summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Ullmann <jokey@gentoo.org>2008-08-25 20:44:06 +0000
committerMarkus Ullmann <jokey@gentoo.org>2008-08-25 20:44:06 +0000
commitacf9f39ea288c7540a352502ee703bd328996fd9 (patch)
tree0a584b6aae3c0975bdd8e32bc32dc977a37df671 /www-client/midori
parentVersion bump - Fluxbox Menu Editor 1.1.2 is released (diff)
downloadgentoo-2-acf9f39ea288c7540a352502ee703bd328996fd9.tar.gz
gentoo-2-acf9f39ea288c7540a352502ee703bd328996fd9.tar.bz2
gentoo-2-acf9f39ea288c7540a352502ee703bd328996fd9.zip
Take care of new upstream buildsystem wrt bug #235544 thanks to Dale Whittaker
(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo i686)
Diffstat (limited to 'www-client/midori')
-rw-r--r--www-client/midori/ChangeLog6
-rw-r--r--www-client/midori/metadata.xml4
-rw-r--r--www-client/midori/midori-9999.ebuild18
3 files changed, 20 insertions, 8 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/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
}