summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-03-31 05:28:24 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-03-31 05:28:24 +0000
commitbae34934e8fb94daa697754682a2de1a1a0a7910 (patch)
tree9f45676c860b28622bbd83554445f1f759790b48 /xfce-base
parentDrop in a blocker left out from yesterdays bump (diff)
downloadgentoo-2-bae34934e8fb94daa697754682a2de1a1a0a7910.tar.gz
gentoo-2-bae34934e8fb94daa697754682a2de1a1a0a7910.tar.bz2
gentoo-2-bae34934e8fb94daa697754682a2de1a1a0a7910.zip
Temporarily let xfce-base/libxfce4ui >= 4.9 be a replacement for xfce-base/xfce-utils while waiting for 4.10 meta package.
(Portage version: 2.2.0_alpha96/cvs/Linux x86_64)
Diffstat (limited to 'xfce-base')
-rw-r--r--xfce-base/xfce4-meta/ChangeLog6
-rw-r--r--xfce-base/xfce4-meta/xfce4-meta-4.8.ebuild5
2 files changed, 8 insertions, 3 deletions
diff --git a/xfce-base/xfce4-meta/ChangeLog b/xfce-base/xfce4-meta/ChangeLog
index 8bc40c43e628..e6416a363291 100644
--- a/xfce-base/xfce4-meta/ChangeLog
+++ b/xfce-base/xfce4-meta/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for xfce-base/xfce4-meta
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-meta/ChangeLog,v 1.26 2012/02/20 21:00:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-meta/ChangeLog,v 1.27 2012/03/31 05:28:24 ssuominen Exp $
+
+ 31 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> xfce4-meta-4.8.ebuild:
+ Temporarily let xfce-base/libxfce4ui >= 4.9 be a replacement for
+ xfce-base/xfce-utils while waiting for 4.10 meta package.
22 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> xfce4-meta-4.8.ebuild:
Pull SLOT="0" of x11-themes/gtk-engines-xfce to get GTK+-2.x engine instead
diff --git a/xfce-base/xfce4-meta/xfce4-meta-4.8.ebuild b/xfce-base/xfce4-meta/xfce4-meta-4.8.ebuild
index ede56f0a1d39..b501b9b8dcae 100644
--- a/xfce-base/xfce4-meta/xfce4-meta-4.8.ebuild
+++ b/xfce-base/xfce4-meta/xfce4-meta-4.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-meta/xfce4-meta-4.8.ebuild,v 1.12 2012/02/20 21:00:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-meta/xfce4-meta-4.8.ebuild,v 1.13 2012/03/31 05:28:24 ssuominen Exp $
EAPI=4
@@ -13,10 +13,11 @@ SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
IUSE="minimal +session +svg"
+# Temporarily hacked to workaround xfce-utils blockers for development series.
RDEPEND="x11-themes/gtk-engines-xfce:0
>=xfce-base/xfce4-panel-4.8
>=xfce-base/xfwm4-4.8
- >=xfce-base/xfce-utils-4.8
+ || ( >=xfce-base/libxfce4ui-4.9 >=xfce-base/xfce-utils-4.8 )
>=xfce-base/xfdesktop-4.8
>=xfce-base/xfce4-settings-4.8
x11-themes/hicolor-icon-theme