summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-02-20 20:42:36 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-02-20 20:42:36 +0000
commit03a292d10a278577005d72410474aa7fc38b3ce8 (patch)
tree33ca383b10ee34820af4fed2dd2f2505ce77c97e /xfce-base/xfce4-meta
parentVersion bump to development series. (diff)
downloadgentoo-2-03a292d10a278577005d72410474aa7fc38b3ce8.tar.gz
gentoo-2-03a292d10a278577005d72410474aa7fc38b3ce8.tar.bz2
gentoo-2-03a292d10a278577005d72410474aa7fc38b3ce8.zip
Accept xfce-base/libxfce4ui since version 4.9.0 as xfce-utils replacement to avoid blockers.
(Portage version: 2.2.0_alpha88/cvs/Linux x86_64)
Diffstat (limited to 'xfce-base/xfce4-meta')
-rw-r--r--xfce-base/xfce4-meta/ChangeLog8
-rw-r--r--xfce-base/xfce4-meta/xfce4-meta-4.8.ebuild6
2 files changed, 9 insertions, 5 deletions
diff --git a/xfce-base/xfce4-meta/ChangeLog b/xfce-base/xfce4-meta/ChangeLog
index 0c08f984e21f..b650d6ac4871 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-meta/ChangeLog,v 1.24 2011/12/22 17:09:47 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-meta/ChangeLog,v 1.25 2012/02/20 20:42:36 ssuominen Exp $
+
+ 20 Feb 2012; Samuli Suominen <ssuominen@gentoo.org> xfce4-meta-4.8.ebuild:
+ Accept xfce-base/libxfce4ui since version 4.9.0 as xfce-utils replacement to
+ avoid blockers.
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 f19a48203ed5..7698cd4fcf40 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-2011 Gentoo Foundation
+# 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.10 2011/12/22 17:09:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-meta/xfce4-meta-4.8.ebuild,v 1.11 2012/02/20 20:42:36 ssuominen Exp $
EAPI=4
@@ -16,7 +16,7 @@ IUSE="minimal +session +svg"
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