Rev bump to fix a typo in the shared lib installation routine.

Package-Manager: portage-2.1.2_pre1-r1

4 files changed, 126 insertions, 5 deletions

diff --git a/app-accessibility/speech-tools/ChangeLog b/app-accessibility/speech-tools/ChangeLog
index 62b7906dde1a..af662674956e 100644
--- a/app-accessibility/speech-tools/ChangeLog
+++ b/app-accessibility/speech-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-accessibility/speech-tools
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 1.38 2006/09/21 04:36:35 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 1.39 2006/09/24 15:52:38 williamh Exp $
+
+*speech-tools-1.2.95_beta-r1 (24 Sep 2006)
+
+  24 Sep 2006; William Hubbs <williamh@gentoo.org>
+  +speech-tools-1.2.95_beta-r1.ebuild:
+  This rev bump fixes a typo in the shared lib installation portion of the ebuild
+  for bug #148851.
 
 *speech-tools-1.2.95_beta (21 Sep 2006)
 
diff --git a/app-accessibility/speech-tools/Manifest b/app-accessibility/speech-tools/Manifest
index 9783ea550228..ef8d1559aa99 100644
--- a/app-accessibility/speech-tools/Manifest
+++ b/app-accessibility/speech-tools/Manifest
@@ -30,14 +30,18 @@ EBUILD speech-tools-1.2.3-r3.ebuild 3136 RMD160 b6799a72a9390b54e30ab2089290bbf0
 MD5 6f2bef3a1a353eab078973d0edd9c750 speech-tools-1.2.3-r3.ebuild 3136
 RMD160 b6799a72a9390b54e30ab2089290bbf0910699b6 speech-tools-1.2.3-r3.ebuild 3136
 SHA256 fd93989e05558140cc19474582486ce626a615ab7d67930ea05063a55bbc3c18 speech-tools-1.2.3-r3.ebuild 3136
+EBUILD speech-tools-1.2.95_beta-r1.ebuild 3159 RMD160 15a73ec3604f872744a1a67fe2c5b434cceda497 SHA1 d2971e1e52a5b964b29d7b297b2eaf80e5a4efce SHA256 aacd15a78f55a4b7ac322badddfabb8890c74a197943de58f9992a179ad3c9a8
+MD5 9c15a200bcbbf3c4ecc4670ba75e4883 speech-tools-1.2.95_beta-r1.ebuild 3159
+RMD160 15a73ec3604f872744a1a67fe2c5b434cceda497 speech-tools-1.2.95_beta-r1.ebuild 3159
+SHA256 aacd15a78f55a4b7ac322badddfabb8890c74a197943de58f9992a179ad3c9a8 speech-tools-1.2.95_beta-r1.ebuild 3159
 EBUILD speech-tools-1.2.95_beta.ebuild 3155 RMD160 da1aa2333f9993d963ba000ca62343d2e7946e27 SHA1 0c0095b22c0e9a92f09debd55c0149f12d03099e SHA256 8f734b6540d4b5d2b944a32dfa601da1930ce94d79a6e4341076b33226343226
 MD5 b966d8ad4e2e82beb931bb3a00419075 speech-tools-1.2.95_beta.ebuild 3155
 RMD160 da1aa2333f9993d963ba000ca62343d2e7946e27 speech-tools-1.2.95_beta.ebuild 3155
 SHA256 8f734b6540d4b5d2b944a32dfa601da1930ce94d79a6e4341076b33226343226 speech-tools-1.2.95_beta.ebuild 3155
-MISC ChangeLog 6132 RMD160 d3690a9923e2394101132b2c42c72463d1becd0e SHA1 5fff53c6f0376cc1e200a55b6d77100765cd0c5c SHA256 967d0695551ba33f9ae6302c7870a84c8e803e1e62b0c72735add6b3b17d0736
-MD5 788441cc1cfc095dafe3048283669a14 ChangeLog 6132
-RMD160 d3690a9923e2394101132b2c42c72463d1becd0e ChangeLog 6132
-SHA256 967d0695551ba33f9ae6302c7870a84c8e803e1e62b0c72735add6b3b17d0736 ChangeLog 6132
+MISC ChangeLog 6368 RMD160 4a40aeb9ef697fcd06a1f43b8369e3e1ac806d16 SHA1 84e5e22a871fc2e2b83f0f3847f99a39db5bd99b SHA256 8fec773fc28846f5538662eaa63cadf2c70aaebbda33c837b5ff3315ee5179ff
+MD5 5485aec968d09d290fc3029304082652 ChangeLog 6368
+RMD160 4a40aeb9ef697fcd06a1f43b8369e3e1ac806d16 ChangeLog 6368
+SHA256 8fec773fc28846f5538662eaa63cadf2c70aaebbda33c837b5ff3315ee5179ff ChangeLog 6368
 MISC metadata.xml 185 RMD160 75382db82e4c69d70f2d53f63363adec302720e5 SHA1 90563c269eff265fbd369095c606bc383cc07232 SHA256 b6de40518e01d3ef5447352b3f476c1f5b8e6ae53d5e654a2fb9e4ee7fdbe135
 MD5 4f5d797c455932135181f0c31b5e71b2 metadata.xml 185
 RMD160 75382db82e4c69d70f2d53f63363adec302720e5 metadata.xml 185
@@ -51,3 +55,6 @@ SHA256 e6f26a356656b742a70d8c81c732e63a14e10c6bac4c07b1af9e98cddcbcf8e2 files/di
 MD5 ceeb4be43852dc06df24df5a4540315f files/digest-speech-tools-1.2.95_beta 277
 RMD160 9db89d5c3b15a8d9c0d5eabdecccb92000cff3e2 files/digest-speech-tools-1.2.95_beta 277
 SHA256 e21ba8626621f708bb6dbb90d0d57dca18c8b83eea63f6813b436e844e97f51b files/digest-speech-tools-1.2.95_beta 277
+MD5 ceeb4be43852dc06df24df5a4540315f files/digest-speech-tools-1.2.95_beta-r1 277
+RMD160 9db89d5c3b15a8d9c0d5eabdecccb92000cff3e2 files/digest-speech-tools-1.2.95_beta-r1 277
+SHA256 e21ba8626621f708bb6dbb90d0d57dca18c8b83eea63f6813b436e844e97f51b files/digest-speech-tools-1.2.95_beta-r1 277
diff --git a/app-accessibility/speech-tools/files/digest-speech-tools-1.2.95_beta-r1 b/app-accessibility/speech-tools/files/digest-speech-tools-1.2.95_beta-r1
new file mode 100644
index 000000000000..ad4a33cf98f5
--- /dev/null
+++ b/app-accessibility/speech-tools/files/digest-speech-tools-1.2.95_beta-r1
@@ -0,0 +1,3 @@
+MD5 4a0a58d8c4bafaee9f0a913372ded8bd speech_tools-1.2.95-beta.tar.gz 1281274
+RMD160 874b9e6d35bf8a59aeacd3d5b149e24e2a490008 speech_tools-1.2.95-beta.tar.gz 1281274
+SHA256 d9d0693ed57ba1f6c9471a43fe60fb1b728683fe6f820e98ef2be13bbd1fe772 speech_tools-1.2.95-beta.tar.gz 1281274
diff --git a/app-accessibility/speech-tools/speech-tools-1.2.95_beta-r1.ebuild b/app-accessibility/speech-tools/speech-tools-1.2.95_beta-r1.ebuild
new file mode 100644
index 000000000000..57226d1b4b09
--- /dev/null
+++ b/app-accessibility/speech-tools/speech-tools-1.2.95_beta-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2006 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.95_beta-r1.ebuild,v 1.1 2006/09/24 15:52:38 williamh Exp $
+
+IUSE="esd X"
+
+inherit eutils fixheadtails 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/"
+CSTR="http://www.cstr.ed.ac.uk/download/festival/1.95"
+SRC_URI="${CSTR}/${MY_P}.tar.gz"
+
+LICENSE="FESTIVAL BSD as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="sys-libs/ncurses"
+DEPEND="${RDEPEND}
+	app-arch/cpio
+	sys-apps/findutils
+	esd? ( media-sound/esound )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXt )
+	!<app-accessibility/festival-1.95_beta
+	>=sys-apps/sed-4"
+
+S="${WORKDIR}/speech_tools"
+
+src_unpack() {
+	unpack ${A}
+
+# set the compiler flags.
+	sed -i -e 's:-O3:$(OPTIMISE_CXXFLAGS):' ${S}/base_class/Makefile
+
+	# Compile fix for #41329.
+	sed -i -e 's/-fpic/-fPIC/' ${S}/config/compilers/gcc_defaults.mak
+
+	sed -i -e 's/# \(SHARED=1\)/\1/' ${S}/config/config.in
+	use esd && sed -i -e 's/# \(INCLUDE_MODULES += ESD_AUDIO\)/\1/' ${S}/config/config.in
+	use X || sed -i -e 's/-lX11 -lXt//' ${S}/config/modules/esd_audio.mak
+
+	# gcc 4.1 compatibility patches
+	epatch ${FILESDIR}/${P}-gcc41.patch
+	epatch ${FILESDIR}/${P}-gcc41-amd64.patch
+	epatch ${FILESDIR}/${P}-gcc41-amd64-int-pointer.patch
+}
+
+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.95.1,libeststring.so.1.2}
+	dosym /usr/$(get_libdir)/libestbase.so.1.2.95.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:0 ${D}
+
+	find ${D}/usr/share/speech-tools/config -type f | xargs sed -i -e 's/-ltermcap/-lncurses/g'
+
+	#doenvd ${FILESDIR}/58speech-tools
+
+	dodoc ${S}/{README,INSTALL}
+	dodoc ${S}/lib/cstrutt.dtd
+}