--- /usr/portage/www-client/midori/midori-9999.ebuild	2009-04-06 05:41:30.000000000 +0900
+++ /usr/portage/www-client/midori/midori-9999.ebuild	2009-08-07 01:37:04.000000000 +0900
@@ -1,38 +1,69 @@ 
 # 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.10 2009/04/05 15:57:11 jokey Exp $
+# $Header: $
 
-inherit git eutils multilib
+EAPI=2
+
+inherit git multilib xfconf
 
 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"
 
-LICENSE="GPL-2"
+LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="-doc gnome +html idn libnotify nls +sqlite +unique"
 
-RDEPEND="net-libs/webkit-gtk
-	net-libs/libsoup
-	dev-db/sqlite"
+RDEPEND="libnotify? ( x11-libs/libnotify )
+	>=net-libs/libsoup-2.26
+	>=net-libs/webkit-gtk-1.1.1
+	dev-libs/libxml2
+	x11-libs/gtk+
+	gnome? ( net-libs/libsoup[gnome] )
+	idn? ( net-dns/libidn )
+	sqlite? ( >=dev-db/sqlite-3.0 )
+	unique? ( dev-libs/libunique )"
 
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
+	dev-lang/python
+	doc? ( dev-util/gtk-doc )
+	html? ( dev-python/docutils )
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	# moving docs to version-specific directory
+	sed -i -e "s:\${DOCDIR}/${PN}:\${DOCDIR}/${PF}/:g" wscript
+	sed -i -e "s:/${PN}/user/midori.html:/${PF}/user/midori.html:g" midori/midori-browser.c
+}
 
-pkg_setup() {
-	ewarn "Note: this software is not yet in a too mature status so expect some minor things to break"
+src_configure() {
+	CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" ./waf \
+		--prefix="/usr/" \
+		--libdir="/usr/$(get_libdir)" \
+		--disable-docs \
+		$(use_enable doc apidocs) \
+		$(use_enable html userdocs) \
+		$(use_enable idn libidn) \
+		$(use_enable nls nls) \
+		$(use_enable sqlite) \
+		$(use_enable unique) \
+		configure || die "configure failed"
 }
 
 src_compile() {
-	CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" ./waf --prefix="/usr/" --libdir="/usr/$(get_libdir)/" configure || die "waf configure failed."
-	./waf build || die "waf build failed."
+	./waf build || die "build failed"
 }
 
 src_install() {
-	DESTDIR=${D} ./waf install || die "waf install failed."
+	DESTDIR=${D} ./waf install || die "install failed"
+	rm -r ${D}/usr/share/doc/${PN}
 	dodoc AUTHORS ChangeLog INSTALL TODO
 }
+
+pkg_postinst() {
+	xfconf_pkg_postinst
+	ewarn "Midori tends to crash due to bugs in WebKit."
+	ewarn "Report bugs at http://www.twotoasts.de/bugs"
+}