Fix the repoman issues in all ebuilds.

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

5 files changed, 13 insertions, 65 deletions

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"
 }