Version bump to fix bug 248470, patch by Thomas Bellman. Allows parent profiles to be selectable. Also, remove old versions

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

8 files changed, 44 insertions, 265 deletions

diff --git a/app-admin/eselect/ChangeLog b/app-admin/eselect/ChangeLog
index 51cb835eca7a..4199c9b40c4f 100644
--- a/app-admin/eselect/ChangeLog
+++ b/app-admin/eselect/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-admin/eselect
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/ChangeLog,v 1.79 2009/04/08 04:35:10 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/ChangeLog,v 1.80 2009/04/08 05:23:54 darkside Exp $
+
+*eselect-1.0.11-r2 (08 Apr 2009)
+
+  08 Apr 2009; Jeremy Olexa <darkside@gentoo.org>
+  +files/eselect-1.0.11-parent-profiles.patch, -eselect-1.0.2.ebuild,
+  -eselect-1.0.7.ebuild, -eselect-1.0.8.ebuild, -eselect-1.0.9.ebuild,
+  -eselect-1.0.11.ebuild, +eselect-1.0.11-r2.ebuild:
+  Version bump to fix bug 248470, patch by Thomas Bellman. Allows parent
+  profiles to be selectable. Also, remove old versions
 
   08 Apr 2009; Jeremy Olexa <darkside@gentoo.org> eselect-1.0.11-r1.ebuild:
   fix postinst message to include instructions for enabling globally, bug 265168
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index e533c882b190..7c885f845cde 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,17 +1,10 @@
 AUX eselect-1.0.11-fix-paludis-command.patch 331 RMD160 4a35622b17e7f147a02ae0f432593f65a7021a9e SHA1 85fda1eae6f0d45a06dc0ec536a322a305bbba41 SHA256 a664d6e41b1ab3d4993b404126f205ddd8b64e622f3f20e2ee00a2fe1a11a9c7
+AUX eselect-1.0.11-parent-profiles.patch 645 RMD160 aff0f543072428921bf337cf89c3218c92a3b32e SHA1 6949c27550c60d62daf148f997d8b936633b4320 SHA256 33d9da042e09bb02518d1acd8cdb8d1b7e5685ead96823929847408b6aed4b73
 AUX eselect-1.0.8-fix-parallel-install.patch 382 RMD160 29859517a46bf6f8cd6776057297b65eacfc95df SHA1 033721eb8f964e326dec98913642348023a8ea01 SHA256 093b3e046fff5fedbc59f45ca4f4a61391c9fe81b412177c6649d7c56b01264d
 DIST eselect-1.0.10.tar.bz2 153077 RMD160 8d5abdf3ac3dec327891023a65ca5c3050bc25c2 SHA1 f40fa9565515fa4e43511634c97f8bbeb39295be SHA256 61b7c2238dc4316905944b9b6b3f570658df83c5c2281a19f848bc2bd56e4a25
 DIST eselect-1.0.11.tar.bz2 153348 RMD160 ef7ecd3c5e537478766f5d55f97fa527a5ad0c91 SHA1 272d58acd11238e033cefca274e9d4543390094e SHA256 711f945d1a7145f5a831dede33f8acb9806bd72833f76b5231ca11b488a01354
-DIST eselect-1.0.2.tar.bz2 147189 RMD160 73cdb5235d068965cb3df9e82e34031e4782af00 SHA1 139153caa6758738a0e4e75cce013c090600308f SHA256 0be9cb816f9194d28dc50a2f7110aa9d0622dd41c981265af10420cb972cf7f5
-DIST eselect-1.0.7.tar.bz2 151621 RMD160 a5b89b77f8a5a82400804badcdee613888e68a70 SHA1 5a261f88fd5775ae5199ddaa7e57bb529805ce90 SHA256 d99a2d0304fddcd1f7a6aba476ea7935d10da3b9064003b232f74f153e714992
-DIST eselect-1.0.8.tar.bz2 152443 RMD160 52ee673c90adefb4d96c9da4298bd93d8739aee3 SHA1 ddba151bed793da5d1708326a065ecfb51d3a556 SHA256 9185b87bea55418909be9e8d877eae80b0b822e48b3ca45d967b01bf08c550c3
-DIST eselect-1.0.9.tar.bz2 152679 RMD160 0b15674395fa30ad533caf9086575b1aefdc73b5 SHA1 b2eabcf70a529e9fd2fe2d675c941fbd598755ec SHA256 44f29f0926f6b1222857bac2168538cac89855952bc3f9f5eff4bff747fdcdc9
 EBUILD eselect-1.0.10.ebuild 1657 RMD160 07a75f7688abbd136c9ac24f4bf49ff0fbedef5c SHA1 1843c0c66136b803e2f4b3f71dd8fc2fb766ee91 SHA256 397965395a32b682210da54df0c74f8173d47d73749bebd96e57de3b9da0b76f
 EBUILD eselect-1.0.11-r1.ebuild 1695 RMD160 9c8f6f4e6f89cd87aaaad2337bb727ae7e0f06e3 SHA1 1d36617295d9b311281930ff15b2e6c9cd5d061e SHA256 b5699872825bfc934312c574859dde4d6ded8c0578a014317b8fc98dcb66ad95
-EBUILD eselect-1.0.11.ebuild 1474 RMD160 e148eba77ada5ca1033d9b32b7d2a0d118b30450 SHA1 35e450a801bc5c1fb8e6e827fb7d09fe642d630f SHA256 e7d9eb613ebeb6ee8fc8f2b798d6b34abf655ce4f1b7f548d07199df93677db2
-EBUILD eselect-1.0.2.ebuild 1345 RMD160 59a4f1a407ebea93162c2e4de19b26cd163227b4 SHA1 229893472982ea13c882394a257a8677536c85ac SHA256 80a997c9215440df59e565d45b4a7bc8bf51c0f54fd899d3cc80a9064cf3f00b
-EBUILD eselect-1.0.7.ebuild 1595 RMD160 e732d1ddd25b0b268a9ba59d8884b82f6f33ee14 SHA1 6f3112b20c6c5903c525f6eda7d72a4243845d59 SHA256 5e09cca3932715fce7115d26675ccf3b20113bd56deb70a9573319e80c31f7a2
-EBUILD eselect-1.0.8.ebuild 1739 RMD160 cf7c028d1768c50ff7f2c0ed65bb151bb20ef630 SHA1 5dc87c73d92d802f38515804453bf86245122977 SHA256 fe74dc256e24c9d8a1331b913924bf45e6bfc54b635187f19a7d3c6bd832d289
-EBUILD eselect-1.0.9.ebuild 1667 RMD160 2a97f8b0821142e999d8419f013b4c1ee8ed6903 SHA1 4f3d8701ad0c61641f1094629df80ad0f75f06b9 SHA256 23a46b2a00ac4965398af14162c1d23fdf10d23898fd2305d11df44a5ebcd400
-MISC ChangeLog 12135 RMD160 30cb5176687b70aa8865ea65a4ac704d56d2d31f SHA1 5612848c74d7c3e0dd88a4d7a0e76bd5413664ea SHA256 01f63f8da3b5e94d1443044acbaf2aa50231bee3731718ecbc389c26664be9ff
+EBUILD eselect-1.0.11-r2.ebuild 1761 RMD160 f3267d5eb46b10e1b497ca33ff1e8fbccc6bfd27 SHA1 d753c25819f7024ea8a848a9d3f5d9b65b1c814c SHA256 9e7ffc27f938039aa53d4ee74ecedd361dff12b71d1ff2498005100dd7127a8e
+MISC ChangeLog 12542 RMD160 8974aea35441b7ea93815cb3ac20524b4898be2b SHA1 6fd1937c2ad4c8c41ede14b241e58d873ae07970 SHA256 3c2a7a50dfccd9c7dbc74786a7f556cb624423bd7ef01352e26a41090603e09a
 MISC metadata.xml 226 RMD160 c17329676784fd7b99439a08e9e15d942763da61 SHA1 dd05a4ccd4cd23092fbf4248cb13b548d2b0130a SHA256 ef8f7fb97dfc4aed17d7da4859d4b9af2ab812238eee190ab015c57ee896127e
diff --git a/app-admin/eselect/eselect-1.0.11.ebuild b/app-admin/eselect/eselect-1.0.11-r2.ebuild
index e293ce92342f..328c938dede9 100644
--- a/app-admin/eselect/eselect-1.0.11.ebuild
+++ b/app-admin/eselect/eselect-1.0.11-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.0.11.ebuild,v 1.1 2007/12/01 17:24:08 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.0.11-r2.ebuild,v 1.1 2009/04/08 05:23:54 darkside Exp $
 
 inherit eutils
 
@@ -25,6 +25,15 @@ RDEPEND="sys-apps/sed
 
 PDEPEND="vim-syntax? ( app-vim/eselect-syntax )"
 
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-fix-paludis-command.patch"
+	pwd
+	epatch "${FILESDIR}/${P}-parent-profiles.patch"
+}
+
 src_compile() {
 	econf || die "econf failed"
 	emake || die "emake failed"
@@ -53,5 +62,10 @@ pkg_postinst() {
 		elog
 		elog "  eselect bashcomp enable eselect"
 		elog
+		elog "to install locally, or"
+		elog
+		elog "  eselect bashcomp enable --global eselect"
+		elog
+		elog "to install system-wide."
 	fi
 }
diff --git a/app-admin/eselect/eselect-1.0.2.ebuild b/app-admin/eselect/eselect-1.0.2.ebuild
deleted file mode 100644
index 465faded199c..000000000000
--- a/app-admin/eselect/eselect-1.0.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.0.2.ebuild,v 1.16 2007/02/28 21:52:02 genstef Exp $
-
-DESCRIPTION="Modular -config replacement utility"
-HOMEPAGE="http://www.gentoo.org/proj/en/eselect/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="doc bash-completion"
-
-DEPEND="sys-apps/sed
-	doc? ( dev-python/docutils )
-	|| (
-		sys-apps/coreutils
-		sys-freebsd/freebsd-bin
-		app-admin/realpath
-	)"
-RDEPEND="sys-apps/sed
-	sys-apps/file"
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-
-	if use doc ; then
-		make html || die "failed to build html"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
-	use doc && dohtml *.html doc/*
-
-	# we don't use bash-completion.eclass since eselect
-	# is listed in RDEPEND.
-	if use bash-completion ; then
-		insinto /usr/share/bash-completion
-		newins misc/${PN}.bashcomp ${PN} || die
-	fi
-}
-
-pkg_postinst() {
-	if use bash-completion ; then
-		elog
-		elog "To enable command-line completion for eselect, run:"
-		elog
-		elog "  eselect bashcomp enable eselect"
-		elog
-	fi
-}
diff --git a/app-admin/eselect/eselect-1.0.7.ebuild b/app-admin/eselect/eselect-1.0.7.ebuild
deleted file mode 100644
index 817804373d08..000000000000
--- a/app-admin/eselect/eselect-1.0.7.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.0.7.ebuild,v 1.14 2007/02/07 14:47:46 blubb Exp $
-
-DESCRIPTION="Modular -config replacement utility"
-HOMEPAGE="http://www.gentoo.org/proj/en/eselect/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="doc bash-completion"
-
-DEPEND="sys-apps/sed
-	doc? ( dev-python/docutils )
-	|| (
-		sys-apps/coreutils
-		sys-freebsd/freebsd-bin
-		app-admin/realpath
-	)"
-RDEPEND="sys-apps/sed
-	sys-apps/file"
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-
-	if use doc ; then
-		make html || die "failed to build html"
-	fi
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
-	use doc && dohtml *.html doc/*
-
-	# we don't use bash-completion.eclass since eselect
-	# is listed in RDEPEND.
-	if use bash-completion ; then
-		insinto /usr/share/bash-completion
-		newins misc/${PN}.bashcomp ${PN} || die
-	fi
-}
-
-pkg_postinst() {
-	if use bash-completion ; then
-		elog
-		elog "To enable command-line completion for eselect, run:"
-		elog
-		elog "  eselect bashcomp enable eselect"
-		elog
-	fi
-
-	elog "Modules cblas.eselect, blas.eselect and lapack.eselect have"
-	elog "been split-out to separate packages called:"
-	elog
-	elog "  app-admin/eselect-cblas"
-	elog "  app-admin/eselect-blas"
-	elog "  app-admin/eselect-lapack"
-	elog
-}
diff --git a/app-admin/eselect/eselect-1.0.8.ebuild b/app-admin/eselect/eselect-1.0.8.ebuild
deleted file mode 100644
index 86ece98d3be2..000000000000
--- a/app-admin/eselect/eselect-1.0.8.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.0.8.ebuild,v 1.3 2007/01/24 14:07:12 genone Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="Modular -config replacement utility"
-HOMEPAGE="http://www.gentoo.org/proj/en/eselect/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="doc bash-completion"
-
-DEPEND="sys-apps/sed
-	doc? ( dev-python/docutils )
-	|| (
-		sys-apps/coreutils
-		sys-freebsd/freebsd-bin
-		app-admin/realpath
-	)"
-RDEPEND="sys-apps/sed
-	sys-apps/file"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-fix-parallel-install.patch"
-	eautoreconf
-}
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-
-	if use doc ; then
-		make html || die "failed to build html"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
-	use doc && dohtml *.html doc/*
-
-	# we don't use bash-completion.eclass since eselect
-	# is listed in RDEPEND.
-	if use bash-completion ; then
-		insinto /usr/share/bash-completion
-		newins misc/${PN}.bashcomp ${PN} || die
-	fi
-}
-
-pkg_postinst() {
-	if use bash-completion ; then
-		elog
-		elog "To enable command-line completion for eselect, run:"
-		elog
-		elog "  eselect bashcomp enable eselect"
-	fi
-
-	elog
-	elog "Modules cblas.eselect, blas.eselect and lapack.eselect have"
-	elog "been split-out to separate packages called:"
-	elog
-	elog "  app-admin/eselect-cblas"
-	elog "  app-admin/eselect-blas"
-	elog "  app-admin/eselect-lapack"
-	elog
-}
diff --git a/app-admin/eselect/eselect-1.0.9.ebuild b/app-admin/eselect/eselect-1.0.9.ebuild
deleted file mode 100644
index b398f1358880..000000000000
--- a/app-admin/eselect/eselect-1.0.9.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.0.9.ebuild,v 1.2 2007/05/06 23:17:05 pioto Exp $
-
-inherit eutils
-
-DESCRIPTION="Modular -config replacement utility"
-HOMEPAGE="http://www.gentoo.org/proj/en/eselect/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="doc bash-completion vim-syntax"
-
-DEPEND="sys-apps/sed
-	doc? ( dev-python/docutils )
-	|| (
-		sys-apps/coreutils
-		sys-freebsd/freebsd-bin
-		app-admin/realpath
-	)"
-RDEPEND="sys-apps/sed
-	sys-apps/file"
-
-PDEPEND="vim-syntax? ( app-vim/eselect-syntax )"
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-
-	if use doc ; then
-		make html || die "failed to build html"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
-	use doc && dohtml *.html doc/*
-
-	# we don't use bash-completion.eclass since eselect
-	# is listed in RDEPEND.
-	if use bash-completion ; then
-		insinto /usr/share/bash-completion
-		newins misc/${PN}.bashcomp ${PN} || die
-	fi
-}
-
-pkg_postinst() {
-	if use bash-completion ; then
-		elog "To enable command-line completion for eselect, run:"
-		elog
-		elog "  eselect bashcomp enable eselect"
-		elog
-	fi
-
-	elog "Modules cblas.eselect, blas.eselect and lapack.eselect have"
-	elog "been split-out to separate packages called:"
-	elog
-	elog "  app-admin/eselect-cblas"
-	elog "  app-admin/eselect-blas"
-	elog "  app-admin/eselect-lapack"
-}
diff --git a/app-admin/eselect/files/eselect-1.0.11-parent-profiles.patch b/app-admin/eselect/files/eselect-1.0.11-parent-profiles.patch
new file mode 100644
index 000000000000..e6a1baafb060
--- /dev/null
+++ b/app-admin/eselect/files/eselect-1.0.11-parent-profiles.patch
@@ -0,0 +1,15 @@
+Allow parent profiles to be selectable, patch by Thomas Bellman in bug 248470
+
+Already in svn.
+
+--- modules/profile.eselect.orig	2009-04-08 00:18:09.366660181 -0500
++++ modules/profile.eselect	2009-04-08 00:18:49.572626838 -0500
+@@ -47,7 +47,7 @@
+ 		[[ -z "${arch}" && ${2} != "--force" ]] && return 1
+ 
+ 		# do a reverse lookup and find the arch associated with ${target}
+-		parch=$(sed -n -e "s|^\([[:alnum:]]\+\)[[:space:]].*${target}.*$|\1|p" \
++		parch=$(sed -n -e "s|^\([[:alnum:]]\+\)[[:space:]].*${target}[[:space:]].*$|\1|p" \
+ 			${ROOT}/${portdir}/profiles/profiles.desc)
+ 
+ 		if [[ ${arch} != ${parch} && ${2} != "--force" ]] ; then