Version bump (missing libsoup >= 2.27.90 for full functionality) wrt #290599, thanks to Jan Aniŝĉuk for reporting.

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

3 files changed, 79 insertions, 12 deletions

diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index f98bfef24e29..d9115a9ac1d9 100644
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -1,6 +1,12 @@
 # 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.19 2009/09/14 16:12:14 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.20 2009/10/28 13:44:10 ssuominen Exp $
+
+*midori-0.2.0 (28 Oct 2009)
+
+  28 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> +midori-0.2.0.ebuild:
+  Version bump (missing libsoup >= 2.27.90 for full functionality) wrt
+  #290599, thanks to Jan Aniŝĉuk for reporting.
 
   14 Sep 2009; Jeremy Olexa <darkside@gentoo.org> midori-9999.ebuild:
   modified -9999 ebuild to match 0.1.10 (improvements in build quality and
diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index 9330fbfbc9ce..d28a16d305c0 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST midori-0.1.10.tar.bz2 543882 RMD160 b3e365b3dbc2896387c249e8f84578544a3a7404 SHA1 9598de84d9c3283f236c3a075eb707b9423967e3 SHA256 1f6a3af09ea9b9669c4b1a7ca2a8cbee5114dac2612e6f5ced1ea7ea4967fbfc
 DIST midori-0.1.9.tar.bz2 516902 RMD160 9e1d6d18cd16f00119adc739551c6ecbb980b166 SHA1 d54314f7e0e2714866e0e57dc55f142c2285757c SHA256 ce0bc3160b9bb40b6c38f968b8dd74e3ff39de412018e4b937223c049929cb43
+DIST midori-0.2.0.tar.bz2 570091 RMD160 e541c532ee30871b235b2ddfc3551319db635b3f SHA1 dddf111d8d1eee0e6028183ccdab39cd96b43c13 SHA256 97c79d20807899bad4b241385c7cbf3a4f85d2673b1b6c12059878450e3e971a
 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-0.2.0.ebuild 1984 RMD160 5dc70883667afe006e4de37c600511bd295ad5e6 SHA1 2ee8466cb97b5aaed88d890a321e38c2185efafd SHA256 b150b05ddbaeb60bb4da856bb576032a57ba4ee4949f896123b793563208a17d
 EBUILD midori-9999.ebuild 1973 RMD160 0dd3d197836953c2ff67ed84e4aec0b060345c53 SHA1 e082cd087739d4bf4c3d741feae00c5d9fad341d SHA256 63ede03b928a7491496c2f85f081488ba788d35368f9db9384332e0097dab16b
-MISC ChangeLog 2947 RMD160 35ae2ab16049e9660053db88f57ff6553eaa4be1 SHA1 5b160de04930d1b07b8652b895eef7fe7e5cf855 SHA256 7ee0ff40979257baa011e09540bfb717ce8a31472614e4b9e6404f6a139e2e20
+MISC ChangeLog 3179 RMD160 2e571df1b0b4019c1b069b6673eab3af3dd0198f SHA1 fce085e476cfeaea969c1711714454a54e0cf84b SHA256 fd6410c527ec22c47d49175c429e831de92a262d7cea49afc65dfba00313bab6
 MISC metadata.xml 458 RMD160 a98e14ea1e235430cf7c1fb7ff35b8232829737a SHA1 3dc0cf5102ee6ce420d2c5bbddceba2d0acd26b8 SHA256 e6ffecf41d41fcab49b7d297380188eecd87748c151defa2030e54c175ad0688
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqua2QACgkQV3J2n04EauyJSACg06Qwqp6UJVXDIPXgGDdLmpuc
-EusAoNgSoTFRryWcb4V9cNge0V5jcCpq
-=xTfr
------END PGP SIGNATURE-----
diff --git a/www-client/midori/midori-0.2.0.ebuild b/www-client/midori/midori-0.2.0.ebuild
new file mode 100644
index 000000000000..68357335b902
--- /dev/null
+++ b/www-client/midori/midori-0.2.0.ebuild
@@ -0,0 +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-0.2.0.ebuild,v 1.1 2009/10/28 13:44:10 ssuominen Exp $
+
+EAPI=2
+inherit xfconf multilib
+
+DESCRIPTION="A lightweight web browser"
+HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
+SRC_URI="http://archive.xfce.org/src/apps/${PN}/0.2/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="doc gnome html idn libnotify nls +sqlite +unique"
+
+RDEPEND="libnotify? ( x11-libs/libnotify )
+	>=net-libs/libsoup-2.25.2
+	>=net-libs/webkit-gtk-1.1.1
+	dev-libs/libxml2
+	>=x11-libs/gtk+-2.10:2
+	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
+	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
+}
+
+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() {
+	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 "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"
+}