diff options
| -rw-r--r-- | sys-libs/cracklib/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-libs/cracklib/cracklib-2.8.16.ebuild | 27 |
2 files changed, 13 insertions, 19 deletions
diff --git a/sys-libs/cracklib/ChangeLog b/sys-libs/cracklib/ChangeLog index 5b0633d44d17..d24fdee1df94 100644 --- 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/cracklib-2.8.16.ebuild b/sys-libs/cracklib/cracklib-2.8.16.ebuild index 15a9368b74d3..3d21b1d3e6b4 100644 --- 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 |