Generalize python code in do_python function, bug 316951

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

diff --git a/sys-libs/cracklib/ChangeLog b/sys-libs/cracklib/ChangeLog
index 5b0633d44d173c87e927ffd9da5b0c302a4857a2..d24fdee1df9485a92169eaba54d7123f0d8a161d 100644 (file)
--- a/sys-libs/cracklib/ChangeLog
+++ b/sys-libs/cracklib/ChangeLog
@@ -1,6 +1,9 @@
 # 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.147 2010/06/05 20:46:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.148 2010/06/07 14:47:34 pva Exp $
+
+  07 Jun 2010; Peter Volkov <pva@gentoo.org> cracklib-2.8.16.ebuild:
+  Generalize python code in do_python function, bug 316951
 
   05 Jun 2010; Mike Frysinger <vapier@gentoo.org> cracklib-2.8.15.ebuild,
   +files/cracklib-2.8.15-no-nls.patch, cracklib-2.8.16.ebuild:

diff --git a/sys-libs/cracklib/Manifest b/sys-libs/cracklib/Manifest
index 21e8b0e41cadc1b591454f320d82c3f06e8c6957..399810062e1a93e03e03479b860e76316d64dab6 100644 (file)
--- a/sys-libs/cracklib/Manifest
+++ b/sys-libs/cracklib/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX cracklib-2.8.13-python-linkage.patch 508 RMD160 fc6123093212c60c0d6de98a0b7390b52274ed28 SHA1 3514a018563e0848cdd9aa2625b7e003e875af8e SHA256 0958a6ce7ff7b89bb374281b0bd416af275d9f052d83d4fac493bee22aaa51f0
 AUX cracklib-2.8.15-no-nls.patch 304 RMD160 741e4972d38f8a59f0e73da9f4f202e1b1a19b36 SHA1 83496378109bc31f6581bf6fb3532e31f4f07d86 SHA256 140c4d76278c84b031a875a7e545e630c3ec2a086e73f84d424e8fb9a84ad1e2
 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 1766 RMD160 7f05f14723c2d1f38c1561cdab987f9c72c8a549 SHA1 e598cd2836923f35cbb47a9d1e14932785e4c477 SHA256 b77c02b91b3e60c3f4b4da12f09bed8a731e3a3ac27d12534ec9825034ca8f44
-EBUILD cracklib-2.8.16.ebuild 2208 RMD160 e30dd8a98e85737b7949e08e2d0e5bfb7e626f3e SHA1 f8ab6a6e18c9d5d32854ccbdc372741dea19fe59 SHA256 2e7232ad532cb4ba6954bdcaa9e6e4e78afbd257fcc41c35b9cb4e499e02d8d0
-MISC ChangeLog 18809 RMD160 c39042f1e24eb0ebcb4c412a49497b03054c1671 SHA1 9ab5831c7e0bbb078a78e5513613d5aa4184d99e SHA256 ea995a5f66315279d9472513468cf921327a70502f31d5db774d298e930a7ab2
+EBUILD cracklib-2.8.16.ebuild 2091 RMD160 382c366c5bb78fcd1e144a502e4ec651add9d8a9 SHA1 e4872218290f2e78b8e48a528d28c56f7f07bb1a SHA256 adae73e375b296d1594c7697671df0a5d6b3ccaf62a2ef9185a6de5fa96de7e8
+MISC ChangeLog 18935 RMD160 7346b5b90d72cddf917c12bdba6c20f96e81060d SHA1 ca1124137f5f9d83d1aded8578b02a59e96be9e6 SHA256 e10e06de797b1a17bc417a05d595e6758e49db913626ff86dee6fd1d71536362
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iF4EAREIAAYFAkwKt6oACgkQTwhj9JtAlp50QgEAlPAQx0SQPRCxX1p5anwdc/yl
-C/gxqFRSLeWcNAlFE3EA/ip6LY3XBCAd0gMcM/pgYDj5DTAOMQHhH4Z8jRj7/0Ep
-=lId5
------END PGP SIGNATURE-----

diff --git a/sys-libs/cracklib/cracklib-2.8.16.ebuild b/sys-libs/cracklib/cracklib-2.8.16.ebuild
index 15a9368b74d38bc4fc3b3e885b0837e182fd4249..3d21b1d3e6b4fdacc11e2b8b9aa7232e807d1ad7 100644 (file)
--- a/sys-libs/cracklib/cracklib-2.8.16.ebuild
+++ b/sys-libs/cracklib/cracklib-2.8.16.ebuild
@@ -1,6 +1,6 @@
 # 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.4 2010/06/05 20:46:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.8.16.ebuild,v 1.5 2010/06/07 14:47:34 pva Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -26,6 +26,11 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}
 
 PYTHON_MODNAME="cracklib.py"
+do_python() {
+       pushd python > /dev/null || die
+       distutils_src_${EBUILD_PHASE}
+       popd > /dev/null
+}
 
 pkg_setup() {
        # workaround #195017
@@ -41,12 +46,7 @@ pkg_setup() {
 src_prepare() {
        epatch "${FILESDIR}"/${PN}-2.8.15-no-nls.patch
        elibtoolize #269003
-
-       if use python; then
-               pushd python > /dev/null
-               distutils_src_prepare
-               popd > /dev/null
-       fi
+       use python && do_python
 }
 
 src_configure() {
@@ -58,23 +58,14 @@ src_configure() {
 
 src_compile() {
        default
-
-       if use python; then
-               pushd python > /dev/null
-               distutils_src_compile
-               popd > /dev/null
-       fi
+       use python && do_python
 }
 
 src_install() {
        emake DESTDIR="${D}" install || die "emake install failed"
        rm -r "${ED}"/usr/share/cracklib
 
-       if use python; then
-               pushd python > /dev/null
-               distutils_src_install
-               popd > /dev/null
-       fi
+       use python && do_python
 
        # move shared libs to /
        gen_usr_ldscript -a crack