gentoo resync : 28.04.2019

8 files changed, 3 insertions, 428 deletions

diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index 1c894ca6f80c..0c58654404cb 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -1,10 +1,3 @@
-AUX midori-0.5.11-libsoup.patch 3311 BLAKE2B 4f77de58b28508941dd1033a9178cc54a8b9a3fb8b312aa23ff5dd306eba63008e9304a00e669cb2b90aedb505c2a432f7feaba390b7db4f700d8da3ead3b51c SHA512 987cc42e19aca9355facac4d4b91d5f6206d24dae6d816e4c39e81c8c6141f564742154c74d22c806aea0f0c0db807b606fc387f46011253736260b827b7a464
-AUX midori-0.5.11-vala-0.35.patch 5048 BLAKE2B 894ae8e212682d01a3591e9a76b4ca0e519baa7dcd6b1b20152170a29ba82ed33ef0bf864c10e7b5bd2a57e9965d25ec59f4dafcefdc9c8423a829c819c226ce SHA512 f21b7daeb77daec74b87bd04ccd9eab83dc69405b72435c928042f993259f74847819609f5710518cb7f1b96285d57febb0a93a4650feb5c0fc82013e3deec18
-DIST midori-v6.0.tar.gz 1823209 BLAKE2B dd00bef8da638d993c9918e991fa4f65d79b9f0d736b865895fae94f7f9d7552d671bda38cff933e65b7017cadfb810b7c180e00ba4e6f26abd471affc4cd903 SHA512 2b3e4808b1297a3ef8436b45ac38782e070658a0ecc62bcf8d0b2cf49f256cdad799ccc5d28df11ff595c042e8474fa2e87065d9a89cdb5a936237c44fdfd9e7
 DIST midori-v7.0.tar.gz 1827341 BLAKE2B e008be32851a3ee12744b7b4e686545a2f9cd84fc6f05a647744c512ea5286fdc1db3b1ec40f546208ffbca4ca8a179752f27b85d9060765a7612ac7c260c67f SHA512 4110d1566ba8b0979c29f1c3a95af3da4cba884f44a1305403d8951f7f2dfb17946c3c7326eebafc111738950c907d06cc6c54ce670cde321da890d8b9ced051
-DIST midori_0.5.11_all_.tar.bz2 1428791 BLAKE2B c19872b3271360877b2affa0ab86d93884895037a72cb9182a44a597bf930394153fea5a744c1cf225f2c4bd8f3c691c5622d0b4abdb33c202c4aa1da48b5ee5 SHA512 237310d1f0bf70796474b9ec5be6755927e66acd2b527d04db39696c5e2f7ea2d11f7deb51ba3f5c151a450ab71e642282a1386e34253aaea1d8602ce76ac87d
-EBUILD midori-0.5.11-r2.ebuild 1829 BLAKE2B 6260e9ff46b0ef8181d182bd7b7c0ff0657f73e09877dd3fa2e337a2f36e0bd07aa53c08e7c8ecaf545431c1ff9d8c6ee60ff6ef9a8c48d49b5b2a48a4308a3a SHA512 89b3410d62abb4595d279d535292d287ae7f9916392ac9216e8b8902071483d2367ae1e3923a5b59b5e66e8d3272bb50e1fd2d0ed088b79839bb6e854504a4d7
-EBUILD midori-0.5.11-r3.ebuild 1881 BLAKE2B b0061cf961a99aae14b4a4311522543d941d293e1028498856dd9b3e9479543b9349408cff902255675308ea6c07c5282dcb1907ef9e2fa20aefbf5ce6c01206 SHA512 58f7f80b7dbd7008fc8e39379e32e5396fd53cfab41a2b6a651bf4d6c7b6d888c321ae47e272e2206235a36289bd8135eb730af3f685efbafd3b9f1b6381aa55
-EBUILD midori-6.0.ebuild 1370 BLAKE2B 0686400e4b547457c4085845ecccf28d641f5deff39976771933b4f3bdc99662024bd13c839403438e6533518ab5c1b39daa25c70e21853d513c5203da349f3e SHA512 cef8ec2feeccc0e36ec5be88efc44efabbf41bb2774bb9348c42026059616010be78f64f692de678617e1fe77d61cb5a369b4987258f873ee7f4ecac52195e5e
-EBUILD midori-7.0.ebuild 1273 BLAKE2B 43bfcc4daf859ae4ea51496e08a296504c8d90fee20cb249ca726e86690ae91d9a7dd9081297634bd87412a3efa9a7d44ae962d40c36eec60cd895476a827946 SHA512 baa0e2ad1a4f1808b1c34f8a940ddd775f24567c0110f5be66de3c719c452a96c7f3498b79982e0517be742bdc27266e7bf2ae119d53f1bc4385cc877281aa34
-MISC metadata.xml 366 BLAKE2B e64689abe46fbfea37056e542427ea966cfed6ee5a7f70b89fe0e3e48c5cc5c6c0505f5cdd8c78449a56ceb2c7e8b51469f9b0bbdf8505b2fcc9e24df09e8a6b SHA512 af119fa95a79e7e74ff02d5da3b8daaf48ea562f7a3f47a60e7f73790350e45c8a8fac6a165230d45adf7d1aabeb69672fd156f6631d2b32a86b6cf309b94ef2
+EBUILD midori-7.0.ebuild 1271 BLAKE2B 4175ad4b6471b44e1e0d11087d1cf8f9fbc6d514ed30f800f1fe5317c4d10c49b96e8c6a893210b3bcca9b9f10293409ae1016f92b7a5601241e8ba389c37d25 SHA512 8932fe6d44d4c6e687af849bd2e5e1832e84d93ba937a7e2b49fc4724022939f4d2c046c1d1de3e1779237fe1c3b545e0b4fc4e3b67fd897b25659de21d4db89
+MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/www-client/midori/files/midori-0.5.11-libsoup.patch b/www-client/midori/files/midori-0.5.11-libsoup.patch
deleted file mode 100644
index b560075f8106..000000000000
--- a/www-client/midori/files/midori-0.5.11-libsoup.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -ur midori-0.5.11/CMakeLists.txt midori-0.5.11_p/CMakeLists.txt
---- midori-0.5.11/CMakeLists.txt	2015-08-30 13:56:26.000000000 +0200
-+++ midori-0.5.11_p/CMakeLists.txt	2016-08-21 21:10:30.117983251 +0200
-@@ -112,13 +112,13 @@
-                   sqlite3>=3.6.19
-                   gmodule-2.0
-                   gio-2.0>=2.32.3
--                  libsoup-gnome-2.4>=2.37.1
-+                  libsoup-2.4>=2.37.1
-                   )
- add_definitions("-DHAVE_LIBXML")
- add_definitions("-DGIO_VERSION=\"${DEPS_gio-2.0_VERSION}\"")
--add_definitions("-DLIBSOUP_VERSION=\"${DEPS_libsoup-gnome-2.4_VERSION}\"")
-+add_definitions("-DLIBSOUP_VERSION=\"${DEPS_libsoup-2.4_VERSION}\"")
- set(PKGS posix linux libxml-2.0 sqlite3 gmodule-2.0 gio-2.0 libsoup-2.4)
--if (${DEPS_libsoup-gnome-2.4_VERSION} VERSION_GREATER "2.40.0")
-+if (${DEPS_libsoup-2.4_VERSION} VERSION_GREATER "2.40.0")
-     # valac 0.16 didn't have the bindings yet
-     # For consistency we need to ensure C code makes the same assumptions
-     if (${VALA_VERSION} VERSION_GREATER "0.17.0")
-@@ -126,7 +126,7 @@
-         set(VALAFLAGS ${VALAFLAGS} -D HAVE_LIBSOUP_2_40_0)
-     endif ()
- endif ()
--if (${DEPS_libsoup-gnome-2.4_VERSION} VERSION_GREATER "2.48.0")
-+if (${DEPS_libsoup-2.4_VERSION} VERSION_GREATER "2.48.0")
-     add_definitions("-DHAVE_LIBSOUP_2_48_0")
-     set(VALAFLAGS ${VALAFLAGS} -D HAVE_LIBSOUP_2_48_0)
- endif ()
-diff -ur midori-0.5.11/extensions/cookie-manager/cookie-manager.c midori-0.5.11_p/extensions/cookie-manager/cookie-manager.c
---- midori-0.5.11/extensions/cookie-manager/cookie-manager.c	2015-08-30 13:56:26.000000000 +0200
-+++ midori-0.5.11_p/extensions/cookie-manager/cookie-manager.c	2016-08-19 23:19:20.000000000 +0200
-@@ -12,7 +12,7 @@
- #include "config.h"
- #include <midori/midori.h>
- #include "katze/katze.h"
--#include <libsoup/soup-cookie-jar-sqlite.h>
-+#include <libsoup/soup-cookie-jar-db.h>
- 
- #include "cookie-manager.h"
- #include "cookie-manager-page.h"
-@@ -282,7 +282,7 @@
- 	/* setup soup */
- #ifdef HAVE_WEBKIT2
- 	gchar *filename = midori_paths_get_config_filename_for_writing ("cookies.db");
--	priv->jar = soup_cookie_jar_sqlite_new (filename, FALSE);
-+	priv->jar = soup_cookie_jar_db_new (filename, FALSE);
- 	g_free(filename);
- #else
- 	SoupSession *session = webkit_get_default_session();
-diff -ur midori-0.5.11/midori/midori-session.c midori-0.5.11_p/midori/midori-session.c
---- midori-0.5.11/midori/midori-session.c	2015-08-30 13:56:26.000000000 +0200
-+++ midori-0.5.11_p/midori/midori-session.c	2016-08-19 23:56:30.000000000 +0200
-@@ -17,8 +17,8 @@
- #include "sokoke.h"
- 
- #include <glib/gi18n-lib.h>
--#include <libsoup/soup-cookie-jar-sqlite.h>
--#include <libsoup/soup-gnome-features.h>
-+#include <libsoup/soup-cookie-jar-db.h>
-+#include <libsoup/soup-types.h>
- 
-     #define LIBSOUP_USE_UNSTABLE_REQUEST_API
-     #include <libsoup/soup-cache.h>
-@@ -297,7 +297,7 @@
-     g_object_unref (feature);
- 
-     katze_assign (config_file, midori_paths_get_config_filename_for_writing ("cookies.db"));
--    jar = soup_cookie_jar_sqlite_new (config_file, FALSE);
-+    jar = soup_cookie_jar_db_new (config_file, FALSE);
-     soup_session_add_feature (session, SOUP_SESSION_FEATURE (jar));
-     g_signal_connect (jar, "changed",
-                       G_CALLBACK (midori_session_cookie_jar_changed_cb), settings);
diff --git a/www-client/midori/files/midori-0.5.11-vala-0.35.patch b/www-client/midori/files/midori-0.5.11-vala-0.35.patch
deleted file mode 100644
index 4192b6084934..000000000000
--- a/www-client/midori/files/midori-0.5.11-vala-0.35.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-Patch provided by Sander Sweers on https://bugs.gentoo.org/628108#c9
-
-diff -ur midori-0.5.11.orig/extensions/adblock/widgets.vala midori-0.5.11/extensions/adblock/widgets.vala
---- midori-0.5.11.orig/extensions/adblock/widgets.vala	2015-08-30 13:56:26.000000000 +0200
-+++ midori-0.5.11/extensions/adblock/widgets.vala	2017-09-30 01:07:04.033922383 +0200
-@@ -227,7 +227,7 @@
-                             liststore.get (iter, 0, out sub);
-                             if (sub.mutable) {
-                                 config.remove (sub);
--                                liststore.remove (iter);
-+                                liststore.remove (ref iter);
-                                 return true;
-                             }
-                         }
-diff -ur midori-0.5.11.orig/extensions/apps.vala midori-0.5.11/extensions/apps.vala
---- midori-0.5.11.orig/extensions/apps.vala	2015-08-30 13:56:26.000000000 +0200
-+++ midori-0.5.11/extensions/apps.vala	2017-09-30 01:08:12.831916408 +0200
-@@ -265,7 +265,7 @@
-                             store.get (iter, 0, out launcher);
-                             try {
-                                 launcher.file.trash (null);
--                                store.remove (iter);
-+                                store.remove (ref iter);
- 
-                                 string filename = Midori.Download.clean_filename (launcher.name);
- #if HAVE_WIN32
-diff -ur midori-0.5.11.orig/extensions/history-list.vala midori-0.5.11/extensions/history-list.vala
---- midori-0.5.11.orig/extensions/history-list.vala	2015-08-30 13:56:26.000000000 +0200
-+++ midori-0.5.11/extensions/history-list.vala	2017-09-30 01:10:25.137904917 +0200
-@@ -223,7 +223,7 @@
-                     FixMe: the retrun value of `Gtk.ListStore.remove` should be checked
-                     Note:  in some cases the return value of `Gtk.ListStore.remove` is wrong
-                 */
--                model.remove (iter);
-+                model.remove (ref iter);
-                 this.browser.close_tab (view);
-                 if (length > 2)
-                     this.resize_treeview ();
-diff -ur midori-0.5.11.orig/extensions/notes.vala midori-0.5.11/extensions/notes.vala
---- midori-0.5.11.orig/extensions/notes.vala	2015-08-30 13:56:26.000000000 +0200
-+++ midori-0.5.11/extensions/notes.vala	2017-09-30 01:09:14.703911034 +0200
-@@ -116,7 +116,7 @@
-                     if (current_note == note) {
-                         current_note = null;
-                     }
--                    notes_list_store.remove (iter);
-+                    notes_list_store.remove (ref iter);
-                     break;
-                 }
-             } while (notes_list_store.iter_next (ref iter));
-diff -ur midori-0.5.11.orig/extensions/transfers.vala midori-0.5.11/extensions/transfers.vala
---- midori-0.5.11.orig/extensions/transfers.vala	2015-08-30 13:56:26.000000000 +0200
-+++ midori-0.5.11/extensions/transfers.vala	2017-09-30 01:05:00.916933075 +0200
-@@ -275,7 +275,7 @@
-                     Transfer found;
-                     store.get (iter, 0, out found);
-                     if (transfer == found) {
--                        store.remove (iter);
-+                        store.remove (ref iter);
-                         break;
-                     }
-                 } while (store.iter_next (ref iter));
-@@ -455,7 +455,7 @@
-                 if (notifications.length () == 1)
-                     msg = _("The file '<b>%s</b>' has been downloaded.").printf (filename);
-                 else
--                    msg = _("'<b>%s</b>' and %d other files have been downloaded.").printf (filename, notifications.length ());
-+                    msg = _("'<b>%s</b>' and %d other files have been downloaded.").printf (filename, (int) notifications.length ());
-                 get_app ().send_notification (_("Transfer completed"), msg);
-                 notifications = new GLib.List<string> ();
-             }
-diff -ur midori-0.5.11.orig/midori/midori-notebook.vala midori-0.5.11/midori/midori-notebook.vala
---- midori-0.5.11.orig/midori/midori-notebook.vala	2015-08-30 13:56:26.000000000 +0200
-+++ midori-0.5.11/midori/midori-notebook.vala	2017-09-30 00:49:47.947012362 +0200
-@@ -10,7 +10,7 @@
- */
- 
- namespace Midori {
--    protected class Tally : Gtk.EventBox {
-+    internal class Tally : Gtk.EventBox {
-         public Midori.Tab tab { get; set; }
-         Gtk.Spinner spinner;
-         public Gtk.Label label;
-@@ -22,7 +22,7 @@
-         public bool close_button_left { get; set; default = false; }
-         public bool close_button_visible { get; set; default = false; }
- 
--        protected Tally (Midori.Tab tab) {
-+        internal Tally (Midori.Tab tab) {
-             this.tab = tab;
-             box = new Gtk.HBox (false, 1);
-             add (box);
-@@ -155,7 +155,7 @@
-         int last_tab_size = 0;
- 
- #if !HAVE_GTK3
--        static const string style_fixup = """
-+        const string style_fixup = """
-             style "midori-close-button-style"
-             {
-             GtkWidget::focus-padding = 0
diff --git a/www-client/midori/metadata.xml b/www-client/midori/metadata.xml
index eedc283b9c40..359901b31db4 100644
--- a/www-client/midori/metadata.xml
+++ b/www-client/midori/metadata.xml
@@ -5,7 +5,4 @@
     <email>xfce@gentoo.org</email>
     <name>XFCE Team</name>
   </maintainer>
-  <use>
-    <flag name="granite">Enable support for the elementary library <pkg>dev-libs/granite</pkg></flag>
-  </use>
 </pkgmetadata>
diff --git a/www-client/midori/midori-0.5.11-r2.ebuild b/www-client/midori/midori-0.5.11-r2.ebuild
deleted file mode 100644
index ac0b850f8946..000000000000
--- a/www-client/midori/midori-0.5.11-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-
-VALA_MAX_API_VERSION=0.34
-
-inherit cmake-utils gnome2-utils pax-utils python-any-r1 vala virtualx xdg-utils
-
-DESCRIPTION="A lightweight web browser based on WebKitGTK+"
-HOMEPAGE="https://www.midori-browser.org/"
-SRC_URI="http://www.${PN}-browser.org/downloads/${PN}_${PV}_all_.tar.bz2"
-
-KEYWORDS="~amd64 ~arm ~mips x86 ~x86-fbsd"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0"
-IUSE="doc granite xscreensaver +jit"
-
-RDEPEND="
-	>=app-crypt/gcr-3:=[gtk]
-	>=dev-db/sqlite-3.6.19:3
-	>=dev-libs/glib-2.32.3:2
-	dev-libs/libxml2
-	>=net-libs/libsoup-2.38:2.4
-	>=x11-libs/libnotify-0.7
-	>=x11-libs/gtk+-3.10.0:3
-	>=net-libs/webkit-gtk-2.3.91:4[jit=,opengl]
-	granite? ( >=dev-libs/granite-0.2 )
-	xscreensaver? (
-		x11-libs/libX11
-		x11-libs/libXScrnSaver )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	$(vala_depend)
-	dev-util/intltool
-	gnome-base/librsvg
-	sys-devel/gettext
-	doc? ( dev-util/gtk-doc )
-"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-libsoup.patch #587448
-
-	cmake-utils_src_prepare
-	vala_src_prepare
-	sed -i -e '/^install/s:COPYING:HACKING TODO TRANSLATE:' CMakeLists.txt || die
-}
-
-src_configure() {
-	strip-linguas -i po
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DUSE_APIDOCS="$(usex doc)"
-		-DUSE_GRANITE="$(usex granite)"
-		-DUSE_ZEITGEIST=OFF
-		-DVALA_EXECUTABLE="${VALAC}"
-		-DUSE_GTK3=ON
-		-DHALF_BRO_INCOM_WEBKIT2=ON
-	)
-
-	use xscreensaver || mycmakeargs+=( -DXSS=XSS-NOTFOUND )
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	virtx cmake-utils_src_test
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/www-client/midori/midori-0.5.11-r3.ebuild b/www-client/midori/midori-0.5.11-r3.ebuild
deleted file mode 100644
index 7d195ae23f63..000000000000
--- a/www-client/midori/midori-0.5.11-r3.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-
-VALA_MIN_API_VERSION=0.36
-
-inherit cmake-utils gnome2-utils pax-utils python-any-r1 vala virtualx xdg-utils
-
-DESCRIPTION="A lightweight web browser based on WebKitGTK+"
-HOMEPAGE="https://www.midori-browser.org/"
-SRC_URI="http://www.${PN}-browser.org/downloads/${PN}_${PV}_all_.tar.bz2"
-
-KEYWORDS="~amd64 ~arm ~mips ~x86 ~x86-fbsd"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0"
-IUSE="doc granite xscreensaver +jit"
-
-RDEPEND="
-	>=app-crypt/gcr-3:=[gtk]
-	>=dev-db/sqlite-3.6.19:3
-	>=dev-libs/glib-2.32.3:2
-	dev-libs/libxml2
-	>=net-libs/libsoup-2.38:2.4
-	>=x11-libs/libnotify-0.7
-	>=x11-libs/gtk+-3.10.0:3
-	>=net-libs/webkit-gtk-2.3.91:4[jit=,opengl]
-	granite? ( >=dev-libs/granite-0.2 )
-	xscreensaver? (
-		x11-libs/libX11
-		x11-libs/libXScrnSaver )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	$(vala_depend)
-	dev-util/intltool
-	gnome-base/librsvg
-	sys-devel/gettext
-	doc? ( dev-util/gtk-doc )
-"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-libsoup.patch #587448
-	eapply "${FILESDIR}"/${P}-vala-0.35.patch #628108
-
-	cmake-utils_src_prepare
-	vala_src_prepare
-	sed -i -e '/^install/s:COPYING:HACKING TODO TRANSLATE:' CMakeLists.txt || die
-}
-
-src_configure() {
-	strip-linguas -i po
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DUSE_APIDOCS="$(usex doc)"
-		-DUSE_GRANITE="$(usex granite)"
-		-DUSE_ZEITGEIST=OFF
-		-DVALA_EXECUTABLE="${VALAC}"
-		-DUSE_GTK3=ON
-		-DHALF_BRO_INCOM_WEBKIT2=ON
-	)
-
-	use xscreensaver || mycmakeargs+=( -DXSS=XSS-NOTFOUND )
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	virtx cmake-utils_src_test
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/www-client/midori/midori-6.0.ebuild b/www-client/midori/midori-6.0.ebuild
deleted file mode 100644
index e344c721d0e5..000000000000
--- a/www-client/midori/midori-6.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VALA_MIN_API_VERSION=0.36
-
-inherit cmake-utils eapi7-ver eutils gnome2-utils vala xdg-utils
-
-MY_P=${PN}-v${PV}
-DESCRIPTION="A lightweight web browser based on WebKitGTK+"
-HOMEPAGE="https://www.midori-browser.org/"
-SRC_URI="https://github.com/midori-browser/core/releases/download/v$(ver_cut 1)/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
-IUSE="+jit"
-
-RDEPEND="
-	>=app-crypt/gcr-3:=[gtk,vala]
-	>=dev-db/sqlite-3.6.19:3
-	>=dev-libs/glib-2.48.0:2
-	dev-libs/libpeas[gtk]
-	dev-libs/libxml2
-	>=net-libs/libsoup-2.38:2.4[vala]
-	>=net-libs/webkit-gtk-2.16.6:4[introspection,jit=,opengl]
-	>=x11-libs/libnotify-0.7
-	>=x11-libs/gtk+-3.12.0:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-util/intltool
-	sys-devel/gettext
-"
-
-S=${WORKDIR}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	vala_src_prepare
-	sed -i -e 's:libsoup-gnome:libsoup:' CMakeLists.txt || die
-	sed -i -e '/^install/s:COPYING::' CMakeLists.txt || die
-}
-
-src_configure() {
-	strip-linguas -i po/
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DVALA_EXECUTABLE="${VALAC}"
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/www-client/midori/midori-7.0.ebuild b/www-client/midori/midori-7.0.ebuild
index 53dc024ca0a9..c5ef2c486c5e 100644
--- a/www-client/midori/midori-7.0.ebuild
+++ b/www-client/midori/midori-7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/midori-browser/core/releases/download/v$(ver_cut 1)/
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
+KEYWORDS="amd64 ~arm ~mips x86"
 IUSE=""
 
 RDEPEND="