1 |
commit: 29d1a265b9384f71d57c1baf9b90154c77ed9888 |
2 |
Author: layman <layman <AT> localhost> |
3 |
AuthorDate: Sun Nov 29 09:26:40 2015 +0000 |
4 |
Commit: Jan Psota <jasiupsota <AT> gmail <DOT> com> |
5 |
CommitDate: Sun Nov 29 09:26:40 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/user/bleeding-edge.git/commit/?id=29d1a265 |
7 |
|
8 |
portage-utils/portage-utils-0.60 with qtail and qportage |
9 |
|
10 |
app-portage/portage-utils/Manifest | 2 +- |
11 |
.../files/portage-utils-0.56-qcheck-tz.patch | 31 ----------------- |
12 |
.../files/portage-utils-0.56-qlop-tz.patch | 39 ---------------------- |
13 |
app-portage/portage-utils/files/qlop-stdin.patch | 27 +++++++++++---- |
14 |
...0.56-r1.ebuild => portage-utils-0.60-r1.ebuild} | 2 -- |
15 |
5 files changed, 21 insertions(+), 80 deletions(-) |
16 |
|
17 |
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest |
18 |
index 016789a..66e194e 100644 |
19 |
--- a/app-portage/portage-utils/Manifest |
20 |
+++ b/app-portage/portage-utils/Manifest |
21 |
@@ -1 +1 @@ |
22 |
-DIST portage-utils-0.56.tar.xz 513832 SHA256 4df7323fb2667dd9bcee0f2d169c01ed8600aa6196118e6cd3a10cfe99852bbf SHA512 f2136a7df4cd91499b135fbf000f81a71177d5a39b4da2db484ab0f9492d152eaa72a5fee0e56d4b58611462e251905e554f5e41890a749f05d19e50c16c77b6 WHIRLPOOL af0a96ca3bf2dd39335317829aa8aff110a63042c415368400977e974cc21163da7eb76f7d53fcd05e133fd8a8568255ba022a32f1b174bda0dcb15b5f1476b9 |
23 |
+DIST portage-utils-0.60.tar.xz 519424 SHA256 d5e4a7384321d21d0aa484fcd30768dbce557e9c97a98cd2723d3eb75b82f503 SHA512 80355b31d49ac0f47c0a05071584608bd5fc0b8a98ab9025cb0a3bc8c18e318fbc60ff33e6834cd4f0ad159c2eb7f63d0d9cb61d4c86cee473215670ebba5694 WHIRLPOOL ec6d2bc1b164a7baff83019455de91483a98401f052153e152cef3733d041e71ca2f4333c9281aa593ee962d0e42b2d4f72f0d04e13982cbb25518f3bd5ca66d |
24 |
|
25 |
diff --git a/app-portage/portage-utils/files/portage-utils-0.56-qcheck-tz.patch b/app-portage/portage-utils/files/portage-utils-0.56-qcheck-tz.patch |
26 |
deleted file mode 100644 |
27 |
index 5b493b6..0000000 |
28 |
--- a/app-portage/portage-utils/files/portage-utils-0.56-qcheck-tz.patch |
29 |
+++ /dev/null |
30 |
@@ -1,31 +0,0 @@ |
31 |
-From 359fe5097ca531291a2cbb878dc6940351a7a358 Mon Sep 17 00:00:00 2001 |
32 |
-From: Mike Frysinger <vapier@g.o> |
33 |
-Date: Thu, 11 Jun 2015 09:51:22 +0000 |
34 |
-Subject: [PATCH] tests: qcheck: fix timezone handling |
35 |
- |
36 |
-Make sure the stamps are pinned to UTC rather than using the active TZ. |
37 |
- |
38 |
-URL: https://bugs.gentoo.org/551718 |
39 |
-Reported-by: Jeroen Roovers <jer@g.o> |
40 |
---- |
41 |
- tests/qcheck/dotest | 4 ++-- |
42 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
43 |
- |
44 |
-diff --git a/tests/qcheck/dotest b/tests/qcheck/dotest |
45 |
-index 965a5b5..9122321 100755 |
46 |
---- a/tests/qcheck/dotest |
47 |
-+++ b/tests/qcheck/dotest |
48 |
-@@ -10,8 +10,8 @@ export Q_VDB=/ |
49 |
- # This is the "valid" mtime the test packages have hardcoded in the CONTENTS |
50 |
- # files. The stamp is the CONTENTS while the touch date is the corresponding |
51 |
- # unpacked date. |
52 |
--STAMP=1398954900 DATE=201405011035 |
53 |
--find "${ROOT}" -exec touch -h -t "${DATE}" {} + |
54 |
-+STAMP=1398954900 DATE='2014-05-01T14:35:00Z' |
55 |
-+find "${ROOT}" -exec touch -h -d "${DATE}" {} + |
56 |
- |
57 |
- mktmpdir |
58 |
- |
59 |
--- |
60 |
-2.4.1 |
61 |
- |
62 |
|
63 |
diff --git a/app-portage/portage-utils/files/portage-utils-0.56-qlop-tz.patch b/app-portage/portage-utils/files/portage-utils-0.56-qlop-tz.patch |
64 |
deleted file mode 100644 |
65 |
index d812daa..0000000 |
66 |
--- a/app-portage/portage-utils/files/portage-utils-0.56-qlop-tz.patch |
67 |
+++ /dev/null |
68 |
@@ -1,39 +0,0 @@ |
69 |
-From 286688cb68c9989f697203ca779b08fad23366db Mon Sep 17 00:00:00 2001 |
70 |
-From: Mike Frysinger <vapier@g.o> |
71 |
-Date: Fri, 12 Jun 2015 05:05:41 -0400 |
72 |
-Subject: [PATCH] tests: force TZ to UTC for everyone |
73 |
- |
74 |
-This should make test outputs more stable across systems. |
75 |
- |
76 |
-URL: https://bugs.gentoo.org/551806 |
77 |
-Reported-by: Nikoli <nikoli@×××.us> |
78 |
---- |
79 |
- tests/init.sh | 2 ++ |
80 |
- tests/qlop/list01.good | 4 ++-- |
81 |
- 2 files changed, 4 insertions(+), 2 deletions(-) |
82 |
- |
83 |
-diff --git a/tests/init.sh b/tests/init.sh |
84 |
-index b3f634e..11fd379 100644 |
85 |
---- a/tests/init.sh |
86 |
-+++ b/tests/init.sh |
87 |
-@@ -33,6 +33,8 @@ setup_env |
88 |
- unset ROOT PORTAGE_CONFIGROOT PORTAGE_QUIET |
89 |
- # but make sure we don't implicitly rely on user's setup |
90 |
- export PORTAGE_CONFIGROOT="${ab}/not/a/real/path" |
91 |
-+# Always use UTC for timestamps to keep tests stable. #551806 |
92 |
-+export TZ='UTC 0' |
93 |
- |
94 |
- q -i -q |
95 |
- |
96 |
-diff --git a/tests/qlop/list01.good b/tests/qlop/list01.good |
97 |
-index 458c751..fc8683c 100644 |
98 |
---- a/tests/qlop/list01.good |
99 |
-+++ b/tests/qlop/list01.good |
100 |
-@@ -1,2 +1,2 @@ |
101 |
--Thu Jan 27 00:42:17 2005 >>> rsync://192.168.0.5/gentoo-portage |
102 |
--Sat May 16 04:21:00 2015 >>> gentoo |
103 |
-+Thu Jan 27 05:42:17 2005 >>> rsync://192.168.0.5/gentoo-portage |
104 |
-+Sat May 16 08:21:00 2015 >>> gentoo |
105 |
--- |
106 |
-2.4.1 |
107 |
- |
108 |
|
109 |
diff --git a/app-portage/portage-utils/files/qlop-stdin.patch b/app-portage/portage-utils/files/qlop-stdin.patch |
110 |
index d5084b2..f592dd0 100644 |
111 |
--- a/app-portage/portage-utils/files/qlop-stdin.patch |
112 |
+++ b/app-portage/portage-utils/files/qlop-stdin.patch |
113 |
@@ -1,6 +1,19 @@ |
114 |
-diff -pruN portage-utils-0.55.orig/qlop.c portage-utils-0.55/qlop.c |
115 |
---- portage-utils-0.55.orig/qlop.c 2015-05-19 19:34:38.000000000 +0200 |
116 |
-+++ portage-utils-0.55/qlop.c 2015-05-24 09:09:09.621302163 +0200 |
117 |
+diff -pruN portage-utils-0.60.orig/main.c portage-utils-0.60/main.c |
118 |
+--- portage-utils-0.60.orig/main.c 2015-11-28 00:27:34.000000000 +0100 |
119 |
++++ portage-utils-0.60/main.c 2015-11-29 09:55:13.148892366 +0100 |
120 |
+@@ -1395,7 +1395,8 @@ int main(int argc, char **argv) |
121 |
+ |
122 |
+ if (fstat(fileno(stdout), &st) != -1) |
123 |
+ if (!isatty(fileno(stdout))) |
124 |
+- no_colors(); |
125 |
++ if (S_ISFIFO(st.st_mode) == 0) |
126 |
++ no_colors(); |
127 |
+ if ((getenv("TERM") == NULL) || (strcmp(getenv("TERM"), "dumb") == 0)) |
128 |
+ no_colors(); |
129 |
+ |
130 |
+diff -pruN portage-utils-0.60.orig/qlop.c portage-utils-0.60/qlop.c |
131 |
+--- portage-utils-0.60.orig/qlop.c 2015-11-28 00:27:34.000000000 +0100 |
132 |
++++ portage-utils-0.60/qlop.c 2015-11-29 10:05:46.456183417 +0100 |
133 |
@@ -48,7 +48,7 @@ static const char * const qlop_opts_help |
134 |
"Show unmerge history", |
135 |
"Show sync history", |
136 |
@@ -80,8 +93,8 @@ diff -pruN portage-utils-0.55.orig/qlop.c portage-utils-0.55/qlop.c |
137 |
+ fp = qfopen(logfile); |
138 |
|
139 |
buf = NULL; |
140 |
- while (getline(&buf, &buflen, fp) != -1) { |
141 |
-@@ -301,7 +319,7 @@ show_emerge_history(char listflag, int a |
142 |
+ while ((linelen = getline(&buf, &buflen, fp)) != -1) { |
143 |
+@@ -300,7 +318,7 @@ show_emerge_history(char listflag, int a |
144 |
} |
145 |
|
146 |
free(buf); |
147 |
@@ -90,7 +103,7 @@ diff -pruN portage-utils-0.55.orig/qlop.c portage-utils-0.55/qlop.c |
148 |
} |
149 |
|
150 |
/* The format of the sync log has changed over time. |
151 |
-@@ -331,10 +349,7 @@ show_sync_history(const char *logfile) |
152 |
+@@ -330,10 +348,7 @@ show_sync_history(const char *logfile) |
153 |
char *buf, *p; |
154 |
time_t t; |
155 |
|
156 |
@@ -102,7 +115,7 @@ diff -pruN portage-utils-0.55.orig/qlop.c portage-utils-0.55/qlop.c |
157 |
|
158 |
buf = NULL; |
159 |
/* Just find the finish lines. */ |
160 |
-@@ -369,7 +384,7 @@ show_sync_history(const char *logfile) |
161 |
+@@ -366,7 +381,7 @@ show_sync_history(const char *logfile) |
162 |
} |
163 |
|
164 |
free(buf); |
165 |
|
166 |
diff --git a/app-portage/portage-utils/portage-utils-0.56-r1.ebuild b/app-portage/portage-utils/portage-utils-0.60-r1.ebuild |
167 |
similarity index 95% |
168 |
rename from app-portage/portage-utils/portage-utils-0.56-r1.ebuild |
169 |
rename to app-portage/portage-utils/portage-utils-0.60-r1.ebuild |
170 |
index 92e4a1d..d81fb6b 100644 |
171 |
--- a/app-portage/portage-utils/portage-utils-0.56-r1.ebuild |
172 |
+++ b/app-portage/portage-utils/portage-utils-0.60-r1.ebuild |
173 |
@@ -22,8 +22,6 @@ DEPEND="${RDEPEND} |
174 |
static? ( dev-libs/iniparser:0[static-libs] )" |
175 |
|
176 |
src_prepare() { |
177 |
- epatch "${FILESDIR}"/${P}-qcheck-tz.patch #551718 |
178 |
- epatch "${FILESDIR}"/${P}-qlop-tz.patch #551806 |
179 |
epatch "${FILESDIR}/qlop-stdin.patch" |
180 |
epatch_user |
181 |
} |