summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2005-07-24 00:57:43 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2005-07-24 00:57:43 +0000
commit940958e02192ee9ac2aa5d2808e063457602adc4 (patch)
tree867ed5fb69cce798a572cab9a1293a0039b662f9 /app-accessibility/speech-tools
parentRevbump... see ChangeLog. (diff)
downloadgentoo-2-940958e02192ee9ac2aa5d2808e063457602adc4.tar.gz
gentoo-2-940958e02192ee9ac2aa5d2808e063457602adc4.tar.bz2
gentoo-2-940958e02192ee9ac2aa5d2808e063457602adc4.zip
Revbump... see ChangeLog.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'app-accessibility/speech-tools')
-rw-r--r--app-accessibility/speech-tools/ChangeLog11
-rw-r--r--app-accessibility/speech-tools/files/digest-speech-tools-1.2.3-r33
-rw-r--r--app-accessibility/speech-tools/speech-tools-1.2.3-r3.ebuild14
3 files changed, 22 insertions, 6 deletions
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/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
index 834911d21031..02c3d978442b 100644
--- a/app-accessibility/speech-tools/speech-tools-1.2.3-r3.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-1.2.3-r3.ebuild
@@ -1,8 +1,8 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-1.2.3-r3.ebuild,v 1.2 2005/07/24 00:57:43 eradicator Exp $
-IUSE="doc esd"
+IUSE="doc esd X"
inherit eutils fixheadtails toolchain-funcs
@@ -28,18 +28,22 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/speech_tools"
src_unpack() {
- [ "${A}" ] && unpack ${A}
+ unpack ${A}
use doc && mv festdoc-1.4.2 festdoc
+ cd ${S}
[[ "$(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
+ sed -i -e 's:-O3:$(OPTIMISE_CXXFLAGS):' ${S}/base_class/Makefile
# Compile fix for #41329.
- sed -i 's/-fpic/-fPIC/' ${S}/config/compilers/gcc_defaults.mak
+ sed -i -e 's/-fpic/-fPIC/' ${S}/config/compilers/gcc_defaults.mak
+
+ 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
}
src_compile() {