portage-utils/portage-utils-0.60 with qtail and qportage

5 files changed, 21 insertions, 80 deletions

diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 016789a..66e194e 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1 +1 @@
-DIST portage-utils-0.56.tar.xz 513832 SHA256 4df7323fb2667dd9bcee0f2d169c01ed8600aa6196118e6cd3a10cfe99852bbf SHA512 f2136a7df4cd91499b135fbf000f81a71177d5a39b4da2db484ab0f9492d152eaa72a5fee0e56d4b58611462e251905e554f5e41890a749f05d19e50c16c77b6 WHIRLPOOL af0a96ca3bf2dd39335317829aa8aff110a63042c415368400977e974cc21163da7eb76f7d53fcd05e133fd8a8568255ba022a32f1b174bda0dcb15b5f1476b9
+DIST portage-utils-0.60.tar.xz 519424 SHA256 d5e4a7384321d21d0aa484fcd30768dbce557e9c97a98cd2723d3eb75b82f503 SHA512 80355b31d49ac0f47c0a05071584608bd5fc0b8a98ab9025cb0a3bc8c18e318fbc60ff33e6834cd4f0ad159c2eb7f63d0d9cb61d4c86cee473215670ebba5694 WHIRLPOOL ec6d2bc1b164a7baff83019455de91483a98401f052153e152cef3733d041e71ca2f4333c9281aa593ee962d0e42b2d4f72f0d04e13982cbb25518f3bd5ca66d
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
deleted file mode 100644
index 5b493b6..0000000
--- a/app-portage/portage-utils/files/portage-utils-0.56-qcheck-tz.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 359fe5097ca531291a2cbb878dc6940351a7a358 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 11 Jun 2015 09:51:22 +0000
-Subject: [PATCH] tests: qcheck: fix timezone handling
-
-Make sure the stamps are pinned to UTC rather than using the active TZ.
-
-URL: https://bugs.gentoo.org/551718
-Reported-by: Jeroen Roovers <jer@gentoo.org>
----
- tests/qcheck/dotest | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/qcheck/dotest b/tests/qcheck/dotest
-index 965a5b5..9122321 100755
---- a/tests/qcheck/dotest
-+++ b/tests/qcheck/dotest
-@@ -10,8 +10,8 @@ export Q_VDB=/
- # This is the "valid" mtime the test packages have hardcoded in the CONTENTS
- # files.  The stamp is the CONTENTS while the touch date is the corresponding
- # unpacked date.
--STAMP=1398954900 DATE=201405011035
--find "${ROOT}" -exec touch -h -t "${DATE}" {} +
-+STAMP=1398954900 DATE='2014-05-01T14:35:00Z'
-+find "${ROOT}" -exec touch -h -d "${DATE}" {} +
- 
- mktmpdir
- 
--- 
-2.4.1
-
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
deleted file mode 100644
index d812daa..0000000
--- a/app-portage/portage-utils/files/portage-utils-0.56-qlop-tz.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 286688cb68c9989f697203ca779b08fad23366db Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 12 Jun 2015 05:05:41 -0400
-Subject: [PATCH] tests: force TZ to UTC for everyone
-
-This should make test outputs more stable across systems.
-
-URL: https://bugs.gentoo.org/551806
-Reported-by: Nikoli <nikoli@gmx.us>
----
- tests/init.sh          | 2 ++
- tests/qlop/list01.good | 4 ++--
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/tests/init.sh b/tests/init.sh
-index b3f634e..11fd379 100644
---- a/tests/init.sh
-+++ b/tests/init.sh
-@@ -33,6 +33,8 @@ setup_env
- unset ROOT PORTAGE_CONFIGROOT PORTAGE_QUIET
- # but make sure we don't implicitly rely on user's setup
- export PORTAGE_CONFIGROOT="${ab}/not/a/real/path"
-+# Always use UTC for timestamps to keep tests stable. #551806
-+export TZ='UTC 0'
- 
- q -i -q
- 
-diff --git a/tests/qlop/list01.good b/tests/qlop/list01.good
-index 458c751..fc8683c 100644
---- a/tests/qlop/list01.good
-+++ b/tests/qlop/list01.good
-@@ -1,2 +1,2 @@
--Thu Jan 27 00:42:17 2005 >>> rsync://192.168.0.5/gentoo-portage
--Sat May 16 04:21:00 2015 >>> gentoo
-+Thu Jan 27 05:42:17 2005 >>> rsync://192.168.0.5/gentoo-portage
-+Sat May 16 08:21:00 2015 >>> gentoo
--- 
-2.4.1
-
diff --git a/app-portage/portage-utils/files/qlop-stdin.patch b/app-portage/portage-utils/files/qlop-stdin.patch
index d5084b2..f592dd0 100644
--- a/app-portage/portage-utils/files/qlop-stdin.patch
+++ b/app-portage/portage-utils/files/qlop-stdin.patch
@@ -1,6 +1,19 @@
-diff -pruN portage-utils-0.55.orig/qlop.c portage-utils-0.55/qlop.c
---- portage-utils-0.55.orig/qlop.c	2015-05-19 19:34:38.000000000 +0200
-+++ portage-utils-0.55/qlop.c	2015-05-24 09:09:09.621302163 +0200
+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)
+ 
+ 	if (fstat(fileno(stdout), &st) != -1)
+ 		if (!isatty(fileno(stdout)))
+-			no_colors();
++			if (S_ISFIFO(st.st_mode) == 0)
++				no_colors();
+ 	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
 @@ -48,7 +48,7 @@ static const char * const qlop_opts_help
  	"Show unmerge history",
  	"Show sync history",
@@ -80,8 +93,8 @@ diff -pruN portage-utils-0.55.orig/qlop.c portage-utils-0.55/qlop.c
 +	fp = qfopen(logfile);
  
  	buf = NULL;
- 	while (getline(&buf, &buflen, fp) != -1) {
-@@ -301,7 +319,7 @@ show_emerge_history(char listflag, int a
+ 	while ((linelen = getline(&buf, &buflen, fp)) != -1) {
+@@ -300,7 +318,7 @@ show_emerge_history(char listflag, int a
  	}
  
  	free(buf);
@@ -90,7 +103,7 @@ diff -pruN portage-utils-0.55.orig/qlop.c portage-utils-0.55/qlop.c
  }
  
  /* The format of the sync log has changed over time.
-@@ -331,10 +349,7 @@ show_sync_history(const char *logfile)
+@@ -330,10 +348,7 @@ show_sync_history(const char *logfile)
  	char *buf, *p;
  	time_t t;
  
@@ -102,7 +115,7 @@ diff -pruN portage-utils-0.55.orig/qlop.c portage-utils-0.55/qlop.c
  
  	buf = NULL;
  	/* Just find the finish lines. */
-@@ -369,7 +384,7 @@ show_sync_history(const char *logfile)
+@@ -366,7 +381,7 @@ show_sync_history(const char *logfile)
  	}
  
  	free(buf);
diff --git a/app-portage/portage-utils/portage-utils-0.56-r1.ebuild b/app-portage/portage-utils/portage-utils-0.60-r1.ebuild
index 92e4a1d..d81fb6b 100644
--- a/app-portage/portage-utils/portage-utils-0.56-r1.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.60-r1.ebuild
@@ -22,8 +22,6 @@ DEPEND="${RDEPEND}
 	static? ( dev-libs/iniparser:0[static-libs] )"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-qcheck-tz.patch #551718
-	epatch "${FILESDIR}"/${P}-qlop-tz.patch #551806
 	epatch "${FILESDIR}/qlop-stdin.patch"
 	epatch_user
 }