gentoo Easter resync : 12.04.2020

3 files changed, 97 insertions, 0 deletions

diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest
index f24c016fd5e0..9e82a3ee66ff 100644
--- a/net-libs/gtk-vnc/Manifest
+++ b/net-libs/gtk-vnc/Manifest
@@ -1,3 +1,7 @@
+AUX 1.0.0-honor-python-ver.patch 691 BLAKE2B 1e7954d6bc2feffa97ec429bb96f0d5b6ef4e04eef977731db75bfde4a00d4afab35944a595131b0088569b17f577c41f0ce63987ddbeba5187ae7591f5e9cb4 SHA512 ca5e2495a13a5bedd29dcdfba4c03f74a65d46f964d861adb7d2bcdf73813fe64c456ab52d0ccbb9fc913d6d5c0a76a9d199c114b1f3850d2184e3c7959412f9
 DIST gtk-vnc-0.9.0.tar.xz 444736 BLAKE2B cf1afc0e856659012738060a584c72d7ad1b70459afd8bf92630d69cf32d380264814304a68a93d8a5a70d6573b6754658450005a2ea2b96f13ae03f9e87fcba SHA512 498b368eb53ac58172db280c80f9da71ce82b636c39f186046e4f674e44c574ff4b63c3f777acc79d32c17d70e4efcdc207768ed49b3d1842bc4b73618296215
+DIST gtk-vnc-1.0.0-patchset.tar.xz 9636 BLAKE2B 4f25fdf279e5a1718ea8dc42bdb59722630b363e4e289704b946ae788d593b5d95c56d0eb5315e30ff00c2eb4d3a9e5df366f74808f94e926a47c2f817b0f1ee SHA512 998771ceb28516f52bb083d872a1ad8aa22a7208c8a0ca94270f63d91cc7f7a0f99c4bb93f7a545d9a6c796fa063dd27b36a1cb9a3d7c9349a9d8372754ea929
+DIST gtk-vnc-1.0.0.tar.xz 215904 BLAKE2B 05ef0389c3ac307859228506adf55a5ed0f5d577078b82686ad97c9df180fc5c23d8dd030930c61f87b1bbd3cb6cee74c4485af4816b7b29fd53016c2d9b1d07 SHA512 63a40b9b284c4e46a92d5375ab3660b324ff27bfc572559d3b34d29fe4f7d24e976396b6688b8f3e3109d49dc5527075d128c43bb997507e68ddc0880b0ad148
 EBUILD gtk-vnc-0.9.0.ebuild 1695 BLAKE2B 88844526c4ff9ef740f82e349bd72e24fc3dcaca517b354d8764c282edeeb28683717d3f201f0da4c2b2232739ba0126114faa23cec74b3cb27ad5f1e2a7e779 SHA512 6f288b5d4b2e1149f15ed59657752ac2475b6c39be57a687d9ea17bb5fd6e0bc4dd9a98f7c099163f386705c2ef82a3bdd1f4a5b15b9a001e70a084328231376
+EBUILD gtk-vnc-1.0.0.ebuild 1854 BLAKE2B 8d6ff327a0058dbee31ae28fe75dc735ba5929344380f1b5d329811a3416e2f230bc4bb42b30e1e1d94397585e07b4e3cb02a403f29d352fe045949155081b23 SHA512 3c6f53b1e5b85f78a40cc740f127d317bcc417adf9972015ab86cf15ef4a4bd3d45ab5e7771bc1997ff35625b1a9abd8c4c15d127d1cc08c525ee6845cce15e7
 MISC metadata.xml 397 BLAKE2B 0e99084e903bd50b1228c59e87a97bbec3d6c2543328b9ac42587969cc402e93537c360ca8e1df2e5a9bb1129473e8d6c698b373b3e65ee7b322bb87f01baf71 SHA512 eeedc7da2c6292330fa47841afdbf4038d1c3bec1b2803bd462ea4b13c6cd88448274a0814675d3d85ef89f2fd1aa9c45344412a9742e26214dfdf9d51a63d06
diff --git a/net-libs/gtk-vnc/files/1.0.0-honor-python-ver.patch b/net-libs/gtk-vnc/files/1.0.0-honor-python-ver.patch
new file mode 100644
index 000000000000..f26a85719b08
--- /dev/null
+++ b/net-libs/gtk-vnc/files/1.0.0-honor-python-ver.patch
@@ -0,0 +1,26 @@
+From a51acc0c353959e8af06a031724a79cfe6b60963 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 5 Apr 2020 00:05:49 +0300
+Subject: [PATCH] meson: Find python explicitly to honor downstream python
+ choice
+
+---
+ src/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index 461d8d2..a09aee9 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -308,7 +308,7 @@ gtk_vnc_sources = gtk_vnc_gir_sources + gvnc_marshal + [
+   'vncdisplaykeymap.c',
+ ]
+ 
+-python = import('python').find_installation()
++python = import('python').find_installation('python3')
+ keymaps = [
+   'xorgevdev',
+   'xorgkbd',
+-- 
+2.20.1
+
diff --git a/net-libs/gtk-vnc/gtk-vnc-1.0.0.ebuild b/net-libs/gtk-vnc/gtk-vnc-1.0.0.ebuild
new file mode 100644
index 000000000000..ffd65be1853c
--- /dev/null
+++ b/net-libs/gtk-vnc/gtk-vnc-1.0.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome.org vala meson python-any-r1 xdg
+
+DESCRIPTION="VNC viewer widget for GTK"
+HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+introspection pulseaudio sasl +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.42.0:2
+	>=x11-libs/gdk-pixbuf-2.12.0:2
+	>=dev-libs/libgcrypt-1.5.0:0=
+	>=net-libs/gnutls-3.1.18:0=
+	>=sys-libs/zlib-1.2.5
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
+	>=x11-libs/gtk+-3.0.0:3[introspection?]
+	>=x11-libs/cairo-1.2.0
+	>=x11-libs/libX11-1.6.5
+	pulseaudio? ( >=media-sound/pulseaudio-10.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.56.0:= )
+"
+# Keymap databases code is generated with python3; configure picks up $PYTHON exported from python-any-r1_pkg_setup
+# perl for pod2man
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-lang/perl-5
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+	# Few fixes from origin/master + optionality patches filed as https://gitlab.gnome.org/GNOME/gtk-vnc/merge_requests/6
+	"${WORKDIR}"/patches
+	"${FILESDIR}"/${PV}-honor-python-ver.patch
+)
+
+src_prepare() {
+	vala_src_prepare
+	xdg_src_prepare
+	# Don't add -O2 explicitly to CFLAGS
+	sed -i -e "/'-O2'/d" meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use introspection)
+		$(meson_feature pulseaudio)
+		$(meson_feature sasl)
+		-Denable-werror=false
+		-Dwith-coroutine=auto # gthread on windows, libc ucontext elsewhere; neither has extra deps
+		$(meson_use vala with-vala)
+	)
+	meson_src_configure
+}