diff options
| -rw-r--r-- | sys-libs/cracklib/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-libs/cracklib/cracklib-2.8.19.ebuild | 32 |
2 files changed, 25 insertions, 12 deletions
diff --git a/sys-libs/cracklib/ChangeLog b/sys-libs/cracklib/ChangeLog index c599a8c9b6e8..afce7fae089c 100644 --- a/sys-libs/cracklib/ChangeLog +++ b/sys-libs/cracklib/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-libs/cracklib # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.163 2012/05/18 18:24:05 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.164 2012/05/18 20:19:49 vapier Exp $ + + 18 May 2012; Mike Frysinger <vapier@gentoo.org> cracklib-2.8.19.ebuild: + Make zlib optional. *cracklib-2.8.19 (18 May 2012) diff --git a/sys-libs/cracklib/cracklib-2.8.19.ebuild b/sys-libs/cracklib/cracklib-2.8.19.ebuild index 6a0ee8827ed9..968123b49eee 100644 --- a/sys-libs/cracklib/cracklib-2.8.19.ebuild +++ b/sys-libs/cracklib/cracklib-2.8.19.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.8.19.ebuild,v 1.1 2012/05/18 18:24:05 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.8.19.ebuild,v 1.2 2012/05/18 20:19:49 vapier Exp $ EAPI="3" PYTHON_DEPEND="python? 2" @@ -17,9 +17,9 @@ SRC_URI="mirror://sourceforge/cracklib/${MY_P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="nls python static-libs" +IUSE="nls python static-libs zlib" -RDEPEND="sys-libs/zlib" +RDEPEND="zlib? ( sys-libs/zlib )" DEPEND="${RDEPEND} python? ( dev-python/setuptools )" @@ -27,9 +27,17 @@ S=${WORKDIR}/${MY_P} PYTHON_MODNAME="cracklib.py" do_python() { - pushd python > /dev/null || die - distutils_src_${EBUILD_PHASE} - popd > /dev/null + use python || return 0 + case ${EBUILD_PHASE} in + prepare|configure|compile|install) + pushd python > /dev/null || die + distutils_src_${EBUILD_PHASE} + popd > /dev/null + ;; + *) + distutils_pkg_${EBUILD_PHASE} + ;; + esac } pkg_setup() { @@ -45,10 +53,12 @@ pkg_setup() { src_prepare() { elibtoolize #269003 - use python && do_python + do_python } src_configure() { + export ac_cv_header_zlib_h=$(usex zlib) + export ac_cv_search_gzopen=$(usex zlib -lz no) econf \ --with-default-dict='$(libdir)/cracklib_dict' \ --without-python \ @@ -58,7 +68,7 @@ src_configure() { src_compile() { default - use python && do_python + do_python } src_install() { @@ -66,7 +76,7 @@ src_install() { use static-libs || find "${ED}"/usr -name libcrack.la -delete rm -r "${ED}"/usr/share/cracklib - use python && do_python + do_python # move shared libs to / gen_usr_ldscript -a crack @@ -84,9 +94,9 @@ pkg_postinst() { eend $? fi - use python && distutils_pkg_postinst + do_python } pkg_postrm() { - use python && distutils_pkg_postrm + do_python } |