stable ebuild, new ebuild, old ones gone

7 files changed, 21 insertions, 108 deletions

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index d1c40dc859e6..c2ed2a435dd8 100644
--- a/x11-wm/icewm/ChangeLog
+++ b/x11-wm/icewm/ChangeLog
@@ -1,6 +1,12 @@
 # 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.55 2004/08/16 23:18:07 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.56 2004/08/16 23:33:19 morfic Exp $
+
+*icewm-1.2.16 (16 Aug 2004)
+
+  16 Aug 2004; Daniel Goller <morfic@gentoo.org> -icewm-1.2.14.ebuild,
+  icewm-1.2.15-r1.ebuild, -icewm-1.2.15.ebuild, +icewm-1.2.16.ebuild:
+  Marked  Stable, cleaned up old ebuilds, added new version
 
   16 Aug 2004; Daniel Goller <morfic@gentoo.org> icewm-1.2.15.ebuild:
   Stable on x86
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index cc64335e506b..b5a11030c7db 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,13 +1,11 @@
-MD5 32aa2caa680ebf7d00cebef468981222 icewm-1.2.14.ebuild 2589
+MD5 b1a22085c05120290b532e4f9282f2ad icewm-1.2.16.ebuild 2777
 MD5 b2b27ccbd6707fa8e3b521f698321cd1 icewm-1.2.13.ebuild 2374
-MD5 0529d8841001960acae4fcc97b4ce925 icewm-1.2.15-r1.ebuild 2780
-MD5 b74f3a928913df9a227c0d922b12ee48 icewm-1.2.15.ebuild 2683
-MD5 2f3529ca76a7c21201eb182203e1b79d ChangeLog 9701
+MD5 6bc79c79dfe5ef31fd816010361ff8ff icewm-1.2.15-r1.ebuild 2779
+MD5 6fd7791e57f5877aecf2576160a511e6 ChangeLog 9932
 MD5 a26b94d92c1e03083b7020e2f4c1afe9 metadata.xml 630
 MD5 8ba1190df18302621076fd49c157a264 icewm-1.2.14-r1.ebuild 2683
 MD5 ce0de25ee74a308432d47313c2d6e5c5 files/digest-icewm-1.2.13 64
-MD5 9e04ca924041143f46b60458baee4a9d files/digest-icewm-1.2.14 141
-MD5 c78f7834862a525325dc59b76ac300f8 files/digest-icewm-1.2.15 141
+MD5 f8870ab789523ba13ed15ce6c440ff21 files/digest-icewm-1.2.16 141
 MD5 9028fc0d1b794c88e4a2db9cf28f66f0 files/IceWM.desktop 200
 MD5 9e04ca924041143f46b60458baee4a9d files/digest-icewm-1.2.14-r1 141
 MD5 c78f7834862a525325dc59b76ac300f8 files/digest-icewm-1.2.15-r1 141
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.15 b/x11-wm/icewm/files/digest-icewm-1.2.15
deleted file mode 100644
index 684e207dbce3..000000000000
--- a/x11-wm/icewm/files/digest-icewm-1.2.15
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 edc98a4d35c7dab1b369d9b84ad012a0 icewm-1.2.15.tar.gz 946892
-MD5 428bac61473d247af1f4e133f2f92342 SilverXP-1.2.14-single-1.tar.bz2 322762
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.14 b/x11-wm/icewm/files/digest-icewm-1.2.16
index 304a8f8dca7b..763735196524 100644
--- a/x11-wm/icewm/files/digest-icewm-1.2.14
+++ b/x11-wm/icewm/files/digest-icewm-1.2.16
@@ -1,2 +1,2 @@
-MD5 1a5670fd074731766a64d5905bad773f icewm-1.2.14.tar.gz 932635
+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.14.ebuild b/x11-wm/icewm/icewm-1.2.14.ebuild
deleted file mode 100644
index 893888ed5d13..000000000000
--- a/x11-wm/icewm/icewm-1.2.14.ebuild
+++ /dev/null
@@ -1,94 +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.14.ebuild,v 1.5 2004/08/06 14:31:44 gustavoz Exp $
-
-inherit eutils
-
-SILVERXP_P="SilverXP-${PV}-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"
-
-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 )
-	>=sys-apps/sed-4"
-
-RDEPEND="${DEPEND}
-	media-fonts/artwiz-fonts"
-
-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
-}
-
-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"
-	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 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.15-r1.ebuild b/x11-wm/icewm/icewm-1.2.15-r1.ebuild
index 282a8a886663..cbd9d24e6d19 100644
--- a/x11-wm/icewm/icewm-1.2.15-r1.ebuild
+++ b/x11-wm/icewm/icewm-1.2.15-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.15-r1.ebuild,v 1.1 2004/08/15 15:05:30 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.15-r1.ebuild,v 1.2 2004/08/16 23:33:19 morfic Exp $
 
 inherit eutils
 
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 
 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.ebuild b/x11-wm/icewm/icewm-1.2.16.ebuild
index 2a01cac6f09b..293ee298aa63 100644
--- a/x11-wm/icewm/icewm-1.2.15.ebuild
+++ b/x11-wm/icewm/icewm-1.2.16.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.ebuild,v 1.2 2004/08/16 23:18:07 morfic Exp $
+# $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
 
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc"
+KEYWORDS="~x86 ~ppc ~sparc"
 S=${WORKDIR}/${P/_}
 
 src_unpack() {
@@ -94,4 +94,9 @@ src_install(){
 
 	exeinto /etc/X11/Sessions
 	doexe $T/icewm
+
+	dodir /usr/share/xsessions
+	insinto /usr/share/xsessions
+	doins ${FILESDIR}/IceWM.desktop
+
 }