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

Package-Manager: portage-2.2.00.15335-prefix/cvs/Darwin powerpc

4 files changed, 95 insertions, 22 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/Manifest b/app-accessibility/espeak/Manifest
index ef3eeeeb75aa..688dfb9e990a 100644
--- a/app-accessibility/espeak/Manifest
+++ b/app-accessibility/espeak/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST espeak-1.40.02-source.zip 1400971 RMD160 caca57d5a6b5165d5b7edbb9c465cb37bc4ec3ec SHA1 de75304b0b58a18669bd05b3fa89573dc4787085 SHA256 b55e323a52be38337f8d5f219fd8878fc7b62b9e25d8cc15685e5f815bf6519e
 DIST espeak-1.41.01-source.zip 1476908 RMD160 bb95144e78c57aa4607be927ea6832802966c2bb SHA1 458bf2f94d598b10ca5d4b9e6855d789e4557f2d SHA256 1c89178b8021f77352eb482e93f2545044c7010ec5c1f902fbdee899bfde01a2
 DIST espeak-1.42.04-source.zip 1537076 RMD160 1b0747501d81acf48241dc6b0da7fb555a1e3927 SHA1 fe3c0e20b994d2332d8841f61ccc2ae016a836b0 SHA256 3791bb853e9283950d58c02396b3b9b1313adf27c0004bcd1e0cdaf87a683eeb
 EBUILD espeak-1.40.02.ebuild 2093 RMD160 bb84e442ed62e52e0805c072f3fcb4da2c97a81e SHA1 175da242ed6f6770c8f865314acbc2d6a2afb95e SHA256 15bbee28438b9269fde06627f7fe282a7706c7235fa873e4b517ed3f711e3220
 EBUILD espeak-1.41.01.ebuild 1962 RMD160 a482cd702826f0de9a37c10e8206ca9425ee9eb2 SHA1 f9e1bd5828c674874a2599d32f3d34a856ec6970 SHA256 06663502e4153f3e5199eefcb202e45321d8dd9912fb5dfe65e6fcec3f7ee923
-EBUILD espeak-1.42.04.ebuild 2090 RMD160 c74d936e8dcb298f44402fe008676c4a0fb04c97 SHA1 03ee80887bd8ef89a2d6d2fa6a6e61532658be30 SHA256 dbc512a17194dcc0f142a6623a26b6f728f94d4a72e9cd9d5831126a392ff23c
-MISC ChangeLog 11160 RMD160 9a2017437bd961afe3dcca9abd14cef82692f6ef SHA1 40c6818c421f553ea978a2be0bdcb71ba422949b SHA256 916898560a64c553dcee0faf69358fb51e7dc040a3987b0ee1ec26ebf1687a00
+EBUILD espeak-1.42.04-r1.ebuild 2053 RMD160 467cf0441f27229aabd5c6f280eb81a9805d7e4a SHA1 9f4c282246524b8215cded771fd39d163506cf95 SHA256 dc42f1af570baeec7912fdd7a2b0c3bbb3b81b1e6add857919d43ee022f6b832
+EBUILD espeak-1.42.04.ebuild 1966 RMD160 3649a327815e6c254764387ebe272b802d23736e SHA1 9b04258646b5ffc9ab9dcac86f4cf1713b295d97 SHA256 5fc227970bfa3b988729cafe576bf237492996de5ff0f45c70a1107e8b77564b
+MISC ChangeLog 11390 RMD160 6784766590160f26f62ae3cd6ec647476809638d SHA1 f5c12996c634aee6ee7bdc83d17b2201ae2ec371 SHA256 4b7b0c1084a659834e91113a6928b2d161d3ddac7a0e41484cb94d4189356ade
 MISC metadata.xml 229 RMD160 7f8d6a0235529eccff705022803122c9534628d7 SHA1 2295356b566d60c8eb979db0e598de9d1d8ccf49 SHA256 b128d301356b3f98f1d6093b4401c36143ff55fc62636612567b0995739b9e66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkt0j8oACgkQOypDUo0oQOq+wwCfVbRqSIcEw7Q2t8kf595NWAgi
-djUAn0lamk6USv0l+prQ1hWbsQp2Y/5Y
-=bCsX
------END PGP SIGNATURE-----
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