Fix repoman issues.

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

3 files changed, 16 insertions, 70 deletions

diff --git a/x11-themes/wm-icons/wm-icons-0.3.0.ebuild b/x11-themes/wm-icons/wm-icons-0.3.0.ebuild
deleted file mode 100644
index af6dd4bda946..000000000000
--- a/x11-themes/wm-icons/wm-icons-0.3.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/wm-icons/wm-icons-0.3.0.ebuild,v 1.11 2007/01/04 19:45:32 flameeyes Exp $
-
-DESCRIPTION="A Large Assortment of Beutiful Themed Icons, Created with FVWM in mind"
-
-HOMEPAGE="http://wm-icons.sourceforge.net/"
-SRC_URI="mirror://sourceforge/wm-icons/wm-icons-${PV}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="alpha ppc ~ppc64 x86"
-
-IUSE=""
-DEPEND=">=sys-apps/gawk-3
-	>=dev-lang/perl-5.8.0
-	>=sys-apps/sed-4"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	sed -i 's#$(bindir)/wm-icons-config#true#g' ${S}/Makefile.in
-}
-
-src_compile() {
-	econf --enable-all-sets --enable-icondir=/usr/share/icons/wm-icons || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	# strange makefile...
-	einstall icondir=${D}/usr/share/icons/wm-icons DESTDIR=${D}
-
-	dodir /usr/bin
-	mv ${D}/${D}/usr/bin/wm-icons-config ${D}/usr/bin/wm-icons-config
-	rm -rf ${D}/${D}/usr/bin
-
-	einfo "Setting default aliases..."
-	${D}/usr/bin/wm-icons-config --user-dir="${D}/usr/share/icons/wm-icons" --defaults
-
-	dodoc AUTHORS ChangeLog COPYING INSTALL NEWS README
-}
-
-pkg_postinst() {
-	einfo "Users can use the wm-icons-config utility to create aliases in their"
-	einfo "home directory, FVWM users can then set this in their ImagePath"
-	einfo
-	einfo "Sample configurations for fvwm1, fvwm2, fvwm95 and scwm are available in"
-	einfo "/usr/share/wm-icons"
-	einfo
-}
diff --git a/x11-themes/wm-icons/wm-icons-0.4.0.ebuild b/x11-themes/wm-icons/wm-icons-0.4.0.ebuild
index 413eb49eb7a5..7ad7455a67e1 100644
--- a/x11-themes/wm-icons/wm-icons-0.4.0.ebuild
+++ b/x11-themes/wm-icons/wm-icons-0.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/wm-icons/wm-icons-0.4.0.ebuild,v 1.1 2007/03/08 19:05:36 anant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/wm-icons/wm-icons-0.4.0.ebuild,v 1.2 2010/02/24 14:18:04 ssuominen Exp $
 
 DESCRIPTION="A Large Assortment of Beutiful Themed Icons, Created with FVWM in mind"
 
@@ -17,16 +17,16 @@ DEPEND="${RDEPEND} sys-devel/autoconf sys-devel/automake sys-apps/sed"
 
 src_compile() {
 	econf --enable-all-sets --enable-icondir=/usr/share/icons/wm-icons || die "econf failed"
-	emake
+	emake || die
 }
 
 src_install() {
-	make icondir=${D}/usr/share/icons/wm-icons DESTDIR=${D} install
+	make icondir="${D}/usr/share/icons/wm-icons" DESTDIR="${D}" install
 
 	einfo "Setting default aliases..."
-	${D}/usr/bin/wm-icons-config --force --user-dir="${D}/usr/share/icons/wm-icons" --defaults
+	"${D}"/usr/bin/wm-icons-config --force --user-dir="${D}/usr/share/icons/wm-icons" --defaults
 
-	dodoc AUTHORS ChangeLog COPYING INSTALL NEWS README
+	dodoc AUTHORS ChangeLog NEWS README
 }
 
 pkg_postinst() {
diff --git a/x11-themes/wm-icons/wm-icons-0.4.0_pre1-r1.ebuild b/x11-themes/wm-icons/wm-icons-0.4.0_pre1-r1.ebuild
index 832c48045afb..5be49b6f7539 100644
--- a/x11-themes/wm-icons/wm-icons-0.4.0_pre1-r1.ebuild
+++ b/x11-themes/wm-icons/wm-icons-0.4.0_pre1-r1.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/wm-icons/wm-icons-0.4.0_pre1-r1.ebuild,v 1.13 2007/01/04 19:48:09 flameeyes Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/wm-icons/wm-icons-0.4.0_pre1-r1.ebuild,v 1.14 2010/02/24 14:18:04 ssuominen Exp $
 
 inherit autotools
 
@@ -24,11 +21,11 @@ S=${WORKDIR}/wm-icons
 src_unpack() {
 	unpack ${A}
 
-	sed -i 's#$(bindir)/wm-icons-config#true#g' ${S}/Makefile.am
+	sed -i 's#$(bindir)/wm-icons-config#true#g' "${S}"/Makefile.am
 	# duplication of bin/Makefile in configure.in #91764
-	sed -i '132s/bin\/Makefile//' ${S}/configure.in
+	sed -i '132s/bin\/Makefile//' "${S}"/configure.in
 	# non-portable comment bombs automake.
-	sed -i 's/\t#/#/' ${S}/Makefile.am
+	sed -i 's/\t#/#/' "${S}"/Makefile.am
 
 	cd "${S}"
 	eautoreconf
@@ -41,16 +38,16 @@ src_compile() {
 
 src_install() {
 	# strange makefile...
-	einstall icondir=${D}/usr/share/icons/wm-icons DESTDIR=${D}
+	einstall icondir="${D}/usr/share/icons/wm-icons" DESTDIR="${D}" || die
 
 	dodir /usr/bin
-	mv ${D}/${D}/usr/bin/wm-icons-config ${D}/usr/bin/wm-icons-config
-	rm -rf ${D}/var
+	mv "${D}"/"${D}"/usr/bin/wm-icons-config "${D}"/usr/bin/wm-icons-config
+	rm -rf "${D}"/var
 
 	einfo "Setting default aliases..."
-	${D}/usr/bin/wm-icons-config --user-dir="${D}/usr/share/icons/wm-icons" --defaults
+	"${D}"/usr/bin/wm-icons-config --user-dir="${D}/usr/share/icons/wm-icons" --defaults
 
-	dodoc AUTHORS ChangeLog COPYING INSTALL NEWS README
+	dodoc AUTHORS ChangeLog NEWS README
 }
 
 pkg_postinst() {