Fix small typo + cleanup old ebuilds

8 files changed, 12 insertions, 220 deletions

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index 5df2a90568bb..bd4bd67d6daa 100644
--- a/x11-wm/icewm/ChangeLog
+++ b/x11-wm/icewm/ChangeLog
@@ -1,6 +1,10 @@
 # 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.74 2004/10/24 23:54:37 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.75 2004/10/25 00:01:57 morfic Exp $
+
+  24 Oct 2004; Daniel Goller <morfic@gentoo.org> -icewm-1.2.15-r1.ebuild,
+  icewm-1.2.16-r1.ebuild, -icewm-1.2.16.ebuild, icewm-1.2.17_pre1.ebuild:
+  remove old ebuilds + fix small typo in ebuilds
 
   24 Oct 2004; Daniel Goller <morfic@gentoo.org> icewm-1.2.17_pre1.ebuild:
   Cleanup econf
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index dbad585d7b1b..5ba55e7e9bfa 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,12 +1,8 @@
-MD5 b1a22085c05120290b532e4f9282f2ad icewm-1.2.16.ebuild 2777
-MD5 e80c7b597d1558ae5bcf2235e33ab3cb icewm-1.2.17_pre1.ebuild 2496
-MD5 c5ead456765b2d1a688419b8b1cdffa1 icewm-1.2.16-r1.ebuild 2433
-MD5 0348a762e3edff82fb88b16dcbf2f5b4 icewm-1.2.15-r1.ebuild 2777
-MD5 fc2dc459e39025f1f448ebe58913c173 ChangeLog 12345
+MD5 6c6a8d9159cb465dbd055981bb583b3d icewm-1.2.17_pre1.ebuild 2496
+MD5 42adda7c2d33b99328a938a9764f5098 icewm-1.2.16-r1.ebuild 2433
+MD5 b8f78a63ff2768a543c6256c47129d67 ChangeLog 12543
 MD5 a26b94d92c1e03083b7020e2f4c1afe9 metadata.xml 630
-MD5 f8870ab789523ba13ed15ce6c440ff21 files/digest-icewm-1.2.16 141
 MD5 9028fc0d1b794c88e4a2db9cf28f66f0 files/IceWM.desktop 200
 MD5 37ad1f076784e6c0b601719e9f5d2a46 files/icewm-1.2.17_pre1.wmtaskbar.cc.patch 342
-MD5 f75a8be94f83e4800311638f37fb5c1a files/digest-icewm-1.2.15-r1 141
 MD5 a15c477442ec11a68f6c5e1932e72d42 files/digest-icewm-1.2.16-r1 141
 MD5 09fb90eb26ebbd9fecafd03b53e956ac files/digest-icewm-1.2.17_pre1 145
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.15-r1 b/x11-wm/icewm/files/digest-icewm-1.2.15-r1
deleted file mode 100644
index 1ed1530b59f5..000000000000
--- a/x11-wm/icewm/files/digest-icewm-1.2.15-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 edc98a4d35c7dab1b369d9b84ad012a0 icewm-1.2.15.tar.gz 946892
-MD5 d0baec59b163c929eb907b0bb138f65b SilverXP-1.2.14-single-3.tar.bz2 322923
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.16 b/x11-wm/icewm/files/digest-icewm-1.2.16
deleted file mode 100644
index 763735196524..000000000000
--- a/x11-wm/icewm/files/digest-icewm-1.2.16
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1aa92846cc516a2ac1d668d80c3ca5ea icewm-1.2.16.tar.gz 947114
-MD5 428bac61473d247af1f4e133f2f92342 SilverXP-1.2.14-single-1.tar.bz2 322762
diff --git a/x11-wm/icewm/icewm-1.2.15-r1.ebuild b/x11-wm/icewm/icewm-1.2.15-r1.ebuild
deleted file mode 100644
index 1055ea9b1a1a..000000000000
--- a/x11-wm/icewm/icewm-1.2.15-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# 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-r1.ebuild,v 1.7 2004/09/17 01:57:33 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-3"
-
-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
-
-	dodir /usr/share/xsessions
-	insinto /usr/share/xsessions
-	doins ${FILESDIR}/IceWM.desktop
-
-}
diff --git a/x11-wm/icewm/icewm-1.2.16-r1.ebuild b/x11-wm/icewm/icewm-1.2.16-r1.ebuild
index 48eba014adb6..ebf0282e56a8 100644
--- a/x11-wm/icewm/icewm-1.2.16-r1.ebuild
+++ b/x11-wm/icewm/icewm-1.2.16-r1.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.16-r1.ebuild,v 1.12 2004/10/24 13:37:43 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.16-r1.ebuild,v 1.13 2004/10/25 00:01:58 morfic Exp $
 
 inherit eutils
 
@@ -89,7 +89,7 @@ src_install(){
 	insinto /usr/share/xsessions
 	doins ${FILESDIR}/IceWM.desktop
 
-	if use silversp
+	if use silverxp
 	then
 	einfo "Please use Version 1.2.14-3 of the Silverxp theme"
 	fi
diff --git a/x11-wm/icewm/icewm-1.2.16.ebuild b/x11-wm/icewm/icewm-1.2.16.ebuild
deleted file mode 100644
index 293ee298aa63..000000000000
--- a/x11-wm/icewm/icewm-1.2.16.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# 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.16.ebuild,v 1.1 2004/08/16 23:33:19 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
-
-	dodir /usr/share/xsessions
-	insinto /usr/share/xsessions
-	doins ${FILESDIR}/IceWM.desktop
-
-}
diff --git a/x11-wm/icewm/icewm-1.2.17_pre1.ebuild b/x11-wm/icewm/icewm-1.2.17_pre1.ebuild
index b8d387029fc3..c8f49cb184b8 100644
--- a/x11-wm/icewm/icewm-1.2.17_pre1.ebuild
+++ b/x11-wm/icewm/icewm-1.2.17_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.17_pre1.ebuild,v 1.2 2004/10/24 23:54:37 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.17_pre1.ebuild,v 1.3 2004/10/25 00:01:58 morfic Exp $
 
 inherit eutils
 
@@ -90,7 +90,7 @@ src_install(){
 	insinto /usr/share/xsessions
 	doins ${FILESDIR}/IceWM.desktop
 
-	if use silversp
+	if use silverxp
 	then
 	einfo "Please use Version 1.2.14-3 of the Silverxp theme"
 	fi