Python ABI fixes and fixes for implicit declarations

(Portage version: 2.2_rc67/git/Linux x86_64)
 (Signed Manifest commit)

4 files changed, 53 insertions, 5 deletions

diff --git a/sci-chemistry/mgltools-geomutils/ChangeLog b/sci-chemistry/mgltools-geomutils/ChangeLog
index 548a797d9..33a9c5d43 100644
--- a/sci-chemistry/mgltools-geomutils/ChangeLog
+++ b/sci-chemistry/mgltools-geomutils/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for sci-chemistry/mgltools-geomutils
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mgltools-geomutils-1.5.4-r1 (27 Jun 2010)
+
+  27 Jun 2010; Justin Lecher <jlec@gentoo.org>
+  -mgltools-geomutils-1.5.4.ebuild, +mgltools-geomutils-1.5.4-r1.ebuild:
+  Python ABI fixes
+
 *mgltools-geomutils-1.5.4 (17 May 2009)
 
   17 May 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
diff --git a/sci-chemistry/mgltools-geomutils/Manifest b/sci-chemistry/mgltools-geomutils/Manifest
index 66c30dcaf..7d629845b 100644
--- a/sci-chemistry/mgltools-geomutils/Manifest
+++ b/sci-chemistry/mgltools-geomutils/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.5.4-gcc4.3.patch 281 RMD160 9ba56245fdf2fb74cda0d548ec8784b4819d0d58 SHA1 e6058a6287b751109bd462d8f5ff90eba59144db SHA256 666eefc4fab65d869f60a8351cb98ccc9a83b609be94441944463093edaf759a
+AUX 1.5.4-impl-dec.patch 224 RMD160 0599637e971e38a5edd1d14b52e8f95a075e6c7c SHA1 8bac78b390a1c86d30ea781e03177c5d50133dd5 SHA256 3f680aed434dc7d82ad0b5d92a2f6cc12d7c67ec20e0fcc8d144ea512e256e43
 DIST mgltools_source_1.5.4.tar.gz 21591865 RMD160 faa158477c4e9156ee5fd23b89251e5bedbd689d SHA1 3b3056a75cd944a4aa46771e09916a4e85052b88 SHA256 d0c614e167512bd19127c741cb2d9860443c097f7ccf0bbe244c0b155e59a9c2
-EBUILD mgltools-geomutils-1.5.4.ebuild 998 RMD160 1c60f8c303116b451602eb3d492c72402c537521 SHA1 aa3a1012c708a049adbe40d3ab4a3811e8d3b804 SHA256 f724ea0cf27736196da248b01ab1678b2d3ff9b7d27ee89d5affbd6b9896ffe3
-MISC ChangeLog 330 RMD160 d5b7ada35ecff5c1dfb2af8f9b7fe41ad3f75487 SHA1 097bd887b54e7894e19d71b3f3aa7a71c9a4eed1 SHA256 482e356eb0860a5f709148c6dd9396ede169536303aadb882d505e8c36cc1e7e
+EBUILD mgltools-geomutils-1.5.4-r1.ebuild 1277 RMD160 2563395890ff4fd20b9dc3c493ab7bb61c3f2ceb SHA1 15440c1a7d92ad8fbaaefffa792bfe43ceab9bfb SHA256 ac0c04099df95e869de4f44c88b7d35f305ee23bf13fa32e5a5cd01bf4b6fab4
+MISC ChangeLog 514 RMD160 d391cfdb27a7e6f7b9fb420df30fa84442478894 SHA1 0f8cff906951990aa72eb929b2075ad477a63ba0 SHA256 781d5782f02c6350de76441f6e6d78e45009d8a3d5e6fdddada448d60baabc2d
 MISC metadata.xml 215 RMD160 bc9c07aa91f2f175542244e4e4522a73558210a1 SHA1 facb283386de1c0b6b938cdcd4dde04d1694298b SHA256 13f32353652adbd3d934d41381cfc2cacc9e1127c508cebc73806cc1026ee80c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwnmZcACgkQgAnW8HDreRagOQCdEvANp2AwMnKkwUH/LGlxbzLR
+rY0An2beuntTBu+ruwPlo+z10Cep/pjY
+=jwce
+-----END PGP SIGNATURE-----
diff --git a/sci-chemistry/mgltools-geomutils/files/1.5.4-impl-dec.patch b/sci-chemistry/mgltools-geomutils/files/1.5.4-impl-dec.patch
new file mode 100644
index 000000000..468d23544
--- /dev/null
+++ b/sci-chemistry/mgltools-geomutils/files/1.5.4-impl-dec.patch
@@ -0,0 +1,12 @@
+diff --git a/src/efit/efit.c b/src/efit/efit.c
+index cfdf7b4..ef71e37 100644
+--- a/src/efit/efit.c
++++ b/src/efit/efit.c
+@@ -6,6 +6,7 @@
+ 
+ #include <stdio.h>
+ #include <math.h>
++#include <string.h>
+ 
+ #define EFIT_MAIN 1
+ 
diff --git a/sci-chemistry/mgltools-geomutils/mgltools-geomutils-1.5.4.ebuild b/sci-chemistry/mgltools-geomutils/mgltools-geomutils-1.5.4-r1.ebuild
index 623a20957..78583cc44 100644
--- a/sci-chemistry/mgltools-geomutils/mgltools-geomutils-1.5.4.ebuild
+++ b/sci-chemistry/mgltools-geomutils/mgltools-geomutils-1.5.4-r1.ebuild
@@ -1,10 +1,16 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="3"
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+
 inherit distutils eutils
 
-MY_P="${P/mgltools-}"
+MY_PN="geomutils"
+MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="mgltools plugin -- geomutils"
 HOMEPAGE="http://mgltools.scripps.edu"
@@ -20,12 +26,15 @@ RDEPEND="dev-python/numpy"
 DEPEND="${RDEPEND}
 	dev-lang/swig"
 
+RESTRICT_PYTHON_ABIS="3.*"
 S="${WORKDIR}"/${MY_P}
 
 src_unpack() {
 	tar xzpf "${DISTDIR}"/${A} mgltools_source_${PV}/MGLPACKS/${MY_P}.tar.gz
 	tar xzpf mgltools_source_${PV}/MGLPACKS/${MY_P}.tar.gz
+}
 
+src_prepare() {
 	find "${S}" -name CVS -type d -exec rm -rf '{}' \; >& /dev/null
 	find "${S}" -name LICENSE -type f -exec rm -f '{}' \; >& /dev/null
 
@@ -35,4 +44,14 @@ src_unpack() {
 		-i "${S}"/MANIFEST.in
 
 	epatch "${FILESDIR}"/${PV}-gcc4.3.patch
+	epatch "${FILESDIR}"/${PV}-impl-dec.patch
+	distutils_src_prepare
+}
+
+pkg_postinst() {
+	python_mod_optimize ${MY_PN}
+}
+
+pkg_postrm() {
+	python_mod_cleanup ${MY_PN}
 }