projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 40bc873)
Fixes for PYTHON ABI, #316179
authorJustin Lecher <jlec@gentoo.org>
Thu, 20 May 2010 20:18:14 +0000 (20:18 +0000)
committerJustin Lecher <jlec@gentoo.org>
Thu, 20 May 2010 20:18:14 +0000 (20:18 +0000)
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

sci-chemistry/openbabel/ChangeLog patch | blob | history
sci-chemistry/openbabel/Manifest patch | blob | history
sci-chemistry/openbabel/openbabel-2.2.2-r1.ebuild patch | blob | history
sci-chemistry/openbabel/openbabel-2.2.3.ebuild patch | blob | history

diff --git a/sci-chemistry/openbabel/ChangeLog b/sci-chemistry/openbabel/ChangeLog
index be59620512ae971fdcb04c3b3371f2e707010086..4cc9694891e88a99b819a0bacf405505f0c871b2 100644 (file)
--- a/sci-chemistry/openbabel/ChangeLog
+++ b/sci-chemistry/openbabel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/openbabel
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel/ChangeLog,v 1.35 2010/01/19 00:38:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel/ChangeLog,v 1.36 2010/05/20 20:18:14 jlec Exp $
+
+  20 May 2010; Justin Lecher <jlec@gentoo.org> openbabel-2.2.2-r1.ebuild,
+  openbabel-2.2.3.ebuild:
+  Fixes for PYTHON ABI, #316179
 
   19 Jan 2010; Jeroen Roovers <jer@gentoo.org> openbabel-2.2.1.ebuild:
   Stable for HPPA too.
diff --git a/sci-chemistry/openbabel/Manifest b/sci-chemistry/openbabel/Manifest
index d3748bd245736dd4b525daa0997aea02600c8a04..b485bd5d0e207781b320afb8e9286d9876ea0c9b 100644 (file)
--- a/sci-chemistry/openbabel/Manifest
+++ b/sci-chemistry/openbabel/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX openbabel-2.2.0-doxyfile.patch 1074 RMD160 26a22e205fde6c778ed19e961e676d99f0ffa2a7 SHA1 89c68eab7c2f144bf664f1c8abb7322430893658 SHA256 28d8b3e4730bdd347ddb1a0bff238bf52b2eb591d23d693812d99bb02c7190ec
 DIST openbabel-2.2.1.tar.gz 6507473 RMD160 47c6afecc1a7c847052dcb8570eee89a52416586 SHA1 736fc5b69851d72b58545c5ba8c2bbd361d64e46 SHA256 822345d70778de1d2d9afe65a659f1719b8ca300066fb1fa2f473bc97c457e80
 DIST openbabel-2.2.2.tar.gz 6621343 RMD160 95c5da693c0d34e85c0f97f23318251b89a47ddb SHA1 eff94c92f1f0e7e834874e2964056f538fa1574a SHA256 9db35a4d0c7aa26fdf845136ac883b44488740769d64c60cbcf1e68be2bcd051
 DIST openbabel-2.2.3.tar.gz 6624028 RMD160 4234baf9773aa6f918bb3fa5a25cab5f657f857e SHA1 e396b27551a106e001ca6c953181657a0a53f43f SHA256 eabc8bdbd68431f441b6b40adde0861b2e99750efd21bbb4870ee0a233feae46
 EBUILD openbabel-2.2.1.ebuild 1517 RMD160 f1457390e0c92a575bd43233e085319472e3005a SHA1 9fc392ffc2ed9440427743e10d5585a563425060 SHA256 a7aeca14f4f09df098938578180275ce4455af7434c6e510764a35584d1df479
-EBUILD openbabel-2.2.2-r1.ebuild 2009 RMD160 24cf1bbabd3e1a3c06ca31ecd40ef1ad1b230dfe SHA1 e5da6a81e80cbd7bdbd4f2fc5e2f28d005c84029 SHA256 4f99b58e5ee352551bb7e3d80c084951df9e38647c4f5706df49b460fd008dc6
-EBUILD openbabel-2.2.3.ebuild 2006 RMD160 82b5ada8c46548165617b88d9742c2e82710c317 SHA1 3fe84ebc77c6745dcabf999ded77edf14007da62 SHA256 3e0b65071e85ce43b675a528848dcd1d0866200cd0e1fc5d5a9e8fa2325db64e
-MISC ChangeLog 6202 RMD160 1d1f7c781690c66a64c245dc6a6e5a9c483d04b6 SHA1 53781324be0c02c0de8283a547134f124af9b75b SHA256 cddf72ffff1387662c2481ba269797c53f6179ac39ed9429db86207eb5474962
+EBUILD openbabel-2.2.2-r1.ebuild 1984 RMD160 df026b27453b30a15424e551e2e055509eb5dfa0 SHA1 5ff1243594f4f473cb44f0a862cabe2b40b2f550 SHA256 be205b3125b74d232f3398127dcba3faf65faa47d38284e46de52d79672899fd
+EBUILD openbabel-2.2.3.ebuild 1982 RMD160 243a7f135caff2e71662b3fabdfc7a774ae0502c SHA1 62b3b6179cc79493dac41e515a864308e7954903 SHA256 9f05fabf275f18e0c01c4203488038186990da03afb2e80ed62db7bf484cd5e5
+MISC ChangeLog 6336 RMD160 40d8650879f4c37a35dacab1798c2b9e9e80e5a0 SHA1 03611af702caf0c3320fa5e719c74480aa7034a2 SHA256 9977f56239119e9e90bb41d510d7eef1d08307dcf43a59ebd4aae2c49c9c2ef1
 MISC metadata.xml 574 RMD160 de480e8ffc0e8c12f3e3d7254daddcf93c8aeb35 SHA1 ff5f154d3514a400db3424496fe9066587f6a731 SHA256 b8fa09ae4d94de3b0ba7233976cfe754060c06a43e583954126cac14193bb07e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkv1mQwACgkQgAnW8HDreRYbWwCeMGL3loniugINZlRY4Nb3AhwM
+R9wAoLiymlw71+6LuLSPLzUUC3Vp0PS1
+=B9XB
+-----END PGP SIGNATURE-----
diff --git a/sci-chemistry/openbabel/openbabel-2.2.2-r1.ebuild b/sci-chemistry/openbabel/openbabel-2.2.2-r1.ebuild
index 0f0edbfc265356282058e177716f75d9f59767ee..2c23f377418df4c0aff5594601473a43c7e34844 100644 (file)
--- a/sci-chemistry/openbabel/openbabel-2.2.2-r1.ebuild
+++ b/sci-chemistry/openbabel/openbabel-2.2.2-r1.ebuild
@@ -1,12 +1,15 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel/openbabel-2.2.2-r1.ebuild,v 1.1 2009/07/24 19:00:34 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel/openbabel-2.2.2-r1.ebuild,v 1.2 2010/05/20 20:18:14 jlec Exp $
 
-EAPI=1
+EAPI="3"
 
-inherit eutils
+PYTHON_DEPEND="python? 2"
+SUPPORT_PYTHON_ABIS="1"
 
-DESCRIPTION="interconverts file formats used in molecular modeling"
+inherit eutils distutils
+
+DESCRIPTION="Interconverts file formats used in molecular modeling"
 HOMEPAGE="http://openbabel.sourceforge.net/"
 SRC_URI="mirror://sourceforge/openbabel/${P}.tar.gz"
 
@@ -15,29 +18,36 @@ SLOT="0"
 LICENSE="GPL-2"
 IUSE="doc python swig"
 
-RDEPEND="!sci-chemistry/babel
+RDEPEND="
        >=dev-libs/libxml2-2.6.5
-       sys-libs/zlib
-       python? ( dev-lang/python )"
+       !sci-chemistry/babel
+       sys-libs/zlib"
 
 DEPEND="${RDEPEND}
-       >=dev-libs/boost-1.35.0
        dev-lang/perl
+       >=dev-libs/boost-1.35.0
        python? ( swig? ( >=dev-lang/swig-1.3.38 ) )
        doc? ( app-doc/doxygen )"
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
+RESTRICT_PYTHON_ABIS="3.*"
+
+src_prepare() {
        epatch "${FILESDIR}/${PN}-2.2.0-doxyfile.patch"
+       if use python; then
+               cd "${S}/scripts/python"
+               distutils_src_prepare
+       fi
 }
 
-src_compile() {
+src_configure() {
        local swigconf=""
        if use swig; then
                swigconf="--enable-maintainer-mode"
        fi
        econf ${swigconf} || die "econf failed"
+}
+
+src_compile() {
        emake || die "emake failed"
        if use doc ; then
                emake docs || die "make docs failed"
@@ -48,7 +58,7 @@ src_compile() {
        fi
        if use python; then
                cd "${S}/scripts/python"
-               python setup.py build || die "Python build failed."
+               distutils_src_compile
        fi
 }
 
@@ -57,30 +67,22 @@ src_test() {
 }
 
 src_install() {
+       dodoc AUTHORS ChangeLog NEWS README THANKS doc/{*.inc,README*,*.inc,*.mol2} || die
+       dohtml doc/{*.html,*.png} || die
+       if use doc ; then
+               insinto /usr/share/doc/${PF}/API/html
+               doins API/html/* || die
+       fi
        emake DESTDIR="${D}" install || die "make install failed"
        # Now to install the Python bindings if necessary
        if use python; then
                cd "${S}/scripts/python"
-               python ./setup.py install --root="${D}" --optimize=1 \
-                       || die "Python bindings install failed"
+               distutils_src_install
                if use doc; then
                        docinto python
-                       dodoc README
+                       dodoc README || die
                        docinto python/html
-                       dodoc *.html
+                       dodoc *.html || die
                fi
        fi
-       # And the documentation
-       docinto
-       cd "${S}"
-       dodoc AUTHORS ChangeLog NEWS README THANKS
-       cd doc
-       dohtml *.html *.png
-       dodoc *.inc README* *.inc *.mol2
-       if use doc ; then
-               dodir /usr/share/doc/${PF}/API/html
-               insinto /usr/share/doc/${PF}/API/html
-               cd API/html
-               doins *
-       fi
 }
diff --git a/sci-chemistry/openbabel/openbabel-2.2.3.ebuild b/sci-chemistry/openbabel/openbabel-2.2.3.ebuild
index da1b2e03f88d2802605f70a0f04f45e2184e2d2b..c5b088e8b657c16010f918a60d2143ff6202faa3 100644 (file)
--- a/sci-chemistry/openbabel/openbabel-2.2.3.ebuild
+++ b/sci-chemistry/openbabel/openbabel-2.2.3.ebuild
@@ -1,12 +1,15 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel/openbabel-2.2.3.ebuild,v 1.1 2009/08/01 15:22:51 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel/openbabel-2.2.3.ebuild,v 1.2 2010/05/20 20:18:14 jlec Exp $
 
-EAPI=1
+EAPI="3"
 
-inherit eutils
+PYTHON_DEPEND="python? 2"
+SUPPORT_PYTHON_ABIS="1"
 
-DESCRIPTION="interconverts file formats used in molecular modeling"
+inherit eutils distutils
+
+DESCRIPTION="Interconverts file formats used in molecular modeling"
 HOMEPAGE="http://openbabel.sourceforge.net/"
 SRC_URI="mirror://sourceforge/openbabel/${P}.tar.gz"
 
@@ -15,29 +18,36 @@ SLOT="0"
 LICENSE="GPL-2"
 IUSE="doc python swig"
 
-RDEPEND="!sci-chemistry/babel
+RDEPEND="
        >=dev-libs/libxml2-2.6.5
-       sys-libs/zlib
-       python? ( dev-lang/python )"
+       !sci-chemistry/babel
+       sys-libs/zlib"
 
 DEPEND="${RDEPEND}
-       >=dev-libs/boost-1.35.0
        dev-lang/perl
+       >=dev-libs/boost-1.35.0
        python? ( swig? ( >=dev-lang/swig-1.3.38 ) )
        doc? ( app-doc/doxygen )"
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
+RESTRICT_PYTHON_ABIS="3.*"
+
+src_prepare() {
        epatch "${FILESDIR}/${PN}-2.2.0-doxyfile.patch"
+       if use python; then
+               cd "${S}/scripts/python"
+               distutils_src_prepare
+       fi
 }
 
-src_compile() {
+src_configure() {
        local swigconf=""
        if use swig; then
                swigconf="--enable-maintainer-mode"
        fi
        econf ${swigconf} || die "econf failed"
+}
+
+src_compile() {
        emake || die "emake failed"
        if use doc ; then
                emake docs || die "make docs failed"
@@ -48,7 +58,7 @@ src_compile() {
        fi
        if use python; then
                cd "${S}/scripts/python"
-               python setup.py build || die "Python build failed."
+               distutils_src_compile
        fi
 }
 
@@ -57,30 +67,23 @@ src_test() {
 }
 
 src_install() {
+       dodoc AUTHORS ChangeLog NEWS README THANKS doc/{*.inc,README*,*.inc,*.mol2} || die
+       dohtml doc/{*.html,*.png} || die
+       if use doc ; then
+               insinto /usr/share/doc/${PF}/API/html
+               doins API/html/* || die
+       fi
+
        emake DESTDIR="${D}" install || die "make install failed"
        # Now to install the Python bindings if necessary
        if use python; then
                cd "${S}/scripts/python"
-               python ./setup.py install --root="${D}" --optimize=1 \
-                       || die "Python bindings install failed"
+               distutils_src_install
                if use doc; then
                        docinto python
-                       dodoc README
+                       dodoc README || die
                        docinto python/html
-                       dodoc *.html
+                       dodoc *.html || die
                fi
        fi
-       # And the documentation
-       docinto
-       cd "${S}"
-       dodoc AUTHORS ChangeLog NEWS README THANKS
-       cd doc
-       dohtml *.html *.png
-       dodoc *.inc README* *.inc *.mol2
-       if use doc ; then
-               dodir /usr/share/doc/${PF}/API/html
-               insinto /usr/share/doc/${PF}/API/html
-               cd API/html
-               doins *
-       fi
 }
Unnamed repository; edit this file 'description' to name the repository.