Fix building on uClibc systems w/out nls support.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 39 insertions, 7 deletions

diff --git a/sys-libs/cracklib/ChangeLog b/sys-libs/cracklib/ChangeLog
index a60f1679dcb2..5b0633d44d17 100644
--- a/sys-libs/cracklib/ChangeLog
+++ b/sys-libs/cracklib/ChangeLog
@@ -1,6 +1,10 @@
 # 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.146 2010/06/03 20:13:55 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.147 2010/06/05 20:46:31 vapier Exp $
+
+  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:
+  Fix building on uClibc systems w/out nls support.
 
   03 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   cracklib-2.8.16.ebuild:
diff --git a/sys-libs/cracklib/Manifest b/sys-libs/cracklib/Manifest
index 62b9339f7377..21e8b0e41cad 100644
--- a/sys-libs/cracklib/Manifest
+++ b/sys-libs/cracklib/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX cracklib-2.8.13-python-linkage.patch 508 RMD160 fc6123093212c60c0d6de98a0b7390b52274ed28 SHA1 3514a018563e0848cdd9aa2625b7e003e875af8e SHA256 0958a6ce7ff7b89bb374281b0bd416af275d9f052d83d4fac493bee22aaa51f0
+AUX cracklib-2.8.15-no-nls.patch 304 RMD160 741e4972d38f8a59f0e73da9f4f202e1b1a19b36 SHA1 83496378109bc31f6581bf6fb3532e31f4f07d86 SHA256 140c4d76278c84b031a875a7e545e630c3ec2a086e73f84d424e8fb9a84ad1e2
 DIST cracklib-2.8.15.tar.gz 615849 RMD160 835425d5266ec0eb909430e755cbcb11a6074e9c SHA1 2535a49da92bfece48639d23ada6964d122cc9ac SHA256 8249accbe09c51397f2d9ebbf2ccaccb07ac35803ca37096b01f25a9291899e5
 DIST cracklib-2.8.16.tar.gz 618120 RMD160 b2032ebe4c476fe273a1daab13764f62520c14c0 SHA1 21c181ed22ab7ab1e178c09fa251c9615f9f336c SHA256 fc3aa492c2879e304bae30955ab8b37d6865d26f79d0493b8c36a9bc1b6475bc
-EBUILD cracklib-2.8.15.ebuild 1726 RMD160 828a5e9219bdbb88e23f880f117576880212cabb SHA1 582807bb5409926e54e9b75a6dbc062638d40db6 SHA256 da5803d992a0d9a93751d182ed373d03e61ccc7f5b0e36e95d72d5d4dfb591cf
-EBUILD cracklib-2.8.16.ebuild 2155 RMD160 660cf3011eb34bbb95425b677da13d384acc85e2 SHA1 6950017b773a2a69d7b958276940f67fb2bb9245 SHA256 64820e7926039cd9b7ecaa92416d664a0ff5fbcee962fcc863e92f6ddf50b688
-MISC ChangeLog 18621 RMD160 7c348b9a613a82f4be8e67361dc71a522adb8989 SHA1 b66028cc46afe7f90bcdd93cb5f5ab03a40fccc2 SHA256 f8749855eebe762beb5b531a50763b8d885104ce59c1ed08b2b862164e5fba2e
+EBUILD cracklib-2.8.15.ebuild 1766 RMD160 7f05f14723c2d1f38c1561cdab987f9c72c8a549 SHA1 e598cd2836923f35cbb47a9d1e14932785e4c477 SHA256 b77c02b91b3e60c3f4b4da12f09bed8a731e3a3ac27d12534ec9825034ca8f44
+EBUILD cracklib-2.8.16.ebuild 2208 RMD160 e30dd8a98e85737b7949e08e2d0e5bfb7e626f3e SHA1 f8ab6a6e18c9d5d32854ccbdc372741dea19fe59 SHA256 2e7232ad532cb4ba6954bdcaa9e6e4e78afbd257fcc41c35b9cb4e499e02d8d0
+MISC ChangeLog 18809 RMD160 c39042f1e24eb0ebcb4c412a49497b03054c1671 SHA1 9ab5831c7e0bbb078a78e5513613d5aa4184d99e SHA256 ea995a5f66315279d9472513468cf921327a70502f31d5db774d298e930a7ab2
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iF4EAREIAAYFAkwKt6oACgkQTwhj9JtAlp50QgEAlPAQx0SQPRCxX1p5anwdc/yl
+C/gxqFRSLeWcNAlFE3EA/ip6LY3XBCAd0gMcM/pgYDj5DTAOMQHhH4Z8jRj7/0Ep
+=lId5
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/cracklib/cracklib-2.8.15.ebuild b/sys-libs/cracklib/cracklib-2.8.15.ebuild
index dcbc89f54a81..678f8352cc40 100644
--- a/sys-libs/cracklib/cracklib-2.8.15.ebuild
+++ b/sys-libs/cracklib/cracklib-2.8.15.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.15.ebuild,v 1.9 2010/04/01 17:24:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.8.15.ebuild,v 1.10 2010/06/05 20:46:31 vapier Exp $
 
 inherit eutils toolchain-funcs multilib libtool
 
@@ -31,6 +31,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-2.8.13-python-linkage.patch #246747
+	epatch "${FILESDIR}"/${P}-no-nls.patch
 	sed -i '/PYTHON/s:\(print\) \([^"]*\):\1(\2):' configure #302908
 	elibtoolize #269003
 }
diff --git a/sys-libs/cracklib/cracklib-2.8.16.ebuild b/sys-libs/cracklib/cracklib-2.8.16.ebuild
index 959cb0850c83..15a9368b74d3 100644
--- a/sys-libs/cracklib/cracklib-2.8.16.ebuild
+++ b/sys-libs/cracklib/cracklib-2.8.16.ebuild
@@ -1,13 +1,13 @@
 # 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.3 2010/06/03 20:17:34 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.8.16.ebuild,v 1.4 2010/06/05 20:46:31 vapier Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.*"
 
-inherit distutils libtool toolchain-funcs
+inherit eutils distutils libtool toolchain-funcs
 
 MY_P=${P/_}
 DESCRIPTION="Password Checking Library"
@@ -39,6 +39,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.8.15-no-nls.patch
 	elibtoolize #269003
 
 	if use python; then
diff --git a/sys-libs/cracklib/files/cracklib-2.8.15-no-nls.patch b/sys-libs/cracklib/files/cracklib-2.8.15-no-nls.patch
new file mode 100644
index 000000000000..80f5d40a563e
--- /dev/null
+++ b/sys-libs/cracklib/files/cracklib-2.8.15-no-nls.patch
@@ -0,0 +1,15 @@
+fix building on uclibc when nls is disabled
+
+--- util/check.c
++++ util/check.c
+@@ -21,8 +21,10 @@
+ 	const char *why;
+ 	int i;
+ 
++#ifdef ENABLE_NLS
+ 	setlocale(LC_ALL, "");
+ 	textdomain(PACKAGE);
++#endif
+ 
+ 	while (fgets(buf, sizeof(buf), stdin) != NULL) {
+ 		while (((i = strlen(buf)) > 0) && (i > 0)) {