Don't use cmake. Use system libopenbabel.

(Portage version: 2.2.0_alpha30_p13/cvs/Linux x86_64)

3 files changed, 27 insertions, 24 deletions

diff --git a/sci-chemistry/openbabel-python/ChangeLog b/sci-chemistry/openbabel-python/ChangeLog
index d9f2b3d21bd3..d05dca5118be 100644
--- a/sci-chemistry/openbabel-python/ChangeLog
+++ b/sci-chemistry/openbabel-python/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/openbabel-python
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel-python/ChangeLog,v 1.3 2011/03/29 06:00:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel-python/ChangeLog,v 1.4 2011/04/28 19:21:51 arfrever Exp $
+
+  28 Apr 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  openbabel-python-2.3.0.ebuild,
+  +files/openbabel-python-2.3.0-system_openbabel.patch:
+  Don't use cmake. Use system libopenbabel.
 
   29 Mar 2011; Justin Lecher <jlec@gentoo.org> openbabel-python-2.3.0.ebuild:
   Depend on >=swig-2
diff --git a/sci-chemistry/openbabel-python/files/openbabel-python-2.3.0-system_openbabel.patch b/sci-chemistry/openbabel-python/files/openbabel-python-2.3.0-system_openbabel.patch
new file mode 100644
index 000000000000..1e1503d6d2f1
--- /dev/null
+++ b/sci-chemistry/openbabel-python/files/openbabel-python-2.3.0-system_openbabel.patch
@@ -0,0 +1,13 @@
+--- scripts/python/setup.py
++++ scripts/python/setup.py
+@@ -15,9 +15,7 @@
+ 
+ obExtension = Extension('_openbabel',
+                  [os.path.join(srcdir, "openbabel-python.cpp")],
+-                 include_dirs=[os.path.join(srcdir, "..", "..", "include"),
+-                               os.path.join("..", "include")],
+-                 library_dirs=[os.path.join("..", "lib")],
++                 include_dirs=[os.path.join("/usr", "include", "openbabel-2.0")],
+                  libraries=['openbabel']
+                  )
+ 
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 0e78a0bf4c6c..f9a84f636be6 100644
--- a/sci-chemistry/openbabel-python/openbabel-python-2.3.0.ebuild
+++ b/sci-chemistry/openbabel-python/openbabel-python-2.3.0.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2011 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.0.ebuild,v 1.3 2011/03/29 06:00:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel-python/openbabel-python-2.3.0.ebuild,v 1.4 2011/04/28 19:21:51 arfrever Exp $
 
 EAPI="3"
 
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython"
 PYTHON_MODNAME="openbabel.py pybel.py"
 
-inherit cmake-utils eutils distutils
+inherit distutils eutils
 
 DESCRIPTION="Python bindings for OpenBabel (including Pybel)"
 HOMEPAGE="http://openbabel.sourceforge.net/"
@@ -26,34 +27,18 @@ RDEPEND="
 	~sci-chemistry/openbabel-${PV}
 	sys-libs/zlib"
 DEPEND="${RDEPEND}
-	>=dev-lang/swig-2
-	dev-util/cmake"
+	>=dev-lang/swig-2"
 
 S="${WORKDIR}"/openbabel-${PV}
 
-DISTUTILS_SETUP_FILES="${S}/scripts/python/setup.py"
+DISTUTILS_SETUP_FILES="scripts|python/setup.py"
 
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-wrap_OBInternalCoord.patch \
 		"${FILESDIR}"/${P}-py3_iterator.patch \
-		"${FILESDIR}"/${P}-swig.patch
-}
-
-src_configure() {
-	local mycmakeargs="-DPYTHON_BINDINGS=ON"
-	mycmakeargs="${mycmakeargs}
-		-DRUN_SWIG=ON"
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile _openbabel
-	cd "${WORKDIR}/${P}_build/scripts"
-	distutils_src_compile
-}
+		"${FILESDIR}"/${P}-swig.patch \
+		"${FILESDIR}"/${P}-system_openbabel.patch
 
-src_install() {
-	cd "${WORKDIR}/${P}_build/scripts"
-	distutils_src_install
+	swig -python -c++ -small -O -templatereduce -naturalvar -I/usr/include/openbabel-2.0 -o scripts/python/openbabel-python.cpp -DHAVE_EIGEN2 -outdir scripts/python scripts/openbabel-python.i || die "Regeneration of openbabel-python.cpp failed"
 }