1 |
commit: 599e5bb2ce34bba27d5897bc748f62ba50fc7295 |
2 |
Author: Jan Psota <jasiupsota <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Feb 23 23:48:39 2016 +0000 |
4 |
Commit: Jan Psota <jasiupsota <AT> gmail <DOT> com> |
5 |
CommitDate: Tue Feb 23 23:48:39 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/user/bleeding-edge.git/commit/?id=599e5bb2 |
7 |
|
8 |
app-portage/portage-utils-0.62-r1 +updated qtail and qportage |
9 |
|
10 |
app-portage/portage-utils/Manifest | 2 +- |
11 |
app-portage/portage-utils/files/qlop-stdin.patch | 41 +++++++++------------- |
12 |
app-portage/portage-utils/files/qportage | 9 ++--- |
13 |
app-portage/portage-utils/files/qtail | 6 ++-- |
14 |
...0.60-r1.ebuild => portage-utils-0.62-r1.ebuild} | 4 +-- |
15 |
5 files changed, 28 insertions(+), 34 deletions(-) |
16 |
|
17 |
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest |
18 |
index 66e194e..5a693ba 100644 |
19 |
--- a/app-portage/portage-utils/Manifest |
20 |
+++ b/app-portage/portage-utils/Manifest |
21 |
@@ -1 +1 @@ |
22 |
-DIST portage-utils-0.60.tar.xz 519424 SHA256 d5e4a7384321d21d0aa484fcd30768dbce557e9c97a98cd2723d3eb75b82f503 SHA512 80355b31d49ac0f47c0a05071584608bd5fc0b8a98ab9025cb0a3bc8c18e318fbc60ff33e6834cd4f0ad159c2eb7f63d0d9cb61d4c86cee473215670ebba5694 WHIRLPOOL ec6d2bc1b164a7baff83019455de91483a98401f052153e152cef3733d041e71ca2f4333c9281aa593ee962d0e42b2d4f72f0d04e13982cbb25518f3bd5ca66d |
23 |
+DIST portage-utils-0.62.tar.xz 527216 SHA256 f6ce1938e41ec2073be12568470a7aae51489579add0709c08af5d9be1c0c563 SHA512 71b2888cef1bf7549c3829cc7d4bbe2e99a711434bae4fb78c55b9c37815b61623518f19ab87db30f533d771398933c085640dc7c8ffcedf87a70ac702a52fa1 WHIRLPOOL 105d60d3f778a79972e39d2d8e78aa8b971f085721362e4d594d86006752d97b25d41a1e5a9006f603cda0088da89abb179d8bc129815c1363f30dfb6ff59891 |
24 |
|
25 |
diff --git a/app-portage/portage-utils/files/qlop-stdin.patch b/app-portage/portage-utils/files/qlop-stdin.patch |
26 |
index f592dd0..568fa6d 100644 |
27 |
--- a/app-portage/portage-utils/files/qlop-stdin.patch |
28 |
+++ b/app-portage/portage-utils/files/qlop-stdin.patch |
29 |
@@ -1,7 +1,7 @@ |
30 |
-diff -pruN portage-utils-0.60.orig/main.c portage-utils-0.60/main.c |
31 |
---- portage-utils-0.60.orig/main.c 2015-11-28 00:27:34.000000000 +0100 |
32 |
-+++ portage-utils-0.60/main.c 2015-11-29 09:55:13.148892366 +0100 |
33 |
-@@ -1395,7 +1395,8 @@ int main(int argc, char **argv) |
34 |
+diff -pruN portage-utils-0.62.orig/main.c portage-utils-0.62/main.c |
35 |
+--- portage-utils-0.62.orig/main.c 2016-02-22 19:31:41.000000000 +0100 |
36 |
++++ portage-utils-0.62/main.c 2016-02-23 23:31:36.432002795 +0100 |
37 |
+@@ -1402,7 +1402,8 @@ int main(int argc, char **argv) |
38 |
|
39 |
if (fstat(fileno(stdout), &st) != -1) |
40 |
if (!isatty(fileno(stdout))) |
41 |
@@ -11,9 +11,9 @@ diff -pruN portage-utils-0.60.orig/main.c portage-utils-0.60/main.c |
42 |
if ((getenv("TERM") == NULL) || (strcmp(getenv("TERM"), "dumb") == 0)) |
43 |
no_colors(); |
44 |
|
45 |
-diff -pruN portage-utils-0.60.orig/qlop.c portage-utils-0.60/qlop.c |
46 |
---- portage-utils-0.60.orig/qlop.c 2015-11-28 00:27:34.000000000 +0100 |
47 |
-+++ portage-utils-0.60/qlop.c 2015-11-29 10:05:46.456183417 +0100 |
48 |
+diff -pruN portage-utils-0.62.orig/qlop.c portage-utils-0.62/qlop.c |
49 |
+--- portage-utils-0.62.orig/qlop.c 2016-02-22 19:31:41.000000000 +0100 |
50 |
++++ portage-utils-0.62/qlop.c 2016-02-23 23:39:17.758530846 +0100 |
51 |
@@ -48,7 +48,7 @@ static const char * const qlop_opts_help |
52 |
"Show unmerge history", |
53 |
"Show sync history", |
54 |
@@ -54,9 +54,9 @@ diff -pruN portage-utils-0.60.orig/qlop.c portage-utils-0.60/qlop.c |
55 |
_q_static void |
56 |
print_seconds_for_earthlings(const unsigned long t) |
57 |
{ |
58 |
-@@ -109,10 +133,7 @@ show_merge_times(char *package, const ch |
59 |
- |
60 |
- DBG("Searching for %s in %s\n", pkg, logfile); |
61 |
+@@ -107,10 +131,7 @@ show_merge_times(char *package, const ch |
62 |
+ pkg = package; |
63 |
+ } |
64 |
|
65 |
- if ((fp = fopen(logfile, "r")) == NULL) { |
66 |
- warnp("Could not open logfile '%s'", logfile); |
67 |
@@ -66,25 +66,18 @@ diff -pruN portage-utils-0.60.orig/qlop.c portage-utils-0.60/qlop.c |
68 |
|
69 |
while (fgets(buf[0], sizeof(buf[0]), fp) != NULL) { |
70 |
if (strstr(buf[0], pkg) == NULL) |
71 |
-@@ -220,7 +241,6 @@ show_merge_times(char *package, const ch |
72 |
+@@ -218,7 +239,7 @@ show_merge_times(char *package, const ch |
73 |
atom_implode(atom); |
74 |
} |
75 |
} |
76 |
- fclose(fp); |
77 |
++ qfclose(fp); |
78 |
if (count == 0) |
79 |
return 0; |
80 |
if (average == 1) { |
81 |
-@@ -233,6 +253,7 @@ show_merge_times(char *package, const ch |
82 |
- } else { |
83 |
- printf("%s%s%s: %s%lu%s times\n", BLUE, pkg, NORM, GREEN, count, NORM); |
84 |
- } |
85 |
-+ qfclose(fp); |
86 |
- return 0; |
87 |
- } |
88 |
- |
89 |
-@@ -246,10 +267,7 @@ show_emerge_history(char listflag, int a |
90 |
- int i; |
91 |
+@@ -246,10 +267,7 @@ show_emerge_history(int listflag, array_ |
92 |
time_t t; |
93 |
+ depend_atom *atom, *logatom; |
94 |
|
95 |
- if ((fp = fopen(logfile, "r")) == NULL) { |
96 |
- warnp("Could not open logfile '%s'", logfile); |
97 |
@@ -94,7 +87,7 @@ diff -pruN portage-utils-0.60.orig/qlop.c portage-utils-0.60/qlop.c |
98 |
|
99 |
buf = NULL; |
100 |
while ((linelen = getline(&buf, &buflen, fp)) != -1) { |
101 |
-@@ -300,7 +318,7 @@ show_emerge_history(char listflag, int a |
102 |
+@@ -309,7 +327,7 @@ show_emerge_history(int listflag, array_ |
103 |
} |
104 |
|
105 |
free(buf); |
106 |
@@ -103,7 +96,7 @@ diff -pruN portage-utils-0.60.orig/qlop.c portage-utils-0.60/qlop.c |
107 |
} |
108 |
|
109 |
/* The format of the sync log has changed over time. |
110 |
-@@ -330,10 +348,7 @@ show_sync_history(const char *logfile) |
111 |
+@@ -339,10 +357,7 @@ show_sync_history(const char *logfile) |
112 |
char *buf, *p; |
113 |
time_t t; |
114 |
|
115 |
@@ -115,7 +108,7 @@ diff -pruN portage-utils-0.60.orig/qlop.c portage-utils-0.60/qlop.c |
116 |
|
117 |
buf = NULL; |
118 |
/* Just find the finish lines. */ |
119 |
-@@ -366,7 +381,7 @@ show_sync_history(const char *logfile) |
120 |
+@@ -375,7 +390,7 @@ show_sync_history(const char *logfile) |
121 |
} |
122 |
|
123 |
free(buf); |
124 |
|
125 |
diff --git a/app-portage/portage-utils/files/qportage b/app-portage/portage-utils/files/qportage |
126 |
index 7bc474a..11a6c9e 100755 |
127 |
--- a/app-portage/portage-utils/files/qportage |
128 |
+++ b/app-portage/portage-utils/files/qportage |
129 |
@@ -1,13 +1,14 @@ |
130 |
#!/bin/bash |
131 |
# |
132 |
-# (C) 2013+ Jan Psota |
133 |
+# (C) 2013-2016+ Jan Psota |
134 |
# |
135 |
# qportage - query portage version |
136 |
-# version 2013-02-09 |
137 |
+# version 2016-02-23 first release 2013-02-09 |
138 |
# |
139 |
. /etc/portage/make.conf || exit 1 |
140 |
|
141 |
-read s d < $PORTDIR/metadata/timestamp.x |
142 |
-let r=`date +%s`-$s r=r/60/60 |
143 |
+pd=$(LC_ALL=C date +%s -d "$(cat $PORTDIR/metadata/timestamp.chk)") |
144 |
+(( r=($(date +%s)-pd)/60/60 )) |
145 |
+ |
146 |
printf "\E[1;%dmportage is %d hours old\E[0m\n" $(( r >= 24 ? 31 : 32 )) $r |
147 |
exit $(( r >= 24 )) |
148 |
|
149 |
diff --git a/app-portage/portage-utils/files/qtail b/app-portage/portage-utils/files/qtail |
150 |
index bba572f..0ec7f2c 100755 |
151 |
--- a/app-portage/portage-utils/files/qtail |
152 |
+++ b/app-portage/portage-utils/files/qtail |
153 |
@@ -1,9 +1,9 @@ |
154 |
#!/bin/bash |
155 |
# |
156 |
-# (C) 2010, 2011, 2012+ Jan Psota |
157 |
+# (C) 2010-2016+ Jan Psota |
158 |
# |
159 |
# qtail |
160 |
-# releases: 2010-09-30, 2011-03-29, 2012-09-17, 2012-10-18 |
161 |
+# version 2016-02-23 first release 2010-09-30 |
162 |
# |
163 |
|
164 |
type qlop > /dev/null || exit 1 |
165 |
@@ -15,7 +15,7 @@ usage() { |
166 |
exit $ret |
167 |
} |
168 |
|
169 |
-let f=0 n=0 |
170 |
+(( f=0, n=0 )) |
171 |
case $1 in |
172 |
-h) usage ;; |
173 |
-f) (( $# == 1 )) || usage "in follow mode no other arguments are allowed" |
174 |
|
175 |
diff --git a/app-portage/portage-utils/portage-utils-0.60-r1.ebuild b/app-portage/portage-utils/portage-utils-0.62-r1.ebuild |
176 |
similarity index 84% |
177 |
rename from app-portage/portage-utils/portage-utils-0.60-r1.ebuild |
178 |
rename to app-portage/portage-utils/portage-utils-0.62-r1.ebuild |
179 |
index d81fb6b..01af7b2 100644 |
180 |
--- a/app-portage/portage-utils/portage-utils-0.60-r1.ebuild |
181 |
+++ b/app-portage/portage-utils/portage-utils-0.62-r1.ebuild |
182 |
@@ -1,4 +1,4 @@ |
183 |
-# Copyright 1999-2015 Gentoo Foundation |
184 |
+# Copyright 1999-2016 Gentoo Foundation |
185 |
# Distributed under the terms of the GNU General Public License v2 |
186 |
# $Id$ |
187 |
|
188 |
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz |
189 |
|
190 |
LICENSE="GPL-2" |
191 |
SLOT="0" |
192 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-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" |
193 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-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" |
194 |
IUSE="nls static" |
195 |
|
196 |
RDEPEND="dev-libs/iniparser:0" |