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

Package-Manager: portage-2.1.2-r9

diff --git a/xfce-base/xfce-mcs-plugins/ChangeLog b/xfce-base/xfce-mcs-plugins/ChangeLog
index 32813200e801c87552bcf9caea0809d06342f814..e99b7da51053503f667e60739f84067af7c01402 100644 (file)
--- 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/Manifest b/xfce-base/xfce-mcs-plugins/Manifest
index 9f47340a7066a81ef72fab8ecf36a13a3c6ad76c..2a8fe408e7e52ba22823681c6d3f017c5f624cb4 100644 (file)
--- a/xfce-base/xfce-mcs-plugins/Manifest
+++ b/xfce-base/xfce-mcs-plugins/Manifest
@@ -1,17 +1,25 @@
+AUX xfce-mcs-plugins-4.4.0-no-broken-themes.patch 702 RMD160 b48a0e17582b12a598a3f01d8fd58c78d258a20b SHA1 f499e7fc7f4ee8b945c17ded7cac045eb421c6aa SHA256 ccba45507f99d87fa874036d7ebaaf7cd1254f5c7e40bb6be7e88edef5aab03e
+MD5 088c3a86fb008c06a05c053dd2e44019 files/xfce-mcs-plugins-4.4.0-no-broken-themes.patch 702
+RMD160 b48a0e17582b12a598a3f01d8fd58c78d258a20b files/xfce-mcs-plugins-4.4.0-no-broken-themes.patch 702
+SHA256 ccba45507f99d87fa874036d7ebaaf7cd1254f5c7e40bb6be7e88edef5aab03e files/xfce-mcs-plugins-4.4.0-no-broken-themes.patch 702
 DIST xfce-mcs-plugins-4.2.3.tar.gz 1009785 RMD160 0e9b69dba25ec43800a4585b6976f43f381cb2e4 SHA1 981a3a38d9063f3b9de32f13384677bf631d135a SHA256 57dffc6ac2d44a8feb11e30f4a12810ab3a22b436b38ea873d3706a62caea169
 DIST xfce-mcs-plugins-4.4.0.tar.bz2 850632 RMD160 fd09de27aa519b3ab4a650cebb7ddc74c8e0c77f SHA1 dcaa3a2d0291e640980355b0c5baadd9e87afea4 SHA256 844d139946a417f17e0d88da7c5bb548cf2ef1f4438ae58e051890b765db1fc4
 EBUILD xfce-mcs-plugins-4.2.3.ebuild 772 RMD160 31f7e6c4f0576c4c20d1dc57e47f0b630b89e79f SHA1 61f1077a51ff74aa28d06ecff78fab30f62c8cbd SHA256 4dc341da8659a636fb5cfda99f26f9f97f0a07751753b3933de24f038d8ae71b
 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.4.0-r1.ebuild 997 RMD160 614144596a3c9558cb4c289833d7661403b03980 SHA1 88d7003647f1048a7441e3a3286aaa15f82ec7d4 SHA256 0285209c687085f4158f93b9e26d923b6ddf0db2b4f48bc61cd83c236e5e49bb
+MD5 f4426ac5cde72c5622ae07e70fb688c8 xfce-mcs-plugins-4.4.0-r1.ebuild 997
+RMD160 614144596a3c9558cb4c289833d7661403b03980 xfce-mcs-plugins-4.4.0-r1.ebuild 997
+SHA256 0285209c687085f4158f93b9e26d923b6ddf0db2b4f48bc61cd83c236e5e49bb xfce-mcs-plugins-4.4.0-r1.ebuild 997
 EBUILD xfce-mcs-plugins-4.4.0.ebuild 937 RMD160 32553ce2e81d934ab8af4ac0e401f510bae16101 SHA1 b879914d2f17ba99e8aebb197e6579a25b0524e8 SHA256 43879d4ec233abea9c6f43bb4d61560de1750e4ccc39eba453f1e7f002c62ddd
 MD5 69ba2a648e1795d5390aea6814139711 xfce-mcs-plugins-4.4.0.ebuild 937
 RMD160 32553ce2e81d934ab8af4ac0e401f510bae16101 xfce-mcs-plugins-4.4.0.ebuild 937
 SHA256 43879d4ec233abea9c6f43bb4d61560de1750e4ccc39eba453f1e7f002c62ddd xfce-mcs-plugins-4.4.0.ebuild 937
-MISC ChangeLog 10809 RMD160 1169c94d9cdaf33d0dcbc37463855bfa66e451f2 SHA1 bc154c77fa55cc88244305d507f27656710b8969 SHA256 2f0c70ecfdbc2f055629178d556c6f26b93639977f029dfbf8f2f319d71bc6bf
-MD5 65871c4ba6e849c86492857734c6d7ae ChangeLog 10809
-RMD160 1169c94d9cdaf33d0dcbc37463855bfa66e451f2 ChangeLog 10809
-SHA256 2f0c70ecfdbc2f055629178d556c6f26b93639977f029dfbf8f2f319d71bc6bf ChangeLog 10809
+MISC ChangeLog 11074 RMD160 d638bce440efcec1937383142cbac6736b2f4d4d SHA1 0136da81fe7219c13eb7e44531de909df06f2cf6 SHA256 3d75526020c944765f843ba853467edf67ae2e8d9035915a991c1f007c8a23f7
+MD5 77a5f838c0d6f3ed3b867faed14bb624 ChangeLog 11074
+RMD160 d638bce440efcec1937383142cbac6736b2f4d4d ChangeLog 11074
+SHA256 3d75526020c944765f843ba853467edf67ae2e8d9035915a991c1f007c8a23f7 ChangeLog 11074
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157
@@ -22,3 +30,6 @@ SHA256 08d4bc13661cdfafcb4e69b68b20703eb5b31eb8a11d41c878da929689c32a8a files/di
 MD5 7f8779ced364d6da5e3a7e8a34c938e0 files/digest-xfce-mcs-plugins-4.4.0 271
 RMD160 5da6cce1ce483e62eecfb0a194f3c3a2d799fb73 files/digest-xfce-mcs-plugins-4.4.0 271
 SHA256 9ea0157bd3dc53bc329b1c235231230fa8bb5b705f34f990bd524bbc06ee298b files/digest-xfce-mcs-plugins-4.4.0 271
+MD5 7f8779ced364d6da5e3a7e8a34c938e0 files/digest-xfce-mcs-plugins-4.4.0-r1 271
+RMD160 5da6cce1ce483e62eecfb0a194f3c3a2d799fb73 files/digest-xfce-mcs-plugins-4.4.0-r1 271
+SHA256 9ea0157bd3dc53bc329b1c235231230fa8bb5b705f34f990bd524bbc06ee298b files/digest-xfce-mcs-plugins-4.4.0-r1 271

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 (file)
index 0000000..eb83284
--- /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 (file)
index 0000000..13788d8
--- /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 (file)
index 0000000..7b06c35
--- /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