gentoo resync : 29.12.2022

5 files changed, 35 insertions, 56 deletions

diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index 78e424b4edb6..28d531a66243 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,9 +1,8 @@
-AUX 3.42.2-fix-build-with-meson-0.61.1.patch 1024 BLAKE2B bce6f28ff01f895a2890b43fd56eb4c9e69dacf547c3eddd13593cce9d2c84c6b0e3346c607bbb21a8bd059e25e88f035e5918bc1d021cddcd2830baf43a5b5d SHA512 93561c9eb344bebec6106b56212258bb0086225957351c0211eef6515107bf8136b65e734b328f4824f8586f80d8a07612a605c1b7f5c4515ce38d33a2f6429e
+AUX gnome-terminal-3.44.1-fix-missing-wexitcode.patch 727 BLAKE2B 5aa58dea55d8370d66f1b356bad0f8add6dc01359387b6e45c093800276ffe3a7c0beb125935afb67cd093397ed5779ba123ba61e572f34d0fa7f28bc7cd8b11 SHA512 b03c250e1d25464dc483b6a9398ade5cde4d40ad2ddb59ee709f25bd07101f7ba22faf98e519ee7e7fb8a4d20a56d9fc08e13d3b5546d5749ffa2882156a05f4
 AUX separate-new-tab-window.gschema.override 56 BLAKE2B ca7934aa89ddad5bbc86a35c79c8e02215888fea4706df5c2740480d9534980f54bc1b298ac02983a56c2bc5c1fc988d02b5cadb2a8e30d6443577b745a55533 SHA512 09eee78d2756752ce32cc9379f1a445e55c6f5f01bde972a8e5801a5c7bf3b385ab081ebc4a1ddd2bc463a8a67dd1ad03f1d531c99aa36eb6e850bf4f2a2b265
-DIST gnome-terminal-3.42.2-cntr-ntfy-autottl-ts.patch.xz 33980 BLAKE2B e0400f960064907c84a059b2210a9299e353b280e4bbe2fb98a887f9806fc2eb5f7de9d3e6dee243f6297275479ec546d47292bb30ea02e8f4a887fafbe04e71 SHA512 4afab38bff15963e88bc756914b5c379634c68d59f0be1189d969ea0a8b7f3f6c0a077199455cc4c2eca96e5c3df06bddebdc32b786aaba3a885e21cb710f210
-DIST gnome-terminal-3.42.2.tar.xz 1806388 BLAKE2B 9e3068d9731689dd5dc012405384073a6ea07d59370340bcccdc3383e24f5a5424a14b5e903a01b4cca3925758f9b2f5cd7861b30658324297f817807fefbb66 SHA512 001504539adbcdac609f22ee8120455d2a2db8f4208ca2715c6bb271b5488bfdbe78deca3c997cd4d2293f2e7e51db66746af56f5ba46792542654972dbc739e
 DIST gnome-terminal-3.44.0-cntr-ntfy-autottl-ts.patch.xz 37248 BLAKE2B b3599386e7272fc5b742c11663f09bbfafa84cc855bd13fd602d679601fbb4126f36cdb157db37db335bf9edfe7d2b85e534baf837c5817984ec17baa4cdbb6c SHA512 6422a774abfee18b2681115344f508b72ead1bb9f27b5b1596b419a9ce5a137d41e2d749b6d784170225e7f21f15c109f7eb74cc3164371d53dee7790bf99187
 DIST gnome-terminal-3.44.0.tar.xz 1810124 BLAKE2B 041aa7400cbf0f075c37f6276d06dbffb0b87da13d8bcb9d13e62b13a1e16ae612970d1ec6462c7c257f7bcf2da222b48df1d8d28ce24b216ae3d11c76f05341 SHA512 0cf039c0aa364a9ac63d9f24d466506a919cf733f2ee8dc1c6f42459e6c742bad678f7ad7cec3721e9512b8f414dc4c4c1f29057c73e5e4a870a04d6bcd98ed6
-EBUILD gnome-terminal-3.42.2.ebuild 2903 BLAKE2B 141f3a347695d2f6f740aa889bd447f15c28b03810823550aa182262a8da4a9a506d036bf1cb4e5399445f7494c68758d59deb6978364fa4ccd21f42759cab4e SHA512 73effc80fec9f29beaa6fe5d200a7c3b4651274e61f0a05116fbe07d84b7f486c1227d9596a652f4fead335d3275ba5b56083952b49be744520bb227bda1b636
-EBUILD gnome-terminal-3.44.0.ebuild 2901 BLAKE2B 7207aed27e888f8069c147d298c65b4678f3fdb9fa1b5ba846503b40dd951eab5d91310e7e15d38ef05e36b1666611c45ba35e5fb3abb975163683fc77f7af53 SHA512 f9890e7bd3ac16b9c81f729b8d630e3ce969d67ac5733b25b8e244ae3a8319d052e2346fd8fb22a9049af14fe125a5b7e450f95bd4a0d727740a8f1f3b71c6d6
+DIST gnome-terminal-3.44.1.tar.xz 1813032 BLAKE2B 3e001139aa0516bd27f7215c692c048393d6ad41737b8817f212529d3c530f6417d05601f63e6265e3fb84e788322341c25784a0a26ee7434f1d4bccd31c1eea SHA512 afaa9a1b4fa86fea853a242f167d1ba3438efe4e049336bae138cb800d43c3325f624849463f16c9d4e34360916377c4edbfd2f3977212b51e35a41cca88b283
+EBUILD gnome-terminal-3.44.0.ebuild 2898 BLAKE2B 2f4426d25fd36980f6de0d37c0268f8a27d4611ad5bee9e9093071bc69fad56f18b9c2e7e7ab60e0456c4f9c47d9db5eb6d383c38107e641cabdcb49bbc6fdea SHA512 171eeaa4ac719e5f80e42e3c2807259a5661d14bcd70d1a9acdc3c12e42d11434b97de5eccaa1aceecc59d489f400a312da79025551ab2c0bf5e35225cbdf7e3
+EBUILD gnome-terminal-3.44.1.ebuild 2956 BLAKE2B f6dab5c6aaeac760ea7e473dd1e8db2ae8d47cddd130929e60450d63178a0dfd0fd83c30b97933f5beba3074fdfc38b257567308ce52183a8352129aeec5e48e SHA512 4bc99354f1fc22dcf48bba401ce75d7204a48913d12b0ec7f2497f65ed8728581158d5647a7b1af6cadda8dda514c17899e4268067807578b7da50406132f48d
 MISC metadata.xml 418 BLAKE2B f4066a783c4612bc4d4b0883a5f74e626c2fe8716ba3cf78b2f5ac17aa803e3bfd3ed0ad6c88bd4142163f2f0f8b6e37638ba3c13fb4f199c7a667d9220d7f3c SHA512 b3bdd052a5038b59c040633331cb9a00da50db1ac6af26b0dbeb5b94a91ec6ada15e493101db1882fb194af590301e9965a400db3f1d29800589ea2256c16636
diff --git a/x11-terms/gnome-terminal/files/3.42.2-fix-build-with-meson-0.61.1.patch b/x11-terms/gnome-terminal/files/3.42.2-fix-build-with-meson-0.61.1.patch
deleted file mode 100644
index e0e9d39204f2..000000000000
--- a/x11-terms/gnome-terminal/files/3.42.2-fix-build-with-meson-0.61.1.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://github.com/GNOME/gnome-terminal/commit/9a168cc23962ce9fa106dc8a40407d381a3db403
-https://bugs.gentoo.org/831940
-
-From: Christian Persch <chpe@src.gnome.org>
-Date: Fri, 14 Jan 2022 11:33:32 +0100
-Subject: [PATCH] build: Fix for newer meson
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -18,7 +18,6 @@
- metainfodir = gt_datadir / 'metainfo'
- 
- i18n.merge_file(
--  gt_dns_name + '.metainfo.xml',
-   input: gt_dns_name + '.metainfo.xml.in',
-   output: '@BASENAME@',
-   po_dir: po_dir,
-@@ -27,7 +26,6 @@ i18n.merge_file(
- )
- 
- i18n.merge_file(
--  gt_dns_name + '.Nautilus.metainfo.xml',
-   input: gt_dns_name + '.Nautilus.metainfo.xml.in',
-   output: '@BASENAME@',
-   po_dir: po_dir,
-@@ -40,7 +38,6 @@ i18n.merge_file(
- desktopdatadir = gt_datadir / 'applications'
- 
- i18n.merge_file(
--  gt_dns_name + '.desktop',
-   input: gt_dns_name + '.desktop.in',
-   output: '@BASENAME@',
-   type: 'desktop',
-@@ -57,4 +54,4 @@ meson.add_install_script(
- 
- # Subdirs
- 
--subdir('icons')
-\ No newline at end of file
-+subdir('icons')
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.44.1-fix-missing-wexitcode.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.44.1-fix-missing-wexitcode.patch
new file mode 100644
index 000000000000..aff2237db902
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-3.44.1-fix-missing-wexitcode.patch
@@ -0,0 +1,21 @@
+https://gitlab.gnome.org/GNOME/vte/-/issues/72
+Someone already tried to upstream a similar patch to gnome vte that
+would fix this but was rejected by maintainer. More info can be found
+on the link above.
+
+W_EXITCODE is missing in musl thus causing gnome-terminal build to fail.
+This patch checks if W_EXITCODE is not defined and then defines it.
+--- a/src/terminal.cc
++++ b/src/terminal.cc
+@@ -47,6 +47,11 @@
+ GS_DEFINE_CLEANUP_FUNCTION0(TerminalOptions*, gs_local_options_free, terminal_options_free)
+ #define gs_free_options __attribute__ ((cleanup(gs_local_options_free)))
+ 
++/* fix for musl */
++#ifndef W_EXITCODE
++#define W_EXITCODE(ret, sig) ((ret) << 8 | (sig))
++#endif
++
+ /* Wait-for-exit helper */
+ 
+ typedef struct {
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.44.0.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.44.0.ebuild
index a5297be2d0ec..de2616fb840b 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.44.0.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.44.0.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
 IUSE="debug +gnome-shell +nautilus vanilla"
 SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.44.0-cntr-ntfy-autottl-ts.patch.xz )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 # FIXME: automagic dependency on gtk+[X], just transitive but needs proper control, bug 624960
 RDEPEND="
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.42.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.44.1.ebuild
index 2dc8e8704803..079de738bb03 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.42.2.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.44.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-inherit gnome.org gnome2-utils meson readme.gentoo-r1 xdg
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+inherit gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 xdg
 
 DESCRIPTION="A terminal emulator for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/ https://gitlab.gnome.org/GNOME/gnome-terminal"
@@ -11,15 +11,15 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/ https://gitlab.gnome.org/GNOME/g
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE="debug +gnome-shell +nautilus vanilla"
-SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.42.2-cntr-ntfy-autottl-ts.patch.xz )"
+SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.44.0-cntr-ntfy-autottl-ts.patch.xz )"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # FIXME: automagic dependency on gtk+[X], just transitive but needs proper control, bug 624960
 RDEPEND="
 	>=dev-libs/glib-2.52:2
 	>=x11-libs/gtk+-3.22.27:3
-	>=x11-libs/vte-0.64.0:2.91[!vanilla?]
+	>=x11-libs/vte-0.68.0:2.91[!vanilla?]
 	>=dev-libs/libpcre2-10
 	>=gnome-base/dconf-0.14
 	>=gnome-base/gsettings-desktop-schemas-0.1.0
@@ -31,6 +31,7 @@ DEPEND="${RDEPEND}"
 # itstool required for help/* with non-en LINGUAS, see bug #549358
 # xmllint required for glib-compile-resources, see bug #549304
 BDEPEND="
+	${PYTHON_DEPS}
 	dev-libs/libxml2:2
 	dev-libs/libxslt
 	dev-util/gdbus-codegen
@@ -40,16 +41,13 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
-)
-
 DOC_CONTENTS="To get previous working directory inherited in new opened tab, or
 	notifications of long-running commands finishing, you will need
 	to add the following line to your ~/.bashrc:\n
 	. /etc/profile.d/vte-2.91.sh"
 
 src_prepare() {
+	eapply "${FILESDIR}"/${P}-fix-missing-wexitcode.patch
 	if ! use vanilla; then
 		# https://bugzilla.gnome.org/show_bug.cgi?id=695371
 		# Fedora patches:
@@ -59,7 +57,7 @@ src_prepare() {
 		# Automatic title updating based on currently running foreground process
 		# https://src.fedoraproject.org/rpms/gnome-terminal/raw/f31/f/gnome-terminal-cntr-ntfy-autottl-ts.patch
 		# Depends on vte[-vanilla] for OSC 777 and the preexec/precmd/etc patches in VTE
-		eapply "${WORKDIR}"/${PN}-3.42.2-cntr-ntfy-autottl-ts.patch
+		eapply "${WORKDIR}"/${PN}-3.44.0-cntr-ntfy-autottl-ts.patch
 	fi
 	default
 }