version bump for #358965, thanks to Chris Brannon.

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

4 files changed, 107 insertions, 3 deletions

diff --git a/app-accessibility/espeak/ChangeLog b/app-accessibility/espeak/ChangeLog
index 951f0416c241..6341c12802f4 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.91 2010/10/30 06:56:26 tove Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/ChangeLog,v 1.92 2011/03/16 03:29:19 williamh Exp $
+
+*espeak-1.45.01 (16 Mar 2011)
+
+  16 Mar 2011; William Hubbs <williamh@gentoo.org> +espeak-1.45.01.ebuild,
+  +files/espeak-1.45.01-fix-libname.patch:
+  version bump for #358965, thanks to Chris Brannon
 
   29 Oct 2010; William Hubbs <williamh@gentoo.org> espeak-1.44.05.ebuild:
   fix file name of ChangeLog.  It should have been ChangeLog.txt.
diff --git a/app-accessibility/espeak/Manifest b/app-accessibility/espeak/Manifest
index 53e5f6941d1e..319d6a97f7b1 100644
--- a/app-accessibility/espeak/Manifest
+++ b/app-accessibility/espeak/Manifest
@@ -1,13 +1,16 @@
 AUX espeak-1.44.05-respect-ldflags.patch 881 RMD160 6dbfe2abc87bbed73b39527c63c7e6f779ee87b6 SHA1 4b6612779209d88424f84c888155706b852bbd31 SHA256 4fe198da16ee408f27798c9d0cfec8e16419a01c17a43ab351a05e5b21491c9d
+AUX espeak-1.45.01-fix-libname.patch 739 RMD160 dcdcf9ade8e1779f444d00bd1537b4d50e2164d6 SHA1 ac05442a5bfea18a0b2ef118a9b9cdb87e46c799 SHA256 9ba83c39cb05b4875445dfb6f49d02fc42924a66a6e4c8d0aeb123d39f7e2fc6
 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
+DIST espeak-1.45.01-source.zip 1891465 RMD160 d8657b356939dc8c122b02ef756d34c09e5a1c55 SHA1 aa82fecb9d723657798911ee61c08a8d3eeb92cd SHA256 64dee057163325bc968e8b933cc31c65053f4d9da085dab96d41ef5e3565dd2c
 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
 EBUILD espeak-1.44.05.ebuild 2161 RMD160 fc4de199f308954b607527063d5f209febc5eca4 SHA1 d43cecd8fc9b1e82a091f7d98746a74874ad1f86 SHA256 c4a93e689d5caf59b5f0c60bab2cdcab87241da4fd39a5e666a0f3b191062169
-MISC ChangeLog 12149 RMD160 1027b6fc4f47dc67a2a1375f8fea107d59d12f7b SHA1 60757f0fa4555dbf1f2484d66692a929e6e96f81 SHA256 1d5d8580691cf4aae698f31dbfee699eeff8132aead09ac6b560d6499b94b0d7
+EBUILD espeak-1.45.01.ebuild 1963 RMD160 fc66b75b6d048758c6e2043b0ddd3a60c2397221 SHA1 ef2f274cf7c29cd92b5c56d5f151fdbbff59eadb SHA256 d5d95c907cc41d7d59eb7d73cd50f4ddf3cc2a4f1a3f56b44ec90ff9c928c25b
+MISC ChangeLog 12355 RMD160 ba4faa43065098be0072d28a974314a8c25a1c42 SHA1 a4bdfab21662bd9e4a8c4384b6f8210bf6dcd4ca SHA256 9f190fe6fbccf545a84bae625ec670c8eee72c4a419ccc724900b87ad48736df
 MISC metadata.xml 229 RMD160 7f8d6a0235529eccff705022803122c9534628d7 SHA1 2295356b566d60c8eb979db0e598de9d1d8ccf49 SHA256 b128d301356b3f98f1d6093b4401c36143ff55fc62636612567b0995739b9e66
diff --git a/app-accessibility/espeak/espeak-1.45.01.ebuild b/app-accessibility/espeak/espeak-1.45.01.ebuild
new file mode 100644
index 000000000000..eb228bcc0854
--- /dev/null
+++ b/app-accessibility/espeak/espeak-1.45.01.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/espeak-1.45.01.ebuild,v 1.1 2011/03/16 03:29:19 williamh Exp $
+
+EAPI="4"
+
+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"
+REQUIRED_USE="portaudio? ( !pulseaudio )
+	pulseaudio? ( !portaudio )"
+	RDEPEND=" pulseaudio? ( media-sound/pulseaudio )
+	portaudio? ( >=media-libs/portaudio-19_pre20071207 )"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}/${MY_P}
+
+get_audio() {
+	if use portaudio; then
+		echo portaudio
+	elif use pulseaudio; then
+		echo pulseaudio
+	else
+		echo none
+	fi
+}
+
+src_prepare() {
+	cd src
+	# gentoo uses portaudio 19.
+	mv -f portaudio19.h portaudio.h
+	epatch "${FILESDIR}"/${P}-fix-libname.patch
+}
+
+src_compile() {
+	cd src
+	emake PREFIX="${EPREFIX}/usr" AUDIO="$(get_audio)" \
+	CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" all
+
+	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
+
+	cd ..
+	insinto /usr/share/espeak-data
+	doins -r dictsource
+	dodoc ChangeLog.txt 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.45.01-fix-libname.patch b/app-accessibility/espeak/files/espeak-1.45.01-fix-libname.patch
new file mode 100644
index 000000000000..8188c4dc9ff4
--- /dev/null
+++ b/app-accessibility/espeak/files/espeak-1.45.01-fix-libname.patch
@@ -0,0 +1,22 @@
+diff --git a/src/Makefile b/src/Makefile
+index a184e85..a884f6f 100755
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -75,7 +75,6 @@ CXXFLAGS=-O2
+ 
+ 
+ all: $(BIN_NAME) $(LIB_NAME) $(STATIC_LIB_NAME) $(BIN2_NAME)
+-	mv $(LIB_NAME) $(LIB_NAME).$(LIBTAG)
+ 
+ .cpp.o:
+ 	$(CXX) $(CXXFLAGS) $(USE_AUDIO) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -pedantic -I. -c -fno-exceptions  $<
+@@ -95,6 +94,9 @@ x_%.o: %.cpp
+ $(LIB_NAME): $(OBJS2)
+ 	$(CXX) $(LDFLAGS) -shared $(SONAME_OPT)$(LIB_NAME).$(LIB_VERSION) -o $@ \
+ 	$(OBJS2) $(LIBS2)
++	mv $(LIB_NAME) $(LIB_NAME).$(LIBTAG)
++	$(LN_SF) $(LIB_NAME).$(LIBTAG) $(LIB_NAME).$(LIB_VERSION)
++	$(LN_SF) $(LIB_NAME).$(LIB_VERSION) $(LIB_NAME)
+ 
+ $(STATIC_LIB_NAME): $(OBJS2)
+ 	$(AR) cqs $(STATIC_LIB_NAME) $(OBJS2)