Version Bump

(Portage version: 2.0.51.20-r4)

6 files changed, 141 insertions, 11 deletions

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index d32fc491a6ae..f18c5653087f 100644
--- a/x11-wm/icewm/ChangeLog
+++ b/x11-wm/icewm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/icewm
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.96 2005/05/21 06:21:57 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.97 2005/06/04 06:29:27 morfic Exp $
+
+*icewm-1.2.21 (04 Jun 2005)
+
+  04 Jun 2005; Daniel Goller <morfic@gentoo.org>
+  +files/icewm-1.2.21.testmap.patch, +files/icewm-1.2.21.ybutton.cc.patch,
+  +icewm-1.2.21.ebuild:
+  Version Bump
 
   21 May 2005; Daniel Goller <morfic@gentoo.org>
   +files/icewm-1.2.20.iceicon.patch, +files/icewm-1.2.20.testmap.patch,
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index 559e4e3b4ed6..22ea2d25ad19 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,18 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 e74fd3f8b677b9a200feacf2fdc7f244 icewm-1.2.20.ebuild 2310
 MD5 b36421a945e1aa73b774e0dcbabf75e9 ChangeLog 15459
+MD5 3012eb518e75f7eeec238c17979631a2 icewm-1.2.21.ebuild 2314
 MD5 a26b94d92c1e03083b7020e2f4c1afe9 metadata.xml 630
 MD5 1ba6fc06d92e0a7d0d4357d83db74493 files/digest-icewm-1.2.20 64
+MD5 ab0c279c830a4148e8c4bba52df974b0 files/digest-icewm-1.2.21 64
+MD5 cea1a375dba2fc5a6d9675d7255229aa files/icewm-1.2.21.iceicon.patch 394
 MD5 9028fc0d1b794c88e4a2db9cf28f66f0 files/IceWM.desktop 200
 MD5 0adfec296f9e1a9eb08a326c0690c28e files/icewm-1.2.20.ybutton.cc.patch 591
 MD5 b3bb2875e9f96c7fbd5620a7388626b0 files/icewm-1.2.20.testmap.patch 529
+MD5 b3bb2875e9f96c7fbd5620a7388626b0 files/icewm-1.2.21.testmap.patch 529
+MD5 0adfec296f9e1a9eb08a326c0690c28e files/icewm-1.2.21.ybutton.cc.patch 591
 MD5 cea1a375dba2fc5a6d9675d7255229aa files/icewm-1.2.20.iceicon.patch 394
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCjsnTUpKYMelfdYERAjaBAKCMh5vm7vgrAWJFPMrwzC/bvJFQogCfct1M
-s2apsTDfVnv6jfEAUDarK+4=
-=Gjib
------END PGP SIGNATURE-----
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.21 b/x11-wm/icewm/files/digest-icewm-1.2.21
new file mode 100644
index 000000000000..e24f1bc54b52
--- /dev/null
+++ b/x11-wm/icewm/files/digest-icewm-1.2.21
@@ -0,0 +1 @@
+MD5 0c17d89fea9044d79a29b88aa6199968 icewm-1.2.21.tar.gz 969491
diff --git a/x11-wm/icewm/files/icewm-1.2.21.testmap.patch b/x11-wm/icewm/files/icewm-1.2.21.testmap.patch
new file mode 100644
index 000000000000..0c6fb65b9221
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.2.21.testmap.patch
@@ -0,0 +1,17 @@
+--- 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
new file mode 100644
index 000000000000..2eeb379ecb41
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.2.21.ybutton.cc.patch
@@ -0,0 +1,20 @@
+--- 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/icewm-1.2.21.ebuild b/x11-wm/icewm/icewm-1.2.21.ebuild
new file mode 100644
index 000000000000..ee34e3bb98f4
--- /dev/null
+++ b/x11-wm/icewm/icewm-1.2.21.ebuild
@@ -0,0 +1,90 @@
+# 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.1 2005/06/04 06:29:27 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="~ppc ~x86 ~sparc ~amd64"
+
+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
+}