From: Joshua Nichols <nichoj@gentoo.org>
Date: Fri, 8 Dec 2006 21:55:36 +0000 (+0000)
Subject: Fixes a file collision, to fix bug #146645. Pruned old version.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2333c3e2769bb4006a2e4424d679e321e6a1e077;p=gentoo.git

Fixes a file collision, to fix bug #146645. Pruned old version.
Package-Manager: portage-2.1.2_rc2-r1
---

diff --git a/xfce-base/xfce-mcs-plugins/ChangeLog b/xfce-base/xfce-mcs-plugins/ChangeLog
index 6e9aaa4a4d4b..b112d42c783e 100644
--- a/xfce-base/xfce-mcs-plugins/ChangeLog
+++ b/xfce-base/xfce-mcs-plugins/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for xfce-base/xfce-mcs-plugins
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-mcs-plugins/ChangeLog,v 1.69 2006/12/05 19:04:11 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-mcs-plugins/ChangeLog,v 1.70 2006/12/08 21:55:36 nichoj Exp $
+
+*xfce-mcs-plugins-4.3.99.2-r1 (08 Dec 2006)
+
+  08 Dec 2006; Joshua Nichols <nichoj@gentoo.org>
+  +files/xfce-mcs-plugins-4.3.99.2-icon.patch,
+  -xfce-mcs-plugins-4.2.1.ebuild, -xfce-mcs-plugins-4.2.2.ebuild,
+  -xfce-mcs-plugins-4.2.2-r1.ebuild, -xfce-mcs-plugins-4.3.90.1.ebuild,
+  -xfce-mcs-plugins-4.3.90.2.ebuild, -xfce-mcs-plugins-4.3.99.2.ebuild,
+  +xfce-mcs-plugins-4.3.99.2-r1.ebuild:
+  Fixes a file collision, to fix bug #146645. Pruned old version.
 
 *xfce-mcs-plugins-4.3.99.2 (07 Dec 2006)
 
diff --git a/xfce-base/xfce-mcs-plugins/files/digest-xfce-mcs-plugins-4.3.99.2-r1 b/xfce-base/xfce-mcs-plugins/files/digest-xfce-mcs-plugins-4.3.99.2-r1
new file mode 100644
index 000000000000..4d8505dfbe0f
--- /dev/null
+++ b/xfce-base/xfce-mcs-plugins/files/digest-xfce-mcs-plugins-4.3.99.2-r1
@@ -0,0 +1,3 @@
+MD5 6234425227e1145319bd75ef52fa97f5 xfce-mcs-plugins-4.3.99.2.tar.bz2 842712
+RMD160 572088b0429f984bedc62484a7a28b2d37aab305 xfce-mcs-plugins-4.3.99.2.tar.bz2 842712
+SHA256 f2773a4c007139f0a06c418b3535374ebeed8e10eef41d3ae69f4259f6f632a5 xfce-mcs-plugins-4.3.99.2.tar.bz2 842712
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
new file mode 100644
index 000000000000..43eab46eb2ce
--- /dev/null
+++ b/xfce-base/xfce-mcs-plugins/files/xfce-mcs-plugins-4.3.99.2-icon.patch
@@ -0,0 +1,11 @@
+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.3.99.2-r1.ebuild b/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.3.99.2-r1.ebuild
new file mode 100644
index 000000000000..65cc17710126
--- /dev/null
+++ b/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.3.99.2-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2006 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.3.99.2-r1.ebuild,v 1.1 2006/12/08 21:55:36 nichoj Exp $
+
+inherit gnome2 xfce44
+
+xfce44_beta
+
+DESCRIPTION="Xfce4 mcs plugins"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="|| ( ( x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXext
+	x11-libs/libXxf86misc
+	x11-libs/libXxf86vm )
+	virtual/x11 )
+	>=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
+DEPEND="${RDEPEND}
+	|| ( ( x11-proto/xf86miscproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xproto )
+	virtual/x11 )
+	xfce-extra/xfce4-dev-tools"
+
+CONFIGURE="xdt-autogen"
+XFCE_CONFIG="--enable-xf86misc --enable-xkb --enable-randr --enable-xf86vm"
+
+xfce44_core_package
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-icon.patch
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}