From: Peter Weller <welp@gentoo.org>
Date: Tue, 23 Jan 2007 18:03:35 +0000 (+0000)
Subject: Removing usage of virtual/x11,  and hardcoding in depends. Minor clean ups.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=aceba3476c1f4447dd012b0969d2a445057421fb;p=gentoo.git

Removing usage of virtual/x11,  and hardcoding in depends. Minor clean ups.
Package-Manager: portage-2.1.2-r1
---

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/Manifest b/xfce-base/xfdesktop/Manifest
index 76a4d0b3afaf..79369091b298 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -17,14 +17,14 @@ EBUILD xfdesktop-4.3.99.2.ebuild 1102 RMD160 661a07f9e426570e944035c1ee30c026ecd
 MD5 cda6feb19068a28b67254d0b853f6967 xfdesktop-4.3.99.2.ebuild 1102
 RMD160 661a07f9e426570e944035c1ee30c026ecd55f50 xfdesktop-4.3.99.2.ebuild 1102
 SHA256 d3584b322f2851b1dbae914c00691c7201f9e8d1c58e22e47c0eaae9352bd62f xfdesktop-4.3.99.2.ebuild 1102
-EBUILD xfdesktop-4.4.0.ebuild 1119 RMD160 d95cb68ba4df89a9040e9449febfc00b89f5347b SHA1 45df7b8a1129557e4037e61d693a83e13d715a00 SHA256 a742358a87d67177c3194a49aa5c210c81c80e055e9155831d2cc3a5ff46b228
-MD5 fd78d769564d811394364f2ad37adf0c xfdesktop-4.4.0.ebuild 1119
-RMD160 d95cb68ba4df89a9040e9449febfc00b89f5347b xfdesktop-4.4.0.ebuild 1119
-SHA256 a742358a87d67177c3194a49aa5c210c81c80e055e9155831d2cc3a5ff46b228 xfdesktop-4.4.0.ebuild 1119
-MISC ChangeLog 9252 RMD160 8979376733f44948e67e55a0c8919ba43c3dc8e1 SHA1 12c09c7b5850eeae1f318c87bb7a56959f2450f8 SHA256 8c323e95f895c196149fb6d50de574060129d0c91636e5009729ac034c8871cd
-MD5 1536fe5ed40b2db2fb2e6ff6efdfe972 ChangeLog 9252
-RMD160 8979376733f44948e67e55a0c8919ba43c3dc8e1 ChangeLog 9252
-SHA256 8c323e95f895c196149fb6d50de574060129d0c91636e5009729ac034c8871cd ChangeLog 9252
+EBUILD xfdesktop-4.4.0.ebuild 1183 RMD160 250fa91f19b25815ef593eebf3a36b07a1d38395 SHA1 6b6129588e68500d6359d328dc852bd0ef7f0511 SHA256 82aefd039592314efe0f10435b7978d45a4b1606d43b0df3ebf3286e26887705
+MD5 c2a656422dc031ed6e82e39e4832de9f xfdesktop-4.4.0.ebuild 1183
+RMD160 250fa91f19b25815ef593eebf3a36b07a1d38395 xfdesktop-4.4.0.ebuild 1183
+SHA256 82aefd039592314efe0f10435b7978d45a4b1606d43b0df3ebf3286e26887705 xfdesktop-4.4.0.ebuild 1183
+MISC ChangeLog 9399 RMD160 a3058d4c734bf5315768b2727ba8985772d09a9b SHA1 74eb48e014b4bff52d0cf829f545494057d8c874 SHA256 f7607bf4ece120b2352ae05f4ec46290200517c21c3dfdca2ce5af9880b5d74b
+MD5 1b7b072472899f446a68161d76101f4d ChangeLog 9399
+RMD160 a3058d4c734bf5315768b2727ba8985772d09a9b ChangeLog 9399
+SHA256 f7607bf4ece120b2352ae05f4ec46290200517c21c3dfdca2ce5af9880b5d74b ChangeLog 9399
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157
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"