Add fix for qlop tests #551806 by Nikoli.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 62 insertions, 7 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/Manifest b/app-portage/portage-utils/Manifest
index 7f602d57df14..b0cc98f997df 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX portage-utils-0.10-x86-test.patch 553 SHA256 261c0637cde745f8a063be7e6e79e21a17dc7844abf82a48ae1e3102327530ee SHA512 b2530913c327a067b97c259e9f310b507cb06dc0c7484ac942ee380b1f0cb46389e47266d719ce08e4584b77923b14257ad482d64498fc29f4c6c5b2013985b1 WHIRLPOOL 5b00984d5bcee654b0f3294af6e0b182ca4ff3b8d9c20540642018c920d4b22f42f8d97302317e88aa6f3a4fabc9e758a104d1107ff7e1520daecb0dd6007ccd
 AUX portage-utils-0.41-scandirat.patch 884 SHA256 c1d97cf76e7f3f37ea850433f35eaa4067fcbb48e2fb14384104c8a49cc68825 SHA512 30f6070432e8a865dabe0eb3dfb42dd5bc598ddb0bee3defea88065841d47f74d9520b65e47bb6a0b235bffb546b5e897387afa2bcff3ca55c514589e2327a4a WHIRLPOOL 64cc00d3485799936fe5b0469c4d67247605cd8eb945694e295ce2a16839fa3468e57ecc17f61443f8c75257db4078e9354cde44a851f8ceec854ccdbcd3ae80
 AUX portage-utils-0.56-qcheck-tz.patch 993 SHA256 429deaef1284dfdb0ef52ff03d2d2e3f08ad56845272e74207959bb08c858de4 SHA512 9ee4a32017ee66f6d3626bb0ded9f087f57c4b8f39b7394856ab134479d39641d887acb67caf62d6145e32b139fde8cbf13fb873723dc297793c9784a0684b9b WHIRLPOOL 69ce056492a7a0e0f95456dc964cc5391fcfad7b911ab809187663f572c9b74779024ee07808d8e4be4597492f084fa157245599762ff0daa333fad056f36d4a
+AUX portage-utils-0.56-qlop-tz.patch 1224 SHA256 6ea5d23e695de6d419b165d63441f5e777be0f06a72d34304f1f064e2b9b0c75 SHA512 0bd1308811a9dfc4a9922f00fb2579c6739a736cacf00f44d76c2a1e159a484572e7d15c00c6dea12ca03f77c58337226d1b08cfce783025628a6e337441fcc6 WHIRLPOOL e833797c6eb308039789ac2a5761dea932d7d100ca81e07db35769c507dc38a56660c92f1c8483709668da98de4a3e0c4fd3372d2edb7d3e9c5f842bbb17758e
 AUX post_sync 190 SHA256 73560378a5ef2bc39ced8f954f3d371f89d04fa45301f6e6471262caff03d5bf SHA512 0153d2931c2d2a0f03e74f75dadc14d115c0d0e50cbc43e17c1b05a6a406b4bf47435bd32d1b2f559ce6a576e24a30dcf47e8ea6d346371553560ceb055b4429 WHIRLPOOL 747a31cb3d31c242f4272940cdba19c62b0b4a60e93f5c8fa558325c8733c74cf1494d53e6b8b931a60d3529bb75fb043f210d98238f37b0f19857a612927b78
 AUX q-reinitialize 68 SHA256 e7aa83822c78d89d128d10e61ff30f529ea5af3c3b9b4395db6c213675b11e3b SHA512 d322fc0e3fd82583e9cfc6ffa95636134e4491e63fc1a1f34dcda58a1749c3ebcda97caee47bea4f44fb056c35c97e30819dd22e5c2ed8c936e0863466ebf6ae WHIRLPOOL 95f691370916fb749c67dffc176a0a1fef75f4eb5c21e0ff0d06e825ebe204cd7cf3412e26d4f4a204b166a882819379442203235a0cc0110a21d11311a0afd3
 DIST portage-utils-0.10.tar.xz 381996 SHA256 da4109b27dc2a791874022e56763a7563708f77de3c3da709b27b8cb74982f8a SHA512 a7caa280d459e1d774e1865c59a01825763f63c1d4efa9da55ca710571149a561bb5fe7cb95ab97d2f74d044d6cc140c18ce7c812b62ebc48f785e65883d812f WHIRLPOOL 06b7c5e3ae9454cd20f3a611564b10afa630d8c332f66ebb3789a6d64ca3e5ba3d5953375c715d94fd7f1add27bce8f4f38a211171ce5b8c0001f70e696a7304
@@ -42,16 +43,26 @@ EBUILD portage-utils-0.52.ebuild 2371 SHA256 286e5d18e459557137c90ddd605e61fc966
 EBUILD portage-utils-0.53.ebuild 2362 SHA256 0611dbaed499534a5dd32df9f3fa56b200ae0f50f530302f56eea663451b56f8 SHA512 b54d5fdd23082321358fe35b6bbaaef267fcf0a674ab0fca591bcef59a1b4b006b31b700665f594eeb028d9753e165f28a61964e48301a287ce42c21726d0944 WHIRLPOOL 61a68d3b2c30eea5fc7ca7cc0dce2e73e56801ac1585ade39d01f0461d9ca0cb65acf7100b0ebee563fff9808fa45bdf5abd9c6bb4652285bc2cb9141c03a6de
 EBUILD portage-utils-0.54.ebuild 2375 SHA256 1876cbdb2fd4319ab18d91331712c8a9e0f2afb0030e0b11672805f2ce3fe3c4 SHA512 ebe2892045a93af7c2edf05718d82f76fc69680e5f8815a32d58d56406e05fbfae20fcd02b0efc4caab303c5487876cdcdb79d62824bde274025d6459f243682 WHIRLPOOL 756753c4d13b2632a78396b2049801574e52b976a68f1d78a819e66bbcd4b475456df29265e22c42c2dafc6ee58717889b038af3df35c8ca6cd4b66a3afc5e2b
 EBUILD portage-utils-0.55.ebuild 2375 SHA256 a915024112746f7974ef7eec18513f45adb7c839d44c44a3bf1d7f5cd3ba6017 SHA512 65b770d6268802032d8e908138bfdf7031c654eaaf170ffc9eafcefb706e78c8ce6bfadba3c47d695e9ca75ea5ce1ef515902d6fa0b1e5a72178dd0bb5e647d3 WHIRLPOOL 7a60fd350be9a2da540284e89b3be932dda479609c46b6ff4334990aca5b02f837da4df92d65e197b0c4c288bcaa122b5961f4d6de2fabc7d765a8fffe6bdf5c
-EBUILD portage-utils-0.56.ebuild 2488 SHA256 0870bd80b155ee051e1da23af2737c1be3d43c4a852d8bed34afbdd8c808c4d8 SHA512 1a195598050c77202977d4424565c3e3f4f3c1b12cc073893c255acc75442432a23c2eee9dd2d5b34715d9b3d55668f21baaf032b2829da9eb97eb0e844bd9b0 WHIRLPOOL 987b6e0a775f1495166824dc053808ce748ef2862b5c72cdfbda7357054dd9c42581475511abb5d523f98708164c3e548d601910de7c78fa805069d7d42f71ac
+EBUILD portage-utils-0.56.ebuild 2540 SHA256 4960df7c130a0ad5a59660b06229c0415507c2a2f982304714f5af182018ddec SHA512 a48d933d147d2c241849229829d87da46a2c338c21b72dd83fba47443f72f128f412663823b91c008898ef2051040ba4f10856e31c7cfe354b44c040e4a3b2f3 WHIRLPOOL e72eb4a8932686bfdadb7cb81596095b33452afa55d7afd343ef797754c776a5a864244b5c10520309994791fdb5fdbd4afdf6474da109aec73f73afcd6bf767
 EBUILD portage-utils-0.6.ebuild 1502 SHA256 fe9a27076d60f3a80f641eade35d70c75327273c469a80f7fb7347ad0127e0ad SHA512 d466387e0dd461cf0f2a7c9a2d28b1e0eccd006a7bb6c52ffcd6d3a7a04aaa84767aaea0d96db03a9fb4fa96266d24ce80331ebe33035f383940c8091f66a702 WHIRLPOOL 616961a53c4b99704082e185b2214231def1ff8da3661a59f99b05f9e636e8f638acaf380a62a33b172cfc29cbc3d0b115bf98945a752dd55622d40e6e1d2f30
 EBUILD portage-utils-0.8.ebuild 1672 SHA256 7635064e89509a266cffd91c30742e36cdb9c63c6e85539860241ca49db30397 SHA512 b5b83e9c98a9cccb5a6944f9304230e0d63e7a0db6198a00499b61f143f59c8c3f1e802c625971447489cf2adeebb05c186678243198abaaab225d47d03d1a39 WHIRLPOOL 8096715ce8c2dfcd6ae4ad62f5752f08e49ad340ac8a41c8dab55d56e5d48c77c820eac734aa34da19a2100b745ccbf38d77a936993567df63040a106849c981
 EBUILD portage-utils-0.9.ebuild 2171 SHA256 f2ccf0cf70c3f02ec5764a75432a60c46c91a99263b830235e61c6b50d7a15cd SHA512 5cf29872ebb8498714e73aa87a4ee75fa48064227c9136ee4744cb667df1d95b97593b975f0c088cdeba0b7fe2a64a6af43dfb495d7ac7767e5e6ee1eabd0fee WHIRLPOOL dc681da3922f4bce8517cd98312cdc2a7bc6c5f9151ad30bebf3287ab3d88d275d7d241e964250fa77184d7e93d5a7be3c6a762b7c8e94f61248b2861dcb0a58
-MISC ChangeLog 28701 SHA256 b032710195bb875728490da00c834d36666dc156a873b93a66fe1031a4855031 SHA512 568df80a3b4623a7e87808eb9884a58728445bcf2a1243089b05bfb65104b0e588f1b35f369d8aa38b63ebaed140ca3b9850cc9cbcaf9d22131ba9104efa9745 WHIRLPOOL ba28e8e7bc2a17f0b887ba350edf65cff56f16230085362e31ce62401ffebf2996d88b9c130da5920884231259ac12024dc1bf3f3ea4dda8a5354ffd60dde3a3
+MISC ChangeLog 28869 SHA256 113db47f049783525d4e5d92e461968a4de072101f619afa93e4622f12f3f19e SHA512 94dabb20075a7294eec6b3efc1e2d0e3de6d324f223f9adb891d26088d44d7c827de2656a57296be1568774c2046f672a3129df12279c6ab75ca5934b3e99fd3 WHIRLPOOL d4f13e6a600ae068f0beaf1330e36a5e4018b1328ec81ae5d24f9065ba1b0e532548b8350b7faa96a895c00223e4b515b5feef5eb1ccde908b4d11e09ef892a3
 MISC metadata.xml 207 SHA256 7e42d8d20b999858f3b4dc74e47877952491faecaa3674f4dd54b5d0c5045867 SHA512 42a980e5a2cde735b41dc5f0d225ae3377fde12bdff944fd9f57b8c11c9990e559b52eff81a686c83a6d03d3a1e6ff924b622b2631a46916ad47f9f6986c2951 WHIRLPOOL 0f0513644cd692a015cef3368825ee03e85c82ac0e8fc328911c3e2c05bbe200ebc63cafc2fee65c389d6b6774206486ca74a21d597a2975147948b50e220670
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlV6ZeIACgkQVWmRsqeSphP2vQCdFdIsCuhjnMXww2gd/Bj7X217
-BH4An36XSa+FNVu6wLta3vm4LodSAeuM
-=ccvV
+iQIcBAEBCAAGBQJVeqKNAAoJEPGu1DbS6WIAZX0P/2TPihQ1tsYB4PyRMjeumuvD
+YTbIr23paEdXI70kiD/6HEuxeCjrXE79Kv+99ZOS+YwHYfpIhNNQVMLlKVtUuiuK
+/iHzTIhG3FJikA7Rtb6v4xV3+2DrdcbOEiz2EpH7lblHA+x4i6mopWFZITvIT6Bi
+yVfsE6SyKLMF/KT9Ra00lV1XBddmob+b1RKHhx5JMJHSWtuscYH+4Jf+oLUQPORP
+XqQclhWL/Huy5faWf+fdyoSUHCpCm1eABAB4RCDqfjHWrIKOjcFySCS6Py//UevW
+2XImX04EOYrEXZ4WMBxDgST7FLCEn+XrPQw4hQjm8UyNuVHRhTBGLp2AEwxKby5S
++8l2yBWQw7ZbkPt1XpKXm+ykA+awIzEz9GAwYMEaTRK3kRVP2WdnUqbDLWZ9xAkY
+7XLXet43v0SepbsRPXvp17WIbEuibJvMaqRSOY9RXWKjXBafahoOS5ACuePHGxgM
+wwb9Z+lJ6ECLloBVztrdXUYSld/WIvc0mrMIKeC98Eks8hVnWDZ9d6kYl8S5Mr9y
+GhMnlA0fwUvE4uqm5qmtFNnwokx2P3FFTANF9hEi00ID2cJLadnuS3rYZc9IByyb
+WPqiraOT8g1cQzDVvPTBbDvu+MSjMjn34DegSb3gHHchOE+0rDSc2vBioXFw7GKn
+E5i2yxE4D7oV2nAdSked
+=8qgv
 -----END PGP SIGNATURE-----
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
 }