Quoting

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 15 insertions, 119 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
 }
diff --git a/x11-wm/matchbox-common/Manifest b/x11-wm/matchbox-common/Manifest
index 21bad97e646c..aff7d5342e5b 100644
--- a/x11-wm/matchbox-common/Manifest
+++ b/x11-wm/matchbox-common/Manifest
@@ -2,8 +2,6 @@ AUX MatchBox.desktop 222 RMD160 481164e9707f74a28fb73f50ac8388df285c83ec SHA1 fc
 AUX add-media-category.patch 1630 RMD160 2b14f60534fcd5ff98cd74341e5e1987d5cd490a SHA1 27e9bdb2eb217619e1b7b1df399725bba52a5a3b SHA256 2634492f90293c4c28e5d0067754e9f078ffbf77beb20c7bd046d7629e6925c5
 AUX no-utilities-category.patch 238 RMD160 da2dd410371bb5324b1d36777ca33853138e2270 SHA1 0cde763ba4abbe5e07e809f443a75397e4e55050 SHA256 f7a3c01ae10c70e689a513104b55742e07b9c65e35ccdcbc2ce2d27a0e78a89d
 DIST matchbox-common-0.9.1.tar.bz2 86365 RMD160 b4c6ed40da45f55129bb31d05e0e43c2787d0104 SHA1 1d8adb017b600f6c58a8cefdd7c9f4597f21e4b5 SHA256 524995b9899cc10d04c7964fb88ff8a2199865ca97e8d4988abd8d6c2a286199
-EBUILD matchbox-common-0.9.1-r1.ebuild 1061 RMD160 82c6170fc8c18a4dc0f851ac4644ceb1d00a1377 SHA1 c1fee745b4ba2483afee484c6d31a8093e493e35 SHA256 23052b0e3f6120a96b6809e6fa991cd9b7ee813ebfc10a040d27a0626b21dd2c
-EBUILD matchbox-common-0.9.1-r2.ebuild 1212 RMD160 516b03cd8a49bbf62ab219113e6b726e5484a2fb SHA1 35a5252f72c04049f03683cd4f8839a98c7a202b SHA256 a6f47c217aabb2a84561997e525616f51e80e945fe11ea7cdf86f074474d7bc6
-EBUILD matchbox-common-0.9.1.ebuild 1048 RMD160 dd425cc8d92b15e777937e2bbf738ac104a59819 SHA1 a52161b10ff3a0f36246d14a1d226d69bf5a50ff SHA256 d2c940432afa84768a71f7dbb60af0456f266bac10ab75f7c16d0d71ba0b7dbf
+EBUILD matchbox-common-0.9.1-r2.ebuild 1197 RMD160 134349f93ee48adead5008ac6aab1d6cb01da978 SHA1 2dadb9ed38d6869ba179a015e28f2467be1b099a SHA256 ae083e1dd6cf723ff7e5d59f0f8055bb2239670ae342ff5ca10e3f03e1a8e228
 MISC ChangeLog 2064 RMD160 1fbdf7d1db129468f2da56e8c90fedf0aa1581b7 SHA1 c0c007aad610de014250e7555d3863af49c62559 SHA256 acc5ab23a5893ff2639e603e92713f6e1111428bfafc1080109060da97e9dec9
 MISC metadata.xml 309 RMD160 c4e5e87f3fe7456514e6ba7e041e3a021b125e66 SHA1 a8e3e1ec227202acd28e7bc018f4abfa08bf5209 SHA256 85e15977fc065b9f489481c87425f1030bea5466a66723d585892631f9e797a0