summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2015-04-14 22:22:10 +0000
committerMichał Górny <mgorny@gentoo.org>2015-04-14 22:22:10 +0000
commita29a7730a05535036fef46c5531b5010c3c9e26c (patch)
tree852b39fd505be0ec3ee4d0779693e515ac7b5887 /xfce-base/xfce4-panel
parentMark m68k/s390/sh stable. (diff)
downloadhistorical-a29a7730a05535036fef46c5531b5010c3c9e26c.tar.gz
historical-a29a7730a05535036fef46c5531b5010c3c9e26c.tar.bz2
historical-a29a7730a05535036fef46c5531b5010c3c9e26c.zip
Add a blocker against broken timezone-data versions, fixes deadlock bug #538484
Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xEFB4464E!
Diffstat (limited to 'xfce-base/xfce4-panel')
-rw-r--r--xfce-base/xfce4-panel/ChangeLog6
-rw-r--r--xfce-base/xfce4-panel/Manifest32
-rw-r--r--xfce-base/xfce4-panel/xfce4-panel-4.12.0.ebuild7
3 files changed, 26 insertions, 19 deletions
diff --git a/xfce-base/xfce4-panel/ChangeLog b/xfce-base/xfce4-panel/ChangeLog
index b7053c6ef87a..89438b6bd3a3 100644
--- a/xfce-base/xfce4-panel/ChangeLog
+++ b/xfce-base/xfce4-panel/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for xfce-base/xfce4-panel
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/ChangeLog,v 1.255 2015/03/08 15:06:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/ChangeLog,v 1.256 2015/04/14 22:22:08 mgorny Exp $
+
+ 14 Apr 2015; Michał Górny <mgorny@gentoo.org> xfce4-panel-4.12.0.ebuild:
+ Add a blocker against broken timezone-data versions, fixes deadlock bug
+ #538484
*xfce4-panel-4.12.0 (08 Mar 2015)
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index 702993dd473f..9f50959ac10b 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -8,25 +8,25 @@ DIST xfce4-panel-4.12.0.tar.bz2 1107470 SHA256 30920fc2e2fc26279a82b5261a155c2cc
EBUILD xfce4-panel-4.10.1.ebuild 1154 SHA256 24d410b64acc96e3282274b2abe107da381e8bbd55c36726ba98ef060d63a56c SHA512 4c205a2a025c71b8f33657d67f259ef06dac47f23611206654e21b159c89fb7a2fb2a47dc4cf594167b412e91f1cc8be848ac2c7df34f604c1a4dd44e8360316 WHIRLPOOL 328940050cf91fb999f19496d058fe9f0f8b5a20de06470a62c292396967cb09e2d4aa99bab562437cc164e531043a801adc6e04e8ae672b34f714fbc0960a37
EBUILD xfce4-panel-4.11.0.ebuild 1207 SHA256 91718e1b905a0dd09aa510a8a0fbd83a3d252be43a60f2b7b2593b3abb7c6207 SHA512 16e15357cd54d266523289ecd7085c0a2dec9a41784000e32116c2232808d70a940115cd78bd9b3538e235994bdf2bfcd5712884df61b7c3e9ff0cb601ef04ee WHIRLPOOL 1043ecbe6819519f22688e1676f57b310ef52773a5939860d3ef0e0e63ecb88a01e28ae118099d4f59d7dd65ee05679ef4f21b494d68852035dd469870ac70a4
EBUILD xfce4-panel-4.11.1.ebuild 1209 SHA256 1bf924fb74aedb62ab11792dc372bf8f14416253f4786443ad68e6b1615fff41 SHA512 8e5d3cbf64ab3f9a62b66d223d074929d5c9261017de09c93eaf710a554bd2c6014c786b8d10c6b8e4a176e7bdcd4b3ac9ffbeaa4d3f1aa5e4abfbbc137d2e6e WHIRLPOOL cd64a53bd1326a921ac0ed698517d59248bc1481beb473d5341746b82976894492c4cb704f88a5268f26a01a483b598db3fec621208e409c7655c90daeaeca26
-EBUILD xfce4-panel-4.12.0.ebuild 1211 SHA256 6fce259f943c5be4eda64af2327c586cae90cf1653a9257dd1f3a5c58bfc7aba SHA512 2fce2b78ae24bd594e2bb907ffeda8af67ed3786aa3b5c344eb5911021f66bdc7c5c8581b72767d8097b22bfe261f46766a8daedd1c459d59a39c6b8b0b4506d WHIRLPOOL eadfd764e79176745d26fcc7d7949f0426011c6d040d6ddb09ce60467e9cc1a9588fd346742c444c3182535b4fdaf6b8f6cdd84e0453feff048ea4283a7608eb
-MISC ChangeLog 31847 SHA256 4467eedc3aa7567bc6004bd0cdc5a37ae1982ecf28c57260d413dfb0556310bd SHA512 e2beca0796e278f88d8dbf680aaae91e77f73436b58e1d2f0c5df79bf034e35f4f6cfebb718625b40d68ddbdae7376a5e98a748ed345ca10cadf3570aa526034 WHIRLPOOL 410e4f556150eb0c124e6d00db6b63a491ed4805a7809e3d3ada63dcec41a4f514818fa3fed4929ecfd32b71649f98865a0e3f1d5631d6aa5b0947f388fe71bf
+EBUILD xfce4-panel-4.12.0.ebuild 1339 SHA256 70db68df1647766c2612f3bb5214bd2339ffb6f885ed41bbca5d4455a16dc274 SHA512 544d523fc9cceb3976c898c3c26d1940c795595bce7cdbde85eb272f76dfbd8697f934bfeb1da0cc1569b6b565ff660d9c35d86c165d0f738b692052aae0e0c2 WHIRLPOOL caaa1e424e99564b7689a6b4dd31596540412cd42c4f7dbb5841dcf3bf0704707e19c669b4c4e0b9b1b40f25c3e368cb07a6e90e65f6af7c0982d13685e2df34
+MISC ChangeLog 32009 SHA256 05993f4ba8cf537d9e3a29208c30e0b27c54d138b61443de953dbff44beddcdc SHA512 8f9f218cfba98865748dbfe300f36725767451782d296eb52f6e486ba364182179749d3f8ff29d86dc3c91736cafaa8449cd0a3c0174f9b4ecfb8a18aedbd738 WHIRLPOOL f672a2e7dd0a9222df1f2c984a3015a882341d4df0c5b0a1a7fe152b305b1637d40ed476d7d08dfc3c971c872f3f792735288eee74c1f5f15e1708f013f62922
MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQJ8BAEBCABmBQJU/GWIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVLZMSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO5csP/3qo6khWEue4VpE61SZuw3NR
-/hAQhxStAnHXH+kijCJFTcmGFp25dzUqxlLjGJtDPOBcq8SADUJRDtSqNFo8MTBC
-PjZPrTOxS9dFvA7Dyi6nHlKe7n/lOh6r9LGnohE8DZQF9NRgSUOLBF7LgfgRXkPn
-DvlFso2ws4i8K2SqFP9o4+kOgzjUVLYYQEiXiSdUMvVdwuBOwfJEVzwHa8722uiU
-/UwekFx5KtTYOhc4dZTrtA9gpTMi1hAkzyLACMzBhebjETI4+M51h3dGhCi1BNNx
-V/ne208bVBE5rXYHMDT0xg+EHfN/+yBs24e105Ddve/ITa+DOQFMfFiFJZYP5TgN
-dLoiIS2miWqMsr8ZGElzCEE4MyYeuKf1YrerZo1kovDOgvI2t00kmWiG+nziQkDk
-onFJAjXAzVujlyqhfmsZnYjjk6xwyrFfHlJwqSIUIz26cNj2/m2txJ/ZftXNsMcO
-N/YpVdgXAA5FrwkmT5TP28FoA1aC3gHLVVcdKEQAK2m4TD1fZbuL+Ju/Hh60jvL4
-2j+kQ5SalOQLWPLrdPMRsxUQlcRgSnZiX7loPYzlRtoTtaaDMx6jtNv4/7m2nx9n
-aHuQbne4bjC5gazGQl/xlXPZLOpPDoD/NO0qt0cIyW1wBMx2zJ6DdmalF1/a+8vu
-/KLiYh5nAmPykSumGFBW
-=ujI4
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO6iIP/AycxoUOUGZsAZgQsXTEoiFl
+TgeGHDttVRUU4iFbnbURjG4Jpv/diq1vTR1YX5L6mFxx2xFNnvxwFDJGy1jdGR1c
++CcmpYaySH7KAPrNqRTBsptkb7UL1H3GoixqoGLlMijDWK/vqpJhGo4H2B7zJ6IM
+4/Msvbpso+PbJ1BbVAZ1fffF2t296ShdVh7lJbh6lT8C6vILhfSVeSr07s1Xk6Ps
+x3kBQ02S991GKr7JkBvRT4OF200HFLQndSikzrVDq+6PV+js10rd5sQawIZw6Bku
+xLZRi5TKDODvd4tZCPSgIMCR0mcaj0YNUQOoxOFNs88RTsWJsNT3lNYOW/4nofla
+4C0MLittVpLJj7/6YIxQUfSpv8hV84n3JOVZnruSatlo/rKywq+HE+EaYaJwDoNC
+4kMGsLDur+OpRnqbTXxVq8XHo9rfArtaQp0iaTZJnVz2EsSdV0NUwAAjAsM83Lhl
+vicyX7KL8ApRr1clAc9BJDoCXHT4FvRGNrgb3Sm6J6UzsABLKoj7mq1cZS7m0CW8
+64X9Ah58RFI8EuuG8/12n35NGT0Eb2G9Aj0JiQgLZ6zUW8+x9qy4DRj9nLs878OH
+6XjsZnnwtYYkGGT3dKDTI1ryzxEeKHpH36DkcL91z9XX+rZ+czKundqtmg2TATfs
+LCa3nN8y8Hdub3Kge1H/
+=Q8hY
-----END PGP SIGNATURE-----
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.12.0.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.12.0.ebuild
index cb5d5504aaa5..912c25b0fc14 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.12.0.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.12.0.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/xfce-base/xfce4-panel/xfce4-panel-4.12.0.ebuild,v 1.1 2015/03/08 15:06:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/xfce4-panel-4.12.0.ebuild,v 1.2 2015/04/14 22:22:08 mgorny Exp $
EAPI=5
inherit xfconf
@@ -14,6 +14,8 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="debug"
+# block timezone-data versions with posix symlink since they cause
+# dead loop, bug #538484
RDEPEND=">=dev-libs/dbus-glib-0.100
>=dev-libs/glib-2.24
>=x11-libs/cairo-1
@@ -25,7 +27,8 @@ RDEPEND=">=dev-libs/dbus-glib-0.100
>=xfce-base/garcon-0.3
>=xfce-base/libxfce4ui-4.11
>=xfce-base/libxfce4util-4.11
- >=xfce-base/xfconf-4.10"
+ >=xfce-base/xfconf-4.10
+ !!<sys-libs/timezone-data-2015c-r1"
DEPEND="${RDEPEND}
dev-lang/perl
dev-util/intltool