Don't use cmake. Use system libopenbabel.

Package-Manager: portage-2.2.0_alpha30_p13/cvs/Linux x86_64

4 files changed, 43 insertions, 29 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/Manifest b/sci-chemistry/openbabel-python/Manifest
index 05830753af4a..976164ac1f23 100644
--- a/sci-chemistry/openbabel-python/Manifest
+++ b/sci-chemistry/openbabel-python/Manifest
@@ -3,15 +3,26 @@ Hash: SHA1
 
 AUX openbabel-python-2.3.0-py3_iterator.patch 346 RMD160 56692e9ab5ce307736a217e2c34121d055fcc5b9 SHA1 6e7dcffa4aa4d6c789b968598f97cc0ebb2165dd SHA256 d138acc218e006e5f5f2defb24c9183f8feae48a5d775788badde21fef77d68e
 AUX openbabel-python-2.3.0-swig.patch 887 RMD160 5fa3e9f6ee70c4f7ec542840cdf861a7b6b8acd5 SHA1 eaf1d9b79787a82734195433bf2ef29f81e0a10c SHA256 2cb191078d1280325ab2eea473be8800e5989e33d0d11a673702436a65954a4e
+AUX openbabel-python-2.3.0-system_openbabel.patch 529 RMD160 a1fd4653ad351cdd8b828497d63d9e80b33a9bd4 SHA1 c7bf439c46a912b78b9dcf3e5f7ac8b052677c0f SHA256 c8ae97e253ae2431418a2f06f0cb86c495ea05434062c391c09866af51ea609c
 AUX openbabel-python-2.3.0-wrap_OBInternalCoord.patch 391 RMD160 d998f3b0cf238fdc925f5f1637630645232e956e SHA1 3a38395df0309b63368d841cba1255afda898133 SHA256 eae434b08f496d0c74b1f97b5b05df22075b11f048055efa902c9530d0f130d8
 DIST openbabel-2.3.0.tar.gz 14321281 RMD160 96dafa3c2aca544f79e08b5617ab0da845c28a16 SHA1 408a4bddb7f052fd89c57ea51b4204b721856b16 SHA256 6dadcb256d83b1f2e616fa1853dd1afadb23550a20d1c118b406231a09f861fb
-EBUILD openbabel-python-2.3.0.ebuild 1363 RMD160 dec6e8d909ee5fbb792bf5f052fac56cd91c503a SHA1 a9a958445756befe26762b9d7747127435aa62a3 SHA256 9fc3c82f4461dee661a4a2622e81505f32d0c711319ca9d5e7c8b28d7388c060
-MISC ChangeLog 872 RMD160 b2d8bc2cd5a467d7cba5ff711324508195d6e03c SHA1 eb0a7c7aa96c9a8f1f48cd71bfcd15b2ee2a6c9a SHA256 612a4d841ec0aa2563aec379f3d33ae34cd67e35b33122a383af720924b19142
+EBUILD openbabel-python-2.3.0.ebuild 1327 RMD160 4f2eea9e9eb3a5df597abfa2929f2f89d9fa45e4 SHA1 135a017ee07235f741332d1765cd28d892d23fe0 SHA256 a503cb76da53149495fc11f7fbdd46c7df1e7ec855b07ecbf7cab532e2c35abe
+MISC ChangeLog 1083 RMD160 ba4bfe18fea53c5d6a303d49e8767af492fa3754 SHA1 473fec0dae00b9cca7d4534e8677cde6f06d708f SHA256 2d06e768623ac768ef41d366078fd16315d6c24ccb3f9f0990d6c9004dcc89b3
 MISC metadata.xml 547 RMD160 685c790d772d3d340cc6506f9ddb0157f0bb1ee0 SHA1 621e3849da03363d9daf831344d275f0116dd95b SHA256 9ab03099df4d364cf5a858fe8127a0069cebe1bab7bf696ed8723c025048b6e6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2RdWUACgkQgAnW8HDreRax8wCgsvXRhSIqCchzYtoY7Mt4oVyB
-l8YAnRRWG6xP7sHdT3riD9Gk5vFFDcsd
-=tLmG
+iQIcBAEBAgAGBQJNub5XAAoJENgZr6v6gHY088YP+wav5E8xyLkVXeIKpvr2fG1b
+q/MKdDPKqP7XEPx6i4KwU1vKF0hjKTvdzjyNsCF91sGnRyO67/TrhS2zoouEb7aq
+lQBwHnUEeAZcjE+pUpB3MuorfRgkIQsVU/CNBLJEBjl+3Lxssh207Wx7FTcJiM4Q
+O1Ak50Av5h65TiZPo6V+g6tX0lzptepNiP2VvVZ0zibpAINOKBXrIClb/+YGPRg9
+fmmVixPIEQKvKy2PYnft8JoDGyShGOiRVK3j2yGUGq95YU8J2Wc+fqfAyYLYrkJW
+7VS+CT98p3iI5orQY1vKVFERnTmgSqUB0BH6SGnfN5EQna207CvrTlH2UrbqS5Zw
+tvl0Havs/hZ/xyo5vVHkH7Gi84VrhcWd2n4t/y2QBJWJ0mjlmONqL454b5y2QRhZ
+KKrV9T/h8OXqqgODiLk/fRRDOFphC9ngpp3JcBDj5Idv1oBAAxunRd7XhesiBx86
+K0Fx3xnFdcG9Ou48nF+ppNPbhTw1Zq1mJTLqBini6nEbj1HAk+UZVsaxrzp2+Q05
+UGLhrsBbRwrB6EAOXBiwWkFLEuXqmw5lWRN7/xFYq/W4Lf7Gq+TTvsK6PXkYlPe7
+P96/EChBgK/Iu2m940uKnTnWf2VAzq/rB60PKNMoYmq8KgfNDYU63+HgXIjb4O5L
+/5PZv3HaNXKETH12gBIj
+=LarT
 -----END PGP SIGNATURE-----
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"
 }