gentoo resync : 15.06.2021

11 files changed, 87 insertions, 45 deletions

diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index a65f6dadf801..4710c2fb8780 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/at-spi2-atk/Manifest b/app-accessibility/at-spi2-atk/Manifest
index ebd349ff31ce..9ca40a8caed8 100644
--- a/app-accessibility/at-spi2-atk/Manifest
+++ b/app-accessibility/at-spi2-atk/Manifest
@@ -1,3 +1,3 @@
 DIST at-spi2-atk-2.38.0.tar.xz 97464 BLAKE2B c5a62bd157ac6dcbf19495eb8f92bd6346651b8df64e15acf4d25c1ab35790f154bead1e012714da36c700e58e164527755137a33812f3a1844aa34f0293ebf5 SHA512 2f40ecbc55b0fbaa57ade952a75583bc8fbfde234cce9248489e9ae06e0597d98c2f4c77d8279758dec29da97e06cde5708d30a1238d91bebd023b2320f38528
-EBUILD at-spi2-atk-2.38.0.ebuild 1018 BLAKE2B dee7dddbdfed728b972a728653a8b6559ab69b58f4f4e6bc1989465b84a221f03a6cd71fb8efba31fdabfe8c6766fdebf27431724b892a1170bb9b5b509d9a98 SHA512 b1e9cc30677dc3964a6d5001aeb255926fb1fae18129a71230139dc9e429f96273f0047a4c6a58f722f829d5d7461e9fed31697c8e29d96a1265a94fd02777c2
+EBUILD at-spi2-atk-2.38.0.ebuild 916 BLAKE2B 3ee17c210653cb58a492eb4a9ae9d3111d5be4391dad054d7bdc57012065fcebebf707cb9fde8c2fad92173626793a1bf79a0c3c33d5c804068a2495c2c459d8 SHA512 f68fedb14b9999d3d8553d8a188d54e4b6654da3702279ef366b64326ce4a00577f05464866ee037b7cdbfd95cec2507ae8f62aac611eed5a73ec93ddaed5c7f
 MISC metadata.xml 562 BLAKE2B 5f5b7b6f0ecfc0067041c3f9982d322485db7a3f992ba2ec20ace679a9771da3731fa68f09768423af5eb042b05b5d665de2f6eb8026f5890941004c2741ca23 SHA512 d9cd5d0c04bc5a3e4e815f0b7a8a5ce0ed0aac2d5b4cf5540669b7450b3ecff7a7346c1a80daf033330e7a5aebe13f85d1821c109cf0c861f85ca514e7e2678f
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.38.0.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.38.0.ebuild
index 72582fccbe92..9d4813c94dbf 100644
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.38.0.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.38.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit gnome.org meson multilib-minimal virtualx xdg
+inherit gnome.org meson-multilib virtualx xdg
 
 DESCRIPTION="Gtk module for bridging AT-SPI to Atk"
 HOMEPAGE="https://wiki.gnome.org/Accessibility"
@@ -33,14 +33,6 @@ multilib_src_configure() {
 	meson_src_configure
 }
 
-multilib_src_compile() {
-	meson_src_compile
-}
-
 multilib_src_test() {
 	virtx dbus-run-session meson test -C "${BUILD_DIR}"
 }
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index 2186dc83d340..780a872d4ff1 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -1,4 +1,6 @@
 AUX at-spi2-core-2.0.2-disable-teamspaces-test.patch 302 BLAKE2B 4165c68b7e8d9835273a55f6bd7a05435a4b3982399871563da7ed1b37444377718a4e31766529dfdd320bf9e2cfb89fc9aad98b7e757c633cfbc1dfaf61487e SHA512 866a2e372999491a74aa3bd230e666151b8fbf74554f70b7ff01891c62a6b2e87459107d885340076c049ebba656e399cb13ea6cb93af88552a328e17b4f8753
 DIST at-spi2-core-2.40.1.tar.xz 197064 BLAKE2B dfa19413e6688678fcc0c0ed76d0fca0d5de5039c9b1e42dc10c9c387c0cbffb3c6a38570f9e74c343fa86310f2c3f6fcf0e311c57d11b5adeac5faf7bdf9630 SHA512 fcb73e78a85db9b982ae10d8c968c7732079832877fa0214c30a04b9e27910448c3f5456b8628ed4a3d4dbd59037c8c206916ad1462ca5c7a44409a702096b14
-EBUILD at-spi2-core-2.40.1.ebuild 1498 BLAKE2B adfa362d47ff9ecb6d555353bea1baea9197bb2687d5f8349a5b442ad06c4c17b3b6124489bcb922d02e98465195137022b75322a41e6672a1a9fe1ab572f3bb SHA512 96585e874daad90f59bdccdf2c313dbdc2af4f3aec02aeef9c3f95d3a6a86c50ea0f07c0bed74fe40c9641615eece82db03e2a461f92b52034434c8d123d8b42
+DIST at-spi2-core-2.40.2.tar.xz 197476 BLAKE2B a3b6f1edb7beace2a54cc651f8bf5d002009a3d2791306f2b0a33c351c68d04e0a1003ab11f215333d498c50d17139b978e7f232df802f6c620bbe31997a8e1c SHA512 854fbba39064ba4b1d9728fc4943e811f0a9557f1096f32d7a6486bcb6c73379ab84c5fb8ce5288bf4dab1d1cd3e0664c492977450d4da503ce4b08abfc75fd9
+EBUILD at-spi2-core-2.40.1.ebuild 1384 BLAKE2B 228eb7444c10a142f85d16e78161dc73005ca47a5a37fbc8444812165cbcb0dd13f7da139c814f95ecb4f2a2a8195e8921e0c2788042e8f443c4a7e63567ea93 SHA512 fa0af448995e79332fa7c05e51fcd1306c2cafb2aca601d42f2f6dccac7bcb569140a7abb98a8c54c0a69bc1b82150427843ffef4aa5fb855063000e395575fe
+EBUILD at-spi2-core-2.40.2.ebuild 1391 BLAKE2B bdd686cb46427ef7f9561cb83db39c0c759112276cd16039bbced7fd40e00f5c4915e2be096b0eddac91d7640fa53a9ba59b5ee00ac972457103e58e89e1c7bc SHA512 ad93fa85da329ae638d51e5ca99ad08e3cb0e620d342f756cfbdb39c89e35990074d937afd864f5bb878a1d7b29d67745f69126aade1487ad068fa53c5477ae9
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.40.1.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.40.1.ebuild
index 4f2d58c0d867..4ab896ede0c9 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.40.1.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.40.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit gnome.org meson multilib-minimal systemd virtualx xdg
+inherit gnome.org meson-multilib systemd virtualx xdg
 
 DESCRIPTION="D-Bus accessibility specifications and registration daemon"
 HOMEPAGE="https://wiki.gnome.org/Accessibility"
@@ -42,21 +42,13 @@ PATCHES=(
 multilib_src_configure() {
 	local emesonargs=(
 		-Dsystemd_user_dir="$(systemd_get_userunitdir)"
-		-Ddocs=$(multilib_native_usex gtk-doc true false)
+		$(meson_native_use_bool gtk-doc docs)
 		-Dintrospection=$(multilib_native_usex introspection)
 		-Dx11=$(usex X)
 	)
 	meson_src_configure
 }
 
-multilib_src_compile() {
-	meson_src_compile
-}
-
 multilib_src_test() {
 	virtx dbus-run-session meson test -C "${BUILD_DIR}"
 }
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.40.2.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.40.2.ebuild
new file mode 100644
index 000000000000..595c3594907e
--- /dev/null
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.40.2.ebuild
@@ -0,0 +1,54 @@
+# 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"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+IUSE="X gtk-doc +introspection"
+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"
+)
+
+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/freetts/Manifest b/app-accessibility/freetts/Manifest
index 2591ee4933f7..14e35d41a508 100644
--- a/app-accessibility/freetts/Manifest
+++ b/app-accessibility/freetts/Manifest
@@ -1,4 +1,4 @@
-AUX jsapi-gentoo.diff 10444 BLAKE2B 0f829738e11f9cf3e852aac0483c891f4c140639e0c7037abf9117a9301f85632bfe11409191d8c137a9b2c4f9dc4251618f16c376fb6c35c9b0848f06072465 SHA512 43e53a55afb973821a7997f7989e7330e263a55eb4c1fdd4bbc6b7269ae428582f21f59b05e258f618c9f2ce88d047797e24dfdaab7465c6feca995fcbcb8ca1
+AUX jsapi-gentoo.diff 10456 BLAKE2B c0de49a34fe6e5240f4a1c895b99593a169a3a14fe7c3b98cc62723d34b31935735e9632f599b90748a760a448860ae81d2a1e48de6f1074633d33e19c5158d3 SHA512 62acd90cb064db176ee7a0950857c173f2ace4de6a6319fce3273bcbb222f8fd309bc6939eaba00a00cd7217871dca60cfa33d5ee1396b86333b9dedbf8f3034
 DIST freetts-1.2.2-src.zip 14111416 BLAKE2B fd3ac79ffe3ca031d40a6523a4ae900200c1b1eea0369fd1eec3233f852af8edffd81ca6c0bba628132221346d283d2138794e1f9697074fc1044944ad852e5b SHA512 a2cce0b1fd2267cc8dbd3e2ad3ec1f99526de3988443c0937405cc7b2eab9ef517001ef0b4b387e8721d3c33610cd642c6b7cf83217996a83481830de9713de7
-EBUILD freetts-1.2.2.ebuild 1891 BLAKE2B 166113be9418f3adbd08d72864765e41673a7eb9fc4605730acbeb2d4cbc6f4c4f69faad5b881e688564049135092df123a2446dc06da4e0d0711f289d1859e0 SHA512 86b7a960527ec03d1fdb5696685ba715de17c84487140d0607579e1187678890adcbffd757850ccb52167227c9feffd1c178df5a1df5be08f27f0a99a2bb4e27
+EBUILD freetts-1.2.2-r1.ebuild 1914 BLAKE2B 1e0be38b586cbbe84ddb212b1046e1386097bcf57af706d41f382ce0a62b1fb7dde3e2df0d173545314da22c52e6a2affd9b085b0d12a92673e847143aa2c983 SHA512 74ab139b264f65d67f2eecd9725c2332d8a7774f4907c5ca638555de6760642d43f873b8d12b2510b0c16f0de964a17dd6a1f99bc1fe4634b55bd4b86b192c29
 MISC metadata.xml 576 BLAKE2B dda15cfed056b8e34ebd707ac45b632b2ba322b85109a77fd8cdb3c9f2e485ec6495cee5773ec7a092e553dc51f2e1534b9778b1e35ec1f6719ce8ac56fb3406 SHA512 f4541826693d1e4b6c943c269d2702f27d60c70727f19ac6511696c723d9e56e5d4673ebb8a219a974bd1b1cfdeba9164b8084017c09fba28429b795308b25a8
diff --git a/app-accessibility/freetts/files/jsapi-gentoo.diff b/app-accessibility/freetts/files/jsapi-gentoo.diff
index 016263e24d0d..5230c41476a5 100644
--- a/app-accessibility/freetts/files/jsapi-gentoo.diff
+++ b/app-accessibility/freetts/files/jsapi-gentoo.diff
@@ -1,5 +1,5 @@
---- jsapi.sh	2001-12-20 09:51:28.000000000 -0500
-+++ jsapi-gentoo.sh	2004-03-20 01:36:10.021810888 -0500
+--- a/lib/jsapi.sh	2001-12-20 09:51:28.000000000 -0500
++++ b/lib/jsapi-gentoo.sh	2004-03-20 01:36:10.021810888 -0500
 @@ -10,191 +10,6 @@
  # ------ ---------- ------------------------------------------
  #  51811 -rw-rw-r-- jsapi.jar
diff --git a/app-accessibility/freetts/freetts-1.2.2.ebuild b/app-accessibility/freetts/freetts-1.2.2-r1.ebuild
index 31b68c3c7b28..bca36b634869 100644
--- a/app-accessibility/freetts/freetts-1.2.2.ebuild
+++ b/app-accessibility/freetts/freetts-1.2.2-r1.ebuild
@@ -1,32 +1,36 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 JAVA_PKG_IUSE="doc examples source"
-inherit eutils epatch java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="A speech synthesis system written entirely in Java"
+HOMEPAGE="https://freetts.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
-HOMEPAGE="http://freetts.sourceforge.net/"
-
-RDEPEND=">=virtual/jre-1.4
-	mbrola? ( >=app-accessibility/mbrola-3.0.1h-r6 ) "
-
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}
-	jsapi? ( app-arch/sharutils )
-	app-arch/unzip"
 
 LICENSE="jsapi? ( sun-bcla-jsapi ) freetts"
 SLOT="0"
 KEYWORDS="amd64 ppc64 x86"
 IUSE="jsapi mbrola"
 
+DEPEND=">=virtual/jdk-1.8:*
+	${RDEPEND}
+	jsapi? ( app-arch/sharutils )"
+RDEPEND=">=virtual/jre-1.8:*
+	mbrola? ( >=app-accessibility/mbrola-3.0.1h-r6 ) "
+BDEPEND="app-arch/unzip"
+
 # Tests aren't present.
 RESTRICT="test"
 
-java_prepare() {
+PATCHES=( "${FILESDIR}"/jsapi-gentoo.diff )
+
+DOCS=( ANNOUNCE.txt README.txt RELEASE_NOTES )
+
+src_prepare() {
+	default
 	# Prepare source directory.
 	mkdir src || die "Failed to create source directory."
 	mv com de src/ || die "Failed to move files to source directory."
@@ -34,7 +38,6 @@ java_prepare() {
 	# Prepare library directory.
 	cd lib || die "Lib directory not present."
 	chmod 0755 jsapi.sh || die "jsapi.sh not present or can't change permissions."
-	epatch "${FILESDIR}"/jsapi-gentoo.diff
 
 	use mbrola && echo "mbrola.base=/usr/share/mbrola/" >> "${S}"/speech.properties
 }
@@ -56,6 +59,7 @@ src_compile() {
 #}
 
 src_install() {
+	default
 	java-pkg_dojar lib/*.jar mbrola/*.jar
 
 	use mbrola && local jflags="--java_args -Dmbrola.base=/usr/share/mbrola"
@@ -66,11 +70,9 @@ src_install() {
 	doins speech.properties
 	doins -r tools
 
-	dodoc ANNOUNCE.txt README.txt RELEASE_NOTES
-
 	if use doc ; then
-		insinto /usr/share/doc/${PF}/html
-		doins -r docs/*
+		docinto /usr/share/doc/${PF}/html
+		dodoc -r docs/*
 		java-pkg_dojavadoc javadoc
 	fi
 
@@ -79,6 +81,6 @@ src_install() {
 	fi
 
 	if use source ; then
-		java-pkg-dosrc src/*
+		java-pkg_dosrc src/*
 	fi
 }
diff --git a/app-accessibility/kontrast/Manifest b/app-accessibility/kontrast/Manifest
index ba3d07a87e42..a31d7020d796 100644
--- a/app-accessibility/kontrast/Manifest
+++ b/app-accessibility/kontrast/Manifest
@@ -1,5 +1,5 @@
 DIST kontrast-20.12.3.tar.xz 122468 BLAKE2B 4e29c034ba87781ffef03a37ecc7219eed488585bc47b0b3420950cdfe8fa92e9f4fd2a35dea76ac296318cb8c8be38fcf92061bca105fcfafa9dc9121afbabe SHA512 d6a4b60416f43bc1e9ba2539b13f33233c988417c7e8f05dd295d7e4946301943db9493123a07c48b0844c7aa55a22a3f1b898c3a00cccc6f6aae295d89d90c8
-DIST kontrast-21.04.1.tar.xz 123064 BLAKE2B d0daec7b5507249812aeae354bf6dfd8aa301629bc124dcb63b768ab1114332165a847065d0071a01fb6b204bb0b75ba625685cc1ef53ccb60acc347a3b4cfd1 SHA512 362ca9211e6540dd983c392e8abb3fc655ed54f07bd448b0b6fb58e9d230dc1cab7c3813929f86b16b5ad9b72c2925780344bc2a30e48f48a957f0381ed3b27a
+DIST kontrast-21.04.2.tar.xz 123756 BLAKE2B db8c244dc793ea5bd3377cfacc16ac8a52118d317f97be90513476d99029b972adcad4964605f987e40efd697b300ebb777b0cf6ae1567ca5146e246256303ea SHA512 fb277eee121edd36fd05bfdd6b2758bc98b4026c56dc0c5523a47ca2ac958e34b37c785c5b63dbf1dd46a5e625fd33d130d66c72d5857769f71baa136c02dcdd
 EBUILD kontrast-20.12.3.ebuild 816 BLAKE2B c014e86a0d6d9f93398ff8ad565e09e698c6a7bee12d7abe9d3fc1c88986e5f74f029ee960b11b81b146aace044758ab4f3c75a1cefbe085670cd6bced016604 SHA512 d5431072659281f8c691b3d4fbe004d64d2cdd97fe7f7a7add7e9d3dccf01603c4b959ee351f2d773f201ae1c61512ac0cc696d7c2acad5d0d3e822acbf100c7
-EBUILD kontrast-21.04.1.ebuild 808 BLAKE2B 495bd0b2cc247bbf03c2738c3a276ecafd52b81780578060b445774c78adc2ce6599954426082f7cf1d9b7c4a1cf74f921052605a523fa73e88a0062877d4c2a SHA512 cd09249358eab250e7bc17078b7b6fafb4a26432bec06f355cdb7ea2dd08447ce1c7904944d412328682abafc1b6258ee65e561b68f9556f079111cb15399ffa
+EBUILD kontrast-21.04.2.ebuild 808 BLAKE2B 495bd0b2cc247bbf03c2738c3a276ecafd52b81780578060b445774c78adc2ce6599954426082f7cf1d9b7c4a1cf74f921052605a523fa73e88a0062877d4c2a SHA512 cd09249358eab250e7bc17078b7b6fafb4a26432bec06f355cdb7ea2dd08447ce1c7904944d412328682abafc1b6258ee65e561b68f9556f079111cb15399ffa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-accessibility/kontrast/kontrast-21.04.1.ebuild b/app-accessibility/kontrast/kontrast-21.04.2.ebuild
index 88b97cc55cc8..88b97cc55cc8 100644
--- a/app-accessibility/kontrast/kontrast-21.04.1.ebuild
+++ b/app-accessibility/kontrast/kontrast-21.04.2.ebuild