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/ChangeLog b/xfce-base/xfce4/ChangeLog
index ed40d1b9f901f9973c491e91f5606d785cc2b979..d5c44c4271690da1809f4970dea3c17232edaec2 100644 (file)
--- a/xfce-base/xfce4/ChangeLog
+++ b/xfce-base/xfce4/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-base/xfce4
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4/ChangeLog,v 1.76 2007/01/22 14:11:36 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4/ChangeLog,v 1.77 2007/01/23 17:32:34 welp Exp $
+
+  23 Jan 2007; Peter Weller <welp@gentoo.org> xfce4-4.4.0.ebuild:
+  Removing usage of virtual/x11,  and hardcoding in depends. Minor clean ups.
 
 *xfce4-4.4.0 (22 Jan 2007)
 

diff --git a/xfce-base/xfce4/Manifest b/xfce-base/xfce4/Manifest
index b3bf16d31c520ff68daccc5c4af85393b3a6da39..50cbf642056bdc5b5fb910eb024e25e2ef07a337 100644 (file)
--- a/xfce-base/xfce4/Manifest
+++ b/xfce-base/xfce4/Manifest
@@ -6,14 +6,14 @@ EBUILD xfce4-4.3.99.2-r1.ebuild 1088 RMD160 9cc91d6fb18470ee0a6d205f04143cbe1cab
 MD5 41d549390c5e769213ed0d2c73a8cade xfce4-4.3.99.2-r1.ebuild 1088
 RMD160 9cc91d6fb18470ee0a6d205f04143cbe1cabde2c xfce4-4.3.99.2-r1.ebuild 1088
 SHA256 1959f14e3ab7db6ab095609951653c6cfc4183dc11c7bf4d2460958c209e73bd xfce4-4.3.99.2-r1.ebuild 1088
-EBUILD xfce4-4.4.0.ebuild 1274 RMD160 187447342d798c871791d8dedf03b9734e1f8e47 SHA1 51b695c9dcd7d9390fd3159c4443cf13ec1418e9 SHA256 a792f5b6c4cfc9cea28e16152603713a526c4065e01e7d4f525c8a7e67bb3411
-MD5 4b280c51ad56868560e699665fbb9215 xfce4-4.4.0.ebuild 1274
-RMD160 187447342d798c871791d8dedf03b9734e1f8e47 xfce4-4.4.0.ebuild 1274
-SHA256 a792f5b6c4cfc9cea28e16152603713a526c4065e01e7d4f525c8a7e67bb3411 xfce4-4.4.0.ebuild 1274
-MISC ChangeLog 9072 RMD160 c323c20de1267e68c2a0cb24b85692df4ab18030 SHA1 cf240e90a69c0db19c2b16f1f237cbd460057105 SHA256 98efc18defd2f588a082ae74335dc53705b8ba5c304a1a03644298c299fc3b82
-MD5 cec3d782b8066059b35108d367ecca3a ChangeLog 9072
-RMD160 c323c20de1267e68c2a0cb24b85692df4ab18030 ChangeLog 9072
-SHA256 98efc18defd2f588a082ae74335dc53705b8ba5c304a1a03644298c299fc3b82 ChangeLog 9072
+EBUILD xfce4-4.4.0.ebuild 1497 RMD160 d58f3765431626710b20c0fc9b5ed5106f490823 SHA1 5ddede18888e313da9c0ef61501b5bd00dbb8212 SHA256 7eed9084673dac0d1233aa549b85adaa93adabc18aa1d15c07b2cc5db0c99cf3
+MD5 f67e2ff48ec55d115afea284c9c1a46d xfce4-4.4.0.ebuild 1497
+RMD160 d58f3765431626710b20c0fc9b5ed5106f490823 xfce4-4.4.0.ebuild 1497
+SHA256 7eed9084673dac0d1233aa549b85adaa93adabc18aa1d15c07b2cc5db0c99cf3 xfce4-4.4.0.ebuild 1497
+MISC ChangeLog 9215 RMD160 5592ab22209ea9bed60cc43ce2a505c378776bd8 SHA1 866f7f2607c5a19401bd32204eb8d61bc6e65b53 SHA256 dce7888826f8f360a692df7912b55127ea232eb14a4dc2392c1813e019172090
+MD5 9640b1dcc4fcb67089047358c230f426 ChangeLog 9215
+RMD160 5592ab22209ea9bed60cc43ce2a505c378776bd8 ChangeLog 9215
+SHA256 dce7888826f8f360a692df7912b55127ea232eb14a4dc2392c1813e019172090 ChangeLog 9215
 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/xfce4-4.4.0.ebuild b/xfce-base/xfce4/xfce4-4.4.0.ebuild
index 64395cf1092cdd953100e77f3780c4765f1e7974..977a69049508d9f8d89cb69a6b94b9f52f0fbd3c 100644 (file)
--- a/xfce-base/xfce4/xfce4-4.4.0.ebuild
+++ b/xfce-base/xfce4/xfce4-4.4.0.ebuild
@@ -1,6 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4/xfce4-4.4.0.ebuild,v 1.1 2007/01/22 14:11:36 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4/xfce4-4.4.0.ebuild,v 1.2 2007/01/23 17:32:34 welp Exp $
+
+inherit xfce44
+
+xfce44
 
 DESCRIPTION="Meta package for Xfce4 desktop, merge this package to install"
 HOMEPAGE="http://www.xfce.org/"
@@ -12,22 +16,22 @@ IUSE="alsa cups minimal oss svg"
 DEPEND="svg? ( gnome-base/librsvg )"
 RDEPEND="${DEPEND}
        >=x11-themes/gtk-engines-xfce-2.4
-       >=xfce-base/xfce-mcs-plugins-${PV}
-       >=xfce-base/xfce4-panel-${PV}
-       >=xfce-base/xfwm4-${PV}
-       >=xfce-base/xfce-utils-${PV}
-       >=xfce-base/xfdesktop-${PV}
-       >=xfce-base/xfce4-session-${PV}
-       cups? ( >=xfce-base/xfprint-${PV} )
-       !minimal? ( >=xfce-base/orage-${PV} )
-       !minimal? ( >=xfce-base/thunar-0.8 )
-       !minimal? ( >=xfce-extra/xfwm4-themes-${PV} )
-       >=xfce-extra/xfce4-appfinder-${PV}
-       >=xfce-extra/xfce4-icon-theme-${PV}
-       !minimal? ( >=xfce-extra/terminal-0.2.6 )
-       oss? ( >=xfce-extra/xfce4-mixer-${PV} )
-       alsa? ( >=xfce-extra/xfce4-mixer-${PV} )
-       !minimal? ( >=xfce-extra/mousepad-0.2.10 )"
+       >=xfce-base/thunar-${THUNAR_MASTER_VERSION}
+       >=xfce-base/xfce-mcs-plugins-${XFCE_MASTER_VERSION}
+       >=xfce-base/xfce4-panel-${XFCE_MASTER_VERSION}
+       >=xfce-base/xfwm4-${XFCE_MASTER_VERSION}
+       >=xfce-base/xfce-utils-${XFCE_MASTER_VERSION}
+       >=xfce-base/xfdesktop-${XFCE_MASTER_VERSION}
+       >=xfce-base/xfce4-session-${XFCE_MASTER_VERSION}
+       >=xfce-extra/xfce4-appfinder-${XFCE_MASTER_VERSION}
+       >=xfce-extra/xfce4-icon-theme-${XFCE_MASTER_VERSION}
+       alsa? ( >=xfce-extra/xfce4-mixer-${XFCE_MASTER_VERSION} )
+       oss? ( >=xfce-extra/xfce4-mixer-${XFCE_MASTER_VERSION} )
+       cups? ( >=xfce-base/xfprint-${XFCE_MASTER_VERSION} )
+       !minimal? ( >=xfce-base/orage-${XFCE_MASTER_VERSION}
+                   >=xfce-extra/mousepad-0.2.10
+                   >=xfce-extra/xfwm4-themes-${XFCE_MASTER_VERSION}
+                   >=xfce-extra/terminal-0.2.6 )"
 
 src_install() {
        dodir /etc/X11/Sessions