Add prefix support, ~amd64-linux/~x86-linux keywords

Package-Manager: portage--svn/cvs/Linux i686

4 files changed, 30 insertions, 13 deletions

diff --git a/app-accessibility/espeak/ChangeLog b/app-accessibility/espeak/ChangeLog
index 649789e4c3e0..29957dbb4e5e 100644
--- a/app-accessibility/espeak/ChangeLog
+++ b/app-accessibility/espeak/ChangeLog
@@ -1,6 +1,9 @@
 # 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.83 2010/02/10 16:02:15 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/ChangeLog,v 1.84 2010/02/11 23:16:16 abcd Exp $
+
+  11 Feb 2010; Jonathan Callen <abcd@gentoo.org> espeak-1.42.04.ebuild:
+  Add prefix support, ~amd64-linux/~x86-linux keywords
 
   10 Feb 2010; Joseph Jezak <josejx@gentoo.org> espeak-1.42.04.ebuild:
   Marked ppc stable for bug #301793.
diff --git a/app-accessibility/espeak/Manifest b/app-accessibility/espeak/Manifest
index 6c5afb066e59..ef3eeeeb75aa 100644
--- a/app-accessibility/espeak/Manifest
+++ b/app-accessibility/espeak/Manifest
@@ -6,13 +6,13 @@ DIST espeak-1.41.01-source.zip 1476908 RMD160 bb95144e78c57aa4607be927ea68328029
 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 1965 RMD160 11075fa295666e71f64bd4fb38d33804a642859a SHA1 a139633195464128094d2aafb6a6c2cfb3ef9409 SHA256 ab811ee5ecb3e127355cb9a43a68b87f8142601c6db7294035191fea629f9879
-MISC ChangeLog 11034 RMD160 b91d4bacdfe0b0ca46c849534e163d87d214761d SHA1 60c5751bb2d89edf041bcd12bad2282aabfdbb8f SHA256 c65a9ffc845e24d62266c4944d2de13d37c8a6c6287a68b38dc06aa49368bf92
+EBUILD espeak-1.42.04.ebuild 2090 RMD160 c74d936e8dcb298f44402fe008676c4a0fb04c97 SHA1 03ee80887bd8ef89a2d6d2fa6a6e61532658be30 SHA256 dbc512a17194dcc0f142a6623a26b6f728f94d4a72e9cd9d5831126a392ff23c
+MISC ChangeLog 11160 RMD160 9a2017437bd961afe3dcca9abd14cef82692f6ef SHA1 40c6818c421f553ea978a2be0bdcb71ba422949b SHA256 916898560a64c553dcee0faf69358fb51e7dc040a3987b0ee1ec26ebf1687a00
 MISC metadata.xml 229 RMD160 7f8d6a0235529eccff705022803122c9534628d7 SHA1 2295356b566d60c8eb979db0e598de9d1d8ccf49 SHA256 b128d301356b3f98f1d6093b4401c36143ff55fc62636612567b0995739b9e66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkty2FoACgkQcsIHjyDViGQq7gCgw99BFDTAwT3UZFtGUflcLC5/
-QQkAn0mR+JjJz7lgKnf0M8FuUUhEuvD3
-=r3m3
+iEYEARECAAYFAkt0j8oACgkQOypDUo0oQOq+wwCfVbRqSIcEw7Q2t8kf595NWAgi
+djUAn0lamk6USv0l+prQ1hWbsQp2Y/5Y
+=bCsX
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/espeak/espeak-1.42.04.ebuild b/app-accessibility/espeak/espeak-1.42.04.ebuild
index 4f5d727a0474..7806132cdfa5 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.5 2010/02/10 16:02:15 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/espeak-1.42.04.ebuild,v 1.6 2010/02/11 23:16:16 abcd 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"
+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}
+DEPEND="${RDEPEND}
 	app-arch/unzip"
 
 S=${WORKDIR}/${MY_P}
@@ -57,8 +57,10 @@ src_prepare() {
 }
 
 src_compile() {
+	use prefix || EPREFIX=
+
 	cd src
-	emake AUDIO="$(get_audio)" CXXFLAGS="${CXXFLAGS}" all || die "Compilation failed"
+	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"
@@ -68,8 +70,10 @@ src_compile() {
 }
 
 src_install() {
+	use prefix || EPREFIX=
+
 	cd src
-	make DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" AUDIO="$(get_audio)" install || die "Installation failed"
+	make DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="\$(PREFIX)/$(get_libdir)" AUDIO="$(get_audio)" install || die "Installation failed"
 
 	cd ..
 	insinto /usr/share/espeak-data
diff --git a/app-accessibility/speech-dispatcher/Manifest b/app-accessibility/speech-dispatcher/Manifest
index 09090eb22d6a..2be8fc8565d7 100644
--- a/app-accessibility/speech-dispatcher/Manifest
+++ b/app-accessibility/speech-dispatcher/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX speech-dispatcher 670 RMD160 ed69fcbfad2cd63dd41b6ef6077eea6aede14483 SHA1 029059d50e6b0b55120d1bb393abec33fca181c4 SHA256 754aa3810c448804b1693036a46c31375165d7d37abd654a23b85c18c9d78adb
 AUX speech-dispatcher-0.6.6-festival-fix-formats.patch 649 RMD160 b0a6b499fcff625076b6a487ce140cc93f85ce8b SHA1 543edd3935539be4e3434015e42ac0a6d7ccb500 SHA256 b4c6e0a8af70001e234086d9494a32a3d76f53f642cf163f722454cf5ae2a575
 DIST speech-dispatcher-0.6.5.tar.gz 1025229 RMD160 0f7cfd00c24e01b83ae6d51594bca965a7aaca62 SHA1 5f2cd4964bf96e49e41bc6fe908f8f482f9ea0e7 SHA256 e57a42094002c39a733b66198d4fcb869845614842f02275c2984e29c4d9654d
@@ -7,6 +10,13 @@ DIST speech-dispatcher-0.6.7.tar.gz 1186677 RMD160 8527d83927c7827e67c91938a28a1
 EBUILD speech-dispatcher-0.6.5.ebuild 1527 RMD160 48d556189049167d5371ad629860b6fb9a0aa10a SHA1 030ffcd7558552f04c03f566b3db0ea2e8a9c567 SHA256 e91c3ca2ce625257b6c27001ccc3de4e5a3bfe4071c5be128cea5f3dcff41e06
 EBUILD speech-dispatcher-0.6.6-r1.ebuild 1585 RMD160 1c1f331ffc8a3b864b90ef793f7f0d4bb40d80e4 SHA1 a102bfbfc6f4760bb7ab4044d5586ec74f98abfc SHA256 bac2b8ecf7e79831cb1b4a427af580b40b0aa8b483c8c5bf97fe8912af86918a
 EBUILD speech-dispatcher-0.6.6.ebuild 1522 RMD160 18db70181df317fecb75aaa3421aa81afc5b1a86 SHA1 81ccf637a6a7ad488420b20e8fdf5a6892044685 SHA256 bf426e7e1f0f2a5a0b4ace32b276faa87d8a2b74e0ac98ce5e9b471b2e60f7c7
-EBUILD speech-dispatcher-0.6.7.ebuild 1868 RMD160 b279b03bfced827074857c918e3fc51dfce526d8 SHA1 ab20fe89d2c883a21b57dd9de34b1ccb65df176d SHA256 0f3d942bec2daea03de0e513ffa26b4e8731cdeb3853c57f220744c9bc7d750f
-MISC ChangeLog 9596 RMD160 c03d8ea8b3367acdba451e5e2530989afec441ff SHA1 b4846dbeae401655880370bc83a6b05d3ea9872c SHA256 81fdeb135baf7dfd05a1a4b29c120767d608da5f9a9f9a4324605c4ff1013e5f
+EBUILD speech-dispatcher-0.6.7.ebuild 1927 RMD160 880eca7452f41ad3642477e6bd7b56aa431c6678 SHA1 276a96b5ff2defde60f5ce9a0477f184411b0741 SHA256 e50a725cb7058b4773be9d76c3e60d33f266b68e3e7ad99f98c8e6d63a10ac2c
+MISC ChangeLog 9716 RMD160 17c2ea61aa5ca1f72474c6aa37ddf2eb26a0b81a SHA1 d0b71f02e8f1cf7e8c43a542a29df77c77f478ab SHA256 86cc51d85a54558e50f1dd5773baf1018a65c38c3d94359d4a5593fb14a6318d
 MISC metadata.xml 391 RMD160 470dc37d4b091c32417820c9e60dd4a8646423c2 SHA1 b7f5b0ecdd4f5f6799676d34a56703bf924cf1a2 SHA256 189a78287c14ae09d0badf2a576e0d4830d0d55c1b6d343b378cf2f77d7f73f7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkt0kMwACgkQOypDUo0oQOpjqgCgq976FXhVhJ7dgOrRNnk3PxCt
+cZoAn2FFz5x+FlhRQk/zZ2HBwJ1BdLOC
+=1Bad
+-----END PGP SIGNATURE-----