commit: 4e05eb368d1eec80b81dbfc7c1cb8a0edba1d17c Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Sat Apr 4 21:10:06 2020 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Sat Apr 4 21:15:16 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e05eb36
net-libs/gtk-vnc: fix honoring of python-any chosen py version Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> .../gtk-vnc/files/1.0.0-honor-python-ver.patch | 26 ++++++++++++++++++++++ net-libs/gtk-vnc/gtk-vnc-1.0.0.ebuild | 1 + 2 files changed, 27 insertions(+) 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 00000000000..f26a85719b0 --- /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 <l...@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 index c8939c84f65..da83431610b 100644 --- a/net-libs/gtk-vnc/gtk-vnc-1.0.0.ebuild +++ b/net-libs/gtk-vnc/gtk-vnc-1.0.0.ebuild @@ -43,6 +43,7 @@ DEPEND="${RDEPEND} 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() {