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

(Portage version: 2.1.6.11/cvs/Linux x86_64)

7 files changed, 41 insertions, 255 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/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