| 1 |
commit: cc766f3f37c73390ef217b9cd12ace377d0ffc78 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 1 02:24:04 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 1 22:08:39 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc766f3f |
| 7 |
|
| 8 |
app-accessibility/speech-tools: modernise 2.5.0, drop useless multilib inherit |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
.../speech-tools/speech-tools-2.5.0.ebuild | 30 +++++++++++++--------- |
| 13 |
1 file changed, 18 insertions(+), 12 deletions(-) |
| 14 |
|
| 15 |
diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild |
| 16 |
index 8a41ef40284..438c9aa873f 100644 |
| 17 |
--- a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild |
| 18 |
+++ b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild |
| 19 |
@@ -1,9 +1,9 @@ |
| 20 |
-# Copyright 1999-2020 Gentoo Authors |
| 21 |
+# Copyright 1999-2021 Gentoo Authors |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
|
| 24 |
-EAPI="7" |
| 25 |
+EAPI=7 |
| 26 |
|
| 27 |
-inherit multilib toolchain-funcs |
| 28 |
+inherit toolchain-funcs |
| 29 |
|
| 30 |
MY_P=${P/speech-/speech_} |
| 31 |
PATCHSET="r3" |
| 32 |
@@ -12,6 +12,7 @@ DESCRIPTION="Speech tools for Festival Text to Speech engine" |
| 33 |
HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/" |
| 34 |
SRC_URI="http://www.festvox.org/packed/festival/$(ver_cut 1-2)/${MY_P}-release.tar.gz |
| 35 |
https://dev.gentoo.org/~neurogeek/${PN}/speech_tools-2.1-${PATCHSET}-patches.tar.gz" |
| 36 |
+S="${WORKDIR}/speech_tools" |
| 37 |
|
| 38 |
LICENSE="FESTIVAL HPND BSD rc regexp-UofT" |
| 39 |
SLOT="0" |
| 40 |
@@ -22,15 +23,14 @@ RDEPEND=" |
| 41 |
media-libs/alsa-lib |
| 42 |
sys-libs/ncurses:0= |
| 43 |
nas? ( media-libs/nas ) |
| 44 |
- X? ( x11-libs/libX11 |
| 45 |
+ X? ( |
| 46 |
+ x11-libs/libX11 |
| 47 |
x11-libs/libXt |
| 48 |
) |
| 49 |
" |
| 50 |
DEPEND="${RDEPEND}" |
| 51 |
BDEPEND="virtual/pkgconfig" |
| 52 |
|
| 53 |
-S="${WORKDIR}/speech_tools" |
| 54 |
- |
| 55 |
DOCS=( README.md lib/cstrutt.dtd lib/example_data ) |
| 56 |
|
| 57 |
PATCHES=( |
| 58 |
@@ -67,14 +67,14 @@ src_prepare() { |
| 59 |
sed -i -e 's,{{HORRIBLELIBARCHKLUDGE}},"/usr/$(get_libdir)",' \ |
| 60 |
main/siod_main.cc || die |
| 61 |
|
| 62 |
- #WRT bug #309983 |
| 63 |
+ # bug #309983 |
| 64 |
sed -i -e "s:\(GCC_SYSTEM_OPTIONS =\).*:\1:" \ |
| 65 |
"${S}"/config/systems/sparc_SunOS5.mak || die |
| 66 |
|
| 67 |
sed -i -e "s|\$(OMP_OPTS)|$(use openmp && echo -fopenmp)|g" \ |
| 68 |
-e "s|\$(OMP_DEFS)|$(use openmp && echo -DOMP_WAGON=1)|g" \ |
| 69 |
-e "/MAKE_SHARED_LIB =/s|-shared|$(use openmp && echo -fopenmp) -shared|" \ |
| 70 |
- config/compilers/gcc_defaults.mak |
| 71 |
+ config/compilers/gcc_defaults.mak || die |
| 72 |
} |
| 73 |
|
| 74 |
src_configure() { |
| 75 |
@@ -95,8 +95,14 @@ src_configure() { |
| 76 |
} |
| 77 |
|
| 78 |
src_compile() { |
| 79 |
- emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" CXX_OTHER_FLAGS="${CXXFLAGS}" CC_OTHER_FLAGS="${CFLAGS}" \ |
| 80 |
- AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" LDFLAGS="${LDFLAGS}" |
| 81 |
+ emake -j1 \ |
| 82 |
+ CC="$(tc-getCC)" \ |
| 83 |
+ CXX="$(tc-getCXX)" \ |
| 84 |
+ CC_OTHER_FLAGS="${CFLAGS}" \ |
| 85 |
+ CXX_OTHER_FLAGS="${CXXFLAGS}" \ |
| 86 |
+ LDFLAGS="${LDFLAGS}" \ |
| 87 |
+ AR="$(tc-getAR)" \ |
| 88 |
+ RANLIB="$(tc-getRANLIB)" |
| 89 |
} |
| 90 |
|
| 91 |
src_install() { |
| 92 |
@@ -135,6 +141,6 @@ src_install() { |
| 93 |
done |
| 94 |
|
| 95 |
# Remove bcat (only useful for testing on windows, see bug #418301). |
| 96 |
- rm "${D}/usr/bin/bcat" || die |
| 97 |
- rm "${D}/usr/$(get_libdir)/speech-tools/bcat" || die |
| 98 |
+ rm "${ED}/usr/bin/bcat" || die |
| 99 |
+ rm "${ED}/usr/$(get_libdir)/speech-tools/bcat" || die |
| 100 |
} |
Archives