Add USE=nls support to control gettext requirement.

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

9 files changed, 55 insertions, 36 deletions

diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index ffeed8487987..4f9520e10cf4 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-vcs/git
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.132 2012/06/14 04:48:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.133 2012/06/14 04:53:12 vapier Exp $
+
+  14 Jun 2012; Mike Frysinger <vapier@gentoo.org> git-1.7.9.1.ebuild,
+  git-1.7.9.2.ebuild, git-1.7.9.3.ebuild, git-1.7.9.4.ebuild,
+  git-1.7.9.7.ebuild, git-1.7.9.ebuild, git-9999.ebuild:
+  Add USE=nls support to control gettext requirement.
 
   14 Jun 2012; Mike Frysinger <vapier@gentoo.org> git-1.7.8.1.ebuild,
   git-1.7.8.2.ebuild, git-1.7.8.3.ebuild, git-1.7.8.4.ebuild,
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index ae565ce9787e..b7914c32f454 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -110,30 +110,30 @@ EBUILD git-1.7.8.4.ebuild 14769 RMD160 52db8444de47ebd96e947a93082ed2eef651f3b5
 EBUILD git-1.7.8.5.ebuild 14769 RMD160 6443e7c1eff218bb9d45ea327e3c43e49c28ab5a SHA1 e2a81e38644821ff0f2c02956c03b3153c4e023f SHA256 9ddefdd129439c9ec5e8f6f76c9164010d39679fbf539394bd5094edc4471338
 EBUILD git-1.7.8.6.ebuild 14781 RMD160 b75093a524898f67658c46901b159ecfde048633 SHA1 f5302c4d07baad2cd86446c79c178e744281fda1 SHA256 f2c0c60e9b55622b076071f1514822c79a7427dd532f667b0692aaaf65472d74
 EBUILD git-1.7.8.ebuild 14767 RMD160 2218f55347ae3161d3cc3483f0ccf7315c3eca2a SHA1 c84dfde2d64dd98f94e9f794290a443ee238843f SHA256 25ce4faef6d965bda2e5c615793e926f1c09f93e8dd3a16e842b4470dd7908ae
-EBUILD git-1.7.9.1.ebuild 16403 RMD160 23520c18b320b09d298221708c5e589cf535f212 SHA1 8a406f59515dbf1738f77e7e5312c0b2ac2d9dc7 SHA256 e9519d8c1b79833b4b88a9b5331756aca1433fb64baf095eca7c8fc5dcca9738
-EBUILD git-1.7.9.2.ebuild 16403 RMD160 a735563c1825df1472494225514d6ed236638cdf SHA1 bd0ade75c42fe9a1e99feedc82dd7422fcd827b1 SHA256 4c63eae78c3c426438288543a1a0e688b90220e519340c8c5330c882e23f88ca
-EBUILD git-1.7.9.3.ebuild 16403 RMD160 e85631c5d7b85754c6aa21acd39bcdc3f80e00f1 SHA1 0f2ec21d4f39257bd07c516ce6bb4ebb22018312 SHA256 fd6dcfa217aeca6f08c14ba03da0b2d761bc43b8249757754fabe22d85890343
-EBUILD git-1.7.9.4.ebuild 16403 RMD160 cdce91e02a7d033ba58bda4a9beb5606ed2a38bb SHA1 9d107a15833fb2a99b53f2d2599319dfaae6b249 SHA256 bf4b6fbfb61d3ac3d55c6a2a8d8e2795c182af07d94788be153d0b3eab18a413
-EBUILD git-1.7.9.7.ebuild 16403 RMD160 565d1e3256f532fc401169465b9081b04957759a SHA1 ee6b9a3b55a5c48ee45f0fce07d055705ab10181 SHA256 e63d2af1032e3827e5ba56d61de58d0475372bc4a0566b06f27b623bc2ccff65
-EBUILD git-1.7.9.ebuild 16401 RMD160 9e21e39b9454155c42783d4f26179d3b376a7537 SHA1 efd2d45600b9500e6cbbde98831fcb323ef30900 SHA256 3b4ba57473b46abcaaed9f2354433e90fa3f2fbb24cd5958270cd8f5df923dc0
+EBUILD git-1.7.9.1.ebuild 16464 RMD160 d1cdaf794c487252fb076ebd9cc7714787f95df6 SHA1 f932f07219663bd807db0426f0b23ffe03e691a5 SHA256 c77c5b8e3ace80da1ded8ebda5c924dcf17ddfa3e105b61c4db0d88ae9402544
+EBUILD git-1.7.9.2.ebuild 16464 RMD160 9c0b97e194102e722b6dc0d1ae1482d45e07a265 SHA1 43dcc6aa9c0dc79a94a83306e8cdccddf75a9530 SHA256 0a53b89afde9184572484441698d8f81476be99a2b49edfc3e3b8b6348552ac4
+EBUILD git-1.7.9.3.ebuild 16464 RMD160 3acaf0d6e15c2c84c504e95fd4b9a3286c90512a SHA1 721b3d0704876d0f21657c35ed222d1ae7401570 SHA256 801eaac9cd818e4f6c43c97dd44c765c5eb5d29163a05177920f018de3ad13ed
+EBUILD git-1.7.9.4.ebuild 16464 RMD160 dcbdde3cb03a0b3182f74e23dc34234c4767f0b2 SHA1 e0b581404bd14a69d8c76aa873475691e30292bc SHA256 1b115146e7bf8285d1b87b3415c7b7aa47a5467d76115435a4e0dfede04680ee
+EBUILD git-1.7.9.7.ebuild 16464 RMD160 848315a84f6973c3c13c44ea1418ef80b0c72d3f SHA1 fda611e9e10bb5ee6802682530a0a9b40d1bce25 SHA256 9d3cad513b70112024bdd7d70f291c52fef89cf1d08d0581ea045481e847300e
+EBUILD git-1.7.9.ebuild 16462 RMD160 bf0550786b3cfd8ad775541b61db0f74c774896e SHA1 a87564b686940cc0b21116b001b4ddef4f1df2b0 SHA256 08f9717572de84ffbb1c93a134a9268920a16a313fc07773dd790fff0e4e0a3d
 EBUILD git-1.7.9_rc2.ebuild 16036 RMD160 84159ea871718442474dd5bb30bf22e007ef1367 SHA1 9dcfde78e66f6131ee0e84f61aebf19b365f3695 SHA256 0eb93296b4353374da0f7254a04f2cdf0b8d08210ef9d08f9ed11ded9baa401a
-EBUILD git-9999.ebuild 15958 RMD160 1adbe9a2520cb568fb2cf9b87d4146d80a935c34 SHA1 d63226c90d7d8a7a176880ac6229bfae886f036a SHA256 2c668018028de1413d8aeb4d38b419bd281861425671b5143f3f6d85fba82a92
-MISC ChangeLog 88175 RMD160 07f8bb592df1a456d36a8df06542763af785c029 SHA1 a28ce10e757760b94daf2c336ddf4fed699e7037 SHA256 d3bec323fea5da751c8919ab0e84eb8d4e62104e0c0919f7111a912e642d28b2
+EBUILD git-9999.ebuild 16019 RMD160 25e67476bed06e6dcd72b0d5e34be70ee85b8513 SHA1 3d51334e29ce9dde758f47fc0f885285cbd72bfa SHA256 09e67453aa7489cf2382686dc053b366765122970c74891fbc20a6605af0766d
+MISC ChangeLog 88419 RMD160 d6b2e1aee7266842b1d13ca46e274c91ba37d5ab SHA1 708234f68cf6ad8a0c0bfb66b8437543447537c7 SHA256 beade1343eb1473832ebfee26f91ae2253ad0cf8aaa9dc452285add5a94492a3
 MISC metadata.xml 1519 RMD160 4ba9e2c4e8239f644b1f4a82bc47d1b587e195a6 SHA1 813d8c8015a1cb757e54fa8681f8a7686cfc40e7 SHA256 58313781f3108991fee93cb0119e6720fe895487e43d44dbf96c4733f81854ca
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP2W0PAAoJELEHsLL7fEFW7ScQAJrChxdjcl1QPIM6gbniFZYX
-XO1pi6LYHir7EWxyRCI35K72GCvxzzmtj+SoVAeYpa9pFAQ0PTrrf5QZFZvSo7dZ
-hxWv3ZndADKJpK3dd8PZOFmGhynxvoLxXB7Dr6Olo+VZ/Lw/btAa5mxYlAT5k8L5
-Qy4mx5Qr7XNLzsAeZZELrTNSgh2M5lATwu7itU5KzRNyYX3jAqopMrSlYt0eOW9G
-Wr8OcUHNv27ghd6lXq0SxSw2OMu/jRgTKHTMKXjHfVRu2UdzmWAeV9UENP5mJD+C
-IqK4dFsl+/yQIc3IpFDOB0j14OiIDimQBDBq1D2c1i2VxL8CckoGTx/NRQ9STB1Y
-xCtYCTtgQPeudLYukk+LCqjQX62MHWvab95PHKe9a5gl5dLIwkwkva7kG/c6IUyA
-1mgWhQoXyRIWcSiukWlIvQ21aMppFSxEtnv6B0KP2mkmSebnlM38l3CrV2+E6oCZ
-nE0qPtlxVc/eGx3m4JiKYASRR0byZNb4x/uRvDxYGPJtfRZPJOYi9ImsYqjAjPLy
-vAGtnQhCtdovqd4k39HM8b4rjN2TqJhhyHZnaZz6M3+6ebKK932W3O9JG3szQE1Z
-bZbMeobu5uabXshA7fTn6a4agXaxpVJ4FF2xB23pCljbPBWCvmg6JNy87uXlsxxZ
-Sbg+2SUY2qfQG/XbgUjD
-=hPfu
+iQIcBAEBAgAGBQJP2W5FAAoJELEHsLL7fEFWa6kQAJVut6FtXvs+Z6olrwvOPCD/
+wdF8KvWhLrNdnTPmQCCNNXalLSOLF2RNjHt3fz+p0yFFDHjHgCOF/SW8NhgKaNV8
+JwoJGKX4HK3hqENBSc41Z3m6SJcdqvHgZJirzZpp06cavHTm4eLR6Zw/PZnSixVZ
+L5JZ8E0r50Q1smNmHC5RBbrvaWnm38Zq+yGqGTX1Orn8JeyhCFtSAhvy8VTMyMBU
+i/wNvwhUkXB4D6dlj+k9IkBkgTtNhbkFD3UCc3s/cXt3GFH68+qhzvRlsqTCGSfi
+9A/muTp5XFdJAJgk5m0s/jdZrGuIguv3oXEpnZmEQIRNG9ISHPmeYh49cdt470DL
+Fv7xBfVeuCamIBiegZuvsmB91McPgxlWzYQ5aMoWfsp3MClyxHd99ItvZQQXvc+Q
+FvVhE5Eqq/Fd+2tkrlsdN+zZuIIf33GTOzxTk6Ns7GyzixruOUgZGzZkkgPyi9+v
+P9PBZgwgtzAlF+oVSjPE4F77LvZ6rKaGThMzAEM7K3JmElA3UwVHURX2Ep7FaGws
+0tBy6RUdVFiIZpIwXJ8sRarmhxiWfeLGJcaZEBNpRYCiTlviPBbOp8jXwDilnhGI
+HpP2I0fApUxNnZJFd8o484bDdWtQGe9g5iPKG9CgFNvXgR9vZVn8GTpb358zbo0W
+NXoBXMKm46EeJaXFiv/F
+=lW8J
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git/git-1.7.9.1.ebuild b/dev-vcs/git/git-1.7.9.1.ebuild
index 64807cd79cff..f0ba3ae289e8 100644
--- a/dev-vcs/git/git-1.7.9.1.ebuild
+++ b/dev-vcs/git/git-1.7.9.1.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/dev-vcs/git/git-1.7.9.1.ebuild,v 1.3 2012/06/14 04:48:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.1.ebuild,v 1.4 2012/06/14 04:53:12 vapier Exp $
 
 EAPI=4
 
@@ -41,7 +41,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk +iconv +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -145,6 +145,8 @@ exportmakeopts() {
 
 	use iconv \
 		|| myopts="${myopts} NO_ICONV=YesPlease"
+	use nls \
+		|| myopts="${myopts} NO_GETTEXT=YesPlease"
 	use tk \
 		|| myopts="${myopts} NO_TCLTK=YesPlease"
 	use pcre \
diff --git a/dev-vcs/git/git-1.7.9.2.ebuild b/dev-vcs/git/git-1.7.9.2.ebuild
index 263bcd5c50e8..1777e72430d9 100644
--- a/dev-vcs/git/git-1.7.9.2.ebuild
+++ b/dev-vcs/git/git-1.7.9.2.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/dev-vcs/git/git-1.7.9.2.ebuild,v 1.3 2012/06/14 04:48:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.2.ebuild,v 1.4 2012/06/14 04:53:12 vapier Exp $
 
 EAPI=4
 
@@ -41,7 +41,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk +iconv +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -145,6 +145,8 @@ exportmakeopts() {
 
 	use iconv \
 		|| myopts="${myopts} NO_ICONV=YesPlease"
+	use nls \
+		|| myopts="${myopts} NO_GETTEXT=YesPlease"
 	use tk \
 		|| myopts="${myopts} NO_TCLTK=YesPlease"
 	use pcre \
diff --git a/dev-vcs/git/git-1.7.9.3.ebuild b/dev-vcs/git/git-1.7.9.3.ebuild
index b9f1bca812d0..3510526b1d12 100644
--- a/dev-vcs/git/git-1.7.9.3.ebuild
+++ b/dev-vcs/git/git-1.7.9.3.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/dev-vcs/git/git-1.7.9.3.ebuild,v 1.3 2012/06/14 04:48:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.3.ebuild,v 1.4 2012/06/14 04:53:12 vapier Exp $
 
 EAPI=4
 
@@ -41,7 +41,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk +iconv +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -145,6 +145,8 @@ exportmakeopts() {
 
 	use iconv \
 		|| myopts="${myopts} NO_ICONV=YesPlease"
+	use nls \
+		|| myopts="${myopts} NO_GETTEXT=YesPlease"
 	use tk \
 		|| myopts="${myopts} NO_TCLTK=YesPlease"
 	use pcre \
diff --git a/dev-vcs/git/git-1.7.9.4.ebuild b/dev-vcs/git/git-1.7.9.4.ebuild
index 63875669a0f6..b942d61c0f87 100644
--- a/dev-vcs/git/git-1.7.9.4.ebuild
+++ b/dev-vcs/git/git-1.7.9.4.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/dev-vcs/git/git-1.7.9.4.ebuild,v 1.3 2012/06/14 04:48:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.4.ebuild,v 1.4 2012/06/14 04:53:12 vapier Exp $
 
 EAPI=4
 
@@ -41,7 +41,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk +iconv +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -145,6 +145,8 @@ exportmakeopts() {
 
 	use iconv \
 		|| myopts="${myopts} NO_ICONV=YesPlease"
+	use nls \
+		|| myopts="${myopts} NO_GETTEXT=YesPlease"
 	use tk \
 		|| myopts="${myopts} NO_TCLTK=YesPlease"
 	use pcre \
diff --git a/dev-vcs/git/git-1.7.9.7.ebuild b/dev-vcs/git/git-1.7.9.7.ebuild
index 1b69b471e0e5..80d2b41ce5cc 100644
--- a/dev-vcs/git/git-1.7.9.7.ebuild
+++ b/dev-vcs/git/git-1.7.9.7.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/dev-vcs/git/git-1.7.9.7.ebuild,v 1.2 2012/06/14 04:48:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.7.ebuild,v 1.3 2012/06/14 04:53:12 vapier Exp $
 
 EAPI=4
 
@@ -41,7 +41,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk +iconv +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -145,6 +145,8 @@ exportmakeopts() {
 
 	use iconv \
 		|| myopts="${myopts} NO_ICONV=YesPlease"
+	use nls \
+		|| myopts="${myopts} NO_GETTEXT=YesPlease"
 	use tk \
 		|| myopts="${myopts} NO_TCLTK=YesPlease"
 	use pcre \
diff --git a/dev-vcs/git/git-1.7.9.ebuild b/dev-vcs/git/git-1.7.9.ebuild
index 434c188fdeda..4e40dd254600 100644
--- a/dev-vcs/git/git-1.7.9.ebuild
+++ b/dev-vcs/git/git-1.7.9.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/dev-vcs/git/git-1.7.9.ebuild,v 1.3 2012/06/14 04:48:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.ebuild,v 1.4 2012/06/14 04:53:12 vapier Exp $
 
 EAPI=4
 
@@ -41,7 +41,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk +iconv +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -145,6 +145,8 @@ exportmakeopts() {
 
 	use iconv \
 		|| myopts="${myopts} NO_ICONV=YesPlease"
+	use nls \
+		|| myopts="${myopts} NO_GETTEXT=YesPlease"
 	use tk \
 		|| myopts="${myopts} NO_TCLTK=YesPlease"
 	use pcre \
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 52278baa97c7..b723e2a5aeb7 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.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/dev-vcs/git/git-9999.ebuild,v 1.32 2012/06/14 04:48:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.33 2012/06/14 04:53:12 vapier Exp $
 
 EAPI=4
 
@@ -40,7 +40,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk +iconv +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -144,6 +144,8 @@ exportmakeopts() {
 
 	use iconv \
 		|| myopts="${myopts} NO_ICONV=YesPlease"
+	use nls \
+		|| myopts="${myopts} NO_GETTEXT=YesPlease"
 	use tk \
 		|| myopts="${myopts} NO_TCLTK=YesPlease"
 	use pcre \