gentoo resync : 02.02.2022

6 files changed, 3 insertions, 194 deletions

diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest
index 4471a2f7f5d8..ed9cecb23de6 100644
--- a/net-libs/gtk-vnc/Manifest
+++ b/net-libs/gtk-vnc/Manifest
@@ -1,8 +1,3 @@
-AUX gtk-vnc-1.2.0-build-improve-with-coroutine-auto-choice.patch 1692 BLAKE2B 6ac0db2a08ec541bb213099e19a67eb7d295b8439c0562032de964343b4c698e6dea3227b0e4fff1dbb5bd3bde715d1bc288ed70b7efe5972ad78407213bc331 SHA512 02c3294e7e94a7f0bc2223c59362351a7256a5934e8c2b9304d226be7d289f2759c9222c2d715364438669048178ad722bcff8c8f31049bd7fa0c1b9780361ce
-AUX gtk-vnc-1.2.0-meson-Find-python-explicitly-to-honor-downstream-pyt.patch 755 BLAKE2B 95934ecb04553fd3153a2d0b81e52a487f922b888868d395a423e28f2d94c1012f9cda4025d79e855e371161a191c6c7b9c6dd6fc8acd603f91286ef9492dac3 SHA512 060ba2f9a95ae6fa790b6481acc3d23b93220b733b1e2966e80c33a7a802dbdf84a55023da381efd037b23cb1ca698251fc6b3779debfe7bf21b9e5ce5c54d76
-AUX gtk-vnc-1.2.0-meson-Fix-configuration-failure-with-Dwith-vala-disa.patch 1052 BLAKE2B 8ba4a7c553bf2af5a4cb6fde0daaa990db67f6fc105d64b03c555f2a091063249dddf657d03907f4d63220dd26d42d10e9be01e766459399b1a7ce4b824e62ea SHA512 d288723785d143bd306b0ff85d25658709f22a75d5a294b43b3e45ef8a84f40bbd00017b84da776453097a218f642d337c2308ca965b0cde0a1a3e97f3b6bae3
-DIST gtk-vnc-1.2.0.tar.xz 218024 BLAKE2B 8e13886826eebc3261271b94e15c504f82b15681417e70cc6b54b824ceff4de20a470460c5176abb2df04f325389a08032f40b49cfc3429c290d6d7255fc56d2 SHA512 830c614afa6540397352da864ad32a5687ccce5dc1e2150220c9a7fc3c7b0fbcbb3770e06b5fed75602d830bc9a9d40855fa8b6d8b65f740fc7a53bbdfce6edb
 DIST gtk-vnc-1.3.0.tar.xz 220488 BLAKE2B ea5070cc396fe4ef52fe980b766658f1a4f82eb7dec52856ab79836363c8fdb48827d52c0df7edb2c943f5087fcfd87898aa43457f7cbf5a544a4c7063f84f3d SHA512 ff25c19a1cbd4588990f1f3a2448fd2e0b694b933ca1a7be9565188db78055efe13f90ad1243bf8237d6a29d38987d7b3e77344e50d09191207b09200b01f5df
-EBUILD gtk-vnc-1.2.0.ebuild 1726 BLAKE2B df068d3bea9685e002579f981cda026260b159948cf127f8152b10c0f102acb43d7a065b79a3d08cd1922bd661f4bb69a0c35450923f5896bbfc92d6ef9ac96b SHA512 20a13ba3044552513299c611bb35b732aca2cced2ce218e9b56947f9386c14acf990119844e09bb09172dd84b889c6665f3361ff5807f25f7dc0f9a4fa9780cb
-EBUILD gtk-vnc-1.3.0.ebuild 1498 BLAKE2B 52b0044d5f482876c75ffa54ba9f8574410b4884ca4a1080774099d6e60c980720a63d847614e599e3ec9c5876fd5972aab712a3103b661ed40b413473d50489 SHA512 03a96ebfabf66ac4544250c425925880e92ad137218aa59d523d3e548f4e56522a2915cd724643e891721d55f0517913fc128956305cdae9e3c6550c80e0b49f
+EBUILD gtk-vnc-1.3.0.ebuild 1496 BLAKE2B adce8166d8ea3b5e421e0e38cd1b634d6bff08c1ac081b0f8198446d7615c1711cfecdd8e6322d7c22827d1289f3b8556fa6e453dad3ed967980169486585dff SHA512 0bd744d6a8c66bd0e74af7ed430a51c22b9d115a9c84c0ed6b327d23f1da4fab1d33a30632f336364a9427aaf39b557a1ed7dc88a8eeb3a713ffeffb03a0bdde
 MISC metadata.xml 398 BLAKE2B f3f6610cc4d7266437aaffb6278d79222d751634d79e275dc34547f95eaa826fc47a991b03cff5d7c9350314f876da54bb1322f6dd6e890e266a9e16b892b30c SHA512 953c1714f9dfaaf81e8dc27efa2758f5b0707dfe8594ef6fffa6da80aee0bfbd0c6d2c830d3459d4ba6bf36206ee55f4af5ee23f9f0845d1d1ee231cb8b8a352
diff --git a/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-build-improve-with-coroutine-auto-choice.patch b/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-build-improve-with-coroutine-auto-choice.patch
deleted file mode 100644
index eba775dd3a52..000000000000
--- a/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-build-improve-with-coroutine-auto-choice.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From e540fbc34d6bbfe3e84f1d9c33deaacc2326c7c9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jakub=20Jank=C5=AF?= <jjanku@redhat.com>
-Date: Mon, 26 Apr 2021 17:38:13 +0200
-Subject: [PATCH 1/3] build: improve --with-coroutine=auto choice
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When the required ucontext functions aren't found, switch to gthread
-coroutines instead of failing during the build.
-
-These functions are absent from the POSIX.1-2008.
-
-Fixes: https://gitlab.gnome.org/GNOME/gtk-vnc/-/issues/11
-
-Signed-off-by: Jakub Janků <jjanku@redhat.com>
----
- meson.build | 17 ++++++++++++++++-
- 1 file changed, 16 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 8052d43..e9829e6 100644
---- a/meson.build
-+++ b/meson.build
-@@ -43,8 +43,20 @@ cc = meson.get_compiler('c')
- 
- coroutine = get_option('with-coroutine')
- 
-+uctx_args = []
-+if host_machine.system() == 'darwin'
-+  uctx_args += ['-D_XOPEN_SOURCE=600']
-+endif
-+has_ucontext = true
-+foreach uctx_func : ['makecontext', 'swapcontext', 'getcontext']
-+  if not cc.has_function(uctx_func, prefix: '#include <ucontext.h>', args: uctx_args)
-+    has_ucontext = false
-+    break
-+  endif
-+endforeach
-+
- if coroutine == 'auto'
--  if host_machine.system() == 'windows'
-+  if host_machine.system() == 'windows' or not has_ucontext
-     coroutine = 'gthread'
-   else
-     coroutine = 'ucontext'
-@@ -52,6 +64,9 @@ if coroutine == 'auto'
- endif
- 
- if coroutine == 'ucontext'
-+  if not has_ucontext
-+    error('ucontext requested, but not available')
-+  endif
-   conf_data.set('WITH_UCONTEXT', true)
- elif coroutine != 'gthread'
-   error('Unknown coroutine backend')
--- 
-2.26.3
-
diff --git a/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Find-python-explicitly-to-honor-downstream-pyt.patch b/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Find-python-explicitly-to-honor-downstream-pyt.patch
deleted file mode 100644
index bd72b5727927..000000000000
--- a/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Find-python-explicitly-to-honor-downstream-pyt.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://gitlab.gnome.org/GNOME/gtk-vnc/-/merge_requests/15
-
-From 4609ad35b6dc11f016ac3a50158eeef7f19d9889 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 5 Apr 2020 00:05:49 +0300
-Subject: [PATCH 3/3] 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 5306fb9..247c597 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -319,7 +319,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.26.3
-
diff --git a/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Fix-configuration-failure-with-Dwith-vala-disa.patch b/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Fix-configuration-failure-with-Dwith-vala-disa.patch
deleted file mode 100644
index fd305f777c5d..000000000000
--- a/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Fix-configuration-failure-with-Dwith-vala-disa.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://gitlab.gnome.org/GNOME/gtk-vnc/-/merge_requests/14
-
-From bdab05584bab5c2ecdd508df49b03e80aedd19fc Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Wed, 28 Apr 2021 17:16:54 -0400
-Subject: [PATCH 2/3] meson: Fix configuration failure with
- -Dwith-vala=disabled
-
-Otherwise with_vala is not defined, and meson setup results in
-
-    src/meson.build:169:5: ERROR: Unknown variable "with_vala".
----
- meson.build | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index e9829e6..777876c 100644
---- a/meson.build
-+++ b/meson.build
-@@ -318,12 +318,11 @@ gir = find_program('g-ir-scanner', required: get_option('introspection'))
- with_gir = gir.found()
- 
- vala_opt = get_option('with-vala')
-+with_vala = false
- if not vala_opt.disabled()
-   if not with_gir
-     if vala_opt.enabled()
-       error('Vala API requires GObject introspection (-Dintrospection=true)')
--    else
--      with_vala = false
-     endif
-   else
-     with_vala = add_languages('vala', required: vala_opt)
--- 
-2.26.3
-
diff --git a/net-libs/gtk-vnc/gtk-vnc-1.2.0.ebuild b/net-libs/gtk-vnc/gtk-vnc-1.2.0.ebuild
deleted file mode 100644
index e879d2277a27..000000000000
--- a/net-libs/gtk-vnc/gtk-vnc-1.2.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit gnome.org vala meson python-any-r1 xdg
-
-DESCRIPTION="VNC viewer widget for GTK"
-HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc"
-
-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.56.0:2
-	>=x11-libs/gdk-pixbuf-2.36.0:2
-	>=dev-libs/libgcrypt-1.8.0:0=
-	>=net-libs/gnutls-3.6.0:0=
-	>=sys-libs/zlib-1.2.11
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.27 )
-	>=x11-libs/gtk+-3.22.0:3[introspection?]
-	>=x11-libs/cairo-1.15.0
-	>=x11-libs/libX11-1.6.5
-	pulseaudio? ( >=media-sound/pulseaudio-11.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=(
-	"${FILESDIR}"/${P}-build-improve-with-coroutine-auto-choice.patch
-	"${FILESDIR}"/${P}-meson-Find-python-explicitly-to-honor-downstream-pyt.patch
-	"${FILESDIR}"/${P}-meson-Fix-configuration-failure-with-Dwith-vala-disa.patch
-)
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature introspection)
-		$(meson_feature pulseaudio)
-		$(meson_feature sasl)
-		-Dwith-coroutine=auto # gthread on windows, libc ucontext elsewhere; neither has extra deps
-		$(meson_feature vala with-vala)
-	)
-	meson_src_configure
-}
diff --git a/net-libs/gtk-vnc/gtk-vnc-1.3.0.ebuild b/net-libs/gtk-vnc/gtk-vnc-1.3.0.ebuild
index 99885c444904..b2dee74c90ef 100644
--- a/net-libs/gtk-vnc/gtk-vnc-1.3.0.ebuild
+++ b/net-libs/gtk-vnc/gtk-vnc-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="+introspection pulseaudio sasl +vala"
 REQUIRED_USE="vala? ( introspection )"