Don't allow broken icon themes patch from bug 167180, applied also by upstream.

(Portage version: 2.1.2-r9)

4 files changed, 63 insertions, 1 deletions

diff --git a/xfce-base/xfce-mcs-plugins/ChangeLog b/xfce-base/xfce-mcs-plugins/ChangeLog
index 32813200e801..e99b7da51053 100644
--- a/xfce-base/xfce-mcs-plugins/ChangeLog
+++ b/xfce-base/xfce-mcs-plugins/ChangeLog
@@ -1,6 +1,13 @@
 # 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.78 2007/02/03 01:02:11 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-mcs-plugins/ChangeLog,v 1.79 2007/02/18 14:00:34 drac Exp $
+
+*xfce-mcs-plugins-4.4.0-r1 (18 Feb 2007)
+
+  18 Feb 2007; Samuli Suominen <drac@gentoo.org>
+  +files/xfce-mcs-plugins-4.4.0-no-broken-themes.patch,
+  +xfce-mcs-plugins-4.4.0-r1.ebuild:
+  Don't allow broken icon themes patch from bug 167180, applied also by upstream.
 
   03 Feb 2007; Joshua Nichols <nichoj@gentoo.org>
   -xfce-mcs-plugins-4.3.99.2-r3.ebuild:
diff --git a/xfce-base/xfce-mcs-plugins/files/digest-xfce-mcs-plugins-4.4.0-r1 b/xfce-base/xfce-mcs-plugins/files/digest-xfce-mcs-plugins-4.4.0-r1
new file mode 100644
index 000000000000..eb8328471493
--- /dev/null
+++ b/xfce-base/xfce-mcs-plugins/files/digest-xfce-mcs-plugins-4.4.0-r1
@@ -0,0 +1,3 @@
+MD5 95213345e3ccd224a30b2be01e9c06b9 xfce-mcs-plugins-4.4.0.tar.bz2 850632
+RMD160 fd09de27aa519b3ab4a650cebb7ddc74c8e0c77f xfce-mcs-plugins-4.4.0.tar.bz2 850632
+SHA256 844d139946a417f17e0d88da7c5bb548cf2ef1f4438ae58e051890b765db1fc4 xfce-mcs-plugins-4.4.0.tar.bz2 850632
diff --git a/xfce-base/xfce-mcs-plugins/files/xfce-mcs-plugins-4.4.0-no-broken-themes.patch b/xfce-base/xfce-mcs-plugins/files/xfce-mcs-plugins-4.4.0-no-broken-themes.patch
new file mode 100644
index 000000000000..13788d8fdd8a
--- /dev/null
+++ b/xfce-base/xfce-mcs-plugins/files/xfce-mcs-plugins-4.4.0-no-broken-themes.patch
@@ -0,0 +1,12 @@
+diff -ur xfce-mcs-plugins-4.4.0.orig/plugins/ui_plugin/ui_plugin.c xfce-mcs-plugins-4.4.0/plugins/ui_plugin/ui_plugin.c
+--- xfce-mcs-plugins-4.4.0.orig/plugins/ui_plugin/ui_plugin.c	2007-01-20 18:45:31.000000000 +0300
++++ xfce-mcs-plugins-4.4.0/plugins/ui_plugin/ui_plugin.c	2007-02-16 13:57:30.000000000 +0300
+@@ -395,7 +395,7 @@
+ 
+             xfce_rc_set_group(themefile, "Icon Theme");
+ 
+-            if(strcmp(xfce_rc_read_entry(themefile, "Hidden", "false"), "true") == 0)
++            if(! xfce_rc_has_entry(themefile, "Directories") || (strcmp(xfce_rc_read_entry(themefile, "Hidden", "false"), "true") == 0))
+             {
+                 xfce_rc_close(themefile);
+                 continue;
diff --git a/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.4.0-r1.ebuild b/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.4.0-r1.ebuild
new file mode 100644
index 000000000000..7b06c357a3fb
--- /dev/null
+++ b/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.4.0-r1.ebuild
@@ -0,0 +1,40 @@
+# 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-r1.ebuild,v 1.1 2007/02/18 14:00:34 drac Exp $
+
+inherit eutils xfce44
+
+xfce44
+
+DESCRIPTION="Setting plugins"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="debug"
+
+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
+	>=dev-libs/glib-2.6
+	>=x11-libs/gtk+-2.6
+	>=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}
+	>=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+XFCE_CONFIG="${XFCE_CONFIG} --enable-xf86misc --enable-xkb --enable-randr --enable-xf86vm"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-no-broken-themes.patch"
+}
+
+xfce44_core_package