Revbump. Fixes bugs #421789 and #438628

(Portage version: 2.2.0_alpha138/cvs/Linux i686, signed Manifest commit with key 748B2C601F6F0683)

2 files changed, 108 insertions, 1 deletions

diff --git a/app-accessibility/speech-tools/ChangeLog b/app-accessibility/speech-tools/ChangeLog
index 476dba5b4d73..b743fb0ac64e 100644
--- a/app-accessibility/speech-tools/ChangeLog
+++ b/app-accessibility/speech-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-accessibility/speech-tools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 1.81 2012/05/31 02:18:35 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 1.82 2012/12/04 04:09:02 neurogeek Exp $
+
+*speech-tools-2.1-r2 (03 Dec 2012)
+
+  03 Dec 2012; Jesus Rivero <neurogeek@gentoo.org> +speech-tools-2.1-r2.ebuild:
+  Revbump. Fixes bugs #421789 and #438628
 
   31 May 2012; Zac Medico <zmedico@gentoo.org>
   speech-tools-1.2.96_beta-r2.ebuild, speech-tools-1.2.96_beta.ebuild,
diff --git a/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild b/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild
new file mode 100644
index 000000000000..51d47321baa5
--- /dev/null
+++ b/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2012 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-r2.ebuild,v 1.1 2012/12/04 04:09:02 neurogeek Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+MY_P=${P/speech-/speech_}
+PATCHSET="r2"
+
+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 BSD as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="nas X"
+
+DEPEND="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"
+
+RDEPEND=${DEPEND}
+
+S="${WORKDIR}/speech_tools"
+
+src_prepare() {
+	EPATCH_SUFFIX="patch"
+	epatch
+
+	sed -i -e 's,{{HORRIBLELIBARCHKLUDGE}},"/usr/$(get_libdir)",' main/siod_main.cc
+
+	#WRT bug #309983
+	sed -i -e "s:\(GCC_SYSTEM_OPTIONS =\).*:\1:" "${S}"/config/systems/sparc_SunOS5.mak
+}
+
+src_configure() {
+	local CONFIG=config/config.in
+	sed -i -e 's/@COMPILERTYPE@/gcc42/' ${CONFIG}
+	if use nas; then
+		sed -i -e "s/#.*\(INCLUDE_MODULES += NAS_AUDIO\)/\1/" ${CONFIG}
+	fi
+	if ! use X; then
+		sed -i -e "s/-lX11 -lXt//" config/modules/esd_audio.mak
+	fi
+	econf || die
+}
+
+src_compile() {
+	emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" CXX_OTHER_FLAGS="${CXXFLAGS}" CC_OTHER_FLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" || die "Compile failed"
+}
+
+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
+	insinto /usr/include/speech-tools
+	doins -r *
+	dosym /usr/include/speech-tools /usr/share/speech-tools/include
+
+	cd ../bin
+	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}
+		sed -i -e "s:${S}/bin:/usr/$(get_libdir)/speech-tools:g" ${dstfile}
+		sed -i -e "s:${S}/main:/usr/$(get_libdir)/speech-tools:g" ${dstfile}
+
+		# This just changes LD_LIBRARY_PATH
+		sed -i -e "s:${S}/lib:/usr/$(get_libdir):g" ${dstfile}
+	done
+
+	cd "${S}"
+	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"
+}