Cleanup.

16 files changed, 9 insertions, 702 deletions

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index a1269ab19a22..3609b771b71b 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.24 2003/06/15 16:30:17 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.25 2003/06/15 16:46:04 bcowan Exp $
+
+  15 Jun 2003; Brad Cowan <bcowan@gentoo.org> icewm-1.2.0-r1.ebuild,
+  icewm-1.2.2-r1.ebuild, icewm-1.2.3.ebuild, icewm-1.2.5.ebuild,
+  icewm-1.2.6.ebuild, files/icewm-1.2.3-gentoo.patch,
+  files/icewm-1.2.5-gentoo.patch, files/icewm-1.2.6-gentoo.patch,
+  files/icewm-gcc31-gentoo.patch:
+  Cleanup.
 
 *icewm-1.2.8 (15 Jun 2003)
 
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index 4758a1d91a5c..8b3a63d387d7 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,21 +1,7 @@
 MD5 8cbc3e586f130cef931d4e032abea6d1 icewm-1.2.8.ebuild 2000
-MD5 30726bc1550287bb594f304fd0a845ca icewm-1.2.3.ebuild 2057
-MD5 3895a0e0cf386484404582c5c8b75622 icewm-1.2.5.ebuild 2058
-MD5 6691ae802a2358c3ef35f3d9c66a7190 icewm-1.2.0-r1.ebuild 2407
 MD5 21e6046fa6ce0973feae10f5014d3fcb icewm-1.2.7.ebuild 2090
-MD5 cde0543f51506ad8dc1d573280620149 icewm-1.2.6.ebuild 2079
-MD5 b03272ff4807db3b7bb3a030f4c4d4a9 icewm-1.2.2-r1.ebuild 2300
-MD5 7acbdb23d738fe5ff02cc335db114fa9 ChangeLog 5034
+MD5 2762ea45554ebc32bd06c45fbfb913de ChangeLog 5334
 MD5 3decb45e7b318067b9c3d68c6ef11e2f files/icewm 25
-MD5 caaf61ec560c01b8e920e5606eb61aa2 files/digest-icewm-1.2.0-r1 63
-MD5 0750e4d376075e5973eac5648820961a files/digest-icewm-1.2.2-r1 63
-MD5 0dc5e896c5f794e256450c88fcc8c0f7 files/icewm-gcc31-gentoo.patch 446
 MD5 1f8f857ae1c221d3633ae1752cdaa51a files/icewm-1.2.7-gentoo.patch 3886
-MD5 7197157fbefaf4d7a5c986f3daefbb14 files/icewm-1.2.3-gentoo.patch 3886
-MD5 6a1991631b8e5381a037ea72942b03a9 files/digest-icewm-1.2.3 63
-MD5 850b3fcfb5994b199b7edcec59b74722 files/digest-icewm-1.2.5 63
-MD5 85d0ba06f6fe7f1cd47f656d875aa2d8 files/digest-icewm-1.2.6 63
 MD5 ede49197766f08023cc5f56114783e61 files/digest-icewm-1.2.7 63
 MD5 c45dcc1eabf02fab00536f2708deb5dd files/digest-icewm-1.2.8 63
-MD5 1f8f857ae1c221d3633ae1752cdaa51a files/icewm-1.2.6-gentoo.patch 3886
-MD5 913ab5de078ca4f34bd9c19f8c22eaed files/icewm-1.2.5-gentoo.patch 3886
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-r1 b/x11-wm/icewm/files/digest-icewm-1.2.2-r1
deleted file mode 100644
index 2a49f82a2f16..000000000000
--- a/x11-wm/icewm/files/digest-icewm-1.2.2-r1
+++ /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 b/x11-wm/icewm/files/digest-icewm-1.2.3
deleted file mode 100644
index 34cec39a3f5c..000000000000
--- a/x11-wm/icewm/files/digest-icewm-1.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1ea2ad99845dd3b9942d6db50a3856e5 icewm-1.2.3.tar.gz 747534
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.5 b/x11-wm/icewm/files/digest-icewm-1.2.5
deleted file mode 100644
index 0ae2956d69b3..000000000000
--- a/x11-wm/icewm/files/digest-icewm-1.2.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 20aa6e9258b07275fdee5bcc9e40b883 icewm-1.2.5.tar.gz 749592
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.6 b/x11-wm/icewm/files/digest-icewm-1.2.6
deleted file mode 100644
index 95ef7aa4e669..000000000000
--- a/x11-wm/icewm/files/digest-icewm-1.2.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e6cd71f4236699a4ede4cd805a9f1dab icewm-1.2.6.tar.gz 762450
diff --git a/x11-wm/icewm/files/icewm-1.2.3-gentoo.patch b/x11-wm/icewm/files/icewm-1.2.3-gentoo.patch
deleted file mode 100644
index a20ab4ecca95..000000000000
--- a/x11-wm/icewm/files/icewm-1.2.3-gentoo.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -urN icewm-1.2.3/Makefile icewm-1.2.3-new/Makefile
---- icewm-1.2.3/Makefile	Thu Dec 26 12:05:47 2002
-+++ icewm-1.2.3-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.3/Makefile.in icewm-1.2.3-new/Makefile.in
---- icewm-1.2.3/Makefile.in	Thu Dec 26 12:05:29 2002
-+++ icewm-1.2.3-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.3/src/Makefile icewm-1.2.3-new/src/Makefile
---- icewm-1.2.3/src/Makefile	Thu Dec 26 12:05:48 2002
-+++ icewm-1.2.3-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.3/src/Makefile.in icewm-1.2.3-new/src/Makefile.in
---- icewm-1.2.3/src/Makefile.in	Thu Dec 26 12:05:30 2002
-+++ icewm-1.2.3-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.3/src/wmclient.h icewm-1.2.3-new/src/wmclient.h
---- icewm-1.2.3/src/wmclient.h	Thu Dec 26 12:05:30 2002
-+++ icewm-1.2.3-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/files/icewm-1.2.5-gentoo.patch b/x11-wm/icewm/files/icewm-1.2.5-gentoo.patch
deleted file mode 100644
index 581e1f2dadac..000000000000
--- a/x11-wm/icewm/files/icewm-1.2.5-gentoo.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -urN icewm-1.2.5/Makefile icewm-1.2.5-new/Makefile
---- icewm-1.2.5/Makefile	Thu Dec 26 12:05:47 2002
-+++ icewm-1.2.5-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.5/Makefile.in icewm-1.2.5-new/Makefile.in
---- icewm-1.2.5/Makefile.in	Thu Dec 26 12:05:29 2002
-+++ icewm-1.2.5-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.5/src/Makefile icewm-1.2.5-new/src/Makefile
---- icewm-1.2.5/src/Makefile	Thu Dec 26 12:05:48 2002
-+++ icewm-1.2.5-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.5/src/Makefile.in icewm-1.2.5-new/src/Makefile.in
---- icewm-1.2.5/src/Makefile.in	Thu Dec 26 12:05:30 2002
-+++ icewm-1.2.5-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.5/src/wmclient.h icewm-1.2.5-new/src/wmclient.h
---- icewm-1.2.5/src/wmclient.h	Thu Dec 26 12:05:30 2002
-+++ icewm-1.2.5-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/files/icewm-1.2.6-gentoo.patch b/x11-wm/icewm/files/icewm-1.2.6-gentoo.patch
deleted file mode 100644
index 046333627de7..000000000000
--- a/x11-wm/icewm/files/icewm-1.2.6-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/files/icewm-gcc31-gentoo.patch b/x11-wm/icewm/files/icewm-gcc31-gentoo.patch
deleted file mode 100644
index d4d45bc3b7a1..000000000000
--- a/x11-wm/icewm/files/icewm-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
deleted file mode 100644
index b93f851ef96e..000000000000
--- a/x11-wm/icewm/icewm-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2003 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.11 2003/02/13 17:49:21 vapier 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 "
-
-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...
-	use x86 \
-		&& myconf="${myconf} --enable-x86-asm" \
-		|| myconf="${myconf} --disable-x86-asm"
-
-	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-r1.ebuild b/x11-wm/icewm/icewm-1.2.2-r1.ebuild
deleted file mode 100644
index 8fcefdb5d3fb..000000000000
--- a/x11-wm/icewm/icewm-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,86 +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.2-r1.ebuild,v 1.6 2003/04/23 00:08:19 lostlogic 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
-	=sys-apps/sed-4*
-	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 "
-
-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.
-	sed -i 's:icewm-$(VERSION)::' Makefile.in
-	sed -i 's:icewm-$(VERSION)::' Makefile
-	
-	cd ${S}/src
-	sed -i 's:icewm-$(VERSION)::' Makefile
-	sed -i 's:icewm-$(VERSION)::' Makefile.in
-}
-
-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 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.ebuild b/x11-wm/icewm/icewm-1.2.3.ebuild
deleted file mode 100644
index 07f46b857ca4..000000000000
--- a/x11-wm/icewm/icewm-1.2.3.ebuild
+++ /dev/null
@@ -1,79 +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.3.ebuild,v 1.2 2003/02/13 17:49:34 vapier 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 )
-	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}
-	patch -p0 < ${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" \
-		|| 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.5.ebuild b/x11-wm/icewm/icewm-1.2.5.ebuild
deleted file mode 100644
index 5445d26aa67a..000000000000
--- a/x11-wm/icewm/icewm-1.2.5.ebuild
+++ /dev/null
@@ -1,79 +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.5.ebuild,v 1.2 2003/02/13 17:49:40 vapier 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 )
-	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}
-	patch -p0 < ${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" \
-		|| 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.6.ebuild b/x11-wm/icewm/icewm-1.2.6.ebuild
deleted file mode 100644
index 5a0ec877c749..000000000000
--- a/x11-wm/icewm/icewm-1.2.6.ebuild
+++ /dev/null
@@ -1,79 +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.6.ebuild,v 1.4 2003/03/13 22:19:03 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_unpack(){
-	unpack ${A}
-	patch -p0 < ${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."
-}