several fixes

11 files changed, 21 insertions, 253 deletions

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index 0041ec09db94..1f8598d5739b 100644
--- a/x11-wm/icewm/ChangeLog
+++ b/x11-wm/icewm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/icewm
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.31 2003/08/20 15:14:48 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.32 2003/08/21 09:37:42 lanius Exp $
+
+  21 Aug 2003; Heinrich Wendel <lanius@gentoo.org> icewm-1.2.10.ebuild,
+  icewm-1.2.7.ebuild, icewm-1.2.8.ebuild, files/icewm,
+  files/icewm-1.2.7-gentoo.patch:
+  - cleaned out old versions
+  - fixed bug #25739 (artwiz-fonts)
+  - fixed bug #27030 (gnome-desktop dep)
 
   20 Aug 2003; Brad Cowan <bcowan@gentoo.org> icewm-1.2.11.ebuild:
   Removed sessions support as upstream says its a buggy hack for PDAs only not
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index 95691bb54b4d..63f592a4b9a9 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,7 +1,7 @@
 MD5 f3df4dc314ae13deb59e3c04a9d336e5 icewm-1.2.11.ebuild 1923
 MD5 09ffe545ce0ba9b1fe50794ad2a5e9a5 icewm-1.2.9.ebuild 1869
-MD5 8e4f0fbe96f29ff456b825a1e575cb2d icewm-1.2.11-r1.ebuild 1995
-MD5 e3ac7bf8a97a1b3a9963ced213544f6b ChangeLog 6135
+MD5 426a177d890b25533c5d3407300bb2f0 icewm-1.2.11-r1.ebuild 1998
+MD5 2ed4229b53c631571a0040c75d9957fb ChangeLog 6403
 MD5 c4b77ba8ebde5f94163b5ed4646ba992 files/digest-icewm-1.2.11 64
 MD5 a523239e4ca120f208740e26388dccc4 files/digest-icewm-1.2.9 63
 MD5 c4b77ba8ebde5f94163b5ed4646ba992 files/digest-icewm-1.2.11-r1 64
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.10 b/x11-wm/icewm/files/digest-icewm-1.2.10
deleted file mode 100644
index dc63984372e9..000000000000
--- a/x11-wm/icewm/files/digest-icewm-1.2.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3c6835d0e17ad158922ea1ddd0cb60de icewm-1.2.10.tar.gz 823363
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.11-r1 b/x11-wm/icewm/files/digest-icewm-1.2.11-r1
new file mode 100644
index 000000000000..36026c116cfd
--- /dev/null
+++ b/x11-wm/icewm/files/digest-icewm-1.2.11-r1
@@ -0,0 +1 @@
+MD5 4aeb61b5c28e86edbbb8a8d360785010 icewm-1.2.11.tar.gz 836627
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.7 b/x11-wm/icewm/files/digest-icewm-1.2.7
deleted file mode 100644
index 657d236d1634..000000000000
--- a/x11-wm/icewm/files/digest-icewm-1.2.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b2423bdcf841a552d8c60a03858a1116 icewm-1.2.7.tar.gz 782335
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.8 b/x11-wm/icewm/files/digest-icewm-1.2.8
deleted file mode 100644
index 16eae7b014f0..000000000000
--- a/x11-wm/icewm/files/digest-icewm-1.2.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8f4e57c875cfe3d612e4ee068a1c2d83 icewm-1.2.8.tar.gz 806459
diff --git a/x11-wm/icewm/files/icewm b/x11-wm/icewm/files/icewm
deleted file mode 100755
index 369d958d5628..000000000000
--- a/x11-wm/icewm/files/icewm
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/bin/icewm
diff --git a/x11-wm/icewm/files/icewm-1.2.7-gentoo.patch b/x11-wm/icewm/files/icewm-1.2.7-gentoo.patch
deleted file mode 100644
index 046333627de7..000000000000
--- a/x11-wm/icewm/files/icewm-1.2.7-gentoo.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -urN icewm-1.2.6/Makefile icewm-1.2.6-new/Makefile
---- icewm-1.2.6/Makefile	Thu Dec 26 12:05:47 2002
-+++ icewm-1.2.6-new/Makefile	Sat Dec 28 18:12:30 2002
-@@ -110,12 +110,12 @@
- 
- install-docs: docs
- 	@echo ------------------------------------------
--	@rm -fr "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
--	@$(INSTALLDIR) "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
-+	@rm -fr "$(DESTDIR)$(DOCDIR)/"
-+	@$(INSTALLDIR) "$(DESTDIR)$(DOCDIR)/"
- 	@echo "Installing documentation in $(DESTDIR)$(DOCDIR)"
--	@$(INSTALLLIB) $(DOCFILES) "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
--	@$(INSTALLLIB) "$(top_srcdir)/doc/"*.sgml "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
--	@$(INSTALLLIB) "$(top_srcdir)/doc/"*.html "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
-+	@$(INSTALLLIB) $(DOCFILES) "$(DESTDIR)$(DOCDIR)/"
-+	@$(INSTALLLIB) "$(top_srcdir)/doc/"*.sgml "$(DESTDIR)$(DOCDIR)/"
-+	@$(INSTALLLIB) "$(top_srcdir)/doc/"*.html "$(DESTDIR)$(DOCDIR)/"
- 	@echo ------------------------------------------
- 
- install-nls: nls
-diff -urN icewm-1.2.6/Makefile.in icewm-1.2.6-new/Makefile.in
---- icewm-1.2.6/Makefile.in	Thu Dec 26 12:05:29 2002
-+++ icewm-1.2.6-new/Makefile.in	Sat Dec 28 18:12:30 2002
-@@ -110,12 +110,12 @@
- 
- install-docs: docs
- 	@echo ------------------------------------------
--	@rm -fr "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
--	@$(INSTALLDIR) "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
-+	@rm -fr "$(DESTDIR)$(DOCDIR)/"
-+	@$(INSTALLDIR) "$(DESTDIR)$(DOCDIR)/"
- 	@echo "Installing documentation in $(DESTDIR)$(DOCDIR)"
--	@$(INSTALLLIB) $(DOCFILES) "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
--	@$(INSTALLLIB) "$(top_srcdir)/doc/"*.sgml "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
--	@$(INSTALLLIB) "$(top_srcdir)/doc/"*.html "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
-+	@$(INSTALLLIB) $(DOCFILES) "$(DESTDIR)$(DOCDIR)/"
-+	@$(INSTALLLIB) "$(top_srcdir)/doc/"*.sgml "$(DESTDIR)$(DOCDIR)/"
-+	@$(INSTALLLIB) "$(top_srcdir)/doc/"*.html "$(DESTDIR)$(DOCDIR)/"
- 	@echo ------------------------------------------
- 
- install-nls: nls
-diff -urN icewm-1.2.6/src/Makefile icewm-1.2.6-new/src/Makefile
---- icewm-1.2.6/src/Makefile	Thu Dec 26 12:05:48 2002
-+++ icewm-1.2.6-new/src/Makefile	Sat Dec 28 18:12:30 2002
-@@ -28,7 +28,7 @@
-                 -DEXEEXT='"$(EXEEXT)"' \
-                 -DICEWMEXE='"icewm$(EXEEXT)"' \
-                 -DICEHELPEXE='"icehelp$(EXEEXT)"' \
--                -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'
-+                -DICEHELPIDX='"$(DOCDIR)//icewm.html"'
- 
- CXXFLAGS =      -fpermissive -Wall -Wpointer-arith -Wconversion -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Winline -Woverloaded-virtual -W -fno-exceptions -fno-rtti -g -O2 $(DEBUG) $(DEFS) \
- 	         -I/usr/X11R6/include -I/usr/include/Xft2 -I/usr/include/freetype2 -I/usr/X11R6/include -I/usr/X11R6/include  # `fc-config --cflags`
-diff -urN icewm-1.2.6/src/Makefile.in icewm-1.2.6-new/src/Makefile.in
---- icewm-1.2.6/src/Makefile.in	Thu Dec 26 12:05:30 2002
-+++ icewm-1.2.6-new/src/Makefile.in	Sat Dec 28 18:12:30 2002
-@@ -28,7 +28,7 @@
-                 -DEXEEXT='"$(EXEEXT)"' \
-                 -DICEWMEXE='"icewm$(EXEEXT)"' \
-                 -DICEHELPEXE='"icehelp$(EXEEXT)"' \
--                -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'
-+                -DICEHELPIDX='"$(DOCDIR)//icewm.html"'
- 
- CXXFLAGS =      @CXXFLAGS@ $(DEBUG) $(DEFS) \
- 	        @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags`
-diff -urN icewm-1.2.6/src/wmclient.h icewm-1.2.6-new/src/wmclient.h
---- icewm-1.2.6/src/wmclient.h	Thu Dec 26 12:05:30 2002
-+++ icewm-1.2.6-new/src/wmclient.h	Sat Dec 28 18:12:38 2002
-@@ -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.10.ebuild b/x11-wm/icewm/icewm-1.2.11-r1.ebuild
index cbd995f1e76e..994eca032c92 100644
--- a/x11-wm/icewm/icewm-1.2.10.ebuild
+++ b/x11-wm/icewm/icewm-1.2.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.10.ebuild,v 1.1 2003/08/16 02:58:41 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.11-r1.ebuild,v 1.1 2003/08/21 09:37:42 lanius Exp $
 
 DESCRIPTION="Ice Window Manager"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -9,14 +9,17 @@ IUSE="esd gnome imlib nls spell truetype"
 
 DEPEND="virtual/x11
 	esd? ( media-sound/esound )
-	gnome? ( gnome-base/gnome-libs )
+	gnome? ( gnome-base/gnome-libs gnome-base/gnome-desktop )
 	imlib? ( >=media-libs/imlib-1.9.10-r1 )
 	nls? ( sys-devel/gettext )
 	truetype? ( >=media-libs/freetype-2.0.9 )"
 
+RDEPEND="${DEPEND}
+	media-fonts/artwiz-fonts"
+
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc "
+KEYWORDS="~x86 ~ppc ~sparc"
 
 src_compile(){
 	use esd \
@@ -35,7 +38,7 @@ src_compile(){
 		|| myconf="${myconf} --disable-GtkSpell"
 
 	use truetype \
-		&& myconf="${myconf} --enable-gradients --with-antialias" \
+		&& myconf="${myconf} --enable-gradients" \
 		|| myconf="${myconf} --disable-xfreetype"
 
 	use x86 \
@@ -43,11 +46,10 @@ src_compile(){
 		|| myconf="${myconf} --disable-x86-asm"
 
 	use gnome \
-		&& myconf="${myconf} --enable-menus-gnome" \
-		|| myconf="${myconf} --disable-menus-gnome"
+		&& myconf="${myconf} --enable-menus-gnome2" \
+		|| myconf="${myconf} --disable-menus-gnome2"
 
 	CXXFLAGS="${CXXFLAGS}" econf \
-		--with-xpm \
 		--with-libdir=/usr/share/icewm \
 		--with-cfgdir=/etc/icewm \
 		--with-docdir=/usr/share/doc/${PF}/html \
@@ -55,7 +57,7 @@ src_compile(){
 	cd src
 	sed -i "s:/icewm-\$(VERSION)::" Makefile || die "patch failed"
 	cd ${S}
-	
+
 	emake || die "emake failed"
 }
 
diff --git a/x11-wm/icewm/icewm-1.2.7.ebuild b/x11-wm/icewm/icewm-1.2.7.ebuild
deleted file mode 100644
index d3ad108e2703..000000000000
--- a/x11-wm/icewm/icewm-1.2.7.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2003 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.7.ebuild,v 1.2 2003/03/26 01:13:52 drobbins Exp $
-
-DESCRIPTION="Ice Window Manager"
-SRC_URI="mirror://sourceforge/${PN}/${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-libs )
-	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 "
-
-src_unpack(){
-	unpack ${A}
-	cd ${S}
-	patch -p1 < ${FILESDIR}/${P}-gentoo.patch || die
-}
-
-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 --with-antialias" \
-		|| 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/share/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
-}
-
-pkg_postinst() {
-	echo "Please note that the default icewm libdir has moved from"
-	echo "/usr/lib/icewm to /usr/share/icewm."
-}
diff --git a/x11-wm/icewm/icewm-1.2.8.ebuild b/x11-wm/icewm/icewm-1.2.8.ebuild
deleted file mode 100644
index 547f957f228d..000000000000
--- a/x11-wm/icewm/icewm-1.2.8.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2003 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.8.ebuild,v 1.1 2003/06/15 16:30:17 bcowan Exp $
-
-DESCRIPTION="Ice Window Manager"
-SRC_URI="mirror://sourceforge/${PN}/${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-libs )
-	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 "
-
-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 --with-antialias" \
-		|| 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/share/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
-}
-
-pkg_postinst() {
-	echo "Please note that the default icewm libdir has moved from"
-	echo "/usr/lib/icewm to /usr/share/icewm."
-}