Backport modified bash-completion.pc pkg-config file from upstream 2.0 release.

Package-Manager: portage-2.2.0_alpha135/cvs/Linux x86_64

4 files changed, 121 insertions, 2 deletions

diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog
index 89eeb14af7bd..27ae0231d239 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.234 2012/05/04 11:08:39 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.235 2012/11/01 09:06:05 ssuominen Exp $
+
+*bash-completion-1.3-r1 (01 Nov 2012)
+
+  01 Nov 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +bash-completion-1.3-r1.ebuild, +files/bash-completion.pc:
+  Backport modified bash-completion.pc pkg-config file from upstream 2.0
+  release.
 
   04 May 2012; Alexis Ballier <aballier@gentoo.org> bash-completion-1.3.ebuild:
   keyword ~amd64-fbsd
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index 4d4fa00fbf2f..7b02e5a7d0e4 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,8 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX bash-completion.pc 274 SHA256 d765d5ac5aa827ad25da257047558dffb96529aec8f7ca1d82b7d6e9398983df SHA512 0e0f9d3c32ca3b0ba63367d9efcf05bc39173cd2a32bbe4706ef37a52cf135ddfcc512f0ac2b3b6c486013fc0d5748087ab1436ba01674a7af7aac632d8fb0be WHIRLPOOL 6981154183e762f80203b709a477f6d15823e4ce00528c9563423894fa0f3cfbb34fa8847449bb80d5dfde06bddf4bc125ca970313a391810f2f31f06b85967b
 AUX bash-completion.sh 2109 SHA256 98022951b80b4af62cb254b5b738592835785784b5ddad4b8f71187f15f03b80 SHA512 b8c817ee3bcafcac0546f3de1a1c8e8e9ae0a7456255a9d591fb9831f78719f6aa6a6141d00447d7e069b5daff78dded22fa647997b4d51c58c0ccedc17824a1 WHIRLPOOL a2b39c9dad7a23b1561325dd4fb3685b0d73aac59037011675a6681d1228d8f2c51242b1d97c431b050b4989113075b1d18368cfed67be2512340f7fa494ac00
 AUX bash-completion.sh-gentoo-1.2 2118 SHA256 219c4618936960a2b97c0a237c36961835ae21d819e29239a5d4466b75695ebb SHA512 c73f91b05d87b646a9a10ed29f7003fca27dc65dd1a0435f65d9bac34f8b9968c31475962b773d0d8a22705beddace552d03c84bd0ca1f1ca858c0aabe17e9f5 WHIRLPOOL 5dea0101b053137da4d6de3907f77fed1bf7868741dd8da5e7fccb834b06f5f0432c0da29e223b2e2e601489a8f9e2354e3e1d37e74e589011e16dfb3e4370ce
 DIST bash-completion-1.2.tar.bz2 197574 SHA256 dd09a86134204e4c6b860bfbd5ee8ac46c6b32a54478b967dcf81e8a7839d354 SHA512 7e4e051dcdffdb3722c3e9def8186a3686da4f0b67302c0354900b60224e06e06a30238e496e5a27e4a893acfe896d5e0f8d1b71ff56cc540b969a40e25d54c7 WHIRLPOOL a9650e2e52e03cdebf4318b3baafb322ef3802aced7acb7f26915bcc8ad12d08e6770bac12cca50f9452072001b67f0476e669084ebfed11c9882296d0f3ea21
 DIST bash-completion-1.3.tar.bz2 211899 SHA256 8ebe30579f0f3e1a521013bcdd183193605dab353d7a244ff2582fb3a36f7bec SHA512 f0c6eb3edce982d1306fdb7ba2cb598c08cff4bde8496fca369b3c4d2d3af0ef48dd494ab96258cc90f30b875a56759aad13a6b1bfb4928bfba4634cce6bf8be WHIRLPOOL 9ea16b019eadcdcf60046b58d2c0f3ab68c189f461842d3d9f585ff25d8ba1bd48bf847868c2cc7e5475320d9c7aeaf21ce74818345c7fe648500549d51f29f8
 EBUILD bash-completion-1.2.ebuild 2815 SHA256 d65c732ae621225f0b3e528005e0a4fb31c2d1de2fe8a2e6ed0be699dc6145a9 SHA512 455f8288f863d01b4f3cad126c6d42e13d1807814861e0220f06fc7e3fdb353ff92400ab82eab438366d6d4440a1f90175d62f8ca635dddb02a3af328a0ceaae WHIRLPOOL 1ca6e12af23b1e2bae709ddfcbfbe535d9431a558744ad8b05490f66a7f46d2e8f2d73dbe7e73f2649ae79064db8b1fc1a215dbbb45155daf7a1264ea41056df
+EBUILD bash-completion-1.3-r1.ebuild 3104 SHA256 fde0cc88a372247e55767b71b1136a1696e25246dfc269e56910c58560434e4d SHA512 e26c81b08e1a787d0d19b4b1749128ded0d5609801beaaa78fc79d4b1485a3fc7bdbc57f08ab41f009ce6ba5e2b35267d320b81cd301038efc17d95a05a4c418 WHIRLPOOL d4c215db3850c8d3f7c17278a7353537ffe56cd8bfc8131113a4b8a7bda65fb02f8dd492141728a736daf15627eadc341a02ef616addbdff650a67f3536a6ef4
 EBUILD bash-completion-1.3.ebuild 2765 SHA256 861a98ec3f944fa89c464172acbd7c8a6bbf8ccafb15bdefbb24774c8158561a SHA512 da3438c89b1e119bbc3f356257e287b6570e3693045ac2909436625a6fd099c2ff5959704bbce848e1ea519cca1fb04a2f5a4385fedc190da90d70414aa40d0f WHIRLPOOL d1e4682a06c18415e2d1640432e93408d9e1ee35dd97901c3046b52540d8e0995d3fbba46fd430b45bdc51a9a25ecec3c237a24af4ca5dc231ad61151e87f292
-MISC ChangeLog 40195 SHA256 d4873e55e16c7344d2686d16b8687a0dd5444ef6309308feb00c2a5eb0ebbb9c SHA512 fc9e4717762cb96bb53914f98c638c2ac4bbfb464203fd7f0775cf005335d8278ad7b9605ad38e51141e671e538cf7190e54e4ba0e30df02aa7991ccb5f6f88a WHIRLPOOL 20d3fc2675d80ee6fca4facc05cd72086e1fd124f1ac3b529e6803ea588a3d4513c8a7d82996ca40318ae68777330cd9a8bdae6648bf066e50d6dfdaf185e3d4
+MISC ChangeLog 40435 SHA256 0ea92d9ed42174d9aac7bd2fbdc034b4391dd2da3273d2d50442d929d7a3990a SHA512 1d012265a61591980ba5bdb18947a92af4a5ee44bbb9eacf4d2842601d7221b9fe75530a47882dcd663d3f32dc9c0decbda16439b54b7111d6e46b1850695015 WHIRLPOOL 4a8fb42907ddf0ae4bc66b4eee2ce65be21cba415d86030fe1f5a989e576fe65b6153e2fbb683bb8a3395b491617f6ab9aaaf65101ab02a6ca105f22fad8937c
 MISC metadata.xml 930 SHA256 281bfd91145b2ae2a5c2774802dee741bbe625777b1c4e3eaefdca406e534ba9 SHA512 3410bd40fd29b9a140e1508c0fea5aed6ad95c8c05b6ab5bca83dfd1a82ed617fe086b45677d971a21cb62c6e7e3f9ade43793b4b1eba978ae6ab0e6a88c3ce7 WHIRLPOOL 8d49a80655a987ea098a7185664f37549a99a54e1da4082ec614ae7b4a4361c3368ca47c857a92e6b5a8c21ecf9a650a9dab6f99bcbcfd22aa0c448f2240b790
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQkjpgAAoJEEdUh39IaPFNLgQH/0SHskNG/f8lrXDxmSB1EtrY
+4d3IIQoN+9VCyUDGPl2kUJ9kTFNsz6MZeCcYO6XV4xE+ajEqCKn1lDWyjVwX0OOF
+uOGJ6uDlMpS1F8iAayhfm9/MuUkiAu4rKKXeEW9Qhc3poM3sGg5Kanef9FHQMZ9y
+vu1XhCCzIo/BSloxXHyMz78kFgbVFnkLBV2VLdQLpoxZhlXNgp0GYbg1wl9oQ3t4
+z2TfBDgWPIfbH9drGtffukx2ode2RfH7Wc6QQvEdyxb+upBK8U0K9l5UonMcDtNQ
+NDnGVmWqZNk4yRgCbgdt11+WTqlK2vaH+CLKHmxJd5yyVqvQZn+IT1DvDRStoqg=
+=9JvQ
+-----END PGP SIGNATURE-----
diff --git a/app-shells/bash-completion/bash-completion-1.3-r1.ebuild b/app-shells/bash-completion/bash-completion-1.3-r1.ebuild
new file mode 100644
index 000000000000..589dfc226acb
--- /dev/null
+++ b/app-shells/bash-completion/bash-completion-1.3-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-1.3-r1.ebuild,v 1.1 2012/11/01 09:06:05 ssuominen Exp $
+
+EAPI=3
+inherit prefix
+
+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=""
+
+DEPEND=""
+RDEPEND="app-admin/eselect
+	|| ( >=app-shells/bash-3.2 app-shells/zsh )
+	sys-apps/miscfiles"
+PDEPEND="app-shells/gentoo-bashcomp"
+
+src_prepare() {
+	cp "${FILESDIR}"/bash-completion.sh-gentoo-1.2 "${T}"/bash-completion.sh || die
+	eprefixify "${T}"/bash-completion.sh
+
+	find "${S}"/completions -name 'Makefile*' -delete
+}
+
+src_configure() { :; } # no-op
+src_compile() { :; } # no-op
+
+src_install() {
+	# Gentoo specific bash-completion.sh file.
+	insinto /etc/profile.d
+	doins "${T}"/bash-completion.sh || die
+
+	# All files from contrib/ in source package get installed
+	insinto /usr/share/bash-completion
+	doins -r "${S}"/completions/* || die
+
+	awk -v D="$ED" '
+	BEGIN { out=".pre" }
+	/^# A lot of the following one-liners/ { out="base" }
+	/^# start of section containing completion functions called by other functions/ { out=".pre" }
+	/^# start of section containing completion functions for external programs/ { out="base" }
+	/^# source completion directory/ { out="" }
+	/^unset -f have/ { out=".post" }
+	out != "" { print > D"/usr/share/bash-completion/"out }' \
+	bash_completion || die "failed to split bash_completion"
+
+	dodoc AUTHORS CHANGES README TODO || die "dodocs failes"
+
+	# This is backported from upstream 2.0 release. You can stop installing
+	# this file after 2.0 is in Portage and use the one from the tarball
+	# instead.
+	# Installed to datadir instead of libdir because bash-completion(s)
+	# are not ELF files.
+	insinto /usr/share/pkgconfig
+	doins "${FILESDIR}"/bash-completion.pc || die
+}
+
+pkg_postinst() {
+	elog "Any user can enable the module completions without editing their"
+	elog ".bashrc by running:"
+	elog
+	elog "    eselect bashcomp enable <module>"
+	elog
+	elog "The system administrator can also be enable this globally with"
+	elog
+	elog "    eselect bashcomp enable --global <module>"
+	elog
+	elog "Make sure you at least enable the base module! Additional completion"
+	elog "modules can be found by running"
+	elog
+	elog "    eselect bashcomp list"
+	elog
+	elog "If you use non-login shells you still need to source"
+	elog "/etc/profile.d/bash-completion.sh in your ~/.bashrc."
+
+	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
+}
diff --git a/app-shells/bash-completion/files/bash-completion.pc b/app-shells/bash-completion/files/bash-completion.pc
new file mode 100644
index 000000000000..79711a99da7e
--- /dev/null
+++ b/app-shells/bash-completion/files/bash-completion.pc
@@ -0,0 +1,9 @@
+prefix=/usr
+compatdir=/etc/bash_completion.d
+completionsdir=${prefix}/share/bash-completion
+helpersdir=${prefix}/share/bash-completion
+
+Name: bash-completion
+Description: programmable completion for the bash shell
+URL: http://bash-completion.alioth.debian.org/
+Version: 1.3