summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Varner <fuzzyray@gentoo.org>2014-03-12 18:26:32 +0000
committerPaul Varner <fuzzyray@gentoo.org>2014-03-12 18:26:32 +0000
commit92c0080a0d1f7f9888cbb76760491c3d6042bc38 (patch)
treece5b4f833417496af3ff6d9c87afc5b8269ef30f /app-portage
parentalpha stable wrt bug #495456 (diff)
downloadgentoo-2-92c0080a0d1f7f9888cbb76760491c3d6042bc38.tar.gz
gentoo-2-92c0080a0d1f7f9888cbb76760491c3d6042bc38.tar.bz2
gentoo-2-92c0080a0d1f7f9888cbb76760491c3d6042bc38.zip
Version bump for bug fixes. See
http://git.overlays.gentoo.org/gitweb/?p=proj/gentoolkit.git;a=shortlog;h=refs/heads/gentoolkit for full list of changes. Removed old ebuilds. (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xDCB4A7FF)
Diffstat (limited to 'app-portage')
-rw-r--r--app-portage/gentoolkit/ChangeLog17
-rw-r--r--app-portage/gentoolkit/files/0.3.0.6-eread-413577.patch97
-rw-r--r--app-portage/gentoolkit/files/0.3.0.6-eshowkw-409449.patch25
-rw-r--r--app-portage/gentoolkit/files/0.3.0.6-eshowkw-414627.patch44
-rw-r--r--app-portage/gentoolkit/files/0.3.0.6-euse-410365.patch29
-rw-r--r--app-portage/gentoolkit/files/0.3.0.6-euse-422675.patch67
-rw-r--r--app-portage/gentoolkit/files/0.3.0.6-gentoolkit-304125.patch30
-rw-r--r--app-portage/gentoolkit/files/0.3.0.7-configroot.patch25
-rw-r--r--app-portage/gentoolkit/files/0.3.0.7-root.patch153
-rw-r--r--app-portage/gentoolkit/gentoolkit-0.3.0.6-r3.ebuild97
-rw-r--r--app-portage/gentoolkit/gentoolkit-0.3.0.7-r1.ebuild95
-rw-r--r--app-portage/gentoolkit/gentoolkit-0.3.0.7-r2.ebuild96
-rw-r--r--app-portage/gentoolkit/gentoolkit-0.3.0.7.ebuild91
-rw-r--r--app-portage/gentoolkit/gentoolkit-0.3.0.8-r1.ebuild86
-rw-r--r--app-portage/gentoolkit/gentoolkit-0.3.0.9.ebuild (renamed from app-portage/gentoolkit/gentoolkit-0.3.0.8.ebuild)13
15 files changed, 24 insertions, 941 deletions
diff --git a/app-portage/gentoolkit/ChangeLog b/app-portage/gentoolkit/ChangeLog
index ff33751f7123..58abd1ce40f1 100644
--- a/app-portage/gentoolkit/ChangeLog
+++ b/app-portage/gentoolkit/ChangeLog
@@ -1,6 +1,21 @@
# ChangeLog for app-portage/gentoolkit
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.309 2014/01/19 02:10:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.310 2014/03/12 18:26:32 fuzzyray Exp $
+
+*gentoolkit-0.3.0.9 (12 Mar 2014)
+
+ 12 Mar 2014; Paul Varner <fuzzyray@gentoo.org> -gentoolkit-0.3.0.6-r3.ebuild,
+ -gentoolkit-0.3.0.7.ebuild, -gentoolkit-0.3.0.7-r1.ebuild,
+ -gentoolkit-0.3.0.7-r2.ebuild, -gentoolkit-0.3.0.8.ebuild,
+ -gentoolkit-0.3.0.8-r1.ebuild, +gentoolkit-0.3.0.9.ebuild,
+ -files/0.3.0.6-gentoolkit-304125.patch, -files/0.3.0.6-eshowkw-409449.patch,
+ -files/0.3.0.6-euse-410365.patch, -files/0.3.0.7-configroot.patch,
+ -files/0.3.0.6-eread-413577.patch, -files/0.3.0.6-eshowkw-414627.patch,
+ -files/0.3.0.6-euse-422675.patch, -files/0.3.0.7-root.patch:
+ Version bump for bug fixes. See
+ http://git.overlays.gentoo.org/gitweb/?p=proj/gentoolkit.git;a=shortlog;h=ref
+ s/heads/gentoolkit
+ for full list of changes. Removed old ebuilds.
19 Jan 2014; Mike Frysinger <vapier@gentoo.org> gentoolkit-0.3.0.8-r2.ebuild:
Add arm64 love.
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
deleted file mode 100644
index a0ddcd91af84..000000000000
--- a/app-portage/gentoolkit/files/0.3.0.6-eread-413577.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-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-409449.patch b/app-portage/gentoolkit/files/0.3.0.6-eshowkw-409449.patch
deleted file mode 100644
index f7964e17669a..000000000000
--- a/app-portage/gentoolkit/files/0.3.0.6-eshowkw-409449.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ba64705ea61bbfe506bee228b56758216ffb987c Mon Sep 17 00:00:00 2001
-From: Paul Varner <fuzzyray@gentoo.org>
-Date: Wed, 16 May 2012 16:58:04 -0500
-Subject: [PATCH 2/3] Fix output to be sorted using portage.versions.vercmp
- (bug 409449).
-
----
- pym/gentoolkit/eshowkw/keywords_content.py | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/pym/gentoolkit/eshowkw/keywords_content.py b/pym/gentoolkit/eshowkw/keywords_content.py
-index 77a68fb..2e6c0fa 100644
---- a/pym/gentoolkit/eshowkw/keywords_content.py
-+++ b/pym/gentoolkit/eshowkw/keywords_content.py
-@@ -176,7 +176,6 @@ class keywords_content:
- return port.versions.vercmp(ver_map[cpv1[0]], ver_map[cpv2[0]])
-
- package_content.sort(key=port.util.cmp_sort_key(cmp_cpv))
-- package_content.sort(key=itemgetter(2))
-
- def __xmatch(self, pdb, package):
- """xmatch function that searches for all packages over all repos"""
---
-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
deleted file mode 100644
index e37594536cbb..000000000000
--- a/app-portage/gentoolkit/files/0.3.0.6-eshowkw-414627.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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/files/0.3.0.6-euse-410365.patch b/app-portage/gentoolkit/files/0.3.0.6-euse-410365.patch
deleted file mode 100644
index f662e2b7a70e..000000000000
--- a/app-portage/gentoolkit/files/0.3.0.6-euse-410365.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 79135c7585402eadeb9e06cbf3138f0d191b15d9 Mon Sep 17 00:00:00 2001
-From: Paul Varner <fuzzyray@gentoo.org>
-Date: Wed, 16 May 2012 17:27:54 -0500
-Subject: [PATCH 3/3] Change sed statement in euse to fix bug 410365.
-
-The sed statement was looking for the useflag as part of the regular
-expression. Since the input to the statement had already grepped for
-the relevant entries from use.local.desc, this is unneccessary. Changed
-the sed statement to look for '(.*) *' instead of '(${1}) *'.
----
- bin/euse | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/bin/euse b/bin/euse
-index 27adb72..4d2c15d 100755
---- a/bin/euse
-+++ b/bin/euse
-@@ -781,7 +781,7 @@ showdesc() {
- fi
- # Fetch all the packages data using this flag
- infos=$( grep -h ":${1} *-" ${ALL_PORTDIRS[@]/%//profiles/use.local.desc} 2> /dev/null \
-- | sed -re "s/^([^:]+):(${1}) *- *(.+)/\1|\2|\3/g")
-+ | sed -re "s/^([^:]+):(.*) *- *(.+)/\1|\2|\3/g")
- OIFS=$IFS; IFS=$'\n'; infos=($infos); IFS=$OIFS;
- for line in "${infos[@]}"; do
- OIFS=$IFS; IFS="|"; line=($line); IFS=$OIFS
---
-1.7.8.6
-
diff --git a/app-portage/gentoolkit/files/0.3.0.6-euse-422675.patch b/app-portage/gentoolkit/files/0.3.0.6-euse-422675.patch
deleted file mode 100644
index 9be4ed652068..000000000000
--- a/app-portage/gentoolkit/files/0.3.0.6-euse-422675.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 6b94fbd3b74471cf9740a35d669963e0b6c84eac Mon Sep 17 00:00:00 2001
-From: Paul Varner <fuzzyray@gentoo.org>
-Date: Wed, 20 Jun 2012 12:11:44 -0500
-Subject: [PATCH] Add support for the md5-cache metadata format. (Bug 422675)
-
-The gentoo tree is moving to the md5-cache format instead of pms. This
-add support for reading the md5-cache metadata format.
----
- bin/euse | 24 ++++++++++++++++++------
- 1 files changed, 18 insertions(+), 6 deletions(-)
-
-diff --git a/bin/euse b/bin/euse
-index 85ff924..3b7556f 100755
---- a/bin/euse
-+++ b/bin/euse
-@@ -385,6 +385,7 @@ get_useflaglist() {
- #
- get_useflaglist_ebuild() {
- local known=$(echo "${ACTIVE_FLAGS[5]}" | egrep "^${1}")
-+ local cacheformat
- if [[ -n $known ]]; then
- # No need to recache
- return
-@@ -400,23 +401,34 @@ get_useflaglist_ebuild() {
- fi
- # Open the ebuild file and retrieve defined USE flags
- [[ ! -d "$portdir/${1}" ]] && continue
-- if [[ ! -d "$portdir/metadata/cache" ]]; then
-+ cacheformat="unknown"
-+ [[ -d "$portdir/metadata/cache" ]] && cacheformat="cache" # format is pms
-+ [[ -d "$portdir/metadata/md5-cache" ]] && cacheformat="md5-cache" # format is md5-cache
-+ if [[ "$cacheformat" == "unknown" ]]; then
- echo "!!! Metadata cache not found. You need to run " >&2
- echo "!!! 'egencache --repo=$overlay --update'" >&2
- echo "!!! to generate metadata for your overlays" >&2
- return 1
- fi
-- append=$(set +f; ls $portdir/metadata/cache/${1}-* \
-+ append=$(set +f; ls ${portdir}/metadata/${cacheformat}/${1}-* \
- | egrep "${1}-[0-9.]+" \
-- | sed -e "s:$portdir/metadata/cache/${1}-::g" \
-+ | sed -e "s:${portdir}/metadata/${cacheformat}/${1}-::g" \
- | while read -d $'\n' version; do
- IFS=$'\n'
-- if [[ ! -e "$portdir/metadata/cache/${1}-$version" ]]; then
-+ if [[ ! -e "${portdir}/metadata/${cacheformat}/${1}-$version" ]]; then
- # Repo does not have this particular package
- continue
- fi
-- iuse=$(head -11 "$portdir/metadata/cache/${1}-$version"|tail -1)
-- slot=$(head -3 "$portdir/metadata/cache/${1}-$version"|tail -1)
-+ if [[ "${cacheformat}" == "cache" ]]; then
-+ iuse=$(head -n 11 "${portdir}/metadata/${cacheformat}/${1}-$version"|tail -n 1)
-+ slot=$(head -n 3 "${portdir}/metadata/${cacheformat}/${1}-$version"|tail -n 1)
-+ elif [[ "${cacheformat}" == "md5-cache" ]]; then
-+ iuse=$(grep "^IUSE=" "${portdir}/metadata/${cacheformat}/${1}-$version" | sed 's/^IUSE=//')
-+ slot=$(grep "^SLOT=" "${portdir}/metadata/${cacheformat}/${1}-$version" | sed 's/^SLOT=//')
-+ else
-+ # This is a bug, we should have already returned
-+ return 1
-+ fi
- echo "${1};${version};${slot};${iuse};${overlay}"
- done
- )
---
-1.7.8.6
-
diff --git a/app-portage/gentoolkit/files/0.3.0.6-gentoolkit-304125.patch b/app-portage/gentoolkit/files/0.3.0.6-gentoolkit-304125.patch
deleted file mode 100644
index 24242f92778a..000000000000
--- a/app-portage/gentoolkit/files/0.3.0.6-gentoolkit-304125.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From df024db3a4573d89d11a59d0c05be7d4f3d7e143 Mon Sep 17 00:00:00 2001
-From: Paul Varner <fuzzyray@gentoo.org>
-Date: Wed, 16 May 2012 16:12:03 -0500
-Subject: [PATCH 1/3] Make colors for useflags be the same as portage.
-
-The current colors are the opposite of how portage uses the colors.
-This just switches them so portage and equery show the same color for
-the same meaning, Red is a set useflag and blue is an unset useflag.
-
-Note: This ignores any user defined colormaps in portage.
----
- pym/gentoolkit/pprinter.py | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/pym/gentoolkit/pprinter.py b/pym/gentoolkit/pprinter.py
-index d9f0375..7d8dc2c 100644
---- a/pym/gentoolkit/pprinter.py
-+++ b/pym/gentoolkit/pprinter.py
-@@ -116,7 +116,7 @@ def subsection(string):
-
- def useflag(string, enabled=True):
- """Returns a USE flag string."""
-- return output.blue(string) if enabled else output.red(string)
-+ return output.red(string) if enabled else output.blue(string)
-
- def keyword(string, stable=True, hard_masked=False):
- """Returns a keyword string."""
---
-1.7.8.6
-
diff --git a/app-portage/gentoolkit/files/0.3.0.7-configroot.patch b/app-portage/gentoolkit/files/0.3.0.7-configroot.patch
deleted file mode 100644
index 74dc1e025362..000000000000
--- a/app-portage/gentoolkit/files/0.3.0.7-configroot.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 95648e0369e74d65582ee3ef44b0a0a338f82cf0 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 12 Mar 2013 12:08:56 -0400
-Subject: [PATCH] equery: respect PORTAGE_CONFIGROOT too
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- pym/gentoolkit/package.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/pym/gentoolkit/package.py b/pym/gentoolkit/package.py
-index 2a103de..da9d65c 100644
---- a/pym/gentoolkit/package.py
-+++ b/pym/gentoolkit/package.py
-@@ -61,6 +61,7 @@ from gentoolkit.eprefix import EPREFIX
- def _NewPortageConfig(local_config):
- ret = portage.config(local_config=local_config,
- eprefix=EPREFIX if EPREFIX else None,
-+ config_root=os.environ.get('PORTAGE_CONFIGROOT', None),
- target_root=os.environ.get('ROOT', None))
- ret.lock()
- return ret
---
-1.8.1.2
-
diff --git a/app-portage/gentoolkit/files/0.3.0.7-root.patch b/app-portage/gentoolkit/files/0.3.0.7-root.patch
deleted file mode 100644
index 19dde6ad963e..000000000000
--- a/app-portage/gentoolkit/files/0.3.0.7-root.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-From 35cc856ee0ce03858a39210525b9893ca061f079 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Wed, 19 Dec 2012 18:50:17 -0500
-Subject: [PATCH] equery: make more ROOT aware
-
-This at least fixes:
- belongs
- check
- depends
- files
- list
- size
-
-URL: https://bugs.gentoo.org/160815
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-Signed-off-by: Paul Varner <fuzzyray@gentoo.org>
----
- pym/gentoolkit/equery/check.py | 17 +++++++++--------
- pym/gentoolkit/package.py | 35 ++++++++++++++++++++++-------------
- 2 files changed, 31 insertions(+), 21 deletions(-)
-
-diff --git a/pym/gentoolkit/equery/check.py b/pym/gentoolkit/equery/check.py
-index 84be634..e903355 100644
---- a/pym/gentoolkit/equery/check.py
-+++ b/pym/gentoolkit/equery/check.py
-@@ -105,26 +105,27 @@ class VerifyContents(object):
- for cfile in files:
- n_checked += 1
- ftype = files[cfile][0]
-- if not os.path.exists(cfile):
-+ real_cfile = os.environ.get('ROOT', '') + cfile
-+ if not os.path.exists(real_cfile):
- errs.append("%s does not exist" % cfile)
- continue
- elif ftype == "dir":
-- if not os.path.isdir(cfile):
-+ if not os.path.isdir(real_cfile):
- err = "%(cfile)s exists, but is not a directory"
- errs.append(err % locals())
- continue
- elif ftype == "obj":
-- obj_errs = self._verify_obj(files, cfile, errs)
-+ obj_errs = self._verify_obj(files, cfile, real_cfile, errs)
- if len(obj_errs) > len(errs):
- errs = obj_errs[:]
- continue
- elif ftype == "sym":
- target = files[cfile][2].strip()
-- if not os.path.islink(cfile):
-+ if not os.path.islink(real_cfile):
- err = "%(cfile)s exists, but is not a symlink"
- errs.append(err % locals())
- continue
-- tgt = os.readlink(cfile)
-+ tgt = os.readlink(real_cfile)
- if tgt != target:
- err = "%(cfile)s does not point to %(target)s"
- errs.append(err % locals())
-@@ -137,14 +138,14 @@ class VerifyContents(object):
-
- return n_passed, n_checked, errs
-
-- def _verify_obj(self, files, cfile, errs):
-+ def _verify_obj(self, files, cfile, real_cfile, errs):
- """Verify the MD5 sum and/or mtime and return any errors."""
-
- obj_errs = errs[:]
- if self.check_sums:
- md5sum = files[cfile][2]
- try:
-- cur_checksum = checksum.perform_md5(cfile, calc_prelink=1)
-+ cur_checksum = checksum.perform_md5(real_cfile, calc_prelink=1)
- except IOError:
- err = "Insufficient permissions to read %(cfile)s"
- obj_errs.append(err % locals())
-@@ -155,7 +156,7 @@ class VerifyContents(object):
- return obj_errs
- if self.check_timestamps:
- mtime = int(files[cfile][1])
-- st_mtime = int(os.lstat(cfile).st_mtime)
-+ st_mtime = int(os.lstat(real_cfile).st_mtime)
- if st_mtime != mtime:
- err = (
- "%(cfile)s has wrong mtime (is %(st_mtime)d, should be "
-diff --git a/pym/gentoolkit/package.py b/pym/gentoolkit/package.py
-index e324399..2a103de 100644
---- a/pym/gentoolkit/package.py
-+++ b/pym/gentoolkit/package.py
-@@ -58,16 +58,14 @@ from gentoolkit.eprefix import EPREFIX
- # Settings
- # =======
-
--if EPREFIX:
-- default_settings = portage.config(local_config=True, eprefix=EPREFIX)
-- default_settings.lock()
-- nolocal_settings = portage.config(local_config=False, eprefix=EPREFIX)
-- nolocal_settings.lock()
--else:
-- default_settings = portage.config(local_config=True)
-- default_settings.lock()
-- nolocal_settings = portage.config(local_config=False)
-- nolocal_settings.lock()
-+def _NewPortageConfig(local_config):
-+ ret = portage.config(local_config=local_config,
-+ eprefix=EPREFIX if EPREFIX else None,
-+ target_root=os.environ.get('ROOT', None))
-+ ret.lock()
-+ return ret
-+default_settings = _NewPortageConfig(local_config=True)
-+nolocal_settings = _NewPortageConfig(local_config=False)
-
- # =======
- # Classes
-@@ -350,14 +348,25 @@ class Package(CPV):
- iuse, final_flags = get_flags(self.cpv, final_setting=True)
- return final_flags
-
-- def parsed_contents(self):
-+ def parsed_contents(self, prefix_root=False):
- """Returns the parsed CONTENTS file.
-
- @rtype: dict
- @return: {'/full/path/to/obj': ['type', 'timestamp', 'md5sum'], ...}
- """
-
-- return self.dblink.getcontents()
-+ contents = self.dblink.getcontents()
-+
-+ # Portage will automatically prepend ROOT. Undo that.
-+ if not prefix_root:
-+ myroot = self._settings["ROOT"]
-+ if myroot != '/':
-+ ret = {}
-+ for key, val in self.dblink.getcontents().iteritems():
-+ ret['/' + os.path.relpath(key, myroot)] = val
-+ contents = ret
-+
-+ return contents
-
- def size(self):
- """Estimates the installed size of the contents of this package.
-@@ -368,7 +377,7 @@ class Package(CPV):
-
- seen = set()
- size = n_files = n_uncounted = 0
-- for f in self.parsed_contents():
-+ for f in self.parsed_contents(prefix_root=True):
- try:
- st = os.lstat(path)
- except OSError:
---
-1.8.1.2
-
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.6-r3.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.6-r3.ebuild
deleted file mode 100644
index 977f7da0bae5..000000000000
--- a/app-portage/gentoolkit/gentoolkit-0.3.0.6-r3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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-r3.ebuild,v 1.12 2012/10/29 16:31:11 mgorny 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
- || ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin )
- sys-apps/gawk
- sys-apps/grep
- virtual/python-argparse"
-
-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"
- epatch "${FILESDIR}/${PV}-gentoolkit-304125.patch"
- epatch "${FILESDIR}/${PV}-euse-410365.patch"
- epatch "${FILESDIR}/${PV}-eshowkw-409449.patch"
- epatch "${FILESDIR}/${PV}-euse-422675.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/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."
-}
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.7-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.7-r1.ebuild
deleted file mode 100644
index 1788066f6f3d..000000000000
--- a/app-portage/gentoolkit/gentoolkit-0.3.0.7-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2013 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.7-r1.ebuild,v 1.1 2013/02/25 18:03:52 vapier 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# 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
- || ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin )
- sys-apps/gawk
- sys-apps/grep
- virtual/python-argparse"
-
-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}-root.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/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"
- einfo
- einfo "Additional tools that may be of interest:"
- einfo
- einfo " app-admin/eclean-kernel"
- einfo " app-portage/diffmask"
- einfo " app-portage/flaggie"
- einfo " app-portage/install-mask"
- einfo " app-portage/portpeek"
- einfo " app-portage/smart-live-rebuild"
-}
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.7-r2.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.7-r2.ebuild
deleted file mode 100644
index 373b01b9336a..000000000000
--- a/app-portage/gentoolkit/gentoolkit-0.3.0.7-r2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2013 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.7-r2.ebuild,v 1.1 2013/03/12 16:14:57 vapier 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# 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
- || ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin )
- sys-apps/gawk
- sys-apps/grep
- virtual/python-argparse"
-
-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}-root.patch
- epatch "${FILESDIR}"/${PV}-configroot.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/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"
- einfo
- einfo "Additional tools that may be of interest:"
- einfo
- einfo " app-admin/eclean-kernel"
- einfo " app-portage/diffmask"
- einfo " app-portage/flaggie"
- einfo " app-portage/install-mask"
- einfo " app-portage/portpeek"
- einfo " app-portage/smart-live-rebuild"
-}
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.7.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.7.ebuild
deleted file mode 100644
index 4d033e71bc00..000000000000
--- a/app-portage/gentoolkit/gentoolkit-0.3.0.7.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2013 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.7.ebuild,v 1.10 2013/02/22 18:07:16 zmedico Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.[45]"
-PYTHON_USE_WITH="xml"
-PYTHON_NONVERSIONED_EXECUTABLES=(".*")
-
-inherit distutils 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"
-
-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# 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
- || ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin )
- sys-apps/gawk
- sys-apps/grep
- virtual/python-argparse"
-
-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_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/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"
- einfo
- einfo "Additional tools that may be of interest:"
- einfo
- einfo " app-admin/eclean-kernel"
- einfo " app-portage/diffmask"
- einfo " app-portage/flaggie"
- einfo " app-portage/install-mask"
- einfo " app-portage/portpeek"
- einfo " app-portage/smart-live-rebuild"
-}
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.8-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.8-r1.ebuild
deleted file mode 100644
index 7ad32a155ae6..000000000000
--- a/app-portage/gentoolkit/gentoolkit-0.3.0.8-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2013 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.8-r1.ebuild,v 1.2 2013/09/11 17:22:19 fuzzyray Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=(python{2_6,2_7,3_2,3_3} pypy2_0)
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-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 ~arm-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
- || ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin )
- sys-apps/gawk
- sys-apps/grep
- virtual/python-argparse[${PYTHON_USEDEP}]"
-
-PATCHES=(
- "${FILESDIR}"/${PV}-revdep-rebuild-484340.patch
- "${FILESDIR}"/${PV}-revdep-rebuild-476740.patch
-)
-
-python_prepare_all() {
- python_export_best
- echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
- VERSION="${PVR}" "${PYTHON}" setup.py set_version
- distutils-r1_python_prepare_all
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- # 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
- keepdir /var/cache/revdep-rebuild
- use prefix || fowners root:0 /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
-}
-
-pkg_postinst() {
- # Only show the elog information on a new install
- if [[ ! ${REPLACING_VERSIONS} ]]; then
- elog
- elog "For further information on gentoolkit, please read the gentoolkit"
- elog "guide: http://www.gentoo.org/doc/en/gentoolkit.xml"
- elog
- elog "Another alternative to equery is app-portage/portage-utils"
- elog
- elog "Additional tools that may be of interest:"
- elog
- elog " app-admin/eclean-kernel"
- elog " app-portage/diffmask"
- elog " app-portage/flaggie"
- elog " app-portage/install-mask"
- elog " app-portage/portpeek"
- elog " app-portage/smart-live-rebuild"
- fi
-}
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.8.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.9.ebuild
index 29accf663f83..9e59df9cb1a1 100644
--- a/app-portage/gentoolkit/gentoolkit-0.3.0.8.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.3.0.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.8.ebuild,v 1.1 2013/09/05 16:56:38 fuzzyray Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0.9.ebuild,v 1.1 2014/03/12 18:26:32 fuzzyray Exp $
EAPI="5"
@@ -17,7 +17,7 @@ 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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 ~arm-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}
@@ -27,10 +27,13 @@ RDEPEND="${DEPEND}
sys-apps/grep
virtual/python-argparse[${PYTHON_USEDEP}]"
+PATCHES=()
+
python_prepare_all() {
python_export_best
echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
VERSION="${PVR}" "${PYTHON}" setup.py set_version
+ mv ./bin/revdep-rebuild{,.py} || die
distutils-r1_python_prepare_all
}
@@ -41,12 +44,12 @@ python_install_all() {
# 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
+ # TODO: Fix this as it is now a QA violation
# Create cache directory for revdep-rebuild
keepdir /var/cache/revdep-rebuild
- use prefix || fowners root:root /var/cache/revdep-rebuild
+ use prefix || fowners root:0 /var/cache/revdep-rebuild
fperms 0700 /var/cache/revdep-rebuild
# remove on Gentoo Prefix platforms where it's broken anyway