Version bump. Use python-any-r1 eclass instead of the deprecated python eclass.

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

4 files changed, 140 insertions, 25 deletions

diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index 9dc849850013..fad0c0e6fcd7 100644
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/midori
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.100 2012/10/21 12:00:16 ssuominen Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.101 2013/02/06 12:56:37 ssuominen Exp $
+
+*midori-0.4.8 (06 Feb 2013)
+
+  06 Feb 2013; Samuli Suominen <ssuominen@gentoo.org> +midori-0.4.8.ebuild,
+  midori-9999.ebuild:
+  Version bump. Use python-any-r1 eclass instead of the deprecated python
+  eclass.
 
   21 Oct 2012; Samuli Suominen <ssuominen@gentoo.org> midori-0.4.7.ebuild,
   midori-9999.ebuild:
diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index 12ef145df1a1..40bde12a308e 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.4.7.tar.bz2 1015921 SHA256 65bf9976733597c405492ce91aa664fd10547cb7df16e0a70f260c7a3e97ea5d SHA512 2a943ef19cb21826b2239dbcd5180ad46240326bc8b5f87fbf6095ca99cea277cf92bb8ed9db8cf96761a8b1af31f4849c25a2bc27b80cd29d14f288875f9e9b WHIRLPOOL 7f7c94fefd3eae2c3d2a827da93b64d738db32d3cff4d27aeb8e7cdf511472943539392dbe62c55043aa41f53f507b0547d2af36898811f500963a42c1aa4ad7
+DIST midori-0.4.8.tar.bz2 1047789 SHA256 40bf23f84a3537f54d7eb45df1da40ebef54c321b1b34d0d0c8e45bb0cce5e9f SHA512 ec10fb836f824928cee2df4ca13d65b8436efd8f34af911884fb225b521d1f67dd44bdb5588cd36e0f2db802ed9d1d3c6852563f563b18e20416fcdf3dc3d349 WHIRLPOOL 607c49dd4269a588bd4c33445b3342aa7c785da458aea3abd10deb7c0ffb55a22024e7f1d293e9237b3cd54fc023a0afb70931ed5bdf99df7bd46d67bf889f42
 EBUILD midori-0.4.6-r1.ebuild 2246 SHA256 02f9afa0790834dded6e7153ed1307fc1537497223c3066fa557fb5d4b765699 SHA512 f5a6dfd6e85a76cacdbf4d73957047cf37bb6c19174e14e586874a94abfa91f6973ccd45c128a4ca373f355aec05779e48f0587b22c3a2fc277e2d916636ca76 WHIRLPOOL 283c97500a5862f3f06e1f8b7ae279a5654c63a7d46598a41d1e7767198e8f05e32a0385a4281c9d887b6f14156d3e3fa4aaf48bc4cfbf893a197bc82efc93b8
 EBUILD midori-0.4.7.ebuild 2542 SHA256 ed792ee72237895496aecb8182664446babc1322d9f6425b691610533c10d00b SHA512 c65faf5755954ad9ef1318f32d47a4028fb41f9d3faf203ef4b18c7ba4ffeb551713871dc75efbe9a8c5e4a3b5d969d95eda83e50ac324e3387f5eea87530932 WHIRLPOOL 8b59ca886690a488018980075133abd08605b76dfb4a753493ed9a3dc84c958c933012cb4ba594c1840ae91fddf9325bf280e02cc5ce0da4b758fa405586f258
-EBUILD midori-9999.ebuild 2542 SHA256 730699051a308b8bd06ffe00591dfb93c68432b7e70e1d5603c5b1190e428ca2 SHA512 b20d16eb939e731373521ca5586825da6666837c362e344556185df4765ece06e22ddc05a6320f0a4a3f0ba945f653640697e8623f3cf75fd0a706e06cde7b66 WHIRLPOOL 4ae1ed52ff40d8045d3f143b62f800b35f8be17d7dd50b28058c08fbd8ea489cd2eedcfac378bf53df8c7ea70feafb30a94b4ed300ac334e3290a8dddbe7dceb
-MISC ChangeLog 14691 SHA256 c9dd3b12f4a2cb069653b29a9c09e44ad9df89ea6da1623e8f8143307ff85a0d SHA512 cf366df54f3f749bea2ed26ce9c37f2c60d1200193d87bb1e7e80e7cdd4ca9b011d1b1bd4d19df5ad7873370bbc517eeea2c5d95f1c4eb847a82b86de85ee861 WHIRLPOOL 0c1d4a1b37d27a4d265d9554e8db9321661f347ca4176aad910e7490c65b3ae804c582f664ce9461232d8931a63be70fd19670d01376b3eb823751f092c438bc
+EBUILD midori-0.4.8.ebuild 2412 SHA256 c90ea303ae05699566a2f32189e7d035e47d9e29fe62771e834dd921c2f31326 SHA512 771b7e32a2cabc1bed13a98a213ca1c5f4d6aaf116c3c9d60f660bd7b59c87bacf185ad8f467df54a86858308b84be64cacaf260e8cf5950fb98e911e6b3a4e6 WHIRLPOOL 031e2a60cf0036b7425793b5654a79ac5b784615326d7ee3cbd5ea0954e983fca792b89464c14a2942a70dc01f976183ab282b21f2592c02963ac2311b44c180
+EBUILD midori-9999.ebuild 2412 SHA256 af653b1ad7a57e4421582642b4a46b278b459f2f1bb179b019f7a67161f248dc SHA512 f1ab9e81c296941b6229bed5aee87950f1c9974f1b1c1397b35f3f683a30ae0e031def8a73934606049e63ec704da8e72a12fcb1e7d326a48753f7310cf31b28 WHIRLPOOL dd380ee8abc059ba8661d28cf9ab47be3a456ba3a69cb88d8fd64a4fcb2bfbe922a3489918f954ceebc80e7aabbb99f4ce9437f965be351ee60b9b8049decc45
+MISC ChangeLog 14903 SHA256 c8cd28b978d14640f345b485546ec5808443f39f530d0bff2f8a7678b3cd8888 SHA512 68ce67a7b11234b5ab88696f9c5e0af4956c3dfa4bd7d6e5eab673d174f5fc69d0973480667c046cbe532aaf6a960404f56e34474006b010201ba7f16a59645e WHIRLPOOL 56a34780fdca53bb0b1262b82ff02b5b70193d97aff73fdd9da32d7c2b3c1f1a0b49f543ad8340b5ae4589270fb0faf1a623766521022f609ba92c1d9227974b
 MISC metadata.xml 468 SHA256 19eecb99ad642e6a8fbd63ed7f3d484eab5d11acb109734121b23e58710b9ba2 SHA512 2d5d7f847a8df75adb35d577658702b96d9838faff55f93e82188b9533f9929c405e1e811eec72ab2df2ab8067f63e8ddfb19da65ac25de42c1e9d56bbe0bc6e WHIRLPOOL a10dc65b031e62c8a20b5b365d3b0769083e1e609eab189cc1403719d66de2da3237dd254d6093091b7a1f7dd826e4f685161318c9bc5fb6ea22b17801b1acb4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQg+LpAAoJEEdUh39IaPFNEpwH/07Gco4ICrf9ozxjlTF13N9q
-cV74cCNtp7pjRaco2OJQ45KfK4ebND4llnLNNUPAt73Rz3G9vCETL9iuoBd+qTKh
-bIwxacMza8MXbepj7wWXEayNlSWNxOhhlbNrHgMR5qG1Bf8k26QsiZcA8umwri5p
-sM3lJglvPztg5ba6/4UvmWsLZLL7SMuoafZshBu8VJWmSGPhPcZZbdHPbvW4V9Ke
-D2cp+7dv3Tc3AYn+JhD0zqGuVQV+xDaIqRivcm5nv8pjwE4RLY70UITj/aBP2wXN
-8F2MTESUfwOJnFGRtjKeZWAqASYzXUFW3CWXJJKXY4o0wbloF1mPuhcUD5czg8o=
-=I7jX
+iQEcBAEBCAAGBQJRElLdAAoJEEdUh39IaPFNRgQH/1FbaXtRh26lD+VXR+nu+EZ/
+9ZELcZMsPClgf5sCConq+qJGOfbRshBI0e8jp5BCWL8cY4zEfijNfncnxB08Kx9A
+zyMVAEj9eKVyOClceyMr5WVWE2QYLOEwxnOOq6QJwlzFIeSiKT+S0Sf0+uQx4B1N
+OKfqtCnoN2MpwcRaNPEh8gt3Fd8apvV6R7Ou2eSXz5p99UfuBJAziScMrY5lt5iZ
+o5chOm4tgDdX+BTGDHFwSRj05sYjRnuDH1iHDvqwocLPTTsvzr8+bLrm77n8SdcX
+D0VcxhIRZnFmZd+RfBqBA4lJKG45jde0X2Yb2pOyRBZnQROWABA1N4/xt1ERNUQ=
+=z0C6
 -----END PGP SIGNATURE-----
diff --git a/www-client/midori/midori-0.4.8.ebuild b/www-client/midori/midori-0.4.8.ebuild
new file mode 100644
index 000000000000..4df8439b6c61
--- /dev/null
+++ b/www-client/midori/midori-0.4.8.ebuild
@@ -0,0 +1,107 @@
+# 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.8.ebuild,v 1.1 2013/02/06 12:56:37 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 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: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
+
+	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)
+}
+
+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 49915ec276fe..64999c49bd79 100644
--- a/www-client/midori/midori-9999.ebuild
+++ b/www-client/midori/midori-9999.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.44 2012/10/21 12:00:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.45 2013/02/06 12:56:37 ssuominen Exp $
 
-EAPI=4
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
 
 unset _live_inherits
 
@@ -14,7 +16,7 @@ else
 	SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 fi
 
-inherit eutils fdo-mime gnome2-utils python waf-utils ${_live_inherits}
+inherit eutils fdo-mime gnome2-utils python-any-r1 waf-utils ${_live_inherits}
 
 VALA_VERSION=0.18
 
@@ -45,7 +47,7 @@ RDEPEND=">=dev-db/sqlite-3.6.19:3
 	libnotify? ( >=x11-libs/libnotify-0.7 )
 	zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 )"
 DEPEND="${RDEPEND}
-	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
+	${PYTHON_DEPS}
 	dev-lang/vala:${VALA_VERSION}
 	dev-util/intltool
 	gnome-base/librsvg
@@ -53,8 +55,7 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
+	python-any-r1_pkg_setup
 
 	DOCS=( AUTHORS ChangeLog HACKING INSTALL TODO TRANSLATE )
 	HTML_DOCS=( data/faq.html data/faq.css )
@@ -69,9 +70,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	# TODO: Both zeitgeist and gcr should have ./configure switch!
-	use zeitgeist || { sed -i -e 's:zeitgeist:&dIsAbLe:' wscript || die; }
-
 	# Force disabled because we don't have this custom renamed in Portage
 	sed -i -e 's:gcr-3-gtk2:&dIsAbLe:' wscript || die
 }
@@ -82,13 +80,14 @@ src_configure() {
 	VALAC="$(type -P valac-${VALA_VERSION})" \
 	waf-utils_src_configure \
 		--disable-docs \
-		 $(use_enable doc apidocs) \
-		 $(use_enable unique) \
-		 $(use_enable libnotify) \
+		$(use_enable doc apidocs) \
+		$(use_enable unique) \
+		$(use_enable libnotify) \
+		--disable-granite \
 		--enable-addons \
 		$(use_enable nls) \
 		$(use_enable !deprecated gtk3) \
-		--disable-granite
+		$(use_enable zeitgeist)
 }
 
 pkg_preinst() {