Set SUPPORT_PYTHON_ABIS (bug #316237).

Package-Manager: portage-HEAD/cvs/Linux x86_64

3 files changed, 50 insertions, 41 deletions

diff --git a/sci-mathematics/snns/ChangeLog b/sci-mathematics/snns/ChangeLog
index 17c79a18cc62..6e04c1206b14 100644
--- a/sci-mathematics/snns/ChangeLog
+++ b/sci-mathematics/snns/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/snns
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/snns/ChangeLog,v 1.19 2009/09/08 09:36:15 phosphan Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/snns/ChangeLog,v 1.20 2010/06/04 16:03:07 arfrever Exp $
+
+  04 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  snns-4.2-r8.ebuild:
+  Set SUPPORT_PYTHON_ABIS (bug #316237).
 
   08 Sep 2009; Patrick Kursawe <phosphan@gentoo.org> -snns-4.2-r7.ebuild:
   Removing obsolete version.
diff --git a/sci-mathematics/snns/Manifest b/sci-mathematics/snns/Manifest
index 03fbcdf436cb..d7f532b7ca4b 100644
--- a/sci-mathematics/snns/Manifest
+++ b/sci-mathematics/snns/Manifest
@@ -4,6 +4,6 @@ DIST PythonFunctionSupport-20050210.patch.gz 15728 RMD160 c1f08db206c42d174a9eed
 DIST SNNSv4.2.Manual.pdf 2103861 RMD160 b0eaddb650303d622001961d74c22cd386218dfa SHA1 491575c7eb16d0274ecd25da13186af29807d638 SHA256 ffed74a4d63f78b8bf8a400a18ce32c3e8d8b3e89682394cc6af122c097aba62
 DIST SNNSv4.2.tar.gz 2170375 RMD160 c27cb08d8838732aea76dc7315fd691d0c9bfb1c SHA1 ccdb91681e43bce68c90558bbf103e7f6417e3fc SHA256 13a36eb7e7838cc7df92a2eaa36c955579a99007c2936d85c20ec0c6a3036c38
 DIST snns-4.2-20040227.patch.gz 55476 RMD160 d4cb5abd4f18c6642ac0f8b438e4bd2dfccd83d1 SHA1 d683b4034a5b4a043155091498485becda248a80 SHA256 08a5fa51552b33e5e981d68cbf05792d40d6d0015abad090697b6f88544d3468
-EBUILD snns-4.2-r8.ebuild 3085 RMD160 1c28a291e39e84d0f2cba8eadf2bf8b95dcffccb SHA1 568ca05f26895e1f27af61141bf1a319315a2a9d SHA256 f791783e72faf3cb74d72b20d0ba79d56ed4a7244a9ded4ed5c0cb114055e4c9
-MISC ChangeLog 4784 RMD160 3d92368f3bfe5427daa0a5c06edbfe6fd10533ca SHA1 87a0b3d373aa2d740393fb7dd4fc1d85d1620c8d SHA256 c534fcbe2223809f5ad2002c2a13b316cd6ddb92f86ab8b3fee7194c340bdb21
+EBUILD snns-4.2-r8.ebuild 2834 RMD160 263e8a18a3b06e045bf05820d24564100bae5e99 SHA1 c81aa346be8c05ea802c5a87e80a51d81b755f24 SHA256 51b34576c462272dd2e435c0ab9a4d230934553b96a6141eae49aafb508ed01c
+MISC ChangeLog 4921 RMD160 e97925a564e7924eabb5c227100a8818416c31c8 SHA1 5f093a5c1a5fa7407ed66c4d2180eceaaf9b62c1 SHA256 c4fb030d3627b62471b00a4d0ec557eba622693c9381581c9d8f33ebad1bfc40
 MISC metadata.xml 232 RMD160 076c48571eef156f7018cfa1655e3a9b2b7194c6 SHA1 032c5ffd7629e1396555e21126bb4666e6441e81 SHA256 26a24f64d408db8eb5d2f94111a10b3d651f0b83fb322262b47f869d6689f74f
diff --git a/sci-mathematics/snns/snns-4.2-r8.ebuild b/sci-mathematics/snns/snns-4.2-r8.ebuild
index 5e455e93a48d..0a0e0ddb228f 100644
--- a/sci-mathematics/snns/snns-4.2-r8.ebuild
+++ b/sci-mathematics/snns/snns-4.2-r8.ebuild
@@ -1,8 +1,13 @@
-# 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-mathematics/snns/snns-4.2-r8.ebuild,v 1.7 2009/09/05 21:31:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/snns/snns-4.2-r8.ebuild,v 1.8 2010/06/04 16:03:07 arfrever Exp $
 
-inherit eutils python multilib
+EAPI="3"
+PYTHON_DEPEND="python? 2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils eutils
 
 MY_P="SNNSv${PV}"
 MYPATCH="${P}-20040227"
@@ -22,11 +27,8 @@ KEYWORDS="amd64 ppc x86"
 SLOT="0"
 IUSE="X doc python"
 
-RDEPEND="X? ( x11-libs/Xaw3d )
-	python? ( >=dev-lang/python-2.3 )"
-
+RDEPEND="X? ( x11-libs/Xaw3d )"
 DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
 	X? ( x11-proto/xproto )"
 
 S="${WORKDIR}/${MY_P}"
@@ -34,42 +36,52 @@ S="${WORKDIR}/${MY_P}"
 src_unpack() {
 	unpack ${MY_P}.tar.gz
 	unpack ${MYPATCH}.patch.gz
-	epatch ${MYPATCH}.patch
+
 	if use python; then
 		unpack ${MYPYTHONEXT}.tar.gz
-
-		cd "${S}"
-		epatch "${FILESDIR}"/${PV}-fPIC-python.patch
-		cd "${WORKDIR}"
 		unpack ${MYPYTHONPATCH}.gz
-		cd "${S}"
-		epatch "${WORKDIR}"/${MYPYTHONPATCH}
 	fi
-	cd "${S}"/xgui/sources
+}
+
+src_prepare() {
+	epatch "${WORKDIR}/${MYPATCH}.patch"
+
+	if use python; then
+		epatch "${FILESDIR}/${PV}-fPIC-python.patch"
+		epatch "${WORKDIR}/${MYPYTHONPATCH}"
+	fi
+
+	cd xgui/sources
 	for file in *.c; do
 		sed -e "s:X11/Xaw/:X11/Xaw3d/:g" -i "${file}"
 	done
 }
 
-src_compile() {
+src_configure() {
 	local myconf="--enable-global"
-	local compileopts="compile-kernel compile-tools"
 
 	if use X; then
-		myconf="${myconf} --with-x"
-		compileopts="${compileopts} compile-xgui"
+		myconf+=" --with-x"
 	else
-		myconf="${myconf} --without-x"
+		myconf+=" --without-x"
+	fi
+
+	econf ${myconf}
+}
+
+src_compile() {
+	local compileopts="compile-kernel compile-tools"
+	if use X; then
+		compileopts+=" compile-xgui"
 	fi
 
-	econf ${myconf} || die "econf failed"
 	# parallel make sometimes fails (phosphan)
-	make ${compileopts} || die "make failed"
+	emake -j1 ${compileopts} || die "make failed"
 
 	if use python; then
-		python_version
-		cd python
-		${python} setup.py build || die "could not build python extension"
+		pushd python > /dev/null
+		distutils_src_compile
+		popd > /dev/null
 	fi
 }
 
@@ -91,13 +103,12 @@ src_install() {
 	fi
 
 	if use python; then
-		python_version
-		cd python
-		${python} setup.py install --prefix="${D}"/usr || die "could not install python module"
+		pushd python > /dev/null
+		distutils_src_install
 		cp -pPR examples "${D}"/usr/share/doc/${PF}/python-examples
 		chmod +x "${D}"/usr/share/doc/${PF}/python-examples/*.py
 		newdoc README README.python
-		cd "${S}"
+		popd > /dev/null
 	fi
 
 	insinto /usr/share/doc/${PF}
@@ -111,18 +122,12 @@ src_install() {
 
 pkg_postinst() {
 	if use python; then
-		einfo "Pre-compiling Python module"
-		python_version
-		for file in __init__.py util.py; do
-			python_mod_compile \
-				/usr/$(get_libdir)/python${PYVER}/site-packages/snns/${file}
-		done
+		distutils_pkg_postinst
 	fi
 }
 
 pkg_postrm() {
 	if use python; then
-		einfo "Cleaning up python stuff"
-		python_mod_cleanup
+		distutils_pkg_postrm
 	fi
 }