gentoo resync : 30.09.2020

10 files changed, 11 insertions, 250 deletions

diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index b0892e8f39c7..76e9484a32c3 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/espeak/Manifest b/app-accessibility/espeak/Manifest
index 68f2af1d952c..54fd8db884e8 100644
--- a/app-accessibility/espeak/Manifest
+++ b/app-accessibility/espeak/Manifest
@@ -1,7 +1,4 @@
 AUX espeak-1.48.04-gcc-6-fix.patch 531 BLAKE2B e17d5304b52ab2e805f63d685f05bf5343a9fd1b64876091b64469ec652296a5de2d04e40b639bd1acb455e133330bfbc270e0d3293b4c487ca174e97d2d4837 SHA512 92966a8f3ef3a4cca2b208216ae9ecd65efdb67001b4ed8c0868bc95bc87fec88826f7554a5239c97269dc673cec8ac70f36c9f3fe186f0a5e6eca924e0bb681
-DIST espeak-1.47.11-source.zip 2813649 BLAKE2B 0ebeabcfd8193dd0d37c43974616f5fc4d769bde7b0a730b37456cd1ab580ab84b5bc141804f4c25d7bff6f4b401fe46764e0117cd9c4a55e2216de6965c17b7 SHA512 77c3989fbd0e4aadae0da2d7f1c587854895ae103633704ee5b4042b0618897d01edffa80b1f13e6cbf356f2f31beaf4fdb7e90e4ab641d5286d559aaefe932b
 DIST espeak-1.48.04-source.zip 3019245 BLAKE2B a29da5eab832fa76b180049765f7fa671ebf47c0a68ee2cdfb0f4466846d97b2bf7b8f07dba747e236a27c9b077000bfd471e35b9744ffac7c9014679f5c04fd SHA512 f0759e6ace2604c8cbb19e8c3fd4b106edf4dcece247a6677f6b734af7746c35a367126edfbe585396c98f6c54f07e25d64bfab35e258e64f09bd2c0833247fa
-EBUILD espeak-1.47.11-r1.ebuild 2168 BLAKE2B 2135fbf742dc9c1222a01dd3c571387d17b4feb8cd8230e54a76492440e6d25672363887caa55b0ff672479052ac421aeb94aefe085a8cd95bfba9f73651f30b SHA512 b2cd30ce382ec869c04a310d7de495feed225e2e8ba6a54eba7a61515f26633bd96cbe096c03c4153c5678fa695100ed03b613ad62a5810a0c18879c09e50449
 EBUILD espeak-1.48.04-r1.ebuild 2231 BLAKE2B 5d52c5d706fc4b94e109c1a230300c38987f7e0c93de96995e60f84e0de2727372fa06bdf850f951f78fc8d247b10c366aefd5795b7c034c468b552a54d9a7be SHA512 0a88d6efe82d6b340a053f2871cbf60e36f579b6bfde6c82e63f765a14593174e5b8e3692f027b64f710d6d55bd49d6cd503779a606a0713559092c5f19e5e0b
-EBUILD espeak-1.48.04.ebuild 2184 BLAKE2B 6b64fb9c609d35c708e6caac07671efa7faa0ee6ef20857283991898b76b8752ec1325c3011468d90c1a46574b33d3cd5f6e630617cf2e2f50abdd344d7c0b53 SHA512 25f0d32cc339ffe486127cc65e455cb5c5d757f3bd919c1a070af17645b09982fe70b5ab6932433701e040096f3adcc65d3ed93c65dcb80ba5c8e52b5d437659
 MISC metadata.xml 425 BLAKE2B a6169a58eac6bcb96da0494648d79f9d5de93430a267d7530f98204562da315deee7ac12f33b0b31e00bd25d190d63a89d00496f6f571ff9cbeb20bb9ee1e9bc SHA512 b3022c321c69fc77c743a0ef402af1801d426e3b72e84754100a4197a5a82df99bfe85b05411d0510e93a262b91d10d63189ff878af91383583e718b8e468f77
diff --git a/app-accessibility/espeak/espeak-1.47.11-r1.ebuild b/app-accessibility/espeak/espeak-1.47.11-r1.ebuild
deleted file mode 100644
index 1682a370839d..000000000000
--- a/app-accessibility/espeak/espeak-1.47.11-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-MY_P="${P}-source"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-DESCRIPTION="Speech synthesizer for English and other languages"
-HOMEPAGE="http://espeak.sourceforge.net/"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="portaudio pulseaudio"
-
-COMMON_DEPEND=" portaudio? ( >=media-libs/portaudio-19_pre20071207 )
-	pulseaudio? ( media-sound/pulseaudio )"
-
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip"
-
-RDEPEND="${COMMON_DEPEND}
-	media-sound/sox"
-
-S=${WORKDIR}/${MY_P}/src
-
-get_audio() {
-	if use portaudio && use pulseaudio; then
-		echo runtime
-	elif use portaudio; then
-		echo portaudio
-	elif use pulseaudio; then
-		echo pulseaudio
-	else
-		echo none
-	fi
-}
-
-src_prepare() {
-	# gentoo uses portaudio 19.
-	mv -f portaudio19.h portaudio.h
-}
-
-src_compile() {
-	emake \
-		PREFIX="${EPREFIX}/usr" \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		CXX="$(tc-getCXX)" \
-		CXXFLAGS="${CXXFLAGS}" \
-		AR="$(tc-getAR)" \
-		AUDIO="$(get_audio)" \
-		all
-
-	einfo "Fixing byte order of phoneme data files"
-	pushd ../platforms/big_endian > /dev/null
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}"
-	./espeak-phoneme-data \
-		../../espeak-data \
-		. \
-		../../espeak-data/phondata-manifest
-	cp -f phondata phonindex phontab "../../espeak-data"
-}
-
-src_install() {
-	emake \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		DESTDIR="${D}" \
-		AUDIO="$(get_audio)" \
-		install
-
-	cd ..
-	insinto /usr/share/espeak-data
-	doins -r dictsource
-	dodoc ChangeLog.txt ReadMe
-	dohtml -r docs/*
-}
-
-pkg_preinst() {
-	local voicedir="${ROOT}/usr/share/${PN}-data/voices/en"
-	if [ -d "${voicedir}" ]; then
-		rm -rf "${voicedir}"
-	fi
-}
-
-pkg_postinst() {
-	if ! use portaudio && ! use pulseaudio; then
-		ewarn "Since portaudio and pulseaudio are not in your use flags,"
-		ewarn "espeak will only be able to create wav files."
-		ewarn "If this is not what you want, please reemerge ${CATEGORY}/${PN}"
-		ewarn "with either portaudio or pulseaudio USE flag enabled."
-	fi
-}
diff --git a/app-accessibility/espeak/espeak-1.48.04.ebuild b/app-accessibility/espeak/espeak-1.48.04.ebuild
deleted file mode 100644
index 0ab3acc0376a..000000000000
--- a/app-accessibility/espeak/espeak-1.48.04.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-MY_P="${P}-source"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-DESCRIPTION="Speech synthesizer for English and other languages"
-HOMEPAGE="http://espeak.sourceforge.net/"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="portaudio pulseaudio"
-
-COMMON_DEPEND=" portaudio? ( >=media-libs/portaudio-19_pre20071207 )
-	pulseaudio? ( media-sound/pulseaudio )"
-
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip"
-
-RDEPEND="${COMMON_DEPEND}
-	media-sound/sox"
-
-S=${WORKDIR}/${MY_P}/src
-
-get_audio() {
-	if use portaudio && use pulseaudio; then
-		echo runtime
-	elif use portaudio; then
-		echo portaudio
-	elif use pulseaudio; then
-		echo pulseaudio
-	else
-		echo none
-	fi
-}
-
-src_prepare() {
-	# gentoo uses portaudio 19.
-	mv -f portaudio19.h portaudio.h
-}
-
-src_compile() {
-	emake \
-		PREFIX="${EPREFIX}/usr" \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		CXX="$(tc-getCXX)" \
-		CXXFLAGS="${CXXFLAGS}" \
-		AR="$(tc-getAR)" \
-		AUDIO="$(get_audio)" \
-		all
-
-	einfo "Fixing byte order of phoneme data files"
-	pushd ../platforms/big_endian > /dev/null
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}"
-	./espeak-phoneme-data \
-		../../espeak-data \
-		. \
-		../../espeak-data/phondata-manifest
-	cp -f phondata phonindex phontab "../../espeak-data"
-}
-
-src_install() {
-	emake \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		DESTDIR="${D}" \
-		AUDIO="$(get_audio)" \
-		install
-
-	cd ..
-	insinto /usr/share/espeak-data
-	doins -r dictsource
-	dodoc ChangeLog.txt ReadMe
-	dohtml -r docs/*
-}
-
-pkg_preinst() {
-	local voicedir="${ROOT}/usr/share/${PN}-data/voices/en"
-	if [ -d "${voicedir}" ]; then
-		rm -rf "${voicedir}"
-	fi
-}
-
-pkg_postinst() {
-	if ! use portaudio && ! use pulseaudio; then
-		ewarn "Since portaudio and pulseaudio are not in your use flags,"
-		ewarn "espeak will only be able to create wav files."
-		ewarn "If this is not what you want, please reemerge ${CATEGORY}/${PN}"
-		ewarn "with either portaudio or pulseaudio USE flag enabled."
-	fi
-}
diff --git a/app-accessibility/speech-tools/Manifest b/app-accessibility/speech-tools/Manifest
index e989ac7810de..2dc0f2a57670 100644
--- a/app-accessibility/speech-tools/Manifest
+++ b/app-accessibility/speech-tools/Manifest
@@ -5,5 +5,5 @@ DIST speech_tools-2.1-r3-patches.tar.gz 6876 BLAKE2B 84ddc30de90459f913cc32d4338
 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 3050 BLAKE2B 55f937d6a041b5008b7e182502fd9fbd325497219207c2ed90221629f848aaaa500e3310e190d9123c976d33bb0fe111ba6600de43b7cd2cb6905b80aec893ce SHA512 9ff9c6888c37d184eb3ce3bfab898579145e50d45e6624a1560ecfa0ecc479e24a8ec430e664cdcc62382b90843ae918059c4ec28526cc1286a477cc86a1466e
-EBUILD speech-tools-2.5.0.ebuild 3711 BLAKE2B f3a9e139161f7c35e6159b4ba751e11958d269f18336bcb0576f3cc989ac54054e252d9be4b7461adf35f433ee314a7b2648a0f467856351969016d21b7b3d54 SHA512 1aed28cb7292d4a2e52bacb4ece1667ae9bebc123bf7c9f14b1bfe588a04fe3b139dd06fe2d630b6daa2cf2d334c70d6e25031332d187b9093a8d8d2dee3f575
+EBUILD speech-tools-2.5.0.ebuild 3757 BLAKE2B bee264c810d542b78ef9d780976f3aa1100b8ae1de6607db6081b78e7b2bbb8abf4db69c0cc1a988d6d23ae89cf1df63aed2aa01ae879c7d61ab1a5ec54fb447 SHA512 7bdca463250497882905e469c1d7cef96a84501482957ddf5f763b3d040da824f44d6b02c623f9cb387788888706fe9b0e58e7fa1a3a7301454419dd21350f21
 MISC metadata.xml 482 BLAKE2B 2638ba066698967011156e0333f367bed8b4a6ffcf765afe64d976724264db09fa2dfb8c6a10f35e3bc298d0b1e9604f8081a74d130a7afbf4ddd019dfffab8b SHA512 1752986ddb186ab10d069dce7ee81c7d0077673a06682e15f4e66a5a87cb29ba4e126a2a627f5f43e388a1d180e243d5362cceae943b1f90b35f54c19de1d2ee
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 184920c28003..8a41ef402844 100644
--- a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild
@@ -79,20 +79,24 @@ src_prepare() {
 
 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}"
+		AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/app-accessibility/speechd-el/Manifest b/app-accessibility/speechd-el/Manifest
index cde1a5460e4a..4ae042ce3f75 100644
--- a/app-accessibility/speechd-el/Manifest
+++ b/app-accessibility/speechd-el/Manifest
@@ -1,5 +1,3 @@
-DIST speechd-el-2.5.tar.gz 183278 BLAKE2B 7ed220a742642d1d22a25ad247e7184183099e93cee37dc0309346d7ad41bd7d2a54e15bae49366af8b31925bfdac43173042ddb4a0851970ac0eaee07461977 SHA512 b4e5d00d3a86be9c42172ab48c5b0c0f5f25817cb542302f04e29f594422247e4b008428dfaaa1bb2e208a71f126b9c86d25186974606bf5764212a0d6a1a09f
 DIST speechd-el-2.8.tar.gz 474614 BLAKE2B 36ac862c2f14b3f9b5be25bf666c466093f8e5bf3d456058d73a4eef0cc766d9b36ce990d8a3ee8161edb4190637a199853ac77eaedc28afd101ebd95842c47f SHA512 1a34e433d5ae61c83dfb7d3a9f26e25210613355f3a71e7601f15865cd9693db81dd9f559aef41bd3142d25702db88006bb9fd2053b597799f1b68c48911a3d2
-EBUILD speechd-el-2.5.ebuild 952 BLAKE2B a76fabbf502fecd527e3e6039dbd93b4e588201f36098c699a9595f8e133ab2de3a76d6e6e4798f767c0f9a7bd902d84a8bff98ade642815a63785023529f733 SHA512 8e093afa0ceb7bbd429cf10ef149ce3725f05e03e6c3552f8f10d0bd5f303bbb2470920c9b4be5d7934a29b5849a812d03596f08fa2b1d28d56a9372cdd98e63
-EBUILD speechd-el-2.8.ebuild 998 BLAKE2B 67990080958dfaafdaf0fc2111fe3fbec42e761fa2d08b5ba7f8e66160bac6cdaaa9970d5ac93499f676a063abce74f49899855a54d0c5a8c05571c933f5a238 SHA512 e56f218ac4ce05348915550a0b04c637918c4b5f469f57b383968d6796618dbf5ca2e629a7886a401714340f9bce4e253180093be95611464720946d332b4b16
-MISC metadata.xml 520 BLAKE2B e22bed4d2f247ed68b685beb59b81ac8fedf50f4d45399400f8d41822120c2537ea53eb55004d16932039fa17b6dce7beb9fd74afb6af6a6cc38187cf25d46a8 SHA512 a3eac680b1c15b152cb6de69f0b4e421b83019eafb49ce781caf9388446f131dea00c0903fd17066d7deb85fa3c789ed4d593d3fb5a09362a673cb0a93c7e6a3
+EBUILD speechd-el-2.8.ebuild 997 BLAKE2B 9b71cd85168ca1cea2b5fb1aff7348e5a72114c21c056ff3a9e290f950b7dc4158906d6a51112b2d70cafa0e94a9a5a20e2510fc25afb697eda1de9a14deba75 SHA512 8afe0e3582dce9bbbcd3506cc89eb95e664da1f0b939762d6b1f9008989cca6eadda5a8d33f1ce2e5904e3d7f1c13c22a8ff4d222dbc628b467dd7cb493fa86d
+MISC metadata.xml 463 BLAKE2B a97c4ff69a8a6db27cee2d6f5af14521e021dadb47c3eee89a71781c8c241698cfbb5c524375a6c86444c345b6ec4c65103e0e47afab6d57f157b75722aa931f SHA512 7d5ad40f8bda917fac4f3b178621e9403c7c5bc1814224cfc98ba17cf827da349cfed0c2accb80724c316363e2dce925c5f8385507a924a9a1963344592a0726
diff --git a/app-accessibility/speechd-el/metadata.xml b/app-accessibility/speechd-el/metadata.xml
index 298ece6d7d62..fb498827c3b3 100644
--- a/app-accessibility/speechd-el/metadata.xml
+++ b/app-accessibility/speechd-el/metadata.xml
@@ -12,7 +12,4 @@
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
-<use>
-  <flag name="brltty">brltty support</flag>
-</use>
 </pkgmetadata>
diff --git a/app-accessibility/speechd-el/speechd-el-2.5.ebuild b/app-accessibility/speechd-el/speechd-el-2.5.ebuild
deleted file mode 100644
index f01f6acc0a06..000000000000
--- a/app-accessibility/speechd-el/speechd-el-2.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit elisp
-
-DESCRIPTION="Emacs speech support"
-HOMEPAGE="http://www.freebsoft.org/speechd-el"
-SRC_URI="http://www.freebsoft.org/pub/projects/speechd-el/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="brltty"
-
-DEPEND=""
-RDEPEND=">=app-accessibility/speech-dispatcher-0.7
-	brltty? ( app-accessibility/brltty )"
-
-src_compile() {
-	emake
-}
-
-src_install() {
-	elisp-install ${PN} *.el *.elc
-	dobin speechd-log-extractor
-	dodoc ANNOUNCE NEWS README speechd-speak.pdf
-	doinfo speechd-el.info
-}
-
-pkg_postinst() {
-	elog "Execute the following commands from within emacs to get it to speak:"
-	elog "  M-x load-library RET speechd-speak RET"
-	elog "  M-x speechd-speak RET"
-	elog
-	elog "or add the following to your ~/.emacs file:"
-	elog
-	elog "(autoload 'speechd-speak \"speechd-speak\" nil t)"
-	elog '(speechd-speak)'
-}
diff --git a/app-accessibility/speechd-el/speechd-el-2.8.ebuild b/app-accessibility/speechd-el/speechd-el-2.8.ebuild
index 1a4b1a7769de..2193ed224eda 100644
--- a/app-accessibility/speechd-el/speechd-el-2.8.ebuild
+++ b/app-accessibility/speechd-el/speechd-el-2.8.ebuild
@@ -6,12 +6,12 @@ EAPI=7
 inherit elisp
 
 DESCRIPTION="Emacs speech support"
-HOMEPAGE="http://www.freebsoft.org/speechd-el"
-SRC_URI="http://www.freebsoft.org/pub/projects/speechd-el/${P}.tar.gz"
+HOMEPAGE="https://www.freebsoft.org/speechd-el"
+SRC_URI="https://www.freebsoft.org/pub/projects/speechd-el/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND=">=app-accessibility/speech-dispatcher-0.7"