mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-30 01:51:09 +02:00
gentoolkit: upgraded package to upstream
Upgraded app-portage/gentoolkit to version 0.3.0.6-r3 on amd64 BUG=chromium-os:31030 TEST=`cbuildbot chromiumos-sdk` worked CQ-DEPEND=CL:39313 Change-Id: I3e77b0fc2f0d7c5b43b13a61cec05a9f791bcda3 Reviewed-on: https://gerrit.chromium.org/gerrit/39314 Reviewed-by: Matt Tennant <mtennant@chromium.org> Reviewed-by: Brian Harring <ferringb@chromium.org> Commit-Ready: Mike Frysinger <vapier@chromium.org> Tested-by: Mike Frysinger <vapier@chromium.org>
This commit is contained in:
Mike Frysinger
Gerrit
parent
6d2ba832f3
commit
80a7b35845
@ -1 +1 @@
|
|||||||
DIST gentoolkit-0.3.0.4.tar.gz 180411 RMD160 f61d5532a90269a34c26d2c1731d5ba31359048f SHA1 eb373ba5069da8f2858f8afa4e40fe158501e94c SHA256 cc1fc031bf69a095a5cd2aab433f06e8eb3b5af2fef743bce5958c7f7f38803c
|
DIST gentoolkit-0.3.0.6.tar.gz 191896 RMD160 0906f6b7ac2796dabd123774cda9ae08c09ccddd SHA1 181d8f412bba427e812a00cbdc4545bcdf8f09a2 SHA256 5b1b7e9e0363764b3c8349540e3a16fcdd850ec2441bb56b24fdb729130e604a
|
||||||
|
|||||||
@ -1,34 +0,0 @@
|
|||||||
From 92e6be628307b0643307202ba9994cab9a4dd439 Mon Sep 17 00:00:00 2001
|
|
||||||
From: dol-sen <brian.dolbec@gmail.com>
|
|
||||||
Date: Thu, 25 Aug 2011 00:04:47 -0700
|
|
||||||
Subject: [PATCH] fix bug 380573.
|
|
||||||
|
|
||||||
---
|
|
||||||
pym/gentoolkit/equery/meta.py | 4 ++--
|
|
||||||
1 files changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/pym/gentoolkit/equery/meta.py b/pym/gentoolkit/equery/meta.py
|
|
||||||
index 01e090a..f617cfa 100644
|
|
||||||
--- a/pym/gentoolkit/equery/meta.py
|
|
||||||
+++ b/pym/gentoolkit/equery/meta.py
|
|
||||||
@@ -22,7 +22,7 @@ from functools import partial
|
|
||||||
|
|
||||||
import gentoolkit.pprinter as pp
|
|
||||||
from gentoolkit import errors
|
|
||||||
-from gentoolkit import keyword
|
|
||||||
+from gentoolkit.keyword import Keyword
|
|
||||||
from gentoolkit.equery import format_options, mod_usage, CONFIG
|
|
||||||
from gentoolkit.helpers import print_sequence, print_file
|
|
||||||
from gentoolkit.textwrap_ import TextWrapper
|
|
||||||
@@ -217,7 +217,7 @@ def format_keywords(keywords):
|
|
||||||
|
|
||||||
result = []
|
|
||||||
|
|
||||||
- for kw in sorted(keywords, keyword.compare_strs):
|
|
||||||
+ for kw in sorted(keywords, key=Keyword):
|
|
||||||
if kw.startswith('-'):
|
|
||||||
# arch masked
|
|
||||||
kw = pp.keyword(kw, stable=False, hard_masked=True)
|
|
||||||
--
|
|
||||||
1.7.3.4
|
|
||||||
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
From: Paul Varner <fuzzyray@gentoo.org>
|
|
||||||
Date: Wed, 27 Jul 2011 19:01:34 +0000 (-0500)
|
|
||||||
Subject: Fix missing parenthises in euse. Bug 376393
|
|
||||||
X-Git-Url: http://git.overlays.gentoo.org/gitweb/?p=proj%2Fgentoolkit.git;a=commitdiff_plain;h=9ad547e5f33fce1dfb378809252d871265a82c58;hp=af81292035e8d3559b11ab16fc54ccd921cb3587
|
|
||||||
|
|
||||||
Fix missing parenthises in euse. Bug 376393
|
|
||||||
---
|
|
||||||
|
|
||||||
diff --git a/bin/euse b/bin/euse
|
|
||||||
index 65fb119..be47cc9 100755
|
|
||||||
--- a/bin/euse
|
|
||||||
+++ b/bin/euse
|
|
||||||
@@ -508,7 +508,7 @@ get_flagstatus_helper_pkg() {
|
|
||||||
atoms=($(
|
|
||||||
echo "${atoms[@]}" | python -c "
|
|
||||||
from __future__ import print_function;import portage.dep as dep, sys
|
|
||||||
-print(' '.join(dep.match_to_list('$5-$6',sys.stdin.read().split()))"))
|
|
||||||
+print(' '.join(dep.match_to_list('$5-$6',sys.stdin.read().split())))"))
|
|
||||||
fi
|
|
||||||
flags=$(for atom in ${atoms[@]}; do
|
|
||||||
[[ -z $atom ]] && continue
|
|
||||||
@ -1,37 +0,0 @@
|
|||||||
From 6edc15a5690a3c26a3c530669a922e01f50ab830 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Paul Varner <fuzzyray@gentoo.org>
|
|
||||||
Date: Wed, 24 Aug 2011 12:28:06 -0500
|
|
||||||
Subject: [PATCH] Fix traversal of cascading profiles by euse (Bug 379559).
|
|
||||||
Thanks to Ian Abbot for the patch!
|
|
||||||
|
|
||||||
---
|
|
||||||
bin/euse | 4 ++--
|
|
||||||
1 files changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/bin/euse b/bin/euse
|
|
||||||
index be47cc9..bedba35 100755
|
|
||||||
--- a/bin/euse
|
|
||||||
+++ b/bin/euse
|
|
||||||
@@ -439,7 +439,6 @@ traverse_profile() {
|
|
||||||
|
|
||||||
curdir="${2:-$(get_real_path ${MAKE_PROFILE_PATH})}"
|
|
||||||
|
|
||||||
- [[ -f "${curdir}/${1}" ]] && rvalue="${curdir}/${1} ${rvalue}"
|
|
||||||
if [[ -f "${curdir}/parent" ]]; then
|
|
||||||
for parent in $(egrep -v '(^#|^ *$)' ${curdir}/parent); do
|
|
||||||
# Bug 231394, handle parent path being absolute
|
|
||||||
@@ -448,9 +447,10 @@ traverse_profile() {
|
|
||||||
else
|
|
||||||
pdir="$(get_real_path ${curdir}/${parent})"
|
|
||||||
fi
|
|
||||||
- rvalue="$(traverse_profile ${1} ${pdir}) ${rvalue}"
|
|
||||||
+ rvalue="${rvalue} $(traverse_profile ${1} ${pdir})"
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
+ [[ -f "${curdir}/${1}" ]] && rvalue="${rvalue} ${curdir}/${1}"
|
|
||||||
|
|
||||||
echo "${rvalue}"
|
|
||||||
} # }}}
|
|
||||||
--
|
|
||||||
1.7.3.4
|
|
||||||
|
|
||||||
@ -1,42 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
From 0382df255affced93b59322611a58bf98aec6c64 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Paul Varner <fuzzyray@gentoo.org>
|
|
||||||
Date: Fri, 15 Jul 2011 14:59:23 -0500
|
|
||||||
Subject: [PATCH] Do not index ChangeLog entries with an invalid CPV. (Bug 375293)
|
|
||||||
|
|
||||||
---
|
|
||||||
pym/gentoolkit/helpers.py | 2 +-
|
|
||||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/pym/gentoolkit/helpers.py b/pym/gentoolkit/helpers.py
|
|
||||||
index 225a198..a0b29ab 100644
|
|
||||||
--- a/pym/gentoolkit/helpers.py
|
|
||||||
+++ b/pym/gentoolkit/helpers.py
|
|
||||||
@@ -175,7 +175,7 @@ class ChangeLog(object):
|
|
||||||
if not pkg_name.strip():
|
|
||||||
continue
|
|
||||||
try:
|
|
||||||
- entry_ver = CPV(pkg_name)
|
|
||||||
+ entry_ver = CPV(pkg_name, validate=True)
|
|
||||||
except errors.GentoolkitInvalidCPV:
|
|
||||||
if self.invalid_entry_is_fatal:
|
|
||||||
raise ValueError(entry_ver)
|
|
||||||
--
|
|
||||||
1.7.3.4
|
|
||||||
|
|
||||||
@ -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
|
||||||
|
|
||||||
@ -0,0 +1,25 @@
|
|||||||
|
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
|
||||||
|
|
||||||
@ -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
|
||||||
|
|
||||||
@ -0,0 +1,29 @@
|
|||||||
|
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
|
||||||
|
|
||||||
@ -0,0 +1,67 @@
|
|||||||
|
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
|
||||||
|
|
||||||
@ -0,0 +1,30 @@
|
|||||||
|
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
|
||||||
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
# Copyright 1999-2011 Gentoo Foundation
|
# Copyright 1999-2012 Gentoo Foundation
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
# 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.5 2011/10/18 21:05:47 jer Exp $
|
# $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"
|
EAPI="3"
|
||||||
SUPPORT_PYTHON_ABIS="1"
|
SUPPORT_PYTHON_ABIS="1"
|
||||||
@ -18,17 +18,21 @@ LICENSE="GPL-2"
|
|||||||
SLOT="0"
|
SLOT="0"
|
||||||
IUSE=""
|
IUSE=""
|
||||||
|
|
||||||
# Drop "~m68k ~s390 ~sh ~sparc-fbsd ~x86-fbsd" due to dev-python/argparse dependency
|
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)
|
|
||||||
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"
|
|
||||||
|
|
||||||
|
# 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"
|
DEPEND="sys-apps/portage"
|
||||||
RDEPEND="${DEPEND}
|
RDEPEND="${DEPEND}
|
||||||
|
>=dev-lang/python-2.6[xml]
|
||||||
|
!>=dev-lang/python-2.6[-xml]
|
||||||
!<=app-portage/gentoolkit-dev-0.2.7
|
!<=app-portage/gentoolkit-dev-0.2.7
|
||||||
dev-python/argparse
|
|| ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin )
|
||||||
|| ( app-misc/realpath sys-freebsd/freebsd-bin )
|
|
||||||
sys-apps/gawk
|
sys-apps/gawk
|
||||||
sys-apps/grep"
|
sys-apps/grep
|
||||||
|
virtual/python-argparse"
|
||||||
|
|
||||||
distutils_src_compile_pre_hook() {
|
distutils_src_compile_pre_hook() {
|
||||||
echo VERSION="${PVR}" "$(PYTHON)" setup.py set_version
|
echo VERSION="${PVR}" "$(PYTHON)" setup.py set_version
|
||||||
@ -37,17 +41,25 @@ distutils_src_compile_pre_hook() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
src_prepare() {
|
src_prepare() {
|
||||||
epatch "${FILESDIR}/${PV}-euse-376393.patch"
|
epatch "${FILESDIR}/${PV}-eread-413577.patch"
|
||||||
epatch "${FILESDIR}/${PV}-euse-379599.patch"
|
epatch "${FILESDIR}/${PV}-eshowkw-414627.patch"
|
||||||
epatch "${FILESDIR}/${PV}-gentoolkit-375293.patch"
|
epatch "${FILESDIR}/${PV}-gentoolkit-304125.patch"
|
||||||
epatch "${FILESDIR}/${PV}-equery-380573.patch"
|
epatch "${FILESDIR}/${PV}-euse-410365.patch"
|
||||||
epatch "${FILESDIR}/${PV}-euse-382219.patch"
|
epatch "${FILESDIR}/${PV}-eshowkw-409449.patch"
|
||||||
|
epatch "${FILESDIR}/${PV}-euse-422675.patch"
|
||||||
}
|
}
|
||||||
|
|
||||||
src_install() {
|
src_install() {
|
||||||
python_convert_shebangs -r "" build-*/scripts-*
|
python_convert_shebangs -r "" build-*/scripts-*
|
||||||
distutils_src_install
|
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
|
# Create cache directory for revdep-rebuild
|
||||||
dodir /var/cache/revdep-rebuild
|
dodir /var/cache/revdep-rebuild
|
||||||
keepdir /var/cache/revdep-rebuild
|
keepdir /var/cache/revdep-rebuild
|
||||||
@ -58,7 +70,7 @@ src_install() {
|
|||||||
if use prefix; then
|
if use prefix; then
|
||||||
elog "The revdep-rebuild command is removed, the preserve-libs"
|
elog "The revdep-rebuild command is removed, the preserve-libs"
|
||||||
elog "feature of portage will handle issues."
|
elog "feature of portage will handle issues."
|
||||||
rm "${ED}"/usr/bin/revdep-rebuild
|
rm "${ED}"/usr/bin/revdep-rebuild*
|
||||||
rm "${ED}"/usr/share/man/man1/revdep-rebuild.1
|
rm "${ED}"/usr/share/man/man1/revdep-rebuild.1
|
||||||
rm -rf "${ED}"/etc/revdep-rebuild
|
rm -rf "${ED}"/etc/revdep-rebuild
|
||||||
rm -rf "${ED}"/var
|
rm -rf "${ED}"/var
|
||||||
@ -1,12 +0,0 @@
|
|||||||
DEFINED_PHASES=compile install postinst postrm prepare setup
|
|
||||||
DEPEND=sys-apps/portage >=app-admin/eselect-python-20091230 dev-lang/python[xml] dev-lang/python >=app-admin/eselect-python-20091230 dev-lang/python[xml]
|
|
||||||
DESCRIPTION=Collection of administration scripts for Gentoo
|
|
||||||
EAPI=3
|
|
||||||
HOMEPAGE=http://www.gentoo.org/proj/en/portage/tools/index.xml
|
|
||||||
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
|
|
||||||
LICENSE=GPL-2
|
|
||||||
RDEPEND=sys-apps/portage !<=app-portage/gentoolkit-dev-0.2.7 dev-python/argparse || ( app-misc/realpath sys-freebsd/freebsd-bin ) sys-apps/gawk sys-apps/grep >=app-admin/eselect-python-20091230 dev-lang/python[xml] dev-lang/python >=app-admin/eselect-python-20091230 dev-lang/python[xml]
|
|
||||||
SLOT=0
|
|
||||||
SRC_URI=mirror://gentoo/gentoolkit-0.3.0.4.tar.gz
|
|
||||||
_eclasses_=distutils b4c334e216d998c4ce4b750cb091e42e eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29
|
|
||||||
_md5_=038b82d0b276300f292202496dea1c4a
|
|
||||||
@ -0,0 +1,12 @@
|
|||||||
|
DEFINED_PHASES=compile install postinst postrm prepare setup
|
||||||
|
DEPEND=sys-apps/portage >=app-admin/eselect-python-20091230 dev-lang/python[xml] dev-lang/python >=app-admin/eselect-python-20091230 dev-lang/python[xml]
|
||||||
|
DESCRIPTION=Collection of administration scripts for Gentoo
|
||||||
|
EAPI=3
|
||||||
|
HOMEPAGE=http://www.gentoo.org/proj/en/portage/tools/index.xml
|
||||||
|
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
|
||||||
|
LICENSE=GPL-2
|
||||||
|
RDEPEND=sys-apps/portage >=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 >=app-admin/eselect-python-20091230 dev-lang/python[xml] dev-lang/python >=app-admin/eselect-python-20091230 dev-lang/python[xml]
|
||||||
|
SLOT=0
|
||||||
|
SRC_URI=mirror://gentoo/gentoolkit-0.3.0.6.tar.gz
|
||||||
|
_eclasses_=distutils b4c334e216d998c4ce4b750cb091e42e eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29
|
||||||
|
_md5_=e4748cca99fb4da36137d2e22ca8f68b
|
||||||
Loading…
x
Reference in New Issue
Block a user