Fix breakage after /etc/make.globals, bug #431034.

Package-Manager: portage-2.1.11.24/cvs/Linux x86_64

3 files changed, 66 insertions, 3 deletions

diff --git a/app-shells/gentoo-bashcomp/ChangeLog b/app-shells/gentoo-bashcomp/ChangeLog
index 31bc80671fdb..e9ce06442964 100644
--- a/app-shells/gentoo-bashcomp/ChangeLog
+++ b/app-shells/gentoo-bashcomp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-shells/gentoo-bashcomp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/gentoo-bashcomp/ChangeLog,v 1.46 2012/05/04 11:07:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/gentoo-bashcomp/ChangeLog,v 1.47 2012/10/06 09:42:36 pacho Exp $
+
+*gentoo-bashcomp-20101217-r1 (06 Oct 2012)
+
+  06 Oct 2012; Pacho Ramos <pacho@gentoo.org>
+  +gentoo-bashcomp-20101217-r1.ebuild:
+  Fix breakage after /etc/make.globals, bug #431034.
 
   04 May 2012; Alexis Ballier <aballier@gentoo.org>
   gentoo-bashcomp-20101217.ebuild:
@@ -219,4 +225,3 @@
   +gentoo-bashcomp-20050316.ebuild:
   New release; broken out from app-shells/bash-completion and into its own
   ebuild.
-
diff --git a/app-shells/gentoo-bashcomp/Manifest b/app-shells/gentoo-bashcomp/Manifest
index 6d578ad0daac..bf4b3b8e376e 100644
--- a/app-shells/gentoo-bashcomp/Manifest
+++ b/app-shells/gentoo-bashcomp/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST gentoo-bashcomp-20101217.tar.bz2 23095 SHA256 834e62a9189294f30771fce3fcdeca5fae6fd706c7fd35047f246fb2c0e8cd5a SHA512 29c4802b8f71585b7146e454f44700954de8655aa46dda7046338ed46e1e9835f4ea4141cfd5a813a5f75b6586b030e0e0cbde4c8030ec303f98110fa7a5e316 WHIRLPOOL 1d2c0ea0cd9a4888cc86b05bc9f9c9e9810a7af3c601c000cfc03d1f648cf958308d0d0c09615aec9b1d5b1f550398fca08b6a5b60cbc86d189650d13d2d0987
+EBUILD gentoo-bashcomp-20101217-r1.ebuild 1585 SHA256 bb421f56457c1d3de419a0a66deed1b00882847009a9d7ec64d48288f26352f6 SHA512 24e19ee417ff18ea547afac65fc3685c6ef1f2c2dd9ffe2f79b84fc2fd5398e4739c53641a74a876f686820cda5d089de6cb80a79665c84ade07c16f953a3e4e WHIRLPOOL 0fc285165ca787b1af8be46e209872572a3ae06a7e8c29107621a51330e538e59f41ddaf93fb9bd0fa001599097f71022699d89cc65a084efff823f9639a5a42
 EBUILD gentoo-bashcomp-20101217.ebuild 1513 SHA256 44de618d36cc937866fbba67ad58b8c61422de79d1c12d3079fb00f8d75ac724 SHA512 2d0cf78c02a458c5a2b68e953fbfc9547ead7c51a2970710ea9f00bd3d6b49b3e7a1a5992c28975dbca5162c8009c42de98217eda6293ddd6dec1348abaf0046 WHIRLPOOL d1e29ea454cb6c4903332e22e3f832bde53f00f8ea7da4e6dc3c78cfb4cff46f7522bc1ea3df9cb7cc977eb9330c3ab972f6e00c230b9de19f8566f6ada7c966
-MISC ChangeLog 7196 SHA256 2a9d1f31b91067105f73e3bdd789e40bf9bf217333dadd43043c8afa1f4086ff SHA512 6d7733444a0609ff7982f99058ed2f990dd6cf30463ec6bf8ea263873dea2043d0ece31b69dbe5ce08abce435ef9cfa3e3a9a5abf42af8b7733a831f6bb59984 WHIRLPOOL f8879fbd09487ab6d06d3bc7bedc42fc315f38e0d668af41f12f968c850792a6e7c5fa8067ec92a32bc10758eb2b5ba68c5ceb8b5963c7a8d916dd58f6b6294a
+MISC ChangeLog 7375 SHA256 37cd3444e3f726faa64582af2bd1cc5f10a0fd46e121ed8279ea56e06a063990 SHA512 2433a8f5653fa68495bc27cd163510bdf3d29904bc806b0ed253c5c4db6487e0ef2846bba39cacf19a7fcbdcf1e354485779be357705fd7995e3c797527e064c WHIRLPOOL e45584c88b15836619677d32be1c66d060101c904ab821e4e417096a8081b3e51f7903203fbe237b96f44dd68c4713bf606e3f87ae571abe1b0ecf6a0d58f0e5
 MISC metadata.xml 165 SHA256 75ca85c472d4181ae0de529c83826baaebe75d9e750ee6621758b5096bceffcd SHA512 d99326d50355f1fa041618844027c043a114e7e63dec3c2d6c0c6023a5863bde8e62706bed974a394e21ce2e64ddf5539750c30e5913dacb39ed37cfd62e6eb3 WHIRLPOOL bb8b8cc1c4d9312dfe9015934c3c315a1ea6b9b6da2db22b231b434fd144ee7690ec2e242a1fba9c8e601610dc5cc9061c1995dd33c5b59c78a19a71f71d7a76
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlBv/Q0ACgkQCaWpQKGI+9S3fQCfU5248s4T1UENp/hYpJj7sXIE
+4c0AnA0VWgmnTyLugS2HOr9VOP7dP9eT
+=p9QN
+-----END PGP SIGNATURE-----
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20101217-r1.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20101217-r1.ebuild
new file mode 100644
index 000000000000..bc0d0c1018a0
--- /dev/null
+++ b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20101217-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/gentoo-bashcomp/gentoo-bashcomp-20101217-r1.ebuild,v 1.1 2012/10/06 09:42:36 pacho Exp $
+
+EAPI=4
+inherit eutils prefix
+
+DESCRIPTION="Gentoo-specific bash command-line completions (emerge, ebuild, equery, repoman, layman, etc)"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	http://dev.gentoo.org/~darkside/tmp/${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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+IUSE=""
+
+RDEPEND="app-shells/bash-completion"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-make_globals.patch" #431034
+	eprefixify gentoo
+}
+
+src_compile() {	:; } # There is a useless Makefile in the distfile
+
+src_install() {
+	insinto /usr/share/bash-completion
+	doins gentoo 	|| die "failed to install gentoo module"
+	doins repoman 	|| die "failed to install repoman module"
+	doins layman 	|| die "failed to install layman module"
+	dodoc AUTHORS ChangeLog TODO
+}
+
+pkg_postinst() {
+	# can't use bash-completion.eclass.
+	elog "To enable command-line completion for ${PN}, run:"
+	elog
+	elog "  eselect bashcomp enable gentoo"
+	elog
+	elog "to install locally, or"
+	elog
+	elog "  eselect bashcomp enable --global gentoo"
+	elog
+	elog "to install system-wide. (and/or repoman instead of gentoo if you use"
+	elog "repoman frequently)"
+}