Backport upstream fix for bug 357483, acked by pchrist

Package-Manager: portage-2.1.10.34/cvs/Linux x86_64

4 files changed, 107 insertions, 8 deletions

diff --git a/dev-lang/swig/ChangeLog b/dev-lang/swig/ChangeLog
index b7fd03c1fc3c..b23cf3409591 100644
--- a/dev-lang/swig/ChangeLog
+++ b/dev-lang/swig/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/swig
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swig/ChangeLog,v 1.157 2011/07/17 10:24:43 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swig/ChangeLog,v 1.158 2011/11/13 12:04:42 dilfridge Exp $
+
+*swig-2.0.4-r1 (13 Nov 2011)
+
+  13 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org> +swig-2.0.4-r1.ebuild,
+  +files/swig-2.0.4-typedef.patch:
+  Backport upstream fix for bug 357483, acked by pchrist
 
   17 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> swig-2.0.2.ebuild:
   ppc/ppc64 stable wrt #365315
diff --git a/dev-lang/swig/Manifest b/dev-lang/swig/Manifest
index 092d3cc8775e..884e0812cae6 100644
--- a/dev-lang/swig/Manifest
+++ b/dev-lang/swig/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
+AUX swig-2.0.4-typedef.patch 1629 RMD160 d2029afdec80bd8ffcdb35de8186060b264627dc SHA1 231061d0ce5d41b25b8548990737edbbbe6f8732 SHA256 23f3ea3ea0fda439412d8474f483d93b223d42a424af2dab70ef167b854dd0d8
 DIST swig-1.3.40.tar.gz 4891020 RMD160 318a59b0ea2b20ca987f7e662e0d7138c869295a SHA1 7e7a426579f2d2d967b731abf062b33aa894fb4e SHA256 1945b3693bcda6777bd05fef1015a0ad1a4604cde4a4a0a368b61ccfd143ac09
 DIST swig-2.0.0.tar.gz 4780164 RMD160 853677ea19307428983034265fb37ce0f4f8a464 SHA1 60faa84a326e5aa8a94f290e9debed4551c1b1e7 SHA256 2568d042d3c7cfbcb17e2471b0434bd3aa78d7a1829f9ef6f1b9fc522e4754ea
 DIST swig-2.0.1.tar.gz 4922992 RMD160 6f09476c11160d07de080c6e97dc89ec71ff821d SHA1 da5a1e396597be683a62d349d71802c33fb0f644 SHA256 6d2072d2fbc2031d47a1a28a8c60d409ccec3f9447a5ae0a47e286c15357fe37
@@ -13,16 +14,25 @@ EBUILD swig-2.0.0.ebuild 1090 RMD160 bce0b90166b815c5ec0e291ef17a678cb564ca83 SH
 EBUILD swig-2.0.1.ebuild 1053 RMD160 2bedec2ce9037c79c7365e22e9061858247c4214 SHA1 45fb58baabbdaa34a35eecf76f9ef809527a30a4 SHA256 8dd5c42c97c30e2967a2eeb367b45282885b8d8d5cde27480a02a841e304fb73
 EBUILD swig-2.0.2.ebuild 1043 RMD160 809c6aa84e9328f2b47ef4ed7dc269d97b22bacd SHA1 bf5c20b19b83611967e667001fef809db98a271d SHA256 7faaff99c5ec3c76b9c2b1294ff0fc0cb23aa2cd640426d6253d66c1bcf56eb4
 EBUILD swig-2.0.3.ebuild 1051 RMD160 c5cd26c2875dfabf1aee98af8e75e9113ff29873 SHA1 23b3a07035ad604ded3969e0ce6fa17df1ff1cca SHA256 64240d239a0e64628e12261ff68936c62a5536d6843c4848f7d381683376a077
+EBUILD swig-2.0.4-r1.ebuild 1116 RMD160 1ae9ebba5fde0d94c527136d8d8b2d75e40d95af SHA1 4af635a6cec93e41043acebdcef761acdec2e580 SHA256 15f38d7d8b841635c010b8259f6f84851438ccda06f493d5440e772ec7def759
 EBUILD swig-2.0.4.ebuild 1051 RMD160 3963d86233ca2a63f278074e8e933781252f66b6 SHA1 b2e79c8ba5906e45ad35b5c9d5ef4479919135ca SHA256 a55ff563077ada0be0153f4282901f0d87d79ab0669ce7299b405197d8bfce12
 EBUILD swig-2.0.4_pre12643.ebuild 1241 RMD160 5ca8e057ba6fb1b34a46a6b05d91d5290c63e057 SHA1 5d5ff06312a4d01423f90848b1a7a7f424c996b5 SHA256 6be391fabd66190ebac113f29a610ef8443a42ee1ebdb0bf7219e67760702a14
-MISC ChangeLog 19959 RMD160 dabb3061919361560d3a99959bab5a88235a8d56 SHA1 63247602c4a578be60260fa457ad63066438ac99 SHA256 8af59b3cf1e0a0d1061418a2e1b09ace90f91413fa4fb1aadd33e51c53be5244
+MISC ChangeLog 20161 RMD160 04161064b2faef3f12d218eacd8761da84fde96f SHA1 4c513c2217b15b10091cb16ce519355d83abee08 SHA256 c2d0d1e2e10acac5af4c8026c066ec09cb5254d51e271ec41250bd62103baea2
 MISC metadata.xml 956 RMD160 b26e212d1522661e27f2141db2aebfd8625f8e67 SHA1 91eb76f152ed9c1faba2678d823f75634519cb19 SHA256 e0d747d1fc0ddfd97fbfdb0f4d53ee635e5f0b435dd36b6e2c5943cbb34d41f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk4iuHEACgkQIiMqcbOVdxSJ6AP8CYRhkEUc9N++qmgMfLRF4imz
-hqJ5oeIBOn5onNr4LR61vtnwLUqyxTeAETpkzDmaBXzD7qzwb2OCXxJ44bTOJwa3
-2goTxov+TGG2QhAX0JuasTabdAddj3lNj9AQSGfOmxQz2Drdf+W/mkMMabY0rlw3
-bQ/ep9bRJTozpx3RkHY=
-=3lzP
+iQIcBAEBCgAGBQJOv7K7AAoJEEb+UGWnxTyHd9MP/RLQdMl+6xRZZbNKcwKtBXFo
+j/f5oFwMMflKunTMDGdZ0wItY9X4/j0ouLuS3SccJnI4fqJbg9P7t6idH5mSVbVg
+BCHUvPRZk4rTC6EpP1t2YeY5+A4BfEbnVXdlBByFD0GSoUsYBsiVKMi9RB5Ajftm
+KL1BwUPDJARtbkklexfgh2bUuGk21cVpbGx9ZW8rP2vf9pZbPkM1Jetxiel3C1p3
+xNKYJu/dZO0fqrlmw4SF4uLaJMPSRJXe0d0BnQ+aTCIJXxtBHU99SmQ1+wqiRgM7
+MQB1H7pjthYvUyAFi4kbvb67NPPXyOK0HOl3RibpVf+ocmPa3NPYjYKQzwOl3Ez7
+vmbajZBRgRoJYyClGBNTJPWfcR2B8mTqo26D2lcvBh9J/6SnnVNgaR8x5UO7UqAY
+c5GB5k8S43TVSQyuVHIJr+7cYaS4k6EUF9eTPeNhKDy1/m8vA05oTyNMb2GR1qK9
+9/BclQD4vh8wEDr8RTlU4452f8jVkiWslfKAuWS/6A/EoHxkjo0V9bvN4/q34aNo
+S0tjXgYHIeDclsRS2/MUIsuigM8G8zI4AMXuq9Y3QBDa/lSuVozZ9TVwRitaKncO
+LnE8UUPAyNVc2l5cOKz9vZoFE8xix6NDPdVW7PKwomrrKfjhN/1v92Ezntvmyjjl
+6TbJenCzB/m72y/nGWTL
+=lf5f
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/swig/files/swig-2.0.4-typedef.patch b/dev-lang/swig/files/swig-2.0.4-typedef.patch
new file mode 100644
index 000000000000..7eaabd5411de
--- /dev/null
+++ b/dev-lang/swig/files/swig-2.0.4-typedef.patch
@@ -0,0 +1,46 @@
+Index: Source/Swig/stype.c
+===================================================================
+--- Source/Swig/stype.c	(Revision 12813)
++++ Source/Swig/stype.c	(Revision 12814)
+@@ -823,7 +823,8 @@
+ 	Insert(result, 0, "(");
+ 	Append(result, ")");
+       }
+-      isreference = 1;
++      if (!isfunction)
++	isreference = 1;
+     } else if (SwigType_isarray(element)) {
+       DOH *size;
+       if (firstarray && !isreference) {
+@@ -869,10 +870,8 @@
+     cast = NewStringf("(%s)", result);
+   }
+   if (name) {
+-    if (!isfunction) {
+-      if (isreference) {
+-	Append(cast, "*");
+-      }
++    if (isreference) {
++      Append(cast, "*");
+     }
+     Append(cast, name);
+   }
+Index: Examples/test-suite/funcptr_cpp.i
+===================================================================
+--- Examples/test-suite/funcptr_cpp.i	(Revision 12813)
++++ Examples/test-suite/funcptr_cpp.i	(Revision 12814)
+@@ -20,3 +20,14 @@
+ %constant int (*ADD_BY_VALUE)(const int &, int) = addByValue;
+ %constant int * (*ADD_BY_POINTER)(const int &, int) = addByPointer;
+ %constant int & (*ADD_BY_REFERENCE)(const int &, int) = addByReference;
++
++
++%inline %{
++typedef int AddByValueTypedef(const int &a, int b);
++typedef int * AddByPointerTypedef(const int &a, int b);
++typedef int & AddByReferenceTypedef(const int &a, int b);
++void *typedef_call1(AddByValueTypedef *& precallback, AddByValueTypedef * postcallback) { return 0; }
++void *typedef_call2(AddByPointerTypedef *& precallback, AddByPointerTypedef * postcallback) { return 0; }
++void *typedef_call3(AddByReferenceTypedef *& precallback, AddByReferenceTypedef * postcallback) { return 0; }
++%}
++
diff --git a/dev-lang/swig/swig-2.0.4-r1.ebuild b/dev-lang/swig/swig-2.0.4-r1.ebuild
new file mode 100644
index 000000000000..ffaaf557a06d
--- /dev/null
+++ b/dev-lang/swig/swig-2.0.4-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swig/swig-2.0.4-r1.ebuild,v 1.1 2011/11/13 12:04:42 dilfridge Exp $
+
+EAPI="3"
+
+inherit base
+
+DESCRIPTION="Simplified Wrapper and Interface Generator"
+HOMEPAGE="http://www.swig.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="ccache doc pcre"
+RESTRICT="test"
+
+DEPEND="pcre? ( dev-libs/libpcre )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-typedef.patch" )
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable ccache) \
+		$(use_with pcre)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc ANNOUNCE CHANGES CHANGES.current README TODO || die "dodoc failed"
+	if use doc; then
+		dohtml -r Doc/{Devel,Manual} || die "dohtml failed"
+	fi
+}