version bump

4 files changed, 170 insertions, 1 deletions

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index 917b5e5c7359..7a906f3e39e8 100644
--- a/x11-wm/icewm/ChangeLog
+++ b/x11-wm/icewm/ChangeLog
@@ -1,6 +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.19 2003/01/08 19:16:48 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.20 2003/01/26 23:03:37 bcowan Exp $
+
+*icewm-1.2.6 (26 Jan 2003)
+
+  26 Jan 2003; Brad Cowan <bcowan@gentoo.org> icewm-1.2.6.ebuild,
+  files/digest-icewm-1.2.6, files/icewm-1.2.6-gentoo.patch: 
+  Version bump.
 
 *icewm-1.2.5 (08 Jan 2003)
 
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.6 b/x11-wm/icewm/files/digest-icewm-1.2.6
new file mode 100644
index 000000000000..95ef7aa4e669
--- /dev/null
+++ b/x11-wm/icewm/files/digest-icewm-1.2.6
@@ -0,0 +1 @@
+MD5 e6cd71f4236699a4ede4cd805a9f1dab icewm-1.2.6.tar.gz 762450
diff --git a/x11-wm/icewm/files/icewm-1.2.6-gentoo.patch b/x11-wm/icewm/files/icewm-1.2.6-gentoo.patch
new file mode 100644
index 000000000000..046333627de7
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.2.6-gentoo.patch
@@ -0,0 +1,83 @@
+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.6.ebuild b/x11-wm/icewm/icewm-1.2.6.ebuild
new file mode 100644
index 000000000000..1e3259980e0e
--- /dev/null
+++ b/x11-wm/icewm/icewm-1.2.6.ebuild
@@ -0,0 +1,79 @@
+# 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.6.ebuild,v 1.1 2003/01/26 23:03:37 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 )
+	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."
+}