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-panel/ChangeLog b/xfce-base/xfce4-panel/ChangeLog
index 93768d92fb325aa08991f3b81de14c10b3f163f5..e5b26bf8bae3bc4273e8150b117c0822eb9692cf 100644 (file)
--- a/xfce-base/xfce4-panel/ChangeLog
+++ b/xfce-base/xfce4-panel/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-base/xfce4-panel
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/ChangeLog,v 1.77 2007/01/23 13:27:53 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/ChangeLog,v 1.78 2007/01/23 17:45:43 welp Exp $
+
+  23 Jan 2007; Peter Weller <welp@gentoo.org> xfce4-panel-4.4.0.ebuild:
+  Removing usage of virtual/x11,  and hardcoding in depends. Minor clean ups.
 
   23 Jan 2007; Joshua Nichols <nichoj@gentoo.org> xfce4-panel-4.4.0.ebuild:
   Updated blockers. Now only plugins which are provided by this package are

diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index d375d63961e875232de9da5172c8e2b9381b52c0..405b9e67f77a2e58ef66fca6c13ba9ee7683f249 100644 (file)
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -13,14 +13,14 @@ EBUILD xfce4-panel-4.3.99.2.ebuild 1664 RMD160 f09f649bd32c9c7aa2d61aa19bed7a514
 MD5 9d5e292f840e7fd55c5cd243aa8cbed2 xfce4-panel-4.3.99.2.ebuild 1664
 RMD160 f09f649bd32c9c7aa2d61aa19bed7a514fc6330b xfce4-panel-4.3.99.2.ebuild 1664
 SHA256 1b161d5144f8a7737c283f22649a49d51d16b4783ecf6a74bc52c7fe720931b9 xfce4-panel-4.3.99.2.ebuild 1664
-EBUILD xfce4-panel-4.4.0.ebuild 946 RMD160 8a2e3318bb031a69a41bf476293b62c16ecf73b0 SHA1 67378f7f4f3eb6fff4259bae4c10f37c62f75d45 SHA256 fc8f13490eb9039ecd3fd01e4e4f9872a1052f33670ee5ccf957b62fb0ae1425
-MD5 3cb8610041093bb854ba7b87c1f53bc0 xfce4-panel-4.4.0.ebuild 946
-RMD160 8a2e3318bb031a69a41bf476293b62c16ecf73b0 xfce4-panel-4.4.0.ebuild 946
-SHA256 fc8f13490eb9039ecd3fd01e4e4f9872a1052f33670ee5ccf957b62fb0ae1425 xfce4-panel-4.4.0.ebuild 946
-MISC ChangeLog 9880 RMD160 143c8417ca90bfbc1548a03ede95283fbc134360 SHA1 3bd926254556cfd86e40e447f88f8cec3cc7d9de SHA256 b7446291d5f824b63845bbe1a09ba02e4f1ae67b8a90be95579da650dbaf4d35
-MD5 6ca78ac296beb1800642bef177f412ef ChangeLog 9880
-RMD160 143c8417ca90bfbc1548a03ede95283fbc134360 ChangeLog 9880
-SHA256 b7446291d5f824b63845bbe1a09ba02e4f1ae67b8a90be95579da650dbaf4d35 ChangeLog 9880
+EBUILD xfce4-panel-4.4.0.ebuild 1012 RMD160 52d736cdd144ef339752b366659ba858eb492111 SHA1 c75ac012a28d362413a3c340ed1e652300d3da46 SHA256 b361fec642df272a5cc2ab73b4f441403e03c88c985abf2858198c3794398b8e
+MD5 33c7bfb795c2b120ca323963579c6222 xfce4-panel-4.4.0.ebuild 1012
+RMD160 52d736cdd144ef339752b366659ba858eb492111 xfce4-panel-4.4.0.ebuild 1012
+SHA256 b361fec642df272a5cc2ab73b4f441403e03c88c985abf2858198c3794398b8e xfce4-panel-4.4.0.ebuild 1012
+MISC ChangeLog 10029 RMD160 00fb3b6b350885232d14f50d12cb5566d450519b SHA1 4683f43f763f822e70422fc2529c550c51a47cad SHA256 669cf0e09f2c549680ebe9d79130513610834f54847a05a53d6adc914c2f685f
+MD5 b6d7db71c77d6385a88a559ff33f7b7f ChangeLog 10029
+RMD160 00fb3b6b350885232d14f50d12cb5566d450519b ChangeLog 10029
+SHA256 669cf0e09f2c549680ebe9d79130513610834f54847a05a53d6adc914c2f685f ChangeLog 10029
 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-panel/xfce4-panel-4.4.0.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.4.0.ebuild
index 36d6220ddaf2c3859f1f216619ffeda23c96387e..a2c82988a838a3ccdb80eda05beeff9dd2d798d4 100644 (file)
--- a/xfce-base/xfce4-panel/xfce4-panel-4.4.0.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-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-panel/xfce4-panel-4.4.0.ebuild,v 1.2 2007/01/23 13:27:53 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/xfce4-panel-4.4.0.ebuild,v 1.3 2007/01/23 17:45:43 welp Exp $
 
 inherit xfce44
 
@@ -9,27 +9,27 @@ xfce44
 DESCRIPTION="Xfce4 panel"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="startup-notification"
+IUSE="debug startup-notification"
 
-RDEPEND="|| ( ( x11-libs/libX11
+RDEPEND="x11-libs/libX11
        x11-libs/libICE
-       x11-libs/libSM )
-       virtual/x11 )
+       x11-libs/libSM
        >=dev-libs/glib-2
        >=x11-libs/gtk+-2.6
-       >=xfce-base/libxfce4util-${PV}
-       >=xfce-base/libxfcegui4-${PV}
-       >=xfce-base/xfce-mcs-manager-${PV}
+       >=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
+       >=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}
+       >=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}
        media-libs/libpng
-       startup-notification? ( >=x11-libs/startup-notification-0.5 )
-       >=dev-util/gtk-doc-1
+       startup-notification? ( >=x11-libs/startup-notification-0.5 )"
+DEPEND="${RDEPEND}
        !xfce-extra/xfce4-panelmenu
        !xfce-extra/xfce4-showdesktop
        !xfce-extra/xfce4-systray
        !xfce-extra/xfce4-taskbar
        !xfce-extra/xfce4-toys
-       !xfce-extra/xfce4-windowlist"
+       !xfce-extra/xfce4-windowlist
+       >=dev-util/gtk-doc-1"
 
-XFCE_CONFIG="$(use_enable startup-notification)"
+XFCE_CONFIG="${XFCE_CONFIG} $(use_enable startup-notification)"
 
 xfce44_core_package