Bump to 1.2.17 final

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index 63caf3c69927cfadf10478a28a29b53d6100f04c..713e8a232eb5c1843fe21e57ba28a3f43cdff855 100644 (file)
--- 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.77 2004/11/07 04:01:39 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.78 2004/11/07 20:00:07 morfic Exp $
+
+*icewm-1.2.17 (07 Nov 2004)
+
+  07 Nov 2004; Daniel Goller <morfic@gentoo.org>
+  +files/icewm-1.2.17.ybutton.cc.patch, +icewm-1.2.17.ebuild:
+  Bump to 1.2.17 final, adjusting offsets of ybutton.cc.patch for silverxp theme
 
   06 Nov 2004; Daniel Goller <morfic@gentoo.org> icewm-1.2.17_pre2.ebuild:
   Small change in ebuild and testing signing

diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index 0e3c43c757af3f86186ba04f22b5c99c99a5a0fe..6abe53a9569210ffb25f00eb2cb9ba58f07395e0 100644 (file)
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -3,10 +3,13 @@ Hash: SHA1
 
 MD5 6c6a8d9159cb465dbd055981bb583b3d icewm-1.2.17_pre1.ebuild 2496
 MD5 42adda7c2d33b99328a938a9764f5098 icewm-1.2.16-r1.ebuild 2433
-MD5 15a406153e54ab75aaaaf69c707acc14 ChangeLog 12797
+MD5 093afff2a21bfcf8c8241d380fb03cd0 ChangeLog 13019
+MD5 7a78b4106f26fb7a2c2c9b9fcfb83d32 icewm-1.2.17.ebuild 2161
 MD5 a26b94d92c1e03083b7020e2f4c1afe9 metadata.xml 630
 MD5 c335367aa3ff27e70e3882690864364a icewm-1.2.17_pre2.ebuild 2441
+MD5 fd57fef0e5a817b5a5ea6ffed65a3e5d files/digest-icewm-1.2.17 64
 MD5 9028fc0d1b794c88e4a2db9cf28f66f0 files/IceWM.desktop 200
+MD5 0adfec296f9e1a9eb08a326c0690c28e files/icewm-1.2.17.ybutton.cc.patch 591
 MD5 37ad1f076784e6c0b601719e9f5d2a46 files/icewm-1.2.17_pre1.wmtaskbar.cc.patch 342
 MD5 a15c477442ec11a68f6c5e1932e72d42 files/digest-icewm-1.2.16-r1 141
 MD5 09fb90eb26ebbd9fecafd03b53e956ac files/digest-icewm-1.2.17_pre1 145
@@ -14,7 +17,7 @@ MD5 346b791e3835d7de7199c7289e29b116 files/digest-icewm-1.2.17_pre2 145
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBjZ50UpKYMelfdYERAgRZAJ4/9rRyMPEDzJozoqgpiypF0KASpgCfW4yL
-srWtRvYn/BftbshWCZeGImQ=
-=vd6Q
+iD8DBQFBjn7RUpKYMelfdYERAqBwAJ97gKy/dI8zq1P8BjXjfS4+nRLgWgCbB2ss
+h7rGdd7jig+TAiP5Lfe6RPA=
+=dLKP
 -----END PGP SIGNATURE-----

diff --git a/x11-wm/icewm/files/digest-icewm-1.2.17 b/x11-wm/icewm/files/digest-icewm-1.2.17
new file mode 100644 (file)
index 0000000..88f0788
--- /dev/null
+++ b/x11-wm/icewm/files/digest-icewm-1.2.17
@@ -0,0 +1 @@
+MD5 8fbbbffcc14f8c2de7e9c3069b46d6c1 icewm-1.2.17.tar.gz 947429

diff --git a/x11-wm/icewm/files/icewm-1.2.17.ybutton.cc.patch b/x11-wm/icewm/files/icewm-1.2.17.ybutton.cc.patch
new file mode 100644 (file)
index 0000000..2eeb379
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.2.17.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.17.ebuild b/x11-wm/icewm/icewm-1.2.17.ebuild
new file mode 100644 (file)
index 0000000..1b27cc8
--- /dev/null
+++ b/x11-wm/icewm/icewm-1.2.17.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2004 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.1 2004/11/07 20:00:07 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="~x86 ~ppc ~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}/icewm-1.2.17.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
+}