Revison bump to fix missing quotes in euse. Bug 382219

(Portage version: 2.1.10.13/cvs/Linux x86_64)

3 files changed, 134 insertions, 1 deletions

diff --git a/app-portage/gentoolkit/ChangeLog b/app-portage/gentoolkit/ChangeLog
index 7427ee5e6f66..3e128ed39ec1 100644
--- a/app-portage/gentoolkit/ChangeLog
+++ b/app-portage/gentoolkit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-portage/gentoolkit
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.231 2011/08/26 21:42:17 fuzzyray Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.232 2011/09/08 01:30:37 fuzzyray Exp $
+
+*gentoolkit-0.3.0.4-r4 (08 Sep 2011)
+
+  08 Sep 2011; Paul Varner <fuzzyray@gentoo.org> +gentoolkit-0.3.0.4-r4.ebuild,
+  +files/0.3.0.4-euse-382219.patch:
+  Revison bump to fix missing quotes in euse. Bug 382219
 
 *gentoolkit-0.3.0.4-r3 (26 Aug 2011)
 
diff --git a/app-portage/gentoolkit/files/0.3.0.4-euse-382219.patch b/app-portage/gentoolkit/files/0.3.0.4-euse-382219.patch
new file mode 100644
index 000000000000..168ca3db99cb
--- /dev/null
+++ b/app-portage/gentoolkit/files/0.3.0.4-euse-382219.patch
@@ -0,0 +1,42 @@
+From 4a1fe09bfdff516e28aab23eea102984fedb429a Mon Sep 17 00:00:00 2001
+From: Christian Ruppert <idl0r@gentoo.org>
+Date: Wed, 7 Sep 2011 14:39:10 +0200
+Subject: [PATCH] Add missing quotes
+
+---
+ bin/euse |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/bin/euse b/bin/euse
+index bedba35..febe732 100755
+--- a/bin/euse
++++ b/bin/euse
+@@ -275,21 +275,21 @@ get_useflags() {
+ 	# backup portdir so get_portdir() doesn't give false results later
+ 	portdir_backup="${PORTDIR}"
+ 	
+-	ACTIVE_FLAGS[0]="$(reduce_incrementals ${USE})"
++	ACTIVE_FLAGS[0]="$(reduce_incrementals "${USE}")"
+ 	USE=""
+ 	for x in $(get_all_make_conf); do
+ 		source "${x}"
+-		ACTIVE_FLAGS[1]="$(reduce_incrementals ${ACTIVE_FLAGS[1]} ${USE})"
++		ACTIVE_FLAGS[1]="$(reduce_incrementals "${ACTIVE_FLAGS[1]}" "${USE}")"
+ 	done
+ 	USE=""
+ 	for x in $(get_all_make_defaults); do
+ 		source "${x}"
+ 		ACTIVE_FLAGS[2]="${ACTIVE_FLAGS[2]} ${USE}"
+ 	done
+-	ACTIVE_FLAGS[2]="$(reduce_incrementals ${ACTIVE_FLAGS[2]})"
++	ACTIVE_FLAGS[2]="$(reduce_incrementals "${ACTIVE_FLAGS[2]}")"
+ 	USE=""
+ 	source "${MAKE_GLOBALS_PATH}"
+-	ACTIVE_FLAGS[3]="$(reduce_incrementals ${USE})"
++	ACTIVE_FLAGS[3]="$(reduce_incrementals "${USE}")"
+ 
+ 	# restore saved env variables
+ 	USE="${ACTIVE_FLAGS[0]}"
+-- 
+1.7.3.4
+
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.4-r4.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.4-r4.ebuild
new file mode 100644
index 000000000000..7af84c6f4837
--- /dev/null
+++ b/app-portage/gentoolkit/gentoolkit-0.3.0.4-r4.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0.4-r4.ebuild,v 1.1 2011/09/08 01:30:37 fuzzyray Exp $
+
+EAPI="3"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.[45]"
+PYTHON_USE_WITH="xml"
+PYTHON_NONVERSIONED_EXECUTABLES=(".*")
+
+inherit distutils python eutils
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+# Drop "~m68k ~s390 ~sh ~sparc-fbsd ~x86-fbsd" due to dev-python/argparse dependency
+# Note: argparse is provided in python 2.7 and 3.2 (Bug 346005)
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="sys-apps/portage"
+RDEPEND="${DEPEND}
+	!<=app-portage/gentoolkit-dev-0.2.7
+	dev-python/argparse
+	|| ( app-misc/realpath sys-freebsd/freebsd-bin )
+	sys-apps/gawk
+	sys-apps/grep"
+
+distutils_src_compile_pre_hook() {
+	echo VERSION="${PVR}" "$(PYTHON)" setup.py set_version
+	VERSION="${PVR}" "$(PYTHON)" setup.py set_version \
+		|| die "setup.py set_version failed"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-euse-376393.patch"
+	epatch "${FILESDIR}/${PV}-euse-379599.patch"
+	epatch "${FILESDIR}/${PV}-gentoolkit-375293.patch"
+	epatch "${FILESDIR}/${PV}-equery-380573.patch"
+	epatch "${FILESDIR}/${PV}-euse-382219.patch"
+}
+
+src_install() {
+	python_convert_shebangs -r "" build-*/scripts-*
+	distutils_src_install
+
+	# Create cache directory for revdep-rebuild
+	dodir /var/cache/revdep-rebuild
+	keepdir /var/cache/revdep-rebuild
+	use prefix || fowners root:root /var/cache/revdep-rebuild
+	fperms 0700 /var/cache/revdep-rebuild
+
+	# remove on Gentoo Prefix platforms where it's broken anyway
+	if use prefix; then
+		elog "The revdep-rebuild command is removed, the preserve-libs"
+		elog "feature of portage will handle issues."
+		rm "${ED}"/usr/bin/revdep-rebuild
+		rm "${ED}"/usr/share/man/man1/revdep-rebuild.1
+		rm -rf "${ED}"/etc/revdep-rebuild
+		rm -rf "${ED}"/var
+	fi
+
+	# Can distutils handle this?
+	dosym eclean /usr/bin/eclean-dist
+	dosym eclean /usr/bin/eclean-pkg
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+
+	einfo
+	einfo "For further information on gentoolkit, please read the gentoolkit"
+	einfo "guide: http://www.gentoo.org/doc/en/gentoolkit.xml"
+	einfo
+	einfo "Another alternative to equery is app-portage/portage-utils"
+	ewarn
+	ewarn "glsa-check since gentoolkit 0.3 has modified some output,"
+	ewarn "options and default behavior. The list of injected GLSAs"
+	ewarn "has moved to /var/lib/portage/glsa_injected, please"
+	ewarn "run 'glsa-check -p affected' before copying the existing checkfile."
+}