Change to GTK+ 3.x and Vala 0.14.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

3 files changed, 29 insertions, 17 deletions

diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index b1cea2f3c5bc..32af94b81b9f 100644
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-client/midori
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.73 2011/11/11 16:35:40 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.74 2011/11/28 23:39:09 ssuominen Exp $
+
+  28 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> midori-9999.ebuild:
+  Change to GTK+ 3.x and Vala 0.14.
 
 *midori-0.4.2 (10 Nov 2011)
 
diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index ffdee07bce80..1791f6b7c3dd 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX midori-0.4.0-webkit151.patch 1797 RMD160 eef08ba9d83cb37d12c097d4ea0ce9d29b292b2f SHA1 82bba447bc1aaeabf0ec95f3ddaf5c24dd27474c SHA256 645140a499c05174909d1060aa0caa71a7fe6f81033814e9934f445a22e89275
 DIST midori-0.4.0.tar.bz2 913425 RMD160 f3449a2b830cdb99035a9bd9162159867bea93d0 SHA1 c6d1d41f4e3c97bd2839235bd9d7b2a8a408c585 SHA256 0ac31b008b44e08cf0536a38405a0ecc2da7c28e3d549915325dbba74f74cd75
@@ -8,13 +8,17 @@ DIST midori-0.4.2.tar.bz2 923897 RMD160 ca16f66bafa4dcb49b0cfbcef9900cee94a0066b
 EBUILD midori-0.4.0.ebuild 1780 RMD160 136c713c1e2d3fa2199627656014b2b8d27aedb0 SHA1 ecc9c15cf6a9eaa340acd023c93ecd033b380909 SHA256 55318698495f9ac8fdc92b55565a68a9170021e79c44138637ef74e2a99cde4a
 EBUILD midori-0.4.1.ebuild 1734 RMD160 a1f244d12bf4338e824c2de6fa439483980bd428 SHA1 681a5b9f95b1372a15b079946c213044abad4f91 SHA256 bce3ab3d8b0d2257ee8409b5dbbfc4afb798d5e57a2e7a14e243de3e2d3b4bca
 EBUILD midori-0.4.2.ebuild 1661 RMD160 2f85449ee74ea950cb35cac8d9b5283d1be863fd SHA1 a47e27ba3e699825b3957ee097662a322a85ca03 SHA256 fdc32245938f3118981d63bf7ed6e376fc5380af32f9f5f9ea68749dc3a60e93
-EBUILD midori-9999.ebuild 1626 RMD160 627bfffca38c9cc87d28e87b6fed4884e8a514a7 SHA1 f90c7c8655c8157cb73fccfa80dfbbab8068caa9 SHA256 3b9eaf47d8504e66f10e79b42870310339678b50fe8b85e04e0b866c2e5f7c40
-MISC ChangeLog 10953 RMD160 bed6b562b9e960d91fcca211251851c3d9dbdace SHA1 f19e294ac4227eb19eb4d62735c3fb9db66a7f33 SHA256 b5b24236e4f19e96bd2840ad0cdbdb092a4ccf96c3a3fa7af96acbcdcd68f429
+EBUILD midori-9999.ebuild 1739 RMD160 41dd2b4779dac650893e62aa394b75390859c925 SHA1 40a4f29dff774733ca38c436633693d6f1f1ede8 SHA256 ea4eb38127bdcc73887600d699ef0af253cd8b61eae5dd6d355c2ccf27938a98
+MISC ChangeLog 11066 RMD160 29969634c648857aaafb998c593de468b8f7bb8d SHA1 bbb9e555d6a0b1fdb74bceda94bdebf6826423f0 SHA256 877b74fc2fa222475b2fb816848638b52b23bef4dba50eb9e20940c0b55cb2ac
 MISC metadata.xml 274 RMD160 3ae0219141cb6e103701de78f56f37f72351b20d SHA1 0458b3f1368ca30ad19355d7db79eb406e2761fb SHA256 5d1336bd8e7ed8f67cfb304d72be04a5bcb18c221e4fbeb9ae68331f5e99d9ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk68Pn8ACgkQmWq1bYTyC0NmfAEAjtffJbkxN//CpeibsBwkc7mW
-h3xwV/whFMckbdOysIAA/jht60zT7PHIQKpDd23uNm3Xw9n+B3wmJjjRuQUPD+pT
-=dcz4
+iQEcBAEBAgAGBQJO1BsLAAoJEEdUh39IaPFNVOIH/1D7qS39yam3Ej8v9Td/dGXy
+dUYkGuBhsxFhqhz4IN7y+wC6MpWJOx0zCwSCq/JVEZPwvMD7Ok2hkbUyyICKR65g
+RKc2FSNZs3taF11aiP4yVM+US8L/XrP4t38A2TsLnR4bzCOrYzbG1jMjVfzv/p0L
+/a4XQQJHLlTHK1sDJWSyypNU67u0/w8HgoO7vIkFFOfcuRzK59vN0DxwErDrKstl
+pMITRKaMR7NISyNcfaHHaLLYENGsS+4mbFp21bEyn07v/DzMyX9f36hjZAB5dlw1
+93sSxy9z2NUQaB8gXGCd7x6Zx8zh8QbbXJ9DKPBHXabtA15E/woRJfsow6N9jQI=
+=9TXP
 -----END PGP SIGNATURE-----
diff --git a/www-client/midori/midori-9999.ebuild b/www-client/midori/midori-9999.ebuild
index f0be277fa414..a3a8dfee943e 100644
--- a/www-client/midori/midori-9999.ebuild
+++ b/www-client/midori/midori-9999.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2011 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.37 2011/11/11 16:35:40 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.38 2011/11/28 23:39:09 ssuominen Exp $
 
 EAPI=4
 inherit eutils fdo-mime gnome2-utils python waf-utils git-2
 
+PV_vala_version=0.14
+
 DESCRIPTION="A lightweight web browser based on WebKitGTK+"
 HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
 EGIT_REPO_URI="git://git.xfce.org/apps/${PN}"
@@ -14,19 +16,21 @@ SLOT="0"
 KEYWORDS=""
 IUSE="doc gnome libnotify nls +unique"
 
-RDEPEND="dev-libs/libxml2:2
-	dev-db/sqlite:3
+RDEPEND="dev-db/sqlite:3
+	>=dev-libs/glib-2.22
+	dev-libs/libxml2
 	net-libs/libsoup:2.4
-	net-libs/webkit-gtk:2
-	x11-libs/gtk+:2
+	net-libs/webkit-gtk:3
+	x11-libs/gtk+:3
 	x11-libs/libXScrnSaver
 	gnome? ( net-libs/libsoup-gnome:2.4 )
 	libnotify? ( x11-libs/libnotify )
 	unique? ( dev-libs/libunique:1 )"
 DEPEND="${RDEPEND}
 	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
-	dev-lang/vala:0.10
+	dev-lang/vala:${PV_vala_version}
 	dev-util/intltool
+	gnome-base/librsvg
 	doc? ( dev-util/gtk-doc )
 	nls? ( sys-devel/gettext )"
 
@@ -41,14 +45,15 @@ pkg_setup() {
 src_configure() {
 	strip-linguas -i po
 
-	VALAC="$(type -p valac-0.10)" \
+	VALAC="$(type -P valac-${PV_vala_version})" \
 	waf-utils_src_configure \
 		--disable-docs \
+		 $(use_enable doc apidocs) \
+		 $(use_enable unique) \
+		 $(use_enable libnotify) \
 		--enable-addons \
-		$(use_enable doc apidocs) \
-		$(use_enable libnotify) \
 		$(use_enable nls) \
-		$(use_enable unique)
+		--enable-gtk3
 }
 
 pkg_preinst() {