From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F2F9E13835A for ; Thu, 1 Apr 2021 22:08:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3B3F8E098F; Thu, 1 Apr 2021 22:08:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 013ECE098F for ; Thu, 1 Apr 2021 22:08:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1F2BE340D24 for ; Thu, 1 Apr 2021 22:08:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7040463F for ; Thu, 1 Apr 2021 22:08:54 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1617314919.cc766f3f37c73390ef217b9cd12ace377d0ffc78.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-accessibility/speech-tools/speech-tools-2.5.0.ebuild X-VCS-Directories: app-accessibility/speech-tools/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: cc766f3f37c73390ef217b9cd12ace377d0ffc78 X-VCS-Branch: master Date: Thu, 1 Apr 2021 22:08:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5a47db18-f3cb-4273-8f7e-843f6d6cc936 X-Archives-Hash: 5ee4feb6b3a90c242f4653239acd5bb4 commit: cc766f3f37c73390ef217b9cd12ace377d0ffc78 Author: Sam James gentoo org> AuthorDate: Thu Apr 1 02:24:04 2021 +0000 Commit: Sam James gentoo org> CommitDate: Thu Apr 1 22:08:39 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc766f3f app-accessibility/speech-tools: modernise 2.5.0, drop useless multilib inherit Signed-off-by: Sam James gentoo.org> .../speech-tools/speech-tools-2.5.0.ebuild | 30 +++++++++++++--------- 1 file changed, 18 insertions(+), 12 deletions(-) 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 8a41ef40284..438c9aa873f 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,6 +12,7 @@ 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" @@ -22,15 +23,14 @@ 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 }