commit: 629c12eac77f710cf35f1a7572bcfaa79d4c7053 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Jan 28 07:12:56 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Jan 28 07:14:38 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=629c12ea
app-accessibility/espeak-ng: allow using app-text/ronn-ng for USE=man app-text/ronn will be last-rited soon. Bug: https://bugs.gentoo.org/770907 Signed-off-by: Sam James <sam <AT> gentoo.org> ...eak-ng-9999.ebuild => espeak-ng-1.50-r1.ebuild} | 22 ++++++++++------------ app-accessibility/espeak-ng/espeak-ng-9999.ebuild | 4 ++-- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/app-accessibility/espeak-ng/espeak-ng-9999.ebuild b/app-accessibility/espeak-ng/espeak-ng-1.50-r1.ebuild similarity index 74% copy from app-accessibility/espeak-ng/espeak-ng-9999.ebuild copy to app-accessibility/espeak-ng/espeak-ng-1.50-r1.ebuild index 941edd1d327b..95392dcb4fcb 100644 --- a/app-accessibility/espeak-ng/espeak-ng-9999.ebuild +++ b/app-accessibility/espeak-ng/espeak-ng-1.50-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,17 +7,11 @@ inherit autotools DESCRIPTION="Software speech synthesizer for English, and some other languages" HOMEPAGE="https://github.com/espeak-ng/espeak-ng"; - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/espeak-ng/espeak-ng.git"; - inherit git-r3 -else - SRC_URI="https://github.com/espeak-ng/espeak-ng/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" -fi +SRC_URI="https://github.com/espeak-ng/espeak-ng/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3+ Turkowski unicode" SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" IUSE="+async +klatt l10n_ru l10n_zh man mbrola +sound" COMMON_DEPEND=" @@ -31,7 +25,7 @@ RDEPEND="${COMMON_DEPEND} " BDEPEND=" virtual/pkgconfig - man? ( app-text/ronn ) + man? ( || ( app-text/ronn-ng app-text/ronn ) ) " DOCS=( CHANGELOG.md README.md docs ) @@ -46,6 +40,10 @@ src_prepare() { -e "/translate.check/d" \ Makefile.am || die + # https://github.com/espeak-ng/espeak-ng/issues/699 + # fixed in master + sed -i -e "s/int samplerate;/static int samplerate;/" src/espeak-ng.c || die + eautoreconf } @@ -55,8 +53,8 @@ src_configure() { $(use_with async) $(use_with klatt) $(use_with l10n_ru extdict-ru) - $(use_with l10n_zh extdict-cmn) - $(use_with l10n_zh extdict-yue) + $(use_with l10n_zh extdict-zh) + $(use_with l10n_zh extdict-zhy) $(use_with mbrola) $(use_with sound pcaudiolib) --without-libfuzzer diff --git a/app-accessibility/espeak-ng/espeak-ng-9999.ebuild b/app-accessibility/espeak-ng/espeak-ng-9999.ebuild index 941edd1d327b..dfba4f0058bf 100644 --- a/app-accessibility/espeak-ng/espeak-ng-9999.ebuild +++ b/app-accessibility/espeak-ng/espeak-ng-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -31,7 +31,7 @@ RDEPEND="${COMMON_DEPEND} " BDEPEND=" virtual/pkgconfig - man? ( app-text/ronn ) + man? ( || ( app-text/ronn-ng app-text/ronn ) ) " DOCS=( CHANGELOG.md README.md docs )
