Removing usage of virtual/x11, and hardcoding in depends. Minor clean ups.

Package-Manager: portage-2.1.2-r1

diff --git a/xfce-base/xfce4-session/ChangeLog b/xfce-base/xfce4-session/ChangeLog
index eff53589d212014c32c9604ef32b2efa3efacc16..ec25ea04a5193dbc6c4bef1e9114ec22b4e028e4 100644 (file)
--- a/xfce-base/xfce4-session/ChangeLog
+++ b/xfce-base/xfce4-session/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-base/xfce4-session
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.46 2007/01/22 02:10:35 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.47 2007/01/23 17:57:02 welp Exp $
+
+  23 Jan 2007; Peter Weller <welp@gentoo.org> xfce4-session-4.4.0.ebuild:
+  Removing usage of virtual/x11,  and hardcoding in depends. Minor clean ups.
 
 *xfce4-session-4.4.0 (22 Jan 2007)
 

diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index d1a2813d0bf8874c8a588107a763e627ad95e868..467f706393371c65820dfc8fbb6c50a89a336061 100644 (file)
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -9,14 +9,14 @@ EBUILD xfce4-session-4.3.99.2-r1.ebuild 702 RMD160 bdac5746df28ad65cc439b6f3d01b
 MD5 3ef89bbe92c8f87efd00138c0a12147c xfce4-session-4.3.99.2-r1.ebuild 702
 RMD160 bdac5746df28ad65cc439b6f3d01b76778656092 xfce4-session-4.3.99.2-r1.ebuild 702
 SHA256 f505b7129bb855b30f925a35e9daf25211ce8e77f5a44786222c1380ce652e5f xfce4-session-4.3.99.2-r1.ebuild 702
-EBUILD xfce4-session-4.4.0.ebuild 691 RMD160 2978d8400f17b7c313e7a1fda07ef40252d44535 SHA1 9bac5a77d8ac2caf3f77aa9c2c5119fc7287bdfe SHA256 c8d6c1b95cde45dab5bf65ad85e72574e60c62243994d11a21005b97802277c5
-MD5 1460ae195346d9673a2c9badd2537535 xfce4-session-4.4.0.ebuild 691
-RMD160 2978d8400f17b7c313e7a1fda07ef40252d44535 xfce4-session-4.4.0.ebuild 691
-SHA256 c8d6c1b95cde45dab5bf65ad85e72574e60c62243994d11a21005b97802277c5 xfce4-session-4.4.0.ebuild 691
-MISC ChangeLog 6289 RMD160 e1997967e532d649616cf34dfeb0f639994ff870 SHA1 89b9dc5f627ffaeffbfd4f78dd836e802180da65 SHA256 27514dfde31a570d4702fcb52f8441a30c378e9e25b8352e0802710bb68b6691
-MD5 51b144fec444eaa9efdb47ad37312681 ChangeLog 6289
-RMD160 e1997967e532d649616cf34dfeb0f639994ff870 ChangeLog 6289
-SHA256 27514dfde31a570d4702fcb52f8441a30c378e9e25b8352e0802710bb68b6691 ChangeLog 6289
+EBUILD xfce4-session-4.4.0.ebuild 656 RMD160 584e964397b4e8e8433b1020c329f72e990134ca SHA1 df2333b930a077ea0539591939aa6cada6c9d679 SHA256 2c4b9ed764145461405254488e7efc4c3c422287c651af091695b100bd3413ea
+MD5 608793edbb04d3a5c3c93538ce174848 xfce4-session-4.4.0.ebuild 656
+RMD160 584e964397b4e8e8433b1020c329f72e990134ca xfce4-session-4.4.0.ebuild 656
+SHA256 2c4b9ed764145461405254488e7efc4c3c422287c651af091695b100bd3413ea xfce4-session-4.4.0.ebuild 656
+MISC ChangeLog 6440 RMD160 11e69673522a15f8d38977295f6b8c9a027539b7 SHA1 7fa5a6a5046eaf4b316854fbf6041ce72abf1bdd SHA256 21aa65b5e6feabe5e86f687f1ed1bdcf75b9b66de207cb77e771a4ffce938f8c
+MD5 f81527fecc774b5a4f8ca29c6dd174ab ChangeLog 6440
+RMD160 11e69673522a15f8d38977295f6b8c9a027539b7 ChangeLog 6440
+SHA256 21aa65b5e6feabe5e86f687f1ed1bdcf75b9b66de207cb77e771a4ffce938f8c ChangeLog 6440
 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/xfce4-session/xfce4-session-4.4.0.ebuild b/xfce-base/xfce4-session/xfce4-session-4.4.0.ebuild
index ce87536148f267190f0d8b8667d6509cb0244a3c..64014707f2ca8b702bef68f6df20c32274b696b7 100644 (file)
--- a/xfce-base/xfce4-session/xfce4-session-4.4.0.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.4.0.ebuild,v 1.1 2007/01/22 02:10:35 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.4.0.ebuild,v 1.2 2007/01/23 17:57:02 welp Exp $
 
 inherit xfce44
 
@@ -10,15 +10,14 @@ DESCRIPTION="Xfce4 session manager"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug hal"
 
-RDEPEND="|| ( ( x11-libs/libX11
-               x11-libs/libSM
-               x11-apps/iceauth )
-               virtual/x11 )
-               >=xfce-base/xfce-utils-${PV}
-               games-misc/fortune-mod
-               hal? ( sys-apps/hal )"
+RDEPEND="x11-libs/libX11
+       x11-libs/libSM
+       x11-apps/iceauth
+       >=xfce-base/xfce-utils-${XFCE_MASTER_VERSION}
+       games-misc/fortune-mod
+       hal? ( sys-apps/hal )"
 DEPEND="${RDEPEND}
-               || ( x11-libs/libXt virtual/x11 )"
+       x11-libs/libXt"
 
 XFCE_CONFIG="${XFCE_CONFIG} $(use_with hal shutdown-style hal)"
 xfce44_core_package