Bump to 1.2.26

Package-Manager: portage-2.1_pre7-r4

5 files changed, 150 insertions, 7 deletions

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index 2b7962b965c2..d3551fcbc2c2 100644
--- a/x11-wm/icewm/ChangeLog
+++ b/x11-wm/icewm/ChangeLog
@@ -1,6 +1,12 @@
 # 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.109 2006/04/09 01:29:21 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.110 2006/04/27 01:41:54 morfic Exp $
+
+*icewm-1.2.26 (27 Apr 2006)
+
+  27 Apr 2006; Daniel Goller <morfic@gentoo.org>
+  +files/icewm-1.2.26.ybutton.cc.patch, +icewm-1.2.26.ebuild:
+  Bump to 1.2.26
 
 *icewm-1.2.25 (09 Apr 2006)
 
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index 49a657108eaa..e21942aa6700 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ac2b503b7459b1f9706027fe9d852e00 ChangeLog 17502
-RMD160 cc39f3e2ccb89a510f08efb58ee93a5927e4a4b3 ChangeLog 17502
-SHA256 871ef1c84d3853796d63ed58cd7672c6275ee7a14b7bd764b47a845d63d20790 ChangeLog 17502
+MD5 e106b3600da39132c9fa8e15cc7fe6b3 ChangeLog 17660
+RMD160 bed5eca31b29b25c670018a5b83597758f1a575e ChangeLog 17660
+SHA256 91f185cdfde94001a0e45fa9565d57d5564464b74bed382e77d407086d618a81 ChangeLog 17660
 MD5 9028fc0d1b794c88e4a2db9cf28f66f0 files/IceWM.desktop 200
 RMD160 0b1de8ea8569d3e15006dcee81d582404d73685f files/IceWM.desktop 200
 SHA256 7564e6a573365eae529b849c7f5723eaef39258d785fd83de42e122cdf8e0eb1 files/IceWM.desktop 200
@@ -13,6 +13,9 @@ SHA256 177cef1d0f60dc8c53e55285d43d5a4aa823d5825954517962150e6ed220beda files/di
 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 4b90404369ae31ce9020a00f373677e4 files/digest-icewm-1.2.26 241
+RMD160 8826a3f82060f32d94c5f45b03a512ecad7f221b files/digest-icewm-1.2.26 241
+SHA256 d30b3dc41ff73cc6d8258b862aa8143190102097bc26c5b372c35eba09db73e2 files/digest-icewm-1.2.26 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
@@ -25,19 +28,25 @@ SHA256 bfe473799b8564da15bbe2b00779dc472c9c854d827d70ba5efe005219770027 files/ic
 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 0adfec296f9e1a9eb08a326c0690c28e files/icewm-1.2.26.ybutton.cc.patch 591
+RMD160 1ade595dadaaa5494b84e4ba6ce76c88eb900e5d files/icewm-1.2.26.ybutton.cc.patch 591
+SHA256 2a5f61bfba0affa9734a6ce167db2b76a2750033db69e7ae692d8c8ab3b1324a files/icewm-1.2.26.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 ea5297afcc8a01efb11699ffb983da7e icewm-1.2.26.ebuild 2506
+RMD160 b7117a6ae4825ebdf78eb48cef2b09e6e4cbfcb8 icewm-1.2.26.ebuild 2506
+SHA256 2cea7ad641316a5c8b8e8ddd58428b4eb6b903dbd95606a4190299f7aa51ac00 icewm-1.2.26.ebuild 2506
 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/
+iD8DBQFEUCFx/aM9DdBw91cRAvjJAKC60WyGfdlWavAjabKWDUcgWDl6zgCgga6G
+LKAgNHndaMvSggjaeE6hSzI=
+=Ncrs
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.26 b/x11-wm/icewm/files/digest-icewm-1.2.26
new file mode 100644
index 000000000000..d8adb030d8ad
--- /dev/null
+++ b/x11-wm/icewm/files/digest-icewm-1.2.26
@@ -0,0 +1,3 @@
+MD5 097b12d3f8e0f57a964e4821bc1825ed icewm-1.2.26.tar.gz 1042824
+RMD160 fca3e3e9c11da971aff132a34cfbf0c8f3a15599 icewm-1.2.26.tar.gz 1042824
+SHA256 96ed51cbaead5bd8c33522be5bf0baac4c051db0a826f764eb8528b2ec0c5497 icewm-1.2.26.tar.gz 1042824
diff --git a/x11-wm/icewm/files/icewm-1.2.26.ybutton.cc.patch b/x11-wm/icewm/files/icewm-1.2.26.ybutton.cc.patch
new file mode 100644
index 000000000000..2eeb379ecb41
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.2.26.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.26.ebuild b/x11-wm/icewm/icewm-1.2.26.ebuild
new file mode 100644
index 000000000000..ddcb9148df24
--- /dev/null
+++ b/x11-wm/icewm/icewm-1.2.26.ebuild
@@ -0,0 +1,105 @@
+# 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.26.ebuild,v 1.1 2006/04/27 01:41:54 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="|| ( (
+		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 )
+	nls? ( sys-devel/gettext )
+	truetype? ( >=media-libs/freetype-2.0.9 )
+	media-fonts/artwiz-fonts
+	media-libs/giflib"
+
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xproto
+		x11-proto/xextproto
+		x11-proto/xineramaproto )
+	virtual/x11 )
+	>=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
+}