unified patches

7 files changed, 96 insertions, 299 deletions

diff --git a/x11-wm/icewm/files/digest-icewm-1.2.0-r1 b/x11-wm/icewm/files/digest-icewm-1.2.0-r1
deleted file mode 100644
index fbfead7c707d..000000000000
--- a/x11-wm/icewm/files/digest-icewm-1.2.0-r1
+++ /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
deleted file mode 100644
index 2a49f82a2f16..000000000000
--- a/x11-wm/icewm/files/digest-icewm-1.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7550e2e7822184d92ecc43e115b2f2d9 icewm-1.2.2.tar.gz 734435
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.3_pre1 b/x11-wm/icewm/files/digest-icewm-1.2.3_pre1
deleted file mode 100644
index 238b2db6552d..000000000000
--- a/x11-wm/icewm/files/digest-icewm-1.2.3_pre1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a0752120edda07b7dc49ddbbb482f64f icewm-1.2.3pre1.tar.gz 735955
diff --git a/x11-wm/icewm/files/icewm-1.2.3_pre1-gentoo.patch b/x11-wm/icewm/files/icewm-1.2.3_pre1-gentoo.patch
new file mode 100644
index 000000000000..6c3fd29e63a7
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.2.3_pre1-gentoo.patch
@@ -0,0 +1,96 @@
+diff -urN icewm-1.2.3pre1-old/Makefile icewm-1.2.3pre1/Makefile
+--- icewm-1.2.3pre1-old/Makefile	2002-10-20 07:05:09.000000000 -0700
++++ icewm-1.2.3pre1/Makefile	2002-11-02 03:25:37.000000000 -0800
+@@ -125,12 +125,12 @@
+ 
+ install-docs: docs $(LSM)
+ 	@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.3pre1-old/Makefile.in icewm-1.2.3pre1/Makefile.in
+--- icewm-1.2.3pre1-old/Makefile.in	2002-10-20 07:04:54.000000000 -0700
++++ icewm-1.2.3pre1/Makefile.in	2002-11-02 03:25:37.000000000 -0800
+@@ -125,12 +125,12 @@
+ 
+ install-docs: docs $(LSM)
+ 	@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.3pre1-old/src/Makefile icewm-1.2.3pre1/src/Makefile
+--- icewm-1.2.3pre1-old/src/Makefile	2002-10-20 07:05:09.000000000 -0700
++++ icewm-1.2.3pre1/src/Makefile	2002-11-02 03:25:38.000000000 -0800
+@@ -26,7 +26,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/X11R6/include  
+diff -urN icewm-1.2.3pre1-old/src/Makefile.in icewm-1.2.3pre1/src/Makefile.in
+--- icewm-1.2.3pre1-old/src/Makefile.in	2002-10-20 07:04:55.000000000 -0700
++++ icewm-1.2.3pre1/src/Makefile.in	2002-11-02 03:25:38.000000000 -0800
+@@ -26,7 +26,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@ @GNOME_CFLAGS@
+diff -urN icewm-1.2.3pre1-old/src/aapm.cc icewm-1.2.3pre1/src/aapm.cc
+--- icewm-1.2.3pre1-old/src/aapm.cc	2002-10-20 07:04:55.000000000 -0700
++++ icewm-1.2.3pre1/src/aapm.cc	2002-11-02 03:25:37.000000000 -0800
+@@ -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 -urN icewm-1.2.3pre1-old/src/wmclient.h icewm-1.2.3pre1/src/wmclient.h
+--- icewm-1.2.3pre1-old/src/wmclient.h	2002-10-20 07:04:55.000000000 -0700
++++ icewm-1.2.3pre1/src/wmclient.h	2002-11-02 03:25:37.000000000 -0800
+@@ -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.0-r1.ebuild b/x11-wm/icewm/icewm-1.2.0-r1.ebuild
deleted file mode 100644
index d4c6a72446ea..000000000000
--- a/x11-wm/icewm/icewm-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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.6 2002/10/17 03:03:55 seemant Exp $
-
-IUSE="truetype nls esd imlib"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Ice Window Manager"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.icewm.org"
-
-DEPEND="virtual/x11
-	esd? ( media-sound/esound )
-	nls? ( sys-devel/gettext )
-	imlib? ( >=media-libs/imlib-1.9.10-r1 )
-	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}/${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)::' \
-		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" \
-		|| 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 \
-		LOCDIR=${D}/usr/share/locale \
-		DOCDIR=${S}/share/doc/${PF} \
-		install || die "make install failed"
-
-	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
-}
diff --git a/x11-wm/icewm/icewm-1.2.2.ebuild b/x11-wm/icewm/icewm-1.2.2.ebuild
deleted file mode 100644
index 7fafd7b47426..000000000000
--- a/x11-wm/icewm/icewm-1.2.2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# 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.3 2002/11/01 08:16:34 seemant Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Ice Window Manager"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.icewm.org"
-IUSE="esd nls imlib truetype gnome"
-
-DEPEND="virtual/x11
-	esd? ( media-sound/esound )
-	nls? ( sys-devel/gettext )
-	imlib? ( >=media-libs/imlib-1.9.10-r1 )
-	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}/${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)::' \
-		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 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 \
-#		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/*
-	
-	echo "#!/bin/bash" > icewm
-	echo "/usr/bin/icewm" >> icewm
-	exeinto /etc/X11/Sessions
-	doexe icewm
-}
diff --git a/x11-wm/icewm/icewm-1.2.3_pre1.ebuild b/x11-wm/icewm/icewm-1.2.3_pre1.ebuild
deleted file mode 100644
index 68b2ef9755c4..000000000000
--- a/x11-wm/icewm/icewm-1.2.3_pre1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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
-}