diff options
3 files changed, 104 insertions, 2 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/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() { |