Version bump.

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

4 files changed, 133 insertions, 12 deletions

diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index 0085900f6bae..fbc6bb1a3bb3 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.110 2013/04/09 15:56:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.111 2013/06/01 14:27:45 ssuominen Exp $
+
+*midori-0.5.2 (01 Jun 2013)
+
+  01 Jun 2013; Samuli Suominen <ssuominen@gentoo.org> +midori-0.5.2.ebuild,
+  midori-9999.ebuild:
+  Version bump.
 
   09 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> -midori-0.4.8.ebuild,
   -files/midori-0.4.8-desktop_file_validation.patch, -midori-0.4.9.ebuild:
diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index 391e893430ac..a94f46d35fb1 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -4,19 +4,21 @@ Hash: SHA256
 AUX midori-0.4.6-dl.patch 2667 SHA256 5c85f994fc577e0bf8c69a1f4bb3bb260c71f80794333c8bac966b163af259c7 SHA512 b7f5bb965fcbf513813138a6dbad4e56f02809baaf03077aa7f01e91b470a6149b76f81f51ef9a0241a9842e074e1abd33674c24a17479a84b3caab37e7ba678 WHIRLPOOL 9f4d1671e704de539f043321596f7a21b90317741484db93769a99793896e2d6796ce10ad48230dbe53bee471328f90318325fa66df46ee6fe984d60de8588b4
 DIST midori-0.4.6.tar.bz2 978570 SHA256 910f47bd2b5f2998cd4fce45c08f9e282318820b68562d0bade2096b9a17e3ea SHA512 8c46f2eed6dd0af237b6aa021f8fc2150bd4387f7de14c9265cf5b8c1a1a558ecf908c98389415100ca0eac9037d7df89c5a348ef9dcd397bb1d3421104a8e7a WHIRLPOOL 36a498e2fd22039816da7072c1a7d59c84548fc187480b33b7a12ddf2ecd41626bb5a80d28298f336148ff74e3ec6fd2dd6da7a19f466ea899849b2d0919c0b2
 DIST midori-0.5.0.tar.bz2 1093278 SHA256 d280c19bb135f2b644a67d9f34d1ec1c148ceb14b5de11ce6c23f64c15be5df0 SHA512 6e4552a2410f642e52d0e165225547b37b6c3f60eda0acb37bb12bd28c707cadfe1af96cf74a93e86b2a4d30f93a72705881b9aafcdfa658498fad168adbc399 WHIRLPOOL d948d1c47f3578903b1af938e8adcbc1805841a452cafb03bc64343a3f84b0d5625dbb812182fa22a6d00f1ee0d85b8cc7a2701c73cf058cc15756e9f3c8be5d
+DIST midori-0.5.2.tar.bz2 1119716 SHA256 a9c5cb4606e8e4967a2b980caa9ada25623c50d927a302b6bf73eeac5815c97c SHA512 4fdd93107db9fb472fc55a75e363395a49852970c2619d291e0117ac882412cfa2be9c4fef82ab7cd79935d4aebc0af78e990e370388304343543c7b86c6d8f1 WHIRLPOOL 3041cb20a7959b22728c405e0fa18cb8231a78ae95f31f92d437604594bee5f9d0a8619d1e73d3fdd2c34a0c9369269c1269ab3b3b45abedd6eef0bd0ce75b77
 EBUILD midori-0.4.6-r1.ebuild 2211 SHA256 48e90bc460897c622ae0632c15dc3c033645489e70744670da3b21886d551b69 SHA512 a1414ab2c4976f577f86a9108ad9806cb4f8eebe834b6360e02911ce3d9c34dbca06ab3e4dea5c61eed2a3dbe00cad85276812dbbf55c22c04a7160d89a3a074 WHIRLPOOL a401d18386e3b3556733962b1cc414fc463df4894db459b546b84e6e2c9eb7c7bdd0f916f99e4207c25cfcaaae176fa89acb79501f88a26dfc43e333707a6a25
 EBUILD midori-0.5.0.ebuild 2513 SHA256 60b01d1459c5575c0806f3bdc71c17b0bd78e83c79a71d89bc2f820a62c40d23 SHA512 0bf16b23b5dcfc19809efde76bc35307681dd2deef41364bcd24657b316c525cfde19876114962486a2c5526f6adcf6d42eb42b4fc3053283ab24f4fa6bcaed5 WHIRLPOOL 683859c8a96ee959d9f1dc25f147827f8640ff1c20e4796d39dd7e49055a38f2cf5864a6cbf985ac7d687ece4976b81c41315ca8a45a6a50b512a308622e5593
-EBUILD midori-9999.ebuild 2511 SHA256 291715cd6136e94f7ee05b717785be1c45f377cc0844953d7d9438599ee921dd SHA512 4a215b39d8016be8d6e4e8e684bba2563f52fb99e1a12f6096f6149c7c50dc5fd24ffffe4f19b0cef957c15d49de26a7cdf205ddbdb61b906a7effac23c9bc48 WHIRLPOOL 0c8c96938dee5f28f9d2e39f0ffa06c8c2b328c1dc322b6d32fae0f71748c6055d6235621839981246a95dc30e0986c7e47d89447654281ef6daee0c02e3d6d5
-MISC ChangeLog 16148 SHA256 ab9e7ba072e5658ee7fa79a5318541b075bcaa72b2144a4c2df2ef22017bd851 SHA512 2ca6ffb1021bb7746ec882832a787a18e9e7ce8a85f062957e1081b8a17a0b2357efd1fef1a2c8bfa011ef04898ba09278d624b970c96f68da631d074df5eece WHIRLPOOL dca2d82d29496f4761c794749544e7d96f6aefbd2789735befe9f8ce039b800ab714faf042f70dad5f8b8a6153580d1a3c00d9f2e62c5092045e609974f16d92
+EBUILD midori-0.5.2.ebuild 2554 SHA256 f75d7663990cb41fd612483b2d2e27968e7341b97f59688bb66b4bb4d2d467e3 SHA512 1b938c7c6a95cc8adf3875116885f3fe9744223570daa3f07240701c1a59f012cb8e40e2362e8fbe6897a87bb43828ca7d6643f4a7833b8dbdb5be349b2ae8dc WHIRLPOOL aba27710c4ea48a36f6fd0c019c729ada7949bf2abc944bf9a381eea71943576f35d0413b0818416c01e0fa8aa9213efd4ee25f45a8ffe2b1926dc193bf94902
+EBUILD midori-9999.ebuild 2554 SHA256 9604d8653d8555f3f363fd9aceea27a9b42b5610033868edf1f9f3ed65cf7570 SHA512 54b1f7f20e6358d46f9070f956cb74771a47f50178d472fa24861456be1cee2e4467ab5f5e8289e8fc055f55e8642f50fdd5287a69cb5c4d65b03e73687931d9 WHIRLPOOL 14068821b49861d0a7dc897713f7042bfb132adc2ff915198d041db51074c310e96deac506298937a9b2a376e6a76540e898af5bed036a35ce2289d40b96bf9c
+MISC ChangeLog 16292 SHA256 ad1418d8038bb4d8266bc81056adebf779d5010e293d6f5c0416f50e5dcec3b4 SHA512 a65f93967ab5a13af37b384903c44da7e79a0dce9e06b27489a3a7104b24114bddf95e961a9ec8a65e8b9dc6eaa10538d0ad29ddbced2d92e67f5cf05608a893 WHIRLPOOL 027431eea94bee293f6bc0c7fecd2f664fe1b443d5483cb83a5d417eb4e6b381d462b6de5c43002e4993cfe916ddaf8b4b9533af09f1f56f9b3ddfdb5653c9be
 MISC metadata.xml 596 SHA256 0fa7bd1140a2b36810b7766e6586d34fed003c56817eb86e9559e03ec03793d7 SHA512 d166a4438ae11dc4efa5fc8834d347e4f29f9ee4fd88c7f09e83ed210b221beb1a9806cd8aac05e1bda22e54ead051e731842b7f2220fae7b7a1cc83e53de263 WHIRLPOOL 3374d47859174c05954af05548a7d2338be0d85b021ccd5345b1ac00ec39aa936360954a09621221534adcbad2662408de5a5b53dadebe352fc9a5891232ab5b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRZDpJAAoJEEdUh39IaPFN03kH/0ZWqqSN7XTOxoSmn+ueVZQi
-d+Q2mQ2jhCys4Wpg+gKMz+Yvpq3zymYrzIbpzqy5jTYiMBylQg9NWwQ0hZst8QRh
-OlBc+yRFlxsgkUy8qpSlYeTJvWZLoFf1Yx1OKkXABUawKc+T6OGv0DYBc3J2R/OP
-ash85F5bPPUMwY1Rmg0WN3Gk+wS9fteYm30oIFracbT0bIsOj/D4lFzJN9KJCBbF
-JPQ2kXOkUTVS+eNr1fAnX920PyOi5j2NDM2LKLzddq8qaEWkkcmIYMcQV+mxpG9i
-7V0qDWJcOMVthM+AU1wFOjsunZF+rYquSx2L85OTdJNsaHjFddos99ce1rJLDbc=
-=lOwU
+iQEcBAEBCAAGBQJRqgR4AAoJEEdUh39IaPFNmtAIAI1f7z5jeDic1Qcl8Uqa7kSH
+9lZs0iUC5Itr1lSRYIspcV0iJ6XOZfwCIeuulPAC0Tc+ooBFgLSwr/6GEo/i24FH
+Yz6/lU+0ySO0tAI8YdYaL2LGt8y9LQ/NoE3BH81Xx2qkpv893xFAw1clCDbq2QHE
+N60/Pm3j2/fY/gTWdk9OcoOCE3lJ3cdu7cuRuFp8rmi7oioV6S6SYGmls4aAfThV
+TFZRWcF9SC4oZC8h+4I64bRLqV/lsnTHI6EkREtBoZW5+cuVItuI2SV8VUN2Coot
+GzKBgWuWggJni0bf4AgdM+9khaYe9IyAuZ98844iK16ZIteftd+CDOtjeipTGAA=
+=Pg7e
 -----END PGP SIGNATURE-----
diff --git a/www-client/midori/midori-0.5.2.ebuild b/www-client/midori/midori-0.5.2.ebuild
new file mode 100644
index 000000000000..7f84591892c2
--- /dev/null
+++ b/www-client/midori/midori-0.5.2.ebuild
@@ -0,0 +1,112 @@
+# 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.5.2.ebuild,v 1.1 2013/06/01 14:27:45 ssuominen Exp $
+
+EAPI=5
+VALA_MIN_API_VERSION=0.14
+
+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 vala ${_live_inherits}
+
+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 )
+		webkit2? ( >=net-libs/webkit-gtk-2 )
+		)
+	gnome? ( || ( >=net-libs/libsoup-2.42:2.4 >=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}
+	$(vala_depend)
+	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
+
+	vala_src_prepare
+}
+
+src_configure() {
+	strip-linguas -i po
+
+	local myconf
+	use deprecated || myconf="$(use_enable webkit2)"
+
+	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 bcb9a2a80237..d833dff4d599 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.48 2013/03/31 19:10:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.49 2013/06/01 14:27:45 ssuominen Exp $
 
 EAPI=5
 VALA_MIN_API_VERSION=0.14
@@ -41,6 +41,7 @@ RDEPEND=">=dev-db/sqlite-3.6.19:3
 		>=net-libs/webkit-gtk-1.10.2:3
 		x11-libs/gtk+:3
 		unique? ( dev-libs/libunique:3 )
+		webkit2? ( >=net-libs/webkit-gtk-2 )
 		)
 	gnome? ( || ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.34:2.4 ) )
 	libnotify? ( >=x11-libs/libnotify-0.7 )