gentoo auto-resync : 26:10:2023 - 20:41:49

6 files changed, 189 insertions, 2 deletions

diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index cffa15a7bf68..dffea6bb1e8a 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/vte-common/Manifest b/gui-libs/vte-common/Manifest
index d8064fc2d098..ad31f07df8fe 100644
--- a/gui-libs/vte-common/Manifest
+++ b/gui-libs/vte-common/Manifest
@@ -1,6 +1,8 @@
 AUX vte-common-0.70.0-musl-W_EXITCODE.patch 779 BLAKE2B c35f3cd21e59b9693d75b00232ef8b2d95448f4ff7031142050e9286ff854a19095bb56cec471d50585302ac08ca7a1d40ad068c013d8af142b0165d4c8d2112 SHA512 a3dd31fb4fcc9c2e725cfd64bbc63def63c1c1a85b6896b4a82083d6ff985df885c3a587e8c3c001de2acae476cb950f05a1e31b33bb263ba4895d25fa1e275b
 DIST vte-0.72.2.tar.bz2 503986 BLAKE2B dbd99a1288176482ebe2cee25a1ae508694a8b47739e9c93aa8f752bf50a1f7a6efd0944430550a73224ac92248e2c4738c51eec66a643efc03616dfa7c4b110 SHA512 0510677d67474fb04c69df0038b042d379ac8e1e89b77961e403b854e4a26b2063e93bcffd75ef0a0a324df077cf2f0a4ce51afa0ad0b1e66f707393590af274
 DIST vte-0.74.0.tar.bz2 505492 BLAKE2B d4f6acd817d1a950032678847c53d4cc720cf33a028078e28eee103591c480603e39eff0a8a517afddd57037ffddb25be9421487651df8d6110cf9743d8e0477 SHA512 36b1af8b41436ed00c889b99b8cab68eb1dd76c8302320d6f6703a19eed4a270faeb91d99ee906ac292da33757c6c89b6c0e54c1a224792b5424007b2879a966
+DIST vte-0.74.1.tar.bz2 505521 BLAKE2B 369cf6e0d69dd2878990ae530f4d3192910f7dcdf8a9210f52ee176a42efbf1a9d771f6942ecfbffc55c8e72683368de3ca9316ecb03a3d6132cb593e6f8aa4d SHA512 405048de9b4d7dae4c5a588f2b29ad9dd3156e76c20c516050157991005350df7bd59bf1255a480e7ca4a4b657e8eed32767f085f00fadb4b23819f52983558a
 EBUILD vte-common-0.72.2.ebuild 1894 BLAKE2B d9f1b80c18eb9811b0add869e56d5c3ba90bc4637a1f2f237a260f56ef120e3f2ce8a225934b1ddd9907d00bc3b4d27815bb853df5bcdf2bbec6f500621b9b01 SHA512 e40ca8b67b98526aef8fc16448cfcfab6604b3c9d57440c2d05c31adb5bb0b1f35dc55f5bb152727e40156633a8c69396abbe112c1fa379cbaa91b6a5f16c373
 EBUILD vte-common-0.74.0.ebuild 1923 BLAKE2B e75bfbff282f27b59e105d11a89b49235f6ef9185f825095ab3898c177eaee6c805dbbe4cbb1c4884434ec70ef11089a2d776712ceb297919259666ca2efdc0d SHA512 ad77f8f69833f3a968c2c2eb772b7c216e7a368d024125ba545ec0881e1f1b0cac27dcfbd76df63b5984a75943ee309f7e6ddd0137b0498342397356e2933c67
-MISC metadata.xml 549 BLAKE2B 8dc2d9f7cd740c190e9c59b5c658181b92d916f219696291dfff4c3615d91fed087654251558dfef0c70af271ad4d8847ce9ca24d80f77d4d58c33dd31904a16 SHA512 530fecebff3bfde9dd98bf9572351aa0de09acbbe354bf74d504d4985232a2f31d6a967812a8ac8ee5a3ae3402779a32dd686e12376ce06006846ca326103e73
+EBUILD vte-common-0.74.1.ebuild 1923 BLAKE2B a3e3a052d8e7a121dea977ce2794fc407411969c3f749f90516ba20024c92705a8b9bb03c94c9a2bf37e070f73d0f4cea0129666758559e6ca2b1219d1109be6 SHA512 84ac0d23ec9bb44dadf06abdf4037e1d698f483d9d12f02739f1b94ace3766a4a90e4e0f571bd971dbd0d528cd0504a0638590d8001b9afbc2673ee5582e9a14
+MISC metadata.xml 524 BLAKE2B 2a7e14b63adff1385d2a1260d238c0f35854cbd7ba0579a55edf0c6367e37fba80c99fa21b911279c6b7eb7ff4d122f56d02cfc463076614adec2eb059666b68 SHA512 60c71846ff7745c3f3d4c2fb0c9b0214c7fef04d221d2b7e568d1a63b2bff56d49a442072aa5aba48b9247c1a60b1cdf3ca8e3766986e9ef1a38ee659fb65437
diff --git a/gui-libs/vte-common/metadata.xml b/gui-libs/vte-common/metadata.xml
index ca243d09d328..a75f3f473b80 100644
--- a/gui-libs/vte-common/metadata.xml
+++ b/gui-libs/vte-common/metadata.xml
@@ -5,7 +5,6 @@
     <email>gnome@gentoo.org</email>
     <name>Gentoo GNOME Desktop</name>
   </maintainer>
-  <stabilize-allarches/>
   <use>
     <flag name="systemd">Support moving terminal child processes to their own systemd user scopes to avoid terminal getting killed due to child causing OOM</flag>
   </use>
diff --git a/gui-libs/vte-common/vte-common-0.74.1.ebuild b/gui-libs/vte-common/vte-common-0.74.1.ebuild
new file mode 100644
index 000000000000..87b4c64a2c66
--- /dev/null
+++ b/gui-libs/vte-common/vte-common-0.74.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit gnome.org meson python-any-r1
+
+DESCRIPTION="Library providing a virtual terminal emulator widget"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
+
+# Once SIXEL support ships (0.66 or later), might need xterm license (but code might be considered upgraded to LGPL-3+)
+LICENSE="LGPL-3+ GPL-3+"
+SLOT="2.91" # vte_api_version in meson.build
+IUSE="systemd"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# Upstream is hostile and refuses to upload tarballs.
+SRC_URI="https://gitlab.gnome.org/GNOME/vte/-/archive/${PV}/vte-${PV}.tar.bz2"
+
+S="${WORKDIR}/vte-${PV}"
+
+DEPEND="
+	|| ( >=gui-libs/gtk-4.0.1:4 >=x11-libs/gtk+-3.24.22:3 )
+	>=x11-libs/cairo-1.0
+	>=dev-libs/fribidi-1.0.0
+	>=dev-libs/glib-2.60:2
+	>=x11-libs/pango-1.22.0
+	>=dev-libs/libpcre2-10.21
+	systemd? ( >=sys-apps/systemd-220:= )
+	sys-libs/zlib
+	x11-libs/pango
+"
+RDEPEND="
+	!<x11-libs/vte-0.70.0:2.91
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	use elibc_musl && eapply "${FILESDIR}"/${PN}-0.70.0-musl-W_EXITCODE.patch
+}
+
+src_configure() {
+	local emesonargs=(
+		-Da11y=false
+		-Ddebugg=false
+		-Ddocs=false
+		-Dgir=false
+		-Dfribidi=true # pulled in by pango anyhow
+		-Dglade=false
+		-Dgnutls=false
+		-Dgtk3=false
+		-Dgtk4=false
+		-Dicu=false
+		$(meson_use systemd _systemd)
+		-Dvapi=false
+	)
+	meson_src_configure
+}
+
+src_install() {
+	exeinto /usr/libexec/
+	doexe "${BUILD_DIR}"/src/vte-urlencode-cwd
+	insinto /etc/profile.d/
+	newins "${BUILD_DIR}"/src/vte.sh vte-${SLOT}.sh
+	newins "${BUILD_DIR}"/src/vte.csh vte-${SLOT}.csh
+	if  use systemd; then
+		insinto /usr/lib/systemd/user/vte-spawn-.scode.d/
+		newins "${S}"/src/vte-spawn-.scope.conf defaults.conf
+	fi
+	einstalldocs
+}
diff --git a/gui-libs/vte/Manifest b/gui-libs/vte/Manifest
index 29b30de670e3..04f1a2637794 100644
--- a/gui-libs/vte/Manifest
+++ b/gui-libs/vte/Manifest
@@ -3,6 +3,8 @@ DIST vte-0.70.0-command-notify.patch.xz 9040 BLAKE2B 108dd05d00409af90b1fd3e9b5c
 DIST vte-0.72.2.tar.bz2 503986 BLAKE2B dbd99a1288176482ebe2cee25a1ae508694a8b47739e9c93aa8f752bf50a1f7a6efd0944430550a73224ac92248e2c4738c51eec66a643efc03616dfa7c4b110 SHA512 0510677d67474fb04c69df0038b042d379ac8e1e89b77961e403b854e4a26b2063e93bcffd75ef0a0a324df077cf2f0a4ce51afa0ad0b1e66f707393590af274
 DIST vte-0.74.0-command-notify.patch.xz 9248 BLAKE2B 30917bc72d2b3fd917178f49c26f023d40d37e9a44a896c44e55345396d0bfdb1b109f8b2fdead96c31f92f5febcc397f2899511647c3adf3c2aace2be8ffa94 SHA512 fc0bb3cfa70fc5e1384c44fcce6d6a76957d0dd72f61a882d9df22d55dd06fcee4e7bd2a136c443158fe403992befe5d7ce5970b8b657b690b3875ff5171ea83
 DIST vte-0.74.0.tar.bz2 505492 BLAKE2B d4f6acd817d1a950032678847c53d4cc720cf33a028078e28eee103591c480603e39eff0a8a517afddd57037ffddb25be9421487651df8d6110cf9743d8e0477 SHA512 36b1af8b41436ed00c889b99b8cab68eb1dd76c8302320d6f6703a19eed4a270faeb91d99ee906ac292da33757c6c89b6c0e54c1a224792b5424007b2879a966
+DIST vte-0.74.1.tar.bz2 505521 BLAKE2B 369cf6e0d69dd2878990ae530f4d3192910f7dcdf8a9210f52ee176a42efbf1a9d771f6942ecfbffc55c8e72683368de3ca9316ecb03a3d6132cb593e6f8aa4d SHA512 405048de9b4d7dae4c5a588f2b29ad9dd3156e76c20c516050157991005350df7bd59bf1255a480e7ca4a4b657e8eed32767f085f00fadb4b23819f52983558a
 EBUILD vte-0.72.2.ebuild 3200 BLAKE2B 0317faec27720185159a443aa6915237255344b9071a29f9fbdedc0735387591d50ba2109642cb81f5d2d19ce31540c0adc8825ec1db01914a83fcca5be73b23 SHA512 5633d1c7270e2316c7ef37582d105130fca955b18d60ce9b6b470443ee27ea38fbc0918f50c6a45ca7fcd1ecb7a1d05a9cbcfc0d24ba7a1a164a3fed14e6d2cc
 EBUILD vte-0.74.0.ebuild 3224 BLAKE2B 9401f2c8a587f07762f547700bc73792a1b9cee074d2f226fc98a22882d2f0515eca5453632ca8ea9ef944030c562105a7aff9bb42660032bc471884331d4543 SHA512 9f13d128f2bcdd3a13794c749a68b46f3727dc95d118c24d7b154b4d978f411320758be953759888dae57ea3024402bfcd3fcc201c89abd9160125d59967e0f7
+EBUILD vte-0.74.1.ebuild 3224 BLAKE2B 9401f2c8a587f07762f547700bc73792a1b9cee074d2f226fc98a22882d2f0515eca5453632ca8ea9ef944030c562105a7aff9bb42660032bc471884331d4543 SHA512 9f13d128f2bcdd3a13794c749a68b46f3727dc95d118c24d7b154b4d978f411320758be953759888dae57ea3024402bfcd3fcc201c89abd9160125d59967e0f7
 MISC metadata.xml 612 BLAKE2B 3243ec48375bf8e69a367e5d631cf84c0ba60b43d1f4a25c313a407bfb1c9826ddd1cd75784bc302e7d8998d1bedaac9d75c7f329255e605315d9f0bf6154a73 SHA512 0abc6f1deb0a7900b6b35620ad3dfa26a900445526cc6474f974ce5cca2dad65cb3f3c4e3b8a59540821a9922e2cafcc7011d705570e77d2a46c907f3962a73d
diff --git a/gui-libs/vte/vte-0.74.1.ebuild b/gui-libs/vte/vte-0.74.1.ebuild
new file mode 100644
index 000000000000..0bc40a997170
--- /dev/null
+++ b/gui-libs/vte/vte-0.74.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit gnome.org meson python-any-r1 vala xdg
+
+DESCRIPTION="Library providing a virtual terminal emulator widget"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
+
+# Once SIXEL support ships (0.66 or later), might need xterm license (but code might be considered upgraded to LGPL-3+)
+LICENSE="LGPL-3+ GPL-3+"
+SLOT="2.91-gtk4" # vte_api_version + "-gtk4" in meson.build
+IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+REQUIRED_USE="
+	gtk-doc? ( introspection )
+	vala? ( introspection )
+"
+
+# Upstream is hostile and refuses to upload tarballs.
+SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.bz2"
+SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-0.74.0-command-notify.patch.xz )"
+
+DEPEND="
+	>=gui-libs/gtk-4.0.1:4[introspection?]
+	>=x11-libs/cairo-1.0
+	>=dev-libs/fribidi-1.0.0
+	>=dev-libs/glib-2.60:2
+	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
+	icu? ( dev-libs/icu:= )
+	>=x11-libs/pango-1.22.0
+	>=dev-libs/libpcre2-10.21:=
+	systemd? ( >=sys-apps/systemd-220:= )
+	sys-libs/zlib
+	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+	x11-libs/pango[introspection?]
+"
+RDEPEND="${DEPEND}
+	~gui-libs/vte-common-${PV}[systemd?]
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	gtk-doc? ( dev-util/gi-docgen )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	default
+	use vala && vala_setup
+	xdg_environment_reset
+
+	use elibc_musl && eapply "${FILESDIR}"/${PN}-0.66.2-musl-W_EXITCODE.patch
+
+	if ! use vanilla; then
+		# From https://src.fedoraproject.org/rpms/vte291/raw/rawhide/f/vte291-cntnr-precmd-preexec-scroll.patch
+		# Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
+		eapply "${WORKDIR}"/${PN}-0.74.0-command-notify.patch
+	fi
+
+	# -Ddebugg option enables various debug support via VTE_DEBUG, but also ggdb3; strip the latter
+	sed -e '/ggdb3/d' -i meson.build || die
+	sed -i 's/vte_gettext_domain = vte_api_name/vte_gettext_domain = vte_gtk4_api_name/' meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Da11y=true
+		$(meson_use debug debugg)
+		$(meson_use gtk-doc docs)
+		$(meson_use introspection gir)
+		-Dfribidi=true # pulled in by pango anyhow
+		-Dglade=true
+		$(meson_use crypt gnutls)
+		-Dgtk3=false
+		-Dgtk4=true
+		$(meson_use icu)
+		$(meson_use systemd _systemd)
+		$(meson_use vala vapi)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	# not meson_src_install because this would include einstalldocs, which
+	# would result in file collisions with x11-libs/vte
+	meson_install
+
+	# Remove files that are provided by gui-libs/vte-common
+	rm "${ED}"/usr/libexec/vte-urlencode-cwd || die
+	rm "${ED}"/etc/profile.d/vte.sh || die
+	rm "${ED}"/etc/profile.d/vte.csh || die
+	if use systemd; then
+		rm "${ED}"/usr/lib/systemd/user/vte-spawn-.scope.d/defaults.conf || die
+	fi
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/ || die
+		mv "${ED}"/usr/share/doc/vte-${SLOT} "${ED}"/usr/share/gtk-doc/ || die
+	fi
+}