Remove old vim-core related completion install.

Package-Manager: portage-2.2.0_alpha196/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

5 files changed, 25 insertions, 30 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index 801592bf6489..7bbda9fe73e2 100644
--- a/app-editors/gvim/ChangeLog
+++ b/app-editors/gvim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/gvim
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.408 2013/08/18 18:31:45 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.409 2013/08/18 18:34:46 radhermit Exp $
+
+  18 Aug 2013; Tim Harder <radhermit@gentoo.org> gvim-7.4.ebuild,
+  gvim-7.4.5.ebuild, gvim-9999.ebuild:
+  Remove old vim-core related completion install.
 
   18 Aug 2013; Tim Harder <radhermit@gentoo.org> -gvim-7.3.266.ebuild,
   -gvim-7.3.409.ebuild, -gvim-7.3.444.ebuild, -gvim-7.3.456.ebuild,
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index eb22ba8eb978..23d86d37c52a 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -16,19 +16,19 @@ DIST vim-patches-7.3.762.patch.bz2 1102824 SHA256 91dd83f66b1f362be987cff40c00c0
 DIST vim-patches-7.4.5.patch.bz2 4352 SHA256 796b8d4e1b758d83a939118d3ab2d8c7ccc64671e41ffd16c723f6285ca447f1 SHA512 6e4b33de2b61d2a451f71d40d8ffce1eb5ab8dc379db96f93a36efb2789300524ddb9e9f8e300dfdf8881ba095aa94e701d9530e9a650e994d6e2d0d35531600 WHIRLPOOL 6a2a15845d7522a32b313161c3d2edddfdc41c5cc9ae8b20e9eb3e3e958173a8a34ffd0775f0bd5675d5bced8b4d680b3023e13c32f3fc2d73976a8b8a2ce839
 EBUILD gvim-7.3.1214.ebuild 1078 SHA256 80b6f32eef384a97e81cc0191b1cccce3b001ddc0a209e5b596ee6e40430c241 SHA512 b8231bd8f3be1c0e9bae9aebf15cb47b752a2707b1aa799802e99d999e8237327af4a3e5ce5272410a9bea55203866054871a04e8dd888560b30e48cd5aa31a8 WHIRLPOOL d19a651f04b4712f730433b86945dcd300e3e296c9ff9e9b2a0a250600b60c9cddf9a1cb52ec9d7be9d58bf9f2c43e954c7dda3fef4795d811dd3f59b835f9e1
 EBUILD gvim-7.3.762.ebuild 958 SHA256 19a7ce0d8ad24047c022c866046ec63aab92efa911e87dea3d83f7e4b33e7dd9 SHA512 3966bd3a5cb514f99cc3ee5718b09a3fcb8eaf2e71c118a255a3ffc496b64d116a5321719a3773d38743b9552408bc2655373753a9e1b8e5f571d848226253e3 WHIRLPOOL 8095463dd1ed4bbace9ef0fbb9a2ce74fc49f1c1f431fc9ce83e8eed4d23c97f1eb54e90575baaa77b928eacf659322076256e511b045896b94e1ec5479fe5ce
-EBUILD gvim-7.4.5.ebuild 12604 SHA256 fa7c227fb94d8ef56e75f7899f39384a46025340a829f685caae2f4d9227885e SHA512 4d90834bace2562eff823099cbf01fce57900c8bbac7e7d697f22883f937ee3626e4895b81271203947e8115fa5be963238c27ef9834b9079cf74adc72b2695d WHIRLPOOL 14fe3a622326c031020cedee5724020b31d5f83da89c626932dbde44620ec03837c66ca9cb2738984c545d6e5c33652ad9b64bba346ffafbc7dea4399d5792b4
-EBUILD gvim-7.4.ebuild 12604 SHA256 c1d3376c87014f90ee61b25b85142781d357f1642a287f105ce6adc67379e4c3 SHA512 c9d07f2789226598acf6e0275499c24273aa3b134a51bc628cdf72203c095dd1952e685673e23791a1524dd1546e9c6d049c94d8dbe232994458bafdd362de87 WHIRLPOOL c5141d870535c75b34c0a386ff842e87bb9025a87959792059fbb0150c5bbd5422090b9433f64be1fd8433a66b4bd4f194c1f64163416e11eaa8af1674e06dc3
-EBUILD gvim-9999.ebuild 12603 SHA256 e2f95ea514c5bb9664c7fd3ab5da8114368275886536af163c2663b5e376a6ce SHA512 649cc657d7d82de9ce66132a3fa1136de5a963c8591ed861d23376700e56e6097232cffb7ed197d83d92d1f946ef3ff32c48fa3ac814acc95e3f7ac67c850aef WHIRLPOOL 52714570af62966741026896a6adb11c4958fc28a31b6c65fec35e439134cabd04e4deb837aa1b245cead65ea84e6fd611f27a97e9ae7e1f3c0b3af43803ab1a
-MISC ChangeLog 55580 SHA256 f8876ee093e839fb0b43bcec0e54c88e70f54f4575bef45ed7ad45a893fda553 SHA512 e16116bf430989950e20a1a8f22cc38f83aefc07b8906c56c7718a15567cc6a9dfa2afc890a375a723de43456d8daff2518c6e2dc9d797c5d5389e6346a1007a WHIRLPOOL 026d57d868195f527f19620590e85fad8422d3e3cb260fbfacfce2bf0e5833c5c3fd48dc361f615ef528b0b4c98006478e8c480c9b427011133a1e39b2f06c6e
+EBUILD gvim-7.4.5.ebuild 12510 SHA256 4765f45615d997abc2901103f347982bef44ed686b7ad5b9e37fc5536d9c75ca SHA512 4c7802c02d0f5837681e6777597b1301d70ebbd36ad5b85607e6814407f516a2577b03289c6774e8aca4c65404accc27c72bf2de508f019b41886f5ff4370fbb WHIRLPOOL 02e701a6765464dcd5c6fabd4e2a0e4144269859a725b8a2cdd35c3f3088945ea8fbb471f533a674fc3ecfecd3631ab31ce72289795b29bd44b1e0fe395925d2
+EBUILD gvim-7.4.ebuild 12510 SHA256 5c85cb27a472fb10effb9ccbd869c5ac86af1799d22abf18ed9e9a61ab929ceb SHA512 ef8c70ad4c1c70fe9467c44838376d7482b7421edec46c49f6d5316f923f3f30a44197bbaa6611ad3b7e67a7a4d3513a9e06237e8668f05281d8e7e61f74fe2f WHIRLPOOL 0e08fd3deea82d2f0ae2e41ae45cdfd2082588d261afdc809aa4f42b99a029008c10d89538641587f7748bd4efed78bb2d0b791ebb219707bf9adfebbcd0ea2b
+EBUILD gvim-9999.ebuild 12509 SHA256 2b0e8d53013201b2dbd4f9a3ff14511835717283d7750fca312fd48b34c1a19e SHA512 a4b1b7d6aaf102120f212658436d5927efb5c7b8e1c8faca05ed26814e210a015391b886067934f7417a15025b34d20215d853ecdcab80eb10ff17e51dfff26a WHIRLPOOL 2640eeeec512ff969147577a691dde8387ad28fe5852b0bdf714a795b5906526716acaa27ff89c8e4b7fc1d75178d5dfd6d57f9c9480d1b46fa7e8c26142a2a3
+MISC ChangeLog 55736 SHA256 462243af34e536b22ba2219a9d7c343e1780b916bd37d28b8fc90adbed2d75e0 SHA512 ec53e1944d342b0addb9473cd137dbb037a362509a9b525dd1e9b52108934b687e04b20d964c15ac1bf5f10008a450a204ef74295a19d3254fa08af1b1635670 WHIRLPOOL c670969f549d08e84b793a92b917183fa3af6eddc903bf3421fab2b0db26bdf298ce3909533f62a62422dc56520a627c18f7455a8302ce2a5c84eaedf87ab8ec
 MISC metadata.xml 348 SHA256 e84bf1fdb970b616d6b2fb17caf3d3f75c276e52430c58e447f8a4dbbfd60777 SHA512 619abbfed97c2bf11f32ea519ba3f0a4a7c388723e6e60fc435fef7487fec143d4f9d492281fda9fd5b2f319afc3d89a7bc21aef962038296e0e13a23ce7229d WHIRLPOOL 0d72852f58d2a0682266ab99a5582112bd95588f781db5bec3d319d5cf1e9b54ff583a622047f5cf23f4165a83b591511cef01f510314710d798d8c688de1e98
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSERMTAAoJEEqz6FtPBkyj9owH/R6f+4ChWzJ2F+dziYBJOvr9
-zdEMQM1kePjraxNOxBbjSmARSrLEpOzaWjN9zJrQCdWSBmhce/hNNWKsthkC5mqe
-Q7xcQLK8KKLUeBDz4VNAbah/Z1APLJ6RFVoDz0b3ETGaVP9bZOURzLMMYw+GuwCy
-QqUQ3oymjILNvyEV/c/vnnZu9kpG/+t9WAYRfEzXfaQ1ccRfIAIa99NOFqVwp9wm
-2KEDmn0cCN01ytcO20yYwY7KaaHKQ56TmGWPQpAIWeb26WVkTaKk27+G2ALQdaAe
-i7VCULV56LFp+Rt55In5JVJ6ZRIWdUolG6+RZLgQw7X48PQGV9Vcywf7IFj4JH4=
-=EGgl
+iQEcBAEBCAAGBQJSERPIAAoJEEqz6FtPBkyj0w8IAIVGeRJkiKNxr2zg00DyMKoz
+ZDPeIXWa/MiQf2JtQKalvyhuAKb7qF816wL98rVJhx63IGs6O5Qe5v1yz6wDwTPQ
+jFxx1Nk4ddPxQ2MLHaDFs5+quQ6nxU7H/i8/tzypD+st5rHP5shGIILUgt0zoJ+e
+/37UoCSSvJFir7O2ySXy9iaL371gKTa5g94Q6dXpzFSZXf3Qwt2Yz2jAmK1LWQgq
+a53Y5ie5fk4QqUjPpzwznVwpuXDOUi0SWCt4s+gQQOBDgImpeG4DU+fCnd0lxk/n
+qAINdIxOedj4y+hno/FnUvXRxn4UEwcquqN3F0fb1SeKmZyDrJUEOcR07F3VuDY=
+=1WGf
 -----END PGP SIGNATURE-----
diff --git a/app-editors/gvim/gvim-7.4.5.ebuild b/app-editors/gvim/gvim-7.4.5.ebuild
index 17c99744c18b..435a530c304e 100644
--- a/app-editors/gvim/gvim-7.4.5.ebuild
+++ b/app-editors/gvim/gvim-7.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.5.ebuild,v 1.1 2013/08/18 18:24:33 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.5.ebuild,v 1.2 2013/08/18 18:34:46 radhermit Exp $
 
 EAPI=5
 VIM_VERSION="7.4"
@@ -355,11 +355,8 @@ src_install() {
 	doins "${FILESDIR}"/gvim.xpm
 
 	# bash completion script, bug #79018.
-	if [[ ${PN} == "vim-core" ]] ; then
-		newbashcomp "${FILESDIR}"/xxd-completion xxd
-	else
-		newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-	fi
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
 	# We shouldn't be installing the ex or view man page symlinks, as they
 	# are managed by eselect-vi
 	rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
diff --git a/app-editors/gvim/gvim-7.4.ebuild b/app-editors/gvim/gvim-7.4.ebuild
index 2d03376a4180..9f6624c94dfb 100644
--- a/app-editors/gvim/gvim-7.4.ebuild
+++ b/app-editors/gvim/gvim-7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.ebuild,v 1.3 2013/08/14 03:40:22 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.ebuild,v 1.4 2013/08/18 18:34:46 radhermit Exp $
 
 EAPI=5
 VIM_VERSION="7.4"
@@ -355,11 +355,8 @@ src_install() {
 	doins "${FILESDIR}"/gvim.xpm
 
 	# bash completion script, bug #79018.
-	if [[ ${PN} == "vim-core" ]] ; then
-		newbashcomp "${FILESDIR}"/xxd-completion xxd
-	else
-		newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-	fi
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
 	# We shouldn't be installing the ex or view man page symlinks, as they
 	# are managed by eselect-vi
 	rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index 621de4a7918b..67f0f67df2eb 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-9999.ebuild,v 1.5 2013/08/14 03:40:22 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-9999.ebuild,v 1.6 2013/08/18 18:34:46 radhermit Exp $
 
 EAPI=5
 VIM_VERSION="7.4"
@@ -355,11 +355,8 @@ src_install() {
 	doins "${FILESDIR}"/gvim.xpm
 
 	# bash completion script, bug #79018.
-	if [[ ${PN} == "vim-core" ]] ; then
-		newbashcomp "${FILESDIR}"/xxd-completion xxd
-	else
-		newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-	fi
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
 	# We shouldn't be installing the ex or view man page symlinks, as they
 	# are managed by eselect-vi
 	rm -f "${ED}"/usr/share/man/man1/{ex,view}.1