stable on x86 and ppc + cleanup of old ebuilds

7 files changed, 12 insertions, 209 deletions

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index 713e8a232eb5..158eb9006898 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.78 2004/11/07 20:00:07 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.79 2004/11/21 04:29:15 morfic Exp $
+
+  20 Nov 2004; Daniel Goller <morfic@gentoo.org> icewm-1.2.17.ebuild,
+  -icewm-1.2.17_pre1.ebuild, -icewm-1.2.17_pre2.ebuild:
+  1.2.17 stable on x86 ppc, and clean up of the pre version to .17
 
 *icewm-1.2.17 (07 Nov 2004)
 
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index 6abe53a95692..65cec49c9f61 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,23 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 6c6a8d9159cb465dbd055981bb583b3d icewm-1.2.17_pre1.ebuild 2496
 MD5 42adda7c2d33b99328a938a9764f5098 icewm-1.2.16-r1.ebuild 2433
-MD5 093afff2a21bfcf8c8241d380fb03cd0 ChangeLog 13019
-MD5 7a78b4106f26fb7a2c2c9b9fcfb83d32 icewm-1.2.17.ebuild 2161
+MD5 4666f03720010b5d4ca6704933f86c48 ChangeLog 13213
+MD5 ea48e715d5684ad1718745b60c0a392a icewm-1.2.17.ebuild 2159
 MD5 a26b94d92c1e03083b7020e2f4c1afe9 metadata.xml 630
-MD5 c335367aa3ff27e70e3882690864364a icewm-1.2.17_pre2.ebuild 2441
 MD5 fd57fef0e5a817b5a5ea6ffed65a3e5d files/digest-icewm-1.2.17 64
 MD5 9028fc0d1b794c88e4a2db9cf28f66f0 files/IceWM.desktop 200
 MD5 0adfec296f9e1a9eb08a326c0690c28e files/icewm-1.2.17.ybutton.cc.patch 591
 MD5 37ad1f076784e6c0b601719e9f5d2a46 files/icewm-1.2.17_pre1.wmtaskbar.cc.patch 342
 MD5 a15c477442ec11a68f6c5e1932e72d42 files/digest-icewm-1.2.16-r1 141
-MD5 09fb90eb26ebbd9fecafd03b53e956ac files/digest-icewm-1.2.17_pre1 145
-MD5 346b791e3835d7de7199c7289e29b116 files/digest-icewm-1.2.17_pre2 145
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBjn7RUpKYMelfdYERAqBwAJ97gKy/dI8zq1P8BjXjfS4+nRLgWgCbB2ss
-h7rGdd7jig+TAiP5Lfe6RPA=
-=dLKP
+iD8DBQFBoBpKUpKYMelfdYERAgoxAJ4wwCErUu/+YsUTbAJGxY55OXaBRwCdGv11
+fROdjRIXDqcjAy8jomV5QXo=
+=3PmC
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.17_pre1 b/x11-wm/icewm/files/digest-icewm-1.2.17_pre1
deleted file mode 100644
index fb5abadcc94d..000000000000
--- a/x11-wm/icewm/files/digest-icewm-1.2.17_pre1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c7faf1b1e95c70f7c200e9bc2f46eb23 icewm-1.2.17pre1.tar.gz 950958
-MD5 d0baec59b163c929eb907b0bb138f65b SilverXP-1.2.14-single-3.tar.bz2 322923
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.17_pre2 b/x11-wm/icewm/files/digest-icewm-1.2.17_pre2
deleted file mode 100644
index bd87278fe4d9..000000000000
--- a/x11-wm/icewm/files/digest-icewm-1.2.17_pre2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c958874dca92371936713638390cc7dc icewm-1.2.17pre2.tar.gz 948243
-MD5 d0baec59b163c929eb907b0bb138f65b SilverXP-1.2.14-single-3.tar.bz2 322923
diff --git a/x11-wm/icewm/icewm-1.2.17.ebuild b/x11-wm/icewm/icewm-1.2.17.ebuild
index 1b27cc8bbc19..75504f899700 100644
--- a/x11-wm/icewm/icewm-1.2.17.ebuild
+++ b/x11-wm/icewm/icewm-1.2.17.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.ebuild,v 1.1 2004/11/07 20:00:07 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.17.ebuild,v 1.2 2004/11/21 04:29:15 morfic Exp $
 
 inherit eutils
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="x86 ppc ~sparc ~amd64"
 
 IUSE="esd gnome imlib nls spell truetype xinerama silverxp"
 
diff --git a/x11-wm/icewm/icewm-1.2.17_pre1.ebuild b/x11-wm/icewm/icewm-1.2.17_pre1.ebuild
deleted file mode 100644
index c8f49cb184b8..000000000000
--- a/x11-wm/icewm/icewm-1.2.17_pre1.ebuild
+++ /dev/null
@@ -1,97 +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.17_pre1.ebuild,v 1.3 2004/10/25 00:01:58 morfic Exp $
-
-inherit eutils
-
-DESCRIPTION="Ice Window Manager"
-
-HOMEPAGE="http://www.icewm.org/
-	http://sourceforge.net/projects/icewmsilverxp/"
-
-#this needs to use the theme for 1.2.14 probably all through pre phase
-SILVERXP_P="SilverXP-1.2.14-single-3"
-#fix for icewm preversion package names
-S=${WORKDIR}/${P/_}
-
-SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz
-	mirror://sourceforge/icewmsilverxp/${SILVERXP_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-
-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 dev-util/pkgconfig )
-	imlib? ( >=media-libs/imlib-1.9.10-r1 )
-	nls? ( sys-devel/gettext )
-	truetype? ( >=media-libs/freetype-2.0.9 )
-	media-fonts/artwiz-fonts
-	media-libs/libungif"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/src
-	epatch ${FILESDIR}/icewm-1.2.17_pre1.wmtaskbar.cc.patch
-	if use silverxp ; then
-		epatch ${WORKDIR}/${PN}/themes/${SILVERXP_P}/Linux/ybutton.cc.patch
-	fi
-
-	echo "#!/bin/sh" > $T/icewm
-	echo "/usr/bin/icewm-session" >> $T/icewm
-
-}
-
-src_compile(){
-
-	if use truetype
-	then
-		myconf="${myconf} --enable-gradients --enable-shape --enable-movesize-fx --enable-shaped-decorations"
-	else
-		myconf="${myconf} --disable-xfreetype --enable-corefonts"
-	fi
-
-	CXXFLAGS="${CXXFLAGS}" econf \
-		--with-libdir=/usr/share/icewm \
-		--with-cfgdir=/etc/icewm \
-		--with-docdir=/usr/share/doc/${PF}/html \
-		$(use_with esd esd-config /usr/bin/esd-config) \
-		$(use_enable nls) \
-		$(use_enable nls i18n) \
-		$(use_with imlib) \
-		$(use_enable spell GtkSpell) \
-		$(use_enable x86 x86-asm) \
-		$(use_enable xinerama) \
-		$(use_enable gnome menus-gnome1) \
-		$(use_enable gnome menus-gnome2) \
-		${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 install failed"
-
-	dodoc AUTHORS BUGS CHANGES FAQ PLATFORMS README* TODO VERSION
-	dohtml -a html,sgml doc/*
-
-	exeinto /etc/X11/Sessions
-	doexe $T/icewm
-
-	insinto /usr/share/xsessions
-	doins ${FILESDIR}/IceWM.desktop
-
-	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.17_pre2.ebuild b/x11-wm/icewm/icewm-1.2.17_pre2.ebuild
deleted file mode 100644
index d9d324d1b982..000000000000
--- a/x11-wm/icewm/icewm-1.2.17_pre2.ebuild
+++ /dev/null
@@ -1,96 +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.17_pre2.ebuild,v 1.2 2004/11/07 04:01:39 morfic Exp $
-
-inherit eutils
-
-DESCRIPTION="Ice Window Manager"
-
-HOMEPAGE="http://www.icewm.org/
-	http://sourceforge.net/projects/icewmsilverxp/"
-
-#this needs to use the theme for 1.2.14 probably all through pre phase
-SILVERXP_P="SilverXP-1.2.14-single-3"
-#fix for icewm preversion package names
-S=${WORKDIR}/${P/_}
-
-SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz
-	mirror://sourceforge/icewmsilverxp/${SILVERXP_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-
-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 dev-util/pkgconfig )
-	imlib? ( >=media-libs/imlib-1.9.10-r1 )
-	nls? ( sys-devel/gettext )
-	truetype? ( >=media-libs/freetype-2.0.9 )
-	media-fonts/artwiz-fonts
-	media-libs/libungif"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/src
-	if use silverxp ; then
-		epatch ${WORKDIR}/${PN}/themes/${SILVERXP_P}/Linux/ybutton.cc.patch
-	fi
-
-	echo "#!/bin/sh" > $T/icewm
-	echo "/usr/bin/icewm-session" >> $T/icewm
-
-}
-
-src_compile(){
-
-	if use truetype
-	then
-		myconf="${myconf} --enable-gradients --enable-shape --enable-movesize-fx --enable-shaped-decorations"
-	else
-		myconf="${myconf} --disable-xfreetype --enable-corefonts"
-	fi
-
-	CXXFLAGS="${CXXFLAGS}" econf \
-		--with-libdir=/usr/share/icewm \
-		--with-cfgdir=/etc/icewm \
-		--with-docdir=/usr/share/doc/${PF}/html \
-		$(use_with esd esd-config /usr/bin/esd-config) \
-		$(use_enable nls) \
-		$(use_enable nls i18n) \
-		$(use_with imlib) \
-		$(use_enable spell GtkSpell) \
-		$(use_enable x86 x86-asm) \
-		$(use_enable xinerama) \
-		$(use_enable gnome menus-gnome1) \
-		$(use_enable gnome menus-gnome2) \
-		${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 install failed"
-
-	dodoc AUTHORS BUGS CHANGES FAQ PLATFORMS README* TODO VERSION
-	dohtml -a html,sgml doc/*
-
-	exeinto /etc/X11/Sessions
-	doexe $T/icewm
-
-	insinto /usr/share/xsessions
-	doins ${FILESDIR}/IceWM.desktop
-
-	if use silverxp
-	then
-	einfo "Please use Version >=1.2.14-3 of the Silverxp theme"
-	fi
-}