diff options
author | 2016-02-24 00:48:39 +0100 | |
---|---|---|
committer | 2016-02-24 00:48:39 +0100 | |
commit | 599e5bb2ce34bba27d5897bc748f62ba50fc7295 (patch) | |
tree | 39d53e0433ee7ff23283493b36a69037737a0207 /app-portage | |
parent | sys-block/tgt-1.0.63 for 2 weeks now (diff) | |
download | bleeding-edge-599e5bb2ce34bba27d5897bc748f62ba50fc7295.tar.gz bleeding-edge-599e5bb2ce34bba27d5897bc748f62ba50fc7295.tar.bz2 bleeding-edge-599e5bb2ce34bba27d5897bc748f62ba50fc7295.zip |
app-portage/portage-utils-0.62-r1 +updated qtail and qportage
Diffstat (limited to 'app-portage')
-rw-r--r-- | app-portage/portage-utils/Manifest | 2 | ||||
-rw-r--r-- | app-portage/portage-utils/files/qlop-stdin.patch | 41 | ||||
-rwxr-xr-x | app-portage/portage-utils/files/qportage | 9 | ||||
-rwxr-xr-x | app-portage/portage-utils/files/qtail | 6 | ||||
-rw-r--r-- | app-portage/portage-utils/portage-utils-0.62-r1.ebuild (renamed from app-portage/portage-utils/portage-utils-0.60-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.000000000 +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.000000000 +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.000000000 +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.000000000 +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 portage-utils-0.60/qlop.c buf = NULL; while ((linelen = getline(&buf, &buflen, fp)) != -1) { -@@ -300,7 +318,7 @@ show_emerge_history(char listflag, int a +@@ -309,7 +327,7 @@ show_emerge_history(int listflag, array_ } free(buf); @@ -103,7 +96,7 @@ diff -pruN portage-utils-0.60.orig/qlop.c portage-utils-0.60/qlop.c } /* The format of the sync log has changed over time. -@@ -330,10 +348,7 @@ show_sync_history(const char *logfile) +@@ -339,10 +357,7 @@ show_sync_history(const char *logfile) char *buf, *p; time_t t; @@ -115,7 +108,7 @@ diff -pruN portage-utils-0.60.orig/qlop.c portage-utils-0.60/qlop.c buf = NULL; /* Just find the finish lines. */ -@@ -366,7 +381,7 @@ show_sync_history(const char *logfile) +@@ -375,7 +390,7 @@ show_sync_history(const char *logfile) } free(buf); diff --git a/app-portage/portage-utils/files/qportage b/app-portage/portage-utils/files/qportage index 7bc474a..11a6c9e 100755 --- a/app-portage/portage-utils/files/qportage +++ b/app-portage/portage-utils/files/qportage @@ -1,13 +1,14 @@ #!/bin/bash # -# (C) 2013+ Jan Psota +# (C) 2013-2016+ Jan Psota # # qportage - query portage version -# version 2013-02-09 +# version 2016-02-23 first release 2013-02-09 # . /etc/portage/make.conf || exit 1 -read s d < $PORTDIR/metadata/timestamp.x -let r=`date +%s`-$s r=r/60/60 +pd=$(LC_ALL=C date +%s -d "$(cat $PORTDIR/metadata/timestamp.chk)") +(( r=($(date +%s)-pd)/60/60 )) + printf "\E[1;%dmportage is %d hours old\E[0m\n" $(( r >= 24 ? 31 : 32 )) $r exit $(( r >= 24 )) diff --git a/app-portage/portage-utils/files/qtail b/app-portage/portage-utils/files/qtail index bba572f..0ec7f2c 100755 --- a/app-portage/portage-utils/files/qtail +++ b/app-portage/portage-utils/files/qtail @@ -1,9 +1,9 @@ #!/bin/bash # -# (C) 2010, 2011, 2012+ Jan Psota +# (C) 2010-2016+ Jan Psota # # qtail -# releases: 2010-09-30, 2011-03-29, 2012-09-17, 2012-10-18 +# version 2016-02-23 first release 2010-09-30 # type qlop > /dev/null || exit 1 @@ -15,7 +15,7 @@ usage() { exit $ret } -let f=0 n=0 +(( f=0, n=0 )) case $1 in -h) usage ;; -f) (( $# == 1 )) || usage "in follow mode no other arguments are allowed" diff --git a/app-portage/portage-utils/portage-utils-0.60-r1.ebuild b/app-portage/portage-utils/portage-utils-0.62-r1.ebuild index d81fb6b..01af7b2 100644 --- a/app-portage/portage-utils/portage-utils-0.60-r1.ebuild +++ b/app-portage/portage-utils/portage-utils-0.62-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz LICENSE="GPL-2" SLOT="0" -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" +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" IUSE="nls static" RDEPEND="dev-libs/iniparser:0" |