Make it compatible with flite-1.4 (#463556 by Chris Brannon)

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 79 insertions, 4 deletions

diff --git a/app-accessibility/eflite/ChangeLog b/app-accessibility/eflite/ChangeLog
index 3a6c73c79f16..8cc52005ffe5 100644
--- a/app-accessibility/eflite/ChangeLog
+++ b/app-accessibility/eflite/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-accessibility/eflite
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/eflite/ChangeLog,v 1.34 2012/05/23 22:57:36 vapier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/eflite/ChangeLog,v 1.35 2014/07/05 07:26:14 pacho Exp $
+
+*eflite-0.4.1-r1 (05 Jul 2014)
+
+  05 Jul 2014; Pacho Ramos <pacho@gentoo.org> +eflite-0.4.1-r1.ebuild,
+  +files/eflite-0.4.1-flite14.patch:
+  Make it compatible with flite-1.4 (#463556 by Chris Brannon)
 
   23 May 2012; Mike Frysinger <vapier@gentoo.org> eflite-0.4.1.ebuild:
   Inherit user eclass for enewuser/etc...
@@ -128,4 +134,3 @@
   21 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> eflite-0.3.8.ebuild,
   metadata.xml, files/eflite-0.3.8-shared_flite.patch:
   Initial import.  Ebuild by dmwaters and me.  Closes bug #45178.
-
diff --git a/app-accessibility/eflite/Manifest b/app-accessibility/eflite/Manifest
index cdcd83d3b52f..8374f617f203 100644
--- a/app-accessibility/eflite/Manifest
+++ b/app-accessibility/eflite/Manifest
@@ -1,6 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX eflite-0.4.1-flite14.patch 661 SHA256 2c4e49ef0dce2513cec6b3a26ab0d7c6b21e4c5d964d06ae35fb29038a097422 SHA512 8d35c593ae59fc04c2f97f664a09d53b55e6d79fa942b3243ef64e42b57e5efedff94a1db915709165f25141af2e9fcdac56ff91563136020aeed1c971025518 WHIRLPOOL 76832ccbfd3b5d13cd0e9c5d929d513e086274284d13f31e8b73825c8c7f3f993729fa0eaf4e189524e4b566d54a695e8f6b28796d09ee62ea57297134d8f7ec
 AUX eflite.rc 756 SHA256 af252f4a588846201814a8836c9cc7c529986f306db14d8c08a99760cba19076 SHA512 cc019694e2ec3b92c7157e1b3e28867a5240bb1ca40e871245bfb8ed96432f05ba90d5c7c35527ace049f68e8dd7e1eec78a31d84d760918342aa00d844ec6c8 WHIRLPOOL b1bb62b19c0fdb6f31cd6cb6412e95b0e0cbfdff83fdba7244c1a71436915343e9c2b45bc6f5533be5a7ca72a77323698caaed78bf988b00d39f665ebac148fe
 AUX es.conf 213 SHA256 20de1fd6979f3a4254fb5e7cac4f135647c8abce030ceef88648b6db0c745d27 SHA512 19e8b5aefb7aa650d1e023a8cd5cf7361acf6f390f2f3f34de1da0b9c2bdddf632bc247f4e6c8eac025118c76d64f375837c13aff8f02342f17acc974beb9547 WHIRLPOOL e0a239a5f86a8cd9c5cb9107ff4ce9180fa4b6b331daef2375cdb04fd4cd845f29e8a37b27bfb1d9fbbe9db3e695abdf7a7bd76f45e649e9e4dc27270da8624f
 DIST eflite-0.4.1.tar.gz 63192 SHA256 91ad85855e55a3fc3b97a1a525db5fd1d211d54342bbfc88d1026813104f1721 SHA512 0060980fd5bb65ad94f1609f6d87cb89b91e680228b603fa590e6ba70b51e894493dda4271dca4d8c97f38cdefbd456c3be0447e5f88a0be7ae39324baa2c796 WHIRLPOOL 50e5e31bd0e8759fdfae1b5183c3fc4b9d1d03d2aa04dd7102651e2aaebafc9b312b1e20082c20bdcb745b7c7fad47bd64f145e392551e6c1d31fa01af5b7969
+EBUILD eflite-0.4.1-r1.ebuild 1059 SHA256 c3b0b50bf35958198ace62ca99d8ab98edf3238ea758085990b6ee96efdfaf63 SHA512 96d16da839af244deb7be09fae0c54f8b1a12312391caceecac885aede301d0e8d6f7273f91e14bc8df470d0b99b57ae027ca89b5fb331ace3c69a9c22d48094 WHIRLPOOL 08fa05103564f946c182afd5140a4b4acced84861dc5232025e8cf4cc5510edd6a68ff1c96f391484aac47d559d976e501c6c0ba7809661e90282a070f8bdabc
 EBUILD eflite-0.4.1.ebuild 1006 SHA256 4eb2eabcd76542580d01fead2265d7c4305ccf1c27065c511501636382fa2ac8 SHA512 01b9b76c070b03879c27acab9fe84d6000919993f8881f54f2c8d07a54fb7af36d646da0397fbdcb3be69ccb3143971af5edad70fe5c8e63291d18d4c743707a WHIRLPOOL 0cb86e0ce44780623e91a0628515fae959f98e6d0c3c79f5b5e8eda7fc407dace1d83fb21cae78e23871417b47acf2052bcd65fcd41cd6e641dd549cc76cdb25
-MISC ChangeLog 4678 SHA256 c0e68ea7e55a6c5731ec4a9586073d73db4f74dc34bcb81ccb41af33ae9c0299 SHA512 8dd09c1b14bd90703bbfeea0914c1d1851ed82cac28da21689a682c980d1bf8105a259e49e7ba8311659427c80a2c4a4f95614847c0503d19d1c92b1c841b3f2 WHIRLPOOL a9bd25494e94e01ba9cedd8f4d613ba9f100b47a44c9930fd38e15357d997d711b1e7f0b44fba7affcd59b090b6e621f1faeda169687f331ac208ec48c33a148
+MISC ChangeLog 4880 SHA256 fdbab0c1772f0e7d3f167e054658c5a6af7081b8aebc56a8ef5d6f541a5b7bff SHA512 51f5e3c4931cbe2ad141cb1fe2e9ccf8ae894bb0861efaae0642aa1d43a74fc817cd4bdcc40c81766c8f26921abaf5253ebb323aebe130d1b63010634ba1db9a WHIRLPOOL f35856f95748b50440792a65b98aa842556781e3683fd13e216448feecbae2936166731401c805ac33dc5cb7cadf4030bbf9dd65d5f70bad606dc1e51a3753df
 MISC metadata.xml 1176 SHA256 151b6e4d6ec44a3c9626e48d0076aaad98ad1509d8ee87c35290ac6b49a0bc5c SHA512 a1a364f5a21fd8b092b5f7c7dabdf7d6df6436b4afb70ac052bc93a82599f5be06c0f5b898b17c6dd6354b2127775550bd09f1c805ef8e8e72f3e00af50fa1f2 WHIRLPOOL 961e1c8c7c6c4513378ed389f8a268d0222192aa5fffc659bff51e685b5a6f4ac0d126fb17a441bffa23e856f853c28b6e6b0a3a093701a4f5181b6edd81489f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iEYEAREIAAYFAlO3qJcACgkQCaWpQKGI+9TbIQCfZBWd4Fb/Hx4IDYifCullrQy2
+A/AAn2ysLczXTBMIWDsOZNYxR6I/4e0U
+=8nR+
+-----END PGP SIGNATURE-----
diff --git a/app-accessibility/eflite/eflite-0.4.1-r1.ebuild b/app-accessibility/eflite/eflite-0.4.1-r1.ebuild
new file mode 100644
index 000000000000..cdbecdbdae5b
--- /dev/null
+++ b/app-accessibility/eflite/eflite-0.4.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/eflite/eflite-0.4.1-r1.ebuild,v 1.1 2014/07/05 07:26:14 pacho Exp $
+
+EAPI="5"
+inherit autotools eutils user
+
+DESCRIPTION="A speech server that allows emacspeak and other screen readers to interact with festival lite."
+HOMEPAGE="http://eflite.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="+16k_voice"
+
+DEPEND=">=app-accessibility/flite-1.4"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i 's:/etc/es.conf:/etc/eflite/es.conf:g' *
+	epatch "${FILESDIR}"/${PN}-0.4.1-flite14.patch
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use 16k_voice; then
+		myconf='--with-vox=cmu_us_kal16'
+	fi
+	econf ${myconf}
+}
+
+src_install() {
+	einstall
+	dodoc ChangeLog README INSTALL eflite_test.txt
+
+	insinto /etc/eflite
+	doins "${FILESDIR}"/es.conf
+
+	newinitd "${FILESDIR}"/eflite.rc eflite
+}
+
+pkg_postinst() {
+	enewgroup speech
+}
diff --git a/app-accessibility/eflite/files/eflite-0.4.1-flite14.patch b/app-accessibility/eflite/files/eflite-0.4.1-flite14.patch
new file mode 100644
index 000000000000..4628ca89cca1
--- /dev/null
+++ b/app-accessibility/eflite/files/eflite-0.4.1-flite14.patch
@@ -0,0 +1,12 @@
+diff -Naur eflite-0.4.1/Makefile.in eflite-0.4.1-new/Makefile.in
+--- eflite-0.4.1/Makefile.in	2007-01-18 18:01:09.000000000 -0600
++++ eflite-0.4.1-new/Makefile.in	2010-07-23 20:06:45.000000000 -0500
+@@ -34,7 +34,7 @@
+ 	$(CC) $(LDFLAGS) -o $@ $^ -lm $(LIBS) $(FLITE_LIBS) $(AUDIOLIBS)
+ 
+ fs.o: fs.c
+-	$(CC) $(CFLAGS) @AUDIODEFS@ -I. -I$(flite_include_dir) -DREGISTER_VOX=register_$(subst cmu_us_kal16,cmu_us_kal,$(FL_VOX)) -DSTANDALONE -DEFLITE -c -o $@ $<
++	$(CC) $(CFLAGS) @AUDIODEFS@ -I. -I$(flite_include_dir) -DREGISTER_VOX=register_$(FL_VOX) -DSTANDALONE -DEFLITE -c -o $@ $<
+ 
+ tone.o: tone.c
+ 	$(CC) $(CFLAGS) -I$(flite_include_dir) -DEFLITE -c -o $@ $<