| 1 |
commit: 629c12eac77f710cf35f1a7572bcfaa79d4c7053 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 28 07:12:56 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 28 07:14:38 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=629c12ea |
| 7 |
|
| 8 |
app-accessibility/espeak-ng: allow using app-text/ronn-ng for USE=man |
| 9 |
|
| 10 |
app-text/ronn will be last-rited soon. |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/770907 |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
...eak-ng-9999.ebuild => espeak-ng-1.50-r1.ebuild} | 22 ++++++++++------------ |
| 16 |
app-accessibility/espeak-ng/espeak-ng-9999.ebuild | 4 ++-- |
| 17 |
2 files changed, 12 insertions(+), 14 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-accessibility/espeak-ng/espeak-ng-9999.ebuild b/app-accessibility/espeak-ng/espeak-ng-1.50-r1.ebuild |
| 20 |
similarity index 74% |
| 21 |
copy from app-accessibility/espeak-ng/espeak-ng-9999.ebuild |
| 22 |
copy to app-accessibility/espeak-ng/espeak-ng-1.50-r1.ebuild |
| 23 |
index 941edd1d327b..95392dcb4fcb 100644 |
| 24 |
--- a/app-accessibility/espeak-ng/espeak-ng-9999.ebuild |
| 25 |
+++ b/app-accessibility/espeak-ng/espeak-ng-1.50-r1.ebuild |
| 26 |
@@ -1,4 +1,4 @@ |
| 27 |
-# Copyright 1999-2021 Gentoo Authors |
| 28 |
+# Copyright 1999-2022 Gentoo Authors |
| 29 |
# Distributed under the terms of the GNU General Public License v2 |
| 30 |
|
| 31 |
EAPI=7 |
| 32 |
@@ -7,17 +7,11 @@ inherit autotools |
| 33 |
|
| 34 |
DESCRIPTION="Software speech synthesizer for English, and some other languages" |
| 35 |
HOMEPAGE="https://github.com/espeak-ng/espeak-ng" |
| 36 |
- |
| 37 |
-if [[ ${PV} == 9999 ]]; then |
| 38 |
- EGIT_REPO_URI="https://github.com/espeak-ng/espeak-ng.git" |
| 39 |
- inherit git-r3 |
| 40 |
-else |
| 41 |
- SRC_URI="https://github.com/espeak-ng/espeak-ng/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 42 |
- KEYWORDS="~amd64" |
| 43 |
-fi |
| 44 |
+SRC_URI="https://github.com/espeak-ng/espeak-ng/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 45 |
|
| 46 |
LICENSE="GPL-3+ Turkowski unicode" |
| 47 |
SLOT="0" |
| 48 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" |
| 49 |
IUSE="+async +klatt l10n_ru l10n_zh man mbrola +sound" |
| 50 |
|
| 51 |
COMMON_DEPEND=" |
| 52 |
@@ -31,7 +25,7 @@ RDEPEND="${COMMON_DEPEND} |
| 53 |
" |
| 54 |
BDEPEND=" |
| 55 |
virtual/pkgconfig |
| 56 |
- man? ( app-text/ronn ) |
| 57 |
+ man? ( || ( app-text/ronn-ng app-text/ronn ) ) |
| 58 |
" |
| 59 |
|
| 60 |
DOCS=( CHANGELOG.md README.md docs ) |
| 61 |
@@ -46,6 +40,10 @@ src_prepare() { |
| 62 |
-e "/translate.check/d" \ |
| 63 |
Makefile.am || die |
| 64 |
|
| 65 |
+ # https://github.com/espeak-ng/espeak-ng/issues/699 |
| 66 |
+ # fixed in master |
| 67 |
+ sed -i -e "s/int samplerate;/static int samplerate;/" src/espeak-ng.c || die |
| 68 |
+ |
| 69 |
eautoreconf |
| 70 |
} |
| 71 |
|
| 72 |
@@ -55,8 +53,8 @@ src_configure() { |
| 73 |
$(use_with async) |
| 74 |
$(use_with klatt) |
| 75 |
$(use_with l10n_ru extdict-ru) |
| 76 |
- $(use_with l10n_zh extdict-cmn) |
| 77 |
- $(use_with l10n_zh extdict-yue) |
| 78 |
+ $(use_with l10n_zh extdict-zh) |
| 79 |
+ $(use_with l10n_zh extdict-zhy) |
| 80 |
$(use_with mbrola) |
| 81 |
$(use_with sound pcaudiolib) |
| 82 |
--without-libfuzzer |
| 83 |
|
| 84 |
diff --git a/app-accessibility/espeak-ng/espeak-ng-9999.ebuild b/app-accessibility/espeak-ng/espeak-ng-9999.ebuild |
| 85 |
index 941edd1d327b..dfba4f0058bf 100644 |
| 86 |
--- a/app-accessibility/espeak-ng/espeak-ng-9999.ebuild |
| 87 |
+++ b/app-accessibility/espeak-ng/espeak-ng-9999.ebuild |
| 88 |
@@ -1,4 +1,4 @@ |
| 89 |
-# Copyright 1999-2021 Gentoo Authors |
| 90 |
+# Copyright 1999-2022 Gentoo Authors |
| 91 |
# Distributed under the terms of the GNU General Public License v2 |
| 92 |
|
| 93 |
EAPI=7 |
| 94 |
@@ -31,7 +31,7 @@ RDEPEND="${COMMON_DEPEND} |
| 95 |
" |
| 96 |
BDEPEND=" |
| 97 |
virtual/pkgconfig |
| 98 |
- man? ( app-text/ronn ) |
| 99 |
+ man? ( || ( app-text/ronn-ng app-text/ronn ) ) |
| 100 |
" |
| 101 |
|
| 102 |
DOCS=( CHANGELOG.md README.md docs ) |
Archives