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..

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

5 files changed, 19 insertions, 9 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/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>