[gentoo-commits] repo/gentoo:master commit in: app-accessibility/espeak-ng/

[William Hubbs]

commit:     c6137ef2289b4a4ae529e7057c2231170eb836af
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 29 13:35:19 2023 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Jun 10 20:12:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6137ef2

app-accessibility/espeak-ng: update 9999 EAPI 7 -> 8, cleanup

- drop superfluous COMMON_DEPEND
- move blocker to RDEPEND
- drop nonexistent app-text/ronn BDEPEND

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 app-accessibility/espeak-ng/espeak-ng-1.51.ebuild | 11 +++++------
 app-accessibility/espeak-ng/espeak-ng-9999.ebuild | 18 ++++++++----------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/app-accessibility/espeak-ng/espeak-ng-1.51.ebuild 
b/app-accessibility/espeak-ng/espeak-ng-1.51.ebuild
index b1bb63eb8365..19d3e39695fa 100644
--- a/app-accessibility/espeak-ng/espeak-ng-1.51.ebuild
+++ b/app-accessibility/espeak-ng/espeak-ng-1.51.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,18 +14,17 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
 IUSE="+async +klatt l10n_ru l10n_zh man mbrola +sound"
 
-COMMON_DEPEND="
-       !app-accessibility/espeak
+DEPEND="
        mbrola? ( app-accessibility/mbrola )
        sound? ( media-libs/pcaudiolib )
 "
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
+       !app-accessibility/espeak
        sound? ( media-sound/sox )
 "
 BDEPEND="
        virtual/pkgconfig
-       man? ( || ( app-text/ronn-ng app-text/ronn ) )
+       man? ( app-text/ronn-ng )
 "
 
 DOCS=( CHANGELOG.md README.md docs )

diff --git a/app-accessibility/espeak-ng/espeak-ng-9999.ebuild 
b/app-accessibility/espeak-ng/espeak-ng-9999.ebuild
index 4dc30d2b5348..791939bee5a1 100644
--- a/app-accessibility/espeak-ng/espeak-ng-9999.ebuild
+++ b/app-accessibility/espeak-ng/espeak-ng-9999.ebuild
@@ -1,37 +1,36 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
 DESCRIPTION="Software speech synthesizer for English, and some other languages"
 HOMEPAGE="https://github.com/espeak-ng/espeak-ng";
 
-if [[ ${PV} == 9999 ]]; then
+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 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+       KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="GPL-3+ unicode"
 SLOT="0"
 IUSE="+async +klatt l10n_ru l10n_zh man mbrola +sound"
 
-COMMON_DEPEND="
-       !app-accessibility/espeak
+DEPEND="
        mbrola? ( app-accessibility/mbrola )
        sound? ( media-libs/pcaudiolib )
 "
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
+       !app-accessibility/espeak
        sound? ( media-sound/sox )
 "
 BDEPEND="
        virtual/pkgconfig
-       man? ( || ( app-text/ronn-ng app-text/ronn ) )
+       man? ( app-text/ronn-ng )
 "
 
 DOCS=( CHANGELOG.md README.md docs )
@@ -66,7 +65,6 @@ src_configure() {
                --without-libfuzzer
                --without-sonic
                --disable-rpath
-               --disable-static
        )
        econf "${econf_args[@]}"
 }