Removed uneeded patch, other trivial changes

(Portage version: 2.1.2-r1)

3 files changed, 17 insertions, 44 deletions

diff --git a/xfce-base/xfce-mcs-plugins/ChangeLog b/xfce-base/xfce-mcs-plugins/ChangeLog
index 8db842002cbe..3402c9202b08 100644
--- a/xfce-base/xfce-mcs-plugins/ChangeLog
+++ b/xfce-base/xfce-mcs-plugins/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-base/xfce-mcs-plugins
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-mcs-plugins/ChangeLog,v 1.73 2007/01/22 02:09:33 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-mcs-plugins/ChangeLog,v 1.74 2007/01/22 21:12:41 welp Exp $
+
+  22 Jan 2007; Peter Weller <welp@gentoo.org>
+  -files/xfce-mcs-plugins-4.3.99.2-icon.patch,
+  xfce-mcs-plugins-4.4.0.ebuild:
+  Removed uneeded patch, other trivial changes
 
 *xfce-mcs-plugins-4.4.0 (22 Jan 2007)
 
diff --git a/xfce-base/xfce-mcs-plugins/files/xfce-mcs-plugins-4.3.99.2-icon.patch b/xfce-base/xfce-mcs-plugins/files/xfce-mcs-plugins-4.3.99.2-icon.patch
deleted file mode 100644
index 43eab46eb2ce..000000000000
--- a/xfce-base/xfce-mcs-plugins/files/xfce-mcs-plugins-4.3.99.2-icon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru xfce-mcs-plugins-4.3.99.2/icons/48x48/Makefile.am xfce-mcs-plugins-4.3.99.2-patched/icons/48x48/Makefile.am
---- xfce-mcs-plugins-4.3.99.2/icons/48x48/Makefile.am	2006-11-05 08:49:30.000000000 -0500
-+++ xfce-mcs-plugins-4.3.99.2-patched/icons/48x48/Makefile.am	2006-12-08 15:52:24.000000000 -0500
-@@ -2,7 +2,6 @@
- 
- iconsdir = $(datadir)/icons/hicolor/48x48/apps
- icons_DATA =								\
--	xfce-filemanager.png						\
- 	xfce4-display.png						\
- 	xfce4-keyboard.png						\
- 	xfce4-mouse.png							\
diff --git a/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.4.0.ebuild b/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.4.0.ebuild
index ff15ff7ba6c3..0a3e78722998 100644
--- a/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.4.0.ebuild
+++ b/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.4.0.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.4.0.ebuild,v 1.1 2007/01/22 02:09:33 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.4.0.ebuild,v 1.2 2007/01/22 21:12:41 welp Exp $
 
-inherit gnome2 xfce44
+inherit xfce44
 
 xfce44
 
 DESCRIPTION="Xfce4 MCS Plugins"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
-RDEPEND="|| ( ( x11-libs/libX11
+RDEPEND="x11-libs/libX11
 	x11-libs/libXcursor
 	x11-libs/libXrandr
 	x11-libs/libXrender
@@ -17,40 +17,19 @@ RDEPEND="|| ( ( x11-libs/libX11
 	x11-libs/libSM
 	x11-libs/libXext
 	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm )
-	virtual/x11 )
+	x11-libs/libXxf86vm
 	>=dev-libs/glib-2
 	>=x11-libs/gtk+-2.6
-	>=xfce-base/libxfce4mcs-${PV}
-	>=xfce-base/libxfce4util-${PV}
-	>=xfce-base/libxfcegui4-${PV}
-	>=xfce-base/xfce-mcs-manager-${PV}"
-# need xfce4-dev-tools, since we patch automake and need regeneration
+	>=xfce-base/libxfce4mcs-4.4
+	>=xfce-base/libxfce4util-4.4
+	>=xfce-base/libxfcegui4-4.4
+	>=xfce-base/xfce-mcs-manager-4.4"
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xf86miscproto
+	x11-proto/xf86miscproto
 	x11-proto/xf86vidmodeproto
-	x11-proto/xproto )
-	virtual/x11 )
+	x11-proto/xproto
 	>=xfce-extra/xfce4-dev-tools-${PV}"
 
-XFCE_CONFIG="--enable-xf86misc --enable-xkb --enable-randr --enable-xf86vm"
+XFCE_CONFIG="${XFCE_CONFIG} --enable-xf86misc --enable-xkb --enable-randr --enable-xf86vm"
 
 xfce44_core_package
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# don't install xfce-filemanager.png, which collides with xfce4-session
-	epatch ${FILESDIR}/${P}-icon.patch
-	# regenerate stuff, but don't run configure yet
-	NOCONFIGURE="true" xdt-autogen
-}
-
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}