Link to intl in non glibc systems when requesting nls.

  Fixes #154181 thanks to Timothy Redaelli.
Package-Manager: portage-2.1.2_rc1-r4

3 files changed, 20 insertions, 21 deletions

diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog
index fe92504e6d8c..566dab8e209c 100644
--- a/sys-libs/timezone-data/ChangeLog
+++ b/sys-libs/timezone-data/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/timezone-data
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.51 2006/11/04 23:42:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.52 2006/11/06 14:17:38 uberlord Exp $
+
+  06 Nov 2006; Roy Marples <uberlord@gentoo.org> timezone-data-2006n.ebuild:
+  Link to intl in non glibc systems when requesting nls.
+  Fixes #154181 thanks to Timothy Redaelli.
 
   04 Nov 2006; Mike Frysinger <vapier@gentoo.org>
   files/timezone-data-2005n-makefile.patch, timezone-data-2006n.ebuild:
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 8da97b5dedb4..7c620f249664 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX timezone-data-2005n-makefile.patch 3502 RMD160 7bc1b2b4dab8e7cecf2ffcf5453d42231c6ad34d SHA1 45fea45901c4c0ca4de9887827d62f7495538509 SHA256 f999f6b3f7f487a4a02f657987e043c0adca137f7dc9855d99d43cc16a84993d
 MD5 a59fc0e8a23fbd0a8c0daea50b37b91b files/timezone-data-2005n-makefile.patch 3502
 RMD160 7bc1b2b4dab8e7cecf2ffcf5453d42231c6ad34d files/timezone-data-2005n-makefile.patch 3502
@@ -36,14 +33,14 @@ EBUILD timezone-data-2006m.ebuild 1488 RMD160 4a5d53b85dd661c6908a55219d0035e0d8
 MD5 b9f4b07370bd8567d3d7bf1c8ea2f847 timezone-data-2006m.ebuild 1488
 RMD160 4a5d53b85dd661c6908a55219d0035e0d87534b8 timezone-data-2006m.ebuild 1488
 SHA256 9ed22b3bd5021b251c29203dc52e41146ff3791bed2cea5cbbd2c4cfcb46b2a9 timezone-data-2006m.ebuild 1488
-EBUILD timezone-data-2006n.ebuild 1536 RMD160 26ca927055c5861742bbc35895f30b629ca27196 SHA1 1e03dcc96334aad5b68bd5c5eba48bb9a5b7a14b SHA256 77f5982b4fdf2faad488dd42ae3510860b05cae34f6859d6d0d143bbf197c865
-MD5 cba5cb0bc30814ac3f62a5d1fe6e8c3f timezone-data-2006n.ebuild 1536
-RMD160 26ca927055c5861742bbc35895f30b629ca27196 timezone-data-2006n.ebuild 1536
-SHA256 77f5982b4fdf2faad488dd42ae3510860b05cae34f6859d6d0d143bbf197c865 timezone-data-2006n.ebuild 1536
-MISC ChangeLog 6570 RMD160 6199fc98485d860e6ae963d285760ad2b3966ca1 SHA1 fe2ea83c7203db70d0df2724fbe614da2ce76963 SHA256 753e0ee4e5ca89e21e49b86ce73af6ea62411ce9a2b1c5c21a483fa6d00f8976
-MD5 2e5c0bb5032a26ef2d3ba31990dfd9ae ChangeLog 6570
-RMD160 6199fc98485d860e6ae963d285760ad2b3966ca1 ChangeLog 6570
-SHA256 753e0ee4e5ca89e21e49b86ce73af6ea62411ce9a2b1c5c21a483fa6d00f8976 ChangeLog 6570
+EBUILD timezone-data-2006n.ebuild 1607 RMD160 c7e4df01ffa194838c8fbfe150e127c3f345cdb3 SHA1 cb7ab0e296ff35cca9334f6eaabbbdea4c9e8ee2 SHA256 e6b123229d17ec925d43f4f7f3c682f959bdd9974627a9a7b4432d7be0bf7f4e
+MD5 4135f526367d1482e465de544aca4d4c timezone-data-2006n.ebuild 1607
+RMD160 c7e4df01ffa194838c8fbfe150e127c3f345cdb3 timezone-data-2006n.ebuild 1607
+SHA256 e6b123229d17ec925d43f4f7f3c682f959bdd9974627a9a7b4432d7be0bf7f4e timezone-data-2006n.ebuild 1607
+MISC ChangeLog 6751 RMD160 50d02840361f3535b00a81ff59a1032770e9897a SHA1 6f00123731d4e8733ea2d2707a4e001214c6b8f3 SHA256 6aef964e80c4141c65a1f79de42c6fd333a83a90bcb1cbb4b16a2f5e6c50f7d7
+MD5 88741e914867816869aba00bd534868b ChangeLog 6751
+RMD160 50d02840361f3535b00a81ff59a1032770e9897a ChangeLog 6751
+SHA256 6aef964e80c4141c65a1f79de42c6fd333a83a90bcb1cbb4b16a2f5e6c50f7d7 ChangeLog 6751
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
@@ -66,10 +63,3 @@ SHA256 3beba9386a22ca07b19c679de29a4184b87d8035975f13bba0b566e9f5227b90 files/di
 MD5 696664b70852c19a5eb1f1a19849d1a9 files/digest-timezone-data-2006n 470
 RMD160 6e5008dd6d12c2a7335372b464f9fbd7cf5a0193 files/digest-timezone-data-2006n 470
 SHA256 a14f3a578c483d53fe1d1a4ae8b6b210350d98c2976cd3d6bd243421b2e727a3 files/digest-timezone-data-2006n 470
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFTSWHamhnQswr0vIRAiy0AKC322WUvFZ64jhy00Ifu73erDxOHACgmIHj
-C87OoV7ZlgJCUpu1tUhFzzc=
-=ZNOy
------END PGP SIGNATURE-----
diff --git a/sys-libs/timezone-data/timezone-data-2006n.ebuild b/sys-libs/timezone-data/timezone-data-2006n.ebuild
index bcb7a7e185ad..b2f07a62b8ea 100644
--- a/sys-libs/timezone-data/timezone-data-2006n.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2006n.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2006n.ebuild,v 1.11 2006/11/04 23:42:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2006n.ebuild,v 1.12 2006/11/06 14:17:38 uberlord Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -29,7 +29,12 @@ src_unpack() {
 src_compile() {
 	tc-export CC
 	use elibc_FreeBSD && append-flags -DSTD_INSPIRED #138251
-	use nls && export NLS=1 || export NLS=0
+	if use nls ; then
+		use elibc_glibc || append-ldflags -lintl #154181
+		export NLS=1
+	else
+		export NLS=0
+	fi
 	emake || die "emake failed"
 	if tc-is-cross-compiler ; then
 		make -C "${S}"-native CC=$(tc-getBUILD_CC) zic || die