Revbump... see ChangeLog.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 119 insertions, 17 deletions

diff --git a/app-accessibility/epos/Manifest b/app-accessibility/epos/Manifest
index 25102d50b66a..2683ab3e30eb 100644
--- a/app-accessibility/epos/Manifest
+++ b/app-accessibility/epos/Manifest
@@ -1,10 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 54d73d59ebadc97fb16fc86900a62527 ChangeLog 1738
+MD5 394662430162d317d81d6f54794ada78 ChangeLog 1931
 MD5 ed1c8a94add02640c0b860edb1c3071e epos-2.5.23-r1.ebuild 755
 MD5 050ab8f1df8b68e12e804df6698c533d metadata.xml 231
-MD5 1abf7aa6cc42593bbac510325e30cafd epos-2.5.35-r1.ebuild 1287
+MD5 edc0319ee45a2ce36ed5f66197993859 epos-2.5.35-r1.ebuild 1338
 MD5 d41676ea75dabd569433cfca8d1f2bf2 files/README.gentoo 108
 MD5 44bb6900b1cf61e43f4397bacc00adf1 files/digest-epos-2.5.23-r1 63
 MD5 ab56a6d2d8704c792114afd7bbf3743a files/epos 546
@@ -13,10 +10,3 @@ MD5 9318068877f92ebdc37fbb8d0258b05c files/eposd 554
 MD5 c8df3770b8aa63afc1ffde3af9922208 files/digest-epos-2.5.35-r1 63
 MD5 ef0ee59a21cd088198c030a2fc5c6fd5 files/epos-2.5.35-destdir.patch 1038
 MD5 365c1b4554293b822779986973f88ac5 files/epos-2.5.35-sysportaudio.patch 1517
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC4qS6ArHZZzCEUG0RAuQKAJ0WPVJJGNVhQ2xGkIqmkQpAwB6M+wCdECNK
-dl8U3efZ9TThIBgexBmWbN0=
-=2wLI
------END PGP SIGNATURE-----
diff --git a/app-accessibility/speech-tools/ChangeLog b/app-accessibility/speech-tools/ChangeLog
index 8872becda04c..a40296da604d 100644
--- a/app-accessibility/speech-tools/ChangeLog
+++ b/app-accessibility/speech-tools/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-accessibility/speech-tools
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 1.27 2005/07/21 09:01:51 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 1.28 2005/07/24 00:55:24 eradicator Exp $
+
+*speech-tools-1.2.3-r3 (24 Jul 2005)
+
+  24 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +speech-tools-1.2.3-r3.ebuild:
+  Added esd support and cleaned up the ebuild thanks to Florian Wesch
+  <dividuum-gentoo@bl0rg.net>, Vincent Poinot <vincent.poinot@wanadoo.fr>, and
+  Stian Skjelstad <stian@nixia.no>. Closes bugs #84721, #87979, and #91962.
+  Also, we now use the proper compilers.
 
   04 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
   speech-tools-1.2.3-r2.ebuild:
diff --git a/app-accessibility/speech-tools/Manifest b/app-accessibility/speech-tools/Manifest
index 11e2baeaaa40..eb4e6681b731 100644
--- a/app-accessibility/speech-tools/Manifest
+++ b/app-accessibility/speech-tools/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 099fd9eb37b716b221a997f9bf539463 ChangeLog 4098
+MD5 6dfdaaa6c0a90329a27b0b85651e98a4 ChangeLog 4493
 MD5 4f5d797c455932135181f0c31b5e71b2 metadata.xml 185
 MD5 4ffd23c3ded99e85692162aeb531e04c speech-tools-1.2.3-r1.ebuild 3007
 MD5 6a79347d216ee0db49beb8028d9b3b7d speech-tools-1.2.3-r2.ebuild 3104
+MD5 f8b4927c002cfe3b00e3ed9331d55c2e speech-tools-1.2.3-r3.ebuild 3132
 MD5 a143fa8cb76f282bdd72ae3ad821f9c5 files/58speech-tools 34
 MD5 dbb77def95ba86c97fb18472325f2e18 files/digest-speech-tools-1.2.3-r1 224
 MD5 19e3325adc92d921d82884fe58485055 files/speech-tools-gcc3.3.diff 25787
 MD5 dbb77def95ba86c97fb18472325f2e18 files/digest-speech-tools-1.2.3-r2 224
+MD5 dbb77def95ba86c97fb18472325f2e18 files/digest-speech-tools-1.2.3-r3 224
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFC32TcArHZZzCEUG0RAiNxAJ4rMBg4CMkxeqWX4M5dKX673ClkVQCfcf+k
-uD9gaNJrbUyLYznZh44HYrE=
-=vtrw
+iD8DBQFC4ueVArHZZzCEUG0RArOYAJ4ntnZmjZYCHnwME8wjR3SKUJPPKACdFP8V
+liOwI3EpEsLZHeoa/4pzlNc=
+=hQZa
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/speech-tools/files/digest-speech-tools-1.2.3-r3 b/app-accessibility/speech-tools/files/digest-speech-tools-1.2.3-r3
new file mode 100644
index 000000000000..866ee7e5befb
--- /dev/null
+++ b/app-accessibility/speech-tools/files/digest-speech-tools-1.2.3-r3
@@ -0,0 +1,3 @@
+MD5 783051edfa493b5325ac3ff205bdf265 speech_tools-1.2.3-release.tar.gz 1257290
+MD5 faabc25a6c1b11854c41adc257c47bdb festdoc-1.4.2.tar.gz 1652551
+MD5 9076a19cf0225bb183deda52d4be1130 speech-tools-1.2.3-gcc3.4.patch.bz2 13451
diff --git a/app-accessibility/speech-tools/speech-tools-1.2.3-r3.ebuild b/app-accessibility/speech-tools/speech-tools-1.2.3-r3.ebuild
new file mode 100644
index 000000000000..834911d21031
--- /dev/null
+++ b/app-accessibility/speech-tools/speech-tools-1.2.3-r3.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-1.2.3-r3.ebuild,v 1.1 2005/07/24 00:55:24 eradicator Exp $
+
+IUSE="doc esd"
+
+inherit eutils fixheadtails toolchain-funcs
+
+MY_P=${P/-/_}
+
+DESCRIPTION="Speech tools for Festival Text to Speech engine"
+HOMEPAGE="http://www.cstr.ed.ac.uk/"
+CSTR="http://www.cstr.ed.ac.uk/download/festival/1.4.3"
+SRC_URI="${CSTR}/${MY_P}-release.tar.gz
+	 doc? ( ${CSTR}/festdoc-1.4.2.tar.gz )
+	 mirror://gentoo/speech-tools-${PV}-gcc3.4.patch.bz2"
+
+LICENSE="FESTIVAL BSD as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="sys-libs/ncurses"
+DEPEND="${RDEPEND}
+	app-arch/cpio
+	sys-apps/findutils
+	>=sys-apps/sed-4"
+
+S="${WORKDIR}/speech_tools"
+
+src_unpack() {
+	[ "${A}" ] && unpack ${A}
+
+	use doc && mv festdoc-1.4.2 festdoc
+
+	[[ "$(gcc-version)" == "3.3" ]] && epatch ${FILESDIR}/${PN}-gcc3.3.diff
+	[[ "$(gcc-version)" == "3.4" ]] && epatch ${WORKDIR}/${P}-gcc3.4.patch
+
+	ht_fix_file ${S}/config.guess
+	sed -i 's:-O3:$(OPTIMISE_CXXFLAGS):' ${S}/base_class/Makefile
+
+	# Compile fix for #41329.
+	sed -i 's/-fpic/-fPIC/' ${S}/config/compilers/gcc_defaults.mak
+}
+
+src_compile() {
+	econf || die
+	emake -j1 OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
+}
+
+src_install() {
+	dolib.so ${S}/lib/{libestbase.so.1.2.3.1,libeststring.so.1.2}
+	dosym /usr/$(get_libdir)/libestbase.so.1.2.3.1 /usr/$(get_libdir)/libestbase.so
+	dosym /usr/$(get_libdir)/libeststring.so.1.2 /usr/$(get_libdir)/libeststring.so
+	dolib.a ${S}/lib/{libestbase.a,libestools.a,libeststring.a}
+
+	cd ${S}/bin
+	for file in *; do
+		[ "${file}" = "Makefile" ] && continue
+		dobin ${file}
+		dstfile="/usr/bin/${file}"
+		dosed "s:${S}/testsuite/data:/usr/share/speech-tools/testsuite:g" ${dstfile}
+		dosed "s:${S}/bin:/usr/libexec/speech-tools:g" ${dstfile}
+		dosed "s:${S}/main:/usr/libexec/speech-tools:g" ${dstfile}
+
+		# This just changes LD_LIBRARY_PATH
+		dosed "s:${S}/lib:/usr/$(get_libdir):g" ${dstfile}
+	done
+
+	exeinto /usr/libexec/speech-tools
+	for file in `find ${S}/main -perm +100 -type f`; do
+		doexe ${file}
+	done
+
+	insinto /usr/share/speech-tools/lib/siod
+	doins ${S}/lib/siod/*
+
+	insinto /usr/share/doc/${PF}/example_data
+	doins ${S}/lib/example_data/*
+
+	cd ${S}
+	find config -print | cpio -pmd ${D}/usr/share/speech-tools || die "Unable to install config files"
+
+	dodir /usr/include/speech-tools
+	cd ${S}/include
+	find . -print | cpio -pmd ${D}/usr/include/speech-tools || die "Unable to install include files"
+	dosym /usr/include/speech-tools /usr/share/speech-tools/include
+
+	chown -R root:root ${D}
+
+	find ${D}/usr/share/speech-tools/config -type f | xargs sed -i 's/-ltermcap/-lncurses/g'
+
+	doenvd ${FILESDIR}/58speech-tools
+
+	dodoc ${S}/{README,INSTALL}
+	dodoc ${S}/lib/cstrutt.dtd
+
+	use doc && dohtml -r ${WORKDIR}/festdoc/speech_tools/doc/*
+}