[gentoo-commits] repo/user/bleeding-edge:master commit in: app-portage/portage-utils/files/, app-portage/portage-utils/
commit: 599e5bb2ce34bba27d5897bc748f62ba50fc7295 Author: Jan Psota gmail com> AuthorDate: Tue Feb 23 23:48:39 2016 + Commit: Jan Psota gmail com> CommitDate: Tue Feb 23 23:48:39 2016 + URL: https://gitweb.gentoo.org/repo/user/bleeding-edge.git/commit/?id=599e5bb2 app-portage/portage-utils-0.62-r1 +updated qtail and qportage app-portage/portage-utils/Manifest | 2 +- app-portage/portage-utils/files/qlop-stdin.patch | 41 +- app-portage/portage-utils/files/qportage | 9 ++--- app-portage/portage-utils/files/qtail | 6 ++-- ...0.60-r1.ebuild => portage-utils-0.62-r1.ebuild} | 4 +-- 5 files changed, 28 insertions(+), 34 deletions(-) diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest index 66e194e..5a693ba 100644 --- a/app-portage/portage-utils/Manifest +++ b/app-portage/portage-utils/Manifest @@ -1 +1 @@ -DIST portage-utils-0.60.tar.xz 519424 SHA256 d5e4a7384321d21d0aa484fcd30768dbce557e9c97a98cd2723d3eb75b82f503 SHA512 80355b31d49ac0f47c0a05071584608bd5fc0b8a98ab9025cb0a3bc8c18e318fbc60ff33e6834cd4f0ad159c2eb7f63d0d9cb61d4c86cee473215670ebba5694 WHIRLPOOL ec6d2bc1b164a7baff83019455de91483a98401f052153e152cef3733d041e71ca2f4333c9281aa593ee962d0e42b2d4f72f0d04e13982cbb25518f3bd5ca66d +DIST portage-utils-0.62.tar.xz 527216 SHA256 f6ce1938e41ec2073be12568470a7aae51489579add0709c08af5d9be1c0c563 SHA512 71b2888cef1bf7549c3829cc7d4bbe2e99a711434bae4fb78c55b9c37815b61623518f19ab87db30f533d771398933c085640dc7c8ffcedf87a70ac702a52fa1 WHIRLPOOL 105d60d3f778a79972e39d2d8e78aa8b971f085721362e4d594d86006752d97b25d41a1e5a9006f603cda0088da89abb179d8bc129815c1363f30dfb6ff59891 diff --git a/app-portage/portage-utils/files/qlop-stdin.patch b/app-portage/portage-utils/files/qlop-stdin.patch index f592dd0..568fa6d 100644 --- a/app-portage/portage-utils/files/qlop-stdin.patch +++ b/app-portage/portage-utils/files/qlop-stdin.patch @@ -1,7 +1,7 @@ -diff -pruN portage-utils-0.60.orig/main.c portage-utils-0.60/main.c portage-utils-0.60.orig/main.c 2015-11-28 00:27:34.0 +0100 -+++ portage-utils-0.60/main.c 2015-11-29 09:55:13.148892366 +0100 -@@ -1395,7 +1395,8 @@ int main(int argc, char **argv) +diff -pruN portage-utils-0.62.orig/main.c portage-utils-0.62/main.c +--- portage-utils-0.62.orig/main.c 2016-02-22 19:31:41.0 +0100 portage-utils-0.62/main.c 2016-02-23 23:31:36.432002795 +0100 +@@ -1402,7 +1402,8 @@ int main(int argc, char **argv) if (fstat(fileno(stdout), &st) != -1) if (!isatty(fileno(stdout))) @@ -11,9 +11,9 @@ diff -pruN portage-utils-0.60.orig/main.c portage-utils-0.60/main.c if ((getenv("TERM") == NULL) || (strcmp(getenv("TERM"), "dumb") == 0)) no_colors(); -diff -pruN portage-utils-0.60.orig/qlop.c portage-utils-0.60/qlop.c portage-utils-0.60.orig/qlop.c 2015-11-28 00:27:34.0 +0100 -+++ portage-utils-0.60/qlop.c 2015-11-29 10:05:46.456183417 +0100 +diff -pruN portage-utils-0.62.orig/qlop.c portage-utils-0.62/qlop.c +--- portage-utils-0.62.orig/qlop.c 2016-02-22 19:31:41.0 +0100 portage-utils-0.62/qlop.c 2016-02-23 23:39:17.758530846 +0100 @@ -48,7 +48,7 @@ static const char * const qlop_opts_help "Show unmerge history", "Show sync history", @@ -54,9 +54,9 @@ diff -pruN portage-utils-0.60.orig/qlop.c portage-utils-0.60/qlop.c _q_static void print_seconds_for_earthlings(const unsigned long t) { -@@ -109,10 +133,7 @@ show_merge_times(char *package, const ch - - DBG("Searching for %s in %s\n", pkg, logfile); +@@ -107,10 +131,7 @@ show_merge_times(char *package, const ch + pkg = package; + } - if ((fp = fopen(logfile, "r")) == NULL) { - warnp("Could not open logfile '%s'", logfile); @@ -66,25 +66,18 @@ diff -pruN portage-utils-0.60.orig/qlop.c portage-utils-0.60/qlop.c while (fgets(buf[0], sizeof(buf[0]), fp) != NULL) { if (strstr(buf[0], pkg) == NULL) -@@ -220,7 +241,6 @@ show_merge_times(char *package, const ch +@@ -218,7 +239,7 @@ show_merge_times(char *package, const ch atom_implode(atom); } } - fclose(fp); ++ qfclose(fp); if (count == 0) return 0; if (average == 1) { -@@ -233,6 +253,7 @@ show_merge_times(char *package, const ch - } else { - printf("%s%s%s: %s%lu%s times\n", BLUE, pkg, NORM, GREEN, count, NORM); - } -+ qfclose(fp); - return 0; - } - -@@ -246,10 +267,7 @@ show_emerge_history(char listflag, int a - int i; +@@ -246,10 +267,7 @@ show_emerge_history(int listflag, array_ time_t t; + depend_atom *atom, *logatom; - if ((fp = fopen(logfile, "r")) == NULL) { - warnp("Could not open logfile '%s'", logfile); @@ -94,7 +87,7 @@ diff -pruN portage-utils-0.60.orig/qlop.c po
[gentoo-commits] repo/user/bleeding-edge:master commit in: app-portage/portage-utils/files/, app-portage/portage-utils/
commit: 4817da2f35a3d4e852a411fa56408458075378df Author: Jan Psota gmail com> AuthorDate: Tue Mar 29 00:51:06 2016 + Commit: Jan Psota gmail com> CommitDate: Tue Mar 29 00:51:06 2016 + URL: https://gitweb.gentoo.org/repo/user/bleeding-edge.git/commit/?id=4817da2f app-portage/portage-utils-0.63-r1 + qtail, qportage app-portage/portage-utils/Manifest | 2 +- app-portage/portage-utils/files/qlop-stdin.patch | 36 +++--- ...0.62-r1.ebuild => portage-utils-0.63-r1.ebuild} | 31 --- 3 files changed, 19 insertions(+), 50 deletions(-) diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest index 5a693ba..234c259 100644 --- a/app-portage/portage-utils/Manifest +++ b/app-portage/portage-utils/Manifest @@ -1 +1 @@ -DIST portage-utils-0.62.tar.xz 527216 SHA256 f6ce1938e41ec2073be12568470a7aae51489579add0709c08af5d9be1c0c563 SHA512 71b2888cef1bf7549c3829cc7d4bbe2e99a711434bae4fb78c55b9c37815b61623518f19ab87db30f533d771398933c085640dc7c8ffcedf87a70ac702a52fa1 WHIRLPOOL 105d60d3f778a79972e39d2d8e78aa8b971f085721362e4d594d86006752d97b25d41a1e5a9006f603cda0088da89abb179d8bc129815c1363f30dfb6ff59891 +DIST portage-utils-0.63.tar.xz 529012 SHA256 7a754cccad2d4c3331d348ba9df51bb3b9565866674303152b55248b05130a02 SHA512 2b0bceee63b894e7f517f3c938a1873aa90c41b668abbf6a39125a1bb9ce1059731e34216cc357787b5cbf83a0cf0748530147262673ea0bc26404d6274714eb WHIRLPOOL fdaec19af639c744394063dd57f7e64fb02ff10c4ee5b1ef2f49928df6d47fb5bf732e547264390787e20ca6e3251be3935e9f348f2510aa0fc6779778ca44ba diff --git a/app-portage/portage-utils/files/qlop-stdin.patch b/app-portage/portage-utils/files/qlop-stdin.patch index 568fa6d..8e5009f 100644 --- a/app-portage/portage-utils/files/qlop-stdin.patch +++ b/app-portage/portage-utils/files/qlop-stdin.patch @@ -1,7 +1,7 @@ -diff -pruN portage-utils-0.62.orig/main.c portage-utils-0.62/main.c portage-utils-0.62.orig/main.c 2016-02-22 19:31:41.0 +0100 -+++ portage-utils-0.62/main.c 2016-02-23 23:31:36.432002795 +0100 -@@ -1402,7 +1402,8 @@ int main(int argc, char **argv) +diff -pruN portage-utils-0.63.orig/main.c portage-utils-0.63/main.c +--- portage-utils-0.63.orig/main.c 2016-03-28 05:53:50.0 +0200 portage-utils-0.63/main.c 2016-03-29 02:40:11.935979233 +0200 +@@ -1422,7 +1422,8 @@ int main(int argc, char **argv) if (fstat(fileno(stdout), &st) != -1) if (!isatty(fileno(stdout))) @@ -11,19 +11,19 @@ diff -pruN portage-utils-0.62.orig/main.c portage-utils-0.62/main.c if ((getenv("TERM") == NULL) || (strcmp(getenv("TERM"), "dumb") == 0)) no_colors(); -diff -pruN portage-utils-0.62.orig/qlop.c portage-utils-0.62/qlop.c portage-utils-0.62.orig/qlop.c 2016-02-22 19:31:41.0 +0100 -+++ portage-utils-0.62/qlop.c 2016-02-23 23:39:17.758530846 +0100 -@@ -48,7 +48,7 @@ static const char * const qlop_opts_help - "Show unmerge history", +diff -pruN portage-utils-0.63.orig/qlop.c portage-utils-0.63/qlop.c +--- portage-utils-0.63.orig/qlop.c 2016-03-28 05:53:50.0 +0200 portage-utils-0.63/qlop.c 2016-03-29 02:42:29.418960636 +0200 +@@ -32,7 +32,7 @@ static const char * const qlop_opts_help "Show sync history", "Show current emerging packages", + "Limit selection to this time (1st -d is start, 2nd -d is end)", - "Read emerge logfile instead of $EMERGE_LOG_DIR/" QLOP_DEFAULT_LOGFILE, -+ "Read emerge logfile instead of " QLOP_DEFAULT_LOGFILE "\n\t\t\t (use \"-\" for stdin)", ++ "Read emerge logfile instead of $EMERGE_LOG_DIR/" QLOP_DEFAULT_LOGFILE "\n\t\t\t (use \"-\" for stdin)", COMMON_OPTS_HELP }; - #define qlop_usage(ret) usage(ret, QLOP_FLAGS, qlop_long_opts, qlop_opts_help, lookup_applet_idx("qlop")) -@@ -56,6 +56,30 @@ static const char * const qlop_opts_help + static const char qlop_desc[] = +@@ -47,6 +47,30 @@ static const char qlop_desc[] = #define QLOP_LIST0x01 #define QLOP_UNLIST 0x02 @@ -54,7 +54,7 @@ diff -pruN portage-utils-0.62.orig/qlop.c portage-utils-0.62/qlop.c _q_static void print_seconds_for_earthlings(const unsigned long t) { -@@ -107,10 +131,7 @@ show_merge_times(char *package, const ch +@@ -98,10 +122,7 @@ show_merge_times(char *package, const ch pkg = package; } @@ -66,7 +66,7 @@ diff -pruN portage-utils-0.62.orig/qlop.c portage-utils-0.62/qlop.c while (fgets(buf[0], sizeof(buf[0]), fp) != NULL) { if (strstr(buf[0], pkg) == NULL) -@@ -218,7 +239,7 @@ show_merge_times(char *package, const ch +@@ -211,7 +232,7 @@ show_merge_times(char *package, const ch atom_implode(atom); } } @@ -75,7 +75,7 @@ diff -pruN portage-utils-0.62.orig/qlop.c portage-utils-0.62/qlop.c if (count == 0) return 0; if (average == 1) { -@@ -246,10 +267,7 @@ show_emerg