Even better fixup for bug #238129.

(Portage version: 2.2_rc14/cvs/Linux 2.6.28-rc5-00117-g7f0f598 x86_64)

16 files changed, 39 insertions, 31 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 52d5e1a5554d..6b6d2f11d0c4 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/git
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.302 2008/11/24 01:17:41 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.303 2008/11/24 01:20:46 robbat2 Exp $
+
+  24 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> git-1.5.4.5.ebuild,
+  git-1.5.5.3.ebuild, git-1.5.5.3-r1.ebuild, git-1.5.5.4.ebuild,
+  git-1.5.6.1.ebuild, git-1.5.6.2.ebuild, git-1.5.6.3.ebuild,
+  git-1.5.6.4.ebuild, git-1.5.6.5.ebuild, git-1.6.0.ebuild,
+  git-1.6.0.1.ebuild, git-1.6.0.2.ebuild, git-1.6.0.3.ebuild,
+  git-1.6.0.4.ebuild, git-1.6.0.4-r1.ebuild:
+  Even better fixup for bug #238129.
 
   24 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> git-1.6.0.4-r1.ebuild:
   Bug #238586, issue a warning for dev-util/subversion[dso].
diff --git a/dev-util/git/git-1.5.4.5.ebuild b/dev-util/git/git-1.5.4.5.ebuild
index d2d38ceb50ee..c69c9f5121a7 100644
--- a/dev-util/git/git-1.5.4.5.ebuild
+++ b/dev-util/git/git-1.5.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.4.5.ebuild,v 1.8 2008/11/24 01:11:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.4.5.ebuild,v 1.9 2008/11/24 01:20:46 robbat2 Exp $
 
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
 
@@ -252,7 +252,7 @@ pkg_postinst() {
 		elog "You can disable the emacs USE flag for dev-util/git"
 		elog "if you are using such a version."
 	fi
-	if use subversion && ! built_with_use --missing false dev-util/subversion perl ; then
+	if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
 		ewarn "You must build dev-util/subversion with USE=perl"
 		ewarn "to get the full functionality of git-svn!"
 	fi
diff --git a/dev-util/git/git-1.5.5.3-r1.ebuild b/dev-util/git/git-1.5.5.3-r1.ebuild
index b476efea2e9a..9e1c4bd260e8 100644
--- a/dev-util/git/git-1.5.5.3-r1.ebuild
+++ b/dev-util/git/git-1.5.5.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.5.3-r1.ebuild,v 1.2 2008/11/24 01:11:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.5.3-r1.ebuild,v 1.3 2008/11/24 01:20:46 robbat2 Exp $
 
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
 
@@ -262,7 +262,7 @@ pkg_postinst() {
 		elog "You can disable the emacs USE flag for dev-util/git"
 		elog "if you are using such a version."
 	fi
-	if use subversion && ! built_with_use --missing false dev-util/subversion perl ; then
+	if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
 		ewarn "You must build dev-util/subversion with USE=perl"
 		ewarn "to get the full functionality of git-svn!"
 	fi
diff --git a/dev-util/git/git-1.5.5.3.ebuild b/dev-util/git/git-1.5.5.3.ebuild
index 977a02e9a350..b56390a80d03 100644
--- a/dev-util/git/git-1.5.5.3.ebuild
+++ b/dev-util/git/git-1.5.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.5.3.ebuild,v 1.2 2008/11/24 01:11:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.5.3.ebuild,v 1.3 2008/11/24 01:20:46 robbat2 Exp $
 
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
 
@@ -264,7 +264,7 @@ pkg_postinst() {
 		elog "You can disable the emacs USE flag for dev-util/git"
 		elog "if you are using such a version."
 	fi
-	if use subversion && ! built_with_use --missing false dev-util/subversion perl ; then
+	if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
 		ewarn "You must build dev-util/subversion with USE=perl"
 		ewarn "to get the full functionality of git-svn!"
 	fi
diff --git a/dev-util/git/git-1.5.5.4.ebuild b/dev-util/git/git-1.5.5.4.ebuild
index 1518c9573277..130df120a538 100644
--- a/dev-util/git/git-1.5.5.4.ebuild
+++ b/dev-util/git/git-1.5.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.5.4.ebuild,v 1.3 2008/11/24 01:11:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.5.4.ebuild,v 1.4 2008/11/24 01:20:46 robbat2 Exp $
 
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
 
@@ -262,7 +262,7 @@ pkg_postinst() {
 		elog "You can disable the emacs USE flag for dev-util/git"
 		elog "if you are using such a version."
 	fi
-	if use subversion && ! built_with_use --missing false dev-util/subversion perl ; then
+	if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
 		ewarn "You must build dev-util/subversion with USE=perl"
 		ewarn "to get the full functionality of git-svn!"
 	fi
diff --git a/dev-util/git/git-1.5.6.1.ebuild b/dev-util/git/git-1.5.6.1.ebuild
index b92816a274cb..6c6a3b27baf8 100644
--- a/dev-util/git/git-1.5.6.1.ebuild
+++ b/dev-util/git/git-1.5.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.6.1.ebuild,v 1.2 2008/11/24 01:11:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.6.1.ebuild,v 1.3 2008/11/24 01:20:46 robbat2 Exp $
 
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
 
@@ -262,7 +262,7 @@ pkg_postinst() {
 		elog "You can disable the emacs USE flag for dev-util/git"
 		elog "if you are using such a version."
 	fi
-	if use subversion && ! built_with_use --missing false dev-util/subversion perl ; then
+	if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
 		ewarn "You must build dev-util/subversion with USE=perl"
 		ewarn "to get the full functionality of git-svn!"
 	fi
diff --git a/dev-util/git/git-1.5.6.2.ebuild b/dev-util/git/git-1.5.6.2.ebuild
index 140403fbd61e..69722b01bc0d 100644
--- a/dev-util/git/git-1.5.6.2.ebuild
+++ b/dev-util/git/git-1.5.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.6.2.ebuild,v 1.2 2008/11/24 01:11:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.6.2.ebuild,v 1.3 2008/11/24 01:20:46 robbat2 Exp $
 
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
 
@@ -262,7 +262,7 @@ pkg_postinst() {
 		elog "You can disable the emacs USE flag for dev-util/git"
 		elog "if you are using such a version."
 	fi
-	if use subversion && ! built_with_use --missing false dev-util/subversion perl ; then
+	if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
 		ewarn "You must build dev-util/subversion with USE=perl"
 		ewarn "to get the full functionality of git-svn!"
 	fi
diff --git a/dev-util/git/git-1.5.6.3.ebuild b/dev-util/git/git-1.5.6.3.ebuild
index 30a40eafe1db..42610678939a 100644
--- a/dev-util/git/git-1.5.6.3.ebuild
+++ b/dev-util/git/git-1.5.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.6.3.ebuild,v 1.2 2008/11/24 01:11:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.6.3.ebuild,v 1.3 2008/11/24 01:20:46 robbat2 Exp $
 
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
 
@@ -262,7 +262,7 @@ pkg_postinst() {
 		elog "You can disable the emacs USE flag for dev-util/git"
 		elog "if you are using such a version."
 	fi
-	if use subversion && ! built_with_use --missing false dev-util/subversion perl ; then
+	if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
 		ewarn "You must build dev-util/subversion with USE=perl"
 		ewarn "to get the full functionality of git-svn!"
 	fi
diff --git a/dev-util/git/git-1.5.6.4.ebuild b/dev-util/git/git-1.5.6.4.ebuild
index b59a1359210c..834fb35d064c 100644
--- a/dev-util/git/git-1.5.6.4.ebuild
+++ b/dev-util/git/git-1.5.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.6.4.ebuild,v 1.11 2008/11/24 01:11:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.6.4.ebuild,v 1.12 2008/11/24 01:20:46 robbat2 Exp $
 
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
 
@@ -262,7 +262,7 @@ pkg_postinst() {
 		elog "You can disable the emacs USE flag for dev-util/git"
 		elog "if you are using such a version."
 	fi
-	if use subversion && ! built_with_use --missing false dev-util/subversion perl ; then
+	if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
 		ewarn "You must build dev-util/subversion with USE=perl"
 		ewarn "to get the full functionality of git-svn!"
 	fi
diff --git a/dev-util/git/git-1.5.6.5.ebuild b/dev-util/git/git-1.5.6.5.ebuild
index e821de207029..3c47d93973c9 100644
--- a/dev-util/git/git-1.5.6.5.ebuild
+++ b/dev-util/git/git-1.5.6.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.6.5.ebuild,v 1.3 2008/11/24 01:11:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.6.5.ebuild,v 1.4 2008/11/24 01:20:46 robbat2 Exp $
 
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
 
@@ -262,7 +262,7 @@ pkg_postinst() {
 		elog "You can disable the emacs USE flag for dev-util/git"
 		elog "if you are using such a version."
 	fi
-	if use subversion && ! built_with_use --missing false dev-util/subversion perl ; then
+	if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
 		ewarn "You must build dev-util/subversion with USE=perl"
 		ewarn "to get the full functionality of git-svn!"
 	fi
diff --git a/dev-util/git/git-1.6.0.1.ebuild b/dev-util/git/git-1.6.0.1.ebuild
index d1ee94f8b3fb..3166e4ef5891 100644
--- a/dev-util/git/git-1.6.0.1.ebuild
+++ b/dev-util/git/git-1.6.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.0.1.ebuild,v 1.2 2008/11/24 01:11:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.0.1.ebuild,v 1.3 2008/11/24 01:20:46 robbat2 Exp $
 
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
 
@@ -276,7 +276,7 @@ pkg_postinst() {
 		elog "You can disable the emacs USE flag for dev-util/git"
 		elog "if you are using such a version."
 	fi
-	if use subversion && ! built_with_use --missing false dev-util/subversion perl ; then
+	if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
 		ewarn "You must build dev-util/subversion with USE=perl"
 		ewarn "to get the full functionality of git-svn!"
 	fi
diff --git a/dev-util/git/git-1.6.0.2.ebuild b/dev-util/git/git-1.6.0.2.ebuild
index 63d954f31168..fc88e2737c6d 100644
--- a/dev-util/git/git-1.6.0.2.ebuild
+++ b/dev-util/git/git-1.6.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.0.2.ebuild,v 1.2 2008/11/24 01:11:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.0.2.ebuild,v 1.3 2008/11/24 01:20:46 robbat2 Exp $
 
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
 
@@ -276,7 +276,7 @@ pkg_postinst() {
 		elog "You can disable the emacs USE flag for dev-util/git"
 		elog "if you are using such a version."
 	fi
-	if use subversion && ! built_with_use --missing false dev-util/subversion perl ; then
+	if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
 		ewarn "You must build dev-util/subversion with USE=perl"
 		ewarn "to get the full functionality of git-svn!"
 	fi
diff --git a/dev-util/git/git-1.6.0.3.ebuild b/dev-util/git/git-1.6.0.3.ebuild
index 0411cb8a5914..6561ff4d57ca 100644
--- a/dev-util/git/git-1.6.0.3.ebuild
+++ b/dev-util/git/git-1.6.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.0.3.ebuild,v 1.2 2008/11/24 01:11:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.0.3.ebuild,v 1.3 2008/11/24 01:20:46 robbat2 Exp $
 
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
 
@@ -276,7 +276,7 @@ pkg_postinst() {
 		elog "You can disable the emacs USE flag for dev-util/git"
 		elog "if you are using such a version."
 	fi
-	if use subversion && ! built_with_use --missing false dev-util/subversion perl ; then
+	if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
 		ewarn "You must build dev-util/subversion with USE=perl"
 		ewarn "to get the full functionality of git-svn!"
 	fi
diff --git a/dev-util/git/git-1.6.0.4-r1.ebuild b/dev-util/git/git-1.6.0.4-r1.ebuild
index 3db51d9d424a..0ce5d2cb01ff 100644
--- a/dev-util/git/git-1.6.0.4-r1.ebuild
+++ b/dev-util/git/git-1.6.0.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.0.4-r1.ebuild,v 1.3 2008/11/24 01:17:41 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.0.4-r1.ebuild,v 1.4 2008/11/24 01:20:46 robbat2 Exp $
 
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
 
@@ -288,7 +288,7 @@ showpkgdeps() {
 
 pkg_postinst() {
 	use emacs && elisp-site-regen
-	if use subversion && ! built_with_use --missing false dev-util/subversion perl ; then
+	if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
 		ewarn "You must build dev-util/subversion with USE=perl"
 		ewarn "to get the full functionality of git-svn!"
 	fi
diff --git a/dev-util/git/git-1.6.0.4.ebuild b/dev-util/git/git-1.6.0.4.ebuild
index b73f581c51a4..861f55594e5d 100644
--- a/dev-util/git/git-1.6.0.4.ebuild
+++ b/dev-util/git/git-1.6.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.0.4.ebuild,v 1.2 2008/11/24 01:11:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.0.4.ebuild,v 1.3 2008/11/24 01:20:46 robbat2 Exp $
 
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
 
@@ -276,7 +276,7 @@ pkg_postinst() {
 		elog "You can disable the emacs USE flag for dev-util/git"
 		elog "if you are using such a version."
 	fi
-	if use subversion && ! built_with_use --missing false dev-util/subversion perl ; then
+	if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
 		ewarn "You must build dev-util/subversion with USE=perl"
 		ewarn "to get the full functionality of git-svn!"
 	fi
diff --git a/dev-util/git/git-1.6.0.ebuild b/dev-util/git/git-1.6.0.ebuild
index e1ffc5df7697..8cc3743c117f 100644
--- a/dev-util/git/git-1.6.0.ebuild
+++ b/dev-util/git/git-1.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.0.ebuild,v 1.3 2008/11/24 01:11:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.0.ebuild,v 1.4 2008/11/24 01:20:46 robbat2 Exp $
 
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
 
@@ -276,7 +276,7 @@ pkg_postinst() {
 		elog "You can disable the emacs USE flag for dev-util/git"
 		elog "if you are using such a version."
 	fi
-	if use subversion && ! built_with_use --missing false dev-util/subversion perl ; then
+	if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
 		ewarn "You must build dev-util/subversion with USE=perl"
 		ewarn "to get the full functionality of git-svn!"
 	fi