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

Package-Manager: portage-2.1.2-r1

diff --git a/xfce-base/libxfce4mcs/ChangeLog b/xfce-base/libxfce4mcs/ChangeLog
index c8970d269a6da92f164e1691b95e784b77dbcaf0..4d958fce0168302522422f79fc95cc7960c43a78 100644 (file)
--- a/xfce-base/libxfce4mcs/ChangeLog
+++ b/xfce-base/libxfce4mcs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-base/libxfce4mcs
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4mcs/ChangeLog,v 1.76 2007/01/22 02:05:22 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4mcs/ChangeLog,v 1.77 2007/01/23 16:40:51 welp Exp $
+
+  23 Jan 2007; Peter Weller <welp@gentoo.org> libxfce4mcs-4.4.0.ebuild:
+  Removing usage of virtual/x11,  and hardcoding in depends. Minor clean ups.
 
 *libxfce4mcs-4.4.0 (22 Jan 2007)
 

diff --git a/xfce-base/libxfce4mcs/libxfce4mcs-4.4.0.ebuild b/xfce-base/libxfce4mcs/libxfce4mcs-4.4.0.ebuild
index a76417561691c6efac723d0056161f88984f98ed..0aaf28deafa3695b659301757ca44d6e14093dd0 100644 (file)
--- a/xfce-base/libxfce4mcs/libxfce4mcs-4.4.0.ebuild
+++ b/xfce-base/libxfce4mcs/libxfce4mcs-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/libxfce4mcs/libxfce4mcs-4.4.0.ebuild,v 1.1 2007/01/22 02:05:22 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4mcs/libxfce4mcs-4.4.0.ebuild,v 1.2 2007/01/23 16:40:51 welp Exp $
 
 inherit xfce44
 
@@ -11,15 +11,13 @@ LICENSE="LGPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug"
 
-RDEPEND=">=xfce-base/libxfce4util-${PV}
+RDEPEND=">=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
        >=dev-libs/glib-2
-       || ( ( x11-libs/libX11
+       >=x11-libs/gtk+-2.4
+       x11-libs/libX11
        x11-libs/libICE
-       x11-libs/libSM )
-       virtual/x11 )"
+       x11-libs/libSM"
 DEPEND="${RDEPEND}
-       || ( x11-proto/xproto
-       virtual/x11 )
-       >=x11-libs/gtk+-2.4"
+       x11-proto/xproto"
 
 xfce44_core_package

diff --git a/xfce-base/libxfcegui4/ChangeLog b/xfce-base/libxfcegui4/ChangeLog
index 1464f1c429eb7d1d4d463a7d5e6859b0faace19c..01409eed0254cec7452adeb7b837055d5b7b5a73 100644 (file)
--- a/xfce-base/libxfcegui4/ChangeLog
+++ b/xfce-base/libxfcegui4/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-base/libxfcegui4
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/ChangeLog,v 1.83 2007/01/22 02:07:26 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/ChangeLog,v 1.84 2007/01/23 16:38:08 welp Exp $
+
+  23 Jan 2007; Peter Weller <welp@gentoo.org> libxfcegui4-4.4.0.ebuild:
+  Removing usage of virtual/x11,  and hardcoding in depends. Minor clean ups.
 
 *libxfcegui4-4.4.0 (22 Jan 2007)
 

diff --git a/xfce-base/libxfcegui4/libxfcegui4-4.4.0.ebuild b/xfce-base/libxfcegui4/libxfcegui4-4.4.0.ebuild
index da7e07079049b0ab86e944ea84d3df2037a39888..fdcebbaa61cce94b5670e6d0552bbc69746c7d8c 100644 (file)
--- a/xfce-base/libxfcegui4/libxfcegui4-4.4.0.ebuild
+++ b/xfce-base/libxfcegui4/libxfcegui4-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/libxfcegui4/libxfcegui4-4.4.0.ebuild,v 1.1 2007/01/22 02:07:26 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/libxfcegui4-4.4.0.ebuild,v 1.2 2007/01/23 16:38:08 welp Exp $
 
 inherit xfce44
 
@@ -11,22 +11,21 @@ LICENSE="LGPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug startup-notification"
 
-RDEPEND="|| ( ( x11-libs/libICE
+RDEPEND="x11-libs/libICE
        x11-libs/libSM
-       x11-libs/libX11 )
-       virtual/x11 )
+       x11-libs/libX11
        >=dev-libs/glib-2
        >=dev-libs/libxml2-2.4
        >=x11-libs/gtk+-2.2
        x11-libs/pango
        startup-notification? ( >=x11-libs/startup-notification-0.5 )
-       >=xfce-base/libxfce4util-${PV}
+       >=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
        dev-libs/atk
        sys-libs/zlib
-       x11-libs/cairo
-       >=dev-util/gtk-doc-1"
+       x11-libs/cairo"
 DEPEND="${RDEPEND}
-       || ( x11-proto/xproto virtual/x11 )"
+       >=dev-util/gtk-doc-1
+       x11-proto/xproto"
 
 XFCE_CONFIG="${XFCE_CONFIG} $(use_enable startup-notification)"
 xfce44_core_package