Fix dependencies. Support installation for multiple Python ABIs (bug #312195).

Package-Manager: portage-2.2.0_alpha4_p23/cvs/Linux x86_64

3 files changed, 74 insertions, 8 deletions

diff --git a/dev-libs/libxslt/ChangeLog b/dev-libs/libxslt/ChangeLog
index 6fdc05c2e7a2..c26f119d8963 100644
--- a/dev-libs/libxslt/ChangeLog
+++ b/dev-libs/libxslt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libxslt
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/ChangeLog,v 1.203 2010/01/25 19:29:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/ChangeLog,v 1.204 2010/11/14 23:02:20 arfrever Exp $
+
+  14 Nov 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  libxslt-1.1.26.ebuild:
+  Fix dependencies. Support installation for multiple Python ABIs (bug
+  #312195).
 
   25 Jan 2010; Raúl Porcel <armin76@gentoo.org> libxslt-1.1.26.ebuild:
   ia64/m68k/s390/sh/sparc stable wrt #296430
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index 265577ac3ee4..3e5bbaf4c253 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -2,6 +2,6 @@ AUX libxslt-1.1.23-parallel-install.patch 578 RMD160 b944d9886516e676ec60f765701
 AUX libxslt-1.1.26-undefined.patch 616 RMD160 571771b9fd262df841442b4d8b0db1922529a7d3 SHA1 fcc3730b2466e08ac443ea05e0fff5877f9e2624 SHA256 bcd05d121d9857181037ec5d9740fff51640ee2e4a7c5933c9d65f7ee6011062
 AUX libxslt.m4-libxslt-1.1.26.patch 1421 RMD160 f54116e3871afaa97daf5bbb832f2147d395077b SHA1 cdf3aa89083371b45e88c67cc53b9303cd13f2f8 SHA256 c02cd8437064db0921c08e63245c403dad12410d2997715aa7aa36600bfaa895
 DIST libxslt-1.1.26.tar.gz 3401513 RMD160 fc7630352ae5772d25fc8132a373d477fb8d8d5f SHA1 69f74df8228b504a87e2b257c2d5238281c65154 SHA256 55dd52b42861f8a02989d701ef716d6280bfa02971e967c285016f99c66e3db1
-EBUILD libxslt-1.1.26.ebuild 1459 RMD160 034fe3e9b825d264c2764c2eab0726769a261e1b SHA1 117e7e2001b52a1bae43e3a2b629d2870feea6e2 SHA256 8da9d1c86e91cf522b70a1b2959a5d64203ac63d0826167f048e6ff2ae82339c
-MISC ChangeLog 24101 RMD160 f62f3d92948fec90abb40cf3f0f0176a297e4e32 SHA1 d7156e64549ff895465929f92603c8dc200ba8f8 SHA256 59ea480e7d66c11fd18e93ff431f0d497c88b1c77900afffa827d9e7a43204d0
+EBUILD libxslt-1.1.26.ebuild 2488 RMD160 4085294322e4d93883272f9a05e9e618b81587a5 SHA1 93ecc7a2c336638ce2e1717436678576824280b8 SHA256 606a49d6a0f24f71de3c8484e4406fd03f1e7cfa5960d2bacfc082bea581843e
+MISC ChangeLog 24284 RMD160 653746fb8fdbb6a621c65e52f931729c025b677c SHA1 48b62209be8fab43fdb10fe28d9519019717593b SHA256 955fca62fdbd14e84de68afb46fd30bee3da3da9e7d35c9ae10f779d2687469d
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
diff --git a/dev-libs/libxslt/libxslt-1.1.26.ebuild b/dev-libs/libxslt/libxslt-1.1.26.ebuild
index 01665a0d0f58..64c1ee8e909d 100644
--- a/dev-libs/libxslt/libxslt-1.1.26.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.26.ebuild
@@ -1,9 +1,13 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.26.ebuild,v 1.12 2010/01/25 19:29:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.26.ebuild,v 1.13 2010/11/14 23:02:20 arfrever Exp $
 
-EAPI=2
-inherit autotools eutils toolchain-funcs
+EAPI="2"
+PYTHON_DEPEND="python? 2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit autotools eutils python toolchain-funcs
 
 DESCRIPTION="XSLT libraries and tools"
 HOMEPAGE="http://www.xmlsoft.org/"
@@ -15,13 +19,22 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~spar
 IUSE="crypt debug python"
 
 DEPEND=">=dev-libs/libxml2-2.6.27
-	crypt?  ( >=dev-libs/libgcrypt-1.1.42 )
-	python? ( >=dev-lang/python-2.5 )"
+	crypt?  ( >=dev-libs/libgcrypt-1.1.42 )"
+
+pkg_setup() {
+	if use python; then
+		python_pkg_setup
+	fi
+}
 
 src_prepare() {
 	epatch "${FILESDIR}"/libxslt.m4-${P}.patch \
 		"${FILESDIR}"/${PN}-1.1.23-parallel-install.patch \
 		"${FILESDIR}"/${P}-undefined.patch
+
+	# Python bindings are built/tested/installed manually.
+	sed -e "s/@PYTHON_SUBDIR@//" -i Makefile.am || die "sed failed"
+
 	eautoreconf
 	epunt_cxx
 }
@@ -43,9 +56,57 @@ src_configure() {
 		$(use_with debug mem-debug)
 }
 
+src_compile() {
+	default
+
+	if use python; then
+		python_copy_sources python
+		building() {
+			emake PYTHON_INCLUDES="$(python_get_includedir)" \
+				PYTHON_SITE_PACKAGES="$(python_get_sitedir)"
+		}
+		python_execute_function -s --source-dir python building
+	fi
+}
+
+src_test() {
+	default
+
+	if use python; then
+		testing() {
+			emake test
+		}
+		python_execute_function -s --source-dir python testing
+	fi
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die
+
+	if use python; then
+		installation() {
+			emake DESTDIR="${D}" \
+				PYTHON_SITE_PACKAGES="$(python_get_sitedir)" \
+				install
+		}
+		python_execute_function -s --source-dir python installation
+
+		python_clean_installation_image
+	fi
+
 	mv -vf "${D}"/usr/share/doc/${PN}-python-${PV} \
 		"${D}"/usr/share/doc/${PF}/python
 	dodoc AUTHORS ChangeLog FEATURES NEWS README TODO || die
 }
+
+pkg_postinst() {
+	if use python; then
+		python_mod_optimize libxslt.py
+	fi
+}
+
+pkg_postrm() {
+	if use python; then
+		python_mod_cleanup libxslt.py
+	fi
+}