Fix the repoman issues in all ebuilds.

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

6 files changed, 17 insertions, 71 deletions

diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index 6a3dc2753147..2c06e05400fc 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -1,9 +1,7 @@
 DIST midori-0.1.10.tar.bz2 543882 RMD160 b3e365b3dbc2896387c249e8f84578544a3a7404 SHA1 9598de84d9c3283f236c3a075eb707b9423967e3 SHA256 1f6a3af09ea9b9669c4b1a7ca2a8cbee5114dac2612e6f5ced1ea7ea4967fbfc
-DIST midori-0.1.9.tar.bz2 516902 RMD160 9e1d6d18cd16f00119adc739551c6ecbb980b166 SHA1 d54314f7e0e2714866e0e57dc55f142c2285757c SHA256 ce0bc3160b9bb40b6c38f968b8dd74e3ff39de412018e4b937223c049929cb43
 DIST midori-0.2.0.tar.bz2 570091 RMD160 e541c532ee30871b235b2ddfc3551319db635b3f SHA1 dddf111d8d1eee0e6028183ccdab39cd96b43c13 SHA256 97c79d20807899bad4b241385c7cbf3a4f85d2673b1b6c12059878450e3e971a
-EBUILD midori-0.1.10.ebuild 1977 RMD160 77e6218b924f93de982b5e3ca7b025632f046e8c SHA1 d397a0e2f33a1d8cf9921e660c1f7fa844e300bb SHA256 d3fc8822e285eb7ff060f94b45382f3937eed5666bf841f91330fadc6a61ace1
-EBUILD midori-0.1.9.ebuild 1281 RMD160 66b5dcb797aa62d0bfcd5970072766ec6ae329d3 SHA1 3ef26d0b04f4c924d90e5b858541f124f1c02c58 SHA256 61aab1e62f27a41d5e95a007dfdc39c4c84e16f6393f1d62b49b281ca12edf0f
-EBUILD midori-0.2.0.ebuild 1978 RMD160 fb241526e346f4d60bba46ff1d0525a7b19106f1 SHA1 ad536647eddada48b8f3a33d8d762b3ba5092920 SHA256 1dc8acd6811f2571983a0d534e159a680df7ef09f71c76c1bd5132badea7663d
-EBUILD midori-9999.ebuild 1973 RMD160 0dd3d197836953c2ff67ed84e4aec0b060345c53 SHA1 e082cd087739d4bf4c3d741feae00c5d9fad341d SHA256 63ede03b928a7491496c2f85f081488ba788d35368f9db9384332e0097dab16b
+EBUILD midori-0.1.10.ebuild 1968 RMD160 fac98af10a6f5bd4bcaa22e0a465d55838398561 SHA1 8dec8b7595faaaa4b83411d41e396545d51d295e SHA256 ebaeb6b6360d1dc112ae520801fa5eec22b0c518e686296f94d29f19b8500506
+EBUILD midori-0.2.0.ebuild 1976 RMD160 977ea508983e3bfb0dbe7575e78e82560715155a SHA1 cd4af88828041159631f5c83e58e1c6c45a0866c SHA256 7e9c3a87edfad1f1347b70d91201d40918d0dfde06d4572d05aaeeaebbc2b164
+EBUILD midori-9999.ebuild 1976 RMD160 1aecb3f32006340f3e22f3766696661c7605441e SHA1 7dc95d0c7ee142c52dfd556689343c84634f0010 SHA256 62854935b83f9f714ed9d95ee5f840e6893d33d7855004ca316e7ab23c3cd684
 MISC ChangeLog 3179 RMD160 2e571df1b0b4019c1b069b6673eab3af3dd0198f SHA1 fce085e476cfeaea969c1711714454a54e0cf84b SHA256 fd6410c527ec22c47d49175c429e831de92a262d7cea49afc65dfba00313bab6
-MISC metadata.xml 458 RMD160 a98e14ea1e235430cf7c1fb7ff35b8232829737a SHA1 3dc0cf5102ee6ce420d2c5bbddceba2d0acd26b8 SHA256 e6ffecf41d41fcab49b7d297380188eecd87748c151defa2030e54c175ad0688
+MISC metadata.xml 290 RMD160 ca55fa90594e529d6c3e9958dbe996e4f30499c9 SHA1 7d2d10b55d003cfa795c5fa9a4371fb48fb5748f SHA256 4b570f38dc8612ef354f8ccede3fb440d35000605ad26eabf6ac441af749436a
diff --git a/www-client/midori/metadata.xml b/www-client/midori/metadata.xml
index 4f17aa6b3f98..1df7eda12c07 100644
--- a/www-client/midori/metadata.xml
+++ b/www-client/midori/metadata.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>xfce</herd>
-<use>
-	<flag name="html">Install HTML documentation</flag>
-	<flag name="soup">Use Soup (<pkg>net-libs/libsoup</pkg>) as HTTP backend instead of curl(<pkg>net-misc/curl</pkg>), if you want better gnome integration for URL processing</flag>
-	<flag name="unique">Optional libunique support</flag>
-</use>
+  <herd>xfce</herd>
+  <use>
+    <flag name="html">Install HTML documentation</flag>
+    <flag name="unique">Optional libunique support</flag>
+  </use>
 </pkgmetadata>
diff --git a/www-client/midori/midori-0.1.10.ebuild b/www-client/midori/midori-0.1.10.ebuild
index 5682c5e80f04..4af1f50323c5 100644
--- a/www-client/midori/midori-0.1.10.ebuild
+++ b/www-client/midori/midori-0.1.10.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.1.10.ebuild,v 1.1 2009/09/14 14:31:22 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.1.10.ebuild,v 1.2 2009/10/28 13:52:15 ssuominen Exp $
 
-EAPI="2"
+EAPI=2
 inherit xfconf multilib
 
 DESCRIPTION="A lightweight web browser"
 HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
-SRC_URI="http://archive.xfce.org/src/apps/${PN}/0.1/${P}.tar.bz2"
+SRC_URI="mirror://xfce/src/apps/${PN}/0.1/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
@@ -58,7 +58,7 @@ src_compile() {
 
 src_install() {
 	DESTDIR=${D} ./waf install || die "install failed"
-	rm -r ${D}/usr/share/doc/${PN}
+	rm -r "${D}"/usr/share/doc/${PN}
 	dodoc AUTHORS ChangeLog INSTALL TODO || die "dodoc failed"
 }
 
diff --git a/www-client/midori/midori-0.1.9.ebuild b/www-client/midori/midori-0.1.9.ebuild
deleted file mode 100644
index 2982df7b3960..000000000000
--- a/www-client/midori/midori-0.1.9.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.1.9.ebuild,v 1.1 2009/08/02 00:57:57 darkside Exp $
-
-EAPI=2
-
-inherit multilib gnome2-utils
-
-DESCRIPTION="A lightweight web browser"
-HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
-SRC_URI="http://archive.xfce.org/src/apps/${PN}/0.1/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="idn soup sqlite"
-
-RDEPEND=">=dev-lang/python-2.4
-	>=net-libs/webkit-gtk-0_p42000
-	dev-libs/libunique
-	dev-libs/libxml2
-	idn? ( net-dns/libidn )
-	soup? ( >=net-libs/libsoup-2.25.5 )
-	sqlite? ( >=dev-db/sqlite-3.0 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-src_configure() {
-	CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" ./waf \
-		--prefix="/usr/" \
-		--libdir="/usr/$(get_libdir)" \
-		configure || die "configure failed"
-}
-
-src_compile() {
-	./waf build || die "build failed"
-}
-
-src_install() {
-	DESTDIR=${D} ./waf install || die "install failed"
-	dodoc AUTHORS ChangeLog INSTALL TODO
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	ewarn "Midori tends to crash due to bugs in WebKit."
-	ewarn "Report bugs at http://www.twotoasts.de/bugs"
-}
diff --git a/www-client/midori/midori-0.2.0.ebuild b/www-client/midori/midori-0.2.0.ebuild
index af15f7a4595d..14030c4c3796 100644
--- a/www-client/midori/midori-0.2.0.ebuild
+++ b/www-client/midori/midori-0.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.2.0.ebuild,v 1.2 2009/10/28 13:46:23 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.2.0.ebuild,v 1.3 2009/10/28 13:52:15 ssuominen Exp $
 
 EAPI=2
 inherit xfconf multilib
@@ -57,7 +57,7 @@ src_compile() {
 }
 
 src_install() {
-	DESTDIR="${D}" ./waf install || die "install failed"
+	DESTDIR=${D} ./waf install || die "install failed"
 	rm -r "${D}"/usr/share/doc/${PN}
 	dodoc AUTHORS ChangeLog INSTALL TODO || die "dodoc failed"
 }
diff --git a/www-client/midori/midori-9999.ebuild b/www-client/midori/midori-9999.ebuild
index f6fed9be8ff9..ca8e2d5cb51c 100644
--- a/www-client/midori/midori-9999.ebuild
+++ b/www-client/midori/midori-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.12 2009/09/14 14:38:30 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.13 2009/10/28 13:52:15 ssuominen Exp $
 
 EAPI="2"
 inherit xfconf multilib git
@@ -60,7 +60,7 @@ src_compile() {
 
 src_install() {
 	DESTDIR=${D} ./waf install || die "install failed"
-	rm -r ${D}/usr/share/doc/${PN}
+	rm -r "${D}"/usr/share/doc/${PN}
 	dodoc AUTHORS ChangeLog INSTALL TODO || die "dodoc failed"
 }