[gentoo-commits] proj/sci:master commit in: sci-chemistry/openbabel-python/files/, sci-chemistry/openbabel-python/

["Reinis Danne" <rei4dan@gmail.com>]

commit:     24be5fc2eaedf8e9c69db19b563251d42a487415
Author:     Reinis Danne <rei4dan <AT> gmail <DOT> com>
AuthorDate: Fri Mar 25 18:59:39 2011 +0000
Commit:     Reinis Danne <rei4dan <AT> gmail <DOT> com>
CommitDate: Fri Mar 25 18:59:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=24be5fc2

openbabel-python: Add Python3 iterator and wrap OBInternalCoord patches

---
 sci-chemistry/openbabel-python/ChangeLog           |    7 +++++++
 .../openbabel-python-2.3.0-py3_iterator.patch      |   12 ++++++++++++
 ...enbabel-python-2.3.0-wrap_OBInternalCoord.patch |   10 ++++++++++
 .../openbabel-python/openbabel-python-2.3.0.ebuild |   10 +++++++++-
 4 files changed, 38 insertions(+), 1 deletions(-)

diff --git a/sci-chemistry/openbabel-python/ChangeLog b/sci-chemistry/openbabel-python/ChangeLog
index b568ab5..2d92edd 100644
--- a/sci-chemistry/openbabel-python/ChangeLog
+++ b/sci-chemistry/openbabel-python/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Mar 2011; Reinis Danne <rei4dan@gmail.com>
+  openbabel-python-2.3.0.ebuild,
+  +files/openbabel-python-2.3.0-py3_iterator.patch,
+  +files/openbabel-python-2.3.0-wrap_OBInternalCoord.patch:
+  Add Python3 iterator and wrap OBInternalCoord patches, upstream r4399,
+  r4400
+
   25 Mar 2011; Justin Lecher <jlec@gentoo.org> openbabel-python-2.3.0.ebuild,
   metadata.xml:
   Cleaned ebuild

diff --git a/sci-chemistry/openbabel-python/files/openbabel-python-2.3.0-py3_iterator.patch b/sci-chemistry/openbabel-python/files/openbabel-python-2.3.0-py3_iterator.patch
new file mode 100644
index 0000000..7efc0ca
--- /dev/null
+++ b/sci-chemistry/openbabel-python/files/openbabel-python-2.3.0-py3_iterator.patch
@@ -0,0 +1,12 @@
+--- scripts/openbabel-python.i	2010-08-16 15:05:20.000000000 +0300
++++ scripts/openbabel-python.i	2011-02-27 14:18:17.000000000 +0200
+@@ -316,6 +316,9 @@
+     def __iter__(self):
+         return self
+ 
++    def __next__(self):
++        return self.next()
++
+     def next(self):
+         if not self.finished:
+             b = self.iter.__ref__()

diff --git a/sci-chemistry/openbabel-python/files/openbabel-python-2.3.0-wrap_OBInternalCoord.patch b/sci-chemistry/openbabel-python/files/openbabel-python-2.3.0-wrap_OBInternalCoord.patch
new file mode 100644
index 0000000..9346189
--- /dev/null
+++ b/sci-chemistry/openbabel-python/files/openbabel-python-2.3.0-wrap_OBInternalCoord.patch
@@ -0,0 +1,10 @@
+--- scripts/openbabel-python.i	2010-08-16 15:05:20.000000000 +0300
++++ scripts/openbabel-python.i	2011-02-25 22:46:08.000000000 +0200
+@@ -120,6 +120,7 @@
+ VECTORTEMPLATE_WRAP(OBRing, OpenBabel::OBRing)
+ VECTORTEMPLATE_WRAP(pOBRing, OpenBabel::OBRing*)
+ VECTORTEMPLATE_WRAP(pOBGenericData, OpenBabel::OBGenericData*)
++VECTORTEMPLATE_WRAP(pOBInternalCoord, OpenBabel::OBInternalCoord*)
+ 
+ }
+ 

diff --git a/sci-chemistry/openbabel-python/openbabel-python-2.3.0.ebuild b/sci-chemistry/openbabel-python/openbabel-python-2.3.0.ebuild
index 463ab69..c5abbeb 100644
--- a/sci-chemistry/openbabel-python/openbabel-python-2.3.0.ebuild
+++ b/sci-chemistry/openbabel-python/openbabel-python-2.3.0.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
 	dev-libs/libxml2:2
 	!sci-chemistry/babel
 	~sci-chemistry/openbabel-${PV}
+	=dev-lang/swig-2.0.1
 	sys-libs/zlib"
 DEPEND="${RDEPEND}
 	dev-util/cmake"
@@ -32,13 +33,20 @@ S="${WORKDIR}"/openbabel-${PV}
 
 DISTUTILS_SETUP_FILES="${WORKDIR}/openbabel-${PV}/scripts/python/setup.py"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-wrap_OBInternalCoord.patch"
+	epatch "${FILESDIR}/${P}-py3_iterator.patch"
+}
+
 src_configure() {
 	local mycmakeargs="-DPYTHON_BINDINGS=ON"
+	mycmakeargs="${mycmakeargs}
+		-DRUN_SWIG=ON"
 	cmake-utils_src_configure
 }
 
 src_compile() {
-	#cmake-utils_src_compile _openbabel
+	cmake-utils_src_compile _openbabel
 	cd "${WORKDIR}/${P}_build/scripts"
 	distutils_src_compile
 }