Migrate to upstream build system and directory structure wrt #472938

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

3 files changed, 62 insertions, 5 deletions

diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog
index 275d053b4c81..afa378585d58 100644
--- a/app-shells/bash-completion/ChangeLog
+++ b/app-shells/bash-completion/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-shells/bash-completion
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.251 2013/06/17 13:37:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.252 2013/07/16 00:13:33 ssuominen Exp $
+
+*bash-completion-2.1-r1 (16 Jul 2013)
+
+  16 Jul 2013; Samuli Suominen <ssuominen@gentoo.org>
+  +bash-completion-2.1-r1.ebuild:
+  Migrate to upstream build system and directory structure wrt #472938
 
   17 Jun 2013; Jeroen Roovers <jer@gentoo.org> bash-completion-2.1.ebuild:
   Remove nmcli completion (bug #472844).
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index 30333b66c247..0406562140fe 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -6,13 +6,18 @@ 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 3168 SHA256 3a4a8da97edefef9122ac0ded7d14735d5c93df8a71fe79472ed200e33cb8473 SHA512 9502a5f5735da5a19b13a9262758f17e6aba4852d218cb06453bb8d6ae704e8afbd6cf04e10118940c3c34c683c5703488e0a97f7d85fa932f606cdededbcb3c WHIRLPOOL 7fcbb4bf61158f7524974c8867f880bcfe98ba90b3e16ecd8162d29a798fac119e86e77f8a4147dbd2002dd8c810f926ea2e47e1dab810376dba1507db437a92
+EBUILD bash-completion-2.1-r1.ebuild 1660 SHA256 bd750eb8519fd756816f12ac4320076002973f3593aec31925228b2ccf17a47f SHA512 8215409aee54f87ffaab16d7415cc7dbeb5012148d61307b8ff4027780e92f38a4745fbbcc3196689e18f85194e6080b969685e70dd463225e8de772b5f52269 WHIRLPOOL c0d141a35818592cbf9b4667e870f8a7882140d4fb71ff50e74ee3d5806bbb51db6551f8c7484d9e294261fdf0e4289f2f49117665c8ac9014c27062b8f0af95
 EBUILD bash-completion-2.1.ebuild 3378 SHA256 0fa79df2187a047ca46c905d87bb9228a578dfc550e7c70a429b0933431c0aa4 SHA512 cc33ea6aab32d24581460e9d1b283e0f4f36567e01dfbe2821795f323a61e4bf67eeb22b4abddc415d9a90d6f69febcb7263ebb990a0c2e50bd5ddc768241826 WHIRLPOOL 4e0605078bdc2a2f20c516a475d35af4a221c695f69126499824897d17a280937dfcb25ffe129e528d0a601cae7aa4d665086fc0cc84893ed31f79159c28104c
-MISC ChangeLog 42515 SHA256 2498baad518f35d0d938a8e0866ac9760d1f8e940f5451a126cd0d2c6f13aa15 SHA512 db226f0e33aed5449876c96fa16821b4fbc78a0b5631a47292ccd6a5527c9e81d142f18979c59f9914fab313f93f1d0fbfb49464f3e39f290b618e0c5d50869c WHIRLPOOL fd943dda6648690537640f6806c4101915f55e49f8fdede479ade690719eafa1bcb38f8f51819d1854f77291f3575c4ad51d2ea87a29cfc1400933de5d65d25e
+MISC ChangeLog 42720 SHA256 fc56d31114e0c5507542cb6633fb1a15ffcdcfb4e579ec85494b9e8069368932 SHA512 1d444f79352351788c68c93ca5ab5085d7f546190a4487b21acc596afc6e93401e090e0fee44809afed1ae399dce753651f265c566de09563f0be1ee7f7fab39 WHIRLPOOL 84ced8fccd48b36194568fc000c1b937c01406860cddf36582ae37fe8b625406994fdee4102e4db1c5350620d93e9678e4df7ef5674280ba9ba5428aac3c0493
 MISC metadata.xml 930 SHA256 281bfd91145b2ae2a5c2774802dee741bbe625777b1c4e3eaefdca406e534ba9 SHA512 3410bd40fd29b9a140e1508c0fea5aed6ad95c8c05b6ab5bca83dfd1a82ed617fe086b45677d971a21cb62c6e7e3f9ade43793b4b1eba978ae6ab0e6a88c3ce7 WHIRLPOOL 8d49a80655a987ea098a7185664f37549a99a54e1da4082ec614ae7b4a4361c3368ca47c857a92e6b5a8c21ecf9a650a9dab6f99bcbcfd22aa0c448f2240b790
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlG/ETQACgkQVWmRsqeSphNkTQCdFdljUo4wte3M9JXuyYPullRv
-KCkAn3IPABnwsM4PG/BbszJoTobjMyzR
-=fbYR
+iQEcBAEBCAAGBQJR5JAnAAoJEEdUh39IaPFN0LUH+wZVbQZ+pd8AzoOOPO/KlAIR
+nSuvdppSDOj1AsH9bMKPnXkiGSpYP6iM0iP17/RFP7jYeIpTJl2cdnqT5JU3Xes/
+Tzq5bJSMHO1Ws/x913P++m95D6l4tA6cYr2ouowluvC/AB3vVXyWsctnfrY7ncIY
+eBFVO7oyXMcTF751M1Mc28V4pzOGEYpfg1zxqzXnGWmt11ZglCFKVKmRqtK/MJIO
+KC6whJpkWJzsDMwapEaSiGUZTmRWxkxfHuO4WHGPoiOCeYMzejQbgQQKAT+7/wXl
+xK7PW5wcNToB1zFV/XEvWByiBGYfCGcMZjwFWSckxmjUidzu2uQfBXBJft+afjk=
+=xUUj
 -----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
new file mode 100644
index 000000000000..2bf6a2b7e776
--- /dev/null
+++ b/app-shells/bash-completion/bash-completion-2.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2013 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.1 2013/07/16 00:13:33 ssuominen 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 ~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
+	!<app-shells/gentoo-bashcomp-20130101" #472938#c1
+
+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 has_version 'app-shells/zsh'; then
+		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
+}