gentoo resync : 15.05.2018

4 files changed, 215 insertions, 8 deletions

diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index 02db98307398..fc7fd794069e 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -1,4 +1,6 @@
 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_0.5.11_all_.tar.bz2 1428791 BLAKE2B c19872b3271360877b2affa0ab86d93884895037a72cb9182a44a597bf930394153fea5a744c1cf225f2c4bd8f3c691c5622d0b4abdb33c202c4aa1da48b5ee5 SHA512 237310d1f0bf70796474b9ec5be6755927e66acd2b527d04db39696c5e2f7ea2d11f7deb51ba3f5c151a450ab71e642282a1386e34253aaea1d8602ce76ac87d
-EBUILD midori-0.5.11-r2.ebuild 1589 BLAKE2B cb500c710ba40e439e5f06de14fe58c9a0e77b9b3360d53958ccaa312afe106adb8e7e97580b2cd8e2d87ea8c2c67755c1ee3578a4bc5230ed252e7b85b79bcf SHA512 4c70e8a0b78aee9e613c61e6a1a240f0fa656c25a64bf6dac3db1fe65fd27b6c96a74573d68b274bdbe8b6ccd711e65ff2b63df375babf35a325756bb3b28fe8
+EBUILD midori-0.5.11-r2.ebuild 1824 BLAKE2B f39d27f55a24a9553ad4a6ca4d3aa344ea0d646291c993468f64dbedfea7a2b9c81cfcc9de4826b036648f0e3c721df6fdcc7b043a67bffac74f940694fd25fa SHA512 d9032de0ac8157d88b53f573a37f5156b73d541b7086a26c7ee98b188fbbce337c58f886689dc5860654b76d8d3ea52ca73607ea870bc41d42354c58edb810c9
+EBUILD midori-0.5.11-r3.ebuild 1876 BLAKE2B 6acc263207529706146b6de8987d3fe341bf46908d60c40feba1cbad625ca9d915bd2ce01e14d93fd8b2fdb3fdc64162992769a0e8dd692687e4a2d120d682fc SHA512 7a758ba109c28a738253be5e9f12b8c4ece87495e239bb6d1ecaedde3afc4263d71713ee531cc9960f245a8a8b686f69615ad78248c1e04e685ca08240e29b15
 MISC metadata.xml 366 BLAKE2B e64689abe46fbfea37056e542427ea966cfed6ee5a7f70b89fe0e3e48c5cc5c6c0505f5cdd8c78449a56ceb2c7e8b51469f9b0bbdf8505b2fcc9e24df09e8a6b SHA512 af119fa95a79e7e74ff02d5da3b8daaf48ea562f7a3f47a60e7f73790350e45c8a8fac6a165230d45adf7d1aabeb69672fd156f6631d2b32a86b6cf309b94ef2
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
new file mode 100644
index 000000000000..4192b6084934
--- /dev/null
+++ b/www-client/midori/files/midori-0.5.11-vala-0.35.patch
@@ -0,0 +1,101 @@
+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/midori-0.5.11-r2.ebuild b/www-client/midori/midori-0.5.11-r2.ebuild
index 84149ddb07ec..6b7ef90da648 100644
--- a/www-client/midori/midori-0.5.11-r2.ebuild
+++ b/www-client/midori/midori-0.5.11-r2.ebuild
@@ -6,7 +6,9 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE='threads(+)'
 
-inherit gnome2 pax-utils python-any-r1 cmake-utils vala
+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="http://www.midori-browser.org/"
@@ -25,10 +27,12 @@ RDEPEND="
 	dev-libs/libxml2
 	>=net-libs/libsoup-2.38:2.4
 	>=x11-libs/libnotify-0.7
-	xscreensaver? ( x11-libs/libXScrnSaver )
 	>=x11-libs/gtk+-3.10.0:3
 	>=net-libs/webkit-gtk-2.3.91:4[jit=]
 	granite? ( >=dev-libs/granite-0.2 )
+	xscreensaver? (
+		x11-libs/libX11
+		x11-libs/libXScrnSaver )
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
@@ -47,7 +51,6 @@ src_prepare() {
 	eapply "${FILESDIR}"/${P}-libsoup.patch #587448
 
 	cmake-utils_src_prepare
-	gnome2_src_prepare
 	vala_src_prepare
 	sed -i -e '/^install/s:COPYING:HACKING TODO TRANSLATE:' CMakeLists.txt || die
 }
@@ -59,15 +62,27 @@ src_configure() {
 		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
 		-DUSE_APIDOCS="$(usex doc)"
 		-DUSE_GRANITE="$(usex granite)"
-		-DUSE_XSCREENSAVER="$(usex xscreensaver)"
+		-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_install() {
-	cmake-utils_src_install
+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
new file mode 100644
index 000000000000..f7bfd147bf80
--- /dev/null
+++ b/www-client/midori/midori-0.5.11-r3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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="http://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=]
+	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
+}