Removed uneeded patch, other trivial changes

Package-Manager: portage-2.1.2-r1

diff --git a/xfce-base/xfce-mcs-plugins/ChangeLog b/xfce-base/xfce-mcs-plugins/ChangeLog
index 8db842002cbe5e1c9ee78f3aaa7a8cd44018b28d..3402c9202b08db4886d9f7bb23afa14ec9bc801e 100644 (file)
--- 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/Manifest b/xfce-base/xfce-mcs-plugins/Manifest
index 3975f76ad9ea26eaee5f5c813900f19c53dcc0ff..8fc8a60e23b77c9d4ae99619346d167f629c8698 100644 (file)
--- a/xfce-base/xfce-mcs-plugins/Manifest
+++ b/xfce-base/xfce-mcs-plugins/Manifest
@@ -1,7 +1,3 @@
-AUX xfce-mcs-plugins-4.3.99.2-icon.patch 505 RMD160 c5e75c16829143a09c008652825749d0e3b4bdc7 SHA1 0fe6632097d5006fc8c4de734e076bece7d6ef04 SHA256 57dbfa515cfc3c292dfdd3edb26d1fe66db8c6bc87510a853cde7054e38cafda
-MD5 875c15c6ed0a30a3d6cf6486b0af6ec7 files/xfce-mcs-plugins-4.3.99.2-icon.patch 505
-RMD160 c5e75c16829143a09c008652825749d0e3b4bdc7 files/xfce-mcs-plugins-4.3.99.2-icon.patch 505
-SHA256 57dbfa515cfc3c292dfdd3edb26d1fe66db8c6bc87510a853cde7054e38cafda files/xfce-mcs-plugins-4.3.99.2-icon.patch 505
 DIST xfce-mcs-plugins-4.2.3.tar.gz 1009785 RMD160 0e9b69dba25ec43800a4585b6976f43f381cb2e4 SHA1 981a3a38d9063f3b9de32f13384677bf631d135a SHA256 57dffc6ac2d44a8feb11e30f4a12810ab3a22b436b38ea873d3706a62caea169
 DIST xfce-mcs-plugins-4.3.99.2.tar.bz2 842712 RMD160 572088b0429f984bedc62484a7a28b2d37aab305 SHA1 933c1d5a9b043dfbe793522574788a0c9615c9aa SHA256 f2773a4c007139f0a06c418b3535374ebeed8e10eef41d3ae69f4259f6f632a5
 DIST xfce-mcs-plugins-4.4.0.tar.bz2 850632 RMD160 fd09de27aa519b3ab4a650cebb7ddc74c8e0c77f SHA1 dcaa3a2d0291e640980355b0c5baadd9e87afea4 SHA256 844d139946a417f17e0d88da7c5bb548cf2ef1f4438ae58e051890b765db1fc4
@@ -13,14 +9,14 @@ EBUILD xfce-mcs-plugins-4.3.99.2-r3.ebuild 1391 RMD160 4ca4779ed665a3be975eb6d45
 MD5 10becda60defa73e2a72613aba03c38c xfce-mcs-plugins-4.3.99.2-r3.ebuild 1391
 RMD160 4ca4779ed665a3be975eb6d45201b00d5566d32f xfce-mcs-plugins-4.3.99.2-r3.ebuild 1391
 SHA256 df0173f26256edc1d8a8ff7c0e719fe8959011612ef0494a9abb88e085ea01ec xfce-mcs-plugins-4.3.99.2-r3.ebuild 1391
-EBUILD xfce-mcs-plugins-4.4.0.ebuild 1392 RMD160 4876fd1581eafd0201fc72d211d585be2d2015cc SHA1 78e43548022867b497345edb6de3b17c37b5e175 SHA256 8da551da39fffaa24c7ba327dfd4e39336476c3223689442394cd539e2e964b6
-MD5 0d1319dee389a5366ce767f801f9de9f xfce-mcs-plugins-4.4.0.ebuild 1392
-RMD160 4876fd1581eafd0201fc72d211d585be2d2015cc xfce-mcs-plugins-4.4.0.ebuild 1392
-SHA256 8da551da39fffaa24c7ba327dfd4e39336476c3223689442394cd539e2e964b6 xfce-mcs-plugins-4.4.0.ebuild 1392
-MISC ChangeLog 10153 RMD160 78fe258797d085b2812751075b314a31bab74472 SHA1 dc57d09df3f2625740633bf6e17448ceac305bc1 SHA256 a70a8613ddd13ca8484658506030a5bfb896e863b1960130110f9c5602603f5e
-MD5 5b2a2ad118cd97044c6a88ccc52c6483 ChangeLog 10153
-RMD160 78fe258797d085b2812751075b314a31bab74472 ChangeLog 10153
-SHA256 a70a8613ddd13ca8484658506030a5bfb896e863b1960130110f9c5602603f5e ChangeLog 10153
+EBUILD xfce-mcs-plugins-4.4.0.ebuild 951 RMD160 2b7df9639e02e79077c72cccc60003d8a0237781 SHA1 b34fca287c84bc349d9b9062592891706c465878 SHA256 0aba25721ab500fe671e639484adf1b14711f6d87f32de07f1a29fd75c4144e7
+MD5 d3ca873b9e6f11a7def3eafb871fb97f xfce-mcs-plugins-4.4.0.ebuild 951
+RMD160 2b7df9639e02e79077c72cccc60003d8a0237781 xfce-mcs-plugins-4.4.0.ebuild 951
+SHA256 0aba25721ab500fe671e639484adf1b14711f6d87f32de07f1a29fd75c4144e7 xfce-mcs-plugins-4.4.0.ebuild 951
+MISC ChangeLog 10325 RMD160 dd68d365bbbab94fa2247ed5ace2821d4c7be68a SHA1 a614f55bca03b00501f57f4b5a5432354070b6f0 SHA256 d27ad69b3be9018ac387f0f94fc0d8c5c100f21c539cdfec63698f1c928a4ae0
+MD5 3800336c149ccb775316a58e3d3d7c7b ChangeLog 10325
+RMD160 dd68d365bbbab94fa2247ed5ace2821d4c7be68a ChangeLog 10325
+SHA256 d27ad69b3be9018ac387f0f94fc0d8c5c100f21c539cdfec63698f1c928a4ae0 ChangeLog 10325
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157

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 (file)
index 43eab46..0000000
--- 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 ff15ff7ba6c3f50857224ec07db114b1e68cfdef..0a3e7872299872ca5db6e825efd5577f5cdc88e7 100644 (file)
--- 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
-}