Port bug #350330 fixes to newer ebuilds.

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

4 files changed, 20 insertions, 16 deletions

diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index 788b5afd277e..b49677d9b342 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/git
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.74 2011/01/07 15:11:30 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.75 2011/01/07 21:51:31 robbat2 Exp $
+
+  07 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> git-1.7.4_rc1-r1.ebuild,
+  git-9999.ebuild:
+  Port bug #350330 fixes to newer ebuilds.
 
   07 Jan 2011; Markos Chandras <hwoarang@gentoo.org> git-1.6.4.5.ebuild,
   git-1.7.2.5.ebuild, git-1.7.3.4-r1.ebuild:
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index fa6a6c30d258..464e71981b8f 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 50git-gentoo.el 472 RMD160 3d9c7dcb70d781dd7f12e4a19e838996681ec0d4 SHA1 fc47553c2422af82bbd2588e9853cc0c9cb437c7 SHA256 7cd37e8db7eaeee8d822d38851eb69771b0f09c79883a8e51309a9add85fdbe2
 AUX git-1.6.4.5-gitweb-cve-2010-3906.patch 6121 RMD160 c0f349228f0c1a2efa5684b9d8463c7d1e4ca03e SHA1 3e306dc154e16cd42619e9f06e4335c38a2bf630 SHA256 7d1f7894393cf22686fd0582b22dcfe91c4d4d7f8c4fc7ee8b439f49751c41e4
 AUX git-1.6.6.1-interix6.patch 457 RMD160 27bdfe9ab248791f628420cc45751fae2643b3d5 SHA1 6c80a5cb63cbcf89b61b8f5e2c16736cb0be09bc SHA256 a8b788b8ef41ce7fd1018f13795694a908fbb1884de195c89a58fe87f3968849
@@ -64,15 +61,8 @@ EBUILD git-1.7.3.4-r1.ebuild 14136 RMD160 c9bde051761319337f6ce8a6ca7aa5b8182be8
 EBUILD git-1.7.3.4.ebuild 13532 RMD160 b379ddde309f7100100918e35ba2c3d01ca6ee91 SHA1 07e6b99f28385aba1af0fed2fc8b9f520431995a SHA256 db389597432ac36a5b7040df99cc3db11e1c3d267e4c2e7e8da0c9658105fdd6
 EBUILD git-1.7.3.5-r1.ebuild 14534 RMD160 830e9397783317f88a6d53a8f178e8bebf9ead31 SHA1 a78dd360518b95a43a9d43a12ccf1b068f66851f SHA256 09bd4d06eca685dfa2378e25f84264bf19f655e6c7881b7260bb8dff42fc3074
 EBUILD git-1.7.3.5.ebuild 14182 RMD160 8dcb114ed8fb7c69cab8fb6263017f1ee46beedd SHA1 9fc7f6836d795377040addf54d2a00135d9d1417 SHA256 fd834346ba9cd9def74cc77376143601610915bb82c686621bbba28b9e5867b7
-EBUILD git-1.7.4_rc1-r1.ebuild 14389 RMD160 d1c95387bf033b1b0df00a53a488d39a93430b2c SHA1 222f8ebf589a45a1a9e2ce6cea7b244fabfc0ea3 SHA256 b97089e164cd3dcc7f8f74dfb4f3cf59d4f1119ce004db8483d8b8bdef982ea4
+EBUILD git-1.7.4_rc1-r1.ebuild 14556 RMD160 d5beb088508abb9e7d61c9198a484078b71806a6 SHA1 c0648f35a92dfcf833b7e8383122c88b200abd93 SHA256 5f409709c3678a39d1e66229672d8d7790813c943c1b828e93c07da4162bd32b
 EBUILD git-1.7.4_rc1.ebuild 14204 RMD160 90440a8dcb3c67814a58a150c05bfe28dc0aa2e7 SHA1 97cc1c2263e78c791a4a097a9b7c540efb67adc8 SHA256 3793d812083128b32cfc3a2c18628c5f4414690ddb6146eab6411459b15a8cd0
-EBUILD git-9999.ebuild 14382 RMD160 78af501801b13068da3f736db2e6209f5bed53a5 SHA1 ff7bfa487cfbfade77af830dad98f0b02c0d37ec SHA256 50019110744274ce66a964c66bd9068e445d6d9f0f86bb1d5d35289588cbe9e6
-MISC ChangeLog 77093 RMD160 f26f40b685d31e3ce76d2ce479229e5bb97ebe0e SHA1 18a04ccf7ff3c8f4a7ae5bf4150efbb0dd6796a5 SHA256 925947d50c56dc73a3e9ad7fb6b504e34ecc8c1c304adc80466271801ff2cfed
+EBUILD git-9999.ebuild 14549 RMD160 c7e37742de905fce1d69aa26cd507afc5a20feda SHA1 4c6bae8e1c63f852b46b03c4d4776bd56af64e8e SHA256 3c77bb9543ab7431e433dbf4195ddabbfd2824da033f0be4801276f197a3993c
+MISC ChangeLog 77233 RMD160 dccc629f3ed82b867efcb8661529e1445ca51e09 SHA1 0ad73b1605f65762b03d5fc54fa542a7712b2e7c SHA256 d1f646872792bfecfb67fcc7086eede134a7c01c6fb6aa0e7514a98f6a8a2098
 MISC metadata.xml 1609 RMD160 80bd2234e48fccd7a442fd6cce3ad9e2f8a05d33 SHA1 0b3b2f486530e009fbe055a87d58a161722f64b1 SHA256 2450bc31e647972be38e76068c6cf27c34e00cd8077f139a137f9d4c14d52a0b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAk0nLOEACgkQ9/cejkQaxBBPtgCeP/fxXr8t9bKW0/7uqPXbNESM
-ir4An081uD0PO5oPeIeV/B6hG3dYj6tP
-=PKRN
------END PGP SIGNATURE-----
diff --git a/dev-vcs/git/git-1.7.4_rc1-r1.ebuild b/dev-vcs/git/git-1.7.4_rc1-r1.ebuild
index 31953170f8c4..c9d826e96a6c 100644
--- a/dev-vcs/git/git-1.7.4_rc1-r1.ebuild
+++ b/dev-vcs/git/git-1.7.4_rc1-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/dev-vcs/git/git-1.7.4_rc1-r1.ebuild,v 1.2 2011/01/07 07:49:33 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.4_rc1-r1.ebuild,v 1.3 2011/01/07 21:51:31 robbat2 Exp $
 
 EAPI=3
 
@@ -142,6 +142,8 @@ exportmakeopts() {
 		|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
 	use threads \
 		&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
+	use cvs \
+		|| myopts="${myopts} NO_CVS=YesPlease"
 # Disabled until ~m68k-mint can be keyworded again
 #	if [[ ${CHOST} == *-mint* ]] ; then
 #		myopts="${myopts} NO_MMAP=YesPlease"
@@ -208,6 +210,9 @@ src_prepare() {
 	# Merged upstream
 	#epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch
 
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	epatch "${FILESDIR}"/git-1.7.3.5-optional-cvs.patch
+
 	sed -i \
 		-e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
 		-e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 3887f511ddd4..72a37efaa28b 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.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/dev-vcs/git/git-9999.ebuild,v 1.10 2011/01/07 07:49:33 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.11 2011/01/07 21:51:31 robbat2 Exp $
 
 EAPI=3
 
@@ -142,6 +142,8 @@ exportmakeopts() {
 		|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
 	use threads \
 		&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
+	use cvs \
+		|| myopts="${myopts} NO_CVS=YesPlease"
 # Disabled until ~m68k-mint can be keyworded again
 #	if [[ ${CHOST} == *-mint* ]] ; then
 #		myopts="${myopts} NO_MMAP=YesPlease"
@@ -208,6 +210,9 @@ src_prepare() {
 	# Merged upstream
 	#epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch
 
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	epatch "${FILESDIR}"/git-1.7.3.5-optional-cvs.patch
+
 	sed -i \
 		-e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
 		-e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \