Version bump.

6 files changed, 22 insertions, 51 deletions

diff --git a/app-shells/bash-completion-config/ChangeLog b/app-shells/bash-completion-config/ChangeLog
index 0c64ef08e253..931b5e982ef5 100644
--- a/app-shells/bash-completion-config/ChangeLog
+++ b/app-shells/bash-completion-config/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-shells/bash-completion-config
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion-config/ChangeLog,v 1.13 2004/11/10 12:58:33 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion-config/ChangeLog,v 1.14 2004/11/14 22:50:25 ka0ttic Exp $
+
+*bash-completion-config-0.6 (14 Nov 2004)
+
+  14 Nov 2004; Aaron Walker <ka0ttic@gentoo.org>
+  -files/0.4-r1_fix-relative-path-install.diff,
+  -bash-completion-config-0.4-r1.ebuild, +bash-completion-config-0.6.ebuild:
+  Version bump.
 
 *bash-completion-config-0.5 (10 Nov 2004)
 
diff --git a/app-shells/bash-completion-config/Manifest b/app-shells/bash-completion-config/Manifest
index b034feb46a20..ad255a2e96e8 100644
--- a/app-shells/bash-completion-config/Manifest
+++ b/app-shells/bash-completion-config/Manifest
@@ -1,17 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 673964a6ee5fb7b68498100c59252899 bash-completion-config-0.4-r1.ebuild 1157
+MD5 207343db1fb3b7d1e62d85297668f608 bash-completion-config-0.6.ebuild 1229
 MD5 d671f36df8ba777e7f17f8a25241d6a4 bash-completion-config-0.5.ebuild 1040
-MD5 2eeee46354823e7c001f547b7708751b ChangeLog 2524
+MD5 c367f29fe34d980f9ef895f27127ec76 ChangeLog 2758
 MD5 99ce5509db4b50f28a1f6675f8c09b2b metadata.xml 258
 MD5 d082a4cf01805e4d876f3be7c4171213 files/digest-bash-completion-config-0.5 71
-MD5 bdb3858021e2314c9f5414d05cc12b7f files/digest-bash-completion-config-0.4-r1 71
-MD5 cc98aa2c1ce505927f4c8a177a8f654a files/0.4-r1_fix-relative-path-install.diff 1112
+MD5 d4df6622f178f3528d241a0cafbfff55 files/digest-bash-completion-config-0.6 71
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBkhCLEZCkKN40op4RAoJfAJ9kMjMRL8RLbe4HtRhEm3fPRYVK2wCgsGmK
-HZSpn5aYZtiJlkZ4q+dLVaU=
-=yJwf
+iD8DBQFBl+FBEZCkKN40op4RAkLwAJ9afGS5/OOeZhMmyDjnpm4zMLEDjgCgxKu9
+fAQvYpYUMZUMyOFybQd79Ck=
+=kzdB
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash-completion-config/bash-completion-config-0.4-r1.ebuild b/app-shells/bash-completion-config/bash-completion-config-0.6.ebuild
index 62573c8ebfd5..76444fc2ff3d 100644
--- a/app-shells/bash-completion-config/bash-completion-config-0.4-r1.ebuild
+++ b/app-shells/bash-completion-config/bash-completion-config-0.6.ebuild
@@ -1,8 +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-config/bash-completion-config-0.4-r1.ebuild,v 1.1 2004/11/05 18:45:54 ka0ttic Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion-config/bash-completion-config-0.6.ebuild,v 1.1 2004/11/14 22:50:25 ka0ttic Exp $
 
 MY_PN="bashcomp-config"
 MY_P="${MY_PN}-${PV}"
@@ -20,17 +18,17 @@ IUSE=""
 RDEPEND=">=app-shells/bash-2.05"
 DEPEND="${RDEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PVR}_fix-relative-path-install.diff
-}
-
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS TODO ChangeLog README
 }
 
+# remove files that bashcomp-config provides for non-Gentoo platforms
+pkg_preinst() {
+	[ -e "${ROOT}/etc/profile.d/bash-completion" ] && rm -fr "${D}/etc"
+	rm -fr "${D}/usr/share/${PN}"
+}
+
 pkg_postinst() {
 	echo
 	einfo "To enable command-line completion for bash-completion-config,"
diff --git a/app-shells/bash-completion-config/files/0.4-r1_fix-relative-path-install.diff b/app-shells/bash-completion-config/files/0.4-r1_fix-relative-path-install.diff
deleted file mode 100644
index 96d5c2aa5511..000000000000
--- a/app-shells/bash-completion-config/files/0.4-r1_fix-relative-path-install.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- bash-completion-config.in.orig	2004-11-05 18:30:26.752513136 -0500
-+++ bash-completion-config.in	2004-11-05 18:29:15.908527310 -0500
-@@ -275,10 +275,26 @@
-     header
-     for bashcomp in "$@" ; do
-         [[ "${bashcomp}" == -* ]] && continue;
--        
--        file="$BASHCOMP_DIR/${bashcomp##*/}"
--        [[ "${bashcomp}" == */* ]] && file=$bashcomp # a path was given
--        
-+
-+        # what form is the argument in?
-+        case "${bashcomp}" in
-+            /*)     # absolute path
-+                file="$bashcomp"        ;;
-+                
-+            */*)    # relative path
-+                file="$PWD/$bashcomp"   ;;
-+                
-+            *)      # just the name
-+                # CWD
-+                if [ -f "${bashcomp}" ] ; then
-+                    file="$PWD/$bashcomp"
-+                # assume BASHCOMP_DIR
-+                else
-+                    file="$BASHCOMP_DIR/$bashcomp"
-+                fi
-+                ;;
-+        esac
-+                
-         if [ ! -e "${file}" ] ; then
-             ewarn "${file##*/} doesn't seem to exist"
-             continue
diff --git a/app-shells/bash-completion-config/files/digest-bash-completion-config-0.4-r1 b/app-shells/bash-completion-config/files/digest-bash-completion-config-0.4-r1
deleted file mode 100644
index 88c3ace0f548..000000000000
--- a/app-shells/bash-completion-config/files/digest-bash-completion-config-0.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 479a61889bf897c2f4d412eb9c892a80 bashcomp-config-0.4.tar.bz2 92312
diff --git a/app-shells/bash-completion-config/files/digest-bash-completion-config-0.6 b/app-shells/bash-completion-config/files/digest-bash-completion-config-0.6
new file mode 100644
index 000000000000..43d7efb4f83f
--- /dev/null
+++ b/app-shells/bash-completion-config/files/digest-bash-completion-config-0.6
@@ -0,0 +1 @@
+MD5 800d58c37ade900e348df98488b1543b bashcomp-config-0.6.tar.bz2 51761