New unmasked icewm 1.2.3 for 1.4 final

5 files changed, 39 insertions, 45 deletions

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index 420728a53937..01b0a2c27e7a 100644
--- a/x11-wm/icewm/ChangeLog
+++ b/x11-wm/icewm/ChangeLog
@@ -1,7 +1,12 @@
 # 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.17 2002/12/13 11:01:05 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.18 2002/12/29 01:37:36 drobbins Exp $
 
+*icewm-1.2.3 (28 Dec 2002)
+
+  28 Dec 2002; Daniel Robbins <drobbins@gentoo.org>: New 1.2.3 icewm ebuild with
+  updated patch; moved "libdir" to /usr/share/icewm.
+  
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
 *icewm-1.2.3_pre1-r1 icewm-1.2.2-r1 (02 Nov 2002)
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.3 b/x11-wm/icewm/files/digest-icewm-1.2.3
new file mode 100644
index 000000000000..34cec39a3f5c
--- /dev/null
+++ b/x11-wm/icewm/files/digest-icewm-1.2.3
@@ -0,0 +1 @@
+MD5 1ea2ad99845dd3b9942d6db50a3856e5 icewm-1.2.3.tar.gz 747534
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.3_pre1-r1 b/x11-wm/icewm/files/digest-icewm-1.2.3_pre1-r1
deleted file mode 100644
index 238b2db6552d..000000000000
--- a/x11-wm/icewm/files/digest-icewm-1.2.3_pre1-r1
+++ /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-gentoo.patch
index 6c3fd29e63a7..a20ab4ecca95 100644
--- a/x11-wm/icewm/files/icewm-1.2.3_pre1-gentoo.patch
+++ b/x11-wm/icewm/files/icewm-1.2.3-gentoo.patch
@@ -1,9 +1,9 @@
-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 @@
+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 $(LSM)
+ install-docs: docs
  	@echo ------------------------------------------
 -	@rm -fr "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
 -	@$(INSTALLDIR) "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
@@ -19,12 +19,12 @@ diff -urN icewm-1.2.3pre1-old/Makefile icewm-1.2.3pre1/Makefile
  	@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 @@
+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 $(LSM)
+ install-docs: docs
  	@echo ------------------------------------------
 -	@rm -fr "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
 -	@$(INSTALLDIR) "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
@@ -40,10 +40,10 @@ diff -urN icewm-1.2.3pre1-old/Makefile.in icewm-1.2.3pre1/Makefile.in
  	@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 @@
+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)"' \
@@ -51,11 +51,11 @@ diff -urN icewm-1.2.3pre1-old/src/Makefile icewm-1.2.3pre1/src/Makefile
 +                -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 @@
+ 	         -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)"' \
@@ -63,23 +63,10 @@ diff -urN icewm-1.2.3pre1-old/src/Makefile.in icewm-1.2.3pre1/src/Makefile.in
 +                -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
+ 	        @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__
diff --git a/x11-wm/icewm/icewm-1.2.3_pre1-r1.ebuild b/x11-wm/icewm/icewm-1.2.3.ebuild
index 9894c14f0156..9b7b29e4b0f5 100644
--- a/x11-wm/icewm/icewm-1.2.3_pre1-r1.ebuild
+++ b/x11-wm/icewm/icewm-1.2.3.ebuild
@@ -1,11 +1,9 @@
 # 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.3 2002/12/09 04:42:02 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.3.ebuild,v 1.1 2002/12/29 01:37:36 drobbins Exp $
 
-MY_P="icewm-1.2.3pre1"
-S=${WORKDIR}/${MY_P}
 DESCRIPTION="Ice Window Manager"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.icewm.org"
 IUSE="esd gnome imlib nls spell truetype"
 
@@ -18,7 +16,7 @@ DEPEND="virtual/x11
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc "
+KEYWORDS="x86 ~ppc ~sparc "
 
 src_unpack(){
 	unpack ${A}
@@ -26,7 +24,6 @@ src_unpack(){
 }
 
 src_compile(){
-
 	use esd \
 		&& myconf="${myconf} --with-esd-config=/usr/bin/esd-config"
 
@@ -56,7 +53,7 @@ src_compile(){
 
 	CXXFLAGS="${CXXFLAGS}" econf \
 		--with-xpm \
-		--with-libdir=/usr/lib/icewm \
+		--with-libdir=/usr/share/icewm \
 		--with-cfgdir=/etc/icewm \
 		--with-docdir=/usr/share/doc/${PF}/html \
 		${myconf} || die "configure failed"
@@ -75,3 +72,8 @@ src_install(){
 	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."
+}