sci-chemistry/openbabel-python: Fix for swig-3.0.3, #536180

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 124 insertions, 9 deletions

diff --git a/sci-chemistry/openbabel-python/ChangeLog b/sci-chemistry/openbabel-python/ChangeLog
index 1443bfc7d9b8..6f91bf210ba1 100644
--- a/sci-chemistry/openbabel-python/ChangeLog
+++ b/sci-chemistry/openbabel-python/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/openbabel-python
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel-python/ChangeLog,v 1.19 2015/01/11 11:54:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel-python/ChangeLog,v 1.20 2015/01/11 14:36:40 jlec Exp $
+
+  11 Jan 2015; Justin Lecher <jlec@gentoo.org> openbabel-python-2.3.2.ebuild,
+  +files/openbabel-python-2.3.2-swig-3.0.3.patch:
+  Fix for swig-3.0.3, #536180
 
   11 Jan 2015; Jeroen Roovers <jer@gentoo.org>
   -files/openbabel-python-2.3.0-py3_iterator.patch,
diff --git a/sci-chemistry/openbabel-python/Manifest b/sci-chemistry/openbabel-python/Manifest
index f3b78e15e3e1..66a3068f43b1 100644
--- a/sci-chemistry/openbabel-python/Manifest
+++ b/sci-chemistry/openbabel-python/Manifest
@@ -1,16 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX openbabel-python-2.3.2-bindings_only.patch 8843 SHA256 dc6eec80f84e851a7dabad19c32a69179ccb747ddf7de3ba321a2ac40216105f SHA512 c933ac9f0c2370ceb305ebb831ab81e3d66dc9233d175f2b31f0e6ca0cc91dce591c46478ef5d5ccc118cfa8f6d82459331d5e7885bffa904ad486215c657333 WHIRLPOOL addaba85bee01eaa5342fbc55c8dde5ce27fb126b2e07f0a16d3b8ababc3593f7f5ba4d679b0112a6d13cf69a80b3f98f4dbff16badcb95a6c6650f289b6e17e
+AUX openbabel-python-2.3.2-swig-3.0.3.patch 4138 SHA256 d4aa44552155f16d43fb086c2cd35a944d5d9ff35ae97bb6e632d9772566bfe8 SHA512 ac454d8f8a8e6d8942d493ee648ad190e275d616bea99cc16bede97e00733d4aa6522cf43a80707b3aa59a78ba68731ccdf748beb76fb2b69267b3b060a5e96f WHIRLPOOL 1a758196daad39b1ebb01d13a26256ccfdefee086676b476e4812206aa65a32fb494fe91b0f6cc64ba3233ccdf747752f97786c261d8f679c9472a4fd4f898cd
 AUX openbabel-python-2.3.2-testpybel.patch 1105 SHA256 d39e2530c31f074aa2860f0dea4845acbb3731004491e409169d0c3689682114 SHA512 65df0351fc626ba9d88c06c7f9e84e5707585f302baea4b4885faa3b190c29483b0016d7390e23c2d2444e83c39ad525ba52d7b8d22faed89d82beb480c5b469 WHIRLPOOL 34be3e8bf7322f1c03b4c55d87b4b46d51603ace4a6f1a1524394c115b8ff731125ed0c55132248029718a0519d7d9a96ff8fb56db430d9ca3bc95014d7915a1
 DIST openbabel-2.3.2.tar.gz 20509105 SHA256 4eaca26679aa6cc85ebf96af19191472ac63ca442c36b0427b369c3a25705188 SHA512 d0e1f8b758ffdd65ec6c31d988bffe3279355e286ce69fad12c5905b3b832e2b73ee95b1061b1576aba1ee9fe4da5e31ec30350c473be17493c657dc80caf919 WHIRLPOOL 74eff18b73d24c8f702e5573a58ba6afba8402e9ce8782de95dc0568575a7d2d632dbc8e8a98b3cd25efdfa7379494f7dcd449342c81ddf73f42a387bce77aaa
-EBUILD openbabel-python-2.3.2.ebuild 2259 SHA256 bf8f55dda5ecd31e6e69fd66b46d355085ceecf220e872759337bbdac4788d85 SHA512 aa45bcc5206956548c4d788f9ee09d444689a466618765e906fa091c781204553ddb0b2fa07337d42744e51d44d7c9573d9e85d3cccbec3ac8f9247ae321e649 WHIRLPOOL 25a2aec1466b7ada84414a8d488874cf0d0ccc35d50e9754d0ba553a455aea50bd31a137659936e5e4a84c474049da2979f51967db0b44455c8fe089ac6ba481
-MISC ChangeLog 3591 SHA256 2b32149ee880569b769c99bfb12a84f5cca901e69cd78f6a8a16e613c6cb4330 SHA512 375d5bbbfe96e9e41d518ed2f320b3a4ffbf2343d4bc7bc9e31cd64c4baaef86f85e61f1ba4a8885481ead5e7db97ae887accbaed021ad69190ae11a8a809f22 WHIRLPOOL 98a9929cee4c9493e0b72afd0945eff17a49ec5372275b03dc1ce71bad2f7b4fee7f0c911c4b972359d305c4181e5aba221f06a493f73a6c9b0c52b1d61ebdab
+EBUILD openbabel-python-2.3.2.ebuild 2296 SHA256 138ba9dac5da802e9bc84aa97278b06220eef48d84f31669b7ac40d0f8d67192 SHA512 82ed95df5384d118856c28b4d14caa76be58c5ed0f7eb9c9f055f66532e217725977d1772f0a4fedd428750ed54591f088cdd0db4a0460e300a4280737b39a4b WHIRLPOOL d2db1fc4b80b530fdcd0bd853e19f6dd8e7d64b612739f34891c4d8819eb2fc1d230cbc74e904b212fbd17c3b1122f042a635b7b976a3c816c2c694bafcb4d09
+MISC ChangeLog 3751 SHA256 1c087c35a9da29ca3ebb8f44be18d977e6c820411b81c73e5d6e3883c81e973a SHA512 f3d37881fbfd7707ee7d2111291a2f21d9a7a7c6788081e334feeceba1b424781af3797de3599c4dd99e1553b29d697e7a1a1cac48a4c16413d93ded6797b91d WHIRLPOOL 379d3959a7a2730fa7acbf43c6b4b3430b46faad34ae044aa905797d782f4fcccfba2cfbb22c7ddbf3f0bf06e51e169514f64cfa919bb15ff0d68b178b175d2f
 MISC metadata.xml 551 SHA256 1bb4d6cf369cf20c39c52bdcdd18984e00538f51ae747ae08d81d5162a426bcc SHA512 f3ccfd4c6b6b32d130c959e8bc7ff82b6307f8e997c5ca8ca9eb20ef4ef9bf4c52854579431d91fde6701f2b4ad096578e752be4367f3c7b61f9a721938ec6a6 WHIRLPOOL 3c5f7bc1a3500a6fa96a8bfb211fe07e9880ba2cc44d132f235b2458e9bf5d5c986a51cb384668733254a59aa63802dca738b39694632eb1127838100b0f0710
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlSyZGwACgkQVWmRsqeSphPFAACdGgvgmx50iFqGexxichmqjGGe
-F0EAni4wGrcJRpKmhIfNRaF9ivTS32Q7
-=24na
+iQJ8BAEBCgBmBQJUsossXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirikIP/0DmcQnHB7NbVebVincp3cql
+WjODksx9dW9bX80wir7y5msWFHAIfFdXSqKFxiBh4F3VKFicbe0kz/cNCE3iL7Ht
+N+u70He7QLO7NgR+1AgSrVKfRJL6oSo19lfl/IKDuibEzN3IH77iPN/u66FJPJWt
+BVFRIGd7hWFsuGgc38szJq7GBngIEkngnGPPY/EN0wDC36CjoyEu2kIqpVOAO0pK
+gNVCg+i1jWoFj7UV9/D4Y/1g2d9BdDJdYUz68H3Y4WUHnWaamsZvW81olvl9wsRX
+sYKkf7um21x7HGJg580gcZKGTfP95PEIzBSjWWlYzdO+AWcruu+v6u8dvdEQSQZF
+WNCjDW3CeurGVTh8x0na9HlLUwmFAf3vxrCR9Zo6innR3F51ojGz9m0YS6GkZTev
+HwzPKwgVKcxLw+HwvGhwILTlgcloilY3opwSIpOvM4rkG/otvqesk7A2F9mZZ84F
+9zoqdScAYvv92cCokWb3z1wWXFqVr2QEBPdTKgpQ4R74OUo6+0tGm/4zo88+vZ8V
+438UIMCivC6nnWGKT1k1YHuERoEUAKocObWAHx1xAdyBnB3qPm2xBCRmXyv1ACN/
+LkO90fBnKLXPW0foChVkgVyM1wNdZvjZFVZ+AEViNe7i3IDzcRWLrxEw6DSGaKyA
+3F87J3g3Gz6U7DF3Pqtq
+=VheT
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/openbabel-python/files/openbabel-python-2.3.2-swig-3.0.3.patch b/sci-chemistry/openbabel-python/files/openbabel-python-2.3.2-swig-3.0.3.patch
new file mode 100644
index 000000000000..d30efd55bd92
--- /dev/null
+++ b/sci-chemistry/openbabel-python/files/openbabel-python-2.3.2-swig-3.0.3.patch
@@ -0,0 +1,97 @@
+ scripts/openbabel-python.i | 34 +++++++++++++++++-----------------
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/scripts/openbabel-python.i b/scripts/openbabel-python.i
+index 7cb8f24..d893129 100644
+--- a/scripts/openbabel-python.i
++++ b/scripts/openbabel-python.i
+@@ -227,7 +227,7 @@ CAST_GENERICDATA_TO(SquarePlanarStereo)
+ %include <openbabel/math/transform3d.h>
+ %include <openbabel/math/spacegroup.h>
+ 
+-# CloneData should be used instead of the following method
++// CloneData should be used instead of the following method
+ %ignore OpenBabel::OBBase::SetData;
+ %include <openbabel/base.h>
+ 
+@@ -289,7 +289,7 @@ OBMol.BeginResidues = OBMol.EndResidues = OBMol.BeginResidue = OBMol.EndResidue
+ %ignore OpenBabel::OBDescriptor::LessThan;
+ %include <openbabel/descriptor.h>
+ 
+-# Ignore shadowed methods
++// Ignore shadowed methods
+ %ignore OpenBabel::OBForceField::VectorSubtract(const double *const, const double *const, double *);
+ %ignore OpenBabel::OBForceField::VectorMultiply(const double *const, const double, double *);
+ %include <openbabel/forcefield.h>
+@@ -310,7 +310,7 @@ OBMol.BeginResidues = OBMol.EndResidues = OBMol.BeginResidue = OBMol.EndResidue
+ 
+ %warnfilter(503) OpenBabel::OBBitVec; // Not wrapping any of the overloaded operators
+ %include <openbabel/bitvec.h>
+-# Ignore shadowed method
++// Ignore shadowed method
+ %ignore OpenBabel::OBRotor::GetRotAtoms() const;
+ %include <openbabel/rotor.h>
+ %ignore OpenBabel::Swab;
+@@ -321,13 +321,13 @@ OBMol.BeginResidues = OBMol.EndResidues = OBMol.BeginResidue = OBMol.EndResidue
+ %include <openbabel/math/align.h>
+ #endif
+ 
+-# The following %ignores avoid warning messages due to shadowed classes.
+-# This does not imply a loss of functionality as (in this case)
+-# the shadowed class is identical (from the point of view of SWIG) to
+-# the shadowing class.
+-# This is because C++ references (&) are transformed by SWIG back into
+-# pointers, so that OBAtomIter(OBMol &) would be treated the same as
+-# OBAtomIter(OBMol *).
++// The following %ignores avoid warning messages due to shadowed classes.
++// This does not imply a loss of functionality as (in this case)
++// the shadowed class is identical (from the point of view of SWIG) to
++// the shadowing class.
++// This is because C++ references (&) are transformed by SWIG back into
++// pointers, so that OBAtomIter(OBMol &) would be treated the same as
++// OBAtomIter(OBMol *).
+ 
+ %ignore OBAtomAtomIter(OBAtom &);
+ %ignore OBAtomBondIter(OBAtom &);
+@@ -346,9 +346,9 @@ OBMol.BeginResidues = OBMol.EndResidues = OBMol.BeginResidue = OBMol.EndResidue
+ %ignore OBResidueIter(OBMol &);
+ %ignore OBResidueAtomIter(OBResidue &);
+ 
+-# These classes are renamed so that they can be replaced by Python
+-# classes of the same name which provide Pythonic iterators
+-# (see %pythoncode section below)
++// These classes are renamed so that they can be replaced by Python
++// classes of the same name which provide Pythonic iterators
++// (see %pythoncode section below)
+ 
+ %rename(_OBAtomAtomIter) OpenBabel::OBAtomAtomIter;
+ %rename(_OBAtomBondIter) OpenBabel::OBAtomBondIter;
+@@ -367,8 +367,8 @@ OBMol.BeginResidues = OBMol.EndResidues = OBMol.BeginResidue = OBMol.EndResidue
+ 
+ %include <openbabel/obiter.h>
+ 
+-# The following class, OBiter, is subclassed to provide Python iterators
+-# equivalent to the C++ iterators in obiter.h and the plugin iterators
++// The following class, OBiter, is subclassed to provide Python iterators
++// equivalent to the C++ iterators in obiter.h and the plugin iterators
+ 
+ %pythoncode %{
+ class OBIter(object):
+@@ -459,7 +459,7 @@ def double_array(mylist):
+     return c
+ %}
+ 
+-# Copy some of the global variables in cvar into the openbabel namespace
++// Copy some of the global variables in cvar into the openbabel namespace
+ 
+ %pythoncode %{
+ obErrorLog = cvar.obErrorLog
+@@ -470,7 +470,7 @@ atomtyper = cvar.atomtyper
+ aromtyper = cvar.aromtyper
+ %}
+ 
+-# Functions to set the log file to std::cout and std::cerr
++// Functions to set the log file to std::cout and std::cerr
+        
+ %ignore OBForceField::SetLogFile(std::ostream *pos);
+ %extend OpenBabel::OBForceField {
diff --git a/sci-chemistry/openbabel-python/openbabel-python-2.3.2.ebuild b/sci-chemistry/openbabel-python/openbabel-python-2.3.2.ebuild
index 81bca06fe427..5bdfc76e4243 100644
--- a/sci-chemistry/openbabel-python/openbabel-python-2.3.2.ebuild
+++ b/sci-chemistry/openbabel-python/openbabel-python-2.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel-python/openbabel-python-2.3.2.ebuild,v 1.10 2015/01/04 13:44:02 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel-python/openbabel-python-2.3.2.ebuild,v 1.11 2015/01/11 14:36:40 jlec Exp $
 
 EAPI=5
 
@@ -31,6 +31,7 @@ S="${WORKDIR}"/openbabel-${PV}
 PATCHES=(
 	"${FILESDIR}"/${P}-testpybel.patch
 	"${FILESDIR}"/${P}-bindings_only.patch
+	"${FILESDIR}"/${P}-swig-3.0.3.patch
 	)
 
 src_prepare() {