fuzzyray 14/11/12 17:45:13
Added: 0.3.0.9-equery-strip-XXXFLAGS.patch
0.3.0.9-revdep-rebuild-526400.patch
0.3.0.9-equery-508114.patch
Log:
Revision bump to add patches
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key
0x6E1CBA7B)
Revision Changes Path
1.1
app-portage/gentoolkit/files/0.3.0.9-equery-strip-XXXFLAGS.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/gentoolkit/files/0.3.0.9-equery-strip-XXXFLAGS.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/gentoolkit/files/0.3.0.9-equery-strip-XXXFLAGS.patch?rev=1.1&content-type=text/plain
Index: 0.3.0.9-equery-strip-XXXFLAGS.patch
===================================================================
>From 1351a6b8f09ab2f4a7469d6e2be874b56a31d3c4 Mon Sep 17 00:00:00 2001
From: Brian Dolbec <dol...@gentoo.org>
Date: Thu, 28 Aug 2014 20:56:22 -0700
Subject: [PATCH 03/14] equery has: Add CFLAGS, CXXFLAGS, LDFLAGS to strip the
leading '-'
Strip the leading '-' from values found in these files.
---
pym/gentoolkit/equery/has.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pym/gentoolkit/equery/has.py b/pym/gentoolkit/equery/has.py
index 15c60b9..180f7f0 100644
--- a/pym/gentoolkit/equery/has.py
+++ b/pym/gentoolkit/equery/has.py
@@ -74,7 +74,7 @@ def query_in_env(query, env_var, pkg):
"""Check if the query is in the pkg's environment."""
try:
- if env_var in ("USE", "IUSE"):
+ if env_var in ("USE", "IUSE", "CFLAGS", "CXXFLAGS", "LDFLAGS"):
results = set(
[x.lstrip("+-") for x in
pkg.environment(env_var).split()]
)
--
2.1.3
1.1
app-portage/gentoolkit/files/0.3.0.9-revdep-rebuild-526400.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/gentoolkit/files/0.3.0.9-revdep-rebuild-526400.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/gentoolkit/files/0.3.0.9-revdep-rebuild-526400.patch?rev=1.1&content-type=text/plain
Index: 0.3.0.9-revdep-rebuild-526400.patch
===================================================================
>From 91023ef967c680db9307b5c58762e8872346167e Mon Sep 17 00:00:00 2001
From: Paul Varner <fuzzy...@gentoo.org>
Date: Fri, 24 Oct 2014 12:59:59 -0500
Subject: [PATCH 06/14] Fix gawk warning escape sequence \. treated as plain.
Bug 526400
---
bin/revdep-rebuild.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/revdep-rebuild.sh b/bin/revdep-rebuild.sh
index 3179a83..01a0454 100755
--- a/bin/revdep-rebuild.sh
+++ b/bin/revdep-rebuild.sh
@@ -842,7 +842,7 @@ main_checks() {
done < <(
# Regexify LD_LIBRARY_MASK. Exclude it from the
search.
LD_LIBRARY_MASK="${LD_LIBRARY_MASK//$'\n'/|}"
- gawk -v ldmask="(${LD_LIBRARY_MASK//./\\\.})" '
+ gawk -v ldmask="(${LD_LIBRARY_MASK//./\\\\.})" '
/no version information available/ &&
$0 !~ ldmask {
gsub(/[()]/, "", $NF)
if (seen[$NF]++) next
--
2.1.3
1.1 app-portage/gentoolkit/files/0.3.0.9-equery-508114.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/gentoolkit/files/0.3.0.9-equery-508114.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/gentoolkit/files/0.3.0.9-equery-508114.patch?rev=1.1&content-type=text/plain
Index: 0.3.0.9-equery-508114.patch
===================================================================
>From 9a33ceffe2e0045bf75b1209a90e9a53530d4e0d Mon Sep 17 00:00:00 2001
From: Tobias Heinlein <keytoas...@gentoo.org>
Date: Sat, 19 Apr 2014 18:39:03 +0200
Subject: [PATCH 01/14] equery: Don't always print the license field (bug
#508114).
---
pym/gentoolkit/equery/meta.py | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/pym/gentoolkit/equery/meta.py b/pym/gentoolkit/equery/meta.py
index e2d2124..d3342cd 100644
--- a/pym/gentoolkit/equery/meta.py
+++ b/pym/gentoolkit/equery/meta.py
@@ -373,12 +373,13 @@ def call_format_functions(best_match, matches):
useflags = format_useflags(best_match.metadata.use())
print_sequence(format_list(useflags))
- _license = best_match.environment(["LICENSE"])
- if QUERY_OPTS["license"]:
- _license = format_list(_license)
- else:
- _license = format_list(_license, "License: ", " " * 13)
- print_sequence(_license)
+ if QUERY_OPTS["license"] or not got_opts:
+ _license = best_match.environment(["LICENSE"])
+ if QUERY_OPTS["license"]:
+ _license = format_list(_license)
+ else:
+ _license = format_list(_license, "License: ", " " *
13)
+ print_sequence(_license)
if QUERY_OPTS["stablereq"]:
# Get {<Package 'dev-libs/glib-2.20.5'>: [u'ia64', u'm68k',
...], ...}
--
2.1.3
