From ea531e4e2f58771e845d35e9b08f8f0681d3c80d Mon Sep 17 00:00:00 2001
From: Jesus Rivero <neurogeek@gentoo.org>
Date: Fri, 23 Apr 2010 07:12:38 +0000
Subject: [PATCH] Removed resynth (bug #253556) and fixed soname bug #224915 by
 adding a patchset Package-Manager: portage-2.2_rc67/cvs/Linux i686

---
 app-accessibility/speech-tools/ChangeLog      |   9 +-
 app-accessibility/speech-tools/Manifest       |  13 +-
 ...ild => speech-tools-1.2.96_beta-r2.ebuild} | 111 +++++++++---------
 3 files changed, 73 insertions(+), 60 deletions(-)
 rename app-accessibility/speech-tools/{speech-tools-1.2.96_beta-r1.ebuild => speech-tools-1.2.96_beta-r2.ebuild} (51%)

diff --git a/app-accessibility/speech-tools/ChangeLog b/app-accessibility/speech-tools/ChangeLog
index f948dbed66ad..ce7ec777206e 100644
--- a/app-accessibility/speech-tools/ChangeLog
+++ b/app-accessibility/speech-tools/ChangeLog
@@ -1,6 +1,13 @@
 # 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.65 2010/03/13 20:32:58 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 1.66 2010/04/23 07:12:38 neurogeek Exp $
+
+*speech-tools-1.2.96_beta-r2 (23 Apr 2010)
+
+  23 Apr 2010; Jesus Rivero <neurogeek@gentoo.org>
+  -speech-tools-1.2.96_beta-r1.ebuild, +speech-tools-1.2.96_beta-r2.ebuild:
+  Removed resynth (bug #253556) and fixed soname bug #224915 by adding a
+  patchset
 
 *speech-tools-1.2.96_beta-r1 (13 Mar 2010)
 
diff --git a/app-accessibility/speech-tools/Manifest b/app-accessibility/speech-tools/Manifest
index 2b2989f147e0..7dd14f518d93 100644
--- a/app-accessibility/speech-tools/Manifest
+++ b/app-accessibility/speech-tools/Manifest
@@ -4,15 +4,16 @@ Hash: SHA1
 AUX speech-tools-1.2.96_beta-gcc42.patch 2203 RMD160 c2bb3d7cec0c9449b4480a45675057acc4a8ef8c SHA1 3cf29f9dcb9fdfd90249003b7eca9d71a88b8219 SHA256 4bc724774e4223448bb1bbd202fe6055580abd62d11ffab470843e1351c45e9e
 AUX speech-tools-1.2.96_beta-gcc43-include.patch 878 RMD160 fb89c84949548cfdc49ddff50a7129ea63dc9b2d SHA1 afb2ecfacc123411acb7e82ae9b7c707bd32b922 SHA256 dd050d6556b484ecd494dd080c8b917fcc08c264260c4850d5392986f492febe
 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
-EBUILD speech-tools-1.2.96_beta-r1.ebuild 3100 RMD160 dfbab1e440e2898171c28a1d80866add1bddcd97 SHA1 c4c5b99f9d33799dfc95c54d76d3693f6a6e265e SHA256 c71b3845a1eaefce5b66c30d8ac2a04e1f687f24d44e645280ca183d82095cbc
+EBUILD speech-tools-1.2.96_beta-r2.ebuild 3067 RMD160 06f4bf6cb898f7a0d1847b2c864f454f41e59100 SHA1 0210fb309fae08e57bcd79d9b49e8cc965a16408 SHA256 23c5e059bcc9b4c6409ba09d29e55c9eeffb849a542c271dd5f88ab523b06fa1
 EBUILD speech-tools-1.2.96_beta.ebuild 2801 RMD160 4d69f662118f44891e82e5a1d9baae38b3b074aa SHA1 4e366f2228e6892b370d5444913c5fd527e7c567 SHA256 9f87ae7a32433603744490de14c1bba8ae2fd2289d779a9b47e6eccc98caa297
-MISC ChangeLog 10483 RMD160 39514055f600e32c446448614f4c56cc61c99915 SHA1 890304f0d72cb480716a849ecaad867a3fb893df SHA256 9ab5b4bfcbb7031e4b3cb79db14ef55bb6a8c7d0a0349a077fdb147ca45fa2cb
+MISC ChangeLog 10739 RMD160 5aa42d12ec77c0c3a207cbc91c4c482a142d9ca3 SHA1 2755020689575cdc3914b44285c9e407f5470e14 SHA256 49f604a98b2abf3740bec2b99bb4cf54d4fc9f3429f536fec4642006238faddc
 MISC metadata.xml 249 RMD160 b4704f1b46f70badf05ac1549e9feaf260041a08 SHA1 901e48e020cb6dcb722212410e1ac34212e87cf0 SHA256 7bce1abcec735751c95b28394f348e421b525ead1ba86638fc5f884217cdb49a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkub6R8ACgkQdIssYB9vBoONSACfaiQRQ0/ZAZjH1i1dKIFA2srz
-snEAnAwNRtcXSA9n+DnujqQoW4Q1b8a6
-=KmjQ
+iEYEARECAAYFAkvROpYACgkQdIssYB9vBoNoUgCcCeAmGTp2jYG7kBZr62vEE/iH
+n5wAniWIDlzWb+LoB915a9qBx/XDN7H+
+=YJZq
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r1.ebuild b/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.ebuild
similarity index 51%
rename from app-accessibility/speech-tools/speech-tools-1.2.96_beta-r1.ebuild
rename to app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.ebuild
index ce699bbac9ae..81bfa88d5c2b 100644
--- a/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r1.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.ebuild
@@ -1,104 +1,109 @@
 # 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-1.2.96_beta-r1.ebuild,v 1.1 2010/03/13 20:32:58 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.ebuild,v 1.1 2010/04/23 07:12:38 neurogeek Exp $
 
-inherit eutils toolchain-funcs
+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/latest/${MY_P}.tar.gz"
+SRC_URI="http://www.festvox.org/packed/festival/latest/${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"
 
-RDEPEND="esd? ( media-sound/esound )
+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"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/speech_tools
-
-src_unpack() {
-	local CONFIG=${S}/config/config.in
-	unpack ${A}
 
-	epatch "${FILESDIR}"/${P}-gcc42.patch \
-		"${FILESDIR}"/${P}-gcc43-include.patch \
-		"${FILESDIR}"/${P}-gcc44.patch
+S="${WORKDIR}/speech_tools"
 
-# set compiler flags for base_class
-	sed -i -e "s:-O3:\$(OPTIMISE_CXXFLAGS):" "${S}"/base_class/Makefile
-
-	# enable building shared libraries
-	sed -i -e "s/#.*\(SHARED=2\)/\1/" ${CONFIG}
+src_prepare() {
+	EPATCH_SUFFIX="patch"
+	epatch
+	sed -i -e 's,{{HORRIBLELIBARCHKLUDGE}},"/usr/$(get_libdir)",' main/siod_main.cc
+}
 
-	use esd && sed -i -e "s/#.*\(INCLUDE_MODULES += ESD_AUDIO\)/\1/" ${CONFIG}
-	use nas && sed -i -e "s/#.*\(INCLUDE_MODULES += NAS_AUDIO\)/\1/" ${CONFIG}
-	use X || sed -i -e "s/-lX11 -lXt//" "${S}"/config/modules/esd_audio.mak
+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() {
-	econf || die
-	emake -j1 OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
+	emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" CC_OTHER_FLAGS="${CFLAGS}" \
+		OPTIMISE_LINKFLAGS="${LDFLAGS}" || die "Compile failed"
 }
 
 src_install() {
-	dolib.so lib/libest*.so.1*
-	dosym libestbase.so.1.2.96.1 /usr/$(get_libdir)/libestbase.so
-	dosym libestools.so.1.2.96.1 /usr/$(get_libdir)/libestools.so
-	dosym libeststring.so.1.2 /usr/$(get_libdir)/libeststring.so
-	dolib.a lib/{libestbase.a,libestools.a,libeststring.a}
-
-	cd 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/$(get_libdir)/speech-tools:g" ${dstfile}
-		dosed "s:${S}/main:/usr/$(get_libdir)/speech-tools:g" ${dstfile}
+	dolib.so lib/libest*.so*
 
-		# This just changes LD_LIBRARY_PATH
-		dosed "s:${S}/lib:/usr/$(get_libdir):g" ${dstfile}
-	done
+	dodoc "${S}"/README
+	dodoc "${S}"/lib/cstrutt.dtd
 
-	cd "${S}"
-	exeinto /usr/$(get_libdir)/speech-tools
-	for file in `find main -perm +100 -type f`; do
-		doexe ${file}
-	done
+	insinto /usr/share/doc/${PF}
+	doins -r lib/example_data
 
 	insinto /usr/share/speech-tools
-	doins -r config
+	doins -r config base_class
 
 	insinto /usr/share/speech-tools/lib
 	doins -r lib/siod
 
-	insinto /usr/share/doc/${PF}
-	doins -r lib/example_data
-
 	cd include
 	insinto /usr/include/speech-tools
 	doins -r *
 	dosym /usr/include/speech-tools /usr/share/speech-tools/include
-	cd "${S}"
 
-	dodoc "${S}"/README
-	dodoc "${S}"/lib/cstrutt.dtd
+	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"
 }
-- 
2.26.2