version bump and add runtime dependency on media-sound/sox for #391679.

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

3 files changed, 85 insertions, 5 deletions

diff --git a/app-accessibility/espeak/ChangeLog b/app-accessibility/espeak/ChangeLog
index f3c592fd70c4..2f0dca12a090 100644
--- a/app-accessibility/espeak/ChangeLog
+++ b/app-accessibility/espeak/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-accessibility/espeak
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/ChangeLog,v 1.100 2011/12/04 16:06:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/ChangeLog,v 1.101 2011/12/18 17:45:53 williamh Exp $
+
+*espeak-1.46.01 (18 Dec 2011)
+
+  18 Dec 2011; William Hubbs <williamh@gentoo.org> +espeak-1.46.01.ebuild:
+  version bump and add runtime dependency on media-sound/sox for #391679.
 
   04 Dec 2011; Raúl Porcel <armin76@gentoo.org> espeak-1.45.04.ebuild:
   alpha/ia64/sparc stable wrt #391417
diff --git a/app-accessibility/espeak/Manifest b/app-accessibility/espeak/Manifest
index 7f7ec7fa12ea..b6c306e9e3c1 100644
--- a/app-accessibility/espeak/Manifest
+++ b/app-accessibility/espeak/Manifest
@@ -4,15 +4,17 @@ Hash: SHA1
 DIST espeak-1.42.04-source.zip 1537076 RMD160 1b0747501d81acf48241dc6b0da7fb555a1e3927 SHA1 fe3c0e20b994d2332d8841f61ccc2ae016a836b0 SHA256 3791bb853e9283950d58c02396b3b9b1313adf27c0004bcd1e0cdaf87a683eeb
 DIST espeak-1.45.03-source.zip 1894722 RMD160 7acb21e77b72ab8888a3cbf09d2ffa851c78de0b SHA1 0aef9196e7e1347eb470d50b30d6e5323c4ec7eb SHA256 74ed21cb0f4f4a040db93ffa9f4dac463a53281fe47ef4e63605a3ee3e8e0eea
 DIST espeak-1.45.04-source.zip 1904805 RMD160 c717da9f7bc2aa6ec62a2f4a20007141ac865e67 SHA1 8b4f6fe720a3a64f0bfdf97abd970e99009603fa SHA256 816825f8aadb8ce9487808d35f698a9ac39b158cf43ad0aa98e8b4d7c5ab9780
+DIST espeak-1.46.01-source.zip 2371712 RMD160 bed5f83ad0e14e4f1269ce5832af2217f908278a SHA1 2f3c14192b012c945db9f06dd47d366f4c3cf15f SHA256 87fc4fdeea9d5151909515ab6258ca0cccea78356037380fa8dcf09953e93de4
 EBUILD espeak-1.42.04.ebuild 1961 RMD160 901810ec5faa2ae9e3042bb2c7d867137b4f95bb SHA1 016870da4c1746dc425dbab5b78f7e53586e3ebb SHA256 2e7222b84398d95c473f29ccdedeac8f9be603684a02ce2ee490a9ee5002d8e9
 EBUILD espeak-1.45.03.ebuild 1918 RMD160 488a80e2fd134ff1e4a528feffb809aa1abb7c05 SHA1 baee82fb1f62e7429b9ec2e6b4cde797e9aa0be9 SHA256 109fde32df8f70c4e66b0c14574a57b6e0c047dbaf11a3450ccd8631743386aa
 EBUILD espeak-1.45.04.ebuild 1911 RMD160 c86477c87dbd79ab5c28e9f4f9c3ca84fb8068e5 SHA1 3accc2c02aa6765c25feb09ac2a73f849cc8c496 SHA256 557301649659fc6731fc69908ad0cc3d54eb65d67592c489f9167644cf2d207e
-MISC ChangeLog 13622 RMD160 b6e5f79a5ac4c1dffa29c9c3e0a6ce2de079bff2 SHA1 b8605bde6bd2bc10e4a677ea96df79f99d991fe4 SHA256 39644e5815957903798e196f6984a5b1692b61a732b5ff8f1d8a1be850e245ac
+EBUILD espeak-1.46.01.ebuild 1927 RMD160 92a9333d02b5982788d981ef1d112e770012ba6b SHA1 24c8c1c743ed6ca2ec65982622cad3619e505d06 SHA256 9541451c500075e670475b2b4c17655ded182ff062a09f192a15e3a27616a5cf
+MISC ChangeLog 13804 RMD160 a1b344ab0557f9e9e8c7287f2f69e00e3917d071 SHA1 ae32066107e46256b3a6df1ec6ac36aedd511ab6 SHA256 e9096c62afdf0f6f6b36a796e2bf88a7713c3319e173f47dd7d20b65edd09f16
 MISC metadata.xml 229 RMD160 7f8d6a0235529eccff705022803122c9534628d7 SHA1 2295356b566d60c8eb979db0e598de9d1d8ccf49 SHA256 b128d301356b3f98f1d6093b4401c36143ff55fc62636612567b0995739b9e66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk7bmpwACgkQuQc30/atMkDCHQCgsg9MAXWEUwwFbRodlxYRPbWj
-VEkAoL+nfYXjN5dni3lkWq75wEuwNMSH
-=VG2I
+iEYEARECAAYFAk7uJdkACgkQblQW9DDEZTgZeQCfcr4qhsDQfPrrtz0WBvgBzhVH
+Ob4AoJ6FBIVERsLloPOy6Bkgg+tcLPFt
+=JgJD
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/espeak/espeak-1.46.01.ebuild b/app-accessibility/espeak/espeak-1.46.01.ebuild
new file mode 100644
index 000000000000..3a2af00c7635
--- /dev/null
+++ b/app-accessibility/espeak/espeak-1.46.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.46.01.ebuild,v 1.1 2011/12/18 17:45:53 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 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="portaudio pulseaudio"
+REQUIRED_USE="portaudio? ( !pulseaudio )
+	pulseaudio? ( !portaudio )"
+RDEPEND="media-sound/sox
+	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
+}
+
+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
+}