diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2015-04-15 07:47:08 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2015-04-15 07:47:08 +0000 |
| commit | aea3d248e9db37ceff326039d26eb57d39192a7e (patch) | |
| tree | cfc5392bc62636b1a556ea5e3e76fe8dc380ce75 /xfce-base/xfce4-panel | |
| parent | Version bump. Add optional GTK+3 support. (diff) | |
| download | gentoo-2-aea3d248e9db37ceff326039d26eb57d39192a7e.tar.gz gentoo-2-aea3d248e9db37ceff326039d26eb57d39192a7e.tar.bz2 gentoo-2-aea3d248e9db37ceff326039d26eb57d39192a7e.zip | |
Revert timezone-data dep bump, the new version does not work either
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'xfce-base/xfce4-panel')
| -rw-r--r-- | xfce-base/xfce4-panel/ChangeLog | 5 | ||||
| -rw-r--r-- | xfce-base/xfce4-panel/xfce4-panel-4.12.0.ebuild | 7 |
2 files changed, 6 insertions, 6 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/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 |