Add back libintl bits for e.g. Solaris 10

Package-Manager: portage-2.2.01.21418-prefix/cvs/SunOS sparc
Manifest-Sign-Key: 0x5F75F607C5C74E89

4 files changed, 31 insertions, 9 deletions

diff --git a/app-misc/getopt/ChangeLog b/app-misc/getopt/ChangeLog
index 423e1f276f1f..d77b4a564ab3 100644
--- a/app-misc/getopt/ChangeLog
+++ b/app-misc/getopt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/getopt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/getopt/ChangeLog,v 1.8 2012/12/28 09:10:26 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/getopt/ChangeLog,v 1.9 2012/12/28 10:47:53 grobian Exp $
+
+  28 Dec 2012; Fabian Groffen <grobian@gentoo.org>
+  +files/getopt-1.1.5-libintl.patch, getopt-1.1.5.ebuild:
+  Add back libintl bits for e.g. Solaris 10
 
 *getopt-1.1.5 (28 Dec 2012)
 
diff --git a/app-misc/getopt/Manifest b/app-misc/getopt/Manifest
index fc5cefcdd291..913e8ad709b2 100644
--- a/app-misc/getopt/Manifest
+++ b/app-misc/getopt/Manifest
@@ -4,18 +4,19 @@ Hash: SHA256
 AUX getopt-1.1.4-irix.patch 357 SHA256 2562a5585f5bc0b4dbe945cbecd94975839b135e4c1ec36069104394febd1061 SHA512 001949835eafe86d5f1f9dfef9892ebbf6b1c5a3d870cf57c4ac7543c048c061429c8f7cb754260ff16e2694bb497ed89c0d4e746f1c7064883a55940563dd92 WHIRLPOOL 9050b02b5e28cf79ffc5a35cf08b6b38bd9d417fbb4494314f8196a338fca118286bf6be554d37e9be7296caad71edd96e4fab4cfcec3a83cea489dc0433bfb3
 AUX getopt-1.1.4-libintl.patch 1119 SHA256 59566da700ae2dec970a5bc3c7e5112c63b55dba93a24138db5097204f462a8d SHA512 e986c409607cf7c3f6f20a99c3709ee2d49e3120cddb824883b3c2a48d097700914fb6ce1ddbb0b7c4dd721afcf0ddcfd97d8fb101ffdd046facf53909cc0596 WHIRLPOOL 0356f225259c4e486c4ccf68e22a35a6bc5bb14d69f408c9c749aec64ede8f5df750d0c5f8585975f372586d774998ff01e0a63eb98791c11541a5839ef27a0b
 AUX getopt-1.1.4-longrename.patch 4825 SHA256 c6331d44293dc315251ab3014f039456bf99e32880084ddc792b9a2ac2b971d0 SHA512 3710f35cf14f36aee628623bc03925c7c5db5f4ba251e257028518d343262c67c6ecd55aabc19ce247478811f30fb78bb827e2b66bc3471d17219173bbbb3758 WHIRLPOOL 791591d5dea7e76c099e94a50664536d5270d7a8983bf16fe701911377a2ae035105c0f3858c118ed6d5963faed132157c654cdf35635cbc5e8a30adca5d595b
+AUX getopt-1.1.5-libintl.patch 353 SHA256 b4a0857bae22fe85f8dbc3741d190ed1b258719257d0f6824298c3febd6cae3e SHA512 eca001588a940f5bc50f95c0f93fc352f5dc647325a5b1ff0c7ddf0bf93e2c8fd2ac4f735c0ae5d48e4c9b2c54799e6d6028a5602147a3b9a28dc5e65e66f5ec WHIRLPOOL 6935d95391ef80e9ff6c4404b339e8cf84ac4dccf9caa8de4555ec5d6f6e7544ae045aa0ec45450d2e65cd528bb753ff40e9dd4f36c28b82ace817b6a1132ee9
 AUX getopt-1.1.5-longrename.patch 3763 SHA256 592cd45a9ac17fb0e0092cbe75580d75e4f06408693a814460129df5682ac7d8 SHA512 4c74684ed6ac90d89a8d100a32456985f544a6440924f503f732e3391d652485b637307a40849103d45781a197d077ab44fd9d63f371cdabfc34ae5cc4396987 WHIRLPOOL a9725839149b0938c9ec03942638043672ac2e162b40fc3b9dcd214a92a21f1275cccb42de2d104161255332954b5a5e31cad7b9eff3f14aeda25b6d6bcb3498
 AUX getopt-1.1.5-setlocale.patch 323 SHA256 2c2ad7608d15efc31581ee4f3c0064c0d93748539f9914cc2f081b0d80b6c2e7 SHA512 1ceb4353355cd1af697b5d46bd58b092b8792a2add97fb8498bfa6e036487e8c811333b03d0461117f1c2c5e90a3f33cf773cb9b0732c753beb8d75345e6c36e WHIRLPOOL 44b8364a0a7136bc12b30d7ea7474e13f9f5935f678a7205ecac873a0b34a7d3dcf9a8ea8e4b63ba869f533a75111cbdc9b5cb3c7769a7b295e35c7d54f5fd23
 DIST getopt-1.1.4.tar.gz 37163 SHA256 41083d9993c26792851e79b81a0991996a3f61e14998fdd607615cc3bf933bab SHA512 9ec9b5ca50a02b6ae772b133408e61fb9fcb5840c00f23d1c836a9c7ee86778211dcb1ecf5cdcaf9e2488b2db0671e29bc8be55f1a7ca4f1d48cc3921dfe04ad WHIRLPOOL 64e4942064930303ecc8cd6ea22f93ccd0c34415815f1e4fc43d2786b1e3bd511fac6d0aa6ef470b0a026a7776c4e0b345b1beada0c972203808232d0c331727
 DIST getopt-1.1.5.tar.gz 51794 SHA256 11893276b94b1629606ab75772143918a5713259950fbf4216288e246f19fbb6 SHA512 43597a1a8dd1dc188b6b4f0a8f8d438456013276aa1c719889e242ba2b526dccbca2fccd3d82d1541f4e0920fd277c101a436ed0c208124227481f792cb1cf75 WHIRLPOOL c5de1797b0c294a404ef8e801d86677d0b84fd6974e5d5ad8d234ae28db5446d0b13766362ecac459b3f8ce07d56282a3f0274b460d5d95118000762d9374815
 EBUILD getopt-1.1.4.ebuild 1831 SHA256 dc7d6fb1bafb9ed23184cffa56c5a7628c2407f583522648d19f909024505a20 SHA512 f2d892f5369221954b6ea001d50da85ba7ce688975a7425288d51111a44590c68872521443f42cdcdf839f3e6142579b5c385919616be15fc13b6ad2af858803 WHIRLPOOL 4a7ac1753a1d0401abac88e8de3af9f9fcfcd0cf31ba172640c001e342cd1065223f6cbf54dcf30a59019f6cf46c3a6d787e414a40a9a523652305068dc397d1
-EBUILD getopt-1.1.5.ebuild 1740 SHA256 256a2414f4bb1ed5d3ff9c098fc3d6737440967aab45db5bc7b20288a0d6d2c7 SHA512 a1a37f5d3d4b3c532f33d80c75eea0f5460591dac56de53fbf78c87760ef5d629b03e9a83221a91e3437d67131eebb29369539fe4086d3d2456b834708b6005f WHIRLPOOL d09d6e3d2e86c848114a6f1dce6c996f43107a62ae3bb7fa93665127af96aae690cfb56319265a991303e3a0b69f9569a1fb851a442059eb44ccf9f58a347a53
-MISC ChangeLog 1517 SHA256 91957a1510c524b0940eb39773d8709e5788342cf4fd8ffdc9fcfd0a6d015348 SHA512 e95677ac2d1d05e81881d8d5e6cfd0ac6c52f89e13278da70836d857bfbc73388712ff9e7015a0fb9da98925d9d0ba92f5a66c32cde4e71790c77248884b95f7 WHIRLPOOL 0faae7ebbc5435c91528ccd0c4aa24ae3599ce7eda7c20f84b2eb99a7420371b60dabde10f803c517b67a82d2deb7da9d510f53f54f09ea3cecbdf3897f1df08
+EBUILD getopt-1.1.5.ebuild 1880 SHA256 89266c6a911eaa9465916f9851efcd1e1c8e009622d362727c26d816c9e1a178 SHA512 6447d63ca56ed8a5c063a688dae6b23689aaba77c438548ac4978ecbc373b8368eb4b15a483ef4b023c4b8307171a2edd86a5050bf2aa57df6e1f46c1583012d WHIRLPOOL 18595ace65b893b7b1c20c05e302d6fa40e90924367f5789ed9283c7ddd75a925911c4acb451fa2b03136e9e0bc75bf9b8e1df7e027f1d8a055f75f9e44e7a7e
+MISC ChangeLog 1671 SHA256 d23bcf4d40ee05612123574ed7e9813605e2f9a84718b41c54d4867f4d30fa05 SHA512 7b49f576295bd4aacd194846804dc87253d61ba51b5cfacf02cbd083d9f1c92b1bb4f8c20103b5d456c4dc56df1f53c68d93c7eac5f2a1a59bd237636bd5db09 WHIRLPOOL 476c2dde5833519852275ce62a9be69233dd27d9a7e0bbeb0c5feaab0242cabdf46df23ea5edaf1c53a364d2536e7683e69cb1b201336b8513b542617f54b7b0
 MISC metadata.xml 176 SHA256 8e6c74feaa809489155bb0291854a8754da6d7c277f1189330845c33afd71371 SHA512 ce52e0ff5336ca9413757a79f1e13c63bdf58a02c2f823bfe24b504232487d70930fd9f9034f2b7f62d67aae71fc06805b6ea46cd2b098bb915a3c1594cfdd03 WHIRLPOOL e123b78e40c2f596efba9cb1378fb6f9f75f1bfadf4daedb7bec493f2c154075480f3e3394f1b230b6d22346ef8fba5e0db9a0ed783fbcc396599fd2b4b3696d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (SunOS)
 
-iEYEAREIAAYFAlDdYgQACgkQX3X2B8XHTol4YgCfX7spjDI3CbFh7/ZchHR4xhEN
-GisAnRGeFIX2M+XEhLOVLVaJSoN6TjD6
-=MILV
+iEYEAREIAAYFAlDdeOwACgkQX3X2B8XHTom9jACgmLX6HVKdyzqKaD1b6faRT03T
+oDcAn2ZW+IWz3qJaqGyKnyAzQXDVXgHZ
+=0KYx
 -----END PGP SIGNATURE-----
diff --git a/app-misc/getopt/files/getopt-1.1.5-libintl.patch b/app-misc/getopt/files/getopt-1.1.5-libintl.patch
new file mode 100644
index 000000000000..b40367105ed0
--- /dev/null
+++ b/app-misc/getopt/files/getopt-1.1.5-libintl.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig	2012-12-28 11:40:09.524686698 +0100
++++ Makefile	2012-12-28 11:41:20.646157275 +0100
+@@ -61,7 +61,7 @@
+ 	-$(RM) $(objects) $(binaries) 
+ 
+ getopt: $(objects)
+-	$(CC) $(LDFLAGS) -o $@ $(objects)
++	$(CC) $(LDFLAGS) -o $@ $(objects) $(LIBINTL)
+ 
+ install: getopt install_po
+ 	$(INSTALL) -m 755 -d $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir)
diff --git a/app-misc/getopt/getopt-1.1.5.ebuild b/app-misc/getopt/getopt-1.1.5.ebuild
index d47c904dd22b..3d7be230035a 100644
--- a/app-misc/getopt/getopt-1.1.5.ebuild
+++ b/app-misc/getopt/getopt-1.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/getopt/getopt-1.1.5.ebuild,v 1.1 2012/12/28 09:10:26 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/getopt/getopt-1.1.5.ebuild,v 1.2 2012/12/28 10:47:53 grobian Exp $
 
 EAPI=3
 
@@ -20,6 +20,7 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-libintl.patch
 	epatch "${FILESDIR}"/${P}-setlocale.patch
 	epatch "${FILESDIR}"/${P}-longrename.patch
 
@@ -29,15 +30,20 @@ src_prepare() {
 
 src_compile() {
 	local nogettext="1"
+	local libintl=""
 	local libcgetopt=1
 
-	use nls && nogettext=0
+	if use nls; then
+		nogettext=0
+		has_version sys-libs/glibc || libintl="-lintl"
+	fi
+
 	[[ ${CHOST} == *-irix* ]] && libcgetopt=0
 	[[ ${CHOST} == *-interix* ]] && libcgetopt=0
 
 	emake CC="$(tc-getCC)" prefix="${EPREFIX}/usr" \
 		LIBCGETOPT=${libcgetopt} \
-		WITHOUT_GETTEXT=${nogettext} \
+		WITHOUT_GETTEXT=${nogettext} LIBINTL=${libintl} \
 		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
 }