Drop USE=git from the default as the overall size of the git package is larger than the space savings of the raw tarballs, and the latest gettext versions no longer require cvs or git but support raw tarballs #339547 by Jared B..

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

6 files changed, 37 insertions, 27 deletions

diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog
index 1e3c804f9273..fd012674d8e9 100644
--- a/sys-devel/gettext/ChangeLog
+++ b/sys-devel/gettext/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/gettext
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.200 2012/05/23 23:19:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.201 2012/06/05 03:46:34 vapier Exp $
+
+  05 Jun 2012; Mike Frysinger <vapier@gentoo.org> gettext-0.18.1.1-r1.ebuild,
+  gettext-0.18.1.1-r2.ebuild, gettext-0.18.1.1-r3.ebuild, metadata.xml:
+  Drop USE=git from the default as the overall size of the git package is larger
+  than the space savings of the raw tarballs, and the latest gettext versions no
+  longer require cvs or git but support raw tarballs #339547 by Jared B..
 
   23 May 2012; Mike Frysinger <vapier@gentoo.org> gettext-0.18.1.1-r1.ebuild:
   Call elibtoolize since we inherit libtool eclass.
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index 24cb27c6a618..52e5c6f71ef5 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -10,25 +10,25 @@ AUX gettext-0.17-x-python.patch 1054 RMD160 5de4646fe872d6cea8ec843fa6e2c519cde2
 AUX gettext-0.18.1.1-no-gets.patch 1547 RMD160 638dad555dcebaf6a0e1abdaf795b83c5106ded2 SHA1 a86db41420e778a5f93b111f242c6b1864241a26 SHA256 014e8d8ed06cc2eba664ca9559b2a4f5a2a396474df2ce9bb3647e20316adaf3
 AUX gettext-0.18.1.1-uclibc-sched_param-def.patch 648 RMD160 2083b28d495f377e2075732df46bef89208e9fe7 SHA1 bed00c6cc3d0f2116f8905dad5b28feb7ff8b506 SHA256 9793f511543a09cfb3454fa2ad1fd3a565c207152d020b35d62ae9460550c47f
 DIST gettext-0.18.1.1.tar.gz 15139737 RMD160 0ca0b6bf0219440404a86f0c16cbac3d1a2ecd37 SHA1 5009deb02f67fc3c59c8ce6b82408d1d35d4e38f SHA256 93ac71a7afa5b70c1b1032516663658c51e653087f42a3fc8044752c026443e9
-EBUILD gettext-0.18.1.1-r1.ebuild 2958 RMD160 c351c91fd0e05bbfeab34fc87a4807340ab3ec25 SHA1 0c61032348e0d40fd305b9ddf4896e3ec241ec86 SHA256 918235ddb5be9f32d3739f611cd13b005934c797a3c1b5da54a58984dae04a13
-EBUILD gettext-0.18.1.1-r2.ebuild 3440 RMD160 ca92117d2e83d442665af8c9b268ebc0cf02fb87 SHA1 d7138c1de8bc39e25e1d8ddcb01cb8a978e21b5b SHA256 65c6c50276e854efe88e260876b53879647785c64a7c98422a6a5a7a93c3dc9d
-EBUILD gettext-0.18.1.1-r3.ebuild 3589 RMD160 66b87999bb89c4518ded9138e034285d54e33eef SHA1 1984bfce32249aa5ca21cf55c5751887a24de731 SHA256 c9b35918567921aa8785c48ca76023bee24d509cd9ec454328b0a9aa8132b3d4
-MISC ChangeLog 26129 RMD160 38eae525c4a74fabf4e58c63d72b0370a61103e6 SHA1 ab0a9eb677adff9b1315a87f9981eec9c90c7df1 SHA256 50c1a4fa813f4f90126c85bed34b578822b08f31a5934dff83687aa4fa692814
-MISC metadata.xml 370 RMD160 d4affadca5919e8b349259ec245da6bb9164d735 SHA1 52bde5b27f373b5ce42d98346e8c8366cc7c22ee SHA256 75e6b478fb79e4575d24b15c4a5963c4f7a00fda1816d3993527887b3cdfde66
+EBUILD gettext-0.18.1.1-r1.ebuild 2957 RMD160 d106100c651aa94ccb2c9acdb38ef9da8e90a019 SHA1 fc2c63833f43bce4a15eb8e001d4e76df27434e4 SHA256 e5814bcf742253abbbb0490eb9457fd72b9b48f062bdb910d08ac3fb4506f096
+EBUILD gettext-0.18.1.1-r2.ebuild 3439 RMD160 5db6ac11629158363cf6e755cecdd9c6d3e56edd SHA1 40061a7cbe8b95058b11c05e8acf619f2dbfea7a SHA256 a7154333ab87ce8ead0365d7f877d24fb0234b63aee3c2dd40621f91d330b7dc
+EBUILD gettext-0.18.1.1-r3.ebuild 3690 RMD160 9ade87012637288e53fbe3eb3ececfb2ab9e5acc SHA1 4dac87af99cd9ce6c624c7cfb9e3527215578e47 SHA256 0d60cbf0860ff768c784b47ad29b5e6f1295b6338fad9cc010f2e485b9d98b52
+MISC ChangeLog 26516 RMD160 135f78ec1b80778471627232373108b8c4232b52 SHA1 35867971f78cab14acd1029fb96d2bd90cc3e093 SHA256 228447493d25091ad973d24962d7a0a55228ea64b036a7e2356da7392e2260b0
+MISC metadata.xml 563 RMD160 d1587454ae0a5502dac886e4d8892298b67b6cbc SHA1 e79e10752e36ce141c368cd19b7c5f4fd3350b6d SHA256 414278bb30c3b2309bb33176d15a3fd4b69d70cbf18e7e58320d799066c821ab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPvXDEAAoJELEHsLL7fEFW4AYP+wfsw6O48DLbD+xDXhBbWeFf
-Bb2LHW5Y+00jx0qn3YoCAbrXTrd9MMDgFbtkoFBRWBBD7VTfOlFx94Moh1k6jLkL
-71ue8gcx0DIz9qMfCFQjzOwEAwybZyYcuLKTnlHd6Txkrpis6HSYOlHUNyqelwbH
-bmkc/u3WGIaBqm6My+bE2g65JS363XdOr2T0gjnk9HOmnJiE6xEv13TAKMeBLfsT
-tqoZcj9GkEf0WaeWJni6DRrLRSaR9OlXikVatuv3U0RsxzeCNCWXb7Q+JcIyD5KZ
-y8zry0VdxCbLB2SMkNL3EXI7eN+nYva9ku3ZwGMYwCEbvPw+TSDJNfCwYk/AHH40
-JF1e1ScNKB6PMrAikTuX+2/FnkpInwRg48Y+NHolWUwLyCfMw2bcK3Jcp7WDFeYO
-ZKmKrVLb5Xbfe/2fJY9pChL9yB8woj7SloNkFImkHpJY+M4AyLiSlu80xBIczfMY
-CBNieqcgzGfZN4Ndu8pTBtXABK6LG3heEJ5kxZflt5hcZXggjdrFyvDuurAo+/bz
-DUI+U573y7qPha1LffGceUYz9h1wpUMS9+NHfX5u/pUrlzrEPw/njOQWVoyAtuv8
-V8t6+3w0T7Xx88f8ahLVr33nz6m3p7yR/uixwPhKykORVOJkXrC8zL0GN6ZTQZxA
-rnn3eTtm5ZX+KyWfdOrS
-=9qs4
+iQIcBAEBAgAGBQJPzYEzAAoJELEHsLL7fEFWC2MQALTZx049YB++byQwqw20Q7Gp
+GgtjH8O0ZgIA9qsJfQuzcdn82QJuaTuPVGnNlKXl+EftaJYeqMuQPAkluibGrZaF
+H8tHxFmEXBo/HmsOVP8wZr9MKi+XGFK4ZzXhomdWn8xMa1F6BMm19NpwN+ZnBPyg
+FPaiwlX6i7AK5Sbp8BUEywP6tP49KDpN4Mjpqo57V3V2y0P6nd0uIeKj94jIlQrt
+Hhf+S4TDV4dDgLrE0P3PqJvwDOiDqpWKo86lxJNz4ppQ+Z331tcnCtrPTdB66Z0K
+VTRKFzBJwvAaA0cLyWeYhIMZYj0JjJmkIncCiZwbd6iPFmao+xAJH5Co483BHUdO
+sUrGagCsNu1CVEcmLpuz71L9fEQlAQD2y7ro3ymA1fWCYz+0pKOh2tD94NnwZDpQ
+Tpo4IV7tpP5PUP77cr1WazY/Zt4SRxVOwkhkJ7p/LzyRKMoeXMUJIn24VOVkuuPr
+wVL9hkgqILZm9t4JIKn1pFwRN6d0NoWxaHrnNs+YnvBRMJXMRUWghHQK+en+54t9
+yNQPijmlTgCOHCRE9JAbM5oB9/sMuvdKu/3pdcxz03JyopUUjkSSCRbGynBF+1o5
+ZatCzOg9vl/Hne9NyErX1lfRVMAkq4oGre+fcSl2aDz8sWEk+jzrqRoHmnJHiztd
+G4EDItmGbOiTVGCJor50
+=5IvN
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gettext/gettext-0.18.1.1-r1.ebuild b/sys-devel/gettext/gettext-0.18.1.1-r1.ebuild
index 0544fe313e81..59f55462c605 100644
--- a/sys-devel/gettext/gettext-0.18.1.1-r1.ebuild
+++ b/sys-devel/gettext/gettext-0.18.1.1-r1.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/sys-devel/gettext/gettext-0.18.1.1-r1.ebuild,v 1.11 2012/05/23 23:19:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.18.1.1-r1.ebuild,v 1.12 2012/06/05 03:46:34 vapier Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 LICENSE="GPL-3 LGPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="acl doc emacs +git nls +cxx openmp elibc_glibc"
+IUSE="acl doc emacs git nls +cxx openmp elibc_glibc"
 
 DEPEND="virtual/libiconv
 	dev-libs/libxml2
diff --git a/sys-devel/gettext/gettext-0.18.1.1-r2.ebuild b/sys-devel/gettext/gettext-0.18.1.1-r2.ebuild
index 5759e548df44..f5a2a1f3b7d2 100644
--- a/sys-devel/gettext/gettext-0.18.1.1-r2.ebuild
+++ b/sys-devel/gettext/gettext-0.18.1.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.18.1.1-r2.ebuild,v 1.4 2011/11/13 19:21:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.18.1.1-r2.ebuild,v 1.5 2012/06/05 03:46:34 vapier Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 LICENSE="GPL-3 LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="acl doc emacs +git java nls +cxx openmp elibc_glibc"
+IUSE="acl doc emacs git java nls +cxx openmp elibc_glibc"
 
 DEPEND="virtual/libiconv
 	dev-libs/libxml2
diff --git a/sys-devel/gettext/gettext-0.18.1.1-r3.ebuild b/sys-devel/gettext/gettext-0.18.1.1-r3.ebuild
index 37037e3df4bd..722a384a496b 100644
--- a/sys-devel/gettext/gettext-0.18.1.1-r3.ebuild
+++ b/sys-devel/gettext/gettext-0.18.1.1-r3.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/sys-devel/gettext/gettext-0.18.1.1-r3.ebuild,v 1.4 2012/05/23 02:12:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.18.1.1-r3.ebuild,v 1.5 2012/06/05 03:46:34 vapier Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 LICENSE="GPL-3 LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="acl doc emacs +git java nls +cxx openmp static-libs elibc_glibc"
+IUSE="acl -cvs doc emacs git java nls +cxx openmp static-libs elibc_glibc"
 
 DEPEND="virtual/libiconv
 	dev-libs/libxml2
@@ -22,6 +22,7 @@ DEPEND="virtual/libiconv
 	acl? ( virtual/acl )
 	java? ( >=virtual/jdk-1.4 )"
 RDEPEND="${DEPEND}
+	!git? ( cvs? ( dev-vcs/cvs ) )
 	git? ( dev-vcs/git )
 	java? ( >=virtual/jre-1.4 )"
 PDEPEND="emacs? ( app-emacs/po-mode )"
@@ -51,6 +52,7 @@ src_configure() {
 	# --with-included-libunistring will _disable_ libunistring (since
 	# --it's not bundled), see bug #326477
 	econf \
+		--cache-file="${S}"/config.cache \
 		--docdir="/usr/share/doc/${PF}" \
 		--without-emacs \
 		--without-lispdir \
@@ -62,7 +64,7 @@ src_configure() {
 		$(use_enable openmp) \
 		$(use_enable static-libs static) \
 		$(use_with git) \
-		--without-cvs
+		$(usex git --without-git $(use_with cvs))
 }
 
 src_install() {
diff --git a/sys-devel/gettext/metadata.xml b/sys-devel/gettext/metadata.xml
index 37c817a947a6..757fc753a66a 100644
--- a/sys-devel/gettext/metadata.xml
+++ b/sys-devel/gettext/metadata.xml
@@ -3,6 +3,8 @@
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
+ <flag name="cvs">When running `autopoint`, use cvs to store the internal development files;
+                  this requires cvs at runtime, but will be faster/smaller than raw archives</flag>
  <flag name="git">When running `autopoint`, use git to store the internal development files;
                   this requires git at runtime, but will be faster/smaller than raw archives</flag>
 </use>