Merge branch 'master' into app-backup/burp-3.1.2

app-accessibility/accerciser/accerciser-3.40.0.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit gnome2 python-single-r1

app-accessibility/accerciser/metadata.xml

@@ -10,4 +10,7 @@
 
   In essence, Accerciser is a next generation at-poke tool.
   </longdescription>
+  <upstream>
+    <remote-id type="gnome-gitlab">GNOME/accerciser</remote-id>
+  </upstream>
 </pkgmetadata>

app-accessibility/at-spi2-atk/metadata.xml

@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<longdescription lang="en">at-spi2-atk is the library used to bridge ATK to AT-SPI, allowing applications
-exposing information via ATK to interface with clients that use AT-SPI. This
-module provides the necessary inter-process communication to allow
-accessibility-oriented software to operate.
-</longdescription>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <longdescription lang="en">
+    at-spi2-atk is the library used to bridge ATK to AT-SPI, allowing applications
+    exposing information via ATK to interface with clients that use AT-SPI. This
+    module provides the necessary inter-process communication to allow
+    accessibility-oriented software to operate.
+  </longdescription>
+  <upstream>
+    <remote-id type="gnome-gitlab">GNOME/at-spi2-atk</remote-id>
+  </upstream>
 </pkgmetadata>

app-accessibility/at-spi2-core/metadata.xml

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="gnome-gitlab">GNOME/at-spi2-core</remote-id>
+  </upstream>
 </pkgmetadata>

app-accessibility/orca/metadata.xml

@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
-	<flag name="braille">Enable braille support</flag>
-</use>
-<longdescription>
-	Orca is a flexible, extensible, and powerful assistive technology
-	for people with visual impairments. Using various combinations of
-	speech synthesis, braille, and magnification, Orca helps provide
-	access to applications and toolkits that support the AT-SPI (e.g.,
-	the GNOME desktop).
-</longdescription>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <use>
+    <flag name="braille">Enable braille support</flag>
+  </use>
+  <longdescription>
+    Orca is a flexible, extensible, and powerful assistive technology
+    for people with visual impairments. Using various combinations of
+    speech synthesis, braille, and magnification, Orca helps provide
+    access to applications and toolkits that support the AT-SPI (e.g.,
+    the GNOME desktop).
+  </longdescription>
+  <upstream>
+    <remote-id type="gnome-gitlab">GNOME/orca</remote-id>
+  </upstream>
 </pkgmetadata>

app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.3-fix-dlopen.patch

@@ -0,0 +1,93 @@
+https://github.com/brailcom/speechd/commit/db21e5fe4b3155734f60a67c8ab5da6b53174e1b
+https://github.com/brailcom/speechd/pull/783
+https://bugs.gentoo.org/877339
+
+From db21e5fe4b3155734f60a67c8ab5da6b53174e1b Mon Sep 17 00:00:00 2001
+From: Bernard Cafarelli <bernard.cafarelli@gmail.com>
+Date: Mon, 17 Oct 2022 15:28:37 +0200
+Subject: [PATCH] Fix audio plugin loading with dlopen
+
+dlopen needs the full name including .so extension
+Set SPD_AUDIO_PLUGIN_ENTRY to correct name (ltdl adds a prefix)
+--- a/src/audio/alsa.c
++++ b/src/audio/alsa.c
+@@ -37,7 +37,11 @@
+ #include <alsa/asoundlib.h>
+ #include <alsa/pcm.h>
+
++#ifdef USE_DLOPEN
++#define SPD_AUDIO_PLUGIN_ENTRY spd_audio_plugin_get
++#else
+ #define SPD_AUDIO_PLUGIN_ENTRY spd_alsa_LTX_spd_audio_plugin_get
++#endif
+ #include <spd_audio_plugin.h>
+
+ typedef struct {
+--- a/src/audio/libao.c
++++ b/src/audio/libao.c
+@@ -32,7 +32,11 @@
+ #include <glib.h>
+ #include <ao/ao.h>
+
++#ifdef USE_DLOPEN
++#define SPD_AUDIO_PLUGIN_ENTRY spd_audio_plugin_get
++#else
+ #define SPD_AUDIO_PLUGIN_ENTRY spd_libao_LTX_spd_audio_plugin_get
++#endif
+ #include <spd_audio_plugin.h>
+
+ /* send a packet of XXX bytes to the sound device */
+--- a/src/audio/nas.c
++++ b/src/audio/nas.c
+@@ -32,7 +32,11 @@
+
+ #include <pthread.h>
+
++#ifdef USE_DLOPEN
++#define SPD_AUDIO_PLUGIN_ENTRY spd_audio_plugin_get
++#else
+ #define SPD_AUDIO_PLUGIN_ENTRY spd_nas_LTX_spd_audio_plugin_get
++#endif
+ #include <spd_audio_plugin.h>
+
+ typedef struct {
+--- a/src/audio/oss.c
++++ b/src/audio/oss.c
+@@ -39,7 +39,11 @@
+
+ #include <sys/soundcard.h>
+
++#ifdef USE_DLOPEN
++#define SPD_AUDIO_PLUGIN_ENTRY spd_audio_plugin_get
++#else
+ #define SPD_AUDIO_PLUGIN_ENTRY spd_oss_LTX_spd_audio_plugin_get
++#endif
+ #include <spd_audio_plugin.h>
+
+ typedef struct {
+--- a/src/audio/pulse.c
++++ b/src/audio/pulse.c
+@@ -51,7 +51,11 @@
+ #include <pulse/simple.h>
+ #include <pulse/error.h>
+
++#ifdef USE_DLOPEN
++#define SPD_AUDIO_PLUGIN_ENTRY spd_audio_plugin_get
++#else
+ #define SPD_AUDIO_PLUGIN_ENTRY spd_pulse_LTX_spd_audio_plugin_get
++#endif
+ #include <spd_audio_plugin.h>
+
+ typedef struct {
+--- a/src/common/spd_audio.c
++++ b/src/common/spd_audio.c
+@@ -120,7 +120,7 @@ AudioID *spd_audio_open(const char *name, void **pars, char **error)
+ 		plugin_dir = PLUGIN_DIR;
+
+ #ifdef USE_DLOPEN
+-	libname = g_strdup_printf("%s/" SPD_AUDIO_LIB_PREFIX "%s", plugin_dir, name);
++	libname = g_strdup_printf("%s/" SPD_AUDIO_LIB_PREFIX "%s.so", plugin_dir, name);
+ 	dlhandle = dlopen(libname, RTLD_NOW | RTLD_GLOBAL);
+
+ 	g_free(libname);
+

app-accessibility/speech-dispatcher/speech-dispatcher-0.11.3-r1.ebuild

@@ -0,0 +1,123 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit python-r1 systemd
+
+DESCRIPTION="Speech synthesis interface"
+HOMEPAGE="https://freebsoft.org/speechd"
+SRC_URI="https://github.com/brailcom/speechd/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="alsa ao espeak +espeak-ng flite nas pulseaudio python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="python? ( ${PYTHON_DEPS} )
+	>=dev-libs/dotconf-1.3
+	>=dev-libs/glib-2.36:2
+	>=media-libs/libsndfile-1.0.2
+	alsa? ( media-libs/alsa-lib )
+	ao? ( media-libs/libao )
+	espeak? ( app-accessibility/espeak )
+	espeak-ng? ( app-accessibility/espeak-ng )
+	flite? ( app-accessibility/flite )
+	nas? ( media-libs/nas )
+	pulseaudio? ( media-sound/pulseaudio )"
+RDEPEND="${DEPEND}
+	python? ( dev-python/pyxdg[${PYTHON_USEDEP}] )"
+BDEPEND="
+	sys-apps/help2man
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.11.1-include-pthread_h.patch
+	"${FILESDIR}"/${P}-fix-dlopen.patch
+)
+
+src_configure() {
+	# bug 573732
+	export GIT_CEILING_DIRECTORIES="${WORKDIR}"
+
+	local myeconfargs=(
+		--disable-ltdl
+		--disable-python
+		--disable-static
+		--with-baratinoo=no
+		--with-ibmtts=no
+		--with-kali=no
+		--with-pico=no
+		--with-voxin=no
+		$(use_with alsa)
+		$(use_with ao libao)
+		$(use_with espeak)
+		$(use_with espeak-ng)
+		$(use_with flite)
+		$(use_with nas)
+		$(use_with pulseaudio pulse)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	use python && python_copy_sources
+
+	emake
+
+	if use python; then
+		building() {
+			cd src/api/python || die
+			emake \
+				pyexecdir="$(python_get_sitedir)" \
+				pythondir="$(python_get_sitedir)"
+		}
+		python_foreach_impl run_in_build_dir building
+	fi
+}
+
+src_install() {
+	default
+
+	if use python; then
+		installation() {
+			cd src/api/python || die
+			emake \
+				DESTDIR="${D}" \
+				pyexecdir="$(python_get_sitedir)" \
+				pythondir="$(python_get_sitedir)" \
+				install
+		}
+		python_foreach_impl run_in_build_dir installation
+		python_replicate_script "${ED}"/usr/bin/spd-conf
+		python_foreach_impl python_optimize
+	fi
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
+
+pkg_postinst() {
+	local editconfig="n"
+	if ! use espeak-ng; then
+		ewarn "You have disabled espeak-ng, which is speech-dispatcher's"
+		ewarn "default speech synthesizer."
+		ewarn
+		editconfig="y"
+	fi
+	if ! use pulseaudio; then
+		ewarn "You have disabled pulseaudio support."
+		ewarn "pulseaudio is speech-dispatcher's default audio subsystem."
+		ewarn
+		editconfig="y"
+	fi
+	if [[ "${editconfig}" == "y" ]]; then
+		ewarn "You must edit ${EROOT}/etc/speech-dispatcher/speechd.conf"
+		ewarn "and make sure the settings there match your system."
+		ewarn
+	fi
+}

app-admin/ansible-molecule/ansible-molecule-4.0.1.ebuild

@@ -48,7 +48,6 @@ BDEPEND="$(python_gen_cond_dep '
 		>=dev-python/ansi2html-1.6.0[${PYTHON_USEDEP}]
 		dev-python/filelock[${PYTHON_USEDEP}]
 		<dev-python/pexpect-5[${PYTHON_USEDEP}]
-		>=dev-python/pytest-html-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/pytest-mock-3.3.1[${PYTHON_USEDEP}]
 		>=dev-python/pytest-plus-0.2[${PYTHON_USEDEP}]
 		>=dev-python/pytest-testinfra-6.1.0[${PYTHON_USEDEP}]

app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild

@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"
 

app-admin/awscli/Manifest

@@ -1,9 +1,7 @@
-DIST aws-cli-1.25.81.gh.tar.gz 2273195 BLAKE2B 3bf3ca742b08c0bf4367ae1bfabcf8c2626010d60cc11ff66250753f62609eba80053c1d8696cc3184ba9f947f995a8bb95489b01f60a3fa7e1a8cbb4961652c SHA512 4f10de492a56b158d88671c149d4ed4171fbbde8fe84de15a446e31a7d8003a4562439eabd369cb80dcf91987caab6aef05e5b3f5684aeea47ba0d323883c53c
 DIST aws-cli-1.25.89.gh.tar.gz 2285887 BLAKE2B 1da21b1e314b187ee105d2bf256ce2fea42fec8d1e5cf0de39c8371a93a588e24e5415b2e50ae314d39613a4ae55963bd544cc7ab3e08d0e38089c5c609454f4 SHA512 39087e269a0318777af73d010d7c6264fd595fc5d27f24bb66da07763165729526bd8a60f4225241eb5172d879d6f562c5bf64ad5979d7ac3be40b7d8cf33486
-DIST aws-cli-1.25.90.gh.tar.gz 2285948 BLAKE2B a664e70e7367e6cf6fbaf62ab4dbbf649e92f3184793cb0f444c520b947cfc0845e075a44025b48a02b431e237d835de23aba6f83fdea5810d759690368ce069 SHA512 f42b0125cddc35314a675f84672fb5716300d9625eac7338b36b6f501d412a5e932f1d75566a9cdaca84b9f7cd65cc354199e5138675d48a0f52ace9a1ab126b
-DIST aws-cli-1.25.91.gh.tar.gz 2287481 BLAKE2B 6cc39905deee332187249124bedc14ef7f2bd82c8a54ee56c6156e767f811a8d26070040f64a059b1bf9a6c46e64cecf82be3d94434f6fb3e0c16dca4cbd94d2 SHA512 531985f71aea2c7eafeba61a214a7f19dfd84912b3c25c47d5c4c44b2e2fae25510a57027fa9a79aaee9a417cbcea1a6d222c7a0f0233ee0afee844a2d99dbe1
-DIST aws-cli-1.25.92.gh.tar.gz 2287842 BLAKE2B 5cbadaeed098efa7a7ac911e76d1259e2fd7310b4c87f6f37fb4c3aa731d4f4fdacf6a3ea4345a295e8f6eba2985698ed36287f84303ba22e1466afa7acdcd06 SHA512 9c646c7f081ffe26571d36953e1c98a80a863ae4b0b3cf941aaa4958a96967481aeb634dfb84dae2bf9d3e20ad528b093634d2bb011ec85f3d583de84c72ebb8
-DIST aws-cli-1.25.93.gh.tar.gz 2288018 BLAKE2B ef0a0c679f5e4e698b21f84f2f0aa594889205c0f468cd3ac665040987a843ad9888687e3127f7755d90c715680fcba39430b094e35c8d017837cd9e8b1d51f0 SHA512 6052e677e04b84eb90a853bb6a85506f1b0b1270e64e2f93d666c66deda1824392cbfa1746a55dfb4f2a64554decb54a94e91b60564291621ff939c894f39ca3
-DIST aws-cli-1.25.94.gh.tar.gz 2288438 BLAKE2B c30b798d1e489b04d0d63630fee9a782262be83cb30df6e66793cbba7951135a814734d90cb6117f87382ec520204f7e553a16bee87c1acd448d22581e0cc14d SHA512 9407751a543c4d15d80d8986508abe2b4c1eb2bc375119f17e60928342f3af442359982f6600b551c318fda0c80629ea02511ad70cdb096adf8e91891ceadc03
-DIST aws-cli-1.25.96.gh.tar.gz 2289725 BLAKE2B 8f1a562a9b144f32e0e72eb8a34cf02ce96f740bded6ebe2e14e16da69d614d06f5285614ff2a1c428330290cc2e6c9cab80639dd4b8da7219d16c112d26cb91 SHA512 c45e0ac254a4f3f7d84fdb082a7932f98921b660b465892b759302937f295ce4eeb7750c492be62c36f96cc6c21d5699c44093c5cd00a32a98659fc707b570a7
 DIST aws-cli-1.25.97.gh.tar.gz 2290672 BLAKE2B 4fbff8d9747b615f7b8633ce2a1c7a68880d50d3a22c5bcdfe2e352a8ea84f8b9d0d1c94d514be3e871beeba5c2cc69853fb40daaa4fa4bfd3409779ca2713b5 SHA512 a27dab95240036158d2dc331a3b1768e7c705b52cb1fcf7f5d0bbc3f40bed62838565493c463e22cf2b249981b0fca255ce65d64b7cfa45df24621cb788171e7
+DIST aws-cli-1.26.0.gh.tar.gz 2291209 BLAKE2B ad2b9380d45d986b2cc4219a93ee30fdc1e86e35e66dc095c76f29e6062601d0e443a96fa93edbc65562580eb9815a8d3f31a59a0c850513793df3870e809be8 SHA512 5b7e87b4fe02d7fbca0482cb93616b8f78f0bb074ed779ca553532be54f914c827a30b8458e209e6fbd23d22b5e734dfe14fb79e8833c3055c771a1766153d2d
+DIST aws-cli-1.26.1.gh.tar.gz 2291902 BLAKE2B 04df153b4b7608ab3c2e86c230065f7b935a911e88e1a5b788dee545d328d9839ba9aba44b334522f2afafef8fa613aea6e749a2a7f9089f40993544f3cec9e9 SHA512 418257a8e4c92a6d21c89f7725cd70f463f4dd53c798783b29c4166daac644501e4a03a180257dfe356bf30228dedcf7a672ad46ff6f36afd40a8efd9ad786f9
+DIST aws-cli-1.26.2.gh.tar.gz 2292384 BLAKE2B 72a24a647ba73ce492f2c7c43984af2c7185da8415c3124c4d55acd81bb8bb8895d5d01232bf2267166094ba0ca24fa690c81838f28ef5b40fbcdaaa6fd93c5a SHA512 fc3569a9c81481fa2b1b04c74b89073724cea0c0f035f60ceb5a8f47f848a2a6c8e104ef1e1ed883c1d330c4b5c240c2b79e86d6eaf28c7a120d1c3cae826e92
+DIST aws-cli-1.26.3.gh.tar.gz 2292758 BLAKE2B b872cf8412628e1b8409fa96f2e1954cbb055bef0bb09485e42d458bbe43cc525fa4fd09bbe6060a6391f2f73952527e2b7aca59bb68bbb1d680884b0fd339c0 SHA512 9a74439c4a4ea43a32df1ab3022dab213ebd62401540bdebba6d263305582f538ce3dba128ac7723972c921c90e3f05fb86a1b5d533a3d36436f057799a9b506
+DIST aws-cli-1.26.4.gh.tar.gz 2293891 BLAKE2B 5565375f74d88b5e0ddc1a96ab461c63bad04ee7a624a7b77e71a3bfee44f75175e892d2a91a1d8e32f7d9cce9888f87109db0bc4aa5b032947d94cbf713b910 SHA512 74df7c09d4edad09745ee9d0412d288ef34230d8fced1b4c8471fb278032b4141c077fc5c3f458c6d76bd593d672c59f650f1372cf324a15e3b12afcabecec42