version bump

10 files changed, 102 insertions, 117 deletions

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index f891e37e0a35..7f9ae570ba17 100644
--- a/x11-wm/icewm/ChangeLog
+++ b/x11-wm/icewm/ChangeLog
@@ -1,6 +1,14 @@
 # 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.5 2002/05/26 21:17:43 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.6 2002/07/01 18:14:50 seemant Exp $
+
+*icewm-1.2.0_pre3 (01 Jul 2002)
+
+  01 Jul 2002; Seemant Kulleen <seemant@gentoo.org> icewm-1.2.0_pre3.ebuild
+  files/digest-icewm-1.2.0_pre3 files/icewm-1.2.0_pre3-gcc31-gentoo.patch :
+
+  Version bump to newest testing.  The patch is the same as Matt's patch,
+  just renamed and edited to reflect the new version number.
 
 *icewm-1.0.9.2-r4 (26 May 2002)
 
diff --git a/x11-wm/icewm/files/digest-icewm-1.0.9.2-r1 b/x11-wm/icewm/files/digest-icewm-1.0.9.2-r1
deleted file mode 100644
index 14ee41d7fddd..000000000000
--- a/x11-wm/icewm/files/digest-icewm-1.0.9.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 076d02415b694518b61b569ddd12822c icewm-1.0.9-2.tar.gz 630017
diff --git a/x11-wm/icewm/files/digest-icewm-1.0.9.2-r2 b/x11-wm/icewm/files/digest-icewm-1.0.9.2-r2
deleted file mode 100644
index 14ee41d7fddd..000000000000
--- a/x11-wm/icewm/files/digest-icewm-1.0.9.2-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 076d02415b694518b61b569ddd12822c icewm-1.0.9-2.tar.gz 630017
diff --git a/x11-wm/icewm/files/digest-icewm-1.0.9.2-r3 b/x11-wm/icewm/files/digest-icewm-1.0.9.2-r3
deleted file mode 100644
index 14ee41d7fddd..000000000000
--- a/x11-wm/icewm/files/digest-icewm-1.0.9.2-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 076d02415b694518b61b569ddd12822c icewm-1.0.9-2.tar.gz 630017
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.0_pre3 b/x11-wm/icewm/files/digest-icewm-1.2.0_pre3
new file mode 100644
index 000000000000..ae58f742f0d5
--- /dev/null
+++ b/x11-wm/icewm/files/digest-icewm-1.2.0_pre3
@@ -0,0 +1 @@
+MD5 6dbf59faeb291cf01da98359bffdaf43 icewm-1.2.0pre3.tar.gz 672387
diff --git a/x11-wm/icewm/files/icewm-1.2.0_pre3-gcc31-gentoo.patch b/x11-wm/icewm/files/icewm-1.2.0_pre3-gcc31-gentoo.patch
new file mode 100644
index 000000000000..d4d45bc3b7a1
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.2.0_pre3-gcc31-gentoo.patch
@@ -0,0 +1,15 @@
+diff -ru icewm-1.2.0pre3/src/wmclient.h icewm-1.2.0pre3-edited/src/wmclient.h
+--- icewm-1.2.0pre3/src/wmclient.h  Tue Oct  9 16:54:03 2001
++++ icewm-1.2.0pre3-edited/src/wmclient.h   Thu May 23 20:44:53 2002
+@@ -11,10 +11,7 @@
+ typedef int FrameState;
+
+ #ifndef __YIMP_UTIL__
+-//!!! remove these if possible
+-typedef struct XWMHints;
+-typedef struct XSizeHints;
+-typedef struct XClassHint;
++#   include <X11/Xutil.h>
+ #endif
+
+ class ClientData {
diff --git a/x11-wm/icewm/icewm-1.0.9.2-r1.ebuild b/x11-wm/icewm/icewm-1.0.9.2-r1.ebuild
deleted file mode 100644
index 0ecffb2158c9..000000000000
--- a/x11-wm/icewm/icewm-1.0.9.2-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.0.9.2-r1.ebuild,v 1.1 2002/02/11 04:43:00 drobbins Exp $
-
-NV=1.0.9-2
-S=${WORKDIR}/icewm-1.0.9
-DESCRIPTION="Ice Window Manager"
-SRC_URI="prdownloads.sourceforge.net/${PN}/${PN}-${NV}.tar.gz"
-HOMEPAGE="www.icewm.org"
-
-DEPEND="virtual/x11 media-libs/imlib"
-
-src_compile(){
-	./configure --with-imlib --host=${CHOST} --prefix=/usr --sysconfdir=/etc || die
-	emake || die
-}
-src_install(){
-	make prefix=${D}/usr DOCDIR=${S}/dummy sysconfdir=${D}/etc install || die
-	dodoc BUGS CHANGES COPYING FAQ PLATFORMS README TODO VERSION
-	docinto html
-	dodoc doc/*.html
-	docinto sgml
-	dodoc doc/*.sgml
-}
-
-
diff --git a/x11-wm/icewm/icewm-1.0.9.2-r2.ebuild b/x11-wm/icewm/icewm-1.0.9.2-r2.ebuild
deleted file mode 100644
index 242d526c1172..000000000000
--- a/x11-wm/icewm/icewm-1.0.9.2-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.0.9.2-r2.ebuild,v 1.1 2002/02/14 22:12:39 danarmak Exp $
-
-NV=1.0.9-2
-S=${WORKDIR}/icewm-1.0.9
-DESCRIPTION="Ice Window Manager"
-SRC_URI="prdownloads.sourceforge.net/${PN}/${PN}-${NV}.tar.gz"
-HOMEPAGE="www.icewm.org"
-
-DEPEND="virtual/x11 media-libs/imlib"
-
-src_compile(){
-	./configure --with-imlib --host=${CHOST} --prefix=/usr --sysconfdir=/etc || die
-	emake || die
-}
-src_install(){
-	make prefix=${D}/usr DOCDIR=${S}/dummy sysconfdir=${D}/etc install || die
-	dodoc BUGS CHANGES COPYING FAQ PLATFORMS README TODO VERSION
-	docinto html
-	dodoc doc/*.html
-	docinto sgml
-	dodoc doc/*.sgml
-	
-	exeinto /etc/X11/Sessions
-	doexe $FILESDIR/icewm
-}
-
-
diff --git a/x11-wm/icewm/icewm-1.0.9.2-r3.ebuild b/x11-wm/icewm/icewm-1.0.9.2-r3.ebuild
deleted file mode 100644
index 07c3e3e01894..000000000000
--- a/x11-wm/icewm/icewm-1.0.9.2-r3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.0.9.2-r3.ebuild,v 1.2 2002/04/27 23:34:21 bangert Exp $
-
-NV=1.0.9-2
-S=${WORKDIR}/icewm-1.0.9
-DESCRIPTION="Ice Window Manager"
-SRC_URI="prdownloads.sourceforge.net/${PN}/${PN}-${NV}.tar.gz"
-HOMEPAGE="www.icewm.org"
-
-DEPEND="virtual/x11
-	nls? ( >=sys-devel/gettext-0.10.40 )
-	imlib? ( >=media-libs/imlib-1.9.10-r1 )"
-
-src_unpack(){
-	unpack ${A}
-	cd ${S}
-
-	# 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.
-	t=src/Makefile
-	cp $t $t.orig
-	sed 's:icewm-$(VERSION)/::' $t.orig > $t
-}
-
-src_compile(){
-	use nls   && myconf="$myconf --enable-nls" \
-	          || myconf="$myconf --disable-nls"
-	use imlib && myconf="$myconf --with-imlib" \
-	          || myconf="$myconf --without-imlib"
-	./configure \
-		--build=${CHOST} \
-		--prefix=/usr \
-		--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 \
-		prefix=${D}/usr \
-		LIBDIR=${D}/usr/lib/icewm \
-		CFGDIR=${D}/etc/icewm \
-		DOCDIR=${S}/dummy \
-		install || die "make install failed"
-	dodoc AUTHORS BUGS CHANGES COPYING FAQ PLATFORMS README* TODO VERSION
-	dohtml -a html,sgml doc/*
-	
-	exeinto /etc/X11/Sessions
-	doexe $FILESDIR/icewm
-}
diff --git a/x11-wm/icewm/icewm-1.2.0_pre3.ebuild b/x11-wm/icewm/icewm-1.2.0_pre3.ebuild
new file mode 100644
index 000000000000..74ebe4757222
--- /dev/null
+++ b/x11-wm/icewm/icewm-1.2.0_pre3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# /space/gentoo/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.0-r1.ebuild,v 1.1 2002/05/26 21:17:43 mkennedy Exp
+
+MY_P=${P/_/}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Ice Window Manager"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+HOMEPAGE="www.icewm.org"
+
+DEPEND="virtual/x11
+	imlib? ( >=media-libs/imlib-1.9.10-r1 )
+	nls? ( >=sys-devel/gettext-0.10.40 )
+	truetype? ( >=media-libs/freetype-2.0.9 )"
+
+src_unpack(){
+	unpack ${A}
+
+	cd ${S}
+	
+	patch -p1< ${FILESDIR}/${P}-gcc31-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 Makefile.orig
+	sed 's:icewm-$(VERSION)/::' \
+		Makefile.orig > Makefile
+}
+
+src_compile(){
+	use nls \
+		&& myconf="${myconf} --enable-nls --enable-i18n" \
+		|| myconf="${myconf} --disable-nls --disable-i18n"
+
+	use imlib \
+		&& myconf="${myconf} --with-imlib" \
+		|| myconf="${myconf} --without-imlib"
+
+	use truetype \
+		&& myconf="${myconf} --enable-gradients" \
+		|| myconf="${myconf} --disable-xfreetype"
+
+	# until the new sexy use style arch code is implemented...
+	if [ ${ARCH} != "x86" ]
+	then
+		myconf="${myconf} --disable-x86-asm"
+	else
+		myconf="${myconf} --enable-x86-asm"
+	fi
+
+	econf \
+		--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 \
+		prefix=${D}/usr \
+		LIBDIR=${D}/usr/lib/icewm \
+		CFGDIR=${D}/etc/icewm \
+		DOCDIR=${S}/dummy \
+		LOCDIR=${S}/usr/share/locale \
+		install || die "make install failed"
+
+	dodoc AUTHORS BUGS CHANGES COPYING FAQ PLATFORMS README* TODO VERSION
+	dohtml -a html,sgml doc/*
+	
+	echo "#!/bin/bash\n/usr/bin/icewm" > icewm
+	exeinto /etc/X11/Sessions
+	doexe icewm
+}