Make zlib optional.

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

3 files changed, 40 insertions, 27 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/Manifest b/sys-libs/cracklib/Manifest
index 36c37b3f9b58..f453154ac569 100644
--- a/sys-libs/cracklib/Manifest
+++ b/sys-libs/cracklib/Manifest
@@ -10,23 +10,23 @@ DIST cracklib-2.8.19.tar.gz 611602 RMD160 ad2e26fbb52efee4a5b7e875183412b2b6211a
 EBUILD cracklib-2.8.16.ebuild 2144 RMD160 af5d54a6b28aa38c7106913d446da647c681752f SHA1 be6eac4135c9c12062a2ba1d86aea19660e484ff SHA256 44c66d27c402b21bb8073b70d7d33ffb8b83368516c9721cbb8e5cb95b0b79a1
 EBUILD cracklib-2.8.18-r1.ebuild 2192 RMD160 50f1bcecb6e644f62859e1feebec3acd7dc2b72d SHA1 08f9d6406fb7c9512d7bf8d4bf6c9996839bef00 SHA256 8d579f9f0a9651b4d70162f422cb7e65d0041aa94515c48a9e4e199c502c0283
 EBUILD cracklib-2.8.18.ebuild 2067 RMD160 22105a6c6f636ed5d0897e3ed98338fa31420135 SHA1 d116f7263131ecabc975ab3e184b4429f74933f8 SHA256 b54871c715af6a5a52d588a3622203b2953b04baaa08fc5a5501f1eaf91a7828
-EBUILD cracklib-2.8.19.ebuild 2143 RMD160 c06e6303f6b4b2e9a9b95acc7c5c230dd9269f07 SHA1 c661da2e508858a609a0697e931ad63d999c1380 SHA256 3ca6ef8de97de5014ceee86ed7bd8f7d0b4937bd92aea0b249ca0d0e7c56a68c
-MISC ChangeLog 20991 RMD160 512ed1e91a74ce34b0e77f9932ac9ca8332a74ab SHA1 6bfdf14d35bad248c3124f9958703d10c61b538a SHA256 89770dc15221b0f1d5ac0e06257307fb5f846f54b43cb4a64b7704df730e292a
+EBUILD cracklib-2.8.19.ebuild 2293 RMD160 a1bc2189d3d2a4e3fd8e1ce49531c90211cc9978 SHA1 ef956512541baa31d5aab3c8fa5eb3211c095d59 SHA256 776f2020c72d900c0f5b007008a017077632127881ba0289b9bc39bc7be0fbf4
+MISC ChangeLog 21088 RMD160 2e8e9e5ee933c559215046afcaa2b230baecc271 SHA1 6a7286a4450f92c0d9aaf8a032d4eab0f41e5c4e SHA256 a256168cd4a75f67bee37086224f6451e46f48e7ca146273a9c929f9d3ff4032
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPtpPwAAoJELEHsLL7fEFW/7gQAL5psup1xWMFaTpTNchpjixV
-grBfDdYHj0m9vvC+TpuKs9HyQdn7egu1PhJ+ynFeG2jKFBzYpvpioa4Ou4OtpwLo
-8in9imm4HcvP2q/z8xD1//tFpZhkgOW4BfQi7XQlDPE7ZrgPcojs25empGdWiZqb
-sKDVQ6ysScMKYDdAeAEtF2LRUmvnEJxt6nfE8mRkkc6URx17JV0FU8zmy4rwbH0Y
-nbG59oq2lCD+vXXYxIQTizwzqMNJn1qv5JO67H+zwD7/2cEq8Gwsho22XW+79Dv2
-TATSLEZwUEF6i2Q3aV3uZSxg+1oyUneszIIQoBLPlhQ8YgsvUvBKh06Xg+9oMRFp
-3ccQR4Z7zwHNaKomLhjtvOKdhwC9j7QwV+0SOi44C2BypXtZiFpVhjCLGsJrL2Xs
-8awLIqEl7m3YP5PGgsVCo1RhdWFVrpLGUlSnAEyCm4+f0ONYx/MdWKfX+Cq8uNmm
-EU4GqALZUZ+Tow/tBxC2fSMQ5BNbHmIuMJngYxDp0/gxtrvssJ7yaW9hpOvCsiNz
-q4Eo/vhG5h79WuVZ0utn4zAsKAZITYqPN6IUMWtShD8cBKx1N5ugpn1CgoZbWWYp
-S4yh87nBkV3dkMKCLZq+ECsr6F9PfR30fxkSEguLMBhEVKBjE2nz5N6ZqLDtvpAt
-hC2r5mHg85JTgtz7lDMs
-=oI23
+iQIcBAEBAgAGBQJPtq8QAAoJELEHsLL7fEFW+30P/3t3hL6pAdP4dlWYycOWJTvY
+MjliPXFoJxuTELTl9bmdNx0M6ZQpMy1VaZYqkw6QgM6uD4g63OQ7KMcTNuIEjnyf
+sPV/B+lvmKFg32EqlDlGEyw8LfDMtWKxq82waK6Z0+O9ekO4cW7FOLCjzdynkF11
+qNQYt8o/YWHUCcIXwSSC2ecrqnojTPgtsrJhrvozkJ1Qa8UJKAzkqtQq1Q54JKSW
+Up6dCw1uK6I7aoLiBuxphHTDpOKUt0C7cO2yVJg1o2xd75EPfMrifevRfAjJYCc/
+9qR6GObMr8RCkmFMfnxk3U2ayzWaEy+5qMCmDgynivAfHAizwzWzc573Q1Wm8XJI
+iOqGswhfRhydhJEctG8vnbl2VyNTw+MJHbMkbbXEL5EVRfidRsAJFCK8zff1oQ72
+sXDeyfOWQL8Q5BwGGZw5iD4J3To0fhP40l7oQu2REr+Gq7yx2083VRl99dQ0jm4a
+v32SgsCSTIp5osZLmNvFJsQXOyyB8yAukF+1qIGa2bFC0enyAFbspY9z+uTPaUo6
+U5r55FLtya83T2M7MTze1U7tbnia2E+RTZ/8Eg9guoe7S11MyN8q+pFvLNMHwAcy
+vQCV4y+1kRvYoVp8van5AE9d7S/QNUpgvAxZwKF7k1hpi+H3VPb16/UTdBVe0KjA
+8sxPjSSGGEq0L3yJOJUt
+=iJfo
 -----END PGP SIGNATURE-----
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
 }