gentoo resync : 22.12.2021

8 files changed, 100 insertions, 4 deletions

diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index f0db8e645f54..c34f05fdeb57 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index ae0de6a8d4aa..466201ec0671 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -1,6 +1,9 @@
 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.40.2.tar.xz 197476 BLAKE2B a3b6f1edb7beace2a54cc651f8bf5d002009a3d2791306f2b0a33c351c68d04e0a1003ab11f215333d498c50d17139b978e7f232df802f6c620bbe31997a8e1c SHA512 854fbba39064ba4b1d9728fc4943e811f0a9557f1096f32d7a6486bcb6c73379ab84c5fb8ce5288bf4dab1d1cd3e0664c492977450d4da503ce4b08abfc75fd9
 DIST at-spi2-core-2.40.3.tar.xz 197528 BLAKE2B bc248d57d51cea6ae6dd6c737d85f10599a9c177a3a59f95ffc8f96f74b7da057f75e2b961c281650795ba8d5387a9439b00a0f277731af3d490cc8f34c3ab1a SHA512 85adf3da0a369d7f3481646a495a9c4c3337da3ae6a20ce8c924f8621d3d6ed1d9461bfac0e821dfe86e4ad6b930e4fd65d24c26401cbea644ef4951e5dda5ce
+DIST at-spi2-core-2.42.0.tar.xz 198016 BLAKE2B 9b14d7d0f5845c7510f7b256a05f5e30c3d3d893a9ae63eee81b3d378dfa9f6ebaa9853f60b23734929692efc4b8c652d4bd7bd035bd989fe0006975bdbea427 SHA512 befcab94b3aa99471723238d9666fc6667041b058a2bac3b012cfa15a91950996431296f33c921764e0ec4ffd0cc41ebe00be461a8460d6f4d2bafff19a38e10
 EBUILD at-spi2-core-2.40.2.ebuild 1458 BLAKE2B df824a43b37bcda7829d3dc21e202d4aacf36d81d7b047a3de3447e1a9159ada562b1b207b06fd6dc0aecf331ea4a0bc7720e6baf493d7ddcc840d7f47cd0c30 SHA512 e32832a771c53744760704ab5a3c9bef0caed556d7dcb2e18f20c44fa1ce598a910739276145478a45a43251c2be2771592f8abacfd3eec0bc1c8d59c5cbb1f7
 EBUILD at-spi2-core-2.40.3.ebuild 1457 BLAKE2B 40ec75db6ff2913254e9a0554a8b8d3903f06d3b5ce8064705ef60dd081146ab0a6a5c81821b4b10f23566b250c01d63f0ce64da58818f62a51648df690d5097 SHA512 b304db6a07e8add0cc3da2d898bf2a12d3714617d57aed783e97637e1ff63b813943a18a69a8c3c2b46d865a9a89b7eed0b7fdd4fc7d29e19c10bfd1f82d658b
+EBUILD at-spi2-core-2.42.0.ebuild 1518 BLAKE2B ebab3d2dbb43ff0126001b32bc577869b37b8d2245650a2d86e0c890a240ef46b5f532cbfa2773d5d4566eec715e19d172e505dbcf35063f5b5494e26e362b7f SHA512 40e67cacf459990898e3bbceb43e9d7e050890e6031845da3d0a696a915ae7f5a8f1ea6678d35d155655adcd77cafaa08e802ff1c43fde770b4a05e7d7c90d69
 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
new file mode 100644
index 000000000000..bc190c2de667
--- /dev/null
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.42.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 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/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
new file mode 100644
index 000000000000..3bf32724e691
--- /dev/null
+++ b/app-accessibility/at-spi2-core/files/at-spi2-core-2.42.0-fix-disabling-x11.patch
@@ -0,0 +1,36 @@
+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
+
diff --git a/app-accessibility/kontrast/Manifest b/app-accessibility/kontrast/Manifest
index 4de947ade4e1..5c71f4210de5 100644
--- a/app-accessibility/kontrast/Manifest
+++ b/app-accessibility/kontrast/Manifest
@@ -1,5 +1,5 @@
 DIST kontrast-21.08.3.tar.xz 125632 BLAKE2B 8734de15fcfd542d037cde92e6a80060e9c6628cd69d3cfee1f1f4c9b8938647d83924381966600ac9978acfa14723e0920c98f3ce2e666ddfdb624b8cc5f010 SHA512 193d372cdcecb3b90a352fb2deb24528d004c44e50c834e02a63c562eb97bd1f528fd81254bfc3ab7152edcc9894129eae7c6e1826a9ae42bc5ab22bf9a660c9
-DIST kontrast-21.11.90.tar.xz 124972 BLAKE2B 375ee104551ff79afdd8cd6cf0aea0b951cc5db360eba0c168146988062fe0c3f1849806b8f1e760081b83134368e1161680f9cb70c3d0d092d912586ffad63e SHA512 ad19a7a38df6420d60d34d933dc0ca7c4d4be283572fe276ff0d4715f73417ffa76f1083078d7d635509d524091e03618a02779ba9784323fbdcf1bc1af0990a
+DIST kontrast-21.12.0.tar.xz 124948 BLAKE2B 89081f80661aa4fefbf4f48d4ba0de0f812e613cc9760170a6626141ca652a1b4e7f084b5dc427b9778bf37edabad74ee100268e31fcc79ec008b34292e92940 SHA512 a9e8022ff11f64c8aae0080263c1148d99a8c4e6a7995e38a6f8407c2e3e6b6b083453f3b8b3166cafc25c209915365372dabd8353ccd50e063fa672409ea908
 EBUILD kontrast-21.08.3-r1.ebuild 842 BLAKE2B 0f58b885b95066a8095e5379734fa81108bb21d7c16674c7b27797b10f2a6ff8cb03b1eef3350215a502701402c0fb2672eb72f9195672416a2f8eab53abab05 SHA512 4b05775123f53b74caf013947d3f6fa6743aadfb0eead7f1f2351d3bd95b7cc7f3ab2bceb4adb1d668b8084c6e43d197ef4bad1c4f38787ec6ae49866266d8d5
-EBUILD kontrast-21.11.90.ebuild 773 BLAKE2B 8561889e18c091463add91311810ac55767302a0999ffe6c086ca5ea2f8cf7d31063d332a0694cde6a75509d7c0d8d1117b610438ffbc59c13d3012e2540bc41 SHA512 24bf19a29ed5c7cc3090f8afad045e622ab96ad33b9d45e82da252d2953f50f593197008b44a6719426efd154cb934cd29c65e3515257edad55e0e21e5fd29a1
+EBUILD kontrast-21.12.0.ebuild 773 BLAKE2B 8561889e18c091463add91311810ac55767302a0999ffe6c086ca5ea2f8cf7d31063d332a0694cde6a75509d7c0d8d1117b610438ffbc59c13d3012e2540bc41 SHA512 24bf19a29ed5c7cc3090f8afad045e622ab96ad33b9d45e82da252d2953f50f593197008b44a6719426efd154cb934cd29c65e3515257edad55e0e21e5fd29a1
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/app-accessibility/kontrast/kontrast-21.11.90.ebuild b/app-accessibility/kontrast/kontrast-21.12.0.ebuild
index 1b6d11aab1ac..1b6d11aab1ac 100644
--- a/app-accessibility/kontrast/kontrast-21.11.90.ebuild
+++ b/app-accessibility/kontrast/kontrast-21.12.0.ebuild
diff --git a/app-accessibility/nfbtrans/Manifest b/app-accessibility/nfbtrans/Manifest
index 247e5cda8ad2..3bad6f958764 100644
--- a/app-accessibility/nfbtrans/Manifest
+++ b/app-accessibility/nfbtrans/Manifest
@@ -2,5 +2,5 @@ AUX nfbtrans-7.74-gentoo-fix.patch 237 BLAKE2B 79966d78a265660633d8e6ad89c2f10a3
 AUX nfbtrans-7.74-getline-fix.patch 880 BLAKE2B 67afefad755a077d949cb492a37af44f275693be3291218882a475059103fc8cf526d67a153c671b51a6f8e80e72ebb4b739e68680285f6b70c2a044f962c078 SHA512 bec4b16259ffb15a396542525ddb5dd8a72da5d4a73b108ee41dd005d00c978d3991d69a5b4cacc963c27a8b186305c619fc3c41860d40fbcaa41843d2fc168d
 AUX nfbtrans-7.74-respect-ldflags.patch 620 BLAKE2B 672883ec0b74c2eb0657756d56f2ee862c676844192a293e4139d0dd76548b6e6c047eb530e96f66eb4e398ffc4304c124d50ba59ebcf440cde59ad219c39ec3 SHA512 65f6c0752ea4ca8badfad0322b8709f7f55cb1e55a57ba2bc4edb0a748584a9c725a9cf9836a67df02d7b9b158f8b46ddae711a1b5d368ed56728a2495272eb1
 DIST nfbtr774.zip 470847 BLAKE2B 54dd9b612c6dda0734d5b21c1ed8b0d428663d2b442406cb36276afd1a6c0b742ddcb4848954a0bbdd29cb300dab6a55dd9b3bafeb603b08ef6a7e678c0d9a86 SHA512 58fa72c53d88d11fa005572f4e2ebd81d21afaec2fac0e986bfad66b42c194ec3573199e2f2b863725001c1cb777b60881605a1533f7eb73e31e24a244673c2c
-EBUILD nfbtrans-7.74-r2.ebuild 924 BLAKE2B 9c7f88e573ad76d1a2deb29486acda7f04ec0328930a3d66cb4c3bfaafe8fb44e0d17f6f0ebd651e241241afa8bf91d51d8512468ec9aecaf006ad86d6357777 SHA512 3714e597237398e6ea5271d3e12081f41f548f396de4ecd5a47b6c1fd3d6e5c2d67e556658020a32e00cfc4cd2f79f47f1319dfa67a09132fa214d9b7c3be957
+EBUILD nfbtrans-7.74-r2.ebuild 940 BLAKE2B 5c40b0544ab0c97f7880725a5329208a8c01181f2e21d1a06186f243dd42fd74d31d6095e989f1fa431d5d29cef877b3cb8b9d56fe25a5c715f4858047a31582 SHA512 a11c802318e07c4a4fe1c3fd221ae1f7b778350f09e8196ffc16d09a502d9e8c6c38ecbe491f12365afcd61f2ba84b88df3fb2d731917e5ddd605f9dbf7b4d9a
 MISC metadata.xml 346 BLAKE2B 7e1272166e3d172f7228c972568c726842ae777ba6a347e8142de8736bebc86d2312d68fcde332947b03c48a7d388371b9f8a231fbcb4b0f37077615ee6f2645 SHA512 b6a500e0266cc804bd2b3b15dd1555801dd2afa30dde160264c6745e55f67576dbc980112c23982d378824d6681ae28e993dcfe48f99b9c5b5eef0092faab4d5
diff --git a/app-accessibility/nfbtrans/nfbtrans-7.74-r2.ebuild b/app-accessibility/nfbtrans/nfbtrans-7.74-r2.ebuild
index 8509d2d383e6..7e24f93de77b 100644
--- a/app-accessibility/nfbtrans/nfbtrans-7.74-r2.ebuild
+++ b/app-accessibility/nfbtrans/nfbtrans-7.74-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Braille translator from the National Federation of the Blind"
-HOMEPAGE="http://www.nfb.org/nfbtrans"
+HOMEPAGE="http://www.nfbnet.org/download/nfbtrans.htm"
 SRC_URI="http://www.nfb.org/Images/nfb/Products_Technology/nfbtr774.zip"
 S="${WORKDIR}"