version bump

6 files changed, 48 insertions, 43 deletions

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index 2abec057b6d0..668ca079d8a7 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.10 2002/09/20 08:30:47 doctomoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.11 2002/10/17 03:03:55 seemant Exp $
+
+*icewm-1.2.2 (16 Oct 2002)
+
+  16 Oct 2002; Seemant Kulleen <seemant@gentoo.org> icewm-1.2.2.ebuild
+  files/digest-icewm-1.2.2 :
+
+  Version bump thanks to: craig@mosquitonet.com (Craig Callender) in bug
+  #7970.
 
 *icewm-1.2.0-r1 (16 Aug 2002)
 
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.0 b/x11-wm/icewm/files/digest-icewm-1.2.0
deleted file mode 100644
index fbfead7c707d..000000000000
--- a/x11-wm/icewm/files/digest-icewm-1.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0972000f4f0569c34ff03c8db200d396 icewm-1.2.0.tar.gz 684306
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.2 b/x11-wm/icewm/files/digest-icewm-1.2.2
new file mode 100644
index 000000000000..2a49f82a2f16
--- /dev/null
+++ b/x11-wm/icewm/files/digest-icewm-1.2.2
@@ -0,0 +1 @@
+MD5 7550e2e7822184d92ecc43e115b2f2d9 icewm-1.2.2.tar.gz 734435
diff --git a/x11-wm/icewm/files/icewm-1.2.0-gcc31-gentoo.patch b/x11-wm/icewm/files/icewm-1.2.0-gcc31-gentoo.patch
deleted file mode 100644
index d4d45bc3b7a1..000000000000
--- a/x11-wm/icewm/files/icewm-1.2.0-gcc31-gentoo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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.2.0-r1.ebuild b/x11-wm/icewm/icewm-1.2.0-r1.ebuild
index bd5cfa78cf24..d4c6a72446ea 100644
--- a/x11-wm/icewm/icewm-1.2.0-r1.ebuild
+++ b/x11-wm/icewm/icewm-1.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.0-r1.ebuild,v 1.5 2002/10/05 05:39:28 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.0-r1.ebuild,v 1.6 2002/10/17 03:03:55 seemant Exp $
 
 IUSE="truetype nls esd imlib"
 
@@ -24,7 +24,7 @@ src_unpack(){
 
 	cd ${S}
 	
-	patch -p1< ${FILESDIR}/${P}-gcc31-gentoo.patch || die
+	patch -p1< ${FILESDIR}/${PN}-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
diff --git a/x11-wm/icewm/icewm-1.2.0.ebuild b/x11-wm/icewm/icewm-1.2.2.ebuild
index e86ed11f59fb..7bb5c2884431 100644
--- a/x11-wm/icewm/icewm-1.2.0.ebuild
+++ b/x11-wm/icewm/icewm-1.2.2.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.0.ebuild,v 1.5 2002/10/05 05:39:28 drobbins Exp $
-
-IUSE="truetype nls esd imlib"
+# 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.1 2002/10/17 03:03:55 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Ice Window Manager"
@@ -17,21 +15,30 @@ DEPEND="virtual/x11
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc sparc64"
+KEYWORDS="~x86 ~ppc ~sparc ~sparc64"
 
 src_unpack(){
 	unpack ${A}
 
 	cd ${S}
 	
-	patch -p1< ${FILESDIR}/${P}-gcc31-gentoo.patch || die
+	patch -p1< ${FILESDIR}/${PN}-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.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)/::' \
+	sed 's:icewm-$(VERSION)::' \
 		Makefile.orig > Makefile
 }
 
@@ -45,22 +52,23 @@ src_compile(){
 		|| myconf="${myconf} --disable-nls --disable-i18n"
 
 	use imlib \
-		&& myconf="${myconf} --with-imlib" \
-		|| myconf="${myconf} --without-imlib"
+		&& myconf="${myconf} --with-imlib --without-xpm" \
+		|| myconf="${myconf} --without-imlib --with-xpm"
 
 	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
+	use x86 \
+		&& myconf="${myconf} --enable-x86-asm" \
+		|| myconf="${myconf} --disable-x86-asm"
+
+	use gnome \
+		&& myconf="${myconf} --with-gnome-menus" \
+		|| myconf="${myconf} --without-gnome-menus"
 
-	econf \
+	CXXFLAGS="${CXXFLAGS}" econf \
+		--with-xpm \
 		--with-libdir=/usr/lib/icewm \
 		--with-cfgdir=/etc/icewm \
 		--with-docdir=/usr/share/doc/${PF}/html \
@@ -70,13 +78,17 @@ src_compile(){
 }
 
 src_install(){
-	make \
-		prefix=${D}/usr \
-		LIBDIR=${D}/usr/lib/icewm \
-		CFGDIR=${D}/etc/icewm \
-		LOCDIR=${D}/usr/share/locale \
-		DOCDIR=${S}/dummy \
-		install || die "make install failed"
+#	make \
+#		PREFIX=${D}/usr \
+#		BINDIR=${D}/usr/bin \
+#		LIBDIR=${D}/usr/lib/icewm \
+#		CFGDIR=${D}/etc/icewm \
+#		LOCDIR=${D}/usr/share/locale \
+#		DOCDIR=${S}/share/doc/${PF} \
+#		KDEDIR=${D}/usr/share \
+#		install || die "make install failed"
+
+	make DESTDIR=${D} install || die
 
 	dodoc AUTHORS BUGS CHANGES COPYING FAQ PLATFORMS README* TODO VERSION
 	dohtml -a html,sgml doc/*