gentoo resync : 11.05.2021

4 files changed, 2 insertions, 145 deletions

diff --git a/app-accessibility/speech-tools/Manifest b/app-accessibility/speech-tools/Manifest
index d29c61199a65..2f2f0195ffa3 100644
--- a/app-accessibility/speech-tools/Manifest
+++ b/app-accessibility/speech-tools/Manifest
@@ -1,9 +1,6 @@
-AUX speech-tools-2.1-gcc7.patch 612 BLAKE2B ded8216c1e7c49821fd1bd738f1c0d508afbd07115d98d3149d31eb402611c1dbe70c07d4885e82beef94bfdfe8a9261722eaf7ea43f3704cee27eb5055f7488 SHA512 6d4c9c43821f571b5fa8f476f740ee276b9a05dcb8a39cfc32f5b3a87548acf051a1abf75f3be5a8563b03c5302b9208ce894a5065899b0f43ba9d2ffe7a65db
 AUX speech-tools-2.1-underlinking.patch 565 BLAKE2B 1be43841d09fe456874323a02d63253dae37dfe6f6969f7d9941c8a39d0ad9127e8fd1b87f5b6e59fcc505f2c9e2bc988b4f572ccbb01418d11ca0fda88b262d SHA512 4091b64da995f2f859f8debd7c6b7c20bf3a788c91d8aa7651f3c6f89445c9fc60b60923a3056de678ec17faee41839917131b9a3176e53c0afc11e24fe92e47
 AUX speech-tools-2.5.0-fno-common.patch 1003 BLAKE2B 6b4dcdf205f2e986e659efda4d52c447b0183cc59146ec892b86d360f16fccab0a85667743c6e0f31a07f20983cce604d3202756c16eae4eff2eb88b1079407c SHA512 ae34fadda5f92dfade923af07222c1ed35b8b39bafc7604a86cebd7196888b2cf9a41fe2686e5210a556309a9c2e71076d22e3f56f1ccec0aca3d4a7bd18f3c1
 DIST speech_tools-2.1-r3-patches.tar.gz 6876 BLAKE2B 84ddc30de90459f913cc32d4338097feb35dc08c48cbda7fc47a78ee0384668828d7166a5ebb1264272a6c326afd4ff2efdf1d793bb8f33937c09d2c7cd9a2b5 SHA512 db4d656a77e3fcfc43447c11b160cf9b45f0c4ec10f2697e4357f0ec86ea56e2841f1b887493a781406975003f5d8065ffbb75eeebb79fcd9873055b52c248e3
-DIST speech_tools-2.1-release.tar.gz 1681999 BLAKE2B 572e7877e195c098dd2df03cda86fe58b7a55379cd01adcc22faf5e12b8c004e8c006b852cfe88c5c20df4a0e54e357b445050cdb63088edd55714a98e3eda90 SHA512 6ef9a7dd01ede152c4dafd0b2037312d62a79d875813d74ea048899a52eee505b93ffbabef9b6c0a1d15aeadb5508fd18a2f392e85276847fe071173aec5db96
 DIST speech_tools-2.5.0-release.tar.gz 1328624 BLAKE2B 445dd5a5e39c02352a850fd92de5b3852ae382a4bd013dccb3fdd46b0b22ce0bd10d089f9e860ae3d3e73a489b20b7c8b78335e57a49e40ae01b0f4997d55315 SHA512 013540a5252efb57633f442143a51bc87aac719dfb46c8f47e750322d19dac9b504f55125462a2ee74a6b0bd2661a63a1fc73a8c3c6d2886e38b136a80447fd7
-EBUILD speech-tools-2.1-r4.ebuild 3055 BLAKE2B 91ff2e524213950a0775e7db6933feef960594fd80847cf08849dcff0b71a1be89a74b0fe20c9944422d48abace3f8aa83e9a1bd150c7f36399521049a26dcd1 SHA512 4a89616b573de9bdbfad9bd952d29675edc9c1fca30b1a2870359bf7bea5e7e244a1cb4f1d9553c9d023c4589b5ccb5285d7847fe63cc2daeb6a9b32940baa96
-EBUILD speech-tools-2.5.0.ebuild 3774 BLAKE2B 05ba61033b3cc1d62be2b19aa05890a7ff250b899e53df39a5a260b2a2264eeb96e779bd7e31a064836d70adb324b6296edce564b8aa90942b12c06df0ba7c28 SHA512 2f7608d4d48f54d499f0cfed95bf08d48ca40d01a9950090fa9f0c635d7c996a3bf1e8327c80bf5e8fe4f7322ae59cda815ac9b922824cb25f7d53bda72b192c
+EBUILD speech-tools-2.5.0.ebuild 3772 BLAKE2B b7a494b2a9cf6e356271c8db84c52394657f9747f9eb84780928ffd5e5476ad66e839ffec8385dbd6a0f58a2a759f05a69bbe10e62ac4ddb10727189517c2ec0 SHA512 d6a809b62fbaaaf3b38e608c0274b516340d14c10f2092a2eb1d5ab7b0a450cfe9e7cf60786bd94ec0598545d024a41b7300e58f7fde78880d8be0f01591595c
 MISC metadata.xml 482 BLAKE2B 2638ba066698967011156e0333f367bed8b4a6ffcf765afe64d976724264db09fa2dfb8c6a10f35e3bc298d0b1e9604f8081a74d130a7afbf4ddd019dfffab8b SHA512 1752986ddb186ab10d069dce7ee81c7d0077673a06682e15f4e66a5a87cb29ba4e126a2a627f5f43e388a1d180e243d5362cceae943b1f90b35f54c19de1d2ee
diff --git a/app-accessibility/speech-tools/files/speech-tools-2.1-gcc7.patch b/app-accessibility/speech-tools/files/speech-tools-2.1-gcc7.patch
deleted file mode 100644
index 9e1067fa1dc1..000000000000
--- a/app-accessibility/speech-tools/files/speech-tools-2.1-gcc7.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/siod/siod.cc
-+++ b/siod/siod.cc
-@@ -459,7 +459,7 @@ char **siod_variable_generator(char *text,int length)
-     matches = walloc(char *,siod_llength(lmatches)+1);
-     for (l=lmatches,i=0; l; l=cdr(l),i++)
- 	matches[i] = wstrdup(PNAME(car(l)));
--    matches[i] = '\0';
-+    *matches[i] = '\0';
- 
-     return matches;
- }
-@@ -498,7 +498,7 @@ char **siod_command_generator (char *text,int length)
-     matches = walloc(char *,siod_llength(lmatches)+1);
-     for (l=lmatches,i=0; l; l=cdr(l),i++)
- 	matches[i] = wstrdup(PNAME(car(l)));
--    matches[i] = '\0';
-+    *matches[i] = '\0';
- 
-     return matches;
- }
diff --git a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild b/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild
deleted file mode 100644
index 2f487ae007ac..000000000000
--- a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils epatch flag-o-matic multilib toolchain-funcs
-
-MY_P=${P/speech-/speech_}
-PATCHSET="r3"
-
-DESCRIPTION="Speech tools for Festival Text to Speech engine"
-HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/"
-SRC_URI="http://www.festvox.org/packed/festival/${PV}/${MY_P}-release.tar.gz
-		 https://dev.gentoo.org/~neurogeek/${PN}/${MY_P}-${PATCHSET}-patches.tar.gz"
-
-LICENSE="FESTIVAL HPND BSD rc regexp-UofT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="nas X"
-
-RDEPEND="
-	nas? ( media-libs/nas )
-	X? ( x11-libs/libX11
-		x11-libs/libXt )
-	>=media-libs/alsa-lib-1.0.20-r1
-	!<app-accessibility/festival-1.96_beta
-	!sys-power/powerman
-	>=sys-libs/ncurses-5.6-r2:0=
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/speech_tools"
-
-src_prepare() {
-	EPATCH_SUFFIX="patch"
-	epatch
-
-	sed -i -e 's,{{HORRIBLELIBARCHKLUDGE}},"/usr/$(get_libdir)",' \
-		main/siod_main.cc || die
-
-	#WRT bug #309983
-	sed -i -e "s:\(GCC_SYSTEM_OPTIONS =\).*:\1:" \
-		"${S}"/config/systems/sparc_SunOS5.mak || die
-
-	# Fix underlinking, bug #493204
-	epatch "${FILESDIR}"/${PN}-2.1-underlinking.patch
-
-	# Fix gcc7 build failure, bug #634224
-	epatch "${FILESDIR}"/${PN}-2.1-gcc7.patch
-}
-
-src_configure() {
-	local CONFIG=config/config.in
-	sed -i -e 's/@COMPILERTYPE@/gcc42/' ${CONFIG} || die
-	if use nas; then
-		sed -i -e "s/#.*\(INCLUDE_MODULES += NAS_AUDIO\)/\1/" \
-			${CONFIG} || die
-	fi
-	if ! use X; then
-		sed -i -e "s/-lX11 -lXt//" config/modules/esd_audio.mak || die
-	fi
-	econf
-}
-
-src_compile() {
-	emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" CXX_OTHER_FLAGS="${CXXFLAGS}" CC_OTHER_FLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dolib.so lib/libest*.so*
-
-	dodoc "${S}"/README
-	dodoc "${S}"/lib/cstrutt.dtd
-
-	insinto /usr/share/doc/${PF}
-	doins -r lib/example_data
-
-	insinto /usr/share/speech-tools
-	doins -r config base_class
-
-	insinto /usr/share/speech-tools/lib
-	doins -r lib/siod
-
-	cd include || die
-	insinto /usr/include/speech-tools
-	doins -r *
-	dosym ../../include/speech-tools /usr/share/speech-tools/include
-
-	cd ../bin || die
-	for file in *; do
-		[ "${file}" = "Makefile" ] && continue
-		dobin ${file}
-		dstfile="${D}/usr/bin/${file}"
-		sed -i -e "s:${S}/testsuite/data:/usr/share/speech-tools/testsuite:g" \
-			${dstfile} || die
-		sed -i -e "s:${S}/bin:/usr/$(get_libdir)/speech-tools:g" \
-			${dstfile} || die
-		sed -i -e "s:${S}/main:/usr/$(get_libdir)/speech-tools:g" \
-			${dstfile} || die
-
-		# This just changes LD_LIBRARY_PATH
-		sed -i -e "s:${S}/lib:/usr/$(get_libdir):g" ${dstfile} || die
-	done
-
-	cd "${S}" || die
-	exeinto /usr/$(get_libdir)/speech-tools
-	for file in `find main -perm /111 -type f`; do
-		doexe ${file}
-	done
-
-	#Remove /usr/bin/resynth as it is broken. See bug #253556
-	rm "${D}/usr/bin/resynth" || die
-
-	# Remove bcat (only useful for testing on windows, see bug #418301).
-	rm "${D}/usr/bin/bcat" || die
-	rm "${D}/usr/$(get_libdir)/speech-tools/bcat" || die
-}
diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild
index f14ff35bfac3..1c0615542e77 100644
--- a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/speech_tools"
 
 LICENSE="FESTIVAL HPND BSD rc regexp-UofT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="nas openmp X"
 
 RDEPEND="