[gentoo-commits] repo/gentoo:master commit in: app-accessibility/espeak/files/, profiles/, app-accessibility/espeak/

[gentoo-commits] repo/gentoo:master commit in: app-accessibility/espeak/files/, profiles/, app-accessibility/espeak/

[Sam James]

commit:     c0f3d9ff9f0e0bfec1a54a849b341c10bf5fa15e
Author:     Leonardo Hernández Hernández <leohdz172 <AT> proton <DOT> me>
AuthorDate: Mon Sep  4 04:23:06 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 11 00:54:22 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0f3d9ff

app-accessibility/espeak: treeclean

Closes: https://bugs.gentoo.org/709290
Closes: https://bugs.gentoo.org/726326
Closes: https://bugs.gentoo.org/877221
Signed-off-by: Leonardo Hernández Hernández <leohdz172 <AT> proton.me>
Closes: https://github.com/gentoo/gentoo/pull/32599
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-accessibility/espeak/Manifest                  |   1 -
 app-accessibility/espeak/espeak-1.48.04-r1.ebuild  | 103 ---------------------
 .../espeak/files/espeak-1.48.04-gcc-6-fix.patch    |  13 ---
 app-accessibility/espeak/metadata.xml              |  14 ---
 profiles/package.mask                              |   6 --
 5 files changed, 137 deletions(-)

diff --git a/app-accessibility/espeak/Manifest b/app-accessibility/espeak/Manifest
deleted file mode 100644
index 24cc686e8b37..000000000000
--- a/app-accessibility/espeak/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST espeak-1.48.04-source.zip 3019245 BLAKE2B a29da5eab832fa76b180049765f7fa671ebf47c0a68ee2cdfb0f4466846d97b2bf7b8f07dba747e236a27c9b077000bfd471e35b9744ffac7c9014679f5c04fd SHA512 f0759e6ace2604c8cbb19e8c3fd4b106edf4dcece247a6677f6b734af7746c35a367126edfbe585396c98f6c54f07e25d64bfab35e258e64f09bd2c0833247fa

diff --git a/app-accessibility/espeak/espeak-1.48.04-r1.ebuild b/app-accessibility/espeak/espeak-1.48.04-r1.ebuild
deleted file mode 100644
index eebc2c473640..000000000000
--- a/app-accessibility/espeak/espeak-1.48.04-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic 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 ~loong ppc ppc64 ~riscv 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"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc-6-fix.patch )
-
-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() {
-	default
-	# gentoo uses portaudio 19.
-	mv -f portaudio19.h portaudio.h
-}
-
-src_compile() {
-	# Uses removed 'register' keyword, bug #894180
-	append-cxxflags -std=c++14
-
-	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
-	HTML_DOCS="docs/*" einstalldocs
-}
-
-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/files/espeak-1.48.04-gcc-6-fix.patch b/app-accessibility/espeak/files/espeak-1.48.04-gcc-6-fix.patch
deleted file mode 100644
index f28de7338b37..000000000000
--- a/app-accessibility/espeak/files/espeak-1.48.04-gcc-6-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://src.fedoraproject.org/cgit/rpms/espeak.git/tree/espeak-1.48-gcc-6-fix.patch
-diff --git a/src/tr_languages.cpp b/src/tr_languages.cpp
---- a/tr_languages.cpp
-+++ b/tr_languages.cpp
-@@ -198,7 +198,7 @@ static const unsigned short chars_ignore_zwnj_hyphen[] = {
- 	0x200d,  1, // zero width joiner
- 	0, 0 };
- 
--const char string_ordinal[] = {0xc2,0xba,0};  // masculine ordinal character, UTF-8
-+const char string_ordinal[] = {'\xc2','\xba',0};  // masculine ordinal character, UTF-8
- 
- 
- static Translator* NewTranslator(void)

diff --git a/app-accessibility/espeak/metadata.xml b/app-accessibility/espeak/metadata.xml
deleted file mode 100644
index 7a1669bb69a0..000000000000
--- a/app-accessibility/espeak/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>williamh@gentoo.org</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>accessibility@gentoo.org</email>
-		<name>Gentoo Accessibility Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">espeak</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index 03860a53a2c5..f53424b2001c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -308,12 +308,6 @@ sci-libs/rosetta-db
 # after 30 days.
 dev-php/swoole-async
 
-# William Hubbs <williamh@gentoo.org> (2023-07-25)
-# This package has been replaced by app-accessibility/espeak-ng.
-# Please transition to the new package.
-# Removal: 2023-08-24.  Bug #877221.
-app-accessibility/espeak
-
 # Mike Gilbert <floppym@gentoo.org> (2023-07-24)
 # Migrated to sys-apps/systemd-utils.
 # Removal on 2023-08-24.