Revision bump to add patches to add sorting to eread and fix a python3

issue with eshowkw.

(Portage version: 2.1.10.57/cvs/Linux x86_64)

4 files changed, 243 insertions, 1 deletions

diff --git a/app-portage/gentoolkit/ChangeLog b/app-portage/gentoolkit/ChangeLog
index bbda186d9d42..8d76a09da8f1 100644
--- a/app-portage/gentoolkit/ChangeLog
+++ b/app-portage/gentoolkit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-portage/gentoolkit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.261 2012/04/26 22:19:18 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.262 2012/05/09 20:43:41 fuzzyray Exp $
+
+*gentoolkit-0.3.0.6-r1 (09 May 2012)
+
+  09 May 2012; Paul Varner <fuzzyray@gentoo.org> +gentoolkit-0.3.0.6-r1.ebuild,
+  +files/0.3.0.6-eread-413577.patch, +files/0.3.0.6-eshowkw-414627.patch:
+  Revision bump to add patches to add sorting to eread and fix a python3
+  issue with eshowkw.
 
   26 Apr 2012; Alexis Ballier <aballier@gentoo.org> gentoolkit-0.3.0.6.ebuild:
   keyword ~amd64-fbsd
diff --git a/app-portage/gentoolkit/files/0.3.0.6-eread-413577.patch b/app-portage/gentoolkit/files/0.3.0.6-eread-413577.patch
new file mode 100644
index 000000000000..a0ddcd91af84
--- /dev/null
+++ b/app-portage/gentoolkit/files/0.3.0.6-eread-413577.patch
@@ -0,0 +1,97 @@
+From a6a159cd3f8c8a89eccbba57689623a747fea73f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C5=82awomir=20Nizio?= <slawomir.nizio@sabayon.org>
+Date: Thu, 26 Apr 2012 00:50:57 +0200
+Subject: [PATCH 1/2] Extend eread to allow sorting (bug 413577).
+
+---
+ bin/eread   |   35 +++++++++++++++++++++++++++++++++--
+ man/eread.1 |   13 +++++++++++++
+ 2 files changed, 46 insertions(+), 2 deletions(-)
+
+diff --git a/bin/eread b/bin/eread
+index 7d0a970..d74a167 100755
+--- a/bin/eread
++++ b/bin/eread
+@@ -5,6 +5,7 @@
+ #
+ # Author: Donnie Berkholz <spyderous@gentoo.org>
+ # Updated by: Uwe Klosa <uwe.klosa@gmail.com>
++# Updated by: Slawomir Nizio <slawomir.nizio@sabayon.org>
+ 
+ # Get prefix
+ EPREFIX=${EPREFIX:-$(portageq envvar EPREFIX)}
+@@ -30,9 +31,33 @@ fi
+ # Set up select prompt
+ PS3="Choice? "
+ 
++SORT=${EREAD_SORT_ORDER}
++
++find_unsorted() {
++	find . -type f | sed -e "s:\./::g"
++}
++find_by_name() {
++	find . -type f | sort | sed -e "s:\./::g"
++}
++find_by_time() {
++	find . -type f | sort -k 3 -t : | sed -e "s:\./::g"
++}
++find_files() {
++	case ${SORT} in
++		alphabet)
++			find_by_name
++			;;
++		time)
++			find_by_time
++			;;
++		*)
++			find_unsorted
++		;;
++	esac
++}
++
+ select_loop() {
+-	ANY_FILES=$(find . -type f)
+-	ANY_FILES=$(echo ${ANY_FILES} | sed -e "s:\./::g")
++	ANY_FILES=$(find_files)
+ 
+ 	if [[ -z ${ANY_FILES} ]]; then
+ 		echo "No log items to read"
+@@ -51,6 +76,12 @@ select_loop() {
+ 				QUIT="yes"
+ 				break
+ 				;;
++			a)
++				SORT="alphabet"
++				;;
++			t)
++				SORT="time"
++				;;
+ 			*)
+ 				if [ -f "$FILE" ]; then
+ 					${PAGER} ${FILE}
+diff --git a/man/eread.1 b/man/eread.1
+index 5e18214..c58c7eb 100644
+--- a/man/eread.1
++++ b/man/eread.1
+@@ -8,5 +8,18 @@ eread
+ .SH "DESCRIPTION"
+ .LP 
+ This tool is used to display and manage ELOG files produced by portage version 2.1 and higher.
++.SH "USAGE"
++.LP
++You can use the following commands:
++.TP
++.B "q"
++Quit
++.TP
++.B "a"
++Sort alphabetically
++.TP
++.B "t"
++Sort by time
+ .SH "ENVIRONMENT VARIABLES"
+ The eread utility uses the PAGER environment variable to display the ELOG files. If the variable is not set, it defaults to /usr/bin/less.
++Another environment variable is EREAD_SORT_ORDER which can be set to specify default sort order of ELOG files. Values \fBalphabet\fP and \fBtime\fP are recognized. If EREAD_SORT_ORDER is not set or has another value, the output is unsorted.
+-- 
+1.7.8.6
+
diff --git a/app-portage/gentoolkit/files/0.3.0.6-eshowkw-414627.patch b/app-portage/gentoolkit/files/0.3.0.6-eshowkw-414627.patch
new file mode 100644
index 000000000000..e37594536cbb
--- /dev/null
+++ b/app-portage/gentoolkit/files/0.3.0.6-eshowkw-414627.patch
@@ -0,0 +1,44 @@
+From 9369c9a3e8d92ac445ff8929a448e83fd30fb485 Mon Sep 17 00:00:00 2001
+From: Paul Varner <fuzzyray@gentoo.org>
+Date: Tue, 8 May 2012 16:03:04 -0500
+Subject: [PATCH 2/2] Fix Bug 414627, where not all packages were being
+ printed.
+
+Not sure of why this fixes it, but it appears to be caused by
+interaction between the map() and zip() iterator objects in python3.
+
+The fix is to use the list() operator to create a list from the iterator
+objects.
+---
+ pym/gentoolkit/eshowkw/keywords_content.py |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/pym/gentoolkit/eshowkw/keywords_content.py b/pym/gentoolkit/eshowkw/keywords_content.py
+index 3e2551d..77a68fb 100644
+--- a/pym/gentoolkit/eshowkw/keywords_content.py
++++ b/pym/gentoolkit/eshowkw/keywords_content.py
+@@ -23,10 +23,11 @@ class keywords_content:
+ 		def __listRedundantSlots(self, masks, keywords, slots):
+ 			"""Search for redundant packages walking per keywords for specified slot."""
+ 			output = list()
++			zipped = list(zip(masks, keywords, slots))
+ 			for slot in self.__uniq(slots):
+ 				ms = list()
+ 				ks = list()
+-				for m, k, s in zip(masks, keywords, slots):
++				for m, k, s in zipped:
+ 					if slot == s:
+ 						ms.append(m)
+ 						ks.append(k)
+@@ -157,7 +158,7 @@ class keywords_content:
+ 			self.vartree = port.db[port.root]['vartree'].dbapi
+ 			self.mysettings = port.config(local_config=False)
+ 			self.versions = self.__getVersions(packages)
+-			self.masks = map(lambda x: self.__getMaskStatus(x), packages)
++			self.masks = list(map(lambda x: self.__getMaskStatus(x), packages))
+ 
+ 	@staticmethod
+ 	def __packages_sort(package_content):
+-- 
+1.7.8.6
+
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.6-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.6-r1.ebuild
new file mode 100644
index 000000000000..cdc5d2c045ad
--- /dev/null
+++ b/app-portage/gentoolkit/gentoolkit-0.3.0.6-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2012 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.6-r1.ebuild,v 1.1 2012/05/09 20:43:41 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=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~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"
+
+# Note: argparse is provided in python 2.7 and 3.2 (Bug 346005)
+# Note: dev-lang/python dependencies are so emerge will print a blocker if any
+# installed slot of python is not built with +xml.  This is used since
+# PYTHON_USE_WITH just dies in the middle of the emerge. See bug 399331.
+DEPEND="sys-apps/portage"
+RDEPEND="${DEPEND}
+	>=dev-lang/python-2.6[xml]
+	!>=dev-lang/python-2.6[-xml]
+	!<=app-portage/gentoolkit-dev-0.2.7
+	dev-python/argparse
+	|| ( >=sys-apps/coreutils-8.15 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}-eread-413577.patch"
+	epatch "${FILESDIR}/${PV}-eshowkw-414627.patch"
+}
+
+src_install() {
+	python_convert_shebangs -r "" build-*/scripts-*
+	distutils_src_install
+
+	# Rename the python versions of revdep-rebuild, since we are not ready
+	# to switch to the python version yet. Link /usr/bin/revdep-rebuild to
+	# revdep-rebuild.sh. Leaving the python version available for potential
+	# testing by a wider audience.
+	mv "${ED}"/usr/bin/revdep-rebuild "${ED}"/usr/bin/revdep-rebuild.py
+	dosym revdep-rebuild.sh /usr/bin/revdep-rebuild
+
+	# 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/bin/revdep-rebuild.py
+		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."
+}