Drop gettext dep (cannot think of a reason for it), and drop USE=nls since the --disable-nls flag has not been in the glibc source for quite some time #398981 by Maxim Kammerer.

8 files changed, 19 insertions, 35 deletions

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 2d3a3b5..f203f15 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -12,7 +12,7 @@ AUX eblits/common.eblit 9254 RMD160 2cd1b2fc996b59fff7533f94b43754a841236e8a SHA
 AUX eblits/pkg_postinst.eblit 1159 RMD160 4b99846819bf0471d1104a8a17dd260796644f9d SHA1 4a2980fede3edebc7960d40db7cf935c7c854859 SHA256 76c403cf5c77a3a3bb7441566335f0c8da2584eaa21f05ab400e7bb00f9db810
 AUX eblits/pkg_preinst.eblit 3764 RMD160 f9a9d43e2d2d8df073be7e1b66655e651cb10740 SHA1 b987e2802201e0f44c357ffc7b92da4aa77cf377 SHA256 41baa253ea529156d628108247545235c4ec377b184e7824bd790eba1361299e
 AUX eblits/pkg_setup.eblit 3318 RMD160 4a38e5f9a385d9134b54ab27a654e9a83eeb9258 SHA1 85341ef8fbf37e3270719cc940d26fd6f1168d6b SHA256 ca79f36240221519e460b8ff08e8453d624731991c3efc27d45068d8c15b756e
-AUX eblits/src_compile.eblit 5844 RMD160 29faae79a18f157e1412d527380c7b70cf7d2442 SHA1 7be66723d4b8af71dfda1bcd0308791acbdbf12e SHA256 29673cef6619ca56bc9ce8eaf8c1a995857626f6bcd72251c5a339ad0574c6fd
+AUX eblits/src_compile.eblit 5799 RMD160 733ba04e5c1d1738a617656df89f5daaae94add1 SHA1 3b15fd63357c85f8c8351b24bdb262d007894663 SHA256 a00ae54a4a4566e4b79bf65571f415a6b7291408d520398ba6c583d07ff8aff3
 AUX eblits/src_install.eblit 7754 RMD160 d13b0283a096d681b3a4f1f4f0499af45ca1c97a SHA1 7b5b4b2da323cdc4ec6c39f2a4b229b7118568b9 SHA256 ae407a96cdff1c053846370a791e4796fb45bc04ae5b7ded06bae0b4861ceff7
 AUX eblits/src_test.eblit 1172 RMD160 a70e31e655cd3e306af6a498002de85b72258566 SHA1 4aec15e6ab67279258fd23400701fd38c106a38b SHA256 e5a390761b7ec613460b8da26df3ffe2a137217261dd9f87f2b78c3fa2a12727
 AUX eblits/src_unpack.eblit 5848 RMD160 8012ba4a31e689080ec2d70156c503b0c36e3119 SHA1 5aab07c312c3ab0624ead0e0a7f7d5cecfe1bf00 SHA256 19f73007557718580860a6e1b7613b4a69a4a639f17a9d3cb9ca2aba9576ccca
@@ -44,9 +44,9 @@ DIST glibc-ports-2.5.tar.bz2 409372 RMD160 e7e29df135a5f0f72760d10e5ad46de038e40
 DIST glibc-ports-2.6.1.tar.bz2 431292 RMD160 aa6ba7bc58932c81416c3407a8dd0b5e61f5454a SHA1 f620103c8b02ced80a425c79691573f949bf5d6b SHA256 d094028bc6d6691f56b4efeff7cd7e1c7ca10733e0cb5efc36e8fb08d8324bf1
 DIST glibc-ports-2.7.tar.bz2 435392 RMD160 b9b96b357a394f29d5617aaa26a2c000bcf88874 SHA1 2186eac2248f1dd604f20a9dc8215ce12319d273 SHA256 3e481996259af87c3581da23481970a27de679e3c87cfa9a5a59751cd20c7b44
 DIST glibc-powerpc-cpu-addon-v0.01.tgz 22422 RMD160 3483c94ec55819b36aa66fc60462317f8d15e4df SHA1 fd30cde7c7cb42baa2c8fa1ac88eeeeb509cac29 SHA256 0ffa9a432fffb9bfed99c529b631a27534ba848c7ec1d707732338b73a4a8ce9
-EBUILD glibc-2.3.6-r5.ebuild 37759 RMD160 4051bfdba2904474fbee423dab06247466534b08 SHA1 fcf641483ba9d0e423775d7b478d2f446ca12b21 SHA256 2259a0e95b4a8f01c7d22e089c31e4de203de60064804daf48a80eca9cd8d774
-EBUILD glibc-2.4-r4.ebuild 39218 RMD160 391da0f0b0e4e9040fead51f5688746f8aeb0098 SHA1 341640ae96da7bf9bcfea1c0f87c6eaa53c10f26 SHA256 23e36f5d6c4fd0e0e934a0b05ccaa00839152f02ce8b2fa5d8702b87d0681028
-EBUILD glibc-2.5.1.ebuild 38284 RMD160 d766cb3c7e0e2f075258464c6836ca5a04229d39 SHA1 a52712f29b9a97c3fa475c16ec2bf366a5377686 SHA256 a1de19b8514fb4f3ccabdde2057d4e528938a6da3a2a4e4a401de0cc14ee8f99
-EBUILD glibc-2.6.1.ebuild 12440 RMD160 7adb44d528bb06ceed78b3f654ea9de0c3b45fa5 SHA1 06b2610fde75d21ce5ee81ae648b94518181e9ec SHA256 312249b3ca6f613d9687d2a52e8e71f40bbfdbad8ae7a0ca6f097e2b6a3ed1b2
-EBUILD glibc-2.7-r2.ebuild 12949 RMD160 acec22ce50d758a70c6adea403ce250377be7282 SHA1 3f8982cc1ccd341c13e53080ab58044d08b284d5 SHA256 f88b3c10119fba9c93e6c055c982f6d8db2c5bee25bda2d6f79e9dc95a5a5a05
-EBUILD glibc-2.8_p20080602-r1.ebuild 13492 RMD160 af0d80016f5157af42d8683a481e7bd9de01bfc3 SHA1 d583f3d21002763118993df9c41ea85d12f3ae4f SHA256 bd9dd02ee81e9cedee9d466ac56181245b132c615bba53681dabef6ffcf79548
+EBUILD glibc-2.3.6-r5.ebuild 37654 RMD160 99eccb7dead367eca4884bf13c1f6e78360b510a SHA1 c7bfa53e4fa16617131ba8214d383ce74512e803 SHA256 ef66d021515ddb985ffd548237df2ece218e2113f916546bd6ea01ad3b053027
+EBUILD glibc-2.4-r4.ebuild 39113 RMD160 da3d9a956abaebbd0bcfec71918ccde5f9ac5acd SHA1 858ad65b1196528150d5f437f2296b8f532e4616 SHA256 1e4d2df405695b616befe3320650f8b5c1a48010f82061a977eb5e2bb7ec0de6
+EBUILD glibc-2.5.1.ebuild 38179 RMD160 a105e42ab930e8da59845c23b9cd374cf2b1ade7 SHA1 ea129d8b2dcc90c51ea4e29445d05075078aba32 SHA256 4189f17d8b54ffd24e0b715897d261287f463e7bd28e98b8abb9050f66e65e8c
+EBUILD glibc-2.6.1.ebuild 12380 RMD160 8f0accb20bc608a4cd22e47033a203302c90fa63 SHA1 ad8ee3ff26ecafbf4f32f31a129aa5a5e8bb5fbc SHA256 618b11a47b31e714fc37d6b94cb0ab16f02744ff42636e5b9400b03e4791a67a
+EBUILD glibc-2.7-r2.ebuild 12889 RMD160 b8e4f365b0ed8e75e16e047690d3663110568cf4 SHA1 b601ca1fda4636f5c58f926b028bc5eef56f6c26 SHA256 6f3825d904fc71d35283b15036fbb286e834f2ba5ba3ea9e247ed5963e64f132
+EBUILD glibc-2.8_p20080602-r1.ebuild 13432 RMD160 702fd3fc02d9f320a55f0aca185962742683a531 SHA1 6b067e2001d1bec2d4d4decded1b5bc3cffdcf56 SHA256 74d278f231e48ec931778316422c7be05f4ea80ea07f5ac4e3a1a560ce2a0236
diff --git a/sys-libs/glibc/files/eblits/src_compile.eblit b/sys-libs/glibc/files/eblits/src_compile.eblit
index dafd2aa..5b26f34 100644
--- a/sys-libs/glibc/files/eblits/src_compile.eblit
+++ b/sys-libs/glibc/files/eblits/src_compile.eblit
@@ -19,7 +19,6 @@ glibc_do_configure() {
 	[[ -d ports ]] && ADDONS="${ADDONS},ports"
 	popd > /dev/null
 
-	use nls || myconf="${myconf} --disable-nls"
 	myconf="${myconf} $(use_enable hardened stackguard-randomization)"
 	if [[ $(<"${T}"/.ssp.compat) == "yes" ]] ; then
 		myconf="${myconf} --enable-old-ssp-compat"
diff --git a/sys-libs/glibc/glibc-2.3.6-r5.ebuild b/sys-libs/glibc/glibc-2.3.6-r5.ebuild
index 7922451..2ab62fa 100644
--- a/sys-libs/glibc/glibc-2.3.6-r5.ebuild
+++ b/sys-libs/glibc/glibc-2.3.6-r5.ebuild
@@ -39,7 +39,7 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library"
 HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
 LICENSE="LGPL-2"
 
-IUSE="nls build nptl nptlonly erandom hardened multilib selinux glibc-compat20 glibc-omitfp profile"
+IUSE="build nptl nptlonly erandom hardened multilib selinux glibc-compat20 glibc-omitfp profile"
 
 export CBUILD=${CBUILD:-${CHOST}}
 export CTARGET=${CTARGET:-${CHOST}}
@@ -834,7 +834,6 @@ glibc_do_configure() {
 	popd > /dev/null
 	use glibc-compat20 && [[ -d glibc-compat ]] && ADDONS="${ADDONS},glibc-compat"
 
-	use nls || myconf="${myconf} --disable-nls"
 	use erandom || myconf="${myconf} --disable-dev-erandom"
 
 	use glibc-omitfp && myconf="${myconf} --enable-omitfp"
@@ -1008,10 +1007,8 @@ DEPEND="!ia64? ( >=sys-devel/gcc-3.4 )
 	>=sys-devel/gcc-config-1.3.12
 	>=app-misc/pax-utils-0.1.10
 	virtual/os-headers
-	nls? ( sys-devel/gettext )
-	selinux? ( !build? ( sys-libs/libselinux ) )"
-RDEPEND="nls? ( sys-devel/gettext )
 	selinux? ( !build? ( sys-libs/libselinux ) )"
+RDEPEND="selinux? ( !build? ( sys-libs/libselinux ) )"
 
 if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
 	DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"
diff --git a/sys-libs/glibc/glibc-2.4-r4.ebuild b/sys-libs/glibc/glibc-2.4-r4.ebuild
index 5595a71..3e58ede 100644
--- a/sys-libs/glibc/glibc-2.4-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.4-r4.ebuild
@@ -52,7 +52,7 @@ LICENSE="LGPL-2"
 
 # note that nptl/nptlonly/glibc-compat20 are for upgrade checks only.
 # we dont generally support these things in this version.
-IUSE="nls build nptl nptlonly hardened multilib selinux glibc-omitfp profile glibc-compat20"
+IUSE="build nptl nptlonly hardened multilib selinux glibc-omitfp profile glibc-compat20"
 
 export CBUILD=${CBUILD:-${CHOST}}
 export CTARGET=${CTARGET:-${CHOST}}
@@ -843,7 +843,6 @@ glibc_do_configure() {
 		esac
 	fi
 
-	use nls || myconf="${myconf} --disable-nls"
 	myconf="${myconf} $(use_enable hardened stackguard-randomization)"
 	if [[ $(<"${T}"/.ssp.compat) == "yes" ]] ; then
 		myconf="${myconf} --enable-old-ssp-compat"
@@ -1027,10 +1026,8 @@ DEPEND=">=sys-devel/gcc-3.4.4
 	>=sys-devel/gcc-config-1.3.12
 	>=app-misc/pax-utils-0.1.10
 	virtual/os-headers
-	nls? ( sys-devel/gettext )
-	selinux? ( !build? ( sys-libs/libselinux ) )"
-RDEPEND="nls? ( sys-devel/gettext )
 	selinux? ( !build? ( sys-libs/libselinux ) )"
+RDEPEND="selinux? ( !build? ( sys-libs/libselinux ) )"
 
 if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
 	DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"
diff --git a/sys-libs/glibc/glibc-2.5.1.ebuild b/sys-libs/glibc/glibc-2.5.1.ebuild
index ad50c42..55dbe57 100644
--- a/sys-libs/glibc/glibc-2.5.1.ebuild
+++ b/sys-libs/glibc/glibc-2.5.1.ebuild
@@ -40,7 +40,7 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library"
 HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
 LICENSE="LGPL-2"
 
-IUSE="build debug nls nptl nptlonly hardened multilib selinux glibc-omitfp profile glibc-compat20"
+IUSE="build debug nptl nptlonly hardened multilib selinux glibc-omitfp profile glibc-compat20"
 
 export CBUILD=${CBUILD:-${CHOST}}
 export CTARGET=${CTARGET:-${CHOST}}
@@ -857,7 +857,6 @@ glibc_do_configure() {
 		-e '/^,\*$/d')
 	popd > /dev/null
 
-	use nls || myconf="${myconf} --disable-nls"
 	myconf="${myconf} $(use_enable hardened stackguard-randomization)"
 	if [[ $(<"${T}"/.ssp.compat) == "yes" ]] ; then
 		myconf="${myconf} --enable-old-ssp-compat"
@@ -1033,11 +1032,9 @@ DEPEND=">=sys-devel/gcc-3.4.4
 	>=sys-devel/gcc-config-1.3.12
 	>=app-misc/pax-utils-0.1.10
 	virtual/os-headers
-	nls? ( sys-devel/gettext )
 	!<sys-apps/portage-2.1.2
 	selinux? ( !build? ( sys-libs/libselinux ) )"
-RDEPEND="nls? ( sys-devel/gettext )
-	selinux? ( !build? ( sys-libs/libselinux ) )"
+RDEPEND="selinux? ( !build? ( sys-libs/libselinux ) )"
 
 if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
 	DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"
diff --git a/sys-libs/glibc/glibc-2.6.1.ebuild b/sys-libs/glibc/glibc-2.6.1.ebuild
index a426fe1..c041813 100644
--- a/sys-libs/glibc/glibc-2.6.1.ebuild
+++ b/sys-libs/glibc/glibc-2.6.1.ebuild
@@ -27,7 +27,7 @@ NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl require
 
 [[ ${CTARGET} == hppa* ]] && NPTL_KERN_VER=${NPTL_KERN_VER:-2.6.20}
 
-IUSE="debug gd nls hardened multilib selinux glibc-omitfp profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}"
+IUSE="debug gd hardened multilib selinux glibc-omitfp profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}"
 S=${WORKDIR}/glibc-${RELEASE_VER}
 
 # Here's how the cross-compile logic breaks down ...
@@ -83,11 +83,9 @@ DEPEND=">=sys-devel/gcc-3.4.4
 	>=sys-devel/gcc-config-1.3.12
 	>=app-misc/pax-utils-0.1.10
 	virtual/os-headers
-	nls? ( sys-devel/gettext )
 	!<sys-apps/portage-2.1.2
 	selinux? ( sys-libs/libselinux )"
-RDEPEND="nls? ( sys-devel/gettext )
-	selinux? ( sys-libs/libselinux )"
+RDEPEND="selinux? ( sys-libs/libselinux )"
 
 if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
 	DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"
diff --git a/sys-libs/glibc/glibc-2.7-r2.ebuild b/sys-libs/glibc/glibc-2.7-r2.ebuild
index 1a4b7b9..c316f4e 100644
--- a/sys-libs/glibc/glibc-2.7-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.7-r2.ebuild
@@ -25,7 +25,7 @@ LT_VER=""                                      # version of linuxthreads addon
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
 #LT_KERN_VER=${LT_KERN_VER:-"2.4.1"}           # min kernel version linuxthreads requires
 
-IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}"
+IUSE="debug gd glibc-omitfp hardened multilib selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}"
 S=${WORKDIR}/glibc-${RELEASE_VER}
 
 # Here's how the cross-compile logic breaks down ...
@@ -83,12 +83,10 @@ DEPEND=">=sys-devel/gcc-3.4.4
 	>=sys-devel/gcc-config-1.3.12
 	>=app-misc/pax-utils-0.1.10
 	virtual/os-headers
-	nls? ( sys-devel/gettext )
 	>=sys-apps/sandbox-1.2.18.1-r2
 	!<sys-apps/portage-2.1.2
 	selinux? ( sys-libs/libselinux )"
-RDEPEND="nls? ( sys-devel/gettext )
-	selinux? ( sys-libs/libselinux )"
+RDEPEND="selinux? ( sys-libs/libselinux )"
 
 if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
 	DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"
diff --git a/sys-libs/glibc/glibc-2.8_p20080602-r1.ebuild b/sys-libs/glibc/glibc-2.8_p20080602-r1.ebuild
index ad59dc4..e7699b4 100644
--- a/sys-libs/glibc/glibc-2.8_p20080602-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.8_p20080602-r1.ebuild
@@ -31,7 +31,7 @@ LT_VER=""                                      # version of linuxthreads addon
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
 #LT_KERN_VER=${LT_KERN_VER:-"2.4.1"}           # min kernel version linuxthreads requires
 
-IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}"
+IUSE="debug gd glibc-omitfp hardened multilib selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}"
 S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER+-${SNAP_VER}}
 
 # Here's how the cross-compile logic breaks down ...
@@ -89,12 +89,10 @@ DEPEND=">=sys-devel/gcc-3.4.4
 	>=sys-devel/gcc-config-1.3.12
 	>=app-misc/pax-utils-0.1.10
 	virtual/os-headers
-	nls? ( sys-devel/gettext )
 	>=sys-apps/sandbox-1.2.18.1-r2
 	!<sys-apps/portage-2.1.2
 	selinux? ( sys-libs/libselinux )"
-RDEPEND="nls? ( sys-devel/gettext )
-	selinux? ( sys-libs/libselinux )"
+RDEPEND="selinux? ( sys-libs/libselinux )"
 
 if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
 	DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"