Set SUPPORT_PYTHON_ABIS.

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

3 files changed, 61 insertions, 24 deletions

diff --git a/dev-db/metakit/ChangeLog b/dev-db/metakit/ChangeLog
index 695ef4f3ead3..51f8e3b33cdb 100644
--- a/dev-db/metakit/ChangeLog
+++ b/dev-db/metakit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/metakit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/ChangeLog,v 1.47 2010/06/21 19:27:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/ChangeLog,v 1.48 2010/07/14 13:30:26 arfrever Exp $
+
+  14 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  metakit-2.4.9.7.ebuild:
+  Set SUPPORT_PYTHON_ABIS.
 
   21 Jun 2010; Jeroen Roovers <jer@gentoo.org> metakit-2.4.9.6.ebuild,
   metakit-2.4.9.7.ebuild:
diff --git a/dev-db/metakit/Manifest b/dev-db/metakit/Manifest
index 2c16b1ff0c5b..21b7e46ec604 100644
--- a/dev-db/metakit/Manifest
+++ b/dev-db/metakit/Manifest
@@ -2,6 +2,6 @@ AUX metakit-2.4.9.3-64bit.patch 1402 RMD160 a62370b09168ae6420bb5c109aaf354a1409
 DIST metakit-2.4.9.6.tar.gz 868298 RMD160 f0515f21c6dfc96f912989155938d9e54b7d0810 SHA1 c8d1babae6d1569a188a77e8648c987a83c7f282 SHA256 bcaef27ca5f0ca44b189ccb0d6fc7e1f07b5781ee1ebda6b75edd8ed4acfe8e2
 DIST metakit-2.4.9.7.tar.gz 868310 RMD160 e563c2187e66ed7a8ea0e9a16971e6ce777e3088 SHA1 1b75400038fcad941886deb0748e669c224bc995 SHA256 d1ba361d2d8517925cff5c23e8602822da9c8c347a75a15c225ec656ff7ca94d
 EBUILD metakit-2.4.9.6.ebuild 1708 RMD160 d114128fae2f783a190c8d2b211ef975d05ae194 SHA1 948c5dcd9d99600106aea86fedac985423372ccc SHA256 39d79163bbf2d7e7474cb13359c050dd74fedc31eefa85f74a347534ce193d17
-EBUILD metakit-2.4.9.7.ebuild 1705 RMD160 5c6a081ff114955d962f40d4a0da77487815c06f SHA1 becfc884d079c5c3ff94d87403fbb8945f1127c9 SHA256 43f06f9149ac568c5b14ad0d9023ab8a7b6b17bfe9380fbf013f8aaab6a51446
-MISC ChangeLog 5802 RMD160 c544db649b60eee852976ec8bec3a423e8d3702d SHA1 63b8d2b9a647a9b05083c346dc5eedff414b0030 SHA256 b79b5fc019a30e638defe01f51c911c793603a39b2f0becbf21fe15c0b7727a5
+EBUILD metakit-2.4.9.7.ebuild 1967 RMD160 56ae79feed7c248fc7a4f91d2b63b8118be1762f SHA1 a688ff98441f173582a3dec0eb6c08aad83afe2f SHA256 abb79490f25969bfa75fa27374367e0bd268d3228e19e1ca7adab13ddf597c0b
+MISC ChangeLog 5934 RMD160 7f4b5a1102cf7e8c6ee45773445c184562213575 SHA1 a34c86ede130ea732a3d9ad80f6aaa1833546d9f SHA256 d637b1b263b470723e7f943564d5c066601433dac2be84fe3a553eb89be13c3d
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
diff --git a/dev-db/metakit/metakit-2.4.9.7.ebuild b/dev-db/metakit/metakit-2.4.9.7.ebuild
index 50707577eae9..83cc982a574b 100644
--- a/dev-db/metakit/metakit-2.4.9.7.ebuild
+++ b/dev-db/metakit/metakit-2.4.9.7.ebuild
@@ -1,6 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/metakit-2.4.9.7.ebuild,v 1.5 2010/06/21 19:27:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/metakit-2.4.9.7.ebuild,v 1.6 2010/07/14 13:30:26 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="python? 2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
 
 inherit eutils multilib python
 
@@ -13,28 +18,21 @@ SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~s390 ~sparc ~x86"
 IUSE="python static tcl"
 
-DEPEND=">=sys-apps/sed-4
-	python? ( >=dev-lang/python-2.2.1 )
-	tcl? ( >=dev-lang/tcl-8.3.3-r2 )"
+DEPEND="tcl? ( >=dev-lang/tcl-8.3.3-r2 )"
+RDEPEND="${DEPEND}"
 
 RESTRICT="test"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix all hardcoded python2.5 paths
-	for name in python/scxx/PWOBase.h python/PyHead.h python/PyStorage.cpp; do
-		sed -i -e "s:Python.h:python$(python_get_version)/Python.h:" ${name}
-	done
-	sed -i -e "s:python2.5:python$(python_get_version):" unix/configure
+pkg_setup() {
+	if use python; then
+		python_pkg_setup
+	fi
 }
 
-src_compile() {
+src_configure() {
 	local myconf mycxxflags
-	use python && myconf="--with-python=$(python_get_includedir),$(python_get_sitedir)"
-	use tcl && myconf="${myconf} --with-tcl=/usr/include,/usr/$(get_libdir)"
-	use static && myconf="${myconf} --disable-shared"
+	use tcl && myconf+=" --with-tcl=/usr/include,/usr/$(get_libdir)"
+	use static && myconf+=" --disable-shared"
 	use static || mycxxflags="-fPIC"
 
 	sed -i -e "s:^\(CXXFLAGS = \).*:\1${CXXFLAGS} ${mycxxflags} -I\$(srcdir)/../include:" unix/Makefile.in
@@ -45,16 +43,51 @@ src_compile() {
 		--prefix=/usr \
 		--libdir=/usr/$(get_libdir) \
 		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
+		--mandir=/usr/share/man || die "configure failed"
+}
+
+src_compile() {
+	default
 
-	emake || die
+	if use python; then
+		python_copy_sources
+
+		building() {
+			emake \
+				pyincludedir="$(python_get_includedir)" \
+				python
+		}
+		python_execute_function -s building
+	fi
 }
 
 src_install () {
-	use python && dodir $(python_get_sitedir)
-	make DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	if use python; then
+		installation() {
+			dodir "$(python_get_sitedir)" || return 1
+			emake \
+				DESTDIR="${D}" \
+				pylibdir="$(python_get_sitedir)" \
+				install-python
+		}
+		python_execute_function -s installation
+	fi
 
 	dodoc CHANGES README
 	dohtml Metakit.html
 	dohtml -a html,gif,png,jpg -r doc/*
 }
+
+pkg_postinst() {
+	if use python; then
+		python_mod_optimize metakit.py
+	fi
+}
+
+pkg_postrm() {
+	if use python; then
+		python_mod_cleanup metakit.py
+	fi
+}