diff options
author | Michał Górny <mgorny@gentoo.org> | 2015-04-14 22:22:08 +0000 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2015-04-14 22:22:08 +0000 |
commit | 9d159c8ba1770868e80a38fdb2887ea039c24bed (patch) | |
tree | 0dba59a16bba5ddd61993c8b75d25e500d48772e /xfce-base | |
parent | Mark m68k/s390/sh stable. (diff) | |
download | gentoo-2-9d159c8ba1770868e80a38fdb2887ea039c24bed.tar.gz gentoo-2-9d159c8ba1770868e80a38fdb2887ea039c24bed.tar.bz2 gentoo-2-9d159c8ba1770868e80a38fdb2887ea039c24bed.zip |
Add a blocker against broken timezone-data versions, fixes deadlock bug #538484
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'xfce-base')
-rw-r--r-- | xfce-base/xfce4-panel/ChangeLog | 6 | ||||
-rw-r--r-- | xfce-base/xfce4-panel/xfce4-panel-4.12.0.ebuild | 7 |
2 files changed, 10 insertions, 3 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/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 |