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

Package-Manager: portage-2.1.2-r1

diff --git a/xfce-base/xfce-utils/ChangeLog b/xfce-base/xfce-utils/ChangeLog
index 8f3ef7193a04d4edd7e6e2d4bcf9e89dcfefde59..27850e18b216a3a0b7b51ef3505821b6aa1db322 100644 (file)
--- a/xfce-base/xfce-utils/ChangeLog
+++ b/xfce-base/xfce-utils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-base/xfce-utils
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/ChangeLog,v 1.80 2007/01/22 02:09:29 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/ChangeLog,v 1.81 2007/01/23 17:23:48 welp Exp $
+
+  23 Jan 2007; Peter Weller <welp@gentoo.org> xfce-utils-4.4.0.ebuild:
+  Removing usage of virtual/x11,  and hardcoding in depends. Minor clean ups.
 
 *xfce-utils-4.4.0 (22 Jan 2007)
 

diff --git a/xfce-base/xfce-utils/Manifest b/xfce-base/xfce-utils/Manifest
index 3837ae14bb43e6657c729c95d546fc177ab69762..1a1cd6691d88cd132109d22c4cc2d6fe369c33ac 100644 (file)
--- a/xfce-base/xfce-utils/Manifest
+++ b/xfce-base/xfce-utils/Manifest
@@ -17,14 +17,14 @@ EBUILD xfce-utils-4.3.99.2.ebuild 996 RMD160 f11d8b8d68b66434b1479a5f4b0137cc3b4
 MD5 f8dddac2325cd2ce1b326d2fe5f6a31e xfce-utils-4.3.99.2.ebuild 996
 RMD160 f11d8b8d68b66434b1479a5f4b0137cc3b4f01eb xfce-utils-4.3.99.2.ebuild 996
 SHA256 786140cf5e470fa131aedfadf78bf8e80ead5a529f2ff34e525a5a39213ab20c xfce-utils-4.3.99.2.ebuild 996
-EBUILD xfce-utils-4.4.0.ebuild 881 RMD160 1268a28d5bae4c2b1ff91aa3de06ab50fe9173c4 SHA1 9b556fab19083bf6b010a6b71e87fbe509e6b2f6 SHA256 886b67079f2904df72131bedea369c8c387b2b818cb750206532a9d2ee5605d6
-MD5 ce620d114bdfa18f7bfae29c8aeae049 xfce-utils-4.4.0.ebuild 881
-RMD160 1268a28d5bae4c2b1ff91aa3de06ab50fe9173c4 xfce-utils-4.4.0.ebuild 881
-SHA256 886b67079f2904df72131bedea369c8c387b2b818cb750206532a9d2ee5605d6 xfce-utils-4.4.0.ebuild 881
-MISC ChangeLog 9972 RMD160 2028ed2cd9a95c1ae8cc95c5a02c5bc53878c457 SHA1 79b8aa2619fb39ebc775678a09030d50292bc189 SHA256 902a5d3de31a9c757c9231d7d307db49fec1406631ee257d5878c43f7c0d9e7c
-MD5 6601326c18dd50b1217675f301749722 ChangeLog 9972
-RMD160 2028ed2cd9a95c1ae8cc95c5a02c5bc53878c457 ChangeLog 9972
-SHA256 902a5d3de31a9c757c9231d7d307db49fec1406631ee257d5878c43f7c0d9e7c ChangeLog 9972
+EBUILD xfce-utils-4.4.0.ebuild 947 RMD160 40606e9f5c3df599523c2966404474c1715ef814 SHA1 686cf901c85b72272c90cb237a1b1d6ca02a4b53 SHA256 b9d6dbb85968f2e41f79d2f45c0fc581821644b0df476e4c34f7b5952494b9a8
+MD5 8ce0553a0192b5c069246c726dc04885 xfce-utils-4.4.0.ebuild 947
+RMD160 40606e9f5c3df599523c2966404474c1715ef814 xfce-utils-4.4.0.ebuild 947
+SHA256 b9d6dbb85968f2e41f79d2f45c0fc581821644b0df476e4c34f7b5952494b9a8 xfce-utils-4.4.0.ebuild 947
+MISC ChangeLog 10120 RMD160 07c332a5545fb9c78e7772e8309b2d6864076810 SHA1 4eaa9ec0f909a945c43db7c070103b1f8c80461e SHA256 fc8543e7a3f80d99c0cd4b7efa50f53b1b635bed07a95e4a3a3da2a4094a73f9
+MD5 8a03de72614218d9e0b9c5d1620b00ad ChangeLog 10120
+RMD160 07c332a5545fb9c78e7772e8309b2d6864076810 ChangeLog 10120
+SHA256 fc8543e7a3f80d99c0cd4b7efa50f53b1b635bed07a95e4a3a3da2a4094a73f9 ChangeLog 10120
 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/xfce-utils/xfce-utils-4.4.0.ebuild b/xfce-base/xfce-utils/xfce-utils-4.4.0.ebuild
index aa7a4b8859e30c18cd18bc8320d2ee726a7bcf46..b333fff8a3ff11a490ff71b40b87ad5960f72cc3 100644 (file)
--- a/xfce-base/xfce-utils/xfce-utils-4.4.0.ebuild
+++ b/xfce-base/xfce-utils/xfce-utils-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/xfce-utils/xfce-utils-4.4.0.ebuild,v 1.1 2007/01/22 02:09:29 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/xfce-utils-4.4.0.ebuild,v 1.2 2007/01/23 17:23:48 welp Exp $
 
 inherit xfce44
 
@@ -10,15 +10,15 @@ DESCRIPTION="Utilities for Xfce4"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc debug"
 
-RDEPEND="|| ( x11-apps/xrdb
-       virtual/x11 )
+RDEPEND="x11-apps/xrdb
        >=dev-libs/glib-2.2
        >=x11-libs/gtk+-2.2
        media-libs/libpng
-       >=xfce-base/libxfce4util-${PV}
-       >=xfce-base/libxfcegui4-${PV}
-       >=xfce-base/libxfce4mcs-${PV}
-       >=xfce-base/xfce-mcs-manager-${PV}"
+       >=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
+       >=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}
+       >=xfce-base/libxfce4mcs-${XFCE_MASTER_VERSION}
+       >=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}"
+DEPEND="${RDEPEND}"
 
 XFCE_CONFIG="${XFCE_CONFIG} --enable-gdm --with-vendor-info=Gentoo"