3 files changed, 88 insertions, 9 deletions
diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index 7c405d8fea7f..eec772c29a80 100644
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -1,6 +1,12 @@
 # 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.77 2011/12/06 03:47:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.78 2011/12/06 03:50:25 ssuominen Exp $
+
+*midori-0.4.2-r200 (06 Dec 2011)
+
+  06 Dec 2011; Samuli Suominen <ssuominen@gentoo.org>
+  +midori-0.4.2-r200.ebuild:
+  Restore GTK+ 2.x based ebuild for now wrt #392571 by Balint SZENTE
 
   06 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> midori-0.4.2-r300.ebuild:
   Search for javascriptcoregtk-3.0 instead of javascriptcoregtk-1.0 wrt #392919
diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index 048c31ccf86f..0b0b1b09c8c2 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -5,18 +5,19 @@ AUX midori-0.4.0-webkit151.patch 1797 RMD160 eef08ba9d83cb37d12c097d4ea0ce9d29b2
 DIST midori-0.4.0.tar.bz2 913425 RMD160 f3449a2b830cdb99035a9bd9162159867bea93d0 SHA1 c6d1d41f4e3c97bd2839235bd9d7b2a8a408c585 SHA256 0ac31b008b44e08cf0536a38405a0ecc2da7c28e3d549915325dbba74f74cd75
 DIST midori-0.4.2.tar.bz2 923897 RMD160 ca16f66bafa4dcb49b0cfbcef9900cee94a0066b SHA1 fac3dc4bb8935f35b38ffc4d6c7a5daba9dc52f1 SHA256 2e3f104254fb9a28c77e8acf1cc8ae6dd529499711d558b29146ab0fa915f0a7
 EBUILD midori-0.4.0.ebuild 1780 RMD160 136c713c1e2d3fa2199627656014b2b8d27aedb0 SHA1 ecc9c15cf6a9eaa340acd023c93ecd033b380909 SHA256 55318698495f9ac8fdc92b55565a68a9170021e79c44138637ef74e2a99cde4a
+EBUILD midori-0.4.2-r200.ebuild 1766 RMD160 50450073f4d2b3ad8a3639c048a6c3007af80d0f SHA1 53631bc16187b204f133eb08778ba524d8fb6a64 SHA256 efa879f9a1c211ba4ca2423a28948007bffc7e36637fa79fd215031645bd4c5e
 EBUILD midori-0.4.2-r300.ebuild 1869 RMD160 383c1430d5fb01eb63caf2e88884a3ab05c77678 SHA1 6552209f3f54a925df7b1ffe4e5a2c3e7fc23e18 SHA256 c65127d6b0378323ed583d59028735092d19d65bc9ab45614501cd93f83de2c4
 EBUILD midori-9999.ebuild 1739 RMD160 a07286e21a46df4ea6c429323292bf2c657bc542 SHA1 941b8a4cebe73b8c492a77f99e26fe96ba853a56 SHA256 27319ebac22d2ff993c837720eca2f4527376f95a4170c6735943720a2232178
-MISC ChangeLog 11413 RMD160 44aff6f333f395c734c702c0994ba63429481a6b SHA1 7d7c62b0fea49279d3571875120c0d8fd309888e SHA256 66c00e03976c43a2ee310c6bd07c56ffb98fa191f33f5113c58d42534f66a83b
+MISC ChangeLog 11600 RMD160 17ebdd8a16e02ace7759ab9784ec9e427e9dda38 SHA1 4341175d2b4ed5f54f1ee0ed3638064c85e2fca8 SHA256 1148b384243585a5e067a38122430991f2110af5fc32612c84647834294dca4d
 MISC metadata.xml 274 RMD160 3ae0219141cb6e103701de78f56f37f72351b20d SHA1 0458b3f1368ca30ad19355d7db79eb406e2761fb SHA256 5d1336bd8e7ed8f67cfb304d72be04a5bcb18c221e4fbeb9ae68331f5e99d9ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJO3ZA0AAoJEEdUh39IaPFNndcIAJ2ng06US1PLFdEO6013+QGt
-6DAv264/qF2uD42JfypWCDcKlPfhsBMYI7KKDvS+vqcfcezzQk1bqEybwdZsbXQD
-FIp1nXtzJkBZbyNhx0HKJLCborSwPFiaRfYYs3V88y3Arzzk2vBa40NJo2FDgRhg
-1a7MVUgsjxXjLwA8Al51UYHLC68HynEzyQDQC44IQ3XjMOsy69TiNjbQJ5xOxwUh
-FRcakJIiUbsNEWBTLg8NRJNXYQxVAG7MEF8aPEyuq4d22fLQeQcpnehpJVI63Xy4
-JhGB/QHDN8b2EZKQU+F5MCWAJf5iamguWRVDX7xS5xCSCpeN1HgRm9lXc2K+0pE=
-=tQO2
+iQEcBAEBAgAGBQJO3ZD1AAoJEEdUh39IaPFNeXkH+gJ7rX5gzJM30UnJyi0PL2zp
+D5UKxHXVqmdMdIuILr9FoEQJWpY9zJPmrIlL7MsdifKmAfelQf5t3AUV7nvF4Xz9
+0a6pogjSJgANAE/1gl8cW2lzyfQKlGfXW5K7EtdFZeckBLnQHPrbwDG53xyOZ7bC
+5pI1HSjjRUJHyezDzdXg6yM1TzZ0I/7rUOa1LGOOJlFaBcILmmytvoP+ISXjmmN4
+dfLVdukN4pFVEBzAW11paiA5yL0ZdxfxFZPgzVMGfHfrbNnUhwKPkCn7V6hxjsOk
+L2zjPsl3fIElU5bLpvbR8JCVl6rteLioIfP6ueri1daR1yqCboFMENEd/0pLKtw=
+=EuA2
 -----END PGP SIGNATURE-----
diff --git a/www-client/midori/midori-0.4.2-r200.ebuild b/www-client/midori/midori-0.4.2-r200.ebuild
new file mode 100644
index 000000000000..7fff675f06b4
--- /dev/null
+++ b/www-client/midori/midori-0.4.2-r200.ebuild
@@ -0,0 +1,72 @@
+# 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-0.4.2-r200.ebuild,v 1.1 2011/12/06 03:50:25 ssuominen Exp $
+
+EAPI=4
+inherit eutils fdo-mime gnome2-utils python waf-utils
+
+PV_vala_version=0.14
+
+DESCRIPTION="A lightweight web browser based on WebKitGTK+"
+HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
+SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+IUSE="doc gnome libnotify nls +unique"
+
+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
+	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:${PV_vala_version}
+	dev-util/intltool
+	gnome-base/librsvg
+	doc? ( dev-util/gtk-doc )
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+
+	DOCS=( AUTHORS ChangeLog HACKING INSTALL TODO TRANSLATE )
+	HTML_DOCS=( data/faq.html data/faq.css )
+}
+
+src_configure() {
+	strip-linguas -i po
+
+	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 nls)
+}
+
+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
+}