bumped to pre2 closing 57866

5 files changed, 122 insertions, 14 deletions

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index 0479222c2940..431156d86326 100644
--- a/x11-wm/icewm/ChangeLog
+++ b/x11-wm/icewm/ChangeLog
@@ -1,6 +1,11 @@
 # 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.48 2004/07/09 07:05:01 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.49 2004/07/22 03:54:37 morfic Exp $
+
+*icewm-1.2.15_pre2 (21 Jul 2004)
+
+  21 Jul 2004; Daniel Goller <morfic@gentoo.org> icewm-1.2.15_pre2.ebuild:
+  Bumped Version, closing bug #57866
 
   09 Jul 2004; Daniel Goller <morfic@gentoo.org> :
   this version has varios bug fixes and upstream merged our gcc 3.4 patches
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index 21fb5ee3e7a4..6b92c3ce8f14 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,9 +1,11 @@
 MD5 298528e55cdf9958bdc356df78cab49e icewm-1.2.14.ebuild 2591
 MD5 b2b27ccbd6707fa8e3b521f698321cd1 icewm-1.2.13.ebuild 2374
 MD5 b207b31284e4b1fcab41159c5b2276d7 ChangeLog 8667
-MD5 73a0648e058dfba5512f132e12836068 icewm-1.2.15_pre1.ebuild 2666
+MD5 45c3b78aaf8c6fa773ce909a8f9400d0 icewm-1.2.15_pre1.ebuild 2689
 MD5 a26b94d92c1e03083b7020e2f4c1afe9 metadata.xml 630
+MD5 45c3b78aaf8c6fa773ce909a8f9400d0 icewm-1.2.15_pre2.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
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.15_pre2 b/x11-wm/icewm/files/digest-icewm-1.2.15_pre2
new file mode 100644
index 000000000000..7ca790d36df0
--- /dev/null
+++ b/x11-wm/icewm/files/digest-icewm-1.2.15_pre2
@@ -0,0 +1,2 @@
+MD5 47c4ec4bc424dd8326c2dddf4f6a8c51 icewm-1.2.15pre2.tar.gz 941559
+MD5 428bac61473d247af1f4e133f2f92342 SilverXP-1.2.14-single-1.tar.bz2 322762
diff --git a/x11-wm/icewm/icewm-1.2.15_pre1.ebuild b/x11-wm/icewm/icewm-1.2.15_pre1.ebuild
index c6f89007207d..5bf82dd75be0 100644
--- a/x11-wm/icewm/icewm-1.2.15_pre1.ebuild
+++ b/x11-wm/icewm/icewm-1.2.15_pre1.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.15_pre1.ebuild,v 1.1 2004/07/09 07:05:01 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.15_pre1.ebuild,v 1.2 2004/07/22 03:54:37 morfic Exp $
 
 inherit eutils
 
@@ -14,17 +14,17 @@ HOMEPAGE="http://www.icewm.org/
 	http://sourceforge.net/projects/icewmsilverxp/"
 IUSE="esd gnome imlib nls spell truetype xinerama silverxp"
 
-DEPEND="virtual/x11
+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 )
-	>=sys-apps/sed-4"
-
-RDEPEND="${DEPEND}
 	media-fonts/artwiz-fonts"
 
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc"
@@ -36,6 +36,10 @@ src_unpack() {
 	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(){
@@ -75,21 +79,19 @@ src_compile(){
 		--with-cfgdir=/etc/icewm \
 		--with-docdir=/usr/share/doc/${PF}/html \
 		${myconf} || die "configure failed"
-	cd src
-	sed -i "s:/icewm-\$(VERSION)::" Makefile || die "patch failed"
-	cd ${S}
+
+	sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die "patch failed"
+
 
 	emake || die "emake failed"
 }
 
 src_install(){
-	make DESTDIR=${D} install || die
+	make DESTDIR=${D} install || die  "make instal failed"
 
 	dodoc AUTHORS BUGS CHANGES FAQ PLATFORMS README* TODO VERSION
 	dohtml -a html,sgml doc/*
 
-	echo "#!/bin/bash" > icewm
-	echo "/usr/bin/icewm-session" >> icewm
 	exeinto /etc/X11/Sessions
-	doexe icewm
+	doexe $T/icewm
 }
diff --git a/x11-wm/icewm/icewm-1.2.15_pre2.ebuild b/x11-wm/icewm/icewm-1.2.15_pre2.ebuild
new file mode 100644
index 000000000000..6871a57165ee
--- /dev/null
+++ b/x11-wm/icewm/icewm-1.2.15_pre2.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_pre2.ebuild,v 1.1 2004/07/22 03:54:37 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
+}