One bump, One stable

5 files changed, 111 insertions, 3 deletions

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index 431156d86326..76379e018543 100644
--- a/x11-wm/icewm/ChangeLog
+++ b/x11-wm/icewm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/icewm
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.49 2004/07/22 03:54:37 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.50 2004/08/06 04:07:39 morfic Exp $
+
+*icewm-1.2.15_pre4 (05 Aug 2004)
+
+  05 Aug 2004; Daniel Goller <morfic@gentoo.org> icewm-1.2.14.ebuild,
+  +icewm-1.2.15_pre4.ebuild:
+  Bump to 1.2.15_pre4
+  Marked 1.2.14 stable on x86
 
 *icewm-1.2.15_pre2 (21 Jul 2004)
 
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index fec696d2d6b5..eb54c028bd2a 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -4,8 +4,10 @@ MD5 2af533ee73eebc44cc640986c7ca0a99 ChangeLog 8814
 MD5 6d7e6e566ce4397264e5a5c69f04eb79 icewm-1.2.15_pre1.ebuild 2689
 MD5 a26b94d92c1e03083b7020e2f4c1afe9 metadata.xml 630
 MD5 2252d00f57d92b68d18aed8690e5d63f icewm-1.2.15_pre2.ebuild 2689
+MD5 2252d00f57d92b68d18aed8690e5d63f icewm-1.2.15_pre4.ebuild 2689
 MD5 ce0de25ee74a308432d47313c2d6e5c5 files/digest-icewm-1.2.13 64
 MD5 9e04ca924041143f46b60458baee4a9d files/digest-icewm-1.2.14 141
 MD5 e38376050c30579ba1fbcfbb23f00153 files/digest-icewm-1.2.15_pre1 145
 MD5 9a3fefa7b9ff958ce22b422d6548562d files/icewm-1.2.13-gentoo.patch 2298
 MD5 184c3141f67f780e4fa064643974f95d files/digest-icewm-1.2.15_pre2 145
+MD5 00dac6972956217c8c9c0d2978d9b057 files/digest-icewm-1.2.15_pre4 145
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.15_pre4 b/x11-wm/icewm/files/digest-icewm-1.2.15_pre4
new file mode 100644
index 000000000000..1beed319ce2f
--- /dev/null
+++ b/x11-wm/icewm/files/digest-icewm-1.2.15_pre4
@@ -0,0 +1,2 @@
+MD5 30bb5a48cc5a9486910fd08e77ecac07 icewm-1.2.15pre4.tar.gz 946910
+MD5 428bac61473d247af1f4e133f2f92342 SilverXP-1.2.14-single-1.tar.bz2 322762
diff --git a/x11-wm/icewm/icewm-1.2.14.ebuild b/x11-wm/icewm/icewm-1.2.14.ebuild
index e884107ece07..d141c27e4188 100644
--- a/x11-wm/icewm/icewm-1.2.14.ebuild
+++ b/x11-wm/icewm/icewm-1.2.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.14.ebuild,v 1.3 2004/06/28 23:49:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.14.ebuild,v 1.4 2004/08/06 04:07:39 morfic Exp $
 
 inherit eutils
 
@@ -26,7 +26,7 @@ RDEPEND="${DEPEND}
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ~ppc ~sparc"
 S=${WORKDIR}/${P/_}
 
 src_unpack() {
diff --git a/x11-wm/icewm/icewm-1.2.15_pre4.ebuild b/x11-wm/icewm/icewm-1.2.15_pre4.ebuild
new file mode 100644
index 000000000000..a3d031d5054b
--- /dev/null
+++ b/x11-wm/icewm/icewm-1.2.15_pre4.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.15_pre4.ebuild,v 1.1 2004/08/06 04:07:39 morfic Exp $
+
+inherit eutils
+
+#this needs to use the theme for 1.2.14 probably all through pre phase
+SILVERXP_P="SilverXP-1.2.14-single-1"
+
+DESCRIPTION="Ice Window Manager"
+SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz
+	mirror://sourceforge/icewmsilverxp/${SILVERXP_P}.tar.bz2"
+HOMEPAGE="http://www.icewm.org/
+	http://sourceforge.net/projects/icewmsilverxp/"
+IUSE="esd gnome imlib nls spell truetype xinerama silverxp"
+
+RDEPEND="virtual/x11
+	esd? ( media-sound/esound )
+	gnome? ( gnome-base/gnome-libs gnome-base/gnome-desktop )
+	imlib? ( >=media-libs/imlib-1.9.10-r1 )
+	nls? ( sys-devel/gettext )
+	truetype? ( >=media-libs/freetype-2.0.9 )
+	media-fonts/artwiz-fonts"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc"
+S=${WORKDIR}/${P/_}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/src
+	if use silverxp ; then
+		epatch ${WORKDIR}/${PN}/themes/${SILVERXP_P}/Linux/ybutton.cc.patch
+	fi
+
+	echo "#!/bin/bash" > $T/icewm
+	echo "/usr/bin/icewm-session" >> $T/icewm
+
+}
+
+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 silverxp || use truetype ) \
+		&& myconf="${myconf} --enable-gradients --enable-shape --enable-movesize-fx --enable-shaped-decorations" \
+		|| myconf="${myconf} --disable-xfreetype --enable-corefonts"
+
+	use x86 \
+		&& myconf="${myconf} --enable-x86-asm" \
+		|| myconf="${myconf} --disable-x86-asm"
+
+	use gnome \
+		&& myconf="${myconf} --enable-menus-gnome2 --enable-menus-gnome1" \
+		|| myconf="${myconf} --disable-menus-gnome2 --disable-menus-gnome1"
+
+	use xinerama \
+		&& myconf="${myconf} --enable-xinerama" \
+		|| myconf="${myconf} --disable-xinerama"
+
+	CXXFLAGS="${CXXFLAGS}" econf \
+		--with-libdir=/usr/share/icewm \
+		--with-cfgdir=/etc/icewm \
+		--with-docdir=/usr/share/doc/${PF}/html \
+		${myconf} || die "configure failed"
+
+	sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die "patch failed"
+
+
+	emake || die "emake failed"
+}
+
+src_install(){
+	make DESTDIR=${D} install || die  "make instal failed"
+
+	dodoc AUTHORS BUGS CHANGES FAQ PLATFORMS README* TODO VERSION
+	dohtml -a html,sgml doc/*
+
+	exeinto /etc/X11/Sessions
+	doexe $T/icewm
+}