Remove -r1 for now (and work on it in overlay)

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 13 insertions, 77 deletions

diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog
index 9025c325c545..98fa3ea7c91e 100644
--- a/app-shells/bash-completion/ChangeLog
+++ b/app-shells/bash-completion/ChangeLog
@@ -1,6 +1,10 @@
 # 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.260 2014/01/19 10:12:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.261 2014/01/22 19:27:19 ssuominen Exp $
+
+  22 Jan 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -bash-completion-2.1-r1.ebuild:
+  Remove -r1 for now (and work on it in overlay)
 
   19 Jan 2014; Mike Frysinger <vapier@gentoo.org> bash-completion-1.3-r2.ebuild,
   bash-completion-2.1-r1.ebuild, bash-completion-2.1.ebuild:
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index fa77bb32ca10..adab3381b607 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -6,24 +6,17 @@ AUX bash-completion.sh-gentoo-1.2 2118 SHA256 219c4618936960a2b97c0a237c36961835
 DIST bash-completion-1.3.tar.bz2 211899 SHA256 8ebe30579f0f3e1a521013bcdd183193605dab353d7a244ff2582fb3a36f7bec SHA512 f0c6eb3edce982d1306fdb7ba2cb598c08cff4bde8496fca369b3c4d2d3af0ef48dd494ab96258cc90f30b875a56759aad13a6b1bfb4928bfba4634cce6bf8be WHIRLPOOL 9ea16b019eadcdcf60046b58d2c0f3ab68c189f461842d3d9f585ff25d8ba1bd48bf847868c2cc7e5475320d9c7aeaf21ce74818345c7fe648500549d51f29f8
 DIST bash-completion-2.1.tar.bz2 265329 SHA256 2b606804a7d5f823380a882e0f7b6c8a37b0e768e72c3d4107c51fbe8a46ae4f SHA512 0bc71039ef136b1ccb72527eb40f2ed4068a58dc31b1ac1ee52a40e7c950ea4cfbb4f1bee2f0da6774e56062578fa3653096e6d306eea7f028dd55ff737e92fe WHIRLPOOL 0275d8ac99a0ac5b12637bf2b13561d656b239ba7c166071cb283a481df2fdd904ad1c18608ea35b9af4f0f4db3b034f833f0fd586a0096626d1b268bcd8fc00
 EBUILD bash-completion-1.3-r2.ebuild 3218 SHA256 65d588e08f44a8a654d88254fd135976a760c4e5574573cd27b6af65a2e7e8f4 SHA512 ffb70519062e81803c287444355e7b5c51ae70cca366b472aef221d4285535d4ce092bdbeed1359a7b9d5903f3f2bfd5d93734753724a283c861d91d8b2f1a63 WHIRLPOOL eeac8f6835e34e1e7d6dcdee6d6b3289097b2c6c619f024eb624248c2a1a454a1b18abec9df59a0b95107acf9808368cda9ec6ade626aeba2a5542731ee84493
-EBUILD bash-completion-2.1-r1.ebuild 2281 SHA256 b71a2b78b4c49669488aab962a1f4cbb1993c85139bda724b14c0de546f38418 SHA512 98b42727a9d8f744564bb23e26369296b9c95a73dca68d154a10ff138406e42e4dd715cffb1a6ea740a2bb20fefe06a659797bef4702e5152b86adb69e6fe6d6 WHIRLPOOL 7c04a24ae6fc63adcf42a61b64c39d9a2682f471d70d625ce54e6e8014d098d75a4084764213032f23433714719eb06c0495bc6dc041bec84d54b6f741e300d2
 EBUILD bash-completion-2.1.ebuild 3429 SHA256 9c43b41f5c3a36a526eae5e32f0c3c3073250764efed494679d5d62981193234 SHA512 56ca3f400b3948f403658df8b5f95dce49827056335edf07a10ba375de9eb23aab450645549a536e9ed50ce3e5e4279746e745437751c956ab71522018bd7917 WHIRLPOOL 0820e25cb25eefb17b163bc03a0d12c81bebad7b5bb1010f37d379bde71af9e8438e4d406d80a54dac0fd59a4b31f937b6d72d6bad50bfb607ba46de64d5ed59
-MISC ChangeLog 44017 SHA256 23eebc277a1421173459442416045c81c0f1a061299b0942775d5f56ed7c9689 SHA512 1a2993ba42bb92768c0a748b0de14d6352d332cbc4fa02c12e2e265fe3f08eb77b1540a862e91d44570ce6e6de46492e3ee4ca3904abc077ecc675544de526f2 WHIRLPOOL d1c64d3b21baa20b01e8812de3d7e282cb3fabf95c126ce64ce1a16b4cb86aff973ceafb107a6ecfbd03ee898f789817d8b26d60f8ae56ae13f4db2d900f7e2a
+MISC ChangeLog 44158 SHA256 d5008b3fd84d49f5430d09800b578990b5dfd0862163ec90134b98174695327b SHA512 110a0061b172ef2e3a570b0dd442975e6c941398d063d2d65774931fd10f055333ecef590092ca02b9c8d5db9014c3be06eaf5a9d8b5a75c67ad02386cc08d84 WHIRLPOOL 6c9ba605db708ce1f9651c247e36e5970a7bfcbf46481ed1b32d71a10613307f49d06b567080f194b28eb7bb6497c66c00efca7353fbfbbd129a3eb0a326d47a
 MISC metadata.xml 930 SHA256 281bfd91145b2ae2a5c2774802dee741bbe625777b1c4e3eaefdca406e534ba9 SHA512 3410bd40fd29b9a140e1508c0fea5aed6ad95c8c05b6ab5bca83dfd1a82ed617fe086b45677d971a21cb62c6e7e3f9ade43793b4b1eba978ae6ab0e6a88c3ce7 WHIRLPOOL 8d49a80655a987ea098a7185664f37549a99a54e1da4082ec614ae7b4a4361c3368ca47c857a92e6b5a8c21ecf9a650a9dab6f99bcbcfd22aa0c448f2240b790
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS26UdAAoJEPGu1DbS6WIAUmUP/3/6TQDxJpw+r5kV5+5fqwl/
-HIuBVtDgwVXYD7GmAUntBBFGAidAfeSdSh1St3kdhgeKP3fp/L8XeRo6UXVvO0z5
-XP4slSTJ1rbcduffIoMvmcSPN2B6I5VRnLulvrqH7+PsNm7GI3efWI+FT1x9mFnR
-drgfow0+AXKmljRBlsBlOOAiY7+kRSYD2XR1kCNKFAAAqTxCF7I5cTlPpkU3aDfn
-1zUMEIcQVmCKtdoIw3xlLZFMcJQIO8bw/t/j3nEFyK+kJ7R9qPkKSDd0gATh1Qrw
-6X0BVpqo+aRgIplgCDMgMtGsTDyHehVI/8nBVUmLm5weh1djPeM8LqsYdk3kCsNY
-cGH62Y4yyXAiaelkwuEzoQZXiBofIIb9AZj7tKmwZbER+eZIy0mxp9KyVXkckES2
-N1DVTv2b0mE2dm1q2skRJxRR0Bo5DumK6mYmA2BjgXR/qovpT+0L/CIz7phjnj7C
-goFo+eTxS5m/DnS1tzS1jLI+NCDJPotqa/h+MqP43c7idnKdj5caEcRLZjTieEgq
-39b4cSYj5106QeWy9ja7q11rbDUEhEmh7DK73b9zwqu3yXbfQl9QoTrBKnL7tBy1
-Njt3Pqs8gd/BZZJD+h5/D8u2NvPGJ+/AxVuv4u2yT4bDAdyVNxdmuxJSAq6pEBqG
-0fwvkEXbQBXJq3Eq5i72
-=tlEn
+iQEcBAEBCAAGBQJS4BrNAAoJEEdUh39IaPFN35YH/22jzbehf8tDkZkwm6a9WuZ9
+eaHg+RY6w/bwo5SF/7MR6wEHct+eCErKM01COOnKN1wkpriyh9rRMTqwvCLYCWxO
+spJuH69Qr1+19+Ot503s6WUxbIPAkg2fJ1cnCdD3ERxinQJTPWja7b/3ajCQlk1r
+f27ufOEU48xjEFlR912oyfPCAHwpi8gT+FNZPGPBueHsfX9cFThSbQT6zhPVm2f2
+uGx9lQWSN5kDzKwq3Dd4vi9BWFF4sl5VzBEfofQBvZcN5SyrwcyYUliyrQpY1IH+
+axvLnVmRo2ysrmUHHSfwxxi+oIDHeu2V0FzH9pHVERPZ04jtm4k6eWbeWfojUsM=
+=WxJo
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash-completion/bash-completion-2.1-r1.ebuild b/app-shells/bash-completion/bash-completion-2.1-r1.ebuild
deleted file mode 100644
index c7c551d1207d..000000000000
--- a/app-shells/bash-completion/bash-completion-2.1-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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-r1.ebuild,v 1.7 2014/01/19 10:12:43 vapier Exp $
-
-EAPI=5
-
-DESCRIPTION="Programmable Completion for bash"
-HOMEPAGE="http://bash-completion.alioth.debian.org/"
-SRC_URI="http://bash-completion.alioth.debian.org/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
-IUSE=""
-
-RDEPEND="|| ( >=app-shells/bash-4.1 app-shells/zsh )
-	sys-apps/miscfiles"
-
-src_test() { :; } # Skip testsuite because of interactive shell wrt #477066
-
-src_install() {
-	default
-
-	# 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
-		rm -f "${ED}"/usr/share/bash-completion/completions/${file}
-	done
-
-	# use the copy from app-editors/vim-core:
-	rm -f "${ED}"/usr/share/bash-completion/completions/xxd
-
-	# use the copy from net-misc/networkmanager:
-	rm -f "${ED}"/usr/share/bash-completion/completions/nmcli
-
-	dodoc AUTHORS CHANGES README
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "If you use non-login shells you still need to source"
-		elog "/usr/share/bash-completion/bash_completion in your ~/.bashrc."
-	else
-		ewarn "Please re-emerge all packages on your system which install"
-		ewarn "completions in /usr/share/bash-completion."
-		ewarn "They should now be in their own completions/ sub directory."
-		ewarn
-		ewarn "One way to do this is to run the following command:"
-		ewarn "emerge -av1 \$(qfile -q -S -C /usr/share/bash-completion)"
-		ewarn "Note that qfile can be found in app-portage/portage-utils"
-	fi
-
-	if has_version 'app-shells/zsh'; then
-		elog
-		elog "If you are interested in using the provided bash completion functions with"
-		elog "zsh, valuable tips on the effective use of bashcompinit are available:"
-		elog "  http://www.zsh.org/mla/workers/2003/msg00046.html"
-		elog
-	fi
-}