Bump to 1.2.20

(Portage version: 2.0.51-r15)

8 files changed, 131 insertions, 24 deletions

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index f019f1b60ced..516cb69cf36d 100644
--- a/x11-wm/icewm/ChangeLog
+++ b/x11-wm/icewm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/icewm
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.85 2004/12/28 06:54:53 morfic Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.86 2005/02/20 05:23:32 morfic Exp $
+
+*icewm-1.2.20 (19 Feb 2005)
+
+  19 Feb 2005; morfic,,, <morfic@gentoo.org>
+  +files/icewm-1.2.20.ybutton.cc.patch, +icewm-1.2.20.ebuild:
+  Bump to 1.2.20 at last
 
 *icewm-1.2.19 (28 Dec 2004)
 
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index 0235fa44f286..b4ad039496c4 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 934a179551a0114f60c25aee61c82d2a icewm-1.2.19.ebuild 2155
+MD5 934a179551a0114f60c25aee61c82d2a icewm-1.2.20.ebuild 2155
 MD5 77e35532e87129864b834ee208641f6a icewm-1.2.16-r1.ebuild 2433
+MD5 4acd87421d3c54657fbb15ed97fd0784 ChangeLog 13941
 MD5 1ea6984aaeba0e9dc3f962d7ba686f5a icewm-1.2.17.ebuild 2153
 MD5 a26b94d92c1e03083b7020e2f4c1afe9 metadata.xml 630
-MD5 934a179551a0114f60c25aee61c82d2a icewm-1.2.19.ebuild 2155
-MD5 4acd87421d3c54657fbb15ed97fd0784 ChangeLog 13941
-MD5 9028fc0d1b794c88e4a2db9cf28f66f0 files/IceWM.desktop 200
-MD5 a15c477442ec11a68f6c5e1932e72d42 files/digest-icewm-1.2.16-r1 141
 MD5 fd57fef0e5a817b5a5ea6ffed65a3e5d files/digest-icewm-1.2.17 64
-MD5 0adfec296f9e1a9eb08a326c0690c28e files/icewm-1.2.17.ybutton.cc.patch 591
-MD5 0adfec296f9e1a9eb08a326c0690c28e files/icewm-1.2.19.ybutton.cc.patch 591
 MD5 c57345927d676af33427279528157a2e files/digest-icewm-1.2.19 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB0QN1UpKYMelfdYERAnCfAKCCeLrfSI6jtgs0zZHZB2x3y1jv6QCeIa7o
-HoZHF9GdUidoN90ngQjbMRc=
-=xRli
------END PGP SIGNATURE-----
+MD5 1ba6fc06d92e0a7d0d4357d83db74493 files/digest-icewm-1.2.20 64
+MD5 9028fc0d1b794c88e4a2db9cf28f66f0 files/IceWM.desktop 200
+MD5 0adfec296f9e1a9eb08a326c0690c28e files/icewm-1.2.19.ybutton.cc.patch 591
+MD5 0adfec296f9e1a9eb08a326c0690c28e files/icewm-1.2.17.ybutton.cc.patch 591
+MD5 a15c477442ec11a68f6c5e1932e72d42 files/digest-icewm-1.2.16-r1 141
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.20 b/x11-wm/icewm/files/digest-icewm-1.2.20
new file mode 100644
index 000000000000..afeadd967029
--- /dev/null
+++ b/x11-wm/icewm/files/digest-icewm-1.2.20
@@ -0,0 +1 @@
+MD5 6c94dae56fbf9aa085a1d780538018c1 icewm-1.2.20.tar.gz 948530
diff --git a/x11-wm/icewm/files/icewm-1.2.20.ybutton.cc.patch b/x11-wm/icewm/files/icewm-1.2.20.ybutton.cc.patch
new file mode 100644
index 000000000000..2eeb379ecb41
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.2.20.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.16-r1.ebuild b/x11-wm/icewm/icewm-1.2.16-r1.ebuild
index 68ef53c9f4ba..d24cb8132943 100644
--- a/x11-wm/icewm/icewm-1.2.16-r1.ebuild
+++ b/x11-wm/icewm/icewm-1.2.16-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.16-r1.ebuild,v 1.14 2004/11/24 17:05:20 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.16-r1.ebuild,v 1.15 2005/02/20 05:23:32 morfic Exp $
 
 inherit eutils
 
diff --git a/x11-wm/icewm/icewm-1.2.17.ebuild b/x11-wm/icewm/icewm-1.2.17.ebuild
index 6e8c9b74b942..2c62efe74337 100644
--- a/x11-wm/icewm/icewm-1.2.17.ebuild
+++ b/x11-wm/icewm/icewm-1.2.17.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.17.ebuild,v 1.6 2004/12/20 13:29:40 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.17.ebuild,v 1.7 2005/02/20 05:23:32 morfic Exp $
 
 inherit eutils
 
diff --git a/x11-wm/icewm/icewm-1.2.19.ebuild b/x11-wm/icewm/icewm-1.2.19.ebuild
index 17563778f43d..d5db6d313fd6 100644
--- a/x11-wm/icewm/icewm-1.2.19.ebuild
+++ b/x11-wm/icewm/icewm-1.2.19.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.19.ebuild,v 1.1 2004/12/28 06:54:53 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.19.ebuild,v 1.2 2005/02/20 05:23:32 morfic Exp $
 
 inherit eutils
 
diff --git a/x11-wm/icewm/icewm-1.2.20.ebuild b/x11-wm/icewm/icewm-1.2.20.ebuild
new file mode 100644
index 000000000000..0850f38ca33e
--- /dev/null
+++ b/x11-wm/icewm/icewm-1.2.20.ebuild
@@ -0,0 +1,88 @@
+# 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.20.ebuild,v 1.1 2005/02/20 05:23:32 morfic Exp $
+
+inherit eutils
+
+DESCRIPTION="Ice Window Manager"
+
+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/libungif"
+
+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"
+
+	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
+}