teiresias    15/01/20 02:01:02

  Modified:             ChangeLog
  Added:                speech-tools-2.1-r3.ebuild
  Log:
  Remove unnecessary bcat tool (see bug #418301).
  
  Also, add die to uses of cd, rm, and sed (see comment on bug #510600).
  
  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 
0x6521e06d)

Revision  Changes    Path
1.88                 app-accessibility/speech-tools/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/speech-tools/ChangeLog?rev=1.88&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/speech-tools/ChangeLog?rev=1.88&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/speech-tools/ChangeLog?r1=1.87&r2=1.88

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- ChangeLog   11 Jan 2015 19:36:13 -0000      1.87
+++ ChangeLog   20 Jan 2015 02:01:02 -0000      1.88
@@ -1,6 +1,12 @@
 # ChangeLog for app-accessibility/speech-tools
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 
1.87 2015/01/11 19:36:13 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 
1.88 2015/01/20 02:01:02 teiresias Exp $
+
+*speech-tools-2.1-r3 (20 Jan 2015)
+
+  20 Jan 2015; Christopher Brannon <[email protected]>
+  +speech-tools-2.1-r3.ebuild:
+  Remove unnecessary bcat tool (see bug #418301).
 
   11 Jan 2015; Chema Alonso <[email protected]> speech-tools-2.1-r2.ebuild:
   Stable for amd64 wrt bug #510600



1.1                  app-accessibility/speech-tools/speech-tools-2.1-r3.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.1-r3.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.1-r3.ebuild?rev=1.1&content-type=text/plain

Index: speech-tools-2.1-r3.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.1-r3.ebuild,v
 1.1 2015/01/20 02:01:02 teiresias Exp $

EAPI="5"

inherit eutils flag-o-matic multilib toolchain-funcs

MY_P=${P/speech-/speech_}
PATCHSET="r3"

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/${PV}/${MY_P}-release.tar.gz
                 
http://dev.gentoo.org/~neurogeek/${PN}/${MY_P}-${PATCHSET}-patches.tar.gz";

LICENSE="FESTIVAL HPND BSD rc regexp-UofT"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd"
IUSE="nas X"

RDEPEND="
        nas? ( media-libs/nas )
        X? ( x11-libs/libX11
                x11-libs/libXt )
        >=media-libs/alsa-lib-1.0.20-r1
        !<app-accessibility/festival-1.96_beta
        !sys-power/powerman
        >=sys-libs/ncurses-5.6-r2
"
DEPEND="${RDEPEND}
        virtual/pkgconfig
"

S="${WORKDIR}/speech_tools"

src_prepare() {
        EPATCH_SUFFIX="patch"
        epatch

        sed -i -e 's,{{HORRIBLELIBARCHKLUDGE}},"/usr/$(get_libdir)",' \
                main/siod_main.cc || die

        #WRT bug #309983
        sed -i -e "s:\(GCC_SYSTEM_OPTIONS =\).*:\1:" \
                "${S}"/config/systems/sparc_SunOS5.mak || die

        # Fix underlinking, bug #493204
        epatch "${FILESDIR}"/${PN}-2.1-underlinking.patch
}

src_configure() {
        local CONFIG=config/config.in
        sed -i -e 's/@COMPILERTYPE@/gcc42/' ${CONFIG} || die
        if use nas; then
                sed -i -e "s/#.*\(INCLUDE_MODULES += NAS_AUDIO\)/\1/" \
                        ${CONFIG} || die
        fi
        if ! use X; then
                sed -i -e "s/-lX11 -lXt//" config/modules/esd_audio.mak || die
        fi
        econf
}

src_compile() {
        emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" 
CXX_OTHER_FLAGS="${CXXFLAGS}" CC_OTHER_FLAGS="${CFLAGS}" \
                LDFLAGS="${LDFLAGS}"
}

src_install() {
        dolib.so lib/libest*.so*

        dodoc "${S}"/README
        dodoc "${S}"/lib/cstrutt.dtd

        insinto /usr/share/doc/${PF}
        doins -r lib/example_data

        insinto /usr/share/speech-tools
        doins -r config base_class

        insinto /usr/share/speech-tools/lib
        doins -r lib/siod

        cd include || die
        insinto /usr/include/speech-tools
        doins -r *
        dosym /usr/include/speech-tools /usr/share/speech-tools/include

        cd ../bin || die
        for file in *; do
                [ "${file}" = "Makefile" ] && continue
                dobin ${file}
                dstfile="${D}/usr/bin/${file}"
                sed -i -e 
"s:${S}/testsuite/data:/usr/share/speech-tools/testsuite:g" \
                        ${dstfile} || die
                sed -i -e "s:${S}/bin:/usr/$(get_libdir)/speech-tools:g" \
                        ${dstfile} || die
                sed -i -e "s:${S}/main:/usr/$(get_libdir)/speech-tools:g" \
                        ${dstfile} || die

                # This just changes LD_LIBRARY_PATH
                sed -i -e "s:${S}/lib:/usr/$(get_libdir):g" ${dstfile} || die
        done

        cd "${S}" || die
        exeinto /usr/$(get_libdir)/speech-tools
        for file in `find main -perm +100 -type f`; do
                doexe ${file}
        done

        #Remove /usr/bin/resynth as it is broken. See bug #253556
        rm "${D}/usr/bin/resynth" || die

        # 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
}




Reply via email to