lot o clean up

9 files changed, 10 insertions, 365 deletions

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index 373791148cef..e2f945af2a0a 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.62 2004/09/13 01:06:14 malc Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.63 2004/09/15 19:45:16 morfic Exp $
+
+  15 Sep 2004; Daniel Goller <morfic@gentoo.org> -icewm-1.2.13.ebuild,
+  -icewm-1.2.14-r1.ebuild, -icewm-1.2.15-r1.ebuild:
+  clean up all old versions
 
   12 Sep 2004; Malcolm Lashley <malc@gentoo.org> icewm-1.2.16-r1.ebuild:
   ~amd64, needed for gcc3.4 compilation
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index 3dbfaac63b6b..dddfd87acf79 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,14 +1,9 @@
-MD5 f6cf735f8705ce2ddd6a372dd4700bfb ChangeLog 10814
-MD5 b2b27ccbd6707fa8e3b521f698321cd1 icewm-1.2.13.ebuild 2374
-MD5 a26b94d92c1e03083b7020e2f4c1afe9 metadata.xml 630
-MD5 b50c59f6afc1a95b617998d093f64c10 icewm-1.2.16-r1.ebuild 2857
 MD5 b1a22085c05120290b532e4f9282f2ad icewm-1.2.16.ebuild 2777
-MD5 3717387cb8f4a66ec7ebd2b9aa477005 icewm-1.2.14-r1.ebuild 2684
-MD5 0f99a770c7f0c2260caf0658e72e16e3 icewm-1.2.15-r1.ebuild 2779
-MD5 ce0de25ee74a308432d47313c2d6e5c5 files/digest-icewm-1.2.13 64
+MD5 b50c59f6afc1a95b617998d093f64c10 icewm-1.2.16-r1.ebuild 2857
+MD5 4a0b79e86a281c26de359d17411ea6de icewm-1.2.15-r1.ebuild 2798
+MD5 2269dafa8aa220241cf284793c656029 ChangeLog 10966
+MD5 a26b94d92c1e03083b7020e2f4c1afe9 metadata.xml 630
 MD5 f8870ab789523ba13ed15ce6c440ff21 files/digest-icewm-1.2.16 141
-MD5 9a3fefa7b9ff958ce22b422d6548562d files/icewm-1.2.13-gentoo.patch 2298
-MD5 a15c477442ec11a68f6c5e1932e72d42 files/digest-icewm-1.2.16-r1 141
 MD5 9028fc0d1b794c88e4a2db9cf28f66f0 files/IceWM.desktop 200
-MD5 9e04ca924041143f46b60458baee4a9d files/digest-icewm-1.2.14-r1 141
 MD5 f75a8be94f83e4800311638f37fb5c1a files/digest-icewm-1.2.15-r1 141
+MD5 a15c477442ec11a68f6c5e1932e72d42 files/digest-icewm-1.2.16-r1 141
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.13 b/x11-wm/icewm/files/digest-icewm-1.2.13
deleted file mode 100644
index f5a80a74d71a..000000000000
--- a/x11-wm/icewm/files/digest-icewm-1.2.13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d189afcf15f2386a0a0397c376e297c6 icewm-1.2.13.tar.gz 839636
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.14-r1 b/x11-wm/icewm/files/digest-icewm-1.2.14-r1
deleted file mode 100644
index 304a8f8dca7b..000000000000
--- a/x11-wm/icewm/files/digest-icewm-1.2.14-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-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.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/icewm-1.2.13-gentoo.patch b/x11-wm/icewm/files/icewm-1.2.13-gentoo.patch
deleted file mode 100644
index 2ec91fff92f8..000000000000
--- a/x11-wm/icewm/files/icewm-1.2.13-gentoo.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- icewm-1.2.13/configure.in.orig	2003-12-30 19:56:55.975650544 -0500
-+++ icewm-1.2.13/configure.in	2003-12-30 20:10:21.265227920 -0500
-@@ -21,7 +21,9 @@
- 
- dnl ---------- Checking for a C compiler in hope that it understands C++ too ---
- dnl
--ICE_PROG_CXX_LIGHT
-+dnl
-+dnl Gentoo patch by Ryan C. Gordon 12/30/2003: ICE_PROG_CXX_LIGHT is broken.
-+dnl ICE_PROG_CXX_LIGHT
- AC_LANG_CPLUSPLUS
- AC_PROG_CXX
- 
-@@ -29,9 +31,11 @@
- dnl ---- for linking. Also check how to turn off RTTI and exception handling ---
- if test x"$ac_cv_prog_gxx" != x; then
-   AC_PROG_CC
--  if test x"$ac_cv_prog_gcc" != x; then
--    CXX_LINK=${CC}
--  fi
-+
-+  dnl Gentoo patch by Ryan C. Gordon 12/30/2003: Must link with CXX, not CC.
-+  dnl if test x"$ac_cv_prog_gcc" != x; then
-+  dnl   CXX_LINK=${CC}
-+  dnl fi
-   
-   ICE_CXX_FLAG_ACCEPT(no_rtti, -fno-rtti)
-   dnl --- Intel C++ supports -fno-rtti, but doens't support -fno-*-exceptions
-@@ -368,7 +372,12 @@
-      AC_MSG_ERROR("xfreetype or core fonts must be enabled")
-   fi
-   if test "$enable_xfreetype" != "no" -o "$enable_xfreetype" = "implied"; then
--    AC_PATH_PROG(XFT_CONFIG, xft-config,, ${with_xft_arg-${PATH}})
-+    dnl Gentoo patch by Ryan C. Gordon 12/30/2003:
-+    dnl xft-config is installed with the xfree package, but is in
-+    dnl /usr/X11R6/bin, which isn't in the default path. The original
-+    dnl version of AC_PATH_PROG can't be used, because it breaks other things.
-+    dnl AC_PATH_PROG(XFT_CONFIG, xft-config,, ${with_xft_arg-${PATH}})
-+    AC_PATH_PROG(XFT_CONFIG, xft-config,, ${PATH}:/usr/X11R6/bin)
-     if test "${XFT_CONFIG}" != ""; then
-       XFT_CFLAGS=`${XFT_CONFIG} --cflags`
-       XFT_LIBS=`${XFT_CONFIG} --libs`
-@@ -774,7 +783,17 @@
-       fi
-     fi ])
- 
--CONFIG_KDE_MENU_DIR="`kde-config --path apps | sed -e 's/.*://'`" 
-+dnl Gentoo patch by Ryan C. Gordon 12/30/2003:
-+dnl kde-config is installed with the kde package, but is in
-+dnl /usr/kde/KDEVER/bin, which isn't in the default path.
-+dnl CONFIG_KDE_MENU_DIR="`kde-config --path apps | sed -e 's/.*://'`"
-+
-+AC_PATH_PROG(KDE_CONFIG, kde-config,, ${PATH}:/usr/kde/*/bin)
-+if test "${KDE_CONFIG}" != ""; then
-+  CONFIG_KDE_MENU_DIR="`${KDE_CONFIG} --path apps | sed -e 's/.*://'`"
-+else
-+  CONFIG_KDE_MENU_DIR=""
-+fi
- 
- AC_SUBST(GNOME_VER)
- AC_SUBST(CONFIG_GNOME1_MENU_DIR)
diff --git a/x11-wm/icewm/icewm-1.2.13.ebuild b/x11-wm/icewm/icewm-1.2.13.ebuild
deleted file mode 100644
index 43a46078714c..000000000000
--- a/x11-wm/icewm/icewm-1.2.13.ebuild
+++ /dev/null
@@ -1,87 +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.13.ebuild,v 1.10 2004/06/28 23:49:38 agriffis Exp $
-
-inherit eutils
-
-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 )
-	>=sys-apps/sed-4"
-
-RDEPEND="${DEPEND}
-	media-fonts/artwiz-fonts"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc amd64"
-
-# rcg12302003 Various patches to configure.in...
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-${PV}-gentoo.patch
-}
-
-src_compile(){
-	# rcg12302003 We patch configure.in, so rebuild the configure script...
-	./autogen.sh
-
-	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 --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"
-
-	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-r1.ebuild b/x11-wm/icewm/icewm-1.2.14-r1.ebuild
deleted file mode 100644
index 2d49100dfdaf..000000000000
--- a/x11-wm/icewm/icewm-1.2.14-r1.ebuild
+++ /dev/null
@@ -1,99 +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-r1.ebuild,v 1.2 2004/08/30 19:19:31 pvdabeel 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
-
-	dodir /usr/share/xsessions
-	insinto /usr/share/xsessions
-	doins ${FILESDIR}/IceWM.desktop
-
-}
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 1f20d8b05870..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.5 2004/08/30 19:19:31 pvdabeel 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
-
-}