diff options
author | 2007-01-23 18:03:35 +0000 | |
---|---|---|
committer | 2007-01-23 18:03:35 +0000 | |
commit | a6631c360a5782cdfefc1df0d533b6d3c751cd10 (patch) | |
tree | 295c0b1fb31dc5e780abad663398704eb5ee0483 | |
parent | Fix bug #163398. (diff) | |
download | gentoo-2-a6631c360a5782cdfefc1df0d533b6d3c751cd10.tar.gz gentoo-2-a6631c360a5782cdfefc1df0d533b6d3c751cd10.tar.bz2 gentoo-2-a6631c360a5782cdfefc1df0d533b6d3c751cd10.zip |
Removing usage of virtual/x11, and hardcoding in depends. Minor clean ups.
(Portage version: 2.1.2-r1)
-rw-r--r-- | xfce-base/xfdesktop/ChangeLog | 5 | ||||
-rw-r--r-- | xfce-base/xfdesktop/xfdesktop-4.4.0.ebuild | 30 |
2 files changed, 18 insertions, 17 deletions
diff --git a/xfce-base/xfdesktop/ChangeLog b/xfce-base/xfdesktop/ChangeLog index 9ec47c7eeb12..7bb489dfb061 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.75 2007/01/22 02:11:44 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.76 2007/01/23 18:03:35 welp Exp $ + + 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. *xfdesktop-4.4.0 (22 Jan 2007) diff --git a/xfce-base/xfdesktop/xfdesktop-4.4.0.ebuild b/xfce-base/xfdesktop/xfdesktop-4.4.0.ebuild index f73c1b059b3a..24464f6488a5 100644 --- a/xfce-base/xfdesktop/xfdesktop-4.4.0.ebuild +++ b/xfce-base/xfdesktop/xfdesktop-4.4.0.ebuild @@ -1,8 +1,8 @@ # 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.1 2007/01/22 02:11:45 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.4.0.ebuild,v 1.2 2007/01/23 18:03:35 welp Exp $ -inherit xfce44 eutils +inherit xfce44 xfce44 @@ -11,23 +11,21 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="debug exo panel-plugin thunar-vfs" -DEPEND="sys-apps/dbus" -RDEPEND="|| ( ( - x11-libs/libX11 - x11-libs/libICE - x11-libs/libSM ) - virtual/x11 ) +RDEPEND="sys-apps/dbus + x11-libs/libX11 + x11-libs/libICE + x11-libs/libSM >=dev-libs/glib-2.2 >=x11-libs/gtk+-2.2 - >=xfce-base/libxfce4mcs-${PV} - >=xfce-base/libxfce4util-${PV} - >=xfce-base/libxfcegui4-${PV} - thunar-vfs? ( >=xfce-base/thunar-0.8.0 ) - panel-plugin? ( >=xfce-base/xfce4-panel-${PV} ) - >=xfce-base/xfce-mcs-manager-${PV} + >=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} ) + >=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION} media-libs/libpng - exo? ( >=xfce-extra/exo-0.3.2 ) - ${DEPEND}" + exo? ( >=xfce-extra/exo-0.3.2 )" +DEPEND="${RDEPEND}" if ! use thunar-vfs; then XFCE_CONFIG="${XFCE_CONFIG} --disable-thunar-vfs --disable-thunarx" |