Add fix for qlop tests #551806 by Nikoli.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

3 files changed, 46 insertions, 2 deletions

diff --git a/app-portage/portage-utils/ChangeLog b/app-portage/portage-utils/ChangeLog
index eaf6dde19b42..dcf563651342 100644
--- a/app-portage/portage-utils/ChangeLog
+++ b/app-portage/portage-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-portage/portage-utils
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/portage-utils/ChangeLog,v 1.169 2015/06/12 04:53:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portage-utils/ChangeLog,v 1.170 2015/06/12 09:12:44 vapier Exp $
+
+  12 Jun 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/portage-utils-0.56-qlop-tz.patch, portage-utils-0.56.ebuild:
+  Add fix for qlop tests #551806 by Nikoli.
 
   12 Jun 2015; Jeroen Roovers <jer@gentoo.org> portage-utils-0.56.ebuild:
   Stable for HPPA (bug #551682).
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
new file mode 100644
index 000000000000..d812daa574bc
--- /dev/null
+++ b/app-portage/portage-utils/files/portage-utils-0.56-qlop-tz.patch
@@ -0,0 +1,39 @@
+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/portage-utils-0.56.ebuild b/app-portage/portage-utils/portage-utils-0.56.ebuild
index ccff2a43f071..04afd921e666 100644
--- a/app-portage/portage-utils/portage-utils-0.56.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.56.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/portage-utils/portage-utils-0.56.ebuild,v 1.8 2015/06/12 04:53:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portage-utils/portage-utils-0.56.ebuild,v 1.9 2015/06/12 09:12:44 vapier Exp $
 
 EAPI="4"
 
@@ -22,6 +22,7 @@ RDEPEND="!static? ( dev-libs/iniparser )"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-qcheck-tz.patch #551718
+	epatch "${FILESDIR}"/${P}-qlop-tz.patch #551806
 	epatch_user
 }