diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-02-20 21:00:10 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-02-20 21:00:10 +0000 |
| commit | 291f1f5bf0e5709266c349c63a211d619cfbd6e4 (patch) | |
| tree | 1ea64d17f98f58bb11e10820d34f28a670eb6ee8 /xfce-base/xfce4-meta | |
| parent | Workaround file collision (diff) | |
| download | gentoo-2-291f1f5bf0e5709266c349c63a211d619cfbd6e4.tar.gz gentoo-2-291f1f5bf0e5709266c349c63a211d619cfbd6e4.tar.bz2 gentoo-2-291f1f5bf0e5709266c349c63a211d619cfbd6e4.zip | |
revert last commit, worked around differently
(Portage version: 2.2.0_alpha88/cvs/Linux x86_64)
Diffstat (limited to 'xfce-base/xfce4-meta')
| -rw-r--r-- | xfce-base/xfce4-meta/ChangeLog | 6 | ||||
| -rw-r--r-- | xfce-base/xfce4-meta/xfce4-meta-4.8.ebuild | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/xfce-base/xfce4-meta/ChangeLog b/xfce-base/xfce4-meta/ChangeLog index b650d6ac4871..8bc40c43e628 100644 --- a/xfce-base/xfce4-meta/ChangeLog +++ b/xfce-base/xfce4-meta/ChangeLog @@ -1,10 +1,6 @@ # 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.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. +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-meta/ChangeLog,v 1.26 2012/02/20 21:00:10 ssuominen Exp $ 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 7698cd4fcf40..ede56f0a1d39 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.11 2012/02/20 20:42:36 ssuominen Exp $ +# $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 $ 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/libxfce4ui-4.9 >=xfce-base/xfce-utils-4.8 ) + >=xfce-base/xfce-utils-4.8 >=xfce-base/xfdesktop-4.8 >=xfce-base/xfce4-settings-4.8 x11-themes/hicolor-icon-theme |