gentoo auto-resync : 29:10:2022 - 16:01:29

4 files changed, 218 insertions, 0 deletions

diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index e5dae061608f..c32dd0d7a5fe 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/speech-dispatcher/Manifest b/app-accessibility/speech-dispatcher/Manifest
index f8fa8aeff2fd..729f45699e07 100644
--- a/app-accessibility/speech-dispatcher/Manifest
+++ b/app-accessibility/speech-dispatcher/Manifest
@@ -1,6 +1,8 @@
 AUX speech-dispatcher-0.11.1-include-pthread_h.patch 367 BLAKE2B 54e4cb3556f066c7291c6c601a0a9cf13c75dc14bfc2ef493d5fd6e38226d10b119612ed57ea4a44d65819653e76a2e74e54e286214f3fd353b8149c00de1ed2 SHA512 d7afc36cd26052576e0fb3af44ba438b5184d32b1d80c98409e227cc86858dfcfcb9287cf44f986042e2733004f30d30a9431e00653779e312543cf43e108537
+AUX speech-dispatcher-0.11.3-fix-dlopen.patch 2518 BLAKE2B 99490232eb3ea43451caf942ff605ca4f94a3917c525a4a67fd21183a0e7c8a99a2bc883c5a22c47ad3c3712a5560278105a5f35439c8d18215b8d5cf8d4e6af SHA512 2b6970624c3f7f88e80266760bc801c0b895c0e5730767ac66adf0cbc147fdd2ad2eaae7662e4939938555e30e0de57a6caa0e783dafaeeee1d04d10126fe2cc
 DIST speech-dispatcher-0.11.2.tar.gz 7147526 BLAKE2B 6b11949736275d900e5e1d3909fab51fc04fbb45baf470a4c98aed19f61b7adb8cedf6b11f1a1aa69d9625383627beab4122c74ec78d9c07a5d0ddf4646669d6 SHA512 038ecaa5b9d56e3f915ec49fe7768cb4eebe1c8be79b95635f09fb3f6067e4c0ade13d2dd355e0b326579dcdf509dd180889b27282410b6bb252a2f642f028d4
 DIST speech-dispatcher-0.11.3.tar.gz 7150632 BLAKE2B 92bad589e453a243362a9e0142d2897b9651fa648012f2bd7ef00bc1ded389fd2c01b6f38f19002289357f7aa6361a6e7fa3ee35ec2ad7c044f34d87e7f2c409 SHA512 e9f5b862066c0292230fda32f16782f9a2d66e8d0c0e3aa0ccdb4628c1182661d2f40894f480ae5206af7fbbc49338189312afe02092f5d472095b053afd75c7
 EBUILD speech-dispatcher-0.11.2.ebuild 2868 BLAKE2B 343ddf0cbd7f970e93175e60385aa3869ab173ac51db10ee3f12b38dce0c68724e36b3da03682fe6b850b07a996e2f10d3921eba73c10d8b50bf3954869f7c23 SHA512 42539976ba09a7dfc6853201a23ca60bc6abb0e957bf1e69bd10b14f674c8724aa092ec487fbe5eb5551fa4336adf113a5b62b8445f55f3ad138ffb23867a162
+EBUILD speech-dispatcher-0.11.3-r1.ebuild 2912 BLAKE2B 0ac187c72682eb88a03e9382be2d2c3758ea53a96f0f4d188870fa955a5bc5a1e307dc6ac7eb7d8f0b106550e2cc40e6415a7c36739a4d8becda131384f05d70 SHA512 6ba9d5976a808bd3fa0fbae4d9e5c5375d83aa6cbb232740b22f9be7dd21c4884400b0a67aad040f2ec847c6312a610350c6a49c73ba471402d815aa975c6651
 EBUILD speech-dispatcher-0.11.3.ebuild 2875 BLAKE2B 7e43633fa593175d1bf889e1f11004c5d95973a0eaa25b9005dc7abc116e9cf393d2a708b92849a2d1581c3d5adf5da4cad711d2cefc7e53e91129a3095dab06 SHA512 e0180013b2599505b0bbcae9dc4dfaf1621af0b699bae5c88f81f7b550791371139113cef98ffcbc3de4a7bd689bf068c5e1e300ddc96cbd00b4dd28ca99a91c
 MISC metadata.xml 708 BLAKE2B fdccc4d8de7f22eb64469021786480527bd87f3718dd5746426874266b8a46dcb6cc2b7bb25a4561a523362b919e0ed77e3f829f3fe269d90060d17a69f1b2ed SHA512 770e54e5ddeacc46165b90d41dd3ea0d1060adfdfb95055a9dab778f757189b892250e66b515773ce7b4d8b1bbdd692386b4d8cb49d670af7af8dadfed5c8788
diff --git a/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.3-fix-dlopen.patch b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.3-fix-dlopen.patch
new file mode 100644
index 000000000000..f520fdc6adfb
--- /dev/null
+++ b/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);
+
diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.3-r1.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.3-r1.ebuild
new file mode 100644
index 000000000000..93309e5e9e06
--- /dev/null
+++ b/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
+}