also add new USE=nls support to git-1.7.10 ebuilds

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

4 files changed, 27 insertions, 22 deletions

diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index 67a519660900..b6ca16b3efd3 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,10 +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.134 2012/06/14 04:55:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.135 2012/06/14 04:57:27 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:
+  git-1.7.9.7.ebuild, git-1.7.9.ebuild, git-1.7.10.ebuild,
+  git-1.7.10.2.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,
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index b7914c32f454..fb56a9f3a891 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -93,8 +93,8 @@ DIST git-manpages-1.7.9.7.tar.gz 512914 RMD160 d42444c20a793c07885579f7cc2c1ae17
 DIST git-manpages-1.7.9.rc2.tar.gz 508558 RMD160 ff92b1eb6cf41a760ff814fbe25b6ead77919edc SHA1 8565f64f6227fcfba3f768dabdcd9d6037f08842 SHA256 4f84e77e90abada3ac89082c7cef49af791bf63b76427edf4c9d25c732ba4a5c
 DIST git-manpages-1.7.9.tar.gz 508027 RMD160 d8b3502c1049933bf9d756f7131a42e0bff50e70 SHA1 1ca1fc430b2814f9e9cf82ec3bf7f2eaf5209b7a SHA256 b85c4533c0bbe0a5920399b3dc856577feaec2bbcde60c577338d29fac2f2cb1
 EBUILD git-1.6.4.5.ebuild 10406 RMD160 974979cc54ba06659818d908b6a4fc37a2e463a1 SHA1 f5b78964fcc68509bd32baffef8016c9ad710bcc SHA256 186e72aa90b3c98448a64b7ae718772675a601c80091509b1ccce44c824830e1
-EBUILD git-1.7.10.2.ebuild 16746 RMD160 f95a955c554274a9b6d66599f462cab2de483995 SHA1 6171e85930fe8f7bff7028ec40073088a7e3fa14 SHA256 d419785b72e0642eae3afbdefbdd56c5a8a574d176b3b7d19b789cd188682eb9
-EBUILD git-1.7.10.ebuild 16742 RMD160 71c6591f3a1e2c85937c3d026ff31302eff2ef25 SHA1 8e611255a5d79c2730d2e3daf8a97b6bdf578464 SHA256 eaff7eae45fd034d724e49f87a9383cbc545d6304dfe1144c10563950de61b18
+EBUILD git-1.7.10.2.ebuild 16466 RMD160 bceebd50e49c3640a1bc2e911e549aa12d8e942b SHA1 d63379992c611d4dbb8540788e9464380aca1fa3 SHA256 b04ecdc376c4deaeb5b2756389c27e31cb9acb9dba1ed7ca569727416c7edf93
+EBUILD git-1.7.10.ebuild 16463 RMD160 54942d7a6b3fc71464800b20281192b84f266c8d SHA1 c369c35a7bde05f653c39bfd6fbd42668bfa36b7 SHA256 09fd9fb3bc2352bfe303099f13ac63cddb3014cc144900200a3fe1323bd0f573
 EBUILD git-1.7.2.5.ebuild 13520 RMD160 9411dac852204b7446bcbaddf3c96ac25f3b6028 SHA1 7fcbba3389a5f8dd1fbf2ed228285d4351b4d000 SHA256 666e01293c6884d6ac11578b45f1fdcdf298cdb6d194c249f8e993d6c1b27343
 EBUILD git-1.7.3.4-r1.ebuild 14029 RMD160 217641ce0f1d00817a1c8bd70d5e7dc422f886fc SHA1 45c8c571e45e46c01f851ef7e1b4281665ccb54a SHA256 9d0c67c61774f8f1f644b182c551d53bdf305dffaad390d0f0aa3cc048c4f662
 EBUILD git-1.7.3.5-r2.ebuild 14564 RMD160 d56ee76ca2232cb851308b4d65382fc4ef146b71 SHA1 0ab0291ab495e6a0d48c940b341c2dfbad44f012 SHA256 3b00f97a76975c43798128e12c3ec1242fc106116d132fe229bf01a2c8b10269
@@ -118,22 +118,22 @@ EBUILD git-1.7.9.7.ebuild 16464 RMD160 848315a84f6973c3c13c44ea1418ef80b0c72d3f
 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 16019 RMD160 25e67476bed06e6dcd72b0d5e34be70ee85b8513 SHA1 3d51334e29ce9dde758f47fc0f885285cbd72bfa SHA256 09e67453aa7489cf2382686dc053b366765122970c74891fbc20a6605af0766d
-MISC ChangeLog 88419 RMD160 d6b2e1aee7266842b1d13ca46e274c91ba37d5ab SHA1 708234f68cf6ad8a0c0bfb66b8437543447537c7 SHA256 beade1343eb1473832ebfee26f91ae2253ad0cf8aaa9dc452285add5a94492a3
+MISC ChangeLog 88503 RMD160 2165264c3eb38fffc1b3912c2ab95fee1055f9db SHA1 fab2a0acc4f9c626378cd3373836567c64821a13 SHA256 2c804240ebcf330cf9e5a921196746d366cc20ce865453a1a3d390a5ca4c32d8
 MISC metadata.xml 1519 RMD160 4ba9e2c4e8239f644b1f4a82bc47d1b587e195a6 SHA1 813d8c8015a1cb757e54fa8681f8a7686cfc40e7 SHA256 58313781f3108991fee93cb0119e6720fe895487e43d44dbf96c4733f81854ca
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-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
+iQIcBAEBAgAGBQJP2W9CAAoJELEHsLL7fEFWbfgP/15WUAqM8VwJ7uqQ2nYrJaCG
+CWryMb8l/kMfDCFzpmUNpQt02mkFbm8kAbhxOd/Tsoi42pwlnSx5ImEuJuauSLCV
+udJSMc3dycJEc4Yftw0fyI26GYbELBxELPa3h04tssGFwFDSeUlKP0W/7UBB9RQy
+XLumQR8GVUigborwi6BwJpOCdaSYUkZ/U1bMlS9dR2hj7pnWI/o9Jr/Gig0I+gr4
+qTlxxGNpxNG1TZcfYM5TLA3mtRXQ0MGtsaa3cHXqcNi6eld8QT57cr3Sb6VSgdz0
+6S0/FCiYQoKKjU5xjs51qAk9LJ28l+aUWHd5SEgMoydHnQ8L5ttTJ92B3zm6wYnl
+MlGX3YFN8lBLi6RFtXS7xQDQ12gHIxUbPfDgrTv+KIUr2krPKYf8nSw92E9VlcxM
+etZxhX1yrZ9xa/YijqWkn4UM8luHiLTlx3cuc2MZZEcnW7Sny/WbJlga0X7O7+Ma
+p6+p4bzRg9rFO5Ty7n8g301MtUs/uZELI9x2pAK2kxjIeabM3yo//0OEoVONxthS
+ACzjvllKtOyFa7gQRL/AXKpZzmb9xWC1/jRNHRMtNJAfopg7BQTTfurZ80cVUAsS
+rD3YqLObse8JLI83KAJ5nXjeiEMpnX3crH3w03Jy2kGlVZJH6evi+iMKnBHqoCf3
+rnGV3wHBZguKj2zrCInK
+=eIRA
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git/git-1.7.10.2.ebuild b/dev-vcs/git/git-1.7.10.2.ebuild
index 1a152d984981..083b31e7b475 100644
--- a/dev-vcs/git/git-1.7.10.2.ebuild
+++ b/dev-vcs/git/git-1.7.10.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.10.2.ebuild,v 1.2 2012/06/14 04:55:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.10.2.ebuild,v 1.3 2012/06/14 04:57:27 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.10.ebuild b/dev-vcs/git/git-1.7.10.ebuild
index 12e81a219a68..138fbf74bbe5 100644
--- a/dev-vcs/git/git-1.7.10.ebuild
+++ b/dev-vcs/git/git-1.7.10.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.10.ebuild,v 1.3 2012/06/14 04:55:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.10.ebuild,v 1.4 2012/06/14 04:57:27 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 \