diff options
| author |   William Hubbs <williamh@gentoo.org> | 2013-09-22 20:14:41 +0000 |
|---|---|---|
| committer | William Hubbs <williamh@gentoo.org> | 2013-09-22 20:14:41 +0000 |
| commit | 01d256e647652fafdc04576663b0dd1e6ddf3f32 (patch) | |
| tree | c90b3badb5bad488ecc3163bcd4a9648171d2c36 /app-accessibility/espeak | |
| parent | Version bump to 0.1.7, proxied commit for Nikoli. (diff) | |
| download | gentoo-2-01d256e647652fafdc04576663b0dd1e6ddf3f32.tar.gz gentoo-2-01d256e647652fafdc04576663b0dd1e6ddf3f32.tar.bz2 gentoo-2-01d256e647652fafdc04576663b0dd1e6ddf3f32.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.
(Portage version: 2.2.1/cvs/Linux i686, signed Manifest commit with key 0x30C46538)
Diffstat (limited to 'app-accessibility/espeak')
| -rw-r--r-- | app-accessibility/espeak/ChangeLog | 7 | ||||
| -rw-r--r-- | app-accessibility/espeak/espeak-1.47.11.ebuild | 27 |
2 files changed, 24 insertions, 10 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/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 |