Make gettext dependencies optional based on the nls use flag (bug #387615 by Ed Wildg...

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

diff --git a/app-misc/realpath/ChangeLog b/app-misc/realpath/ChangeLog
index 2f361403776bf7b30c035a16b37750fca0a50cc3..627e7f3374f1681052c4c902c97107ea24f357a9 100644 (file)
--- a/app-misc/realpath/ChangeLog
+++ b/app-misc/realpath/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/realpath
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/realpath/ChangeLog,v 1.17 2011/10/17 19:52:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/realpath/ChangeLog,v 1.18 2011/10/19 03:53:28 radhermit Exp $
+
+  19 Oct 2011; Tim Harder <radhermit@gentoo.org> realpath-1.15-r1.ebuild,
+  realpath-1.15-r3.ebuild, realpath-1.16.ebuild:
+  Make gettext dependencies optional based on the nls use flag (bug #387615 by
+  Ed Wildgoose).
 
   17 Oct 2011; Justin Lecher <jlec@gentoo.org> +files/realpath-1.16-nonls.patch,
   metadata.xml, realpath-1.16.ebuild:

diff --git a/app-misc/realpath/Manifest b/app-misc/realpath/Manifest
index 5bae046fd2c09bcd2157c69af2f5642271923eb3..8a3a26d73293639c9a0426491eedae08d99d2a93 100644 (file)
--- a/app-misc/realpath/Manifest
+++ b/app-misc/realpath/Manifest
@@ -11,15 +11,19 @@ DIST realpath_1.15.tar.gz 17406 RMD160 83129946171248446b3bcd1eae8ad82217c4248d
 DIST realpath_1.15_i386.deb 15670 RMD160 cedc694ff0e7302581ee3a81ba951ca591309828 SHA1 a890ea32d012d712fc263a68a076631805feab4c SHA256 6fdcace221422a042d7fce941e46977adfb3b1da44d23e8be00628c56d726d3e
 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.15-r1.ebuild 1701 RMD160 70833465db01644445cb2fdaaf08a564443dd2d9 SHA1 fba0246616e26d173d928aef5a7a93447868457c SHA256 9134173886fac6fc4a97e80f4aa7929f3498eb7612eb325056eb3652629401d7
-EBUILD realpath-1.15-r3.ebuild 2386 RMD160 8a9ce34f6a193dbb572313a34c3e764a3e598d47 SHA1 8090ee2d01bc7e21edc818fb720454063a5b87d3 SHA256 ea625486b288fd0f8f4ab257991507757c0aeda92c3e905e41c523abec89ca14
-EBUILD realpath-1.16.ebuild 2397 RMD160 10061f3dcf8c49e2d9497492eb298da2a042bcbd SHA1 346bcd72c2b3012a7ab1884dbd1f6e267507d113 SHA256 f0431ed18cfbb3590852e9e0c8823cf99bdc193cc4b73681802546956a6f7fb4
-MISC ChangeLog 8538 RMD160 b81382dda8cb59274302a72414d01a4229570d9d SHA1 3c572ce2a2c75a39a0f7a90cd8f65a5dd42c8dc7 SHA256 89316e6d89f771ed1fee0a845897e22852286efda16af8fa68590f1672cd42f8
+EBUILD realpath-1.15-r1.ebuild 1715 RMD160 e25f2608bde3f4cb2a5785fdd156e154327b956b SHA1 16e99b1756e38af0c2386127974285d5fe22a9dc SHA256 8edbbae3b0f03cb96321df9edd4cbbc9ed73eb278eb6e2def5b55792325f562b
+EBUILD realpath-1.15-r3.ebuild 2409 RMD160 5d153b4bc0e96a123a1914c0eabce38ed47c82ac SHA1 8264329b6f140552667e348aa63305cb3384ffa3 SHA256 041d25e7e055bb188d94b6436da5a4720bec6d1d742399b07dc09689b0a38276
+EBUILD realpath-1.16.ebuild 2420 RMD160 32b543f438306fa5488c65226dfb07cd1aed2dee SHA1 6da74e0b3f14a685cfa2eee7fbe15c7c86d92d30 SHA256 e8259e42cff94c6e06efd1d84a061816d83053ff2d6c7c41f18e193cd5c95c34
+MISC ChangeLog 8763 RMD160 96bf2b67f59453a7768d88fc85c951bb514a3107 SHA1 fef0a74e2ba64c4f106bf056bc60934b986a1b84 SHA256 87acd4c59e423249261ad725f98afdee0d2ad608aab09233dd9235acbf1bff52
 MISC metadata.xml 330 RMD160 8e4fb7e078006d9ec92fc010ed29b1c3db4b1981 SHA1 0ce456d51b531a1915118f4a382e56288206fc16 SHA256 547bed0d72e01786755f761c092ae7d23d46a77f88565acf3b32ab8622954de3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk6ch8QACgkQgAnW8HDreRalGwCgu6RE1+VRXCiFy/3dO/dKNbxs
-4mAAnj8iiLS+1mype4wroEiatfMXbXoF
-=bKgo
+iQEcBAEBCgAGBQJOnknIAAoJEEqz6FtPBkyj0t8H+wQMA8NIyYWfkkiVqffPjepY
+DzD1y4KbhXyi4jUBaRR/piH9Oxh6EAvw5e94gjylLoj8Cpet/HZLi4SuK7f8c2/z
+1jm+3xcR6LSG8MwyDyCFpA/Mmy9dAv3E5sVOBiLgMinR1Cl5Q4sWzsuhn3r2vDD+
+V5YpJdAkH73/bXBOwa1AGdb3UTuAkRQlBKKF3nGl2M8y8t/Ya0WWlg5ej1Tr/Vfa
+LMinhmCqNm3fTKvez6nEitR+398segtBDzIxZT4tGH9zLpfPRQnkEWNxaweA2qji
+xDGEGjoT56tKbPmFrV+17uP1VcT68qSOfcePujIsKxtxbneU+2vGDkPhIOgUMPE=
+=d5Rj
 -----END PGP SIGNATURE-----

diff --git a/app-misc/realpath/realpath-1.15-r1.ebuild b/app-misc/realpath/realpath-1.15-r1.ebuild
index da1160f084b6fb3a16cee9f4d52a67693ee51c1a..8480b92ba279decbbca0b9e1e0f83ab5cf691f45 100644 (file)
--- a/app-misc/realpath/realpath-1.15-r1.ebuild
+++ b/app-misc/realpath/realpath-1.15-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/realpath/realpath-1.15-r1.ebuild,v 1.8 2011/01/01 08:44:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/realpath/realpath-1.15-r1.ebuild,v 1.9 2011/10/19 03:53:28 radhermit Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="nls"
 
-DEPEND="sys-devel/gettext"
+DEPEND="nls? ( sys-devel/gettext )"
 RDEPEND="!sys-freebsd/freebsd-bin"
 
 src_unpack() {

diff --git a/app-misc/realpath/realpath-1.15-r3.ebuild b/app-misc/realpath/realpath-1.15-r3.ebuild
index db92238d674a556c141567e7d02c1f85b8f5cd58..bdb3436bcd9b5d7f909c2f88b8f2bb5598cce6bc 100644 (file)
--- a/app-misc/realpath/realpath-1.15-r3.ebuild
+++ b/app-misc/realpath/realpath-1.15-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/realpath/realpath-1.15-r3.ebuild,v 1.2 2011/01/01 08:44:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/realpath/realpath-1.15-r3.ebuild,v 1.3 2011/10/19 03:53:28 radhermit Exp $
 
 EAPI="3"
 inherit eutils toolchain-funcs flag-o-matic prefix
@@ -15,10 +15,10 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
-RDEPEND="!sys-freebsd/freebsd-bin"
+RDEPEND="!sys-freebsd/freebsd-bin
+       nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
-       sys-devel/gettext
-       virtual/libintl
+       nls? ( sys-devel/gettext )
        elibc_IRIX? ( dev-libs/gnulib )
        x86-interix? ( dev-libs/gnulib )
        elibc_mintlib? ( virtual/libiconv )"

diff --git a/app-misc/realpath/realpath-1.16.ebuild b/app-misc/realpath/realpath-1.16.ebuild
index 7acb7d609f72e7b4f27b2ca4d58672866195d200..6e50ebae689c3de6dda521a02905c7d06c4905fd 100644 (file)
--- a/app-misc/realpath/realpath-1.16.ebuild
+++ b/app-misc/realpath/realpath-1.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.2 2011/10/17 19:52:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/realpath/realpath-1.16.ebuild,v 1.3 2011/10/19 03:53:28 radhermit Exp $
 
 EAPI="3"
 inherit eutils toolchain-funcs flag-o-matic prefix
@@ -16,10 +16,10 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
-RDEPEND="!sys-freebsd/freebsd-bin"
+RDEPEND="!sys-freebsd/freebsd-bin
+       nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
-       sys-devel/gettext
-       virtual/libintl
+       nls? ( sys-devel/gettext )
        elibc_IRIX? ( dev-libs/gnulib )
        x86-interix? ( dev-libs/gnulib )
        elibc_mintlib? ( virtual/libiconv )"