Version bump.

Package-Manager: portage-2.2_rc67/cvs/Linux i686

3 files changed, 125 insertions, 5 deletions

diff --git a/app-accessibility/speech-tools/ChangeLog b/app-accessibility/speech-tools/ChangeLog
index 81260a616b0e..39236f8f242b 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 1.67 2010/05/19 16:20:50 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 1.68 2010/06/30 14:40:52 neurogeek Exp $
+
+*speech-tools-2.0.95_beta (30 Jun 2010)
+
+  30 Jun 2010; Jesus Rivero <neurogeek@gentoo.org>
+  +speech-tools-2.0.95_beta.ebuild:
+  Version bump.
 
   19 May 2010; Jesus Rivero <neurogeek@gentoo.org>
   speech-tools-1.2.96_beta-r2.ebuild:
diff --git a/app-accessibility/speech-tools/Manifest b/app-accessibility/speech-tools/Manifest
index 84df0d6a6b89..7f7eeb030159 100644
--- a/app-accessibility/speech-tools/Manifest
+++ b/app-accessibility/speech-tools/Manifest
@@ -6,14 +6,17 @@ AUX speech-tools-1.2.96_beta-gcc43-include.patch 878 RMD160 fb89c84949548cfdc49d
 AUX speech-tools-1.2.96_beta-gcc44.patch 579 RMD160 389950e6e9e8444acfaa7c647519cf488d38e89c SHA1 3389cad0757b5239be7caba00d412c625e3e49d0 SHA256 720cb246c3845779291038e945e09024370b3478d3e84416886efb9263f490bf
 DIST speech_tools-1.2.96-beta-patches.tar.gz 17282 RMD160 9fbcc8ae819d51380bbf3ced849a07fadc47aead SHA1 91f1da75b686e0c345a0fc23ab03d7d64203a682 SHA256 389a4fb53854dc9b4c822b4ad7310fa4dd121bad22ccbee9bfe24cf4163459d0
 DIST speech_tools-1.2.96-beta.tar.gz 1275015 RMD160 3d2acc841a8b14e0bff66c9bb08293206f501a7a SHA1 7f208863833a7e7ea4838e0f0f04a4881b32cf56 SHA256 fa1ce5698e1253ee21e67629f394733ef6ad578af671e3a90ea8b73898a12428
+DIST speech_tools-2.0.95-beta-patches.tar.gz 5773 RMD160 2b781434bae545425af4a2e4ff99a159b3251215 SHA1 3cf324b45350be07d49dfafc01d3ec8bf41308e3 SHA256 e7d6780ccf7f1cc4e61f1f70f3fc6d981344b2b2d1c5a1631fe15397f7daac0e
+DIST speech_tools-2.0.95-beta.tar.gz 1681824 RMD160 ccb1f249924885c0b0c831bb0bc0c9f6a7279fbb SHA1 d3f13f0f66f763e80c73eb26f07b86572944ba2a SHA256 61f6786468872aeb2ba0db3ba8c42dd23dfba95467b9fb30cc4f3d92a956b554
 EBUILD speech-tools-1.2.96_beta-r2.ebuild 3065 RMD160 837c5622f9b9a5e34e44f3439040d1cf238a81f3 SHA1 fba5bef6718136fde171194a5af583b0ce9c6402 SHA256 f2d796ed614051e7f789676ee19202ccd49ce10c84e2f6e107e0085fb0cfb171
 EBUILD speech-tools-1.2.96_beta.ebuild 2801 RMD160 4d69f662118f44891e82e5a1d9baae38b3b074aa SHA1 4e366f2228e6892b370d5444913c5fd527e7c567 SHA256 9f87ae7a32433603744490de14c1bba8ae2fd2289d779a9b47e6eccc98caa297
-MISC ChangeLog 10845 RMD160 bf64e64d5f2b8279635172040195ef994ec99786 SHA1 ef26b83b31608dcafc42a75f348727d7e489fd75 SHA256 e4d830179a4d1b23c4c16bf378ec33fc11592d5c63c94bd75c22acc13748a008
+EBUILD speech-tools-2.0.95_beta.ebuild 3201 RMD160 726be641cbfe09d1af8b0050a46ef6eae36bd944 SHA1 44c0e1d84fac70321d90ddc6b4ad20c8fa3b330b SHA256 eb782858044a7ea27a3ab549b09704e82b0561844c01dfbf66a69ee4c4278f8f
+MISC ChangeLog 10990 RMD160 a4908c968c366452c3a018869e64c38690c8cc68 SHA1 7287e837294f4555819f2a3becb88c69e1143d66 SHA256 1f4281e5a03b920c446eb0e078acab48fd66d849045fe5ade3252cc00f37b41d
 MISC metadata.xml 249 RMD160 b4704f1b46f70badf05ac1549e9feaf260041a08 SHA1 901e48e020cb6dcb722212410e1ac34212e87cf0 SHA256 7bce1abcec735751c95b28394f348e421b525ead1ba86638fc5f884217cdb49a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkv0AaYACgkQdIssYB9vBoPDTACdHV62JPWnubosmER5aj0EWXMk
-5X0AniT28pYck816J0c0Jcf4+IzfLcWE
-=DnIA
+iEYEARECAAYFAkwrSYgACgkQdIssYB9vBoM8vQCeNMvYl5V47ZkRq13tJexT2la6
+moUAn1Oo1BT+Cy0xcNpwGia6dzdT+/2y
+=91vc
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild b/app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild
new file mode 100644
index 000000000000..c5842a3d3888
--- /dev/null
+++ b/app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2010 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.0.95_beta.ebuild,v 1.1 2010/06/30 14:40:52 neurogeek Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+MY_P=${P/speech-/speech_}
+MY_P=${MY_P/_beta/-beta}
+
+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%_beta}/${MY_P}.tar.gz
+	mirror://gentoo/${MY_P}-patches.tar.gz"
+LICENSE="FESTIVAL BSD as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="esd nas X"
+
+DEPEND="esd? ( media-sound/esound )
+	nas? ( media-libs/nas )
+	X? ( x11-libs/libX11
+		x11-libs/libXt )
+	!<app-accessibility/festival-1.96_beta
+	!sys-power/powerman"
+
+S="${WORKDIR}/speech_tools"
+
+src_prepare() {
+	EPATCH_SUFFIX="patch"
+	epatch
+	sed -i -e 's,{{HORRIBLELIBARCHKLUDGE}},"/usr/$(get_libdir)",' main/siod_main.cc
+}
+
+src_configure() {
+	local CONFIG=config/config.in
+	sed -i -e 's/@COMPILERTYPE@/gcc42/' ${CONFIG}
+	if use esd; then
+		sed -i -e "s/#.*\(INCLUDE_MODULES += ESD_AUDIO\)/\1/" ${CONFIG}
+	fi
+	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
+	append-ldflags -Wl,--no-as-needed
+	econf || die
+}
+
+src_compile() {
+	#emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" CC_OTHER_FLAGS="${CFLAGS}" \
+	#	OPTIMISE_LINKFLAGS="${LDFLAGS}" || die "Compile failed"
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" CC_OTHER_FLAGS="${CFLAGS}" \
+		OPTIMISE_LINKFLAGS="${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
+
+	#Rename to avoid file collisions. See bug #287983
+	mv "${D}/usr/bin/dp" "${D}/usr/bin/speech-dp"
+	#Remove /usr/bin/resynth as it is broken. See bug #253556
+	rm "${D}/usr/bin/resynth"
+}
+
+pkg_postinst() {
+	elog "The /usr/bin/dp wrapper script has been renamed to /usr/bin/speech-dp"
+	elog "due to file collision with other programs."
+	elog "See bug #287983 for more details"
+
+	elog "The /usr/bin/resynth program has been removed since it is broken"
+	elog "See bug #253556 for more details"
+}