Revert Prefix changes to espeak-1.42.04, apply them in espeak-1.42.04-r1 with EAPI=3

(Portage version: 2.2.00.15335-prefix/cvs/Darwin powerpc)

3 files changed, 92 insertions, 10 deletions

diff --git a/app-accessibility/espeak/ChangeLog b/app-accessibility/espeak/ChangeLog
index 29957dbb4e5e..bea0c56f52ca 100644
--- a/app-accessibility/espeak/ChangeLog
+++ b/app-accessibility/espeak/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-accessibility/espeak
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/ChangeLog,v 1.84 2010/02/11 23:16:16 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/ChangeLog,v 1.85 2010/02/13 18:49:23 grobian Exp $
+
+*espeak-1.42.04-r1 (13 Feb 2010)
+
+  13 Feb 2010; Fabian Groffen <grobian@gentoo.org> espeak-1.42.04.ebuild,
+  +espeak-1.42.04-r1.ebuild:
+  Revert Prefix changes to espeak-1.42.04, apply them in espeak-1.42.04-r1
+  with EAPI=3
 
   11 Feb 2010; Jonathan Callen <abcd@gentoo.org> espeak-1.42.04.ebuild:
   Add prefix support, ~amd64-linux/~x86-linux keywords
diff --git a/app-accessibility/espeak/espeak-1.42.04-r1.ebuild b/app-accessibility/espeak/espeak-1.42.04-r1.ebuild
new file mode 100644
index 000000000000..6591de920d76
--- /dev/null
+++ b/app-accessibility/espeak/espeak-1.42.04-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/espeak-1.42.04-r1.ebuild,v 1.1 2010/02/13 18:49:23 grobian Exp $
+
+EAPI="3"
+
+inherit eutils
+
+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 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="portaudio pulseaudio"
+RDEPEND="portaudio? ( >=media-libs/portaudio-19_pre20071207 )
+	pulseaudio? ( media-sound/pulseaudio )"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}/${MY_P}
+
+get_audio() {
+	local MY_AUDIO
+
+	if use portaudio; then
+		MY_AUDIO=portaudio
+	elif use pulseaudio; then
+		MY_AUDIO=pulseaudio
+	else
+		MY_AUDIO=none
+	fi
+	echo ${MY_AUDIO}
+}
+
+pkg_setup() {
+	if ! use portaudio && ! use pulseaudio; then
+		ewarn
+		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, press ctrl-c and put either
+		ewarn portaudio or pulseaudio in your use flags.
+		ebeep
+		epause 10
+	elif use portaudio && use pulseaudio; then
+		die "You must choose either portaudio or pulseaudio, but not both."
+	fi
+}
+
+src_prepare() {
+	cd src
+	# gentoo uses portaudio 19.
+	if use portaudio; then
+		mv -f portaudio19.h portaudio.h
+	fi
+}
+
+src_compile() {
+	cd src
+	emake PREFIX="${EPREFIX}/usr" AUDIO="$(get_audio)" CXXFLAGS="${CXXFLAGS}" all || die "Compilation failed"
+
+	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 || die "Installation failed"
+
+	cd ..
+	insinto /usr/share/espeak-data
+	doins -r dictsource
+	dodoc ChangeLog ReadMe
+	dohtml -r docs/*
+}
diff --git a/app-accessibility/espeak/espeak-1.42.04.ebuild b/app-accessibility/espeak/espeak-1.42.04.ebuild
index 7806132cdfa5..e9a6ebc4c1bc 100644
--- a/app-accessibility/espeak/espeak-1.42.04.ebuild
+++ b/app-accessibility/espeak/espeak-1.42.04.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/espeak-1.42.04.ebuild,v 1.6 2010/02/11 23:16:16 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/espeak-1.42.04.ebuild,v 1.7 2010/02/13 18:49:23 grobian Exp $
 
 EAPI="2"
 
@@ -12,11 +12,11 @@ DESCRIPTION="Speech synthesizer for English and other languages"
 HOMEPAGE="http://espeak.sourceforge.net/"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
 IUSE="portaudio pulseaudio"
 RDEPEND="portaudio? ( >=media-libs/portaudio-19_pre20071207 )
 	pulseaudio? ( media-sound/pulseaudio )"
-DEPEND="${RDEPEND}
+	DEPEND="${RDEPEND}
 	app-arch/unzip"
 
 S=${WORKDIR}/${MY_P}
@@ -57,10 +57,8 @@ src_prepare() {
 }
 
 src_compile() {
-	use prefix || EPREFIX=
-
 	cd src
-	emake PREFIX="${EPREFIX}/usr" AUDIO="$(get_audio)" CXXFLAGS="${CXXFLAGS}" all || die "Compilation failed"
+	emake AUDIO="$(get_audio)" CXXFLAGS="${CXXFLAGS}" all || die "Compilation failed"
 
 	einfo "Fixing byte order of phoneme data files"
 	cd "${S}/platforms/big_endian"
@@ -70,10 +68,8 @@ src_compile() {
 }
 
 src_install() {
-	use prefix || EPREFIX=
-
 	cd src
-	make DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="\$(PREFIX)/$(get_libdir)" AUDIO="$(get_audio)" install || die "Installation failed"
+	make DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" AUDIO="$(get_audio)" install || die "Installation failed"
 
 	cd ..
 	insinto /usr/share/espeak-data