Take care of new upstream buildsystem wrt bug #235544 thanks to Dale Whittaker

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo i686

4 files changed, 26 insertions, 14 deletions

diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index 0d74ffa5818f..d6c2f57bc0fd 100644
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/midori
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.4 2008/08/22 14:17:53 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.5 2008/08/25 20:44:06 jokey Exp $
+
+  25 Aug 2008; Markus Ullmann <jokey@gentoo.org> midori-9999.ebuild:
+  Take care of new upstream buildsystem wrt bug #235544 thanks to Dale
+  Whittaker
 
   22 Aug 2008; Markus Ullmann <jokey@gentoo.org> midori-9999.ebuild:
   New upstream repo id, thanks to David Voge in bug #234797
diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index 94ff7e34ea5f..cd142a1fed50 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -1,13 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-EBUILD midori-9999.ebuild 813 RMD160 45e361d76e812d44e43203243b66a80f9082134d SHA1 cf384277348fa497b73b1646225864cea69cd771 SHA256 047cde8314ad181899b1c27fd67bf36a7accf5168618b2ace1d7b1db3a2b65cc
-MISC ChangeLog 820 RMD160 c90eceebf2a2a4ca3ea23eaec77ca099c6fa71e3 SHA1 dcbf318a8573339be9107bc528a4c184043b5cce SHA256 dff0cbf04b6536f413049d5e3cf03e053f5a8a723fc8c071929406ef65e9cdc4
-MISC metadata.xml 251 RMD160 f98b79c78c9a648314ee514bc8521a31a8018b3d SHA1 f58b9ae8d4a67e568288a4cf7d0037f228ba3fc4 SHA256 2ecb6b4fcce7435885895d82f44bd288b8ab797c7d6476eaac494d44a56f8886
+EBUILD midori-9999.ebuild 952 RMD160 6a2d7148f9d019a46c50bdcca8fe28f0ba551092 SHA1 341bdab37f144be1f5c6e5eb356c781983014cea SHA256 eb61846696e8b2eaf5c4ec9c95a6b9596c23a07274c946d6f4333461801afe06
+MISC ChangeLog 973 RMD160 0c0d3e57891793dc3ebf8325e7827ca23c10a27a SHA1 32caf31c36326195a2c55164f5f9200f45f31a48 SHA256 1f0fb40cfc33f5b1d548019e710626f826c753dbf7212135f2b83edca756c02e
+MISC metadata.xml 380 RMD160 870a1cb3f22bc3ba38abf1dc2b24628322187a32 SHA1 6da385a6a24b8cb8fd99134ee74041d8f9c2419b SHA256 b0909fbf5df4df2518257e81f01b324af114822f300b91aeaf3e7685199ad62d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiuypkACgkQz974XjDVpblwwwCdFSMRx9H3pUxvCZKc+EGXhzb9
-dwgAoJan4n+5TeChPUBl/cNDBneJn7Sf
-=lD/K
+iEYEARECAAYFAkizGaUACgkQz974XjDVpbn3tQCgmYsI536IVXZY/uwmclMybjx7
+ANoAn22OzON66eDtDWKGiFRtesv2Tm8f
+=71WP
 -----END PGP SIGNATURE-----
diff --git a/www-client/midori/metadata.xml b/www-client/midori/metadata.xml
index 88bdb4223fff..850229bbe7bf 100644
--- a/www-client/midori/metadata.xml
+++ b/www-client/midori/metadata.xml
@@ -6,4 +6,8 @@
   <email>jokey@gentoo.org</email>
   <name>Markus Ullmann</name>
 </maintainer>
+<use>
+	<flag name="sourceview">Allow page source viewing</flag>
+	<flag name="gvfs">Use GNOME VFS for communication</flag>
+</use>
 </pkgmetadata>
diff --git a/www-client/midori/midori-9999.ebuild b/www-client/midori/midori-9999.ebuild
index d5a9c5ff8a9e..155a31c7b9ce 100644
--- a/www-client/midori/midori-9999.ebuild
+++ b/www-client/midori/midori-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.6 2008/08/22 14:17:53 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.7 2008/08/25 20:44:06 jokey Exp $
 
 inherit git eutils
 
@@ -8,23 +8,27 @@ DESCRIPTION="A lightweight web browser"
 HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
 EGIT_REPO_URI="git://git.xfce.org/kalikiana/midori"
 EGIT_PROJECT="midori"
-EGIT_BOOTSTRAP="NOCONFIGURE=1 ./autogen.sh"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="gvfs sourceview"
 
 DEPEND="x11-libs/gtk+
-	x11-libs/libsexy
-	net-libs/webkit-gtk"
+	net-libs/webkit-gtk
+	gvfs? ( gnome-base/gvfs )
+	sourceview? ( x11-libs/gtksourceview )"
 
 pkg_setup() {
 	ewarn "Note: this software is not yet in a too mature status so expect some minor things to break"
 }
 
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
+src_compile() {
+	./waf --prefix="/usr/" configure || die "waf configure failed."
+	./waf build || die "waf build failed."
+}
 
+src_install() {
+	DESTDIR=${D} ./waf install || die "waf install failed."
 	dodoc AUTHORS ChangeLog INSTALL TODO
 }