Remove unnecessary bcat tool (see bug #418301).

Also, add die to uses of cd, rm, and sed (see comment on bug #510600).

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x6521E06D

3 files changed, 134 insertions, 15 deletions

diff --git a/app-accessibility/speech-tools/ChangeLog b/app-accessibility/speech-tools/ChangeLog
index 6f49c8d3927d..38be4a065be7 100644
--- a/app-accessibility/speech-tools/ChangeLog
+++ b/app-accessibility/speech-tools/ChangeLog
@@ -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 <teiresias@gentoo.org>
+  +speech-tools-2.1-r3.ebuild:
+  Remove unnecessary bcat tool (see bug #418301).
 
   11 Jan 2015; Chema Alonso <nimiux@gentoo.org> speech-tools-2.1-r2.ebuild:
   Stable for amd64 wrt bug #510600
diff --git a/app-accessibility/speech-tools/Manifest b/app-accessibility/speech-tools/Manifest
index 4144e1e32bee..a7d97922b320 100644
--- a/app-accessibility/speech-tools/Manifest
+++ b/app-accessibility/speech-tools/Manifest
@@ -7,22 +7,17 @@ DIST speech_tools-2.1-r3-patches.tar.gz 6876 SHA256 c37357211aa88ca6038932222f66
 DIST speech_tools-2.1-release.tar.gz 1681999 SHA256 ff6167cd929a88e2f91b47191c6c4dae87c9c06ba39fccc4465af9d79e9b2be9 SHA512 6ef9a7dd01ede152c4dafd0b2037312d62a79d875813d74ea048899a52eee505b93ffbabef9b6c0a1d15aeadb5508fd18a2f392e85276847fe071173aec5db96 WHIRLPOOL 6df6ca5168462599fadf209827e367c963af5ca6be05277618c9d09aac34a3b151665b860a14fa4742482cc77246e372671ac94b23bdca63bbbb7b8c7b234644
 EBUILD speech-tools-2.1-r1.ebuild 2663 SHA256 0be3245158410ded8f461a2afeed689056bff684d96ca2d3d8d30224e1b047ca SHA512 a608f65cd3dc9a8e8eb3148b85d3053787e8dfb86b678f53fb4ecb5fc255ef6d63eb059c6f46f38ac278a0c561d7ba6f51afe7c321fba472d9b87604b509a895 WHIRLPOOL d220b66d03c7f4cac478f46440dc79a69a65b6948c6fd744bf217e099856b97aa5675485002c6b3fbdd77339913fa61f6befc3c4f302be674c3274a7369921b8
 EBUILD speech-tools-2.1-r2.ebuild 2836 SHA256 f8b33a65add40b6c8358a94cde13cefba5d7d5a93bc6d635e0861494b2107859 SHA512 50bac06e3f81c48137633f6801d0cfb915c511e3858ddf1a1315206b20d7e887b32a44776aa6c51e3d227572e53b1240c48a99514e5e2d7312471054b19163bd WHIRLPOOL 6610706baf2cf24a22514cc4da965e95a428343c442191b5b44e788f25e5146c9d07daf3de1ee15c5826faacd09e6c754eb4a6a077523d540d0e30bd8d7bc255
-MISC ChangeLog 14437 SHA256 083b1d9fdc8c4c7a316d62531e4ba2d6bd34257e331a57af159f0fa0bc85baf0 SHA512 dfcee7f428c601d2df57e4332643535d0e8171f9fcd36fc940bd4772db9c6c40654708e6f47ca8f65cbf3c861d06b1c11b902fb8f138a0e757bf084e8ca29a2c WHIRLPOOL c6e8a2c456d2e6a21289f2758a4a345c59a2c4a3f63261c71e6df8b69be3699eb8aad9812b8bed1823fc6b33c4916f269663510e293a79ab472bad316ca0419f
+EBUILD speech-tools-2.1-r3.ebuild 3115 SHA256 40ff2778c4dd78bc6780e82ee6b06e2a478e2f50a692acc90be95462a54e240b SHA512 7470c62727c02490a54e7ad0a4e1de1e213751578920a1c438cc62110e4dff6a620eea8c4c446c0552c68c70f970cbd33f639c12b0249a3db7309a50c58c7f1b WHIRLPOOL 9912afd91cfabe6cddbf155c8019e8192770e900b893654a78433cc2c86aef024dd213ae54b78f09033b4bd3082266f53c612d43e197f3c857ef4ba7f31c8967
+MISC ChangeLog 14616 SHA256 aadbf7ddb1237f095cb853cac03647dca3bcf4c1d0ba67ebf10b18db298596cc SHA512 02779fb3e02c6a26f4436cb6dc0401a5e5e4795941fe7fdfdbc5efc14e0c83d1a84f92cc715d426420154282d279a762727235221f4633d10113fe441d97251e WHIRLPOOL 99f155c1c175cd4838ad83d31633b4902648a29c4855d9eb839e5f1079526730ce7bafeeae247e171ae054a50ef8e4ecaf5cf24f5b49f21806f5c1f3fac8e640
 MISC metadata.xml 249 SHA256 7bce1abcec735751c95b28394f348e421b525ead1ba86638fc5f884217cdb49a SHA512 5d0f694d49c84a53b2f504fe98ab89c54a505cf991603923fd4b255899fd076d832a1b1e4ab30bed1a765e708513434da4f16c64a01aeb7bca9886caf5a6629f WHIRLPOOL 559c9365b8ba9856ef2c25a90d97a3d961c2378680af5e3703da684152eb81ba75faa5bbfdc9bb015df2a2214e94934e5b13fa0d5056d972285fd9e0da363828
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUstEyAAoJEH/rgyzyU9sVVA0P/2T3pFCckQ9tiIJJ2/ipiQZ+
-G7sf55JEk+sfU+hEFHHaJvxbmnaKVtvPrRBcHBLYS+et/XCJRS0MP1OLb0hNr1AL
-83bFlRGnu5Iy+VGYiUGCTTS+pqaF/c5/5kh1zW8GENite1uYh3t2r+9QvYkAiHTc
-yc0TGmkOFO3zIDSthDgSHVYU9qY9zlYTJorpp9UTbOc5uLoUZ3dWzjkS090zRfnZ
-e6PXyDhN2oBRjLtUaa3TZbHF8mGHLijTp4M24BqeJRf6oWoX2LKyb1FSA3W5txiz
-pf9XzPro3xaWZ676xSMBwrO5qD2Bqo8bx/wjq/E1Wd8Xg4H9WIhr821JVcz+aMLs
-FB2fJgNpJwF9Z4PKEyc373Bncygpx1JD97hLvzNUkoAbMBfNEDSKre/rbWkxo38O
-hnpeY8rSJfafdsir2s/oWT/MERnKctmcDmLZCk44DCjVSwURRFFZeOJ9yt8/6dsR
-4Gl6VkdbFLcJr0x0Rd1d3laANfA17cleEspDn7rFZilD+jHAmTusUKziEHa0Lxby
-sC+ZBVDaFC+2wA87zLo1pH0ZoLhXo76N78An9B7zfG9oPfFAS2/o4GCi+xzFRH2d
-bIoEhp3yqop2+IDOf7TcU0H/VzlUl5t5XEGry11eh+Np7zVSoFvrqWpebug8CKNS
-R478tOjjlBiltWMnT61m
-=nXDV
+iQEcBAEBCAAGBQJUvbbfAAoJEH8qFnJlIeBtSuwH/2XXHbUE16H+zefnE4EPIm2L
+rO3QQpdyKNKNUvbc4/QgdMk0bepVELKKn8cQhvtItX42ne4PemdBFKWBj7mGV+qx
+NyZCTB0YOnyBVitBCwCtj4K2ZyE0VfUo8SBOZNwEMn+Nvx5mcH4078a35hbhiT+8
+ykoLZyXIXzf/OPeBEHOpIZ0LuFFeGwt8Y+EJQunuyo9JYBmftzM0HHuvtLZILlpp
+scwCD81HOoWZnTP3HFbvG5XWAs8pO4My9a/z3/fbDoEWevA+AkESDpoA9l76XCtn
+l0IRq1FK3XE63/Qq6+ZjhU+73Qf7Grquw+i+5T7cx3JrS/gIXpsz0Gs1uHrnZTM=
+=BlT4
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/speech-tools/speech-tools-2.1-r3.ebuild b/app-accessibility/speech-tools/speech-tools-2.1-r3.ebuild
new file mode 100644
index 000000000000..5804e5f48892
--- /dev/null
+++ b/app-accessibility/speech-tools/speech-tools-2.1-r3.ebuild
@@ -0,0 +1,118 @@
+# 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
+}