Support installation for multiple Python ABIs (bug #316951).

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

3 files changed, 54 insertions, 29 deletions

diff --git a/sys-libs/cracklib/ChangeLog b/sys-libs/cracklib/ChangeLog
index 0327620a6a99..a60f1679dcb2 100644
--- a/sys-libs/cracklib/ChangeLog
+++ b/sys-libs/cracklib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/cracklib
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.145 2010/04/30 13:02:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.146 2010/06/03 20:13:55 arfrever Exp $
+
+  03 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  cracklib-2.8.16.ebuild:
+  Support installation for multiple Python ABIs (bug #316951).
 
 *cracklib-2.8.16 (30 Apr 2010)
 
diff --git a/sys-libs/cracklib/Manifest b/sys-libs/cracklib/Manifest
index fe607308668e..d97904eeef8c 100644
--- a/sys-libs/cracklib/Manifest
+++ b/sys-libs/cracklib/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX cracklib-2.8.13-python-linkage.patch 508 RMD160 fc6123093212c60c0d6de98a0b7390b52274ed28 SHA1 3514a018563e0848cdd9aa2625b7e003e875af8e SHA256 0958a6ce7ff7b89bb374281b0bd416af275d9f052d83d4fac493bee22aaa51f0
 DIST cracklib-2.8.15.tar.gz 615849 RMD160 835425d5266ec0eb909430e755cbcb11a6074e9c SHA1 2535a49da92bfece48639d23ada6964d122cc9ac SHA256 8249accbe09c51397f2d9ebbf2ccaccb07ac35803ca37096b01f25a9291899e5
 DIST cracklib-2.8.16.tar.gz 618120 RMD160 b2032ebe4c476fe273a1daab13764f62520c14c0 SHA1 21c181ed22ab7ab1e178c09fa251c9615f9f336c SHA256 fc3aa492c2879e304bae30955ab8b37d6865d26f79d0493b8c36a9bc1b6475bc
 EBUILD cracklib-2.8.15.ebuild 1726 RMD160 828a5e9219bdbb88e23f880f117576880212cabb SHA1 582807bb5409926e54e9b75a6dbc062638d40db6 SHA256 da5803d992a0d9a93751d182ed373d03e61ccc7f5b0e36e95d72d5d4dfb591cf
-EBUILD cracklib-2.8.16.ebuild 1800 RMD160 fa10cee4d55b49198109a844b012c4ad7e486fde SHA1 b90fbff5b630e08199107390fe11103e061295b8 SHA256 c8ba042596785910b214f162ef0e50de5b2cd49c56b3d39d72664a989834392e
-MISC ChangeLog 18456 RMD160 c1541008b06627729d203ff61a659c5d83f90ca0 SHA1 08fd053499ac1de5a4adceeaeef7591dd84d19dd SHA256 0df158634ec789ab7f89e571ea08bb69c5c2cc3f3905e59459172bac9a75be14
+EBUILD cracklib-2.8.16.ebuild 2154 RMD160 9d7636e7bf1e782763e87dc3c90f4603fe84e92a SHA1 30a4c72abbe9fc90f3dc10eac37194b2d0455424 SHA256 f3a85deebb7f35310a3c2853d2c193df5537be23e3593ae501edadcf68f94ece
+MISC ChangeLog 18621 RMD160 7c348b9a613a82f4be8e67361dc71a522adb8989 SHA1 b66028cc46afe7f90bcdd93cb5f5ab03a40fccc2 SHA256 f8749855eebe762beb5b531a50763b8d885104ce59c1ed08b2b862164e5fba2e
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iF4EAREIAAYFAkva13oACgkQTwhj9JtAlp6CNwD+LOQ7Wu5MkKvJYUVz5nnjOcBh
-0e0soj71HpMfUcBR/IgBAJ5nJNABfu3YvfYv9zWTGgyrYLm8VeiA3N8I0S71VlsX
-=En8z
------END PGP SIGNATURE-----
diff --git a/sys-libs/cracklib/cracklib-2.8.16.ebuild b/sys-libs/cracklib/cracklib-2.8.16.ebuild
index 43a8899081cc..650240569354 100644
--- a/sys-libs/cracklib/cracklib-2.8.16.ebuild
+++ b/sys-libs/cracklib/cracklib-2.8.16.ebuild
@@ -1,8 +1,13 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.8.16.ebuild,v 1.1 2010/04/30 13:02:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.8.16.ebuild,v 1.2 2010/06/03 20:13:55 arfrever Exp $
 
-inherit eutils toolchain-funcs multilib libtool
+EAPI="3"
+PYTHON_DEPEND="python? 2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils libtool toolchain-funcs
 
 MY_P=${P/_}
 DESCRIPTION="Password Checking Library"
@@ -14,10 +19,14 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="nls python"
 
-DEPEND="python? ( <dev-lang/python-3 )"
+DEPEND="sys-libs/zlib
+	python? ( dev-python/setuptools )"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
+PYTHON_MODNAME="cracklib.py"
+
 pkg_setup() {
 	# workaround #195017
 	if has unmerge-orphans ${FEATURES} && has_version "<${CATEGORY}/${PN}-2.8.10" ; then
@@ -25,30 +34,46 @@ pkg_setup() {
 		eerror "Please run: FEATURES=-unmerge-orphans emerge cracklib"
 		die "Please run: FEATURES=-unmerge-orphans emerge cracklib"
 	fi
+
+	use python && python_pkg_setup
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-2.8.13-python-linkage.patch #246747
-	sed -i '/PYTHON/s:\(print\) \([^"]*\):\1(\2):' configure #302908
+src_prepare() {
 	elibtoolize #269003
+
+	if use python; then
+		pushd python > /dev/null
+		distutils_src_prepare
+		popd > /dev/null
+	fi
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		--with-default-dict='$(libdir)/cracklib_dict' \
-		$(use_enable nls) \
-		$(use_with python) \
-		|| die
-	emake || die
+		--without-python \
+		$(use_enable nls)
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		pushd python > /dev/null
+		distutils_src_compile
+		popd > /dev/null
+	fi
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	rm -r "${D}"/usr/share/cracklib
+	emake DESTDIR="${D}" install || die "emake install failed"
+	rm -r "${ED}"/usr/share/cracklib
 
-	find "${D}" -name '_cracklibmodule.*a' -exec rm {} + #316495
+	if use python; then
+		pushd python > /dev/null
+		distutils_src_install
+		popd > /dev/null
+	fi
 
 	# move shared libs to /
 	gen_usr_ldscript -a crack
@@ -65,4 +90,10 @@ pkg_postinst() {
 		create-cracklib-dict /usr/share/dict/* > /dev/null
 		eend $?
 	fi
+
+	use python && distutils_pkg_postinst
+}
+
+pkg_postrm() {
+	use python && distutils_pkg_postrm
 }