summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Weller <welp@gentoo.org>2007-01-28 15:30:18 +0000
committerPeter Weller <welp@gentoo.org>2007-01-28 15:30:18 +0000
commit9a1b27e6e05f10ddeac5ddf9bd88508320f32d1a (patch)
treee9ab9546f245f515e35dfc9ef06426cf5faa009c /xfce-base
parentDep fixes, various other fixes (diff)
downloadgentoo-2-9a1b27e6e05f10ddeac5ddf9bd88508320f32d1a.tar.gz
gentoo-2-9a1b27e6e05f10ddeac5ddf9bd88508320f32d1a.tar.bz2
gentoo-2-9a1b27e6e05f10ddeac5ddf9bd88508320f32d1a.zip
Dep fixes, various other fixes
(Portage version: 2.1.2-r4)
Diffstat (limited to 'xfce-base')
-rw-r--r--xfce-base/xfdesktop/ChangeLog5
-rw-r--r--xfce-base/xfdesktop/xfdesktop-4.4.0.ebuild47
2 files changed, 27 insertions, 25 deletions
diff --git a/xfce-base/xfdesktop/ChangeLog b/xfce-base/xfdesktop/ChangeLog
index 7bb489dfb061..dcec2ebcbda7 100644
--- a/xfce-base/xfdesktop/ChangeLog
+++ b/xfce-base/xfdesktop/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for xfce-base/xfdesktop
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.76 2007/01/23 18:03:35 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.77 2007/01/28 15:30:18 welp Exp $
+
+ 28 Jan 2007; Peter Weller <welp@gentoo.org> xfdesktop-4.4.0.ebuild:
+ Dep fixes, various other fixes
23 Jan 2007; Peter Weller <welp@gentoo.org> xfdesktop-4.4.0.ebuild:
Removing usage of virtual/x11, and hardcoding in depends. Minor clean ups.
diff --git a/xfce-base/xfdesktop/xfdesktop-4.4.0.ebuild b/xfce-base/xfdesktop/xfdesktop-4.4.0.ebuild
index 24464f6488a5..6f74e5b9016f 100644
--- a/xfce-base/xfdesktop/xfdesktop-4.4.0.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-4.4.0.ebuild
@@ -1,42 +1,41 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.4.0.ebuild,v 1.2 2007/01/23 18:03:35 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.4.0.ebuild,v 1.3 2007/01/28 15:30:18 welp Exp $
inherit xfce44
xfce44
-DESCRIPTION="Xfce4 desktop manager"
+DESCRIPTION="Desktop manager"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug doc plugins thunar-vfs"
-IUSE="debug exo panel-plugin thunar-vfs"
-
-RDEPEND="sys-apps/dbus
- x11-libs/libX11
- x11-libs/libICE
+RDEPEND="x11-libs/libX11
x11-libs/libSM
- >=dev-libs/glib-2.2
- >=x11-libs/gtk+-2.2
+ >=dev-libs/glib-2.6
+ >=x11-libs/gtk+-2.6
+ gnome-base/librsvg
>=xfce-base/libxfce4mcs-${XFCE_MASTER_VERSION}
>=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
>=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}
- thunar-vfs? ( >=xfce-base/thunar-${THUNAR_MASTER_VERSION} )
- panel-plugin? ( >=xfce-base/xfce4-panel-${XFCE_MASTER_VERSION} )
+ plugins? ( dev-libs/dbus-glib >=xfce-base/xfce4-panel-${XFCE_MASTER_VERSION} )
>=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}
- media-libs/libpng
- exo? ( >=xfce-extra/exo-0.3.2 )"
-DEPEND="${RDEPEND}"
-
-if ! use thunar-vfs; then
- XFCE_CONFIG="${XFCE_CONFIG} --disable-thunar-vfs --disable-thunarx"
+ thunar-vfs? ( >=xfce-base/thunar-${THUNAR_MASTER_VERSION}
+ >=xfce-extra/exo-0.3.2 dev-libs/dbus-glib )"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig
+ dev-util/intltool"
+
+XFCE_CONFIG="${XFCE_CONFIG} $(use_enable plugins panel-plugin) $(use_enable doc xsltproc)"
+
+if use thunar-vfs; then
+ XFCE_CONFIG="${XFCE_CONFIG} --enable-thunarx --enable-desktop-icons \
+ --enable-file-icons --enable-exo"
+else
+ XFCE_CONFIG="${XFCE_CONFIG} --disable-thunarx --disable-desktop-icons \
+ --disable-file-icons --disable-exo"
fi
-if ! use exo; then
- XFCE_CONFIG="${XFCE_CONFIG} --disable-exo"
-fi
-
-if ! use panel-plugin; then
- XFCE_CONFIG="${XFCE_CONFIG} --disable-panel-plugin"
-fi
+DOCS="AUTHORS ChangeLog NEWS TODO README"
xfce44_core_package