Revert timezone-data dep bump, the new version does not work either

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 22 insertions, 22 deletions

diff --git a/xfce-base/xfce4-panel/ChangeLog b/xfce-base/xfce4-panel/ChangeLog
index 89438b6bd3a3..d9892cfc4d18 100644
--- a/xfce-base/xfce4-panel/ChangeLog
+++ b/xfce-base/xfce4-panel/ChangeLog
@@ -1,6 +1,9 @@
 # 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.256 2015/04/14 22:22:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/ChangeLog,v 1.257 2015/04/15 07:47:08 mgorny Exp $
+
+  15 Apr 2015; Michał Górny <mgorny@gentoo.org> xfce4-panel-4.12.0.ebuild:
+  Revert timezone-data dep bump, the new version does not work either
 
   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
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index 9f50959ac10b..d88e74d6f252 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 1339 SHA256 70db68df1647766c2612f3bb5214bd2339ffb6f885ed41bbca5d4455a16dc274 SHA512 544d523fc9cceb3976c898c3c26d1940c795595bce7cdbde85eb272f76dfbd8697f934bfeb1da0cc1569b6b565ff660d9c35d86c165d0f738b692052aae0e0c2 WHIRLPOOL caaa1e424e99564b7689a6b4dd31596540412cd42c4f7dbb5841dcf3bf0704707e19c669b4c4e0b9b1b40f25c3e368cb07a6e90e65f6af7c0982d13685e2df34
-MISC ChangeLog 32009 SHA256 05993f4ba8cf537d9e3a29208c30e0b27c54d138b61443de953dbff44beddcdc SHA512 8f9f218cfba98865748dbfe300f36725767451782d296eb52f6e486ba364182179749d3f8ff29d86dc3c91736cafaa8449cd0a3c0174f9b4ecfb8a18aedbd738 WHIRLPOOL f672a2e7dd0a9222df1f2c984a3015a882341d4df0c5b0a1a7fe152b305b1637d40ed476d7d08dfc3c971c872f3f792735288eee74c1f5f15e1708f013f62922
+EBUILD xfce4-panel-4.12.0.ebuild 1211 SHA256 988e1270db4edae3b07a3d8a2770a0c353ad821447252a27f902e45e04ee3342 SHA512 22d7e8e4102dbe75a346d79eafd4e96cf9de19cbc454c9cda4d449a6c903cc76bff8b0b1f2cdb74545eb6ba9a02397298d56beade86617a1d314dd3406727989 WHIRLPOOL 47bc08397f809389d2390fb72fd27bc2f8acdfdc47ad3df4e130d6f056ebbb87cc0b4bdbac0df21a6d246c9d503dcfd5e119adfcb7b3824d596b960c1de73ca8
+MISC ChangeLog 32157 SHA256 571dc3b2fdd69827b68656053c6d9b2ebf00124ecfd713db0def17b68b1a5835 SHA512 8b847836945048c0733a9329299b04224a5fc966739c2d7a57b1604fc5afbe4069c96c902518c2c226abb47a660600bb99f46973c67cfced613c59148449a88a WHIRLPOOL b5d777fa99cd0f4591b0906ed58414a01efc28e0dc3d2d3d628dfb6a4e1b1677c0ea0cf5cfdf5b5bf6fd5a01889df683fb08a367cf5c1776a8c1375791fc3034
 MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVLZMSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVLhd9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-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
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOeP4P/jI3494tEyLnLOV9HdaQ3Uq9
+7zu6L2lTHwx2eA+ikNrph/CHMuK+ruqwTLyWQ/YrvwJxqW0modZnomm9mjO9KJwp
+1vaMaHOReReh95KBc9DLZBN3mCRwFMS/+i5X1MgQpxoKl5BCuyRNYmliEifOGJiG
+6gQ+m5vuJY91KqT7ch0U7j4OUIj3mgNr1LxYq+QN7/UVT7oLZ2E1ZaIE/K/VbdU2
+ju1dEg77RRsYMGcypOyVSZweUA0O53ULj/cEL+mvVYg+dbLiqAtccoWDvxhgtex0
+CutVStRKsOKyH2+BnhDwGypnvb3aZkZ+cMyO43/wtAR/X7ATb+TGTTZ3U+Z10lg3
+AsuSYlF0uY12DxhG64HSFhoQb+Bd1iatDVqG729EQynK664afgDbl90DW9l8A13p
+8FK535BJtBLzRa3kCC4ZPMOBmb1e1P4jR5D+fc994v8/9m4NRDO0EJhn4hk1J+Mk
+sUZjYiM6v4i0IBhLxOKyC2RGzorMGiz8WAU77RfvvS/ikfdSraWBvAmlhwh+79TZ
+/nJfTu9beoHVc9ln+IcbLiwTToUDa6YJkcUai4odNZVFDn6HQCbtrLwgrfifPE++
+NwoItAiklN0dDMWczSTOuvEz+kP9wGuTaoiKPQkhpgL8j8N27pxQ7x471RxkT5Dh
+K18lF3YaEgDGfofmuKrM
+=xOGX
 -----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 912c25b0fc14..7a9dcbac145f 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.2 2015/04/14 22:22:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/xfce4-panel-4.12.0.ebuild,v 1.3 2015/04/15 07:47:08 mgorny Exp $
 
 EAPI=5
 inherit xfconf
@@ -14,8 +14,6 @@ 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
@@ -27,8 +25,7 @@ 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
-	!!<sys-libs/timezone-data-2015c-r1"
+	>=xfce-base/xfconf-4.10"
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	dev-util/intltool