Restored latest stable version

Package-Manager: portage-2.2.20/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x981CA6FC

3 files changed, 127 insertions, 15 deletions

diff --git a/sys-libs/cracklib/ChangeLog b/sys-libs/cracklib/ChangeLog
index 999e52ccb616..65ef2cbc0001 100644
--- a/sys-libs/cracklib/ChangeLog
+++ b/sys-libs/cracklib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/cracklib
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.212 2015/07/14 08:32:18 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.213 2015/07/14 12:04:57 polynomial-c Exp $
+
+  14 Jul 2015; Lars Wendler <polynomial-c@gentoo.org>
+  +cracklib-2.9.1-r1.ebuild:
+  Restored latest stable version.
 
 *cracklib-2.9.5 (14 Jul 2015)
 
diff --git a/sys-libs/cracklib/Manifest b/sys-libs/cracklib/Manifest
index c7a4e066f9ef..7d09e5ac668f 100644
--- a/sys-libs/cracklib/Manifest
+++ b/sys-libs/cracklib/Manifest
@@ -3,27 +3,29 @@ Hash: SHA512
 
 AUX cracklib-2.9.1-setup.py-srcdir.patch 1097 SHA256 f3b2cdd7c9db3d30e8696ed1620f6fa66dcf439292a2e8433d921b8f858e5ca6 SHA512 31784d3fcf8024bc61084a83adc38e9d91eb070ac8831307d50159a3576a1d159548c467f57c137434e52115693066bda6f3121db365ddb97395b331da2ba9e4 WHIRLPOOL 5be326e50c77938b6ff97457c5c45759021c202ab6b1b2900ac8d9199e9de4a855147cbd10f5a1421dab90dcf1935e3b8aaee195d789200cf1eb32c02c7e5ea0
 DIST cracklib-2.8.22.tar.gz 631796 SHA256 feaff49bfb513ec10b2618c00d2f7f60776ba93fcc5fa22dd3479dd9cad9f770 SHA512 7ec9f93d1bb8132dc143e320373c0ffab2c3e4a9da4e449ce7c6e9b3aada5a30933d3bccbca4d2ea0ef5e72ef5593427756e06c03a97940edf74bac37f2fd08b WHIRLPOOL 186720e1cb5c9392343f9c8e569e35dc5c7a5be5d2067770555423667d4dc8e543e68c4dd7d4a3e5fac4a42b5bca66f18bc723441dea64d04e8f135cecc3029a
+DIST cracklib-2.9.1.tar.gz 635123 SHA256 408905c2539a97dc8cbbb6d7cd2046cb5647a345b4bda399220d9471be16d156 SHA512 19b1d38dfcfce98893e6a63e4387a8da9da1eae109d9d84e0f84adabc0ee25fac930576011fb60de007f59f7dea2ee0bb01fd6d8607d4854b7de006ec07a4b2a WHIRLPOOL ff3a71cb81535dde5ad63f51f9c8d5807c91ff5394e8336bac69708357804b8efc7816b2cfe32529777f18e9ba50c22af054b8d5ccff3d4b837a92d85b64dc80
 DIST cracklib-2.9.4.tar.gz 622478 SHA256 f2a866b4b9808344228ea6d68b69e3ba9a8a99210e23dfd718d4b95c60be8958 SHA512 4c94af41d5734e737576221620236951c083f45a7a8061d22ec174c283b91bf64b781ee8dddb91f459f5008ca70f1adfe59c311f082a7a7fecd5214705512a63 WHIRLPOOL 2d9fe10dbc50a45ec3e295e7c5aee3e327f1d7728811c33693bafcffad833e953a4425c4aac7c2556b75aa84a76b1a81bbfd2210d47555086cc4ddd5fd1f7eee
 DIST cracklib-2.9.5.tar.gz 622499 SHA256 59ab0138bc8cf90cccb8509b6969a024d5e58d2d02bcbdccbb9ba9b88be3fa33 SHA512 2362419deb9024b8d761f8349210a25c3182568bb4a4ecf59b1f221ad0c9bd6049fb26eafe853d55b50dcca5f66c695d58b432c70d14054db704ca28a68aa2e2 WHIRLPOOL 72210f50de508fcc70566aabce303c0d1cb09da71385808a2c50808bf8a894b16210633b492f6cd702af51024da0a5850a36e9b5a7542a1313b93bd350f53c35
 EBUILD cracklib-2.8.22.ebuild 2449 SHA256 73c22a3e2f7e488fbbcafb1a96843050675e65d292ef9b414f0302f2b6300c3c SHA512 4371dff09c6c9c2d70794a2f9cad6297100828d4dce6581126ead6edbd67a8ca76548ae9c60f0d0b2017e348f9d3712411a5a52be709fab1fb14f3dc28dc5a48 WHIRLPOOL 63fb061f04a8aa619aec3fda87f47014047662fead1ad89552d6a12cac278c2cad5a331620e08d7357bb2259f1186d97b93851d3f567161a316527be9ebc993f
+EBUILD cracklib-2.9.1-r1.ebuild 2685 SHA256 0aa09dbe296b63615070d1443123a9192f81ac13f791a23c1640c1cd788e45e9 SHA512 8eb489aadd9c8bed2d334f9c6d4e1052a3bd23eb8848bceda647fa37c045ab9f5dbc260e4a362c5d81f9fdd270443aec9e17ce5fc87361cf502181d2219b1611 WHIRLPOOL c25d0533758f31d8489e008865a0d0d4d94347b6025f3abd7e5d9ca1389df4b05910bac504b9a58d9f73ea89a39544c397c143f808cc71c0fd8fea0b830e25c6
 EBUILD cracklib-2.9.4.ebuild 2635 SHA256 994f0864958045dcdf9050f276f80e4bce9ec9b45d5faf6eb81886042e3e7988 SHA512 480bb7a15c4cf21428cc0372430a1c03b184040547a45ba9bda16f9780b1e5d6a4985047cfdfa8ce3968fab6a0f6c4e116d57791073872ff4d46b243e90b74ab WHIRLPOOL c8371c21f21f4e136ed1791b43a2fdb8373b298f95c38d621446653a672a925b0ba61350ad707472c21b88b9c8a84a12dbdfcc0742f46f3ece4b111baa6e0216
 EBUILD cracklib-2.9.5.ebuild 2635 SHA256 81153a4928b9c3318179ecd2cd5f7a7ae4ee21f84be6ceefd2dda593b9e3858a SHA512 2108769bcec9afd073d64307aeeda5bfe4eff9b73cf2b7a4bb7ce06cc83cd1dc9608aa5f5701ea93b59f239403377ec77f516e893e667f641a3b262fef568261 WHIRLPOOL c3341b1e6fae88f1d1d5a83df79eeb86803513e7f5e07d624eee83b9f303f60641f42e8adc67412da35160197c28bd9f5f65224793ce4e9c8abc0698c115a2f3
-MISC ChangeLog 27317 SHA256 00df86ef6916020346a1a62bdd956ea815019aadbbf1c4b5345e1b8b21450006 SHA512 08fc37941f080164d342de87fe5a165ef58edc5c09d0a409ecded311316eeaaaea434f3651b07d09c98853ed7d965a4be90c312ac14d4ebd920f5f4971ce6b10 WHIRLPOOL 6e052a0dbb8f2456da709dcc48ace398fbde567f22de6d1b49eecb7a541f326635a5be3cfb7b4a8ab9a03fa657b975a8a282d0eabf4a79ed2326c0abcd0fc64f
+MISC ChangeLog 27435 SHA256 f4e21158fda642097c81941e1bfbd1ca009335d73a21fefe18e41d322dcafa6e SHA512 73625d98457b1e96cc9b77585a457a3375b34fce199cac90db905616013934ea4edbf05a2d6f1419dba58c3c9e158e900d652c39a8eb7583b91678c293da0592 WHIRLPOOL 7ee06f55d10d379fd01caef49525c803413a551e5dc4573fa01d652b4152c6c4eaf486781fc71ed5e76fb2686e00bc98435a7b8538ec5c4899d4d0d32a3a326c
 MISC metadata.xml 243 SHA256 7750bd19ec6466d4b334778fbcb32b31297c7cbca1c78b8ee5c5b0fa2d5b9b0e SHA512 5bf4063c5074b366451fc68b347e0f68da98d3096f67d38505d58fc4dd21f10582c1ea28c7cbd1c221d8a7ef0ba5c410b945d86b2dee1e0fe920977cbef5fc56 WHIRLPOOL 1055d33bcd9439c713cd44eb5c4dd42e7850e8808cdb873da1c7c0482ee85d6abfd6eef676710604203c7ed74ce4abdd1b6d81659885812e2fb6c696dfc78283
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCgAGBQJVpMkTAAoJEPiazRVxLXTFGaEP/jb5IEsj/H9bnp4Kx2MHKgSZ
-XDgPirAAAus3bqVc7qtmPSThM9KvXoSOdSrOMW8PBxrt+BeBWfnGL7xO4EvCr5eA
-GNanJNDkN/VAs1VVA8i/BBihve6pS/mdnCz57Lv/pBgC61fhOpzRrbKMQz50cTSv
-9bn2utoSQIC3WwdpRFQZk2mutlxrS9A3DnDWChu1766G0Ub4wvuZ7GUntAEfltlX
-FQ1REH1etrDWHScX4XotA4R96OV70GD7jRJi96vAzL7qy1X3NLiM8K2JWmvweKIa
-R0CVAefCtEApOt5iF/1WkfLlDva3+hc+7gv8Qt3a5tGS8qRtf3Vg/2Vozgp0ZFKb
-1MA02QxeGkjyGEIuq+brYr4M44IO7+djQ+IfPqeDU2LBa3WTAn32d+j3Ju5o6ftR
-s6d5nJ1lXGQ1BibMkaih+hCNtsL+TW2NsC8nQC60wvxrkdDA8/dOOgbR3G7g0EvG
-tJouPRj6qdOocBXs88Q2tLIjIE1y+S98P+LkmA4nJsbi44/8vdGopbrR0ITDp5j1
-N4SRUL16iTUp8BPJQIyF92ETQ8IyflOcDkfC1wqJ23uYuCpDo02o25HLWwpYwYMO
-pnRgE0ZdlIQIX9+mGb6T4lSoxzHGZq86jWT8SsHtNoAD4kx5vtO5GGJBXI9RXPuR
-XZ2oe46Gp6xXyFTA+hk3
-=7aC2
+iQIcBAEBCgAGBQJVpPrqAAoJEPiazRVxLXTFMpYP/iqVFryiWSe4Ti502Y9Wk6R6
+LKo4ostyF5JTRqCk2Slo9owVfeFAxAjCKnDqDpGTL1FsWeSicunOyY5B4qAY7EBv
+TAs21uQ/vnxwL/kcfZBJV1NqUprNAhlBCKb8VsymI1awRqoTWnwEVWwIkgwnGoM3
+U6kYg/yx9VCXdv3zTt9GwKwaHdzrK/Y6Dxd7owXWtHE2n3FAcfEZA5bLmy+VO2KC
+ha2Is4Hyx+84bK3tL5pzDi4KmogHzFnOj3RT2KmkeN0jeX79uBpaH5yrZM6Bsdty
+W2Pmwqa5scuYH59FA4ZV5pA7flACiPswS4PSFdn+DIdQ+qkEWcs/Gy6l+L5KAhCO
+ToW+yCHK48sFEeRtuXiolEKaCPo3FK91xcNDLzb67rKYGxYtnAcJzSuqMg/qWh8i
+DySsNTAmCTnuJVPHCwLkO0TKnE7l9Q686O8VkvoJzgzVmpP1wGDJrmYV5pnwaqL7
+/OfHLzLXtmkNyGvAzMo/Fmg8ZwQ3M8/uX76w0OEwidNiuR4errPCUeWx4YeA2Rf+
+O+7aNM88VDBEqdvTp6hZaMzQlYv1eM8yTaC7QLAkGKs4V7TH9vwZdMpGMBfRSXH6
+L8I4AcxzD7r2nWisqdVOc+e3Sb5mqjS0I65VQK9AIkJtJAFsb29r1Ud1SJMBlhO7
+RWJHQB2t/CIjjAumr6xf
+=RnKV
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/cracklib/cracklib-2.9.1-r1.ebuild b/sys-libs/cracklib/cracklib-2.9.1-r1.ebuild
new file mode 100644
index 000000000000..0e52267383c4
--- /dev/null
+++ b/sys-libs/cracklib/cracklib-2.9.1-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.9.1-r1.ebuild,v 1.18 2015/07/14 12:04:57 polynomial-c Exp $
+
+EAPI="4"
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
+
+inherit eutils distutils-r1 libtool multilib-minimal toolchain-funcs
+
+MY_P=${P/_}
+DESCRIPTION="Password Checking Library"
+HOMEPAGE="http://sourceforge.net/projects/cracklib"
+SRC_URI="mirror://sourceforge/cracklib/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
+IUSE="nls python static-libs test zlib"
+
+RDEPEND="zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	)"
+RDEPEND="${RDEPEND}
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r6
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+do_python() {
+	multilib_is_native_abi || return 0
+	use python || return 0
+	pushd python > /dev/null || die
+	distutils-r1_src_${EBUILD_PHASE}
+	popd > /dev/null
+}
+
+pkg_setup() {
+	# workaround #195017
+	if has unmerge-orphans ${FEATURES} && has_version "<${CATEGORY}/${PN}-2.8.10" ; then
+		eerror "Upgrade path is broken with FEATURES=unmerge-orphans"
+		eerror "Please run: FEATURES=-unmerge-orphans emerge cracklib"
+		die "Please run: FEATURES=-unmerge-orphans emerge cracklib"
+	fi
+}
+
+src_prepare() {
+	elibtoolize #269003
+	epatch "${FILESDIR}"/cracklib-2.9.1-setup.py-srcdir.patch
+	do_python
+}
+
+multilib_src_configure() {
+	export ac_cv_header_zlib_h=$(usex zlib)
+	export ac_cv_search_gzopen=$(usex zlib -lz no)
+	# use /usr/lib so that the dictionary is shared between ABIs
+	ECONF_SOURCE=${S} \
+	econf \
+		--with-default-dict='/usr/lib/cracklib_dict' \
+		--without-python \
+		$(use_enable nls) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_compile() {
+	default
+	do_python
+}
+
+multilib_src_test() {
+	do_python
+}
+
+python_test() {
+	nosetests -w "${S}"/python || die "Tests fail with ${EPYTHON}"
+}
+
+multilib_src_install() {
+	default
+	# move shared libs to /
+	multilib_is_native_abi && gen_usr_ldscript -a crack
+
+	do_python
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+	rm -r "${ED}"/usr/share/cracklib
+
+	insinto /usr/share/dict
+	doins dicts/cracklib-small || die
+}
+
+pkg_postinst() {
+	if [[ ${ROOT} == "/" ]] ; then
+		ebegin "Regenerating cracklib dictionary"
+		create-cracklib-dict "${EPREFIX}"/usr/share/dict/* > /dev/null
+		eend $?
+	fi
+}