From 16ab09ec0642752f26cd70b8cd5f6b324568ff0c Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Wed, 7 Feb 2007 03:15:26 +0000 Subject: [PATCH] Removed old versions and updated espeak-1.19-big-endian.patch. Package-Manager: portage-2.1.2-r7 --- app-accessibility/espeak/ChangeLog | 8 ++- app-accessibility/espeak/Manifest | 40 +++--------- app-accessibility/espeak/espeak-1.16.ebuild | 53 --------------- app-accessibility/espeak/espeak-1.18.ebuild | 53 --------------- .../espeak/files/digest-espeak-1.16 | 3 - .../espeak/files/digest-espeak-1.18 | 3 - .../espeak/files/espeak-1.18-64bits.patch | 64 ------------------- .../espeak/files/espeak-1.18-parallel.patch | 12 ---- .../espeak/files/espeak-1.19-big-endian.patch | 26 +++++--- 9 files changed, 31 insertions(+), 231 deletions(-) delete mode 100644 app-accessibility/espeak/espeak-1.16.ebuild delete mode 100644 app-accessibility/espeak/espeak-1.18.ebuild delete mode 100644 app-accessibility/espeak/files/digest-espeak-1.16 delete mode 100644 app-accessibility/espeak/files/digest-espeak-1.18 delete mode 100644 app-accessibility/espeak/files/espeak-1.18-64bits.patch delete mode 100644 app-accessibility/espeak/files/espeak-1.18-parallel.patch diff --git a/app-accessibility/espeak/ChangeLog b/app-accessibility/espeak/ChangeLog index 018ee5700738..a9c6592689bb 100644 --- a/app-accessibility/espeak/ChangeLog +++ b/app-accessibility/espeak/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-accessibility/espeak # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/ChangeLog,v 1.6 2007/02/06 06:32:25 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/ChangeLog,v 1.7 2007/02/07 03:15:25 williamh Exp $ + + 07 Feb 2007; William Hubbs + -files/espeak-1.18-64bits.patch, -files/espeak-1.18-parallel.patch, + files/espeak-1.19-big-endian.patch, -espeak-1.16.ebuild, + -espeak-1.18.ebuild: + Removed old versions, also updated espeak-1.19-big-endian.patch. 06 Feb 2007; William Hubbs espeak-1.19.ebuild: Added patches to fix a segfault on ppc64 and to move ARCH_BIG out of the diff --git a/app-accessibility/espeak/Manifest b/app-accessibility/espeak/Manifest index 1a4ede9f014b..56f1e6f6679b 100644 --- a/app-accessibility/espeak/Manifest +++ b/app-accessibility/espeak/Manifest @@ -1,48 +1,24 @@ -AUX espeak-1.18-64bits.patch 2496 RMD160 db313d18e90e458ed2c12687dd25e381d2817c53 SHA1 2879e4614d21f9721ddbff2cc9751b7de0f14548 SHA256 97d71fdb3c4b7c19436e37396747bd2828fa08ed5c6c0aa1a4db15e387aebae4 -MD5 0311d084162c3fc6c7150c438e882c16 files/espeak-1.18-64bits.patch 2496 -RMD160 db313d18e90e458ed2c12687dd25e381d2817c53 files/espeak-1.18-64bits.patch 2496 -SHA256 97d71fdb3c4b7c19436e37396747bd2828fa08ed5c6c0aa1a4db15e387aebae4 files/espeak-1.18-64bits.patch 2496 -AUX espeak-1.18-parallel.patch 409 RMD160 89849b86aafb3bdfeb15b66c22aa7e07132fe961 SHA1 446e06a4856b088d99f9a4f166a505cb4726e2c4 SHA256 391574549f981cf3587489b37df4087d1bbbb23fd5f26961f0a9374187f89031 -MD5 557155f1fbb7dce6a97cd6c18ea937c4 files/espeak-1.18-parallel.patch 409 -RMD160 89849b86aafb3bdfeb15b66c22aa7e07132fe961 files/espeak-1.18-parallel.patch 409 -SHA256 391574549f981cf3587489b37df4087d1bbbb23fd5f26961f0a9374187f89031 files/espeak-1.18-parallel.patch 409 -AUX espeak-1.19-big-endian.patch 622 RMD160 c4b2d372ea0021a14027889f221583bfb5900b1e SHA1 eb118f7b56606ffc2aed520759dbdefee3d70402 SHA256 fa39adc9133d44952c9b98410cd278526084afda6eef932223da28407bee9893 -MD5 c057609a517073d8e8f4e32f7dc1654f files/espeak-1.19-big-endian.patch 622 -RMD160 c4b2d372ea0021a14027889f221583bfb5900b1e files/espeak-1.19-big-endian.patch 622 -SHA256 fa39adc9133d44952c9b98410cd278526084afda6eef932223da28407bee9893 files/espeak-1.19-big-endian.patch 622 +AUX espeak-1.19-big-endian.patch 783 RMD160 34adcda34d5bf81043b44a7d43ca9e02467ff192 SHA1 e3906e23f55709be1b9062c5265d526827062512 SHA256 8ad07d0541e4a5d9b0cd5cf5fdb275e0960dcebe8da83720f958264c185c1c37 +MD5 51a412d884e110a310159ad6918ff34c files/espeak-1.19-big-endian.patch 783 +RMD160 34adcda34d5bf81043b44a7d43ca9e02467ff192 files/espeak-1.19-big-endian.patch 783 +SHA256 8ad07d0541e4a5d9b0cd5cf5fdb275e0960dcebe8da83720f958264c185c1c37 files/espeak-1.19-big-endian.patch 783 AUX espeak-1.19-ppc64-segfault.patch 354 RMD160 b29461b997a41043f2b28a8e48fa0ee8d5a316be SHA1 ede6544c87d122037c022ccdd38f82530b871422 SHA256 c1e876365013fcf8ab67e8ed8c0a84e05e700345ab0d4d48c7ee7f34858e057f MD5 0ba2b29ae1337deecaa5d0ef9473b27b files/espeak-1.19-ppc64-segfault.patch 354 RMD160 b29461b997a41043f2b28a8e48fa0ee8d5a316be files/espeak-1.19-ppc64-segfault.patch 354 SHA256 c1e876365013fcf8ab67e8ed8c0a84e05e700345ab0d4d48c7ee7f34858e057f files/espeak-1.19-ppc64-segfault.patch 354 -DIST espeak-1.16-source.zip 528920 RMD160 56a0504e9909022194603394a203651fa5945e13 SHA1 28c45c3ca8b520be54d0dfc78e72b25a3ae56311 SHA256 cdb213b50bff0c092a4d1941038eadac831251acee64acb48943e13ccae3471b -DIST espeak-1.18-source.zip 658805 RMD160 9097e6f241a7830a8301b0e268cc767e661b81aa SHA1 8c98dac2ab5484d16f8a16fcb91fec14f338a1df SHA256 7d20b69419a5b19d3fb901701edd18b272f2cbf97dee1dd5775f50e44503a878 DIST espeak-1.19-source.zip 669628 RMD160 a544181d60561e9f2ed8948b31e47b733562e121 SHA1 0f5ed89c99acadd04f664819f986f04b734f0e47 SHA256 32ded8994f317b9f5f12a2ee5fff621acc4770d5906aaccde6d6d97b06568c79 -EBUILD espeak-1.16.ebuild 1242 RMD160 2206faeb21b3835fb585eac495834b85ae938e61 SHA1 b98f1e86e53101a04601f016451b38a6ddd796e0 SHA256 92650bc7c106982b3a211a61d75105f7dbf9a3af82b0798c9a180dfe12f7fdae -MD5 fba44395ff1c12a775fa0a529ceb47a9 espeak-1.16.ebuild 1242 -RMD160 2206faeb21b3835fb585eac495834b85ae938e61 espeak-1.16.ebuild 1242 -SHA256 92650bc7c106982b3a211a61d75105f7dbf9a3af82b0798c9a180dfe12f7fdae espeak-1.16.ebuild 1242 -EBUILD espeak-1.18.ebuild 1198 RMD160 1f8f3e8b436830ede9b4aff1c2e129e93c5ffba2 SHA1 cb79f5d1cce1a900011b1a6404997a37c06b2ff2 SHA256 d6d83238e87562d82b9b5aad33e1736dc4e5ac3b66237c5fa337e11e7af5c774 -MD5 0371066906461208a1240dc96534d86f espeak-1.18.ebuild 1198 -RMD160 1f8f3e8b436830ede9b4aff1c2e129e93c5ffba2 espeak-1.18.ebuild 1198 -SHA256 d6d83238e87562d82b9b5aad33e1736dc4e5ac3b66237c5fa337e11e7af5c774 espeak-1.18.ebuild 1198 EBUILD espeak-1.19.ebuild 1208 RMD160 e8e142f00a2aa8448f160202f47ecb3825f91aea SHA1 f438120bef969e8be88c1569fcc7f68ba7e31e07 SHA256 0471b328fc6faa90a2e5a295660d3fdf957cddc4bc67920c36e1854802576d4f MD5 f74145ee1efce1e7fafdb7d8a19e662f espeak-1.19.ebuild 1208 RMD160 e8e142f00a2aa8448f160202f47ecb3825f91aea espeak-1.19.ebuild 1208 SHA256 0471b328fc6faa90a2e5a295660d3fdf957cddc4bc67920c36e1854802576d4f espeak-1.19.ebuild 1208 -MISC ChangeLog 1277 RMD160 f7ce2f3ed7166c91125d350efdbcd8bab1d03cd4 SHA1 11426de5af2b90ac0d90488f29d04be6a287bbfa SHA256 b3d9dca985193eb52b217cc9571a183af6c811b7983fecd8b4c60f48b98f3088 -MD5 ebcc48790b3156b04cdcbc9b964afe55 ChangeLog 1277 -RMD160 f7ce2f3ed7166c91125d350efdbcd8bab1d03cd4 ChangeLog 1277 -SHA256 b3d9dca985193eb52b217cc9571a183af6c811b7983fecd8b4c60f48b98f3088 ChangeLog 1277 +MISC ChangeLog 1548 RMD160 095c62a2897bedbd7073037705ab319819c2387f SHA1 68b3ea528db8b5a20132201905645d06a2a9c6e7 SHA256 05d9952c24a4925c6e00d3b9d96cb612f6a3241e3e6aedf8707cd733edb8dfd7 +MD5 51d2b1bced96402bea134007d1fcc71e ChangeLog 1548 +RMD160 095c62a2897bedbd7073037705ab319819c2387f ChangeLog 1548 +SHA256 05d9952c24a4925c6e00d3b9d96cb612f6a3241e3e6aedf8707cd733edb8dfd7 ChangeLog 1548 MISC metadata.xml 229 RMD160 7f8d6a0235529eccff705022803122c9534628d7 SHA1 2295356b566d60c8eb979db0e598de9d1d8ccf49 SHA256 b128d301356b3f98f1d6093b4401c36143ff55fc62636612567b0995739b9e66 MD5 82235b237bf37d432e6987e3be2235d1 metadata.xml 229 RMD160 7f8d6a0235529eccff705022803122c9534628d7 metadata.xml 229 SHA256 b128d301356b3f98f1d6093b4401c36143ff55fc62636612567b0995739b9e66 metadata.xml 229 -MD5 6660406e1e447fadf287cdd140b4cd70 files/digest-espeak-1.16 247 -RMD160 70566cfe0aa0f64784e63d008f516022f5c0b77a files/digest-espeak-1.16 247 -SHA256 103364035a5816f16c092dde2dee7fa26fa3a8f5851c1ff219a70a7e7d53339c files/digest-espeak-1.16 247 -MD5 df294b5190ab272c9f79bc136c0a3fbb files/digest-espeak-1.18 247 -RMD160 dc58605b4d820ba9ffa588db43748c9e403b6060 files/digest-espeak-1.18 247 -SHA256 b99d475193018fd987c71db92d688782a698777e8dfb6d316a00323b92b27661 files/digest-espeak-1.18 247 MD5 dcef0353ad89b28e1374aabc36eed4bd files/digest-espeak-1.19 247 RMD160 a1d74bce771a8bc5bdfa5fe841eae93cc2e20e25 files/digest-espeak-1.19 247 SHA256 5ad3063a8c95e44cdea937a71c466d95191f30c1da344d88b5752f05e82a9ffb files/digest-espeak-1.19 247 diff --git a/app-accessibility/espeak/espeak-1.16.ebuild b/app-accessibility/espeak/espeak-1.16.ebuild deleted file mode 100644 index 0a9d30ac6395..000000000000 --- a/app-accessibility/espeak/espeak-1.16.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/espeak-1.16.ebuild,v 1.3 2007/01/22 18:53:25 leonardop Exp $ - -MY_P="${P}-source" - -DESCRIPTION="Speech synthesizer for English and other languages" -HOMEPAGE="http://espeak.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=">=media-libs/portaudio-18.1-r5 - app-arch/unzip" - -S=${WORKDIR}/${MY_P} - -src_unpack() { - unpack ${A} - cd "${S}/src" - - # select the version of portaudio to use - if has_version "=media-libs/portaudio-18*" ; then - mv -f portaudio18.h portaudio.h - elif has_version "=media-libs/portaudio-19*" ; then - mv -f portaudio19.h portaudio.h - fi - sed -i -e 's/ -O2//' Makefile -} - -src_compile() { - cd src - emake || die "Compilation failed." -} - -src_install() { - dobin src/speak || die - dolib.so src/libespeak.so.* || die - dosym libespeak.so.1.1.16 /usr/lib/libespeak.so || die - insinto /usr/include/espeak - doins src/speak_lib.h - - insinto /usr/share - doins -r espeak-data || die - insinto /usr/share/espeak-data - doins -r dictsource || die - - dodoc ChangeLog ReadMe - dohtml -r docs/* -} diff --git a/app-accessibility/espeak/espeak-1.18.ebuild b/app-accessibility/espeak/espeak-1.18.ebuild deleted file mode 100644 index 89e6e8fad3b4..000000000000 --- a/app-accessibility/espeak/espeak-1.18.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/espeak-1.18.ebuild,v 1.2 2007/01/24 18:52:12 leonardop Exp $ - -inherit eutils - -MY_P="${P}-source" - -DESCRIPTION="Speech synthesizer for English and other languages" -HOMEPAGE="http://espeak.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=">=media-libs/portaudio-18.1-r5 - app-arch/unzip" - -S=${WORKDIR}/${MY_P} - - -src_unpack() { - unpack "${A}" - cd "${S}" - - # Fix compilation in 64bit systems (e.g. amd64) - epatch "${FILESDIR}/${P}-64bits.patch" - - # Fix parallel compilation - epatch "${FILESDIR}/${P}-parallel.patch" - - # portaudio.h is by default the same as portaudio18.h, but use the version - # 19 API if available - if has_version "=media-libs/portaudio-19*" ; then - mv -f "${S}/src/portaudio19.h" "${S}/src/portaudio.h" - fi -} - -src_compile() { - cd src - emake CXXFLAGS="${CXXFLAGS}" || die "Compilation failed" -} - -src_install() { - cd src - make DESTDIR="${D}" install || die "Installation failed" - - cd "${S}" - dodoc ChangeLog ReadMe - dohtml -r docs/* -} diff --git a/app-accessibility/espeak/files/digest-espeak-1.16 b/app-accessibility/espeak/files/digest-espeak-1.16 deleted file mode 100644 index 9df3a8c56694..000000000000 --- a/app-accessibility/espeak/files/digest-espeak-1.16 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 c376ea94cddda90b093f231926f7ba44 espeak-1.16-source.zip 528920 -RMD160 56a0504e9909022194603394a203651fa5945e13 espeak-1.16-source.zip 528920 -SHA256 cdb213b50bff0c092a4d1941038eadac831251acee64acb48943e13ccae3471b espeak-1.16-source.zip 528920 diff --git a/app-accessibility/espeak/files/digest-espeak-1.18 b/app-accessibility/espeak/files/digest-espeak-1.18 deleted file mode 100644 index 2bdc272ecbf6..000000000000 --- a/app-accessibility/espeak/files/digest-espeak-1.18 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 8e5ed7ff85c56ca2c5f2fcaba36df110 espeak-1.18-source.zip 658805 -RMD160 9097e6f241a7830a8301b0e268cc767e661b81aa espeak-1.18-source.zip 658805 -SHA256 7d20b69419a5b19d3fb901701edd18b272f2cbf97dee1dd5775f50e44503a878 espeak-1.18-source.zip 658805 diff --git a/app-accessibility/espeak/files/espeak-1.18-64bits.patch b/app-accessibility/espeak/files/espeak-1.18-64bits.patch deleted file mode 100644 index 8d3b778610ca..000000000000 --- a/app-accessibility/espeak/files/espeak-1.18-64bits.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -NurdB espeak-1.18-source/src/dictionary.cpp espeak-1.18-source-patched/src/dictionary.cpp ---- espeak-1.18-source/src/dictionary.cpp 2007-01-13 15:56:33.000000000 +0000 -+++ espeak-1.18-source-patched/src/dictionary.cpp 2007-01-24 16:25:23.000000000 +0000 -@@ -592,7 +592,12 @@ - int Translator::IsLetter(int letter, int group) - {//============================================ - if(letter_type_list[group] != NULL) -- return((int)wcschr(letter_type_list[group],letter)); -+ { -+ if(wcschr(letter_type_list[group],letter) == NULL) -+ return(0); -+ else -+ return(1); -+ } - - if(letter_bits_offset > 0) - { -diff -NurdB espeak-1.18-source/src/speak_lib.cpp espeak-1.18-source-patched/src/speak_lib.cpp ---- espeak-1.18-source/src/speak_lib.cpp 2007-01-13 15:56:33.000000000 +0000 -+++ espeak-1.18-source-patched/src/speak_lib.cpp 2007-01-24 17:14:10.000000000 +0000 -@@ -73,7 +73,7 @@ - - int a_wave_can_be_played = fifo_is_command_enabled(); - -- SHOW("*** dispatch_audio > uid=%d, [write=%x (%d bytes)], sample=%d, a_wave_can_be_played = %d\n", -+ SHOW("*** dispatch_audio > uid=%d, [write=%p (%d bytes)], sample=%d, a_wave_can_be_played = %d\n", - (event) ? event->unique_identifier : 0, wave_test_get_write_buffer(), 2*length, - (event) ? event->sample : 0, - a_wave_can_be_played); -diff -NurdB espeak-1.18-source/src/wave.cpp espeak-1.18-source-patched/src/wave.cpp ---- espeak-1.18-source/src/wave.cpp 2007-01-13 15:56:34.000000000 +0000 -+++ espeak-1.18-source-patched/src/wave.cpp 2007-01-24 17:13:27.000000000 +0000 -@@ -877,9 +877,9 @@ - //> - // ++ + // conditional compilation options + +#if defined(BYTE_ORDER) && BYTE_ORDER == BIG_ENDIAN +#define ARCH_BIG +#endif - - // will look for espeak_data directory here, and also in user's home directory - #ifndef PATH_ESPEAK_DATA ++ + #define PLATFORM_POSIX + #define PATHSEP '/' + #define USE_PORTAUDIO -- 2.26.2