Overdue bump to 1.2.25, spring cleaning too

Package-Manager: portage-2.1_pre7-r4

16 files changed, 84 insertions, 287 deletions

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index 20346b8fbc9c..2b7962b965c2 100644
--- a/x11-wm/icewm/ChangeLog
+++ b/x11-wm/icewm/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for x11-wm/icewm
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.108 2006/01/24 23:42:29 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.109 2006/04/09 01:29:21 morfic Exp $
+
+*icewm-1.2.25 (09 Apr 2006)
+
+  09 Apr 2006; Daniel Goller <morfic@gentoo.org>
+  -files/icewm-1.2.20.iceicon.patch, -files/icewm-1.2.20.testmap.patch,
+  -files/icewm-1.2.20.ybutton.cc.patch, -files/icewm-1.2.21.testmap.patch,
+  -files/icewm-1.2.21.ybutton.cc.patch,
+  -files/icewm-1.2.22.ybutton.cc.patch, +files/icewm-1.2.25-gcc41.patch,
+  +files/icewm-1.2.25.ybutton.cc.patch, -icewm-1.2.20.ebuild,
+  -icewm-1.2.21.ebuild, -icewm-1.2.22.ebuild, +icewm-1.2.25.ebuild:
+  Overdue bump to 1.2.25, spring cleaning too
 
   24 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> icewm-1.2.23.ebuild:
   Fixed DEPEND for modular X.
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index b9944afb9b89..49a657108eaa 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,19 +1,43 @@
-MD5 45e2a36b7d18af232c54c6cfc980ed4a ChangeLog 16989
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ac2b503b7459b1f9706027fe9d852e00 ChangeLog 17502
+RMD160 cc39f3e2ccb89a510f08efb58ee93a5927e4a4b3 ChangeLog 17502
+SHA256 871ef1c84d3853796d63ed58cd7672c6275ee7a14b7bd764b47a845d63d20790 ChangeLog 17502
 MD5 9028fc0d1b794c88e4a2db9cf28f66f0 files/IceWM.desktop 200
-MD5 1ba6fc06d92e0a7d0d4357d83db74493 files/digest-icewm-1.2.20 64
-MD5 ab0c279c830a4148e8c4bba52df974b0 files/digest-icewm-1.2.21 64
-MD5 a644431b77f0f8026d82b40033a46d3e files/digest-icewm-1.2.22 64
+RMD160 0b1de8ea8569d3e15006dcee81d582404d73685f files/IceWM.desktop 200
+SHA256 7564e6a573365eae529b849c7f5723eaef39258d785fd83de42e122cdf8e0eb1 files/IceWM.desktop 200
 MD5 39a926bf34be3c704ff71518f13a175b files/digest-icewm-1.2.23 65
-MD5 cea1a375dba2fc5a6d9675d7255229aa files/icewm-1.2.20.iceicon.patch 394
-MD5 b3bb2875e9f96c7fbd5620a7388626b0 files/icewm-1.2.20.testmap.patch 529
-MD5 0adfec296f9e1a9eb08a326c0690c28e files/icewm-1.2.20.ybutton.cc.patch 591
-MD5 b3bb2875e9f96c7fbd5620a7388626b0 files/icewm-1.2.21.testmap.patch 529
-MD5 0adfec296f9e1a9eb08a326c0690c28e files/icewm-1.2.21.ybutton.cc.patch 591
-MD5 0adfec296f9e1a9eb08a326c0690c28e files/icewm-1.2.22.ybutton.cc.patch 591
+RMD160 7b7caa354e7d4a343acdd611bca860209bf26a6e files/digest-icewm-1.2.23 65
+SHA256 177cef1d0f60dc8c53e55285d43d5a4aa823d5825954517962150e6ed220beda files/digest-icewm-1.2.23 65
+MD5 7ac15125978a7d74b831baad4a1d0807 files/digest-icewm-1.2.25 241
+RMD160 9fceccb15a08e608f5a4d49f5ae6cf90dab2a6b8 files/digest-icewm-1.2.25 241
+SHA256 5e0f35eedf89314f542276cd7576f7f238e7784a42356cd0afcb1312b96ae73d files/digest-icewm-1.2.25 241
 MD5 6c31373fef2347787b0ac6b504642f6e files/icewm-1.2.23-gcc41.patch 1521
+RMD160 6de0933e58fa4c4e0144da977eb73d8c6b996086 files/icewm-1.2.23-gcc41.patch 1521
+SHA256 9c9fdf5f78d821bee818bd51f9bf3de6b1edb3800bf0bf9a72762751524269f4 files/icewm-1.2.23-gcc41.patch 1521
 MD5 0adfec296f9e1a9eb08a326c0690c28e files/icewm-1.2.23.ybutton.cc.patch 591
-MD5 e74fd3f8b677b9a200feacf2fdc7f244 icewm-1.2.20.ebuild 2310
-MD5 646a3a2aa9a92246bec0db5211f16133 icewm-1.2.21.ebuild 2270
-MD5 1179ec44ecc2f0198fb5ef3de42a108d icewm-1.2.22.ebuild 2228
+RMD160 1ade595dadaaa5494b84e4ba6ce76c88eb900e5d files/icewm-1.2.23.ybutton.cc.patch 591
+SHA256 2a5f61bfba0affa9734a6ce167db2b76a2750033db69e7ae692d8c8ab3b1324a files/icewm-1.2.23.ybutton.cc.patch 591
+MD5 50083fec82eb79a039a23fb96bad2fc7 files/icewm-1.2.25-gcc41.patch 608
+RMD160 dab0e7d33df2c277de8a9430c0dfebcd6049e7de files/icewm-1.2.25-gcc41.patch 608
+SHA256 bfe473799b8564da15bbe2b00779dc472c9c854d827d70ba5efe005219770027 files/icewm-1.2.25-gcc41.patch 608
+MD5 0adfec296f9e1a9eb08a326c0690c28e files/icewm-1.2.25.ybutton.cc.patch 591
+RMD160 1ade595dadaaa5494b84e4ba6ce76c88eb900e5d files/icewm-1.2.25.ybutton.cc.patch 591
+SHA256 2a5f61bfba0affa9734a6ce167db2b76a2750033db69e7ae692d8c8ab3b1324a files/icewm-1.2.25.ybutton.cc.patch 591
 MD5 9714ddd60475f1070463e9f2bb15df39 icewm-1.2.23.ebuild 2541
+RMD160 f0f9efeee8e17b93a68f235911c90398d602eba6 icewm-1.2.23.ebuild 2541
+SHA256 9ca12a913d0a54a2671999044dd55095e1aec70af6ef2ea54cb4f96b7a36ad15 icewm-1.2.23.ebuild 2541
+MD5 8ceaa9bbd185849888804d0cab0b9e90 icewm-1.2.25.ebuild 2543
+RMD160 89265483bd3e1780b406fb267d186d4dbabf0efa icewm-1.2.25.ebuild 2543
+SHA256 9c89a7f806609bfd2231b13bca361fc63374c3a64ba55f76175dc4575931a8ea icewm-1.2.25.ebuild 2543
 MD5 a26b94d92c1e03083b7020e2f4c1afe9 metadata.xml 630
+RMD160 8ccd4a508c55ae60ea8df12a6dc885dcb194ce82 metadata.xml 630
+SHA256 f953ed71f13606da930e0bf27997358533008989364c1d3badf31b0276b80191 metadata.xml 630
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.1 (GNU/Linux)
+
+iD8DBQFEOFVr/aM9DdBw91cRAs4fAJ442R5tT6S6wfWgN25Mxqq6+SSxSQCfT5o3
+3M2G6QOARKCGtbUF/2nPyiE=
+=P1P/
+-----END PGP SIGNATURE-----
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.20 b/x11-wm/icewm/files/digest-icewm-1.2.20
deleted file mode 100644
index afeadd967029..000000000000
--- a/x11-wm/icewm/files/digest-icewm-1.2.20
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6c94dae56fbf9aa085a1d780538018c1 icewm-1.2.20.tar.gz 948530
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.21 b/x11-wm/icewm/files/digest-icewm-1.2.21
deleted file mode 100644
index e24f1bc54b52..000000000000
--- a/x11-wm/icewm/files/digest-icewm-1.2.21
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0c17d89fea9044d79a29b88aa6199968 icewm-1.2.21.tar.gz 969491
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.22 b/x11-wm/icewm/files/digest-icewm-1.2.22
deleted file mode 100644
index 79519a62ac76..000000000000
--- a/x11-wm/icewm/files/digest-icewm-1.2.22
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ed156744dc2967518cea4eb952d1983e icewm-1.2.22.tar.gz 990315
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.25 b/x11-wm/icewm/files/digest-icewm-1.2.25
new file mode 100644
index 000000000000..1eaef6bcb480
--- /dev/null
+++ b/x11-wm/icewm/files/digest-icewm-1.2.25
@@ -0,0 +1,3 @@
+MD5 af69d095a6c6fba1f73f80e966bc4459 icewm-1.2.25.tar.gz 1042790
+RMD160 58bab630875aea02c64c2ca9bcbe80cf2338cdb3 icewm-1.2.25.tar.gz 1042790
+SHA256 b0971c6f79a1642eda06cdb79e022a05168f8031e408cc96e367318c9c5f97fa icewm-1.2.25.tar.gz 1042790
diff --git a/x11-wm/icewm/files/icewm-1.2.20.iceicon.patch b/x11-wm/icewm/files/icewm-1.2.20.iceicon.patch
deleted file mode 100644
index 90c442b1e769..000000000000
--- a/x11-wm/icewm/files/icewm-1.2.20.iceicon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- iceicon.cc	2005-01-09 15:48:23.000000000 -0600
-+++ /root/iceicon.cc	2005-05-21 01:00:11.000000000 -0500
-@@ -161,7 +161,7 @@
- void YIconView::updateItems() {
-     if (fItems == 0) {
-         //fMaxWidth = 0;
--        fItems = new (YIconItem *)[fItemCount];
-+        fItems = new YIconItem *[fItemCount];
-         if (fItems) {
-             YIconItem *a = getFirst();
-             int n = 0;
diff --git a/x11-wm/icewm/files/icewm-1.2.20.testmap.patch b/x11-wm/icewm/files/icewm-1.2.20.testmap.patch
deleted file mode 100644
index 0c6fb65b9221..000000000000
--- a/x11-wm/icewm/files/icewm-1.2.20.testmap.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- testmap.cc	2005-01-09 15:48:24.000000000 -0600
-+++ /root/testmap.cc	2005-05-21 00:57:32.000000000 -0500
-@@ -63,10 +63,11 @@
-     
-     while (1) {
-         if (argc > 1) {
--            int nwx, nwy, nww, nwh;
-+            int nwx, nwy;
-+	    unsigned int nww, nwh;
-             int nrx, nry;
--            int bw;
--            int depth;
-+            unsigned int bw;
-+            unsigned int depth;
-             Window xroot, child;
- 
-             XGetGeometry(display, window, &xroot, &nwx, &nwy, &nww, &nwh, &bw, &depth);
diff --git a/x11-wm/icewm/files/icewm-1.2.21.testmap.patch b/x11-wm/icewm/files/icewm-1.2.21.testmap.patch
deleted file mode 100644
index 0c6fb65b9221..000000000000
--- a/x11-wm/icewm/files/icewm-1.2.21.testmap.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- testmap.cc	2005-01-09 15:48:24.000000000 -0600
-+++ /root/testmap.cc	2005-05-21 00:57:32.000000000 -0500
-@@ -63,10 +63,11 @@
-     
-     while (1) {
-         if (argc > 1) {
--            int nwx, nwy, nww, nwh;
-+            int nwx, nwy;
-+	    unsigned int nww, nwh;
-             int nrx, nry;
--            int bw;
--            int depth;
-+            unsigned int bw;
-+            unsigned int depth;
-             Window xroot, child;
- 
-             XGetGeometry(display, window, &xroot, &nwx, &nwy, &nww, &nwh, &bw, &depth);
diff --git a/x11-wm/icewm/files/icewm-1.2.21.ybutton.cc.patch b/x11-wm/icewm/files/icewm-1.2.21.ybutton.cc.patch
deleted file mode 100644
index 2eeb379ecb41..000000000000
--- a/x11-wm/icewm/files/icewm-1.2.21.ybutton.cc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ybutton.cc.orig	2004-11-07 13:49:19.926827944 -0600
-+++ ybutton.cc	2004-11-07 13:49:30.113279368 -0600
-@@ -103,8 +103,7 @@
-         g.setColor(surface.color);
- 
-         if (wmLook == lookMetal) {
--            g.drawBorderM(x, y, w - 1, h - 1, !d);
--            d = 0; x += 2; y += 2; w -= 4; h -= 4;
-+	    d=0;
-         } else if (wmLook == lookGtk) {
-             g.drawBorderG(x, y, w - 1, h - 1, !d);
-             x += 1 + d; y += 1 + d; w -= 3; h -= 3;
-@@ -114,7 +113,6 @@
-         }
- 
-         paint(g, d, YRect(x, y, w, h));
--        paintFocus(g, YRect(x, y, w, h));
-     }
- }
- 
diff --git a/x11-wm/icewm/files/icewm-1.2.22.ybutton.cc.patch b/x11-wm/icewm/files/icewm-1.2.22.ybutton.cc.patch
deleted file mode 100644
index 2eeb379ecb41..000000000000
--- a/x11-wm/icewm/files/icewm-1.2.22.ybutton.cc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ybutton.cc.orig	2004-11-07 13:49:19.926827944 -0600
-+++ ybutton.cc	2004-11-07 13:49:30.113279368 -0600
-@@ -103,8 +103,7 @@
-         g.setColor(surface.color);
- 
-         if (wmLook == lookMetal) {
--            g.drawBorderM(x, y, w - 1, h - 1, !d);
--            d = 0; x += 2; y += 2; w -= 4; h -= 4;
-+	    d=0;
-         } else if (wmLook == lookGtk) {
-             g.drawBorderG(x, y, w - 1, h - 1, !d);
-             x += 1 + d; y += 1 + d; w -= 3; h -= 3;
-@@ -114,7 +113,6 @@
-         }
- 
-         paint(g, d, YRect(x, y, w, h));
--        paintFocus(g, YRect(x, y, w, h));
-     }
- }
- 
diff --git a/x11-wm/icewm/files/icewm-1.2.25-gcc41.patch b/x11-wm/icewm/files/icewm-1.2.25-gcc41.patch
new file mode 100644
index 000000000000..eba1c2bfffb2
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.2.25-gcc41.patch
@@ -0,0 +1,11 @@
+--- icewm-1.2.25/src/ylocale.cc.orig	2006-04-08 19:03:17.000000000 -0500
++++ icewm-1.2.25/src/ylocale.cc	2006-04-08 19:04:46.000000000 -0500
+@@ -152,7 +152,7 @@ YUChar *YLocale::unicodeString(const YLC
+     char * inbuf((char *) lStr), * outbuf((char *) uStr);
+     size_t inlen(lLen), outlen(4 * lLen);
+ 
+-    if (0 > (int) iconv(instance->toUnicode, const_cast<const char **>(&inbuf), &inlen, &outbuf, &outlen))
++    if (0 > (int) iconv(instance->toUnicode, &inbuf, &inlen, &outbuf, &outlen))
+         warn(_("Invalid multibyte string \"%s\": %s"), lStr, strerror(errno));
+ 
+     *((YUChar *) outbuf) = 0;
diff --git a/x11-wm/icewm/files/icewm-1.2.20.ybutton.cc.patch b/x11-wm/icewm/files/icewm-1.2.25.ybutton.cc.patch
index 2eeb379ecb41..2eeb379ecb41 100644
--- a/x11-wm/icewm/files/icewm-1.2.20.ybutton.cc.patch
+++ b/x11-wm/icewm/files/icewm-1.2.25.ybutton.cc.patch
diff --git a/x11-wm/icewm/icewm-1.2.21.ebuild b/x11-wm/icewm/icewm-1.2.21.ebuild
deleted file mode 100644
index 12bde3105144..000000000000
--- a/x11-wm/icewm/icewm-1.2.21.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.21.ebuild,v 1.4 2005/08/13 11:24:16 metalgod Exp $
-
-inherit eutils
-
-DESCRIPTION="Ice Window Manager with Themes"
-
-HOMEPAGE="http://www.icewm.org/
-	http://sourceforge.net/projects/icewmsilverxp/"
-
-#fix for icewm preversion package names
-S=${WORKDIR}/${P/_}
-
-SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="amd64 ppc sparc x86"
-
-IUSE="esd gnome imlib nls spell truetype xinerama silverxp"
-
-RDEPEND="virtual/x11
-	esd? ( media-sound/esound )
-	gnome? ( gnome-base/gnome-libs gnome-base/gnome-desktop dev-util/pkgconfig )
-	imlib? ( >=media-libs/imlib-1.9.10-r1 )
-	nls? ( sys-devel/gettext )
-	truetype? ( >=media-libs/freetype-2.0.9 )
-	media-fonts/artwiz-fonts
-	media-libs/giflib"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/src
-	if use silverxp ; then
-		epatch ${FILESDIR}/${P/_}.ybutton.cc.patch
-	fi
-		epatch ${FILESDIR}/${P/_}.testmap.patch
-
-	echo "#!/bin/sh" > $T/icewm
-	echo "/usr/bin/icewm-session" >> $T/icewm
-
-}
-
-src_compile(){
-
-	if use truetype
-	then
-		myconf="${myconf} --enable-gradients --enable-shape --enable-movesize-fx --enable-shaped-decorations"
-	else
-		myconf="${myconf} --disable-xfreetype --enable-corefonts"
-	fi
-
-	CXXFLAGS="${CXXFLAGS}" econf \
-		--with-libdir=/usr/share/icewm \
-		--with-cfgdir=/etc/icewm \
-		--with-docdir=/usr/share/doc/${PF}/html \
-		$(use_with esd esd-config /usr/bin/esd-config) \
-		$(use_enable nls) \
-		$(use_enable nls i18n) \
-		$(use_with imlib) \
-		$(use_enable spell GtkSpell) \
-		$(use_enable x86 x86-asm) \
-		$(use_enable xinerama) \
-		$(use_enable gnome menus-gnome1) \
-		$(use_enable gnome menus-gnome2) \
-		${myconf} || die "configure failed"
-
-	sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die "patch failed"
-	sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
-
-	emake || die "emake failed"
-}
-
-src_install(){
-	make DESTDIR=${D} install || die  "make install failed"
-
-	dodoc AUTHORS BUGS CHANGES FAQ PLATFORMS README* TODO VERSION
-	dohtml -a html,sgml doc/*
-
-	exeinto /etc/X11/Sessions
-	doexe $T/icewm
-
-	insinto /usr/share/xsessions
-	doins ${FILESDIR}/IceWM.desktop
-}
diff --git a/x11-wm/icewm/icewm-1.2.22.ebuild b/x11-wm/icewm/icewm-1.2.22.ebuild
deleted file mode 100644
index 274f73ca6207..000000000000
--- a/x11-wm/icewm/icewm-1.2.22.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.22.ebuild,v 1.2 2005/09/22 22:41:14 morfic Exp $
-
-inherit eutils
-
-DESCRIPTION="Ice Window Manager with Themes"
-
-HOMEPAGE="http://www.icewm.org/
-	http://sourceforge.net/projects/icewmsilverxp/"
-
-#fix for icewm preversion package names
-S=${WORKDIR}/${P/_}
-
-SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="amd64 ppc ~sparc ~x86"
-
-IUSE="esd gnome imlib nls spell truetype xinerama silverxp"
-
-RDEPEND="virtual/x11
-	esd? ( media-sound/esound )
-	gnome? ( gnome-base/gnome-libs gnome-base/gnome-desktop dev-util/pkgconfig )
-	imlib? ( >=media-libs/imlib-1.9.10-r1 )
-	nls? ( sys-devel/gettext )
-	truetype? ( >=media-libs/freetype-2.0.9 )
-	media-fonts/artwiz-fonts
-	media-libs/giflib"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/src
-	if use silverxp ; then
-		epatch ${FILESDIR}/${P/_}.ybutton.cc.patch
-	fi
-
-	echo "#!/bin/sh" > $T/icewm
-	echo "/usr/bin/icewm-session" >> $T/icewm
-
-}
-
-src_compile(){
-
-	if use truetype
-	then
-		myconf="${myconf} --enable-gradients --enable-shape --enable-movesize-fx --enable-shaped-decorations"
-	else
-		myconf="${myconf} --disable-xfreetype --enable-corefonts"
-	fi
-
-	CXXFLAGS="${CXXFLAGS}" econf \
-		--with-libdir=/usr/share/icewm \
-		--with-cfgdir=/etc/icewm \
-		--with-docdir=/usr/share/doc/${PF}/html \
-		$(use_with esd esd-config /usr/bin/esd-config) \
-		$(use_enable nls) \
-		$(use_enable nls i18n) \
-		$(use_with imlib) \
-		$(use_enable spell GtkSpell) \
-		$(use_enable x86 x86-asm) \
-		$(use_enable xinerama) \
-		$(use_enable gnome menus-gnome1) \
-		$(use_enable gnome menus-gnome2) \
-		${myconf} || die "configure failed"
-
-	sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die "patch failed"
-	sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
-
-	emake || die "emake failed"
-}
-
-src_install(){
-	make DESTDIR=${D} install || die  "make install failed"
-
-	dodoc AUTHORS BUGS CHANGES FAQ PLATFORMS README* TODO VERSION
-	dohtml -a html,sgml doc/*
-
-	exeinto /etc/X11/Sessions
-	doexe $T/icewm
-
-	insinto /usr/share/xsessions
-	doins ${FILESDIR}/IceWM.desktop
-}
diff --git a/x11-wm/icewm/icewm-1.2.20.ebuild b/x11-wm/icewm/icewm-1.2.25.ebuild
index 24b41eca91d8..f1e302429f74 100644
--- a/x11-wm/icewm/icewm-1.2.20.ebuild
+++ b/x11-wm/icewm/icewm-1.2.25.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.20.ebuild,v 1.7 2005/05/21 06:21:57 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.25.ebuild,v 1.1 2006/04/09 01:29:21 morfic Exp $
 
 inherit eutils
 
@@ -17,11 +17,21 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="ppc x86 sparc amd64"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 IUSE="esd gnome imlib nls spell truetype xinerama silverxp"
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( (
+		x11-libs/libXau
+		x11-libs/libX11
+		x11-libs/libXrandr
+		x11-libs/libXext
+		x11-libs/libXpm
+		x11-libs/libXrender
+		x11-libs/libXft
+		x11-libs/libXt
+		x11-libs/libXdmcp )
+	virtual/x11 )
 	esd? ( media-sound/esound )
 	gnome? ( gnome-base/gnome-libs gnome-base/gnome-desktop dev-util/pkgconfig )
 	imlib? ( >=media-libs/imlib-1.9.10-r1 )
@@ -31,16 +41,21 @@ RDEPEND="virtual/x11
 	media-libs/giflib"
 
 DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xproto
+		x11-proto/xextproto
+		x11-proto/xineramaproto )
+	virtual/x11 )
 	>=sys-apps/sed-4"
 
 src_unpack() {
 	unpack ${A}
+	epatch ${FILESDIR}/${P}-gcc41.patch
+
 	cd ${S}/src
 	if use silverxp ; then
 		epatch ${FILESDIR}/${P/_}.ybutton.cc.patch
 	fi
-		epatch ${FILESDIR}/${P/_}.testmap.patch
-		epatch ${FILESDIR}/${P/_}.iceicon.patch
 
 	echo "#!/bin/sh" > $T/icewm
 	echo "/usr/bin/icewm-session" >> $T/icewm