Version bump. Remove live version because upstream migrated from git to bazaar.

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

3 files changed, 29 insertions, 21 deletions

diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index b6409d543047..e6f00f82371b 100644
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -1,6 +1,13 @@
 # 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.112 2013/06/01 16:50:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.113 2013/07/17 06:02:01 ssuominen Exp $
+
+*midori-0.5.4 (17 Jul 2013)
+
+  17 Jul 2013; Samuli Suominen <ssuominen@gentoo.org> +midori-0.5.4.ebuild,
+  -midori-9999.ebuild:
+  Version bump. Remove live version because upstream migrated from git to
+  bazaar.
 
   01 Jun 2013; Samuli Suominen <ssuominen@gentoo.org> -midori-0.5.0.ebuild:
   old
diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index 8c98d1d0fbf9..49fa2d868400 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -4,19 +4,20 @@ 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.2.tar.bz2 1119716 SHA256 a9c5cb4606e8e4967a2b980caa9ada25623c50d927a302b6bf73eeac5815c97c SHA512 4fdd93107db9fb472fc55a75e363395a49852970c2619d291e0117ac882412cfa2be9c4fef82ab7cd79935d4aebc0af78e990e370388304343543c7b86c6d8f1 WHIRLPOOL 3041cb20a7959b22728c405e0fa18cb8231a78ae95f31f92d437604594bee5f9d0a8619d1e73d3fdd2c34a0c9369269c1269ab3b3b45abedd6eef0bd0ce75b77
+DIST midori_0.5.4_all_.tar.bz2 1229169 SHA256 d4ee77f3dd9bf2c07cea7674d533e77960e9346bd8b5482582ccb3cdaf182022 SHA512 94d71eb5b4addb184b356d2434550c40adc717f105518a78b42df40830467a91a6acc5bd04a02891cd4ad3343e0a881d063bdb7ea979dfa0cbe19a84271e3138 WHIRLPOOL eecda1f91c7b740cbaeae7e44ea90ad41dbb261c543cc1e5a17c2ce50ffba4c7e42218572347b3e1b2101bf4a5fc14511364789819aa54724be6045dfa1db329
 EBUILD midori-0.4.6-r1.ebuild 2211 SHA256 48e90bc460897c622ae0632c15dc3c033645489e70744670da3b21886d551b69 SHA512 a1414ab2c4976f577f86a9108ad9806cb4f8eebe834b6360e02911ce3d9c34dbca06ab3e4dea5c61eed2a3dbe00cad85276812dbbf55c22c04a7160d89a3a074 WHIRLPOOL a401d18386e3b3556733962b1cc414fc463df4894db459b546b84e6e2c9eb7c7bdd0f916f99e4207c25cfcaaae176fa89acb79501f88a26dfc43e333707a6a25
 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 16375 SHA256 4bd8029757cb037da558ec7bf5e6e08847a805ca8f488a991741a9323f2a9f39 SHA512 020d74283624961c5136df0ff954c556fe357b03c61c1b91a4f106a1b3350d1ef4e027a200c8e0205ffccc8d0fbd4f55cecfa7771a5c199da175b1e0ae05e2e2 WHIRLPOOL 18788551ba89f078d47375653d04b1c2321ad4f6a0bbd7d7137f7dca909853305443bb6142bdd51e7a18b802164d04743feb6c238aa84a8f0537facb9680fa47
+EBUILD midori-0.5.4.ebuild 2554 SHA256 0c7ba73d1ac9e14a40d9df693141426ee8c581eac4899076c8317f6aaee9d03d SHA512 60b361292fadb34a69bf56df9f2b3167eb9be02d7a843d448aff7cf2ae14095449be836082705659594a98f9dfb04e86ce6860162f9220b90b49d131f64fdbc4 WHIRLPOOL 4083e26d02d5c097417ff9c60d0fe7ad921859d597988892fcd36c2b0d027ef888e21f16d88d05a976846cc84103a3ab831f347cbad4d7ca77b850a0534fdd8c
+MISC ChangeLog 16588 SHA256 1e0fb87a5f4aba7663fe36b1d337a4329a4d3cd916ee243e8916baa3dedb73ca SHA512 4ea674984ed9cf618b81385487e582e07d0467660e9c46691ed526148131730545d1567656c654067361e28d5d022f315e3b30e163567f3895d1c93626bcdefb WHIRLPOOL 4f9ffd40f43fe3ca86961d35e56de52ea3cff0fb029378fa6c8f23dae1a918910fcd43407ae2cd15e88363c8cf4e96c7c11def7ecd8507dba3fd937094d5c6bc
 MISC metadata.xml 596 SHA256 0fa7bd1140a2b36810b7766e6586d34fed003c56817eb86e9559e03ec03793d7 SHA512 d166a4438ae11dc4efa5fc8834d347e4f29f9ee4fd88c7f09e83ed210b221beb1a9806cd8aac05e1bda22e54ead051e731842b7f2220fae7b7a1cc83e53de263 WHIRLPOOL 3374d47859174c05954af05548a7d2338be0d85b021ccd5345b1ac00ec39aa936360954a09621221534adcbad2662408de5a5b53dadebe352fc9a5891232ab5b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRqiX1AAoJEEdUh39IaPFNeZ8H/jFTKRDqRanUEK0KaoV/afci
-6YtHrIiSRSb1x/AfrjPycBj3XN/fcyFeS2tjHOLQEhIQoEK49eyKue+PitAyz5Q1
-yXqI5E/Z4PjAPbwogSIr2wQ/aP+D+A5WgysHF5W6SKnfUS+rs6o5CIi2s11N1Iwh
-ijALiHXm+Vv2wb5nAvkOf2LUtOOgdNtDRA4D+BDnyXanM3GOJm4vuM0FGYiy53Bz
-voGjRfjedGy/oN1s4uqSbMh3yi2S/1qBh3Lp/JYWLtv3c9A4IF1B5ePlXjEcDFAM
-SkqZn2yzr0G9eteCOcIFXgqVwLeK5EPrHHT8dvITZffXNE4N78u2B+JRjSAPDG0=
-=FIle
+iQEcBAEBCAAGBQJR5jNNAAoJEEdUh39IaPFNv/wH/3SZSoFwOaL+QfwQ4tbe+h7Q
+ngdVYmHCuhmCMkiiRCGTtx/80IDe0walDd3LEs0ctBhtm13Znq+tzq+YPgSdeoLt
+uGbwwqpv2hUSlo4fG3fKqu3HwPaVTRXX+qCpTA1tB9WcMNlDFhllljoIYiWAj6jH
+uWh42MoTwmn6U4hML7rAmXHuRV8z2twYdSD6o7c2ffa9kpPSu0sfm8p+L3kaJz1A
+IQrcv+evkUqstOl5S+3QeLxnPiji3J2g5WMJR3kgChWpWJev06N801NtaNCJOrmt
+j1h+BAlmgax60BmFLmCzAy85ddi6CkvkMpDX0LLaOrOb32m4xPF9tWbaWsOxPeA=
+=vrZL
 -----END PGP SIGNATURE-----
diff --git a/www-client/midori/midori-9999.ebuild b/www-client/midori/midori-0.5.4.ebuild
index d833dff4d599..191db49ba359 100644
--- a/www-client/midori/midori-9999.ebuild
+++ b/www-client/midori/midori-0.5.4.ebuild
@@ -1,9 +1,9 @@
 # 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.49 2013/06/01 14:27:45 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.5.4.ebuild,v 1.1 2013/07/17 06:02:01 ssuominen Exp $
 
 EAPI=5
-VALA_MIN_API_VERSION=0.14
+VALA_MIN_API_VERSION=0.16
 
 PYTHON_COMPAT=( python2_7 )
 
@@ -14,26 +14,28 @@ if [[ ${PV} == *9999* ]]; then
 	_live_inherits=git-2
 else
 	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
-	SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+	SRC_URI="http://www.${PN}-browser.org/downloads/${PN}_${PV}_all_.tar.bz2"
+	S=${WORKDIR}/${PN}_${PV}_all_
 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/"
+HOMEPAGE="http://www.midori-browser.org/"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0"
-IUSE="+deprecated doc gnome libnotify nls +unique webkit2 zeitgeist"
+IUSE="+deprecated doc gnome nls +unique webkit2 zeitgeist"
 
 RDEPEND=">=dev-db/sqlite-3.6.19:3
-	>=dev-libs/glib-2.22
+	>=dev-libs/glib-2.32.3
 	dev-libs/libxml2
 	>=net-libs/libsoup-2.34:2.4
+	>=x11-libs/libnotify-0.7
 	x11-libs/libXScrnSaver
 	deprecated? (
-		net-libs/webkit-gtk:2
-		x11-libs/gtk+:2
+		>=net-libs/webkit-gtk-1.8.3:2
+		>=x11-libs/gtk+-2.24:2
 		unique? ( dev-libs/libunique:1 )
 		)
 	!deprecated? (
@@ -44,7 +46,6 @@ RDEPEND=">=dev-db/sqlite-3.6.19: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}
@@ -57,7 +58,7 @@ DEPEND="${RDEPEND}
 pkg_setup() {
 	python-any-r1_pkg_setup
 
-	DOCS=( AUTHORS ChangeLog HACKING INSTALL TODO TRANSLATE )
+	DOCS=( AUTHORS ChangeLog HACKING README TODO TRANSLATE )
 	HTML_DOCS=( data/faq.html data/faq.css )
 }
 
@@ -86,7 +87,6 @@ src_configure() {
 		--disable-docs \
 		$(use_enable doc apidocs) \
 		$(use_enable unique) \
-		$(use_enable libnotify) \
 		--disable-granite \
 		--enable-addons \
 		$(use_enable nls) \