Fall cleaning

3 files changed, 42 insertions, 37 deletions

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index 6ab617ee6a95..625d71576fe9 100644
--- a/x11-wm/icewm/ChangeLog
+++ b/x11-wm/icewm/ChangeLog
@@ -1,6 +1,9 @@
 # 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.64 2004/09/17 01:57:33 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.65 2004/09/23 04:33:57 morfic Exp $
+
+  22 Sep 2004; Daniel Goller <morfic@gentoo.org> icewm-1.2.16-r1.ebuild:
+  Nothing but a major ebuild cleanup
 
 *icewm-1.2.15-r1 (15 Sep 2004)
 
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index cdc2f21aabd9..ff534d3f26b8 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,7 +1,7 @@
 MD5 b1a22085c05120290b532e4f9282f2ad icewm-1.2.16.ebuild 2777
-MD5 b50c59f6afc1a95b617998d093f64c10 icewm-1.2.16-r1.ebuild 2857
+MD5 19c028a09facb2b13dcaf56501826500 icewm-1.2.16-r1.ebuild 2469
 MD5 0348a762e3edff82fb88b16dcbf2f5b4 icewm-1.2.15-r1.ebuild 2777
-MD5 507684763f43e0b8d913451eb2acf365 ChangeLog 11113
+MD5 5cb9dc6224993e7b66d2eba9b43a637c ChangeLog 11224
 MD5 a26b94d92c1e03083b7020e2f4c1afe9 metadata.xml 630
 MD5 f8870ab789523ba13ed15ce6c440ff21 files/digest-icewm-1.2.16 141
 MD5 9028fc0d1b794c88e4a2db9cf28f66f0 files/IceWM.desktop 200
diff --git a/x11-wm/icewm/icewm-1.2.16-r1.ebuild b/x11-wm/icewm/icewm-1.2.16-r1.ebuild
index cd6d8faf46a3..933783b3b746 100644
--- a/x11-wm/icewm/icewm-1.2.16-r1.ebuild
+++ b/x11-wm/icewm/icewm-1.2.16-r1.ebuild
@@ -1,17 +1,27 @@
 # 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.4 2004/09/13 01:06:14 malc Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.16-r1.ebuild,v 1.5 2004/09/23 04:33:57 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/_}
 
-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/"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="x86 ~ppc sparc ~amd64"
+
 IUSE="esd gnome imlib nls spell truetype xinerama silverxp"
 
 RDEPEND="virtual/x11
@@ -25,11 +35,6 @@ RDEPEND="virtual/x11
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc sparc ~amd64"
-S=${WORKDIR}/${P/_}
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}/src
@@ -37,42 +42,39 @@ src_unpack() {
 		epatch ${WORKDIR}/${PN}/themes/${SILVERXP_P}/Linux/ybutton.cc.patch
 	fi
 
-	echo "#!/bin/bash" > $T/icewm
+	echo "#!/bin/sh" > $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"
+	 local myconf="
+		$(use_with esd esd-config /usr/bin/esd-config)
+
+		$(use_enable nls)
+		$(use_enable nls i18n)
 
-	use imlib \
-		&& myconf="${myconf} --with-imlib --without-xpm" \
-		|| myconf="${myconf} --without-imlib --with-xpm"
+		$(use_with imlib)
 
-	use spell \
-		&& myconf="${myconf} --enable-GtkSpell" \
-		|| myconf="${myconf} --disable-GtkSpell"
+		$(use_enable spell GtkSpell)
 
-	( use silverxp || use truetype ) \
-		&& myconf="${myconf} --enable-gradients --enable-shape --enable-movesize-fx --enable-shaped-decorations" \
-		|| myconf="${myconf} --disable-xfreetype --enable-corefonts"
+		$(use_enable x86 x86-asm)
 
-	use x86 \
-		&& myconf="${myconf} --enable-x86-asm" \
-		|| myconf="${myconf} --disable-x86-asm"
+		$(use_enable xinerama)
 
-	use gnome \
-		&& myconf="${myconf} --enable-menus-gnome2 --enable-menus-gnome1" \
-		|| myconf="${myconf} --disable-menus-gnome2 --disable-menus-gnome1"
+		$(use_enable gnome menus-gnome1)
+		$(use_enable gnome menus-gnome2)"
+
+	if use silverxp || use truetype
+	then
+		myconf="${myconf} --enable-gradients --enable-shape --enable-movesize-fx --enable-shaped-decorations"
+	else
+		myconf="${myconf} --disable-xfreetype --enable-corefonts"
+	fi
 
-	use xinerama \
-		&& myconf="${myconf} --enable-xinerama" \
-		|| myconf="${myconf} --disable-xinerama"
+echo ${myconf}
+epause
 
 	CXXFLAGS="${CXXFLAGS}" econf \
 		--with-libdir=/usr/share/icewm \
@@ -101,6 +103,6 @@ src_install(){
 
 	if use silversp
 	then
-	einfo "Please use 1.2.14-3 of Silverxp theme"
+	einfo "Please use Version 1.2.14-3 of the Silverxp theme"
 	fi
 }