Enable multilib support, as a dependency of PAM.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 131 insertions, 15 deletions

diff --git a/sys-libs/cracklib/ChangeLog b/sys-libs/cracklib/ChangeLog
index ecb907fb8236..cfa3981e125a 100644
--- a/sys-libs/cracklib/ChangeLog
+++ b/sys-libs/cracklib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/cracklib
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.190 2014/05/17 13:58:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.191 2014/05/29 18:42:41 mgorny Exp $
+
+*cracklib-2.9.1-r1 (29 May 2014)
+
+  29 May 2014; Michał Górny <mgorny@gentoo.org> +cracklib-2.9.1-r1.ebuild:
+  Enable multilib support, as a dependency of PAM.
 
   17 May 2014; Agostino Sarubbo <ago@gentoo.org> cracklib-2.9.1.ebuild:
   Stable for alpha, wrt bug #503648
diff --git a/sys-libs/cracklib/Manifest b/sys-libs/cracklib/Manifest
index 2c576b38b1a4..52220b24ee87 100644
--- a/sys-libs/cracklib/Manifest
+++ b/sys-libs/cracklib/Manifest
@@ -17,23 +17,26 @@ EBUILD cracklib-2.8.19.ebuild 2437 SHA256 aad7d6d3d514279b026eb8bc57defe761aec4c
 EBUILD cracklib-2.8.22.ebuild 2449 SHA256 73c22a3e2f7e488fbbcafb1a96843050675e65d292ef9b414f0302f2b6300c3c SHA512 4371dff09c6c9c2d70794a2f9cad6297100828d4dce6581126ead6edbd67a8ca76548ae9c60f0d0b2017e348f9d3712411a5a52be709fab1fb14f3dc28dc5a48 WHIRLPOOL 63fb061f04a8aa619aec3fda87f47014047662fead1ad89552d6a12cac278c2cad5a331620e08d7357bb2259f1186d97b93851d3f567161a316527be9ebc993f
 EBUILD cracklib-2.9.0-r1.ebuild 2396 SHA256 859ac5912f319858ecc71fd51d2777e28999898c7e80a7695d1754572053d269 SHA512 c3f40bba25c63b2491f77a6e2e5836c48cbb21ab250f0834d5268c7cd6b0d9b7c8b1f8551e1d7aef7a41c71ea6b06ffac08dd2195ca63854daf886ac0baf4f49 WHIRLPOOL 3c3cf114797c2072c27ebce923ce424218c96def8568716494c7cc5a3139487afa300cef847263c508e0974e8ebf994ee68778316808ac5c202b1f3e88ec6cd3
 EBUILD cracklib-2.9.0.ebuild 2448 SHA256 e911f4c86224321cbb816459d86af73a1429096600a47afc99c893725176d90a SHA512 3b4099bd7fabeb315de51a11699e3fd13565fa7c970730ae7c4a550a9ee3c82072f4bf7ce4113c226856cc3d6766dbc2cd13355fa70f35232ba6ddf864c776cc WHIRLPOOL 26fdfc31a606b59971e5d1107ff2da7ac1fc55f65f84cd6506f0371ac73e72c79030eb5b8a48b6c4e985d7a234a87a9563a26f2fd3e7e4251fd164a466102785
+EBUILD cracklib-2.9.1-r1.ebuild 2706 SHA256 f0f39e547f57a5005bef4d9b3a2a901b2f61f1df774f342cee7c43d28929a537 SHA512 d64ead1ad0ff43e1324381402f7364e52f8a9de66d1a25b345a442f70cb6b05b722bb3cdd7739688b1e1843705900a1b9d570816182e80c674566b9621d90003 WHIRLPOOL cf4f346082887c8763b6eb5270e953ae87d82ac7fceafc5526bd6f8e371bedcdeea8f7d7817eccb763a7936a06dca311071eb2ac4c319f8f1d260e77ea3f52b5
 EBUILD cracklib-2.9.1.ebuild 2226 SHA256 f5abbae9f0f6417cec98a90b4a3f4b08ee650582687c272054662e8f90e6ab97 SHA512 f77ce60afaf78ecfd27c6105b9e272c0c4ade4adcb11afe0f2f0df74722278b23b554f6f27fddcbb8c885931e115277e8c0abd39d05d738851e0ec4aa26668be WHIRLPOOL c690c5cafeb0322e8892bccace0c66bd57ca3c6d744c799a9a39621f9a5e9a486961f88307abb4fd891ea1685b9d0eb41a2ebb09cbb6697b0e069009fefa91ad
-MISC ChangeLog 24182 SHA256 3b7498afafb820a2be8d0ea793a2920700f719a1bee20044fafc0e85c62cea46 SHA512 69d50eb1c0956546decc56413dcc523adde14cade8915bac479f8a606b1f33ddcb454e6c1931771ad3ca18c8074f8b4eeff87b4ff8356d32428f8741fc3939de WHIRLPOOL 99107be12ce4652cea650779b758fc70080be6729c0a63ef8d1ceb6a00a010095eace9b918ed96d3d1ba8861a3959714644bd923c3ec630fd02c733dfce8d619
+MISC ChangeLog 24348 SHA256 5ae3a041c90918426ce29f1bfb70def78c1a8ed887245558d06ec29843fcb385 SHA512 d54c02d45717536d077a86af0e29f94cf5feb2a2434ffc16ed05262757fb5df0068d9542b938622e012f4ea4640c5670db088c4c4b92088e8c6ba1c031ab910c WHIRLPOOL 38539f237efd87a8f68d310cc2da7d9a9eb545ca1c05a48f64b920e8c15751aca1e85b1b5afd2717189827fd476ae448c679c26cee55077e500d32e93347239a
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTd2sDAAoJELp701BxlEWfzUgP/REmpYSW2uDCfvKRlY54ksOr
-o9yzDgsKrEjdzdRR1+G7+Pz4yJ1NdNJN1BmG6R10+qRWJtda6jjXgM0FTFtf9OOd
-Yo81RiDARjBUu3p6AMn892V09TWCbSvVpZADQzMO1jTMtB//Bf+O4BQwmOC8jdrX
-9Tpeci5vmnl+1iVpVAwvNDB2HFPt0tdenz0nI0YIDUeI9UEHr0Kjdc7rYxhjR641
-ykdsRIWWTKXK0FQSUsvP4HMtnjOP9jQN6NkGJwAL72nvEtFNvsn1WexrXVie+aoT
-4RUNKZBjYG07ube4ePZfKgvjctvQx8TdXxYk92JbHruTY/klm05E5QewQ6iBQyQw
-5MjF1tZV5J7758zHctcd77+z19tjWzFMh2654K0Ad9ZtW3Y2ESmXJ/6FxsJjjCdW
-a/60QdPrU0VU/7jULA3r3p8U/Odsnm8BEClnE7moPHPq0BqzReUw2+srTFbgtYR4
-c+tMdQWi3t7qke4k8Xq1fuBua9JI1mPUGf7OvoXdEuAt4YYKlchsatAQyHDMpR26
-U06D2DP9f9k+Q7K/GTyeTxJbEh1dNPqUaV+p3jEsxHRJ3cwG0MEdZLi+acufPp85
-pTmWImLneYHjkCqUNRRXpf/t3uYYAVTs8FJ/MGx5maISkXSFkyIwl7I+hWyYlX1/
-7fzwBNnpIt0TSobvuKR/
-=UH0O
+iQJ8BAEBCABmBQJTh3+kXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOP+sP/R5AlFlcFV9ixhHJmMrIqMmG
+hyl9A1I26DwJCXL1LSBmHI0ObbmO4qXTR29Iy9qqSwO1aEm45y+cho6fKXTR8aKt
+ZYPcfYJxBUwB9SYRV605ku9yFPxeWfELONGw3fP6cDFP/NeFhTK/eHQ8IJQAnNKJ
+6Zssc5JlyboTjQOn39Z1U/o5GnJNN5I66NFHriW2vQ5OoAWuUNUYi6tPQeQmBia4
+CVp7hOuh6zjmMKiDMwoms5NvoUlzvRWOxcGOnl0o9R5xxwrtfFrpEGfdmqrS8E2H
+2LcKZOUwOQ293lIM0aMIypoTVDgztP4kFi8OvyVdf8rXE6ztU2tX7Knu0cUJNWav
+I3FDcCzxvntcccGV+geVvDQniUA0vjmpEVdEKR9lCMm0/SJom6av3WFZ+oxvzhAi
+vZ+F6ZxHMq2ATZllYUFFrUHJHToh7m67O27/quogZWiMtINPoQl8voui3Syuufqv
+NPJp+jJfpa8GrSd61YODcViirHCNFbAuWV8d75JDxC/VQC2VCb2ey5QnAhCoG95P
+reZviUka1LGl+Skd/0x8SuGGjiBWIUdY8/1fn3Axxug9mNqB6TvdjsuVaFtckGVT
+nYhAOLgjXLpwnrHQgTBPpq4P1Y4pw57F50+jifaVdRRK481A15z1m2Y8dL9qoCGc
+onCZqo/OdZakLAMV2mj0
+=ou+E
 -----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..b735f822f256
--- /dev/null
+++ b/sys-libs/cracklib/cracklib-2.9.1-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2014 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.1 2014/05/29 18:42:41 mgorny Exp $
+
+EAPI="4"
+PYTHON_COMPAT=( python{2_6,2_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[${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
+	sed -i \
+		-e 's:_cracklib.c:@srcdir@/&:' \
+		-e '/include/s:builddir:srcdir:' \
+		python/setup.py.in || die
+	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 || 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() {
+	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
+}