modified -9999 ebuild to match 0.1.10 (improvements in build quality and ebuild syntax

(Portage version: 2.1.6.13/cvs/Linux x86_64)

2 files changed, 53 insertions, 16 deletions

diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index 64f398a12056..dd81dc640990 100644
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/midori
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.17 2009/09/14 14:31:22 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.18 2009/09/14 14:38:30 darkside Exp $
+
+  14 Sep 2009; Jeremy Olexa <darkside@gentoo.org> midori-9999.ebuild:
+  modified -9999 ebuild to match 0.1.10 (improvements in build quality and
+  ebuild syntax
 
 *midori-0.1.10 (14 Sep 2009)
 
diff --git a/www-client/midori/midori-9999.ebuild b/www-client/midori/midori-9999.ebuild
index 814a2fc27196..f6fed9be8ff9 100644
--- a/www-client/midori/midori-9999.ebuild
+++ b/www-client/midori/midori-9999.ebuild
@@ -1,38 +1,71 @@
 # 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.11 2009/08/22 16:18:22 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.12 2009/09/14 14:38:30 darkside Exp $
 
-inherit git eutils multilib
+EAPI="2"
+inherit xfconf multilib git
 
 DESCRIPTION="A lightweight web browser"
 HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
 EGIT_REPO_URI="git://git.xfce.org/apps/midori"
 EGIT_PROJECT="midori"
+SRC_URI=""
 
-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.25.2
+	>=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-lang/python
 	dev-util/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
+	doc? ( dev-util/gtk-doc )
+	html? ( dev-python/docutils )
+	nls? ( sys-devel/gettext )"
 
-pkg_setup() {
-	ewarn "Note: this software is not yet in a too mature status so expect some minor things to break"
+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
+}
+
+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."
+	NUMJOBS=$(sed -e 's/.*\(\-j[ 0-9]\+\) .*/\1/; s/--jobs=\?/-j/' <<< ${MAKEOPTS})
+	./waf build ${NUMJOBS} || die "build failed"
 }
 
 src_install() {
-	DESTDIR=${D} ./waf install || die "waf install failed."
-	dodoc AUTHORS ChangeLog INSTALL TODO
+	DESTDIR=${D} ./waf install || die "install failed"
+	rm -r ${D}/usr/share/doc/${PN}
+	dodoc AUTHORS ChangeLog INSTALL TODO || die "dodoc failed"
+}
+
+pkg_postinst() {
+	xfconf_pkg_postinst
+	ewarn "Midori tends to crash due to bugs in WebKit."
+	ewarn "Report bugs at http://www.twotoasts.de/bugs"
 }