Added fix for const pointers (Bug #87599)

(Portage version: 2.0.51.19)

8 files changed, 206 insertions, 4 deletions

diff --git a/dev-util/cunit/ChangeLog b/dev-util/cunit/ChangeLog
index d31d5b903a15..36bacd3de729 100644
--- a/dev-util/cunit/ChangeLog
+++ b/dev-util/cunit/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-util/cunit
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cunit/ChangeLog,v 1.9 2004/10/30 10:21:55 dholm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cunit/ChangeLog,v 1.10 2005/04/12 08:00:14 dholm Exp $
+
+*cunit-1.1.0.1-r1 (12 Apr 2005)
+*cunit-1.0.0.8-r1 (12 Apr 2005)
+
+  12 Apr 2005; David Holm <dholm@gentoo.org> +files/cunit-const.patch,
+  +metadata.xml, +cunit-1.0.0.8-r1.ebuild, +cunit-1.1.0.1-r1.ebuild:
+  Added const pointers fix from James Ranson <euclid80 (at) users (dot) sf
+  (dot) net> (Bug #87599)
+  Added metadata.xml
 
 *cunit-2.0 (30 Oct 2004)
 
diff --git a/dev-util/cunit/Manifest b/dev-util/cunit/Manifest
index 4637997b5417..ed32c340bbba 100644
--- a/dev-util/cunit/Manifest
+++ b/dev-util/cunit/Manifest
@@ -1,9 +1,15 @@
-MD5 8a244f35dcc5050de997a9ae91e000b0 ChangeLog 1289
 MD5 b5a67110ba209d866a919fce35121095 cunit-1.0.0.6.ebuild 702
+MD5 a0e27eaf651a5505a147a2e71d7b08ff cunit-2.0.ebuild 685
+MD5 c4c708e3dc384f836a21bfea63ae3288 metadata.xml 162
+MD5 fde6682eeea9015cfc6088ad35c36042 cunit-1.1.0.1-r1.ebuild 852
 MD5 551c322ead82e0b2306d8743b2e55375 cunit-1.0.0.8.ebuild 755
 MD5 c58d623bb7473d16ab4312a60212629a cunit-1.1.0.1.ebuild 759
-MD5 a0e27eaf651a5505a147a2e71d7b08ff cunit-2.0.ebuild 685
+MD5 6585e9d466dcfca631440f7fab7bc180 cunit-1.0.0.8-r1.ebuild 856
+MD5 7f046618346dcdba691cd4aec7f48523 ChangeLog 1617
 MD5 26c52006f89c9836586b154c3465db20 files/digest-cunit-1.0.0.6 62
 MD5 4ddd27589e87597ed66d379abdfcafbd files/digest-cunit-1.0.0.8 62
 MD5 7b8e4175a4d75fb58daea1e419f1027b files/digest-cunit-1.1.0.1 63
 MD5 96bd14a67ff89d3fb36de258235fdbe8 files/digest-cunit-2.0 63
+MD5 61a6ec028abc7aaacc7043668ca66b46 files/cunit-const.patch 3794
+MD5 7b8e4175a4d75fb58daea1e419f1027b files/digest-cunit-1.1.0.1-r1 63
+MD5 4ddd27589e87597ed66d379abdfcafbd files/digest-cunit-1.0.0.8-r1 62
diff --git a/dev-util/cunit/cunit-1.0.0.8-r1.ebuild b/dev-util/cunit/cunit-1.0.0.8-r1.ebuild
new file mode 100644
index 000000000000..01f99b41493c
--- /dev/null
+++ b/dev-util/cunit/cunit-1.0.0.8-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cunit/cunit-1.0.0.8-r1.ebuild,v 1.1 2005/04/12 08:00:14 dholm Exp $
+
+inherit eutils
+
+S=${WORKDIR}/CUnit-1.0-8
+DESCRIPTION="CUnit - C Unit Test Framework"
+# Note: Upstream authors have sucky versioning scheme. We fake.
+SRC_URI="mirror://sourceforge/cunit/CUnit-1.0-8.tar.gz"
+HOMEPAGE="http://cunit.sourceforge.net"
+
+DEPEND="virtual/libc"
+
+SLOT="0"
+LICENSE="LGPL-2"
+KEYWORDS="~x86 ~sparc ~ppc"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-const.patch
+}
+
+src_compile() {
+	./configure --prefix=/usr || die "configure failed"
+	make || die "make failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+	dodoc AUTHORS COPYING INSTALL NEWS README ChangeLog
+}
diff --git a/dev-util/cunit/cunit-1.1.0.1-r1.ebuild b/dev-util/cunit/cunit-1.1.0.1-r1.ebuild
new file mode 100644
index 000000000000..ff677e45fa03
--- /dev/null
+++ b/dev-util/cunit/cunit-1.1.0.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cunit/cunit-1.1.0.1-r1.ebuild,v 1.1 2005/04/12 08:00:14 dholm Exp $
+
+inherit eutils
+
+S=${WORKDIR}/CUnit-1.1-1
+DESCRIPTION="CUnit - C Unit Test Framework"
+# Note: Upstream authors have sucky versioning scheme. We fake.
+SRC_URI="mirror://sourceforge/cunit/CUnit-1.1-1.tar.gz"
+HOMEPAGE="http://cunit.sourceforge.net"
+
+DEPEND="virtual/libc"
+
+SLOT="0"
+LICENSE="LGPL-2"
+KEYWORDS="~x86 ~sparc ppc"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-const.patch
+}
+
+src_compile() {
+	./configure --prefix=/usr || die "configure failed"
+	make || die "make failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+	dodoc AUTHORS COPYING INSTALL NEWS README ChangeLog
+}
diff --git a/dev-util/cunit/files/cunit-const.patch b/dev-util/cunit/files/cunit-const.patch
new file mode 100644
index 000000000000..fc23c33038bd
--- /dev/null
+++ b/dev-util/cunit/files/cunit-const.patch
@@ -0,0 +1,112 @@
+diff -r -C 5 CUnit-1.0-8/CUnit/Headers/CUnit.h CUnit-1.0-8.new/CUnit/Headers/CUnit.h
+*** CUnit-1.0-8/CUnit/Headers/CUnit.h	Sun Apr  7 21:36:31 2002
+--- CUnit-1.0-8.new/CUnit/Headers/CUnit.h	Fri Apr  1 12:11:31 2005
+***************
+*** 56,66 ****
+  #ifndef TRUE

+  	#define TRUE	(int)~FALSE

+  #endif

+  

+  extern void assertImplementation(unsigned int bValue,unsigned int uiLine,

+! 				char strCondition[], char strFile[], char strFunction[]);

+  

+  

+  #undef ASSERT

+  #define ASSERT(value) if (0 == (int)(value))  {  assertImplementation(value, __LINE__, #value, __FILE__, "");  return;  }

+  

+--- 56,66 ----
+  #ifndef TRUE

+  	#define TRUE	(int)~FALSE

+  #endif

+  

+  extern void assertImplementation(unsigned int bValue,unsigned int uiLine,

+! 				const char strCondition[], const char strFile[], const char strFunction[]);

+  

+  

+  #undef ASSERT

+  #define ASSERT(value) if (0 == (int)(value))  {  assertImplementation(value, __LINE__, #value, __FILE__, "");  return;  }

+  

+diff -r -C 5 CUnit-1.0-8/CUnit/Headers/TestDB.h CUnit-1.0-8.new/CUnit/Headers/TestDB.h
+*** CUnit-1.0-8/CUnit/Headers/TestDB.h	Sun Apr  7 21:36:31 2002
+--- CUnit-1.0-8.new/CUnit/Headers/TestDB.h	Fri Apr  1 12:12:33 2005
+***************
+*** 114,125 ****
+  /*

+   * This function is for internal use and is used by the 

+   * Asssert Implementation function to store the error description

+   * and the codes.

+   */

+! extern void add_failure(unsigned int uiLineNumber, char szCondition[],

+! 				char szFileName[], PTestGroup pGroup, PTestCase pTest);

+  

+  extern const char* get_error(void);

+  

+  #ifdef __cplusplus

+  }

+--- 114,125 ----
+  /*

+   * This function is for internal use and is used by the 

+   * Asssert Implementation function to store the error description

+   * and the codes.

+   */

+! extern void add_failure(unsigned int uiLineNumber, const char szCondition[],

+! 				const char szFileName[], PTestGroup pGroup, PTestCase pTest);

+  

+  extern const char* get_error(void);

+  

+  #ifdef __cplusplus

+  }

+diff -r -C 5 CUnit-1.0-8/CUnit/Sources/Framework/AssertImpl.c CUnit-1.0-8.new/CUnit/Sources/Framework/AssertImpl.c
+*** CUnit-1.0-8/CUnit/Sources/Framework/AssertImpl.c	Wed Jan  2 07:14:04 2002
+--- CUnit-1.0-8.new/CUnit/Sources/Framework/AssertImpl.c	Fri Apr  1 12:08:45 2005
+***************
+*** 37,45 ****
+  #include "TestDB.h"

+  #include "TestRun.h"

+  

+  

+  void assertImplementation(unsigned int uiValue, unsigned int uiLine,

+! 		char strCondition[], char strFile[], char strFunction[])

+  {

+  	add_failure(uiLine, strCondition, strFile, g_pTestGroup, g_pTestCase);

+  }

+--- 37,45 ----
+  #include "TestDB.h"

+  #include "TestRun.h"

+  

+  

+  void assertImplementation(unsigned int uiValue, unsigned int uiLine,

+! 		const char strCondition[], const char strFile[], const char strFunction[])

+  {

+  	add_failure(uiLine, strCondition, strFile, g_pTestGroup, g_pTestCase);

+  }

+diff -r -C 5 CUnit-1.0-8/CUnit/Sources/Framework/TestRun.c CUnit-1.0-8.new/CUnit/Sources/Framework/TestRun.c
+*** CUnit-1.0-8/CUnit/Sources/Framework/TestRun.c	Tue Jul 23 22:43:58 2002
+--- CUnit-1.0-8.new/CUnit/Sources/Framework/TestRun.c	Fri Apr  1 12:09:57 2005
+***************
+*** 292,303 ****
+  	
+  	f_bCleanupResultSet = 1;
+  	return error_number;
+  }
+  
+! void add_failure(unsigned int uiLineNumber, char szCondition[],
+! 		char szFileName[], PTestGroup pGroup, PTestCase pTest)
+  {
+  	PTestResult pResult = NULL;
+  	PTestResult pTemp = NULL;
+  
+  	if (!g_pTestRegistry) {
+--- 292,303 ----
+  	
+  	f_bCleanupResultSet = 1;
+  	return error_number;
+  }
+  
+! void add_failure(unsigned int uiLineNumber, const char szCondition[],
+! 		const char szFileName[], PTestGroup pGroup, PTestCase pTest)
+  {
+  	PTestResult pResult = NULL;
+  	PTestResult pTemp = NULL;
+  
+  	if (!g_pTestRegistry) {
diff --git a/dev-util/cunit/files/digest-cunit-1.0.0.8-r1 b/dev-util/cunit/files/digest-cunit-1.0.0.8-r1
new file mode 100644
index 000000000000..339475f456ba
--- /dev/null
+++ b/dev-util/cunit/files/digest-cunit-1.0.0.8-r1
@@ -0,0 +1 @@
+MD5 d9752abbc5a5c11e622de158394c7b2b CUnit-1.0-8.tar.gz 93129
diff --git a/dev-util/cunit/files/digest-cunit-1.1.0.1-r1 b/dev-util/cunit/files/digest-cunit-1.1.0.1-r1
new file mode 100644
index 000000000000..74a7ba6ba236
--- /dev/null
+++ b/dev-util/cunit/files/digest-cunit-1.1.0.1-r1
@@ -0,0 +1 @@
+MD5 9771bd432245d060aa06fc95e967fc69 CUnit-1.1-1.tar.gz 110334
diff --git a/dev-util/cunit/metadata.xml b/dev-util/cunit/metadata.xml
new file mode 100644
index 000000000000..f376edc581d2
--- /dev/null
+++ b/dev-util/cunit/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>lang-misc</herd>
+</pkgmetadata>