version bump

6 files changed, 140 insertions, 3 deletions

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index 7008a0c90a6b..852ae08a7afe 100644
--- a/x11-wm/icewm/ChangeLog
+++ b/x11-wm/icewm/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-wm/icewm
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.12 2002/10/17 13:14:40 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.13 2002/11/01 08:16:34 seemant Exp $
+
+*icewm-1.2.3_pre1 (01 Nov 2002)
+
+  01 Nov 2002; Seemant Kulleen <seemant@gentoo.org> icewm-1.2.3_pre1.ebuild
+  files/icewm-1.2.3_pre1-gcc31-gentoo.patch
+  files/icewm-1.2.3_pre1-aapm-gentoo.patch ChangeLog
+  files/digest-icewm-1.2.3_pre1 :
+
+  Version bump, thanks to: craig@mosquitonet.com (Craig Callender) in bug
+  #9920
 
 *icewm-1.2.2 (16 Oct 2002)
 
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.3_pre1 b/x11-wm/icewm/files/digest-icewm-1.2.3_pre1
new file mode 100644
index 000000000000..238b2db6552d
--- /dev/null
+++ b/x11-wm/icewm/files/digest-icewm-1.2.3_pre1
@@ -0,0 +1 @@
+MD5 a0752120edda07b7dc49ddbbb482f64f icewm-1.2.3pre1.tar.gz 735955
diff --git a/x11-wm/icewm/files/icewm-1.2.3_pre1-aapm-gentoo.patch b/x11-wm/icewm/files/icewm-1.2.3_pre1-aapm-gentoo.patch
new file mode 100644
index 000000000000..6174c41d6161
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.2.3_pre1-aapm-gentoo.patch
@@ -0,0 +1,12 @@
+--- icewm-1.2.3pre1/src/aapm.cc	2002-10-20 10:04:55.000000000 -0400
++++ aapm.cc	2002-10-29 11:49:35.000000000 -0500
+@@ -462,8 +462,7 @@
+     class YPixbuf * gradient(parent()->getGradient());
+ 
+     if (gradient) {
+-        g.copyPixbuf(*gradient, this->x(), this->y(),
+-                     width((), height(), 0, 0));
++        g.copyPixbuf(*gradient, this->x(), this->y(), width(), height(), 0, 0);
+     }
+     else
+ #endif
diff --git a/x11-wm/icewm/files/icewm-1.2.3_pre1-gcc31-gentoo.patch b/x11-wm/icewm/files/icewm-1.2.3_pre1-gcc31-gentoo.patch
new file mode 100644
index 000000000000..6fa463cd741f
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.2.3_pre1-gcc31-gentoo.patch
@@ -0,0 +1,16 @@
+--- icewm-1.2.3pre1/src/wmclient.h	2002-10-20 10:04:55.000000000 -0400
++++ src/wmclient.h	2002-10-29 15:50:25.000000000 -0500
+@@ -13,9 +13,10 @@
+ 
+ #ifndef __YIMP_XUTIL__
+ //!!! remove these if possible
+-typedef struct XWMHints;
+-typedef struct XSizeHints;
+-typedef struct XClassHint;
++//typedef struct XWMHints;
++//typedef struct XSizeHints;
++//typedef struct XClassHint;
++#include <X11/Xutil.h>
+ #endif
+ 
+ class ClientData {
diff --git a/x11-wm/icewm/icewm-1.2.2.ebuild b/x11-wm/icewm/icewm-1.2.2.ebuild
index ce77659bc9dd..7fafd7b47426 100644
--- a/x11-wm/icewm/icewm-1.2.2.ebuild
+++ b/x11-wm/icewm/icewm-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.2.ebuild,v 1.2 2002/10/17 13:14:40 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.2.ebuild,v 1.3 2002/11/01 08:16:34 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Ice Window Manager"
@@ -16,7 +16,7 @@ DEPEND="virtual/x11
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~sparc64"
+KEYWORDS="x86 ~ppc ~sparc ~sparc64"
 
 src_unpack(){
 	unpack ${A}
diff --git a/x11-wm/icewm/icewm-1.2.3_pre1.ebuild b/x11-wm/icewm/icewm-1.2.3_pre1.ebuild
new file mode 100644
index 000000000000..68b2ef9755c4
--- /dev/null
+++ b/x11-wm/icewm/icewm-1.2.3_pre1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.3_pre1.ebuild,v 1.1 2002/11/01 08:16:34 seemant Exp $
+
+MY_P="icewm-1.2.3pre1"
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Ice Window Manager"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+HOMEPAGE="http://www.icewm.org"
+IUSE="esd gnome imlib nls spell truetype"
+
+DEPEND="virtual/x11
+	esd? ( media-sound/esound )
+	gnome? ( gnome-base/gnome )
+	imlib? ( >=media-libs/imlib-1.9.10-r1 )
+	nls? ( sys-devel/gettext )
+	truetype? ( >=media-libs/freetype-2.0.9 )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~sparc64"
+
+src_unpack(){
+	unpack ${A}
+
+	cd ${S}
+	
+	patch -p1< ${FILESDIR}/${P}-gcc31-gentoo.patch || die
+	patch -p1< ${FILESDIR}/${P}-aapm-gentoo.patch || die
+	
+	# icewm's doc dir layout is un-gentoo-like.  To fix it, we have
+	# "make install" skip the docs install, and do it ourselves.  That also
+	# means we have to adjust the Makefile so that it can find the help files
+	# when you choose the 'help' item out of its menu.
+	cp Makefile.in Makefile.in.orig
+	sed 's:icewm-$(VERSION)::' \
+		Makefile.in.orig > Makefile.in
+
+	cp Makefile Makefile.orig
+	sed 's:icewm-$(VERSION)::' \
+		Makefile.orig > Makefile
+	
+	cd ${S}/src
+	cp Makefile Makefile.orig
+	sed 's:icewm-$(VERSION)::' \
+		Makefile.orig > Makefile
+}
+
+src_compile(){
+
+	use esd \
+		&& myconf="${myconf} --with-esd-config=/usr/bin/esd-config"
+
+	use nls \
+		&& myconf="${myconf} --enable-nls --enable-i18n" \
+		|| myconf="${myconf} --disable-nls --disable-i18n"
+
+	use imlib \
+		&& myconf="${myconf} --with-imlib --without-xpm" \
+		|| myconf="${myconf} --without-imlib --with-xpm"
+
+	use spell \
+		&& myconf="${myconf} --enable-GtkSpell" \
+		|| myconf="${myconf} --disable-GtkSpell"
+
+	use truetype \
+		&& myconf="${myconf} --enable-gradients" \
+		|| myconf="${myconf} --disable-xfreetype"
+
+	use x86 \
+		&& myconf="${myconf} --enable-x86-asm" \
+		|| myconf="${myconf} --disable-x86-asm"
+
+	use gnome \
+		&& myconf="${myconf} --with-gnome-menus" \
+		|| myconf="${myconf} --without-gnome-menus"
+
+	CXXFLAGS="${CXXFLAGS}" econf \
+		--with-xpm \
+		--with-libdir=/usr/lib/icewm \
+		--with-cfgdir=/etc/icewm \
+		--with-docdir=/usr/share/doc/${PF}/html \
+		${myconf} || die "configure failed"
+
+	emake || die "emake failed"
+}
+
+src_install(){
+	make DESTDIR=${D} install || die
+
+	dodoc AUTHORS BUGS CHANGES COPYING FAQ PLATFORMS README* TODO VERSION
+	dohtml -a html,sgml doc/*
+	
+	echo "#!/bin/bash" > icewm
+	echo "/usr/bin/icewm" >> icewm
+	exeinto /etc/X11/Sessions
+	doexe icewm
+}