summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Mende <angelos@gentoo.org>2009-03-16 08:04:10 +0000
committerChristoph Mende <angelos@gentoo.org>2009-03-16 08:04:10 +0000
commit5a1fbb56827da0ca6d7216cf4f81a81bff485fda (patch)
tree831571fd3beb353570f62accc7797638f1b551c5 /xfce-base
parentDisable semi-broken patch for now so more people dont hit the bug #262567. (diff)
downloadgentoo-2-5a1fbb56827da0ca6d7216cf4f81a81bff485fda.tar.gz
gentoo-2-5a1fbb56827da0ca6d7216cf4f81a81bff485fda.tar.bz2
gentoo-2-5a1fbb56827da0ca6d7216cf4f81a81bff485fda.zip
Don't pull in xfce4-settings on alpha
(Portage version: 2.2_rc25/cvs/Linux x86_64)
Diffstat (limited to 'xfce-base')
-rw-r--r--xfce-base/xfce4/ChangeLog5
-rw-r--r--xfce-base/xfce4/xfce4-4.6.0.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/xfce-base/xfce4/ChangeLog b/xfce-base/xfce4/ChangeLog
index 3a949de52b29..1ac8e045d78e 100644
--- a/xfce-base/xfce4/ChangeLog
+++ b/xfce-base/xfce4/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for xfce-base/xfce4
# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4/ChangeLog,v 1.133 2009/03/10 13:51:50 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4/ChangeLog,v 1.134 2009/03/16 08:04:10 angelos Exp $
+
+ 16 Mar 2009; Christoph Mende <angelos@gentoo.org> xfce4-4.6.0.ebuild:
+ Don't pull in xfce4-settings on alpha
*xfce4-4.6.0 (10 Mar 2009)
diff --git a/xfce-base/xfce4/xfce4-4.6.0.ebuild b/xfce-base/xfce4/xfce4-4.6.0.ebuild
index b926bfcf23ac..7e1b99a011e3 100644
--- a/xfce-base/xfce4/xfce4-4.6.0.ebuild
+++ b/xfce-base/xfce4/xfce4-4.6.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4/xfce4-4.6.0.ebuild,v 1.1 2009/03/10 13:51:50 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4/xfce4-4.6.0.ebuild,v 1.2 2009/03/16 08:04:10 angelos Exp $
XFCE_VERSION=${PV}
@@ -18,7 +18,7 @@ RDEPEND=">=x11-themes/gtk-engines-xfce-2.6
>=xfce-base/xfce-utils-${XFCE_VERSION}
>=xfce-base/xfdesktop-${XFCE_VERSION}
>=xfce-base/xfce4-session-${XFCE_VERSION}
- >=xfce-base/xfce4-settings-${XFCE_VERSION}
+ !alpha? ( >=xfce-base/xfce4-settings-${XFCE_VERSION} )
alsa? ( >=xfce-extra/xfce4-mixer-${XFCE_VERSION} )
oss? ( >=xfce-extra/xfce4-mixer-${XFCE_VERSION} )
cups? ( >=net-print/xfprint-${XFCE_VERSION} )