New swig-1.3.29-r1. This fixes a const char type conversion error. Mainly fixes bug #149064.

Package-Manager: portage-2.1.2_pre1

5 files changed, 135 insertions, 5 deletions

diff --git a/dev-lang/swig/ChangeLog b/dev-lang/swig/ChangeLog
index 871cab79d1a9..fee535ebb5a1 100644
--- a/dev-lang/swig/ChangeLog
+++ b/dev-lang/swig/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/swig
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swig/ChangeLog,v 1.71 2006/09/03 21:48:55 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swig/ChangeLog,v 1.72 2006/09/26 13:30:47 chriswhite Exp $
+
+*swig-1.3.29-r1 (26 Sep 2006)
+
+  26 Sep 2006; Chris White <chriswhite@gentoo.org> +files/swig-const.patch,
+  +swig-1.3.29-r1.ebuild:
+  New swig-1.3.29-r1. This fixes a const char type conversion error. Mainly
+  fixes bug #149064.
 
   05 Sep 2006; Joshua Kinard <kumba@gentoo.org> swig-1.3.25.ebuild:
   Marked stable on mips.
diff --git a/dev-lang/swig/Manifest b/dev-lang/swig/Manifest
index 999d6cc37ff6..c1a57bdc95cd 100644
--- a/dev-lang/swig/Manifest
+++ b/dev-lang/swig/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX swig-const.patch 1343 RMD160 12b783de48888237d5b58726501e6299393c222b SHA1 ebbc70b6be6a1c22d4a5a4e29efe27dc201b77f4 SHA256 1b534a21cd72942ca34f39cb7e56b9605ec9fa611bf2835efda54fa745b26189
+MD5 415bee933ea8e6ebc33da229b942dec5 files/swig-const.patch 1343
+RMD160 12b783de48888237d5b58726501e6299393c222b files/swig-const.patch 1343
+SHA256 1b534a21cd72942ca34f39cb7e56b9605ec9fa611bf2835efda54fa745b26189 files/swig-const.patch 1343
 DIST swig-1.3.21.tar.gz 2023025 RMD160 3db61da060332e032db073d4497380ef4a4a1c6a SHA256 802340c2174dd3ce3be1ace4e8c41b0c97e21066345f90269f0a9ce14cb9c13b
 DIST swig-1.3.25.tar.gz 3451186 RMD160 78b87fb50e11e2003e95621106401d2e6822f224 SHA1 7887a65e57b03a02dfd3f3c93a894f247dc2153c SHA256 ba6fb4b7845758a8078d4bc7f4ff18e5cc437c55025f96b4de209ba280fa7641
 DIST swig-1.3.27.tar.gz 3635865
@@ -14,14 +21,18 @@ EBUILD swig-1.3.27.ebuild 1679 RMD160 3ffc08d5b7818cab75c50f82a16ca8c10ea199a6 S
 MD5 6441becb45d1ce47b4ded1db8f1f5a1f swig-1.3.27.ebuild 1679
 RMD160 3ffc08d5b7818cab75c50f82a16ca8c10ea199a6 swig-1.3.27.ebuild 1679
 SHA256 55f36c588298166c7c909767b83835a2e812aaa61edd4c7346abca711439dcf4 swig-1.3.27.ebuild 1679
+EBUILD swig-1.3.29-r1.ebuild 1814 RMD160 5fa3988aeb3d57922e8eb8c29e4ef46216c98195 SHA1 5c9323dffb49bd168dfc75f3a78a40dcd7867aa7 SHA256 c37ac2dd7b8db6f90858499cc41d53ce35739f59a55b16f37cb433b0c9b9f68f
+MD5 7f0b5321844158607cf60a5f5264d5d8 swig-1.3.29-r1.ebuild 1814
+RMD160 5fa3988aeb3d57922e8eb8c29e4ef46216c98195 swig-1.3.29-r1.ebuild 1814
+SHA256 c37ac2dd7b8db6f90858499cc41d53ce35739f59a55b16f37cb433b0c9b9f68f swig-1.3.29-r1.ebuild 1814
 EBUILD swig-1.3.29.ebuild 1679 RMD160 e50aed42346aeb73947201b4234ad1803414b2ca SHA1 f80501d6b913381d5ccc3b48204c48b3387ce43b SHA256 18aa08aea6b4256d7f0d2852dbf97f761d8dee894a7a96b14ea23e32a346ac45
 MD5 da8b30e2de93854080652a31df87990a swig-1.3.29.ebuild 1679
 RMD160 e50aed42346aeb73947201b4234ad1803414b2ca swig-1.3.29.ebuild 1679
 SHA256 18aa08aea6b4256d7f0d2852dbf97f761d8dee894a7a96b14ea23e32a346ac45 swig-1.3.29.ebuild 1679
-MISC ChangeLog 8372 RMD160 0fed53347a4021aed8e702fcf86f4c2956d8e179 SHA1 c038de6d26fb3c7c669398bd7844161a7b7464a9 SHA256 60c2b9d8fc887ccfdd0ede299537641cb6ac1e73c5517ceed4c404e4ee6725f6
-MD5 c76a77286669e2ebc4a4f44589995398 ChangeLog 8372
-RMD160 0fed53347a4021aed8e702fcf86f4c2956d8e179 ChangeLog 8372
-SHA256 60c2b9d8fc887ccfdd0ede299537641cb6ac1e73c5517ceed4c404e4ee6725f6 ChangeLog 8372
+MISC ChangeLog 8608 RMD160 ce3a02f9e3435e64b090f9de5d5da7b14d8517bf SHA1 be7e074c28c5ab5022eac3ecf10ecee8d9419fe5 SHA256 50192ce2c416475f7c00bdd012f14cdadef6d8f69d8228f9b295dd43fe19474f
+MD5 8c811eff878d34e00cc56c0ca517e8f8 ChangeLog 8608
+RMD160 ce3a02f9e3435e64b090f9de5d5da7b14d8517bf ChangeLog 8608
+SHA256 50192ce2c416475f7c00bdd012f14cdadef6d8f69d8228f9b295dd43fe19474f ChangeLog 8608
 MISC metadata.xml 789 RMD160 aff2d7aa091a43cabd0c5919a4e22f61edbf9694 SHA1 ba03b8b5c10f0f9d5075b0bece80442aa179076b SHA256 d80cc064309c98e8374c5863dffd7d6a3e991509cbd9b787837cd4d5696421f0
 MD5 33a0355b463ef42e3f902697da45f3b3 metadata.xml 789
 RMD160 aff2d7aa091a43cabd0c5919a4e22f61edbf9694 metadata.xml 789
@@ -38,3 +49,13 @@ SHA256 ede82c3ae8b6bc9fc2e353ecfc234f78d27ef1d0ccd20a9a8e8822a7509cd3bf files/di
 MD5 c183ef51249420d66850c927c312113c files/digest-swig-1.3.29 238
 RMD160 a985397360949f0f3ca3e5ab86c89b60b107aa07 files/digest-swig-1.3.29 238
 SHA256 91bb28ad5b182eed50510f3fdf2d2abb4c4df6093a6f2235a74c295f8b12577c files/digest-swig-1.3.29 238
+MD5 c183ef51249420d66850c927c312113c files/digest-swig-1.3.29-r1 238
+RMD160 a985397360949f0f3ca3e5ab86c89b60b107aa07 files/digest-swig-1.3.29-r1 238
+SHA256 91bb28ad5b182eed50510f3fdf2d2abb4c4df6093a6f2235a74c295f8b12577c files/digest-swig-1.3.29-r1 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFGSu/FdQwWVoAgN4RAomoAJ9+db6i4XMKLm2GZDDanx7zMVcEJgCfcXqJ
+X9L6CkZP//YEfU8zNkFF8ko=
+=4sa1
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/swig/files/digest-swig-1.3.29-r1 b/dev-lang/swig/files/digest-swig-1.3.29-r1
new file mode 100644
index 000000000000..efe8b831e1e5
--- /dev/null
+++ b/dev-lang/swig/files/digest-swig-1.3.29-r1
@@ -0,0 +1,3 @@
+MD5 44c6f6d8d724cf7fa4a5109e6f63c9b1 swig-1.3.29.tar.gz 4018019
+RMD160 3818fae5818a235dd09d5c47a52ad751ae21526b swig-1.3.29.tar.gz 4018019
+SHA256 68b1b032cdc6297f068ef8c3c09abdd46a08512e17705d477cc0bf7b80a550e8 swig-1.3.29.tar.gz 4018019
diff --git a/dev-lang/swig/files/swig-const.patch b/dev-lang/swig/files/swig-const.patch
new file mode 100644
index 000000000000..6db41fd98237
--- /dev/null
+++ b/dev-lang/swig/files/swig-const.patch
@@ -0,0 +1,29 @@
+diff -ru swig-1.3.29/Lib/python/pyinit.swg swig-1.3.29_fixed/Lib/python/pyinit.swg
+--- swig-1.3.29/Lib/python/pyinit.swg	2006-02-02 23:48:56.000000000 +0000
++++ swig-1.3.29_fixed/Lib/python/pyinit.swg	2006-09-05 10:30:18.000000000 +0100
+@@ -226,11 +226,11 @@
+ 		       swig_type_info **types_initial) {
+   size_t i;
+   for (i = 0; methods[i].ml_name; ++i) {
+-    char *c = methods[i].ml_doc;
++    const char *c = methods[i].ml_doc;
+     if (c && (c = strstr(c, "swig_ptr: "))) {
+       int j;
+       swig_const_info *ci = 0;
+-      char *name = c + 10;
++      const char *name = c + 10;
+       for (j = 0; const_table[j].type; ++j) {
+ 	if (strncmp(const_table[j].name, name, 
+ 		    strlen(const_table[j].name)) == 0) {
+diff -ru swig-1.3.29/Lib/python/pyrun.swg swig-1.3.29_fixed/Lib/python/pyrun.swg
+--- swig-1.3.29/Lib/python/pyrun.swg	2006-03-07 00:35:17.000000000 +0000
++++ swig-1.3.29_fixed/Lib/python/pyrun.swg	2006-09-05 10:30:03.000000000 +0100
+@@ -1075,7 +1075,7 @@
+     void *vptr = 0;
+     
+     /* here we get the method pointer for callbacks */
+-    char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
++    const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
+     const char *desc = doc ? strstr(doc, "swig_ptr: ") : 0;
+     if (desc) {
+       desc = ty ? SWIG_UnpackVoidPtr(desc + 10, &vptr, ty->name) : 0;
diff --git a/dev-lang/swig/swig-1.3.29-r1.ebuild b/dev-lang/swig/swig-1.3.29-r1.ebuild
new file mode 100644
index 000000000000..868527c15de9
--- /dev/null
+++ b/dev-lang/swig/swig-1.3.29-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swig/swig-1.3.29-r1.ebuild,v 1.1 2006/09/26 13:30:47 chriswhite Exp $
+
+inherit flag-o-matic mono eutils #48511
+
+DESCRIPTION="Simplified Wrapper and Interface Generator"
+HOMEPAGE="http://www.swig.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86"
+IUSE="doc guile java lua mono ocaml perl php pike python ruby tcl tk"
+RESTRICT="test"
+
+DEPEND="lua? ( dev-lang/lua )
+	guile? ( >=dev-util/guile-1.4 )
+	java? ( virtual/jdk )
+	mono? ( dev-lang/mono )
+	perl? ( >=dev-lang/perl-5.6.1 )
+	php? ( virtual/php )
+	pike? ( dev-lang/pike )
+	python? ( virtual/python )
+	ocaml? ( dev-lang/ocaml )
+	ruby? ( virtual/ruby )
+	tcl? ( dev-lang/tcl )
+	tk? ( dev-lang/tk )"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	# const char type casting issue prevention
+	epatch "${FILESDIR}"/swig-const.patch
+}
+
+src_compile() {
+	strip-flags
+
+	local myconf
+	if use ruby ; then
+		local rubyver=$(ruby --version | cut -d '.' -f 1,2)
+		export RUBY="/usr/$(get_libdir)/ruby/${rubyver/ruby /}/"
+	fi
+
+	econf \
+		$(use_with tk x) \
+		$(use_with tcl) \
+		$(use_with python python python) \
+		$(use_with perl perl5 /usr/bin/perl) \
+		$(use_with java java "${JAVA_HOME}") \
+		$(use_with java javaincl "${JAVA_HOME}/include") \
+		$(use_with guile) \
+		$(use_with ruby ruby /usr/bin/ruby) \
+		$(use_with php php4) \
+		$(use_with ocaml) \
+		$(use_with pike) \
+		$(use_with mono csharp) \
+		$(use_with lua) \
+		|| die
+
+	emake || die
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die
+	dodoc ANNOUNCE CHANGES CHANGES.current FUTURE NEW README TODO
+	use doc && dohtml -r Doc/{Devel,Manual}
+}