gentoo resync : 29.12.2022

6 files changed, 3 insertions, 196 deletions

diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index 25a2ae5c83c5..be248aca9e0d 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -1,10 +1,4 @@
-AUX 2.44.0-Fix-build-with-X11-disabled.patch 1374 BLAKE2B 70c2b51dddc55c537b9e8f95d651b7148f94ac737b0f42a1c8ca8a00a8e4ade80d3f390fe3bccc6df04ce86e2730d6fb38cbbd4b37c197498f709074b8d576a0 SHA512 789a4c191428b74ca488dcfa2f6304d4388ad0ea910f045d58ce832689d94f03ba40fc961ea1695ef6528886789409023e4cf497524c3c370feb5cae82c5cfd5
 AUX at-spi2-core-2.0.2-disable-teamspaces-test.patch 302 BLAKE2B 4165c68b7e8d9835273a55f6bd7a05435a4b3982399871563da7ed1b37444377718a4e31766529dfdd320bf9e2cfb89fc9aad98b7e757c633cfbc1dfaf61487e SHA512 866a2e372999491a74aa3bd230e666151b8fbf74554f70b7ff01891c62a6b2e87459107d885340076c049ebba656e399cb13ea6cb93af88552a328e17b4f8753
-AUX at-spi2-core-2.42.0-fix-disabling-x11.patch 1017 BLAKE2B 7db683a92ff8587444a34a6c4ad12be8e8a31b26128c843f6c89fa42b1604d55e25a72855272930082c3a1ca2b73f2d3a51ae5274770aa0cc0c530f691e062be SHA512 22ff6474e7fdcee3e00c979e56d23b40f8625236f0cc885171ded9434af6ea12900d29577fbdf08cd655919b9b623c172bca4dada7f2b9d15a57c900b326c333
-DIST at-spi2-core-2.42.0.tar.xz 198016 BLAKE2B 9b14d7d0f5845c7510f7b256a05f5e30c3d3d893a9ae63eee81b3d378dfa9f6ebaa9853f60b23734929692efc4b8c652d4bd7bd035bd989fe0006975bdbea427 SHA512 befcab94b3aa99471723238d9666fc6667041b058a2bac3b012cfa15a91950996431296f33c921764e0ec4ffd0cc41ebe00be461a8460d6f4d2bafff19a38e10
-DIST at-spi2-core-2.44.0.tar.xz 209692 BLAKE2B 149251ba4061f5dbfac1e27775491bb6d7cee279cb7bd58c05f97cdec8a4e0208e5a129651a07c9febea681cc3fe36a7d7fa57c43c2b558249cdd321466729dd SHA512 6d74a56d7ad6c643985e98aebbbf0cdaad69c03b8030f8968bd9cce9357805cd846d71d35d2cc4a193770cd6d4a83cbfb98ef082e17719f3dee7b839c48bda44
 DIST at-spi2-core-2.44.1.tar.xz 209780 BLAKE2B e76f0b0c478564181db774633dfc9613bdfa6c74c5c52878d877723e37605b7b7169fee45a9025b331e84bf5af8132eed50b388db9ac1aee0fec7776a633628a SHA512 8d85df75f886c4a19d829d14e5a9412b607b9cbe2d1b7ecb95b4082602f0624e90747fe955f96d378c3a52bc0e732074b97008bb34e6acc2722c7056b2c0504e
-EBUILD at-spi2-core-2.42.0.ebuild 1510 BLAKE2B f9ccee7e9bf28fc0c9865284cdf2fd76215d6cc90a7130c17ee21eb67d56998594a130530a467758ccf095c2de5ed560e1686ea1751b8b22f73040fc173c6ea8 SHA512 d4da094c2b88c0eb26a41c89bde4be1793888a50cb43c88dd4801bca5c02d24e744d19ce73f5c3dab5f07b15d6426a85c2f8530068f05acc46899dfb39d776fe
-EBUILD at-spi2-core-2.44.0.ebuild 1520 BLAKE2B e43adcb6ff0f55e4ea43f2a87a442e108b4e144d3fc1b2ce7da3872d6b6606f92fbd5f202a7af005033985fd60abb1c67dd9a3626b25c957d1ea66f1c792b2ea SHA512 ea203e37cebb4d89c9bc4f5b23085ac4c275368ba62f69350b5a4d6936d4dfa3e17256d83779d5652b06de0b7c93f13d50f03cba2a34ca4f593d9e65229bc09a
-EBUILD at-spi2-core-2.44.1.ebuild 1465 BLAKE2B 74255d325bbac9c6d4e7800178b2a7b519a7272d3dab8c1740a85c26f221374cd872a06d2ab515a30add7b31e321493fe4ab820645790f100db3d99e153db94f SHA512 36d7fd8b245dd5e5c410cf19eb69d248357deddc051da3280007880c631357236ecf1c0488618e2ef6054fda67db30c20582e917008ed9a6668dcf148f428d72
+EBUILD at-spi2-core-2.44.1.ebuild 1466 BLAKE2B 572e617a22ab16d1cfb42fbab8c318840174b8bea5e05d02fc88b7ddedb48757b587a3414cb772960b20212350931d6f9272933fb439e4cc6ea2ff6bcf7ab358 SHA512 2740ff17261253dd6a0ab6ae5e8f1aa9bdba5ebd4cf28808ed9bc055f8dd520e21094889773c8d3990a623a3344036b661b78bd772b3a93e581411ee845e37c6
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.42.0.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.42.0.ebuild
deleted file mode 100644
index 50059a5040db..000000000000
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.42.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson-multilib systemd virtualx xdg
-
-DESCRIPTION="D-Bus accessibility specifications and registration daemon"
-HOMEPAGE="https://wiki.gnome.org/Accessibility https://gitlab.gnome.org/GNOME/at-spi2-core"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-IUSE="X gtk-doc +introspection"
-REQUIRED_USE="gtk-doc? ( X )"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.62:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXtst[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.25
-		app-text/docbook-xml-dtd:4.3
-	)
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
-	"${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
-
-	"${FILESDIR}/${PN}-2.42.0-fix-disabling-x11.patch"
-)
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dsystemd_user_dir="$(systemd_get_userunitdir)"
-		$(meson_native_use_bool gtk-doc docs)
-		-Dintrospection=$(multilib_native_usex introspection)
-		-Dx11=$(usex X)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	virtx dbus-run-session meson test -C "${BUILD_DIR}"
-}
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.44.0.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.44.0.ebuild
deleted file mode 100644
index ec6aee601bdb..000000000000
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.44.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson-multilib systemd virtualx xdg
-
-DESCRIPTION="D-Bus accessibility specifications and registration daemon"
-HOMEPAGE="https://wiki.gnome.org/Accessibility https://gitlab.gnome.org/GNOME/at-spi2-core"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-IUSE="X gtk-doc +introspection"
-REQUIRED_USE="gtk-doc? ( X )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.62:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXtst[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.25
-		app-text/docbook-xml-dtd:4.3
-	)
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
-	"${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
-	"${FILESDIR}/${PV}-Fix-build-with-X11-disabled.patch"
-)
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dsystemd_user_dir="$(systemd_get_userunitdir)"
-		$(meson_native_use_bool gtk-doc docs)
-		-Dintrospection=$(multilib_native_usex introspection)
-		-Dx11=$(usex X)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	virtx dbus-run-session meson test -C "${BUILD_DIR}"
-}
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.44.1.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.44.1.ebuild
index 6d1568dc223b..3d5837a0a1d6 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.44.1.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.44.1.ebuild
@@ -12,11 +12,11 @@ LICENSE="LGPL-2.1+"
 SLOT="2"
 IUSE="X gtk-doc +introspection"
 REQUIRED_USE="gtk-doc? ( X )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.62:2[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.67.4:2[${MULTILIB_USEDEP}]
 	introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
 	X? (
 		x11-libs/libX11[${MULTILIB_USEDEP}]
diff --git a/app-accessibility/at-spi2-core/files/2.44.0-Fix-build-with-X11-disabled.patch b/app-accessibility/at-spi2-core/files/2.44.0-Fix-build-with-X11-disabled.patch
deleted file mode 100644
index bd6dfaaec885..000000000000
--- a/app-accessibility/at-spi2-core/files/2.44.0-Fix-build-with-X11-disabled.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 08036a4c4491eea57d7b713bb4440f541584204b Mon Sep 17 00:00:00 2001
-From: Mike Gorse <mgorse@suse.com>
-Date: Mon, 21 Mar 2022 10:19:03 -0500
-Subject: [PATCH] Fix build with X11 disabled
-
-Closes #51
----
- registryd/deviceeventcontroller.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c
-index 8a321adc..3068ec4b 100644
---- a/registryd/deviceeventcontroller.c
-+++ b/registryd/deviceeventcontroller.c
-@@ -1720,16 +1720,16 @@ spi_dec_synth_keysym (SpiDEController *controller, long keysym)
- 	if (synth_mods != modifiers) {
- 		lock_mods = synth_mods & ~modifiers;
- 		spi_dec_plat_lock_modifiers (controller, lock_mods);
--		if (modifiers & LockMask)
--			spi_dec_plat_unlock_modifiers (controller, LockMask);
-+		if (modifiers & SPI_KEYMASK_SHIFTLOCK)
-+			spi_dec_plat_unlock_modifiers (controller, SPI_KEYMASK_SHIFTLOCK);
- 	}
- 	spi_dec_plat_synth_keycode_press (controller, key_synth_code);
- 	spi_dec_plat_synth_keycode_release (controller, key_synth_code);
- 
- 	if (synth_mods != modifiers) {
- 		spi_dec_plat_unlock_modifiers (controller, lock_mods);
--		if (modifiers & LockMask)
--			spi_dec_plat_lock_modifiers (controller, LockMask);
-+		if (modifiers & SPI_KEYMASK_SHIFTLOCK)
-+			spi_dec_plat_lock_modifiers (controller, SPI_KEYMASK_SHIFTLOCK);
- 	}
- 	return TRUE;
- }
--- 
-2.34.1
-
diff --git a/app-accessibility/at-spi2-core/files/at-spi2-core-2.42.0-fix-disabling-x11.patch b/app-accessibility/at-spi2-core/files/at-spi2-core-2.42.0-fix-disabling-x11.patch
deleted file mode 100644
index 3bf32724e691..000000000000
--- a/app-accessibility/at-spi2-core/files/at-spi2-core-2.42.0-fix-disabling-x11.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://bugs.gentoo.org/829591
-https://gitlab.gnome.org/GNOME/at-spi2-core/-/commit/2175d89198440d948075f3268aec5f45430afb3d
-
-From 2175d89198440d948075f3268aec5f45430afb3d Mon Sep 17 00:00:00 2001
-From: Tim Orling <ticotimo@gmail.com>
-Date: Fri, 15 Oct 2021 12:44:39 -0700
-Subject: [PATCH] Ensure x11_dep is defined
-
-bus/meson.build checks if x11_dep.found(), but this fails when
--Dx11=no
-
-References:
-  https://gitlab.gnome.org/GNOME/at-spi2-core/-/issues/42
-  https://mesonbuild.com/howtox.html#get-a-default-notfound-dependency
-
-Signed-off-by: Tim Orling <ticotimo@gmail.com>
----
- meson.build | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/meson.build b/meson.build
-index b5104c8c..cfd2e091 100644
---- a/meson.build
-+++ b/meson.build
-@@ -62,6 +62,8 @@ endif
- 
- x11_deps = []
- x11_option = get_option('x11')
-+# ensure x11_dep is defined for use elsewhere, such as bus/meson.build
-+x11_dep = dependency('', required: false)
- if x11_option != 'no'
-   x11_dep = dependency('x11', required: false)
- 
--- 
-GitLab
-