Drop gunzip on man pages (portage automatically takes care of that), simplify use/nls logic, and only append -lintl when USE=nls as this breaks uclibc systems.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

3 files changed, 27 insertions, 13 deletions

diff --git a/app-misc/realpath/ChangeLog b/app-misc/realpath/ChangeLog
index 70f66cc3e350..deadadbedd47 100644
--- a/app-misc/realpath/ChangeLog
+++ b/app-misc/realpath/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/realpath
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/realpath/ChangeLog,v 1.24 2012/02/07 20:33:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/realpath/ChangeLog,v 1.25 2012/04/23 22:33:56 vapier Exp $
+
+  23 Apr 2012; Mike Frysinger <vapier@gentoo.org> realpath-1.16.ebuild:
+  Drop gunzip on man pages (portage automatically takes care of that), simplify
+  use/nls logic, and only append -lintl when USE=nls as this breaks uclibc
+  systems.
 
   07 Feb 2012; Justin Lecher <jlec@gentoo.org>
   -files/realpath-1.14-build.patch, -realpath-1.15-r1.ebuild,
diff --git a/app-misc/realpath/Manifest b/app-misc/realpath/Manifest
index be4c52154239..20512af4f426 100644
--- a/app-misc/realpath/Manifest
+++ b/app-misc/realpath/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX realpath-1.14-no-po4a.patch 288 RMD160 0c652a04b84432353b0547dba1454a4784350ee6 SHA1 0ef6f48971ffd947e09361225c1faf6d2f6f6c32 SHA256 5fc4321c8e6a3906366d198d309768de026b628ec320bf4c00c137f9fa6eeacc
 AUX realpath-1.15-build.patch 1083 RMD160 f3564d00f7772fdb9da9b2830eec3e90142678c6 SHA1 7bcc6fd8f1a36563f7a4a7cebc4d75b02b626dc8 SHA256 d3e92fbb823cc3b20017cbf1dd370ade7870f36dd819d199ebff1a04534e41d3
@@ -7,13 +7,23 @@ AUX realpath-1.15-prefix.patch 1443 RMD160 fcf72dedc5ce1308a8ec554974dbd92b7698c
 AUX realpath-1.16-nonls.patch 685 RMD160 f4c98a29973a783b4defbcd56ed99ade9a5aad19 SHA1 6a807bf60f31a6714ad8408200e6358433e93cb1 SHA256 ea9c3bf075d932a6d1c3e92f31050a1272cd5f2135f079bac17788acb417ffbe
 DIST realpath_1.16.tar.gz 17420 RMD160 f90ebc48f64d611825cdcf6a6eb61838a36f91c6 SHA1 ecc9272dcc3844c0d01e1606674d62ff52721a56 SHA256 b42b4c17a29d1cca933f42c463771d4162f35a731e801dae1312b65fc4d702d8
 DIST realpath_1.16_i386.deb 16114 RMD160 6abbec5c6b59f8c35659276e110aa6c661a852b4 SHA1 40dbbbcfd7e2a71c75e6616c29268cc30bfa408c SHA256 596a20716bf0cc1fc036b0df0ff793c27dde24522fcd10edb04e47c3bc892a97
-EBUILD realpath-1.16.ebuild 2369 RMD160 dca0aa2d58cd6197813de25ab464d0f61a7217bd SHA1 57efe0a525de9c4787e46061fa6e1c82fb4db32d SHA256 03856f460b0b110136908dc54587b606d6599d323671448a6e48704caea38967
-MISC ChangeLog 9537 RMD160 510b07b3a60e89448507be7655130b0862131e10 SHA1 6af8cfcf5bd6599a72bcc7c2b94d0c6da7d06d2c SHA256 012cf6a9df5674698b827d6bdfd4d808d3bab9641feec9e5391b473ae07b34a2
+EBUILD realpath-1.16.ebuild 2326 RMD160 ca8a9e9026fd4fee91384aff8eb6b6762e9ce46a SHA1 ffd8bfb0d4aba976d00bfc83457d43bc539b2c4d SHA256 7eebdf53d3fb8e496d3253f19471c169227f3b77925601694a1f5dafaed9bcaa
+MISC ChangeLog 9778 RMD160 29578417fc853c766db7e753a53d741633936fcb SHA1 e0ff31a8caf005369ce46cc0975d1cb90f261c0e SHA256 4be3fb53c8527a9e4e4c40bcd8173ec78e46091e35c0a89bb0185a67f1afcd40
 MISC metadata.xml 330 RMD160 8e4fb7e078006d9ec92fc010ed29b1c3db4b1981 SHA1 0ce456d51b531a1915118f4a382e56288206fc16 SHA256 547bed0d72e01786755f761c092ae7d23d46a77f88565acf3b32ab8622954de3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAk8xipEACgkQgAnW8HDreRa2QQCgo2KeTAwYzVxMuDqb9mYRNl30
-3sAAn3uERTkobinwMcwUO8Si3qOl6fwU
-=vuZW
+iQIcBAEBAgAGBQJPldkxAAoJELEHsLL7fEFWRVoP/jZpr7I3hCrVLFgd8q4XlEMX
+bgzv91DERt17OT6b/KtxuZ/u4r3WAB8I0uwQFTIhkkNnSF9RdGoY1lMtsFGZ/BES
+JZX8B7AeVjW55MdxBWT9997+Ej9tvzOqKE6DBXTQmJhiXm0SPz+I5N9DXxDvHXcE
+FCAtmNYWnBrASMaO9huQsAg0zEsg5tZe3WF9fhOqTaJ6AgTpwiXHJXxvdiV7qxcy
+opEdkxinvorG9OqNt/RC4bmhYwqJDwExxP6qWM12xtncpkI6/ElGwJoYH3q6d7lb
+efPa/nvVAyRB3+TMojv6ZgJQUQL7yGBITwzEKw/xhFzv7wMdDkBfYwVNasicMKgZ
+r2JjoU8rT11IpfAjc3QvadiTGWW/JZg/z5GZO5wzgix2Qf6SxkG2KTCeYLWqMQqL
+MbP5O6Cx/3ctoXRiQH8GLyB6RN8jTyhdd5PILT0wBinKcJu5ov4BVZgxbp+uMI3c
+gNt5IvFRan7f2awmBCE9Rjjt/z8Kkkq1F4XbbBRIL7+ouh6L1jxtJsCtqR8uuNCH
+Q/eyxnoYMwnDLtQHyPdwz8n78GnDPrv3xfs+zdrRch83J3gOeRg1G1lcer0C78a2
+WndvlCuBelO7fhkCky5D6p5UJrEbaeFlKKA3acIWTDimrIWhycKw6FJybxiGuw+o
+2rQh0pMjFLgDvLg5WOtO
+=uKi1
 -----END PGP SIGNATURE-----
diff --git a/app-misc/realpath/realpath-1.16.ebuild b/app-misc/realpath/realpath-1.16.ebuild
index 1bad77ecee7d..6ca2f0a3310e 100644
--- a/app-misc/realpath/realpath-1.16.ebuild
+++ b/app-misc/realpath/realpath-1.16.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/realpath/realpath-1.16.ebuild,v 1.8 2012/02/07 15:25:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/realpath/realpath-1.16.ebuild,v 1.9 2012/04/23 22:33:56 vapier Exp $
 
 EAPI="3"
 inherit eutils toolchain-funcs flag-o-matic prefix
@@ -33,7 +33,6 @@ src_unpack() {
 		cd deb
 		unpack ${PN}_${PV}_i386.deb
 		unpack ./data.tar.gz
-		gunzip -r usr/share/man || die "gunzip failed"
 	fi
 }
 
@@ -47,7 +46,7 @@ src_prepare() {
 
 src_compile() {
 	tc-export CC
-	use !elibc_glibc && append-libs -lintl
+	use nls && use !elibc_glibc && append-libs -lintl
 	[[ ${CHOST} == *-mint* ]] && append-libs "-liconv"
 	if [[ ${CHOST} == *-irix* || ${CHOST} == *-interix[35]* ]] ; then
 		append-flags -I"${EPREFIX}"/usr/$(get_libdir)/gnulib/include
@@ -55,12 +54,12 @@ src_compile() {
 		append-libs -lgnu
 	fi
 
-	emake VERSION="${PV}" SUBDIRS="src man $(use nls && echo po)" \
+	emake VERSION="${PV}" SUBDIRS="src man $(usex nls po '')" \
 		|| die "emake failed"
 }
 
 src_install() {
-	emake VERSION="${PV}" SUBDIRS="src man $(use nls && echo po)" \
+	emake VERSION="${PV}" SUBDIRS="src man $(usex nls po '')" \
 		DESTDIR="${D}" install || die "emake install failed"
 	newdoc debian/changelog ChangeLog.debian || die