version bump, also fixes #303094, thanks to Kacper Kowalik

Package-Manager: portage-2.2.0_alpha2/cvs/Linux i686

4 files changed, 120 insertions, 2 deletions

diff --git a/app-accessibility/espeak/ChangeLog b/app-accessibility/espeak/ChangeLog
index b3694085bc93..9f51202c06e7 100644
--- a/app-accessibility/espeak/ChangeLog
+++ b/app-accessibility/espeak/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-accessibility/espeak
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/ChangeLog,v 1.88 2010/07/20 18:37:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/ChangeLog,v 1.89 2010/10/29 18:06:33 williamh Exp $
+
+*espeak-1.44.05 (29 Oct 2010)
+
+  29 Oct 2010; William Hubbs <williamh@gentoo.org> +espeak-1.44.05.ebuild,
+  +files/espeak-1.44.05-respect-ldflags.patch:
+  Version bump, also fixes bug #303094 thanks to Kacper Kowalik.
 
   20 Jul 2010; Jeroen Roovers <jer@gentoo.org> espeak-1.42.04.ebuild:
   Stable for HPPA (bug #301793).
diff --git a/app-accessibility/espeak/Manifest b/app-accessibility/espeak/Manifest
index 09278fcff8da..024f8ae31a4f 100644
--- a/app-accessibility/espeak/Manifest
+++ b/app-accessibility/espeak/Manifest
@@ -1,10 +1,13 @@
+AUX espeak-1.44.05-respect-ldflags.patch 881 RMD160 6dbfe2abc87bbed73b39527c63c7e6f779ee87b6 SHA1 4b6612779209d88424f84c888155706b852bbd31 SHA256 4fe198da16ee408f27798c9d0cfec8e16419a01c17a43ab351a05e5b21491c9d
 DIST espeak-1.40.02-source.zip 1400971 RMD160 caca57d5a6b5165d5b7edbb9c465cb37bc4ec3ec SHA1 de75304b0b58a18669bd05b3fa89573dc4787085 SHA256 b55e323a52be38337f8d5f219fd8878fc7b62b9e25d8cc15685e5f815bf6519e
 DIST espeak-1.41.01-source.zip 1476908 RMD160 bb95144e78c57aa4607be927ea6832802966c2bb SHA1 458bf2f94d598b10ca5d4b9e6855d789e4557f2d SHA256 1c89178b8021f77352eb482e93f2545044c7010ec5c1f902fbdee899bfde01a2
 DIST espeak-1.42.04-source.zip 1537076 RMD160 1b0747501d81acf48241dc6b0da7fb555a1e3927 SHA1 fe3c0e20b994d2332d8841f61ccc2ae016a836b0 SHA256 3791bb853e9283950d58c02396b3b9b1313adf27c0004bcd1e0cdaf87a683eeb
 DIST espeak-1.43-source.zip 1539068 RMD160 36795472b9115f6ee17cd2ca244cbdf283476261 SHA1 fcb365d7f4f82678d85f6f5cb343011a1612da12 SHA256 232e3dd4d3be605cd51c4aa0948aa3d9afa13827c709d0316ba4a5893bfbd2c5
+DIST espeak-1.44.05-source.zip 2000381 RMD160 ec9be5e033b09c17204b8cfe022eada674718135 SHA1 c23d315e807a3c0c0eeafb88d0af787994e4d64d SHA256 89c37e69a7348d638c859ea492958145a790d0d57a057b29f2f5d913541f8ef9
 EBUILD espeak-1.40.02.ebuild 2093 RMD160 bb84e442ed62e52e0805c072f3fcb4da2c97a81e SHA1 175da242ed6f6770c8f865314acbc2d6a2afb95e SHA256 15bbee28438b9269fde06627f7fe282a7706c7235fa873e4b517ed3f711e3220
 EBUILD espeak-1.41.01.ebuild 1962 RMD160 a482cd702826f0de9a37c10e8206ca9425ee9eb2 SHA1 f9e1bd5828c674874a2599d32f3d34a856ec6970 SHA256 06663502e4153f3e5199eefcb202e45321d8dd9912fb5dfe65e6fcec3f7ee923
 EBUILD espeak-1.42.04.ebuild 1961 RMD160 901810ec5faa2ae9e3042bb2c7d867137b4f95bb SHA1 016870da4c1746dc425dbab5b78f7e53586e3ebb SHA256 2e7222b84398d95c473f29ccdedeac8f9be603684a02ce2ee490a9ee5002d8e9
 EBUILD espeak-1.43.ebuild 2067 RMD160 4a42b7a18c3bc1ec02c9bf4c991012e4aeea4e3b SHA1 d057d7c322169610699b166037c434174553749f SHA256 7f3dcb9adde885510e1cde40336fa637eeaa459a6468ad1a89859b5805e84d9b
-MISC ChangeLog 11788 RMD160 4e2513f7fb4a6a7ae6db1d81870094700014bd74 SHA1 c31c536b7811a58c85fbd36161a353d5aeebf4d0 SHA256 46884b35e7ed26dc067894a0dae913cccd7bd4c7768d4469aee7eb7859162636
+EBUILD espeak-1.44.05.ebuild 2157 RMD160 1ccd947e22783973fce811f4a66e8169238a0a05 SHA1 05e507a9d8cb8cad0b871ac05d4c9fe279ccdcd2 SHA256 f9fa8f748a08a3b36fb5bb315e80ee45d70fd8c311942575d98d56f2e9b9fc31
+MISC ChangeLog 12012 RMD160 181bd60b4e75f2fb4d2ceb243631654d025bd680 SHA1 5afd1da093dabb86c7523ccddda55426e7fca63c SHA256 f140f21815af8c76a9edd1579f866ae759bb75d3bdbd925c304062dfa98b598a
 MISC metadata.xml 229 RMD160 7f8d6a0235529eccff705022803122c9534628d7 SHA1 2295356b566d60c8eb979db0e598de9d1d8ccf49 SHA256 b128d301356b3f98f1d6093b4401c36143ff55fc62636612567b0995739b9e66
diff --git a/app-accessibility/espeak/espeak-1.44.05.ebuild b/app-accessibility/espeak/espeak-1.44.05.ebuild
new file mode 100644
index 000000000000..5e008b9b8fd6
--- /dev/null
+++ b/app-accessibility/espeak/espeak-1.44.05.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/espeak-1.44.05.ebuild,v 1.1 2010/10/29 18:06:33 williamh Exp $
+
+EAPI="3"
+
+inherit eutils toolchain-funcs
+
+MY_P="${P}-source"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+DESCRIPTION="Speech synthesizer for English and other languages"
+HOMEPAGE="http://espeak.sourceforge.net/"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="portaudio pulseaudio"
+RDEPEND="portaudio? ( >=media-libs/portaudio-19_pre20071207 )
+	pulseaudio? ( media-sound/pulseaudio )"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}/${MY_P}
+
+get_audio() {
+	local MY_AUDIO
+
+	if use portaudio; then
+		MY_AUDIO=portaudio
+	elif use pulseaudio; then
+		MY_AUDIO=pulseaudio
+	else
+		MY_AUDIO=none
+	fi
+	echo ${MY_AUDIO}
+}
+
+pkg_setup() {
+	if use portaudio && use pulseaudio; then
+		die "You must choose either portaudio or pulseaudio, but not both."
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-respect-ldflags.patch
+	cd src
+	# gentoo uses portaudio 19.
+	if use portaudio; then
+		mv -f portaudio19.h portaudio.h
+	fi
+}
+
+src_compile() {
+	cd src
+	emake PREFIX="${EPREFIX}/usr" AUDIO="$(get_audio)" \
+	CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" all || die "Compilation failed"
+
+	einfo "Fixing byte order of phoneme data files"
+	cd "${S}/platforms/big_endian"
+	make
+	./espeak-phoneme-data "${S}/espeak-data"
+	cp -f phondata phonindex phontab "${S}/espeak-data"
+}
+
+src_install() {
+	cd src
+	make DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="\$(PREFIX)/$(get_libdir)" AUDIO="$(get_audio)" install || die "Installation failed"
+
+	cd ..
+	insinto /usr/share/espeak-data
+	doins -r dictsource
+	dodoc ChangeLog ReadMe
+	dohtml -r docs/*
+}
+
+pkg_postinst() {
+	if ! use portaudio && ! use pulseaudio; then
+		ewarn "Since portaudio and pulseaudio are not in your use flags,"
+		ewarn "espeak will only be able to create wav files."
+		ewarn "If this is not what you want, please reemerge ${CATEGORY}/${PN}"
+		ewarn "with either portaudio or pulseaudio USE flag enabled."
+	fi
+}
diff --git a/app-accessibility/espeak/files/espeak-1.44.05-respect-ldflags.patch b/app-accessibility/espeak/files/espeak-1.44.05-respect-ldflags.patch
new file mode 100644
index 000000000000..abdf0e86de06
--- /dev/null
+++ b/app-accessibility/espeak/files/espeak-1.44.05-respect-ldflags.patch
@@ -0,0 +1,27 @@
+diff --git a/src/Makefile b/src/Makefile
+index da9409e..4fb26d1 100755
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -80,10 +80,10 @@ all: $(BIN_NAME) $(LIB_NAME) $(STATIC_LIB_NAME) $(BIN2_NAME)
+ 	$(CXX) $(CXXFLAGS) $(USE_AUDIO) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -pedantic -I. -c -fno-exceptions  $<
+ 
+ $(BIN_NAME): $(OBJS1)
+-	$(CXX) -o $@ $(OBJS1) $(LIBS1)
++	$(CXX) $(LDFLAGS) -o $@ $(OBJS1) $(LIBS1)
+ 
+ $(BIN2_NAME): $(OBJS3) $(LIB_NAME)
+-	$(CXX) -o $@ $(OBJS3) $(LIBS3)
++	$(CXX) $(LDFLAGS) -o $@ $(OBJS3) $(LIBS3)
+ 
+ 
+ 
+@@ -92,7 +92,8 @@ x_%.o: %.cpp
+ 	-I. -D LIBRARY -c -fno-exceptions  $<  -o x_$*.o
+ 
+ $(LIB_NAME): $(OBJS2)
+-	$(CXX) -shared $(SONAME_OPT)$(LIB_NAME).$(LIB_VERSION) -o $@ $(OBJS2) $(LIBS2)
++	$(CXX) $(LDFLAGS) -shared $(SONAME_OPT)$(LIB_NAME).$(LIB_VERSION) -o $@ \
++	$(OBJS2) $(LIBS2)
+ 
+ $(STATIC_LIB_NAME): $(OBJS2)
+ 	$(AR) cqs $(STATIC_LIB_NAME) $(OBJS2)