Version bump.

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

5 files changed, 139 insertions, 15 deletions

diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index 707c4b01d35e..0dedfada89bf 100644
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/midori
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.105 2013/02/06 18:18:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.106 2013/03/12 10:19:16 ssuominen Exp $
+
+*midori-0.4.9 (12 Mar 2013)
+
+  12 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> +midori-0.4.9.ebuild,
+  midori-9999.ebuild, metadata.xml:
+  Version bump.
 
   06 Feb 2013; Samuli Suominen <ssuominen@gentoo.org> midori-0.4.8.ebuild:
   Comment out the desktop file validation patch temporarily because the code is
diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index c05bb773fc92..0be7e12f5c3e 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -5,19 +5,21 @@ AUX midori-0.4.6-dl.patch 2667 SHA256 5c85f994fc577e0bf8c69a1f4bb3bb260c71f80794
 AUX midori-0.4.8-desktop_file_validation.patch 870 SHA256 615f3f5de1de29f2704e9d347b394236f1861a08cd707a2d247ea8e9a646c45c SHA512 08db8b9d5283f929296b479d3304551da1e8a37ec8a47d2dc44aac7fca10aedd213f892ba2159a32d271546bee30e2c10e42a2f6b40dce39dc74749473f72dc7 WHIRLPOOL 027197332780d44a8b28a71ef942acabef6942cabf51482794a4399c9263d9cb083dbe0c1a0dbddb1536458d8b4012b33af9775e358ab544997f2080fb86df2d
 DIST midori-0.4.6.tar.bz2 978570 SHA256 910f47bd2b5f2998cd4fce45c08f9e282318820b68562d0bade2096b9a17e3ea SHA512 8c46f2eed6dd0af237b6aa021f8fc2150bd4387f7de14c9265cf5b8c1a1a558ecf908c98389415100ca0eac9037d7df89c5a348ef9dcd397bb1d3421104a8e7a WHIRLPOOL 36a498e2fd22039816da7072c1a7d59c84548fc187480b33b7a12ddf2ecd41626bb5a80d28298f336148ff74e3ec6fd2dd6da7a19f466ea899849b2d0919c0b2
 DIST midori-0.4.8.tar.bz2 1047789 SHA256 40bf23f84a3537f54d7eb45df1da40ebef54c321b1b34d0d0c8e45bb0cce5e9f SHA512 ec10fb836f824928cee2df4ca13d65b8436efd8f34af911884fb225b521d1f67dd44bdb5588cd36e0f2db802ed9d1d3c6852563f563b18e20416fcdf3dc3d349 WHIRLPOOL 607c49dd4269a588bd4c33445b3342aa7c785da458aea3abd10deb7c0ffb55a22024e7f1d293e9237b3cd54fc023a0afb70931ed5bdf99df7bd46d67bf889f42
+DIST midori-0.4.9.tar.bz2 1079713 SHA256 f01e5dc45e94f909e48f0dd62cc4afedd80710769fdf98bc4e0b38d4ef0abc11 SHA512 02a1f6523c8912c916cbff930712ba87d42487f5f513e59c3adbaeaed533406874074635e96db87f3c4132e4221e60b126002785634d194bb5cbf2f602d3c321 WHIRLPOOL 9aa814b69cfbcb36f0dcb1ddff47c0fda38411cfd788f1c6b0bfd758f10db7ba8598144ef066b677404b85fca3bae408b0e8bb708a33cd1be11d4877644610b2
 EBUILD midori-0.4.6-r1.ebuild 2246 SHA256 02f9afa0790834dded6e7153ed1307fc1537497223c3066fa557fb5d4b765699 SHA512 f5a6dfd6e85a76cacdbf4d73957047cf37bb6c19174e14e586874a94abfa91f6973ccd45c128a4ca373f355aec05779e48f0587b22c3a2fc277e2d916636ca76 WHIRLPOOL 283c97500a5862f3f06e1f8b7ae279a5654c63a7d46598a41d1e7767198e8f05e32a0385a4281c9d887b6f14156d3e3fa4aaf48bc4cfbf893a197bc82efc93b8
 EBUILD midori-0.4.8.ebuild 2528 SHA256 0bc40661d6ab5f72c85fcfa89438444e05598a9d230b74f0d35ca561dd5b262b SHA512 7fcf44615a488a983555f5ae93313d24028bca3338fa1008efdf73b8ebef66dec3666fbf95eef0212765bcd4db3e041d784e51cacc238708637943d4d303fe93 WHIRLPOOL 30a26fb115136aaa10d00ac1e87c576b8855805fbf2a0774cd80b865946e8a474ded6e37f36cde9b763b0428398c71f43eea5e265a759e88b3de05ebf0cc8d5e
-EBUILD midori-9999.ebuild 2412 SHA256 af653b1ad7a57e4421582642b4a46b278b459f2f1bb179b019f7a67161f248dc SHA512 f1ab9e81c296941b6229bed5aee87950f1c9974f1b1c1397b35f3f683a30ae0e031def8a73934606049e63ec704da8e72a12fcb1e7d326a48753f7310cf31b28 WHIRLPOOL dd380ee8abc059ba8661d28cf9ab47be3a456ba3a69cb88d8fd64a4fcb2bfbe922a3489918f954ceebc80e7aabbb99f4ce9437f965be351ee60b9b8049decc45
-MISC ChangeLog 15391 SHA256 9a9af3144a8cfb7bea12e4638724120c7fa7c5b69a097fdaaea3db675d9e5fc5 SHA512 bab4f841103ab1dce0f832f290c09e83d3c0b4622b1692dcf986921c1308e22a4252204a7100b0afdaa02bdf7eb55680d90e38561369decd4b15f9d14949dfc6 WHIRLPOOL 84b1ff2e4e4be984b1d234d15923305f3e82aa5380d03c5ca0da337e1c33a2199d5d7d87ba2f31d64a186f13bcebecd6d08d24cd7696f5f018cfd955998ebf74
-MISC metadata.xml 468 SHA256 19eecb99ad642e6a8fbd63ed7f3d484eab5d11acb109734121b23e58710b9ba2 SHA512 2d5d7f847a8df75adb35d577658702b96d9838faff55f93e82188b9533f9929c405e1e811eec72ab2df2ab8067f63e8ddfb19da65ac25de42c1e9d56bbe0bc6e WHIRLPOOL a10dc65b031e62c8a20b5b365d3b0769083e1e609eab189cc1403719d66de2da3237dd254d6093091b7a1f7dd826e4f685161318c9bc5fb6ea22b17801b1acb4
+EBUILD midori-0.4.9.ebuild 2508 SHA256 682ea9628fb169cb780b4b8372ab1bd4d0af60cf868681140acebdeac3711c12 SHA512 e8b4513bba3831a1738b9cdace908784a6690881d2cf600a00ced243d627bcad8f2091a34315c026a39624791bc71977b4736bbe1d60cdb2e28c7efbe91e22bb WHIRLPOOL fcefb86065314d8f8ff74bc919a7211e46dc3aad76ab0927245abc6dee2f1e59010bfdd20407e0b7a371e0952d9543a979eb2bc01b902b8158b69b719b09e88c
+EBUILD midori-9999.ebuild 2508 SHA256 50a114795520b10aded28dee74ab0f5408bb0bc88a258253a7a89cfb2393819c SHA512 e6233745ce8a694a181d765e3d7bf7a21117f548318ffbb10791feb4340f88d10739e807b7851d14bd95e3f73f99f4cf25adc9a392f9df0eaaccca0ba39896a3 WHIRLPOOL 544c1b8668da44f25b3a3ea2e88f84e3a57fc0012892355bf4d6de3709dda1d62ec8d734d07bbcea4781f5a3e6bb1cd794ff8836463bec2d91e30a7a23e3d286
+MISC ChangeLog 15549 SHA256 01b02fae097125f5c3c15c4569e15317d1f8a5eaba2687ad26dac53319e6b6ad SHA512 78ae8e5efc90f61e428dd65803ec5293dd398254962cbbc54a81574d69cbabcd4b8697161e5969391714b62daf67f041b8d86f20883fce00edfd2e99acc2c25d WHIRLPOOL 5b624bc3b91640c7dbddf64a1905b7929942dea7eeccb6d869dd81b7c441c835b6b75cf18edee39e077c7f1606f095ddc5354a6eab02132c1f888d936bc51fad
+MISC metadata.xml 593 SHA256 f3efe53895db5aec0c86bc7d7cda5005d83c1826342428d91f445a174a1d2962 SHA512 b1d2503024ec47201b47912f941ad39978bd5ba997f877f34255c24a1ddd5a2e654e1b7cf9fa08394f3fb00ede463a99311e9da78699a3d359c6aed6e548aeef WHIRLPOOL 6422b42101fd2f2f209480b1dacc88d4cbf822acc319961ab51fd1b0948438f14e41426ddac44bc0d203658a1f1e2688b1bb68cfaa3bca65bbb117eaf1965f1f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJREp49AAoJEEdUh39IaPFNufoH/1sWV0VrfUGwCcZDrgo1iPMq
-+/TAVioN/VRDrkjsLsj+GVUGz4AaRa4B4/68/J+hGhQoNVeleUDgjZB1kxbIBjG2
-EEmF1x87jCW8p4DrbD2T7TZMc+4RvMXVzO045ri4GcTYpBfPqbOEjwH1TmaWaxlD
-l/0CizHEBUQBJ+frr2b4PyS2DJazaJzdSomZJdI420MM4/GYmiqe8c3CUv90KKuu
-7H0xKJ9Z2nzjCQD71Yq99TojgWVCEnL/Q1u3gwx7hkH0BuoGVc7aULBSmxYydHKb
-r8CGz307dLVLhcJGH5uZxqtFMtlo6crcHfk81BC0TpUx0wtPbhn8bfgZJwTkCt4=
-=ek7n
+iQEcBAEBCAAGBQJRPwCfAAoJEEdUh39IaPFNTlEIAJsLeMPySQFqnyB9LgFg7cLr
+Cmf6oEkKQIv3lNimKjmKMBMZstYoghHW16yvevoBwWgBl1B1UQlAByVI+6qQpF2m
+ZUuivwNDhAGv8EPnD+vcrikaxRQzjIzvHnB1E5vYPg3E7ylLNz7P189lW/gOzK9k
+EG1CBFnzbII+wYLjfHS1sy/def4zqQVTxXA8XgUoCJDGXRcXlR7T5LWxmTwXYqbW
+Fxz3e1wDuFwwQz/IfErJFIPWDic7tuIrb20838Km84v3KD0ve/T7MfXULRUSxZaP
+Ja4TwqFRY2pj/jD45ZyV641sGmMiyg9QgkWQwbwUu10D7mDTghEkfJzCpYPWoGY=
+=C8g4
 -----END PGP SIGNATURE-----
diff --git a/www-client/midori/metadata.xml b/www-client/midori/metadata.xml
index 756f517676a1..6fe4735b70cb 100644
--- a/www-client/midori/metadata.xml
+++ b/www-client/midori/metadata.xml
@@ -6,5 +6,6 @@
     <flag name='deprecated'>Enable GTK+-2 instead of GTK+-3 because of external plugins like adobe-flash</flag>
     <flag name='unique'>Enable single instance support using <pkg>dev-libs/libunique</pkg></flag>
     <flag name='zeitgeist'>Add support for Zeitgeist event tracking system</flag>
+	<flag name='webkit2'>Enable WebKit2 API that splits web content rendering and application UI into separate processes</flag>
   </use>
 </pkgmetadata>
diff --git a/www-client/midori/midori-0.4.9.ebuild b/www-client/midori/midori-0.4.9.ebuild
new file mode 100644
index 000000000000..b905fc882d8d
--- /dev/null
+++ b/www-client/midori/midori-0.4.9.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.4.9.ebuild,v 1.1 2013/03/12 10:19:16 ssuominen Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+unset _live_inherits
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="git://git.xfce.org/apps/${PN}"
+	_live_inherits=git-2
+else
+	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+	SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+fi
+
+inherit eutils fdo-mime gnome2-utils python-any-r1 waf-utils ${_live_inherits}
+
+VALA_VERSION=0.18
+
+DESCRIPTION="A lightweight web browser based on WebKitGTK+"
+HOMEPAGE="http://twotoasts.de/index.php/midori/"
+
+LICENSE="LGPL-2.1 MIT"
+SLOT="0"
+IUSE="+deprecated doc gnome libnotify nls +unique webkit2 zeitgeist"
+
+RDEPEND=">=dev-db/sqlite-3.6.19:3
+	>=dev-libs/glib-2.22
+	dev-libs/libxml2
+	>=net-libs/libsoup-2.34:2.4
+	x11-libs/libXScrnSaver
+	deprecated? (
+		net-libs/webkit-gtk:2
+		x11-libs/gtk+:2
+		unique? ( dev-libs/libunique:1 )
+		)
+	!deprecated? (
+		>=app-crypt/gcr-3
+		>=net-libs/webkit-gtk-1.10.2:3
+		x11-libs/gtk+:3
+		unique? ( dev-libs/libunique:3 )
+		)
+	gnome? ( >=net-libs/libsoup-gnome-2.34:2.4 )
+	libnotify? ( >=x11-libs/libnotify-0.7 )
+	zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-lang/vala:${VALA_VERSION}
+	dev-util/intltool
+	gnome-base/librsvg
+	doc? ( dev-util/gtk-doc )
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+
+	DOCS=( AUTHORS ChangeLog HACKING INSTALL TODO TRANSLATE )
+	HTML_DOCS=( data/faq.html data/faq.css )
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]]; then
+		git-2_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	# Force disabled because we don't have this custom renamed in Portage
+	sed -i -e 's:gcr-3-gtk2:&dIsAbLe:' wscript || die
+}
+
+src_configure() {
+	strip-linguas -i po
+
+	local myconf
+	use deprecated || myconf="$(use_enable webkit2)"
+
+	VALAC="$(type -P valac-${VALA_VERSION})" \
+	waf-utils_src_configure \
+		--disable-docs \
+		$(use_enable doc apidocs) \
+		$(use_enable unique) \
+		$(use_enable libnotify) \
+		--disable-granite \
+		--enable-addons \
+		$(use_enable nls) \
+		$(use_enable !deprecated gtk3) \
+		$(use_enable zeitgeist) \
+		${myconf}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
diff --git a/www-client/midori/midori-9999.ebuild b/www-client/midori/midori-9999.ebuild
index 64999c49bd79..9b5fcad5c038 100644
--- a/www-client/midori/midori-9999.ebuild
+++ b/www-client/midori/midori-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.45 2013/02/06 12:56:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.46 2013/03/12 10:19:16 ssuominen Exp $
 
 EAPI=5
 
@@ -25,7 +25,7 @@ HOMEPAGE="http://twotoasts.de/index.php/midori/"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0"
-IUSE="+deprecated doc gnome libnotify nls +unique zeitgeist"
+IUSE="+deprecated doc gnome libnotify nls +unique webkit2 zeitgeist"
 
 RDEPEND=">=dev-db/sqlite-3.6.19:3
 	>=dev-libs/glib-2.22
@@ -39,7 +39,7 @@ RDEPEND=">=dev-db/sqlite-3.6.19:3
 		)
 	!deprecated? (
 		>=app-crypt/gcr-3
-		net-libs/webkit-gtk:3
+		>=net-libs/webkit-gtk-1.10.2:3
 		x11-libs/gtk+:3
 		unique? ( dev-libs/libunique:3 )
 		)
@@ -77,6 +77,9 @@ src_prepare() {
 src_configure() {
 	strip-linguas -i po
 
+	local myconf
+	use deprecated || myconf="$(use_enable webkit2)"
+
 	VALAC="$(type -P valac-${VALA_VERSION})" \
 	waf-utils_src_configure \
 		--disable-docs \
@@ -87,7 +90,8 @@ src_configure() {
 		--enable-addons \
 		$(use_enable nls) \
 		$(use_enable !deprecated gtk3) \
-		$(use_enable zeitgeist)
+		$(use_enable zeitgeist) \
+		${myconf}
 }
 
 pkg_preinst() {