Temporary fix for plugins getting installed in /usr/local

(Portage version: 2.1.2_rc2-r1)
 (Unsigned Manifest commit)

3 files changed, 11 insertions, 67 deletions

diff --git a/xfce-base/xfce-mcs-plugins/Manifest b/xfce-base/xfce-mcs-plugins/Manifest
index 9bfef4b1a3dd..d0af84297416 100644
--- a/xfce-base/xfce-mcs-plugins/Manifest
+++ b/xfce-base/xfce-mcs-plugins/Manifest
@@ -8,14 +8,14 @@ EBUILD xfce-mcs-plugins-4.2.3.ebuild 772 RMD160 31f7e6c4f0576c4c20d1dc57e47f0b63
 MD5 31c888d9b98a004cca0c441f6a775299 xfce-mcs-plugins-4.2.3.ebuild 772
 RMD160 31f7e6c4f0576c4c20d1dc57e47f0b630b89e79f xfce-mcs-plugins-4.2.3.ebuild 772
 SHA256 4dc341da8659a636fb5cfda99f26f9f97f0a07751753b3933de24f038d8ae71b xfce-mcs-plugins-4.2.3.ebuild 772
-EBUILD xfce-mcs-plugins-4.3.99.2-r1.ebuild 1260 RMD160 d414a28acd516a6f67d3b9222286506160144579 SHA1 dd05fa4aefabae8caaf88a541fc089a1e28a032f SHA256 1260c2d48a58831a2b3a0348787528959e5faec5eee107538018dde35a1b8be6
-MD5 c44d9772ff76f48ffe4215e3f97ba296 xfce-mcs-plugins-4.3.99.2-r1.ebuild 1260
-RMD160 d414a28acd516a6f67d3b9222286506160144579 xfce-mcs-plugins-4.3.99.2-r1.ebuild 1260
-SHA256 1260c2d48a58831a2b3a0348787528959e5faec5eee107538018dde35a1b8be6 xfce-mcs-plugins-4.3.99.2-r1.ebuild 1260
-MISC ChangeLog 9424 RMD160 83a30fd8b3c82e17eb1bccb71e9e2619d57ad95f SHA1 8e417acb50326ec5f4b456b2d9a666b132ae2c79 SHA256 31347c13363a9f844efe7cc93690945d180bef0822626967677c0b4a8f63db55
-MD5 ed755d844351bd00e73d079757dd5325 ChangeLog 9424
-RMD160 83a30fd8b3c82e17eb1bccb71e9e2619d57ad95f ChangeLog 9424
-SHA256 31347c13363a9f844efe7cc93690945d180bef0822626967677c0b4a8f63db55 ChangeLog 9424
+EBUILD xfce-mcs-plugins-4.3.99.2-r2.ebuild 1274 RMD160 5d8a7eb67c0e010d136f6f0561866951b4c88271 SHA1 63a4d2db5d3d0f922f630ebccf748098d70543fa SHA256 6ff3b499cdd360d45e6455ec800c48d0b6f012ce94222bb537777cc680e21358
+MD5 c1a323f678ec48000bdb64711eafc89b xfce-mcs-plugins-4.3.99.2-r2.ebuild 1274
+RMD160 5d8a7eb67c0e010d136f6f0561866951b4c88271 xfce-mcs-plugins-4.3.99.2-r2.ebuild 1274
+SHA256 6ff3b499cdd360d45e6455ec800c48d0b6f012ce94222bb537777cc680e21358 xfce-mcs-plugins-4.3.99.2-r2.ebuild 1274
+MISC ChangeLog 9660 RMD160 469fb1491eb2116149492c62b929c0be2f2c6c2b SHA1 b56162dc8fbe4a088b0723382238cc3c12970eba SHA256 ebffbe6f68c4a106ad8362ca883801f1b2317ef4dd0152c56317d0b265bc8c7d
+MD5 96629a2361e66c0538574b8a4b66b2c3 ChangeLog 9660
+RMD160 469fb1491eb2116149492c62b929c0be2f2c6c2b ChangeLog 9660
+SHA256 ebffbe6f68c4a106ad8362ca883801f1b2317ef4dd0152c56317d0b265bc8c7d ChangeLog 9660
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157
@@ -23,6 +23,6 @@ SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61 metadata
 MD5 c1617e3998719791117df1660ac3983d files/digest-xfce-mcs-plugins-4.2.3 271
 RMD160 4033d87f3f130da787c574121e69c2f6f9fd4f01 files/digest-xfce-mcs-plugins-4.2.3 271
 SHA256 08d4bc13661cdfafcb4e69b68b20703eb5b31eb8a11d41c878da929689c32a8a files/digest-xfce-mcs-plugins-4.2.3 271
-MD5 542e00ae0a93ce3177b0024f7db9864a files/digest-xfce-mcs-plugins-4.3.99.2-r1 280
-RMD160 316f0f1322badea81e099efa5d3dad7e0b58c73f files/digest-xfce-mcs-plugins-4.3.99.2-r1 280
-SHA256 4f220531749f8f6edb44cd6a6f9d23af234935f70ce7eb0431f7f4ab85679ceb files/digest-xfce-mcs-plugins-4.3.99.2-r1 280
+MD5 542e00ae0a93ce3177b0024f7db9864a files/digest-xfce-mcs-plugins-4.3.99.2-r2 280
+RMD160 316f0f1322badea81e099efa5d3dad7e0b58c73f files/digest-xfce-mcs-plugins-4.3.99.2-r2 280
+SHA256 4f220531749f8f6edb44cd6a6f9d23af234935f70ce7eb0431f7f4ab85679ceb files/digest-xfce-mcs-plugins-4.3.99.2-r2 280
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
deleted file mode 100644
index 4d8505dfbe0f..000000000000
--- a/xfce-base/xfce-mcs-plugins/files/digest-xfce-mcs-plugins-4.3.99.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-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/xfce-mcs-plugins-4.3.99.2-r1.ebuild b/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.3.99.2-r1.ebuild
deleted file mode 100644
index 65cc17710126..000000000000
--- a/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.3.99.2-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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
-}