Add patch to read USE expanded variables from their desc files. Fixes bug #238005. Thanks to Michael A. Smith <michael@smith-li.com>.

(Portage version: 2.1.6_rc2/cvs/Linux 2.6.27-gentoo-r2 i686)

3 files changed, 99 insertions, 1 deletions

diff --git a/app-portage/gentoolkit/ChangeLog b/app-portage/gentoolkit/ChangeLog
index 240ae18647da..52c9f5aefeb8 100644
--- a/app-portage/gentoolkit/ChangeLog
+++ b/app-portage/gentoolkit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-portage/gentoolkit
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.144 2008/10/03 13:19:33 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.145 2008/11/30 17:15:33 betelgeuse Exp $
+
+*gentoolkit-0.2.4.2-r1 (30 Nov 2008)
+
+  30 Nov 2008; Petteri Räty <betelgeuse@gentoo.org>
+  +files/equery-0.2.4.2_use_expanded.patch, +gentoolkit-0.2.4.2-r1.ebuild:
+  Add patch to read USE expanded variables from their desc files. Fixes bug
+  #238005. Thanks to Michael A. Smith <michael@smith-li.com>.
 
   03 Oct 2008; Alexis Ballier <aballier@gentoo.org>
   gentoolkit-0.2.4.2.ebuild:
@@ -586,6 +593,7 @@
   are no new bugs.
 
 *gentoolkit-0.2.0_pre10-r1 (31 Oct 2004)
+*gentoolkit-0.2.0_pre8-r1 (31 Oct 2004)
 
   31 Oct 2004; Marius Mauch <genone@gentoo.org>
   +files/qpkg-security-fix-68846.diff, +gentoolkit-0.2.0_pre10-r1.ebuild,
diff --git a/app-portage/gentoolkit/files/equery-0.2.4.2_use_expanded.patch b/app-portage/gentoolkit/files/equery-0.2.4.2_use_expanded.patch
new file mode 100644
index 000000000000..b991d35eeaeb
--- /dev/null
+++ b/app-portage/gentoolkit/files/equery-0.2.4.2_use_expanded.patch
@@ -0,0 +1,31 @@
+--- gentoolkit-0.2.4.2/src/equery/equery	2008-11-27 10:25:21.000000000 -0500
++++ gentoolkit-0.2.4.2/src/equery/equery	2008-11-27 10:29:09.000000000 -0500
+@@ -17,6 +17,7 @@
+ import re
+ import sys
+ import time
++from glob import glob
+ 
+ # portage (output module) and gentoolkit need special path modifications
+ sys.path.insert(0, "/usr/lib/gentoolkit/pym")
+@@ -529,6 +530,20 @@
+ 		except IOError:
+ 			print_warn(5, "Could not load USE flag descriptions from " + ppath(gentoolkit.settings["PORTDIR"] + "/profiles/use.desc"))
+ 
++		# Add USE_EXPANDED variables to usedesc hash -- Bug #238005
++		for descfile in glob(gentoolkit.settings["PORTDIR"]+"/profiles/desc/*.desc"):
++			try:
++				fd = open(descfile)
++				for line in fd.readlines():
++					if line[0] == "#":
++						continue
++					fields = [field.strip() for field in line.split(" - ", 1)]
++					if len(fields) == 2:
++						expanded_useflag = "%s_%s" % (descfile.split("/")[-1][0:-5], fields[0],)
++						usedesc[expanded_useflag] = fields[1]
++			except IOError:
++				print_warn(5, "Could not load USE flag descriptions from " + descfile)
++			
+ 		# Load local USE flag descriptions
+ 		try:
+ 			fd = open(gentoolkit.settings["PORTDIR"]+"/profiles/use.local.desc")
diff --git a/app-portage/gentoolkit/gentoolkit-0.2.4.2-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.2.4.2-r1.ebuild
new file mode 100644
index 000000000000..b3acb405b80c
--- /dev/null
+++ b/app-portage/gentoolkit/gentoolkit-0.2.4.2-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.2.4.2-r1.ebuild,v 1.1 2008/11/30 17:15:33 betelgeuse Exp $
+
+EAPI=2
+
+inherit eutils python
+
+DESCRIPTION="Collection of administration scripts for Gentoo"
+HOMEPAGE="http://www.gentoo.org/proj/en/portage/tools/index.xml"
+SRC_URI="mirror://gentoo/${P}.tar.gz http://dev.gentoo.org/~fuzzyray/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="userland_GNU"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd"
+
+DEPEND=">=sys-apps/portage-2.1.1_pre1
+	>=dev-lang/python-2.0
+	>=dev-lang/perl-5.6
+	>=sys-apps/grep-2.4
+	userland_GNU? ( sys-apps/debianutils )"
+
+
+src_prepare() {
+	epatch "${FILESDIR}/equery-0.2.4.2_use_expanded.patch"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-gentoolkit || die "install-gentoolkit failed"
+
+	# Create cache directory for revdep-rebuild
+	dodir /var/cache/revdep-rebuild
+	keepdir /var/cache/revdep-rebuild
+	fowners root:root /var/cache/revdep-rebuild
+	fperms 0700 /var/cache/revdep-rebuild
+}
+
+pkg_postinst() {
+	# Make sure that our ownership and permissions stuck
+	chown root:root "${ROOT}/var/cache/revdep-rebuild"
+	chmod 0700 "${ROOT}/var/cache/revdep-rebuild"
+
+	python_mod_optimize /usr/lib/gentoolkit
+	echo
+	elog "The default location for revdep-rebuild files has been moved"
+	elog "to /var/cache/revdep-rebuild when run as root."
+	elog
+	elog "Another alternative to equery is app-portage/portage-utils"
+	elog
+	elog "For further information on gentoolkit, please read the gentoolkit"
+	elog "guide: http://www.gentoo.org/doc/en/gentoolkit.xml"
+	elog
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/lib/gentoolkit
+}