diff options
| author |   William Hubbs <williamh@gentoo.org> | 2013-09-22 20:15:08 +0000 |
|---|---|---|
| committer | William Hubbs <williamh@gentoo.org> | 2013-09-22 20:15:08 +0000 |
| commit | 10bcb566678f803aa7aa6e6e007332ae1aa28692 (patch) | |
| tree | c92a7dfdea5c0bee8ebcb8181a97f2c98551fe35 /app-accessibility | |
| parent | Version bump to 0.1.7, proxied commit for Nikoli. (diff) | |
| download | historical-10bcb566678f803aa7aa6e6e007332ae1aa28692.tar.gz historical-10bcb566678f803aa7aa6e6e007332ae1aa28692.tar.bz2 historical-10bcb566678f803aa7aa6e6e007332ae1aa28692.zip | |
Add overrides for AR and CFLAGS, convert a call to make to emake, use
the S variable instead of "cd src" in the src_* functions and make some
cosmetic changes. Thanks to ago for pointing these out.
This fixes bug #484852.
Package-Manager: portage-2.2.1/cvs/Linux i686
Manifest-Sign-Key: 0x30C46538
Diffstat (limited to 'app-accessibility')
| -rw-r--r-- | app-accessibility/espeak/ChangeLog | 7 | ||||
| -rw-r--r-- | app-accessibility/espeak/Manifest | 10 | ||||
| -rw-r--r-- | app-accessibility/espeak/espeak-1.47.11.ebuild | 27 |
3 files changed, 29 insertions, 15 deletions
diff --git a/app-accessibility/espeak/ChangeLog b/app-accessibility/espeak/ChangeLog index bf9bd8d72a3c..16d5b8824d93 100644 --- a/app-accessibility/espeak/ChangeLog +++ b/app-accessibility/espeak/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-accessibility/espeak # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/ChangeLog,v 1.110 2013/07/12 06:52:31 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/ChangeLog,v 1.111 2013/09/22 20:14:41 williamh Exp $ + + 22 Sep 2013; William Hubbs <williamh@gentoo.org> espeak-1.47.11.ebuild: + Add overrides for AR and CFLAGS, convert a call to make to emake, use the S + variable instead of "cd src" in the src_* functions and make some cosmetic + changes. Thanks to ago for pointing these out. This fixes bug #484852. 12 Jul 2013; William Hubbs <williamh@gentoo.org> espeak-1.47.11.ebuild: remove error message since "rm -rf" does not fail diff --git a/app-accessibility/espeak/Manifest b/app-accessibility/espeak/Manifest index dd3159ea47ed..d86c4491e0d9 100644 --- a/app-accessibility/espeak/Manifest +++ b/app-accessibility/espeak/Manifest @@ -10,13 +10,13 @@ EBUILD espeak-1.42.04.ebuild 1974 SHA256 dcae748864f34fde8cf2cd110ad1c0631d66c23 EBUILD espeak-1.45.03.ebuild 1926 SHA256 fe533c6ca9c6c815fb31008a4f0fef15a0e3a2067a858a773cf8b280741de631 SHA512 b26ac4bda8b78260bdb691219f99b9314f4e3635a266693226cc204085dfb1413387a08fca1b85b9f647eff8ba20329eefee6875a60e4378d26599456744c1b1 WHIRLPOOL 8e9a16ce16015508f1f44c8033fc490693c0ef5510325d2b9216582e6942970059f08e9631fe7196f59649e056229b1f4df4d154258b59376be5d7cfd2f8a40c EBUILD espeak-1.45.04.ebuild 1918 SHA256 6909a3d5436e69aca518280721c22cb59229b6d3375ff75029aac5fc181faee2 SHA512 1a4fbb3455d19711debc79b1b809199b95dc47ef75f22ad7dee73f1a3ac10ebed79c80d30a8f3777d8b70b1630445cae988c80efced04a226b314e4e5f43338a WHIRLPOOL f23ac11d01c51d5a2ef5c3b75fe65bb14d31a45f1865498675b13502e863a4b9473eb821c586e03b94176167bb86f921c8f002f42e330f06146ca05bacebb588 EBUILD espeak-1.46.01.ebuild 1942 SHA256 8bf7192b9ed081842e5956ecf9067af6e7786d7f90722ea78a04594376e7feed SHA512 0627f0681372c871be5b32ba5a57b3b8fa7fc7e3a807bffb96f92afef1b42b66a0a342f9eaf65dbe61715e53f9afbf05176f3c17b0a3ae57cf4826570fa9d0d7 WHIRLPOOL 26f70f3445889afaeefc1fdfa855d67e6d946d92b59797f49db1adfe12b74b07666fe5af44482c1c0982f29d1e1553bda2b3799fbeabbb17043ba0159a1c52d8 -EBUILD espeak-1.47.11.ebuild 2072 SHA256 3523d9380c2d84d60360beeb4fe58861bb2a9ecd6793e9e8fc2937bb9fa930a9 SHA512 ff93597df2f183c324690095635e5398274762d6891ef43af339d784c8b0760a233057c9347440bfe5aadf9ca54e5e4fa8b994024b8eb424b69dcb52891ec62c WHIRLPOOL 8bd132050b519f033eab69d0f81fc299c1407852a6095226dc18691ef8820bb45f2a2eae2c348fd8528a87d3b13387c503e5554f51d27a56e688ec5eef040c7b -MISC ChangeLog 14937 SHA256 62682d7e8ac0ed38658a426835e0727e6ff2e7edbd7796ba3a6d9ec15f31d929 SHA512 1becf3ce119e8eee80215f3be14b8ab7de2db0df1905ff126ff7024e84f23cceddc287b1db81a0b817bc91fa78a49fdf63ae3a0a11df74b042e8c3cff3dfa2b4 WHIRLPOOL 6048c830caad8f06158fe38eda2006f78cf8be8334b31cc706e600acec018a31ad6b7abac65b00e1ab8ad34376f37207850f7d54974fc5159a0658b2082ba03d +EBUILD espeak-1.47.11.ebuild 2156 SHA256 01d536f21cb67567c1d55b47353827e15cda14bd4c942411663d82f2c7e6b699 SHA512 6fa42b6af42fa19dc4d1413e5361326979170c5228ccc8ad77915b2a876368ac4b8470fe6b8b2cf7bcf3c6b9b098cc393b79e4ae2599ee8329540d72d79bd155 WHIRLPOOL 946ae0db5e28a74e666d859e2329b6f79de676ca5e7c7d6f162294469f889aa0e3c263468a0820a5546a3b0d4340c20a729c897308fc94fe3be251a254916723 +MISC ChangeLog 15240 SHA256 5dbbedbe6e699bcf98bf1faffde9a4b82fb54d6b8717f7291ae499f3df2d7fd8 SHA512 c195961cd7da1406e5cfc452ef707395e08bb58f9ac756de9ac11b2002e7112fb4dda56a1df249ed5adb30e921116113dd887725310890b6f2ad75e3d8d908f3 WHIRLPOOL de0cdfc1bf139eb2c085c9daa25cabb573ca4a3e2ebc9f67dc0ccbab490b9e963d536371969a9b563bf2aeefe18cb1d4d901f5f7c5b7cd216d3e250d2cfad434 MISC metadata.xml 229 SHA256 b128d301356b3f98f1d6093b4401c36143ff55fc62636612567b0995739b9e66 SHA512 bd12bd8878fa253afe1f030863335b920b00e7cd7f5f551442b9b7fd02fe6c606938b07351bd60ef8a858c3c07da59ea00000c34b8cb49321a499244e423077d WHIRLPOOL 4a865d3061aabfbd49a1a1b11abdab5b44411e86251f560bc7c0eca9982bd230a9226737f0c4afdb5e15426daad16a4c89a4c90a686f0c73122fe56492ee1b53 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) -iEYEAREIAAYFAlHfp7AACgkQblQW9DDEZTgFvwCfWKn+w5J2d9x9R1YAgXtSOmPP -oWQAoIgIpUNNcLrWdGl+0PsWSVDwo7Gb -=JOAw +iEYEAREIAAYFAlI/T8sACgkQblQW9DDEZTj8QACgoa/Zt0YWXUVxGV3aq2fwBSVi +VvMAniFVPEBGAGuDJCFwqEOtb47O6l3R +=fwtA -----END PGP SIGNATURE----- diff --git a/app-accessibility/espeak/espeak-1.47.11.ebuild b/app-accessibility/espeak/espeak-1.47.11.ebuild index e76651a4b614..658927c3cf0b 100644 --- a/app-accessibility/espeak/espeak-1.47.11.ebuild +++ b/app-accessibility/espeak/espeak-1.47.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/espeak-1.47.11.ebuild,v 1.4 2013/07/12 06:52:31 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/espeak-1.47.11.ebuild,v 1.5 2013/09/22 20:14:41 williamh Exp $ EAPI=5 @@ -23,7 +23,7 @@ RDEPEND=" DEPEND="${RDEPEND} app-arch/unzip" -S=${WORKDIR}/${MY_P} +S=${WORKDIR}/${MY_P}/src get_audio() { if use portaudio && use pulseaudio; then @@ -38,26 +38,35 @@ get_audio() { } 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 + emake \ + PREFIX="${EPREFIX}/usr" \ + CC="$(tc-getCC)" \ + CFLAGS="${CFLAGS}" \ + CXX="$(tc-getCXX)" \ + CXXFLAGS="${CXXFLAGS}" \ + AR="$(tc-getAR)" \ + AUDIO="$(get_audio)" \ + all einfo "Fixing byte order of phoneme data files" cd "${S}/platforms/big_endian" - make + emake ./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 + emake \ + PREFIX="${EPREFIX}/usr" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + DESTDIR="${D}" \ + AUDIO="$(get_audio)" \ + install cd .. insinto /usr/share/espeak-data |