Quoting

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 14 insertions, 116 deletions

diff --git a/x11-wm/icewm/icewm-1.2.30-r1.ebuild b/x11-wm/icewm/icewm-1.2.30-r1.ebuild
deleted file mode 100644
index 3f715fb95d83..000000000000
--- a/x11-wm/icewm/icewm-1.2.30-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.30-r1.ebuild,v 1.1 2007/07/28 22:40:26 beandog Exp $
-
-inherit eutils
-
-DESCRIPTION="Ice Window Manager with Themes"
-
-HOMEPAGE="http://www.icewm.org/"
-
-#fix for icewm preversion package names
-S=${WORKDIR}/${P/_}
-
-SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-IUSE="esd imlib nls spell truetype xinerama minimal debug uclibc"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXrandr
-	x11-libs/libXext
-	x11-libs/libXpm
-	x11-libs/libXrender
-	x11-libs/libXft
-	xinerama? ( x11-libs/libXinerama )
-	esd? ( media-sound/esound )
-	imlib? ( >=media-libs/imlib-1.9.10-r1 )
-	nls? ( sys-devel/gettext )
-	truetype? ( >=media-libs/freetype-2.0.9 )
-	media-libs/giflib"
-
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto
-	xinerama? ( x11-proto/xineramaproto )
-	>=sys-apps/sed-4"
-
-pkg_setup() {
-	if use truetype && use minimal; then
-		ewarn "You have both 'truetype' and 'minimal' use flags enabled."
-		ewarn "If you really want a minimal install, you will have to turn off"
-		ewarn "the truetype flag for this package."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/src
-
-	use uclibc && epatch "${FILESDIR}/icewm-uclibc.patch"
-
-	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
-			$(use_enable minimal lite)"
-	fi
-
-	myconf="${myconf}
-		--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 debug)"
-
-	CXXFLAGS="${CXXFLAGS}" econf ${myconf} || die "configure failed"
-
-	sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die "patch failed"
-	sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
-
-	emake || die "emake failed"
-}
-
-src_install(){
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS BUGS CHANGES PLATFORMS README* TODO VERSION
-	dohtml -a html,sgml doc/*
-
-	exeinto /etc/X11/Sessions
-	doexe $T/icewm
-
-	insinto /usr/share/xsessions
-	doins ${FILESDIR}/IceWM.desktop
-}
diff --git a/x11-wm/icewm/icewm-1.2.30.ebuild b/x11-wm/icewm/icewm-1.2.30.ebuild
index beb5f02395b0..a1cda69f9cad 100644
--- a/x11-wm/icewm/icewm-1.2.30.ebuild
+++ b/x11-wm/icewm/icewm-1.2.30.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.30.ebuild,v 1.7 2007/07/22 04:25:55 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.30.ebuild,v 1.8 2009/08/03 10:46:18 ssuominen Exp $
 
 inherit eutils
 
@@ -49,10 +49,10 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}/src
+	cd "${S}"/src
 
-	echo "#!/bin/sh" > $T/icewm
-	echo "/usr/bin/icewm-session" >> $T/icewm
+	echo "#!/bin/sh" > ${T}/icewm
+	echo "/usr/bin/icewm-session" >> ${T}/icewm
 }
 
 src_compile() {
@@ -93,8 +93,8 @@ src_install(){
 	dohtml -a html,sgml doc/*
 
 	exeinto /etc/X11/Sessions
-	doexe $T/icewm
+	doexe "${T}"/icewm
 
 	insinto /usr/share/xsessions
-	doins ${FILESDIR}/IceWM.desktop
+	doins "${FILESDIR}"/IceWM.desktop
 }
diff --git a/x11-wm/icewm/icewm-1.2.32.ebuild b/x11-wm/icewm/icewm-1.2.32.ebuild
index 41a8c09a1f08..374baffa4e1a 100644
--- a/x11-wm/icewm/icewm-1.2.32.ebuild
+++ b/x11-wm/icewm/icewm-1.2.32.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.32.ebuild,v 1.3 2007/10/06 15:20:47 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.32.ebuild,v 1.4 2009/08/03 10:46:18 ssuominen Exp $
 
 inherit eutils
 
@@ -49,12 +49,12 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}/src
+	cd "${S}"/src
 
 	use uclibc && epatch "${FILESDIR}/icewm-uclibc.patch"
 
-	echo "#!/bin/sh" > $T/icewm
-	echo "/usr/bin/icewm-session" >> $T/icewm
+	echo "#!/bin/sh" > ${T}/icewm
+	echo "/usr/bin/icewm-session" >> ${T}/icewm
 }
 
 src_compile() {
@@ -95,8 +95,8 @@ src_install(){
 	dohtml -a html,sgml doc/*
 
 	exeinto /etc/X11/Sessions
-	doexe $T/icewm
+	doexe "${T}"/icewm
 
 	insinto /usr/share/xsessions
-	doins ${FILESDIR}/IceWM.desktop
+	doins "${FILESDIR}"/IceWM.desktop
 }