unified patches

6 files changed, 9 insertions, 63 deletions

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index d42035d7fc76..1a1e62d87e42 100644
--- a/x11-wm/icewm/ChangeLog
+++ b/x11-wm/icewm/ChangeLog
@@ -1,12 +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.14 2002/11/02 08:20:45 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.15 2002/11/02 11:37:59 seemant Exp $
 
 *icewm-1.2.3_pre1-r1 icewm-1.2.2-r1 (02 Nov 2002)
 
   02 Nov 2002; Seemant Kulleen <seemant@gentoo.org> icewm-1.2.3_pre1-r1.ebuild
-  icewm-1.2.2-r1.ebuild files/digest-icewm-1.2.4_pre1-r1
-  files/digest-icewm-1.2.2-r1 :
+  icewm-1.2.2-r1.ebuild files/digest-icewm-1.2.3_pre1-r1
+  files/digest-icewm-1.2.2-r1 files/icewm-1.2.3_pre1-gentoo.patch :
+
+  Later on: unified the gcc31, aapm.c patches and ssed lines into one patch.
 
   pez@apocalyptech.com (CJ Kucera) in bug #10057 pointed out that an extra
   sed was needed for icewm to know its doc directory.
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.0-r1 b/x11-wm/icewm/files/digest-icewm-1.2.0-r1
new file mode 100644
index 000000000000..fbfead7c707d
--- /dev/null
+++ b/x11-wm/icewm/files/digest-icewm-1.2.0-r1
@@ -0,0 +1 @@
+MD5 0972000f4f0569c34ff03c8db200d396 icewm-1.2.0.tar.gz 684306
diff --git a/x11-wm/icewm/files/icewm-1.2.3_pre1-aapm-gentoo.patch b/x11-wm/icewm/files/icewm-1.2.3_pre1-aapm-gentoo.patch
deleted file mode 100644
index 6174c41d6161..000000000000
--- a/x11-wm/icewm/files/icewm-1.2.3_pre1-aapm-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- icewm-1.2.3pre1/src/aapm.cc	2002-10-20 10:04:55.000000000 -0400
-+++ aapm.cc	2002-10-29 11:49:35.000000000 -0500
-@@ -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 --git a/x11-wm/icewm/files/icewm-1.2.3_pre1-gcc31-gentoo.patch b/x11-wm/icewm/files/icewm-1.2.3_pre1-gcc31-gentoo.patch
deleted file mode 100644
index 6fa463cd741f..000000000000
--- a/x11-wm/icewm/files/icewm-1.2.3_pre1-gcc31-gentoo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- icewm-1.2.3pre1/src/wmclient.h	2002-10-20 10:04:55.000000000 -0400
-+++ src/wmclient.h	2002-10-29 15:50:25.000000000 -0500
-@@ -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.2-r1.ebuild b/x11-wm/icewm/icewm-1.2.2-r1.ebuild
index d37044ca7bab..2264fb2d5b45 100644
--- a/x11-wm/icewm/icewm-1.2.2-r1.ebuild
+++ b/x11-wm/icewm/icewm-1.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2002/11/02 08:20:45 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.2-r1.ebuild,v 1.2 2002/11/02 11:37:59 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Ice Window Manager"
@@ -31,12 +31,10 @@ src_unpack(){
 	# 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.
 	ssed -i 's:icewm-$(VERSION)::' Makefile.in
-
 	ssed -i 's:icewm-$(VERSION)::' Makefile
 	
 	cd ${S}/src
 	ssed -i 's:icewm-$(VERSION)::' Makefile
-
 	ssed -i 's:icewm-$(VERSION)::' Makefile.in
 }
 
@@ -76,16 +74,6 @@ src_compile(){
 }
 
 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
diff --git a/x11-wm/icewm/icewm-1.2.3_pre1-r1.ebuild b/x11-wm/icewm/icewm-1.2.3_pre1-r1.ebuild
index b88b98c0abcd..33392e1cf82a 100644
--- a/x11-wm/icewm/icewm-1.2.3_pre1-r1.ebuild
+++ b/x11-wm/icewm/icewm-1.2.3_pre1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2002/11/02 08:20:45 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.3_pre1-r1.ebuild,v 1.2 2002/11/02 11:37:59 seemant Exp $
 
 MY_P="icewm-1.2.3pre1"
 S=${WORKDIR}/${MY_P}
@@ -10,7 +10,6 @@ HOMEPAGE="http://www.icewm.org"
 IUSE="esd gnome imlib nls spell truetype"
 
 DEPEND="virtual/x11
-	sys-apps/supersed
 	esd? ( media-sound/esound )
 	gnome? ( gnome-base/gnome )
 	imlib? ( >=media-libs/imlib-1.9.10-r1 )
@@ -23,23 +22,7 @@ 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.
-	ssed -i 's:icewm-$(VERSION)::' Makefile.in
-	ssed -i 's:icewm-$(VERSION)::' Makefile
-	
-	cd ${S}/src
-	ssed -i 's:icewm-$(VERSION)::' Makefile.in
-	ssed -i 's:icewm-$(VERSION)::' Makefile
-
+	patch -p0 < ${FILESDIR}/${P}-gentoo.patch || die
 }
 
 src_compile(){