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

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

3 files changed, 55 insertions, 18 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/Manifest b/www-client/midori/Manifest
index c062e940fd69..2a7a266e5ad8 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -2,6 +2,6 @@ DIST midori-0.1.10.tar.bz2 543882 RMD160 b3e365b3dbc2896387c249e8f84578544a3a740
 DIST midori-0.1.9.tar.bz2 516902 RMD160 9e1d6d18cd16f00119adc739551c6ecbb980b166 SHA1 d54314f7e0e2714866e0e57dc55f142c2285757c SHA256 ce0bc3160b9bb40b6c38f968b8dd74e3ff39de412018e4b937223c049929cb43
 EBUILD midori-0.1.10.ebuild 1977 RMD160 77e6218b924f93de982b5e3ca7b025632f046e8c SHA1 d397a0e2f33a1d8cf9921e660c1f7fa844e300bb SHA256 d3fc8822e285eb7ff060f94b45382f3937eed5666bf841f91330fadc6a61ace1
 EBUILD midori-0.1.9.ebuild 1281 RMD160 66b5dcb797aa62d0bfcd5970072766ec6ae329d3 SHA1 3ef26d0b04f4c924d90e5b858541f124f1c02c58 SHA256 61aab1e62f27a41d5e95a007dfdc39c4c84e16f6393f1d62b49b281ca12edf0f
-EBUILD midori-9999.ebuild 1050 RMD160 da332792aea5138209ae56411a3e138d01ea335e SHA1 48aff2316607d1a73a711c15dad6c7e7c273808b SHA256 c819ccc44f56532cbb5ef3792f5771aa639f9a75332f88f2fb74a6e8a2b302b3
-MISC ChangeLog 2791 RMD160 2db9779e5ae65c82488bda4764e5e0e694653e49 SHA1 5a1d72bf7f40276c26177e441b8e0685027ec81d SHA256 c0e4a6b4ef720ffa5515823ae3b632da63148425d7e0abc4890bba4cdf8a655f
+EBUILD midori-9999.ebuild 1973 RMD160 0dd3d197836953c2ff67ed84e4aec0b060345c53 SHA1 e082cd087739d4bf4c3d741feae00c5d9fad341d SHA256 63ede03b928a7491496c2f85f081488ba788d35368f9db9384332e0097dab16b
+MISC ChangeLog 2953 RMD160 00c6037aff2d96b76320740c96edfb429622d627 SHA1 4179801115ce46314e5174f45416f9ff66c43d6f SHA256 4a626e35cd9ddc44e3b1ec37d5f57b9f881df38e045094ae5512a92441d2d848
 MISC metadata.xml 458 RMD160 a98e14ea1e235430cf7c1fb7ff35b8232829737a SHA1 3dc0cf5102ee6ce420d2c5bbddceba2d0acd26b8 SHA256 e6ffecf41d41fcab49b7d297380188eecd87748c151defa2030e54c175ad0688
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"
 }