Even better fixup for bug #238129.

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.28-rc5-00117-g7f0f598 x86_64

17 files changed, 55 insertions, 47 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/Manifest b/dev-util/git/Manifest
index db20d33b628f..80c8117a7a67 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -65,20 +65,20 @@ DIST git-manpages-1.6.0.tar.bz2 221399 RMD160 9e8cbb5d6ebda82407df325ed19f1ced12
 EBUILD git-1.5.1.6.ebuild 4400 RMD160 c81b28b5efca8244c87cc5f0ac1923c03c9e5b1f SHA1 bb71d825a1c1eef4a5ba26958a7e4dd35b02d938 SHA256 8cbd6c76e3cc3a9e00a3accdb69dec8e134b99acf7cad1e39b243c6289559734
 EBUILD git-1.5.3.7-r1.ebuild 6371 RMD160 847ed38b63b34256ce17991dc6c4dbd34c207955 SHA1 d6edbbd1bcd150992f69eb2655e1ab5b4a925420 SHA256 7d881d0f76b68244aa0021e71beb8537197f2147aa464b5707c39217ec6be87c
 EBUILD git-1.5.3.8.ebuild 6388 RMD160 a76f9cc851a04c6b898f7f34d85b5433e28cfe2a SHA1 d10fbe86d2825b563025c0014db93cbbfd57d47c SHA256 13dc2bf683b369d4b61016587072db9c6b6af54ff0aa32ff2a542ec968a42b84
-EBUILD git-1.5.4.5.ebuild 7855 RMD160 01e59fec6c16eb75959fc091c4ea34ca17154068 SHA1 0b1cb9d77928d40b3cff0551100c93edce292955 SHA256 9bd57f3406c07ca777e0ee56a701c9fccbbe1caabb095ba7d1a4fc39ac200d20
-EBUILD git-1.5.5.3-r1.ebuild 7965 RMD160 84fa2a6bb69adebc7704691945febcafac8a0404 SHA1 d72b0ea479f878cc7edbb4e71efdc2c86456e9c9 SHA256 94353b4e0bff799f79ab9b85ecd2229ad0d4cdea1df7aa8d95fc84c36bf478a9
-EBUILD git-1.5.5.3.ebuild 8197 RMD160 2df30172768fb6b9970f6aa78c16cc1d11febfe3 SHA1 6432bfdb69b9470ee1ac5346f3848f736027f0fe SHA256 77d6015c8a178c922271bc4f6dc3f2068bec49039b7c2a99fe0e71b23f5d5e07
-EBUILD git-1.5.5.4.ebuild 7968 RMD160 cab8d8bba278ddfd611b21f7e5e4da3ac9b50b5e SHA1 7219b9d83042b625230d562cf0dbb71c3dde9b9c SHA256 098c8ff53bb166f5ed8429e6ef1d022883a131973af1ffb296ebfcf397a34c1d
-EBUILD git-1.5.6.1.ebuild 7966 RMD160 88a6d09c6b7bd5ea76f5978361c978904aaa7173 SHA1 71296186c2f1b10258b9b6b8bc7f6a822992ae94 SHA256 a3139211c44f5d0794f19658467b534999edbed11208c898f8588532fa9cc593
-EBUILD git-1.5.6.2.ebuild 7966 RMD160 6e0107256b1002de6bd79e7cfa3dfa75b883d339 SHA1 0845fcfbe1b616e48ace9484df11eddab41b5abd SHA256 32814b0d6a5b9347edaaf7cd24e027041463acc0192057f2964d3bcd01164919
-EBUILD git-1.5.6.3.ebuild 7966 RMD160 74b77d452e700e5286fe17f1bf7673658f113884 SHA1 8837af356623c117120aa7e00aaa90381f109961 SHA256 72f70aa7e820af92ea58d7bb49e07d9919ec32f22c9e4e638ddd6c5d45ffacf6
-EBUILD git-1.5.6.4.ebuild 7913 RMD160 c9df3c673a7142ca45fd95a159863295aee721c4 SHA1 2d1d15ae6916d9f5737a11d61ced6fbf80c8e23f SHA256 e61751349ea0d9af1fec82a53148b97aa0dc599e64e52ce3dee33b2f1f009cb2
-EBUILD git-1.5.6.5.ebuild 7923 RMD160 4e891530ee217bbaf8e8aaedc4ed97c9d08f3933 SHA1 1c1d746bbc35caf45adbb06552d204715d545c83 SHA256 cd359b161ecbc45990991ae675ebddc5f17949fe482a7edf18ad09ef5a8bee38
-EBUILD git-1.6.0.1.ebuild 8381 RMD160 7b1cee2eb228d0c71407fb08d5658fffe475cdea SHA1 293123de70ed204bd49ee556e50c8df4aa087f86 SHA256 4f27b88757223eb221eacf263bdd273d052bfc1dae8180aa45fff987b8378662
-EBUILD git-1.6.0.2.ebuild 8381 RMD160 1afb3cb5811739c55852b3de3a17540074155f2a SHA1 cc72ed4a94cee8d800162be3a3cadd2b1ebd5c19 SHA256 c87b6b4ac707e50b1149ce28f47843ca98b4fb2a3ff6c4f2d2185636995cceec
-EBUILD git-1.6.0.3.ebuild 8381 RMD160 9d9dbd39ae0b10a5c82b0ad37f2a30b2ac5c349f SHA1 7b6e9d2b160e6a79be14cbfea00d7a30f38cb2c3 SHA256 2608c171cad2e3fc06f96e084d0df408d66b874daa39fc8267d22b027486c860
-EBUILD git-1.6.0.4-r1.ebuild 8745 RMD160 ce46904b1c99cdb4b0beb15ea63c7e8506c838af SHA1 7630523b7d7bfc7a816ae3f22fbec56b2d1e22ed SHA256 b887a0520a89a3bae427c068433e7e70a87b59bf1d1e54a7e712edf15d1a2104
-EBUILD git-1.6.0.4.ebuild 8381 RMD160 9f9e80cb012ae3da7e3239ca595a286137577327 SHA1 1a0f417bae07b0d70c1be7885cbaa5a5badda91d SHA256 e98ce9979c3a0b47203baea8e47d5f46daf0d1eadce4d3c8c7c257d845155cf1
-EBUILD git-1.6.0.ebuild 8379 RMD160 7ecab613ffed1a9ae16e8278cdbf4e47ba507bff SHA1 860a61ceabfb5ffe20ef72ba40b513040d2981b4 SHA256 b70162ca24518d4ca50c05f52dc5cc1fcda305cbde6cae34e83bae55033ff083
-MISC ChangeLog 45426 RMD160 17e2425b0113b5b13b8154f40bf13d604037b72f SHA1 08370b2df17797bc7235ddd1a8b3287485a37318 SHA256 9fc3a571282db5e506c4e8d85b43694db2bc5d4fe46efe9a50da6a1b5a98c0eb
+EBUILD git-1.5.4.5.ebuild 7890 RMD160 d9b03da67050705be1b13716805095bede740613 SHA1 4c99cd61c9557751bd7840a870470f4910291d50 SHA256 06c04cb8f6cc066b5aaabef21811b275bd756124827816e4ef264b54274b27d2
+EBUILD git-1.5.5.3-r1.ebuild 8000 RMD160 1bfa4d100531984b05f6b4806fcf2244354846b4 SHA1 f69ddc4b3d4d53365fe12a1846be42e9d20a6793 SHA256 c1600616b3d48fc2181168379d6b0b13ab7416cd9d11d0956ac83cc2e5a7a888
+EBUILD git-1.5.5.3.ebuild 8232 RMD160 eb31080ca06a76e11d36d389f997d3702da96dd2 SHA1 015082b4c2ced79da40bd68517d39b554fcfe1b2 SHA256 9df15afa6790c8b50a5cc2b3f8fd3c5d3edf08095d8c4e3400ae543a77f2528c
+EBUILD git-1.5.5.4.ebuild 8003 RMD160 80b9960715ffbaed45d924aa9ef7e924100b5e2c SHA1 a8c0d42418e6f781e1e41f12b1c949b4aa84d3ee SHA256 68bc4f3c3c6a186b6060098ac01f264dd83c26d5801b5fb728854d56ab46e52f
+EBUILD git-1.5.6.1.ebuild 8001 RMD160 ac80960b3ded1707715d75ab63d7ceb2e14ba123 SHA1 cb41bc933d48d8caf712a3588a7eacc12339fa0d SHA256 964220d6b313b4acd03d3aaabfe887662b5d70ed94c9c46b2223977ab3f25822
+EBUILD git-1.5.6.2.ebuild 8001 RMD160 33213125e8d23690977e8f8d143f3ddbae65d937 SHA1 e6f9206cb8b3f36bcabca04500890dbb85b63b0f SHA256 9fa68654e29453235caf6e72da4af0bcf0bc4b57a1dbd0f810e099229cfbee7c
+EBUILD git-1.5.6.3.ebuild 8001 RMD160 b651378a14d58ecca2b3d76806433466304a9d0b SHA1 f9aab4481bec86e1564130b8c12ad9ae24e48e66 SHA256 cc09d26e30a63c4a9d76bb75063b5accb0675c1139fa9146b3e5f70230acc553
+EBUILD git-1.5.6.4.ebuild 7948 RMD160 1a147d0b2136bab51bb11146f85aec75a40bba6c SHA1 66b67aac8858b879569a3af363b30ec260ba6a55 SHA256 c2a19a6ba20cecdfd0c1695bdfb50e4cd76c9f2fe233cf81be7e53c9fc2330d6
+EBUILD git-1.5.6.5.ebuild 7958 RMD160 b631e788c0a0abb032fe036e96b2271a4f75282e SHA1 a89d108b4c69312bc9633419a808390d71c3d262 SHA256 d3b0d90a90b96a3cf0a4b77d16ec6da46e0bd747bd900363f761e7dac79d5d04
+EBUILD git-1.6.0.1.ebuild 8416 RMD160 f66272869bf69e0a324e3bb340bb93fdfd57cb34 SHA1 27e7ba25a1161fbf0eca5c6181f798a793a99997 SHA256 8c8f4d6e22d28edcb28a633bee301b10d879995a53aefdaf05327e4a0a208ad4
+EBUILD git-1.6.0.2.ebuild 8416 RMD160 df5f708da54bfd6a030c5b2dc759e1a30059aaa8 SHA1 ddb81cee72eb8628ad5f85af9354d0e943e57e18 SHA256 8c0d04907936430e533cf020923009b45ef64b7123c71e69100146f47651b40f
+EBUILD git-1.6.0.3.ebuild 8416 RMD160 f2c4ed1b4e0806e468a7f3dbf5ac27381ecdad9b SHA1 f63af1f522626f3fa25363baae3d72f6e5b1cde9 SHA256 bae9e11f08fecaf9ef2cc65b889c7ad15ce2496168b90366fdaa86c80613fe8f
+EBUILD git-1.6.0.4-r1.ebuild 8780 RMD160 efa3edda7b578f2f9b32b9d195ba5f7b356e4865 SHA1 b644d75eab2e37664e94cffc6df1f3c32cb9bd58 SHA256 e9c2e44e5dec690acf6f0355aeea5734e984346216affb8a094cd9aacc1e46db
+EBUILD git-1.6.0.4.ebuild 8416 RMD160 d4d959465b22fa6747e187547d9e7c5c86dad177 SHA1 ca3eec4154653011f6b68d4d4cae5fa1c0ad31d6 SHA256 78bbe545b099da0c431f0b19da417c8c125f267005791721683961e9093c5b7b
+EBUILD git-1.6.0.ebuild 8414 RMD160 3c1d79572a1231ccc82de22d16a5be15eab5ea66 SHA1 02cfa595340ca2d11bfe17b59b392c884f1b94cb SHA256 650f93ca84a368bc3ed617a9c023ee67a810b1d41f1691807c46c31a22d26b2c
+MISC ChangeLog 45831 RMD160 b73f9b7f83a696ba97168526e3df4783988ab651 SHA1 59d78a46691fd1be067a3aae57e2aa54f13ae585 SHA256 72013d3af9b816a407f8152539e071d00cdd21c6654d518847b59db4e1fc8d69
 MISC metadata.xml 1480 RMD160 06494b78bc4f5da7c5b377e48e8a38e6a61e71b6 SHA1 382259eed96d57835f30304b751540bc8c4a807e SHA256 347f2853546bdfc23b5c17a5d3cd6449a6e533a39fd4647dae2a653d17694b5a
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