Remove Slackware packaging tool completions because of collisions. Remove Debian/Red Hat ifup/ifdown completions.

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 41 insertions, 11 deletions

diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog
index b1ba4a04b394..028c6464a421 100644
--- a/app-shells/bash-completion/ChangeLog
+++ b/app-shells/bash-completion/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-shells/bash-completion
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.271 2014/10/14 11:38:16 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.272 2014/10/24 23:03:19 mgorny Exp $
+
+*bash-completion-2.1-r91 (24 Oct 2014)
+
+  24 Oct 2014; Michał Górny <mgorny@gentoo.org> +bash-completion-2.1-r91.ebuild,
+  -bash-completion-2.1-r90.ebuild:
+  Remove Slackware packaging tool completions because of collisions. Remove
+  Debian/Red Hat ifup/ifdown completions.
 
   14 Oct 2014; Tobias Klausmann <klausman@gentoo.org>
   bash-completion-2.1.ebuild:
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index 7ef0067a180e..0593a37a0211 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -8,16 +8,26 @@ DIST bash-completion-2.1.tar.bz2 265329 SHA256 2b606804a7d5f823380a882e0f7b6c8a3
 DIST bashcomp2-pre1.tar.gz 3732 SHA256 fd201638bae06f134c243887cafe402ef0a21f9e62cca3966f405c249abc9eec SHA512 745801fe20c846cb0cdb044d712caacd75a2902c9dddc2261bdb179dcd826e5d1032d6b1f73340abe74dbb82d29b4386897291ccdf45d9bbd1fdb80a5f79fa45 WHIRLPOOL eb529c7263653b3e3e36c0cf29d44c57ce64bb2144f06ff7f2df569dd2ae66eb135b2ace5542c37cb100da8b3562b32ab61bcd9f5fd3cfbf67febf5e5086e04a
 EBUILD bash-completion-1.3-r2.ebuild 3218 SHA256 65d588e08f44a8a654d88254fd135976a760c4e5574573cd27b6af65a2e7e8f4 SHA512 ffb70519062e81803c287444355e7b5c51ae70cca366b472aef221d4285535d4ce092bdbeed1359a7b9d5903f3f2bfd5d93734753724a283c861d91d8b2f1a63 WHIRLPOOL eeac8f6835e34e1e7d6dcdee6d6b3289097b2c6c619f024eb624248c2a1a454a1b18abec9df59a0b95107acf9808368cda9ec6ade626aeba2a5542731ee84493
 EBUILD bash-completion-2.1-r2.ebuild 4090 SHA256 34b75f419f50a4f9354775d573b60cae86e3d096904f7eae6faf355a33c64889 SHA512 f0236136e18d38d6a5fb99592c21975b7e2b5058ab9eb883e1be31acf3494f32cbc2dba7ebf424f4fd373a20ccab9dae511111dccd267bef262c850b79f5c13f WHIRLPOOL 3aca5eb741c1f6e0aa0036bada05d5ac7d4cfb0c81c7cb5ae730f99a4e3d905cad86274262d1450d2de5cca703261b265cb0c08d37aa86064d7a86efa60da6ca
-EBUILD bash-completion-2.1-r90.ebuild 2717 SHA256 58962ad9e76a82497af6e45746997a445ae817df78b9b2e3c41fb96472c8d3c8 SHA512 4ee464e4967f9d305762d0e32cb156d747ceafd2c41b08553f256c4546e5ea3ed9b7f986f5dfc87ead86fb191ab648f7a84ac36a42b4831f8808695c82de56e0 WHIRLPOOL 0896785a40b578481bb875bf72d297d56cfcf9f73ecc53c62c9c0038857f93d03709a70ba8024e169e77de5d01105708fb0cf81e8ef7b18a03263fe5ab17d82d
+EBUILD bash-completion-2.1-r91.ebuild 3049 SHA256 960032a85b040f1d319e311283b773a84bcdd3a0be76abaeedb9d2fd211c3c0b SHA512 301b564ccb134f69724cbf0d02e82f3a133911bf70db33186b5bbac24a655e60c24b13dd033d71c974f4a0ad4cb9af7aebcdb768bc2c4178355834ae14be860f WHIRLPOOL abcdad662e6357b5cd6718024b28217c26c8f04bea306b96569979c32d216291e187989a6712579eb302779ea6a69095e7e7828ec8148459a48015f15629f373
 EBUILD bash-completion-2.1.ebuild 3430 SHA256 f32bfb8898fd5591e95037095b4d646526448b2ae9d1c0b8045aafeba8f3f21f SHA512 f6b62b85d51b8c327933c58805e1c46cfb4c2fa82f009bab9b91f5e5af790f1f771f08eab8a3a6c2a03c9c9ed1932e4a5641f9afd1ba6cf937fbe6849bda8c9e WHIRLPOOL ad3948f6d1e05002e4d3c2dd3c84007e14fd47461f5973387d2a2d0e221eb1a06aaaaefd13dab69c071039a989d50a3b888d3a615e52a64088113e5afe12401b
-MISC ChangeLog 45917 SHA256 8e2fea77f422ab38fcb2bd473813161db835e2f4a2af325975def9ba160701df SHA512 16824e6030bee644bca4a6914758513fa46156b4b3ce797e8a5bb1bb210c40b9e93f3b08ee707b8730401590ebe1796a77ac1f687702fa45d5db9653d310b8ec WHIRLPOOL 1878e71a7cdd655cd9b45642e9810e68f9744490892912efd40048c2ab9aa12ac87113b50313b71e2e2284c2d36d7eecd4e282b7528dd43dbc6d9af3907412e3
+MISC ChangeLog 46192 SHA256 74be483c1956c5c7b7344ae95304e6cbf79c426e7060ba44de55cd89323a4474 SHA512 c034702800f8cd54f8490393498a95e2362dbad2748e69a66c5efd7a569e0d3a8d146e5503cd786e3a972fa035fa37c69ca2e787b0304438487bb6436693eff6 WHIRLPOOL c20192e3258bdab92e8a64e5ccc56067ff1b3eeaae7c89027de3a77eda21841e1c3b223ed22614b1fc3bb6c2d9203fb6008e88b3506993483dd926072b773b93
 MISC metadata.xml 1020 SHA256 785eaa20ef6e8c3d46916e22ecbf772ddc9ac12243d2f50ffd149b5f0e5c51c2 SHA512 305eddc1c77d281e6c64417c9d1c2373d20b6a88ae1f27764488814343eb7d5409705e645b31fb978774352c76cf4a14d0d51949a2f2945a8e8e168dd6d59528 WHIRLPOOL 52db2505ddd82f53c74675babc2ea35d3551091254f13638390662cb151bd65f87d36b26245ae90605cb6c9b8ba74cb25ce27158ce2016e8e2192ee47ea6f979
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iKYEAREIAGYFAlQ9CzBfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldDFGNDg1MzU4NjMzRTAyNzA3RkY0ODA1QzAz
-RUUwM0ExQ0U1RDU0RTgACgkQA+4Doc5dVOir7wCcCXoDJyGhptr2Miztre9czF15
-qm4An0RD2la7VwQ5Wjf8uqVAJShoezp0
-=nxKz
+iQJ8BAEBCABmBQJUStq5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOWy0QAKFTdmxj7aDl01Qd/mGd4E8r
+FOO19aNf+X0vcckYPieqqxKo2QDg8cM17O8Uc6Vo7PoSZuKr6aDmDlX+fHWQFRLU
+CXxWi45pyWehC1Zx0++sOIPRqAwcX5OJBG8DmVjapnxWJtJd8NE4b6K0/V8WUQ0n
+Qiv2cMLuOlpk2DTXDyC1+WHTNOCGK0XueYuED3xrvvV7sno3KKo4NET5yrit4fSQ
+YuGamdylAKOCjmvXSr8GNrEQvsaF1wBrrVf8WAPZrjfHDE9htFZgGaP5beioGDSj
+3MDRTwHpbtRQbcNU6VTpUTonrUESaEtDqNYcofi8IvpTiA7D+U+5B5d6+yiUf+P0
+wSgiwxWydZvXvbaHTvUFse3Lu7rexPlzfh1NP0oV5RrSBGu7riyUQRtyp8ti92Ld
+xviSxt002MhFMrG5pwgPx2YeRvN2s662C75l0/GTDufooDBAGyqU6KntFPUVRxJn
+aKPKRd9MJOIGR/4M+z4kMQjAMoDQoahcbcAC3qy/NavA7sWrMsTh9tUjSUEGnx+A
+PbRqUUvnHyN9ZX6FgFwf8f5hrGUKiVxkTPTlI7BeusB9qnxz+anAEJTcNuE+CSUr
+lhNCXBQpBffFZYoyGOu1EULkTgAYWSF5JjagJwxERguNpif0pmfS23/oWfH+TAiz
+xH4TmEoDOmbSjTQ1aGor
+=0KAk
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash-completion/bash-completion-2.1-r90.ebuild b/app-shells/bash-completion/bash-completion-2.1-r91.ebuild
index f2f82155a519..cb4dc34989c6 100644
--- a/app-shells/bash-completion/bash-completion-2.1-r90.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.1-r91.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-2.1-r90.ebuild,v 1.2 2014/10/13 09:40:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-2.1-r91.ebuild,v 1.1 2014/10/24 23:03:19 mgorny Exp $
 
 EAPI=5
 
@@ -20,6 +20,19 @@ RDEPEND="|| ( >=app-shells/bash-4.1 app-shells/zsh )
 	sys-apps/miscfiles
 	!app-admin/eselect-bashcomp"
 
+# Remove unwanted completions.
+STRIP_COMPLETIONS=(
+	# Included in util-linux, bug #468544
+	cal dmesg eject hd hexdump hwclock ionice look ncal renice rtcwake
+
+	# Slackware package stuff, quite generic names cause collisions
+	# (e.g. with sys-apps/pacman)
+	explodepkg installpkg makepkg pkgtool removepkg upgradepkg
+
+	# Debian/Red Hat network stuff
+	ifdown ifup ifstatus
+)
+
 src_prepare() {
 	epatch "${WORKDIR}"/bashcomp2-pre1/*.patch
 }
@@ -32,7 +45,7 @@ src_install() {
 	# use the copies from >=sys-apps/util-linux-2.23 wrt #468544 -> hd and ncal
 	# becomes dead symlinks as a result
 	local file
-	for file in cal dmesg eject hd hexdump hwclock ionice look ncal renice rtcwake; do
+	for file in "${STRIP_COMPLETIONS[@]}"; do
 		rm "${ED}"/usr/share/bash-completion/completions/${file} || die
 	done