Use has_version to determine whether or not to install subversion completion.

diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog
index e3079cd242ed10ece7c8a9ef5a54c36b6582a7d3..848cfe79a638b5a1e1aa828d8338642a05118f99 100644 (file)
--- a/app-shells/bash-completion/ChangeLog
+++ b/app-shells/bash-completion/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/bash-completion
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.80 2004/11/12 23:44:04 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.81 2004/11/15 15:34:01 ka0ttic Exp $
+
+  15 Nov 2004; Aaron Walker <ka0ttic@gentoo.org>
+  bash-completion-20041017-r1.ebuild:
+  Use has_version to determine whether or not to install subversion completion.
 
   12 Nov 2004; Aaron Walker <ka0ttic@gentoo.org> files/bash-completion:
   Clean up profile.d file thanks to Joker.

diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index 9f9b9d33865556b8828ce23be282844c9b86e9a2..bba0f94c287c6a81d0dc0303ae00e5af8528978b 100644 (file)
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 380396b5af573a9eb310e1f150288411 bash-completion-20041017-r1.ebuild 2238
+MD5 8fec3a89ed490aa10f450d0ef0f846f0 bash-completion-20041017-r1.ebuild 2267
 MD5 50f43407f43fdbbfa26b4d63f947497a bash-completion-20040711.ebuild 2088
 MD5 f6bee54f0c35dc47430924ecb49c03fb bash-completion-20040704.ebuild 2092
 MD5 7d4aeaf81dd9f767c41a81c3e47d01a2 bash-completion-20040704-r1.ebuild 2087
-MD5 1afb058cf0ae65d23c164482d72a0c4f ChangeLog 11501
+MD5 c81da5bd1940ed64600a2e3c91623769 ChangeLog 11669
 MD5 00e8cae3d9ece63e4be61f4a2b3afd5e metadata.xml 930
 MD5 3790b4d8b911d7cb16effa66acdc6e93 bash-completion-20041017.ebuild 2123
 MD5 236fd9c517ac5642cae8df109dbaf9f6 files/digest-bash-completion-20041017-r1 152
@@ -17,7 +17,7 @@ MD5 49e9f0b0674471ff56169ce7d9265fb2 files/digest-bash-completion-20040704-r1 15
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBlUrPEZCkKN40op4RAlksAJ96ARMr7GUIXRPLnVh6mFzH7n6hPwCfQpIF
-Ynl4ibjIOdgkCKqCGSdPGQI=
-=US3C
+iD8DBQFBmMxyEZCkKN40op4RAgFEAJ9Ulv5Ef3iuiZQrkOHscrmJRZ5KYACfflvM
+1ZtCmwIsBZmJ9kCAbl/pgqQ=
+=yGl1
 -----END PGP SIGNATURE-----

diff --git a/app-shells/bash-completion/bash-completion-20041017-r1.ebuild b/app-shells/bash-completion/bash-completion-20041017-r1.ebuild
index 399d2026783f90add3d3c3a660f53763a40c26fb..cb552a23af4f4e01454ad4617f8eae270f3c4706 100644 (file)
--- a/app-shells/bash-completion/bash-completion-20041017-r1.ebuild
+++ b/app-shells/bash-completion/bash-completion-20041017-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20041017-r1.ebuild,v 1.1 2004/11/12 10:57:56 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20041017-r1.ebuild,v 1.2 2004/11/15 15:34:01 ka0ttic Exp $
 
 GENCOMP_VERS="1.0_beta2"
 
@@ -24,10 +24,10 @@ src_install() {
        insinto /etc
        doins bash_completion
 
+       # >=dev-util/subversion-1.1.1-r3 provides extremely superior completions
+       has_version ">=dev-util/subversion-1.1.1-r3" && rm contrib/subversion
+
        insinto /usr/share/bash-completion
-       # don't install subversion completion, since the subversion
-       # package provides its own
-       rm contrib/subversion
        doins contrib/*
 
        exeinto /etc/profile.d
@@ -47,7 +47,7 @@ pkg_postinst() {
        echo
        einfo "Add the following line to your ~/.bashrc to"
        einfo "activate completion support in your bash:"
-       einfo "[ -f /etc/profile.d/bash-completion ] && source /etc/profile.d/bash-completion"
+       einfo "[ -f /etc/profile.d/bash-completion ] && . /etc/profile.d/bash-completion"
        einfo
        einfo "Additional complete functions can be enabled by symlinking them from"
        einfo "/usr/share/bash-completion to /etc/bash_completion.d"