Python ABI fixes

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

4 files changed, 54 insertions, 6 deletions

diff --git a/sci-chemistry/mgltools-sff/ChangeLog b/sci-chemistry/mgltools-sff/ChangeLog
index c38b30101..797584676 100644
--- a/sci-chemistry/mgltools-sff/ChangeLog
+++ b/sci-chemistry/mgltools-sff/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for sci-chemistry/mgltools-sff
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mgltools-sff-1.5.4-r1 (27 Jun 2010)
+
+  27 Jun 2010; Justin Lecher <jlec@gentoo.org> -mgltools-sff-1.5.4.ebuild,
+  +mgltools-sff-1.5.4-r1.ebuild:
+  Python ABI fixes
+
 *mgltools-sff-1.5.4 (17 May 2009)
 
   17 May 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
diff --git a/sci-chemistry/mgltools-sff/Manifest b/sci-chemistry/mgltools-sff/Manifest
index 6237f4459..ffe86471b 100644
--- a/sci-chemistry/mgltools-sff/Manifest
+++ b/sci-chemistry/mgltools-sff/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 1.5.4-impl-dec.patch 242 RMD160 6c168ecd1278fd1daae941ee7738af2708a8fc37 SHA1 5cb141ad0bda5c1eca165505325ab48e3b2fd190 SHA256 30bce203b82288530cc4acc617748d11d2242f2cbe4d15d0ff3fe9ae02974b43
 DIST mgltools_source_1.5.4.tar.gz 21591865 RMD160 faa158477c4e9156ee5fd23b89251e5bedbd689d SHA1 3b3056a75cd944a4aa46771e09916a4e85052b88 SHA256 d0c614e167512bd19127c741cb2d9860443c097f7ccf0bbe244c0b155e59a9c2
-EBUILD mgltools-sff-1.5.4.ebuild 943 RMD160 073c2c26383d4b323ab6f2da778fbb7caa1e43da SHA1 b28369531dc372901165758a1f8a1eb88bc5451f SHA256 f8c9be364420d50347403fbc035ae6a10b7855f70b7e6832568f46dd8eade2d6
-MISC ChangeLog 281 RMD160 b87fa17358ae87d464420f7a494254a009e49052 SHA1 b4ecaa1bcaa62a60fbed13b75670c5a3e09f575b SHA256 da13c9f170b30f1245dd969ef9752a130ffd95c0b4ddd7c9b6d0cf7cc1dadda8
+EBUILD mgltools-sff-1.5.4-r1.ebuild 1223 RMD160 4105e506b97d4ceeafe36acd4c8c7aa4104f4ec5 SHA1 cc72143bce933cd0a3ed572285946bf55770d9e2 SHA256 bcf296266a52fe2b8257154d0561c229a8d9e84a6429cc929e64162bee845870
+MISC ChangeLog 447 RMD160 5cc2e007adf1c9079ea3b83670d3e951faf10674 SHA1 508ad7718b096671a04bf5b6eb08b458403863dd SHA256 850a4a2797df997144d08bc1b9f2f1c38a46f0936f298886aae7cab489d90ee8
 MISC metadata.xml 215 RMD160 bc9c07aa91f2f175542244e4e4522a73558210a1 SHA1 facb283386de1c0b6b938cdcd4dde04d1694298b SHA256 13f32353652adbd3d934d41381cfc2cacc9e1127c508cebc73806cc1026ee80c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwnuXsACgkQgAnW8HDreRZz0ACghzBoaJblz4e9BvDH795WQUZN
+nhAAnjJz9N9r3UjAXDHfICatQnBJKJaO
+=Va1R
+-----END PGP SIGNATURE-----
diff --git a/sci-chemistry/mgltools-sff/files/1.5.4-impl-dec.patch b/sci-chemistry/mgltools-sff/files/1.5.4-impl-dec.patch
new file mode 100644
index 000000000..253051992
--- /dev/null
+++ b/sci-chemistry/mgltools-sff/files/1.5.4-impl-dec.patch
@@ -0,0 +1,12 @@
+diff --git a/src/bhtree.c b/src/bhtree.c
+index 1db701a..cb16afb 100644
+--- a/src/bhtree.c
++++ b/src/bhtree.c
+@@ -38,6 +38,7 @@
+ */
+ #include <stdio.h>
+ #include <math.h>
++#include <stdlib.h>
+ #include "bhtree.h"
+ 
+ /* Barnes - Hut Trees ? */
diff --git a/sci-chemistry/mgltools-sff/mgltools-sff-1.5.4.ebuild b/sci-chemistry/mgltools-sff/mgltools-sff-1.5.4-r1.ebuild
index 10fce5aca..f81f8f210 100644
--- a/sci-chemistry/mgltools-sff/mgltools-sff-1.5.4.ebuild
+++ b/sci-chemistry/mgltools-sff/mgltools-sff-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: $
 
-inherit distutils
+EAPI="3"
 
-MY_P="${P/mgltools-}"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit distutils eutils
+
+MY_PN="sff"
+MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="mgltools plugin -- sff"
 HOMEPAGE="http://mgltools.scripps.edu"
@@ -20,12 +26,16 @@ 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() {
+	epatch "${FILESDIR}"/${PV}-impl-dec.patch
 	find "${S}" -name CVS -type d -exec rm -rf '{}' \; >& /dev/null
 	find "${S}" -name LICENSE -type f -exec rm -f '{}' \; >& /dev/null
 
@@ -33,4 +43,13 @@ src_unpack() {
 		-e 's:^.*CVS:#&1:g' \
 		-e 's:^.*LICENSE:#&1:g' \
 		-i "${S}"/MANIFEST.in
+	distutils_src_prepare
+}
+
+pkg_postinst() {
+	python_mod_optimize ${MY_PN}
+}
+
+pkg_postrm() {
+	python_mod_cleanup ${MY_PN}
 }