Version bumped. Fixed configure error when truetype is disabled. Added silverxp IUSE flag. Thanks to Daniel Goller <dgoller@satx.rr.com>. This closes bug #40148 and #53685. Cleaned out _pre* ebuilds.

12 files changed, 39 insertions, 254 deletions

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index 002c5ccd00a5..f076b5eaeb41 100644
--- a/x11-wm/icewm/ChangeLog
+++ b/x11-wm/icewm/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-wm/icewm
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.44 2004/04/27 21:38:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.45 2004/06/14 16:10:26 usata Exp $
+
+*icewm-1.2.14 (15 Jun 2004)
+
+  15 Jun 2004; Mamoru KOMACHI <usata@gentoo.org> icewm-1.2.13.ebuild,
+  +icewm-1.2.14.ebuild, -icewm-1.2.14_pre1.ebuild, -icewm-1.2.14_pre2.ebuild,
+  -icewm-1.2.14_pre7.ebuild, -icewm-1.2.14_pre9.ebuild:
+  Version bumped. Fixed configure error when truetype is disabled. Added
+  silverxp IUSE flag. Thanks to Daniel Goller <dgoller@satx.rr.com>.
+  This closes bug #40148 and #53685. Cleaned out _pre* ebuilds.
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org> icewm-1.2.13.ebuild:
   Add inherit eutils
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index c7c50baf1794..a0e38358c358 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,13 +1,7 @@
-MD5 22e7d7bcc301560abd32143c711c1637 ChangeLog 7921
-MD5 2504e692f73d883acbefe9c6ea71e27c icewm-1.2.13.ebuild 2363
+MD5 ffe2537ffacc36f518285cb11959d356 icewm-1.2.13.ebuild 2360
+MD5 c7aee2333c18774d01dddc53912322f2 icewm-1.2.14.ebuild 2578
+MD5 52bab2fe32bb9d6e27b007941866c6bc ChangeLog 8357
 MD5 e7c564f12681a38859734776f439fa01 metadata.xml 541
-MD5 14d0ff9aa123b1d0a009d3963e441290 icewm-1.2.14_pre2.ebuild 2131
-MD5 06aeb00efe21d0435146178c26df220a icewm-1.2.14_pre7.ebuild 2242
-MD5 6e907b0fc11e9beb2b3692a7ccee9b63 icewm-1.2.14_pre9.ebuild 2241
-MD5 00bc975ed8de7a87a77c3aa144c78481 icewm-1.2.14_pre1.ebuild 2131
 MD5 ce0de25ee74a308432d47313c2d6e5c5 files/digest-icewm-1.2.13 64
-MD5 0559bf5a078d2e61a68b67f331ac99f1 files/digest-icewm-1.2.14_pre2 68
-MD5 ee750f38b264bb2a795074ca2b89a8fc files/digest-icewm-1.2.14_pre7 68
-MD5 91e9ad302a6db2f774b6c4c9cddb5efd files/digest-icewm-1.2.14_pre9 68
+MD5 9e04ca924041143f46b60458baee4a9d files/digest-icewm-1.2.14 141
 MD5 9a3fefa7b9ff958ce22b422d6548562d files/icewm-1.2.13-gentoo.patch 2298
-MD5 29467e3621b9c136f000bd31cc8d2d92 files/digest-icewm-1.2.14_pre1 68
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.14 b/x11-wm/icewm/files/digest-icewm-1.2.14
new file mode 100644
index 000000000000..304a8f8dca7b
--- /dev/null
+++ b/x11-wm/icewm/files/digest-icewm-1.2.14
@@ -0,0 +1,2 @@
+MD5 1a5670fd074731766a64d5905bad773f icewm-1.2.14.tar.gz 932635
+MD5 428bac61473d247af1f4e133f2f92342 SilverXP-1.2.14-single-1.tar.bz2 322762
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.14_pre1 b/x11-wm/icewm/files/digest-icewm-1.2.14_pre1
deleted file mode 100644
index 967125c44fc6..000000000000
--- a/x11-wm/icewm/files/digest-icewm-1.2.14_pre1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 12dcbab8083a800354b1974c278581d9 icewm-1.2.14pre1.tar.gz 845389
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.14_pre2 b/x11-wm/icewm/files/digest-icewm-1.2.14_pre2
deleted file mode 100644
index 6b1c9b5dd28f..000000000000
--- a/x11-wm/icewm/files/digest-icewm-1.2.14_pre2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 795c4e613f9866af4b2b51f881b4f68c icewm-1.2.14pre2.tar.gz 846354
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.14_pre7 b/x11-wm/icewm/files/digest-icewm-1.2.14_pre7
deleted file mode 100644
index f157d86a18c5..000000000000
--- a/x11-wm/icewm/files/digest-icewm-1.2.14_pre7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e28ac7445dfe01db6fcfef291b258257 icewm-1.2.14pre7.tar.gz 914524
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.14_pre9 b/x11-wm/icewm/files/digest-icewm-1.2.14_pre9
deleted file mode 100644
index cd21daaf8403..000000000000
--- a/x11-wm/icewm/files/digest-icewm-1.2.14_pre9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b28db6d83f44d1b440fdae6657970eda icewm-1.2.14pre9.tar.gz 915495
diff --git a/x11-wm/icewm/icewm-1.2.13.ebuild b/x11-wm/icewm/icewm-1.2.13.ebuild
index 5e273ef06e0a..4ecc91e6e484 100644
--- a/x11-wm/icewm/icewm-1.2.13.ebuild
+++ b/x11-wm/icewm/icewm-1.2.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.13.ebuild,v 1.7 2004/04/27 21:38:14 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.13.ebuild,v 1.8 2004/06/14 16:10:26 usata Exp $
 
 inherit eutils
 
@@ -22,7 +22,6 @@ RDEPEND="${DEPEND}
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc amd64"
-S=${WORKDIR}/${P}
 
 # rcg12302003 Various patches to configure.in...
 src_unpack() {
@@ -52,7 +51,7 @@ src_compile(){
 
 	use truetype \
 		&& myconf="${myconf} --enable-gradients --enable-shape --enable-movesize-fx --enable-shaped-decorations" \
-		|| myconf="${myconf} --disable-xfreetype"
+		|| myconf="${myconf} --disable-xfreetype --enable-corefonts"
 
 	use x86 \
 		&& myconf="${myconf} --enable-x86-asm" \
diff --git a/x11-wm/icewm/icewm-1.2.14_pre7.ebuild b/x11-wm/icewm/icewm-1.2.14.ebuild
index b22f0548407d..e29a6cb0f737 100644
--- a/x11-wm/icewm/icewm-1.2.14_pre7.ebuild
+++ b/x11-wm/icewm/icewm-1.2.14.ebuild
@@ -1,11 +1,17 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.14_pre7.ebuild,v 1.2 2004/02/02 20:30:13 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.14.ebuild,v 1.1 2004/06/14 16:10:26 usata Exp $
+
+inherit eutils
+
+SILVERXP_P="SilverXP-${PV}-single-1"
 
 DESCRIPTION="Ice Window Manager"
-SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
-HOMEPAGE="http://www.icewm.org"
-IUSE="esd gnome imlib nls spell truetype xinerama"
+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"
 
 DEPEND="virtual/x11
 	esd? ( media-sound/esound )
@@ -22,6 +28,14 @@ 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
+}
+
 src_compile(){
 	use esd \
 		&& myconf="${myconf} --with-esd-config=/usr/bin/esd-config"
@@ -38,9 +52,9 @@ src_compile(){
 		&& myconf="${myconf} --enable-GtkSpell" \
 		|| myconf="${myconf} --disable-GtkSpell"
 
-	use truetype \
+	( use silverxp || use truetype ) \
 		&& myconf="${myconf} --enable-gradients --enable-shape --enable-movesize-fx --enable-shaped-decorations" \
-		|| myconf="${myconf} --disable-xfreetype"
+		|| myconf="${myconf} --disable-xfreetype --enable-corefonts"
 
 	use x86 \
 		&& myconf="${myconf} --enable-x86-asm" \
@@ -69,7 +83,7 @@ src_compile(){
 src_install(){
 	make DESTDIR=${D} install || die
 
-	dodoc AUTHORS BUGS CHANGES COPYING FAQ PLATFORMS README* TODO VERSION
+	dodoc AUTHORS BUGS CHANGES FAQ PLATFORMS README* TODO VERSION
 	dohtml -a html,sgml doc/*
 
 	echo "#!/bin/bash" > icewm
diff --git a/x11-wm/icewm/icewm-1.2.14_pre1.ebuild b/x11-wm/icewm/icewm-1.2.14_pre1.ebuild
deleted file mode 100644
index 17c16b2e203e..000000000000
--- a/x11-wm/icewm/icewm-1.2.14_pre1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.14_pre1.ebuild,v 1.2 2004/04/27 17:13:03 pvdabeel 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-libs gnome-base/gnome-desktop )
-	imlib? ( >=media-libs/imlib-1.9.10-r1 )
-	nls? ( sys-devel/gettext )
-	truetype? ( >=media-libs/freetype-2.0.9 )"
-
-RDEPEND="${DEPEND}
-	media-fonts/artwiz-fonts"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
-S=${WORKDIR}/${P/_}
-
-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 --enable-shape --enable-movesize-fx --enable-shaped-decorations" \
-		|| myconf="${myconf} --disable-xfreetype"
-
-	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"
-
-	CXXFLAGS="${CXXFLAGS}" econf \
-		--with-libdir=/usr/share/icewm \
-		--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}
-
-	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-session" >> icewm
-	exeinto /etc/X11/Sessions
-	doexe icewm
-}
diff --git a/x11-wm/icewm/icewm-1.2.14_pre2.ebuild b/x11-wm/icewm/icewm-1.2.14_pre2.ebuild
deleted file mode 100644
index eded0d6f4787..000000000000
--- a/x11-wm/icewm/icewm-1.2.14_pre2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.14_pre2.ebuild,v 1.2 2004/04/27 17:13:03 pvdabeel 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-libs gnome-base/gnome-desktop )
-	imlib? ( >=media-libs/imlib-1.9.10-r1 )
-	nls? ( sys-devel/gettext )
-	truetype? ( >=media-libs/freetype-2.0.9 )"
-
-RDEPEND="${DEPEND}
-	media-fonts/artwiz-fonts"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
-S=${WORKDIR}/${P/_}
-
-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 --enable-shape --enable-movesize-fx --enable-shaped-decorations" \
-		|| myconf="${myconf} --disable-xfreetype"
-
-	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"
-
-	CXXFLAGS="${CXXFLAGS}" econf \
-		--with-libdir=/usr/share/icewm \
-		--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}
-
-	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-session" >> icewm
-	exeinto /etc/X11/Sessions
-	doexe icewm
-}
diff --git a/x11-wm/icewm/icewm-1.2.14_pre9.ebuild b/x11-wm/icewm/icewm-1.2.14_pre9.ebuild
deleted file mode 100644
index 833cd9f7baed..000000000000
--- a/x11-wm/icewm/icewm-1.2.14_pre9.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.14_pre9.ebuild,v 1.1 2004/02/03 15:41:57 hanno 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 xinerama"
-
-DEPEND="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 )"
-
-RDEPEND="${DEPEND}
-	media-fonts/artwiz-fonts"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
-S=${WORKDIR}/${P/_}
-
-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 --enable-shape --enable-movesize-fx --enable-shaped-decorations" \
-		|| myconf="${myconf} --disable-xfreetype"
-
-	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"
-	cd src
-	sed -i "s:/icewm-\$(VERSION)::" Makefile || die "patch failed"
-	cd ${S}
-
-	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-session" >> icewm
-	exeinto /etc/X11/Sessions
-	doexe icewm
-}