1 |
commit: 4817da2f35a3d4e852a411fa56408458075378df |
2 |
Author: Jan Psota <jasiupsota <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Mar 29 00:51:06 2016 +0000 |
4 |
Commit: Jan Psota <jasiupsota <AT> gmail <DOT> com> |
5 |
CommitDate: Tue Mar 29 00:51:06 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/user/bleeding-edge.git/commit/?id=4817da2f |
7 |
|
8 |
app-portage/portage-utils-0.63-r1 + qtail, qportage |
9 |
|
10 |
app-portage/portage-utils/Manifest | 2 +- |
11 |
app-portage/portage-utils/files/qlop-stdin.patch | 36 +++++++++++----------- |
12 |
...0.62-r1.ebuild => portage-utils-0.63-r1.ebuild} | 31 ------------------- |
13 |
3 files changed, 19 insertions(+), 50 deletions(-) |
14 |
|
15 |
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest |
16 |
index 5a693ba..234c259 100644 |
17 |
--- a/app-portage/portage-utils/Manifest |
18 |
+++ b/app-portage/portage-utils/Manifest |
19 |
@@ -1 +1 @@ |
20 |
-DIST portage-utils-0.62.tar.xz 527216 SHA256 f6ce1938e41ec2073be12568470a7aae51489579add0709c08af5d9be1c0c563 SHA512 71b2888cef1bf7549c3829cc7d4bbe2e99a711434bae4fb78c55b9c37815b61623518f19ab87db30f533d771398933c085640dc7c8ffcedf87a70ac702a52fa1 WHIRLPOOL 105d60d3f778a79972e39d2d8e78aa8b971f085721362e4d594d86006752d97b25d41a1e5a9006f603cda0088da89abb179d8bc129815c1363f30dfb6ff59891 |
21 |
+DIST portage-utils-0.63.tar.xz 529012 SHA256 7a754cccad2d4c3331d348ba9df51bb3b9565866674303152b55248b05130a02 SHA512 2b0bceee63b894e7f517f3c938a1873aa90c41b668abbf6a39125a1bb9ce1059731e34216cc357787b5cbf83a0cf0748530147262673ea0bc26404d6274714eb WHIRLPOOL fdaec19af639c744394063dd57f7e64fb02ff10c4ee5b1ef2f49928df6d47fb5bf732e547264390787e20ca6e3251be3935e9f348f2510aa0fc6779778ca44ba |
22 |
|
23 |
diff --git a/app-portage/portage-utils/files/qlop-stdin.patch b/app-portage/portage-utils/files/qlop-stdin.patch |
24 |
index 568fa6d..8e5009f 100644 |
25 |
--- a/app-portage/portage-utils/files/qlop-stdin.patch |
26 |
+++ b/app-portage/portage-utils/files/qlop-stdin.patch |
27 |
@@ -1,7 +1,7 @@ |
28 |
-diff -pruN portage-utils-0.62.orig/main.c portage-utils-0.62/main.c |
29 |
---- portage-utils-0.62.orig/main.c 2016-02-22 19:31:41.000000000 +0100 |
30 |
-+++ portage-utils-0.62/main.c 2016-02-23 23:31:36.432002795 +0100 |
31 |
-@@ -1402,7 +1402,8 @@ int main(int argc, char **argv) |
32 |
+diff -pruN portage-utils-0.63.orig/main.c portage-utils-0.63/main.c |
33 |
+--- portage-utils-0.63.orig/main.c 2016-03-28 05:53:50.000000000 +0200 |
34 |
++++ portage-utils-0.63/main.c 2016-03-29 02:40:11.935979233 +0200 |
35 |
+@@ -1422,7 +1422,8 @@ int main(int argc, char **argv) |
36 |
|
37 |
if (fstat(fileno(stdout), &st) != -1) |
38 |
if (!isatty(fileno(stdout))) |
39 |
@@ -11,19 +11,19 @@ diff -pruN portage-utils-0.62.orig/main.c portage-utils-0.62/main.c |
40 |
if ((getenv("TERM") == NULL) || (strcmp(getenv("TERM"), "dumb") == 0)) |
41 |
no_colors(); |
42 |
|
43 |
-diff -pruN portage-utils-0.62.orig/qlop.c portage-utils-0.62/qlop.c |
44 |
---- portage-utils-0.62.orig/qlop.c 2016-02-22 19:31:41.000000000 +0100 |
45 |
-+++ portage-utils-0.62/qlop.c 2016-02-23 23:39:17.758530846 +0100 |
46 |
-@@ -48,7 +48,7 @@ static const char * const qlop_opts_help |
47 |
- "Show unmerge history", |
48 |
+diff -pruN portage-utils-0.63.orig/qlop.c portage-utils-0.63/qlop.c |
49 |
+--- portage-utils-0.63.orig/qlop.c 2016-03-28 05:53:50.000000000 +0200 |
50 |
++++ portage-utils-0.63/qlop.c 2016-03-29 02:42:29.418960636 +0200 |
51 |
+@@ -32,7 +32,7 @@ static const char * const qlop_opts_help |
52 |
"Show sync history", |
53 |
"Show current emerging packages", |
54 |
+ "Limit selection to this time (1st -d is start, 2nd -d is end)", |
55 |
- "Read emerge logfile instead of $EMERGE_LOG_DIR/" QLOP_DEFAULT_LOGFILE, |
56 |
-+ "Read emerge logfile instead of " QLOP_DEFAULT_LOGFILE "\n\t\t\t (use \"-\" for stdin)", |
57 |
++ "Read emerge logfile instead of $EMERGE_LOG_DIR/" QLOP_DEFAULT_LOGFILE "\n\t\t\t (use \"-\" for stdin)", |
58 |
COMMON_OPTS_HELP |
59 |
}; |
60 |
- #define qlop_usage(ret) usage(ret, QLOP_FLAGS, qlop_long_opts, qlop_opts_help, lookup_applet_idx("qlop")) |
61 |
-@@ -56,6 +56,30 @@ static const char * const qlop_opts_help |
62 |
+ static const char qlop_desc[] = |
63 |
+@@ -47,6 +47,30 @@ static const char qlop_desc[] = |
64 |
#define QLOP_LIST 0x01 |
65 |
#define QLOP_UNLIST 0x02 |
66 |
|
67 |
@@ -54,7 +54,7 @@ diff -pruN portage-utils-0.62.orig/qlop.c portage-utils-0.62/qlop.c |
68 |
_q_static void |
69 |
print_seconds_for_earthlings(const unsigned long t) |
70 |
{ |
71 |
-@@ -107,10 +131,7 @@ show_merge_times(char *package, const ch |
72 |
+@@ -98,10 +122,7 @@ show_merge_times(char *package, const ch |
73 |
pkg = package; |
74 |
} |
75 |
|
76 |
@@ -66,7 +66,7 @@ diff -pruN portage-utils-0.62.orig/qlop.c portage-utils-0.62/qlop.c |
77 |
|
78 |
while (fgets(buf[0], sizeof(buf[0]), fp) != NULL) { |
79 |
if (strstr(buf[0], pkg) == NULL) |
80 |
-@@ -218,7 +239,7 @@ show_merge_times(char *package, const ch |
81 |
+@@ -211,7 +232,7 @@ show_merge_times(char *package, const ch |
82 |
atom_implode(atom); |
83 |
} |
84 |
} |
85 |
@@ -75,7 +75,7 @@ diff -pruN portage-utils-0.62.orig/qlop.c portage-utils-0.62/qlop.c |
86 |
if (count == 0) |
87 |
return 0; |
88 |
if (average == 1) { |
89 |
-@@ -246,10 +267,7 @@ show_emerge_history(int listflag, array_ |
90 |
+@@ -240,10 +261,7 @@ show_emerge_history(int listflag, array_ |
91 |
time_t t; |
92 |
depend_atom *atom, *logatom; |
93 |
|
94 |
@@ -87,7 +87,7 @@ diff -pruN portage-utils-0.62.orig/qlop.c portage-utils-0.62/qlop.c |
95 |
|
96 |
buf = NULL; |
97 |
while ((linelen = getline(&buf, &buflen, fp)) != -1) { |
98 |
-@@ -309,7 +327,7 @@ show_emerge_history(int listflag, array_ |
99 |
+@@ -305,7 +323,7 @@ show_emerge_history(int listflag, array_ |
100 |
} |
101 |
|
102 |
free(buf); |
103 |
@@ -96,7 +96,7 @@ diff -pruN portage-utils-0.62.orig/qlop.c portage-utils-0.62/qlop.c |
104 |
} |
105 |
|
106 |
/* The format of the sync log has changed over time. |
107 |
-@@ -339,10 +357,7 @@ show_sync_history(const char *logfile) |
108 |
+@@ -335,10 +353,7 @@ show_sync_history(const char *logfile, t |
109 |
char *buf, *p; |
110 |
time_t t; |
111 |
|
112 |
@@ -108,7 +108,7 @@ diff -pruN portage-utils-0.62.orig/qlop.c portage-utils-0.62/qlop.c |
113 |
|
114 |
buf = NULL; |
115 |
/* Just find the finish lines. */ |
116 |
-@@ -375,7 +390,7 @@ show_sync_history(const char *logfile) |
117 |
+@@ -373,7 +388,7 @@ show_sync_history(const char *logfile, t |
118 |
} |
119 |
|
120 |
free(buf); |
121 |
|
122 |
diff --git a/app-portage/portage-utils/portage-utils-0.62-r1.ebuild b/app-portage/portage-utils/portage-utils-0.63-r1.ebuild |
123 |
similarity index 54% |
124 |
rename from app-portage/portage-utils/portage-utils-0.62-r1.ebuild |
125 |
rename to app-portage/portage-utils/portage-utils-0.63-r1.ebuild |
126 |
index 01af7b2..cc6e883 100644 |
127 |
--- a/app-portage/portage-utils/portage-utils-0.62-r1.ebuild |
128 |
+++ b/app-portage/portage-utils/portage-utils-0.63-r1.ebuild |
129 |
@@ -45,36 +45,5 @@ src_compile() { |
130 |
|
131 |
src_install() { |
132 |
default |
133 |
- |
134 |
dobin "${FILESDIR}"/{qtail,qportage} |
135 |
- exeinto /etc/portage/bin |
136 |
- doexe "${FILESDIR}"/post_sync |
137 |
- insinto /etc/portage/postsync.d |
138 |
- doins "${FILESDIR}"/q-reinitialize |
139 |
- |
140 |
- # Portage fixes shebangs, we just need to fix the paths in the files |
141 |
- sed -i \ |
142 |
- -e "s:\(/etc/portage/postsync.d\|/usr/bin/q\):${EPREFIX}&:g" \ |
143 |
- "${ED}"/etc/portage/bin/post_sync \ |
144 |
- "${ED}"/etc/portage/postsync.d/q-reinitialize || die |
145 |
-} |
146 |
- |
147 |
-pkg_preinst() { |
148 |
- # preserve +x bit on postsync files #301721 |
149 |
- local x |
150 |
- pushd "${ED}" >/dev/null |
151 |
- for x in etc/portage/postsync.d/* ; do |
152 |
- [[ -x ${EROOT}/${x} ]] && chmod +x "${x}" |
153 |
- done |
154 |
-} |
155 |
- |
156 |
-pkg_postinst() { |
157 |
- if [[ -z ${REPLACING_VERSIONS} ]] ; then |
158 |
- elog "${EPREFIX}/etc/portage/postsync.d/q-reinitialize has been installed for convenience" |
159 |
- elog "If you wish for it to be automatically run at the end of every --sync:" |
160 |
- elog " # chmod +x ${EPREFIX}/etc/portage/postsync.d/q-reinitialize" |
161 |
- elog "Normally this should only take a few seconds to run but file systems" |
162 |
- elog "such as ext3 can take a lot longer. To disable, simply do:" |
163 |
- elog " # chmod -x ${EPREFIX}/etc/portage/postsync.d/q-reinitialize" |
164 |
- fi |
165 |
} |