diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /app-accessibility/speech-tools | |
parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) |
gentoo resync : 28.04.2021
Diffstat (limited to 'app-accessibility/speech-tools')
-rw-r--r-- | app-accessibility/speech-tools/Manifest | 4 | ||||
-rw-r--r-- | app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild | 6 | ||||
-rw-r--r-- | app-accessibility/speech-tools/speech-tools-2.5.0.ebuild | 32 |
3 files changed, 24 insertions, 18 deletions
diff --git a/app-accessibility/speech-tools/Manifest b/app-accessibility/speech-tools/Manifest index 2dc0f2a57670..d29c61199a65 100644 --- a/app-accessibility/speech-tools/Manifest +++ b/app-accessibility/speech-tools/Manifest @@ -4,6 +4,6 @@ AUX speech-tools-2.5.0-fno-common.patch 1003 BLAKE2B 6b4dcdf205f2e986e659efda4d5 DIST speech_tools-2.1-r3-patches.tar.gz 6876 BLAKE2B 84ddc30de90459f913cc32d4338097feb35dc08c48cbda7fc47a78ee0384668828d7166a5ebb1264272a6c326afd4ff2efdf1d793bb8f33937c09d2c7cd9a2b5 SHA512 db4d656a77e3fcfc43447c11b160cf9b45f0c4ec10f2697e4357f0ec86ea56e2841f1b887493a781406975003f5d8065ffbb75eeebb79fcd9873055b52c248e3 DIST speech_tools-2.1-release.tar.gz 1681999 BLAKE2B 572e7877e195c098dd2df03cda86fe58b7a55379cd01adcc22faf5e12b8c004e8c006b852cfe88c5c20df4a0e54e357b445050cdb63088edd55714a98e3eda90 SHA512 6ef9a7dd01ede152c4dafd0b2037312d62a79d875813d74ea048899a52eee505b93ffbabef9b6c0a1d15aeadb5508fd18a2f392e85276847fe071173aec5db96 DIST speech_tools-2.5.0-release.tar.gz 1328624 BLAKE2B 445dd5a5e39c02352a850fd92de5b3852ae382a4bd013dccb3fdd46b0b22ce0bd10d089f9e860ae3d3e73a489b20b7c8b78335e57a49e40ae01b0f4997d55315 SHA512 013540a5252efb57633f442143a51bc87aac719dfb46c8f47e750322d19dac9b504f55125462a2ee74a6b0bd2661a63a1fc73a8c3c6d2886e38b136a80447fd7 -EBUILD speech-tools-2.1-r4.ebuild 3050 BLAKE2B 55f937d6a041b5008b7e182502fd9fbd325497219207c2ed90221629f848aaaa500e3310e190d9123c976d33bb0fe111ba6600de43b7cd2cb6905b80aec893ce SHA512 9ff9c6888c37d184eb3ce3bfab898579145e50d45e6624a1560ecfa0ecc479e24a8ec430e664cdcc62382b90843ae918059c4ec28526cc1286a477cc86a1466e -EBUILD speech-tools-2.5.0.ebuild 3757 BLAKE2B bee264c810d542b78ef9d780976f3aa1100b8ae1de6607db6081b78e7b2bbb8abf4db69c0cc1a988d6d23ae89cf1df63aed2aa01ae879c7d61ab1a5ec54fb447 SHA512 7bdca463250497882905e469c1d7cef96a84501482957ddf5f763b3d040da824f44d6b02c623f9cb387788888706fe9b0e58e7fa1a3a7301454419dd21350f21 +EBUILD speech-tools-2.1-r4.ebuild 3055 BLAKE2B 91ff2e524213950a0775e7db6933feef960594fd80847cf08849dcff0b71a1be89a74b0fe20c9944422d48abace3f8aa83e9a1bd150c7f36399521049a26dcd1 SHA512 4a89616b573de9bdbfad9bd952d29675edc9c1fca30b1a2870359bf7bea5e7e244a1cb4f1d9553c9d023c4589b5ccb5285d7847fe63cc2daeb6a9b32940baa96 +EBUILD speech-tools-2.5.0.ebuild 3774 BLAKE2B 05ba61033b3cc1d62be2b19aa05890a7ff250b899e53df39a5a260b2a2264eeb96e779bd7e31a064836d70adb324b6296edce564b8aa90942b12c06df0ba7c28 SHA512 2f7608d4d48f54d499f0cfed95bf08d48ca40d01a9950090fa9f0c635d7c996a3bf1e8327c80bf5e8fe4f7322ae59cda815ac9b922824cb25f7d53bda72b192c MISC metadata.xml 482 BLAKE2B 2638ba066698967011156e0333f367bed8b4a6ffcf765afe64d976724264db09fa2dfb8c6a10f35e3bc298d0b1e9604f8081a74d130a7afbf4ddd019dfffab8b SHA512 1752986ddb186ab10d069dce7ee81c7d0077673a06682e15f4e66a5a87cb29ba4e126a2a627f5f43e388a1d180e243d5362cceae943b1f90b35f54c19de1d2ee diff --git a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild b/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild index 4a54649722d2..2f487ae007ac 100644 --- a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild +++ b/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=5 -inherit eutils flag-o-matic multilib toolchain-funcs +inherit eutils epatch flag-o-matic multilib toolchain-funcs MY_P=${P/speech-/speech_} PATCHSET="r3" diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild index 8a41ef402844..f14ff35bfac3 100644 --- a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild +++ b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=7 -inherit multilib toolchain-funcs +inherit toolchain-funcs MY_P=${P/speech-/speech_} PATCHSET="r3" @@ -12,25 +12,25 @@ DESCRIPTION="Speech tools for Festival Text to Speech engine" HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/" SRC_URI="http://www.festvox.org/packed/festival/$(ver_cut 1-2)/${MY_P}-release.tar.gz https://dev.gentoo.org/~neurogeek/${PN}/speech_tools-2.1-${PATCHSET}-patches.tar.gz" +S="${WORKDIR}/speech_tools" LICENSE="FESTIVAL HPND BSD rc regexp-UofT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86" IUSE="nas openmp X" RDEPEND=" media-libs/alsa-lib sys-libs/ncurses:0= nas? ( media-libs/nas ) - X? ( x11-libs/libX11 + X? ( + x11-libs/libX11 x11-libs/libXt ) " DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" -S="${WORKDIR}/speech_tools" - DOCS=( README.md lib/cstrutt.dtd lib/example_data ) PATCHES=( @@ -67,14 +67,14 @@ src_prepare() { sed -i -e 's,{{HORRIBLELIBARCHKLUDGE}},"/usr/$(get_libdir)",' \ main/siod_main.cc || die - #WRT bug #309983 + # bug #309983 sed -i -e "s:\(GCC_SYSTEM_OPTIONS =\).*:\1:" \ "${S}"/config/systems/sparc_SunOS5.mak || die sed -i -e "s|\$(OMP_OPTS)|$(use openmp && echo -fopenmp)|g" \ -e "s|\$(OMP_DEFS)|$(use openmp && echo -DOMP_WAGON=1)|g" \ -e "/MAKE_SHARED_LIB =/s|-shared|$(use openmp && echo -fopenmp) -shared|" \ - config/compilers/gcc_defaults.mak + config/compilers/gcc_defaults.mak || die } src_configure() { @@ -95,8 +95,14 @@ src_configure() { } src_compile() { - emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" CXX_OTHER_FLAGS="${CXXFLAGS}" CC_OTHER_FLAGS="${CFLAGS}" \ - AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" LDFLAGS="${LDFLAGS}" + emake -j1 \ + CC="$(tc-getCC)" \ + CXX="$(tc-getCXX)" \ + CC_OTHER_FLAGS="${CFLAGS}" \ + CXX_OTHER_FLAGS="${CXXFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + AR="$(tc-getAR)" \ + RANLIB="$(tc-getRANLIB)" } src_install() { @@ -135,6 +141,6 @@ src_install() { done # Remove bcat (only useful for testing on windows, see bug #418301). - rm "${D}/usr/bin/bcat" || die - rm "${D}/usr/$(get_libdir)/speech-tools/bcat" || die + rm "${ED}/usr/bin/bcat" || die + rm "${ED}/usr/$(get_libdir)/speech-tools/bcat" || die } |