Fix repoman issues.

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

6 files changed, 20 insertions, 76 deletions

diff --git a/x11-themes/vdr-channel-logos/Manifest b/x11-themes/vdr-channel-logos/Manifest
index de8a17290e66..b5c83a2767ec 100644
--- a/x11-themes/vdr-channel-logos/Manifest
+++ b/x11-themes/vdr-channel-logos/Manifest
@@ -1,4 +1,4 @@
 DIST logos-0.2.tar.gz 659476 RMD160 37047405ab60ba4191302a5d6c55b4186aaa9c21 SHA1 6843894a63d6dc5be0c63bd9424dd40c6d5a69c6 SHA256 adb1e0ca8445200a69545fd09476f06012bbce96660f01c837b232c12fe173f8
-EBUILD vdr-channel-logos-0.2.ebuild 712 RMD160 b6f6d5801fdfd532b735bb6771163143234499f3 SHA1 d8b9dcf9cfe364aa4e841ebff030dd0604fb539a SHA256 3060dff82e6f24dddd3de8dd726b2688ac3cf6237904793082ebf1b60d44d0ea
+EBUILD vdr-channel-logos-0.2.ebuild 673 RMD160 8f0810ee28c40c8268edfb0ba41a988444b31676 SHA1 9dd775189a0823b9dee2e1557e700034c9f83839 SHA256 b0b02f0dec83b29eae52539517cd27732437eb2a7fe63e9ef51ddbceff3b4d7e
 MISC ChangeLog 647 RMD160 ae5020bc63edbb6c528c4d05091be39b8aaf4bf6 SHA1 c6c366d2512e1e5aa56fd3eff58f8176dcdec993 SHA256 50edec1ba5eaff65d7982668a398d8b79967860e5b2d7b014361d30d64504127
 MISC metadata.xml 263 RMD160 ce7af80e59cdab36a4c2c4f22e942a5893bf108c SHA1 1dba53cbe1821e2edc8bd55e223afb62c6a344c4 SHA256 08d4610093d9d54d33c4f62a4886312290016bd2be38ddbc27391eb4b9c8b2be
diff --git a/x11-themes/wm-icons/Manifest b/x11-themes/wm-icons/Manifest
index 65b056d898c4..f8180e866427 100644
--- a/x11-themes/wm-icons/Manifest
+++ b/x11-themes/wm-icons/Manifest
@@ -1,8 +1,6 @@
-DIST wm-icons-0.3.0.tar.bz2 979087 RMD160 c71d4c30c02604fc33065cf18c948d5e3a964aac SHA1 f7afdc0bd4acf3a9657d5bd7f06834361c85bd43 SHA256 a65b3a3062c1f090100a38d80cade66fd5f483cfe59ef210ad50727a6064d5d2
 DIST wm-icons-0.4.0.tar.bz2 3433177 RMD160 a44f722109ce5f43ce1e7f0332393c34062e7355 SHA1 c293ff64350224c1130ac5471e6cc871f9048023 SHA256 285ed5eb5ae6d6f93b956ab20109fa05181ef1ce9cf1b8dfd7cf228f4497edfb
 DIST wm-icons-0.4.0_pre1-cvs-01092003.tar.bz2 2046784 RMD160 eda3235a35123a82e89c1a982bb669ca872daf05 SHA1 05f5b58614e38a86024aa8c049cfffdf3fb15049 SHA256 c544fa910944cfe1f380750dabce83012b52f68c5c72cfa73ac529b8b720c715
-EBUILD wm-icons-0.3.0.ebuild 1491 RMD160 96be47f219bd1a0198a6de99032547967c204052 SHA1 8911bf268b4e3799f27d4b24649eb5b1ae576a0c SHA256 f66087b4078e9ecf35dacb6eecf2ba6663360e09a336c292cc999165f3e71dfd
-EBUILD wm-icons-0.4.0.ebuild 1287 RMD160 a427886396bf925fd0c601701d9ceb8a62239eb0 SHA1 14db83da48ff3ae7b069b71b00ef67981d4e189d SHA256 b2609e3870cbc22eeac7f1d77ca703cce76ccaa8f7dece342f879ff99d083fde
-EBUILD wm-icons-0.4.0_pre1-r1.ebuild 1743 RMD160 21fb2801970885aaa898c563ca898fb7bccc6ca3 SHA1 ec81726a3efc497792f6e09586f3cd8726eb85d6 SHA256 a1f006be261283a5df8f5c178c1f66fd2fcd8ab8eaf468496f40a3a288e0f85c
+EBUILD wm-icons-0.4.0.ebuild 1288 RMD160 71ab639693284e400c6ccfdaafc7a372539630c1 SHA1 6ed5fed8a66c7b6a691e7aa2359bde2b7b080242 SHA256 810da160494d332b332753bcd8a4578ab03c2c962140f312583d36035a92112e
+EBUILD wm-icons-0.4.0_pre1-r1.ebuild 1707 RMD160 062ee1294d1024f8806ce29fcd09426420d023ab SHA1 672e3b5228968c1191a2f1b514a738ed57a1ed45 SHA256 22481c30bcef98ac9a93deb457b59b9ae19ada89c5f673fc56749a68917d5fde
 MISC ChangeLog 2466 RMD160 683835e21e1a49a5c6a23702f94d773eaa0deb8d SHA1 18cbd11a37225bf21b5bb978e16e3d14a41e9396 SHA256 36924506bcafcdb48425e788b3e75652301d2018c7f4e21b1d86f87b9a85dc12
 MISC metadata.xml 343 RMD160 102673ccb1de89a7b619c0f331fdb4207fe17f21 SHA1 807371066e6e747e18109ab10d3252de0a3ccdc6 SHA256 7bbbb2ca0739f15d5a9ee7304c02e4acc76c1b67731eda1a167281d513be4196
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() {
diff --git a/x11-themes/xcursor-neutral/Manifest b/x11-themes/xcursor-neutral/Manifest
index 78aa825a8e3d..06d23fe0ee87 100644
--- a/x11-themes/xcursor-neutral/Manifest
+++ b/x11-themes/xcursor-neutral/Manifest
@@ -1,6 +1,6 @@
 DIST 28310-neutral-1.13a.tar.gz 68777 RMD160 94a53a8c4e62ac7638273029aadcb8195a8a4cd2 SHA1 2395b24c2c9ef5234a0535915530a71c2715370f SHA256 f67f613fa1e16742f144f26ef149fb24a55fe59c4237aa9a7d124c133484b0f9
 DIST 48837-Neutral_Plus_1.2.tar.bz2 61354 RMD160 9a5dbd8c0d8811a9262873fa71a9f9981edaf27a SHA1 abddb75314374a65b6066fdddae23699768fe771 SHA256 6b496406128fb3effd4e87159a29811d12a1b2f071e1341e67a6744c57d206dd
-EBUILD xcursor-neutral-1.13a.ebuild 821 RMD160 d5f55c5ad3f39b43d675933ee701f5847209cbcd SHA1 b4da5772b137a68e2d358a765cf72a107d04ce51 SHA256 d71466e914f547766ea574116d8df59d9771bdca25a4b0a79ab9247d9b982a2c
+EBUILD xcursor-neutral-1.13a.ebuild 787 RMD160 b5089fc33d0d0b78ad5f3b98639a0ddf628eb507 SHA1 f0269842bfedfa571f7eb16c0219136498c73d14 SHA256 c0fc51716c5c5d6eb56f316f179e6bbe1ce2b84aa3154d15a3a727eaff419747
 EBUILD xcursor-neutral-1.20.ebuild 1013 RMD160 a62a7c9b23308171e4e9039be0f1fc1be39dc9c5 SHA1 b4cc401bba7b7e70ee6f0643942d25906be2ff3e SHA256 17a11586967bf4e0c835fae66a3b01b924d931459c21d0277703b2e8dbe83208
 MISC ChangeLog 1655 RMD160 33072d078902ea967b046a369d4051ca0a6f152c SHA1 48958ce4d7a0fa473aa6f2e5404a87dcaa5bcb0f SHA256 dde33fe89f4c7ff0f95be01b2eb9923abcbfed9b0dfca01554ce3ceda5d150c9
 MISC metadata.xml 263 RMD160 3a7c4caf761fd53690c78d1352c1f7c2858a2c3b SHA1 0a3e12eb5d6d1c8e869b12ce442e89791f96d1a9 SHA256 05cfd5d6b86ee3f8cfda20636cefb676c252d2f4410b610d4f189ea8bfdff37e