Remove USE="esd" because media-sound/esound isn't in tree anymore.

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

6 files changed, 36 insertions, 51 deletions

diff --git a/app-accessibility/speech-tools/ChangeLog b/app-accessibility/speech-tools/ChangeLog
index b9b18ab8596c..dacaaaa72a01 100644
--- a/app-accessibility/speech-tools/ChangeLog
+++ b/app-accessibility/speech-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-accessibility/speech-tools
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 1.79 2011/12/29 22:06:51 halcy0n Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 1.80 2012/03/18 13:43:36 ssuominen Exp $
+
+  18 Mar 2012; Samuli Suominen <ssuominen@gentoo.org>
+  speech-tools-1.2.96_beta.ebuild, speech-tools-1.2.96_beta-r2.ebuild,
+  speech-tools-2.0.95_beta.ebuild, speech-tools-2.1-r1.ebuild:
+  Remove USE="esd" because media-sound/esound isn't in tree anymore.
 
   29 Dec 2011; Mark Loeser <halcy0n@gentoo.org> speech-tools-2.1-r1.ebuild:
   Stable for ppc/ppc64; bug #380773
diff --git a/app-accessibility/speech-tools/Manifest b/app-accessibility/speech-tools/Manifest
index 464f6e1d0806..829151f8543d 100644
--- a/app-accessibility/speech-tools/Manifest
+++ b/app-accessibility/speech-tools/Manifest
@@ -10,26 +10,20 @@ DIST speech_tools-2.0.95-beta-patches.tar.gz 5773 RMD160 2b781434bae545425af4a2e
 DIST speech_tools-2.0.95-beta.tar.gz 1681824 RMD160 ccb1f249924885c0b0c831bb0bc0c9f6a7279fbb SHA1 d3f13f0f66f763e80c73eb26f07b86572944ba2a SHA256 61f6786468872aeb2ba0db3ba8c42dd23dfba95467b9fb30cc4f3d92a956b554
 DIST speech_tools-2.1-patches.tar.gz 5688 RMD160 9d5e1d9f4b267aac9230251a0a30b32b4264a278 SHA1 f062f95fe7431296948bbea9ec1f665d3027a971 SHA256 4b1a3579a39fe78e4d524e69c2199f19509ff9d15f8e74c1ea8c6865efc23f65
 DIST speech_tools-2.1-release.tar.gz 1681999 RMD160 59831fbe607f05308f339a3cfb3af53d7337328b SHA1 bbf43b259de8bb91e0c5e8a1defc6e45a10e60f9 SHA256 ff6167cd929a88e2f91b47191c6c4dae87c9c06ba39fccc4465af9d79e9b2be9
-EBUILD speech-tools-1.2.96_beta-r2.ebuild 3062 RMD160 4aef36d48a788889b71d76edb13cefcbf478b647 SHA1 82a74fe507a39b2d307d73fa4694e3238261ca30 SHA256 5814021c5378e4193f5a6cf3aad56f4c84c2ec41e9acb9c95bf175b0e005adfc
-EBUILD speech-tools-1.2.96_beta.ebuild 2801 RMD160 4d69f662118f44891e82e5a1d9baae38b3b074aa SHA1 4e366f2228e6892b370d5444913c5fd527e7c567 SHA256 9f87ae7a32433603744490de14c1bba8ae2fd2289d779a9b47e6eccc98caa297
-EBUILD speech-tools-2.0.95_beta.ebuild 3034 RMD160 25af5a043a4f27ff7e3f7c566ab09ea465620eb1 SHA1 9f8b4f868f1cd2fd8f2e7b337bc03b7dfef839e1 SHA256 52deae4b24c6eac0cfaacb280a5955157dbd1abf42328d00dc7eac329c8377e6
-EBUILD speech-tools-2.1-r1.ebuild 2764 RMD160 1aac4493b5d8fe6bd3b41b98dccd7a2f4761984d SHA1 79967cef5f36c5c4a84484125df789c284b5280f SHA256 8b0e9e5c73144c533b612974fb894b28c0860bd14e01cb960b0950a8f5d05b13
-MISC ChangeLog 12731 RMD160 6e7846e6003af08523960da071b6aef68a9dc60c SHA1 de9dd88ebdb9d1abff8225ce315b04f076ad79c5 SHA256 7edcd4c4987e4547aee7d2c39cf25936e937c06f8fc2ab7662e236de35c204df
+EBUILD speech-tools-1.2.96_beta-r2.ebuild 2941 RMD160 4d3d3b757add172d9f41adc95c4276c2ae53b340 SHA1 3cf82d6d7aad4aaeec943910a1f60e401c445558 SHA256 0a2ad6dc9ae769f47072317501635c62e6d2655d8e0341e9b51b6c2d62a2f1da
+EBUILD speech-tools-1.2.96_beta.ebuild 2692 RMD160 5ba82120db2f9091ab8208b4ecbabebc9947fb33 SHA1 ec35e97d89aa577fed2ae55e73958b279523bab2 SHA256 64b8239300aa5bdd05a1fdc24b26c7689837a70c2200c5456dfcd06d1df4440c
+EBUILD speech-tools-2.0.95_beta.ebuild 2913 RMD160 f4a6af349d10020b84c7db7523be813b6218e2a8 SHA1 9ef58cc8b58c05e9279e585cd12aa59a343b6c84 SHA256 9066946a5c75f1e9bb5494ce44d12e2540e1520344e472e6b21a4bbea69fdb61
+EBUILD speech-tools-2.1-r1.ebuild 2645 RMD160 438d81312c3b983307445cf49fc68fdbd70e7c0b SHA1 7526ca37fb53a5320fc907e39edd3edf75782bff SHA256 995eec2daec8c1810c4a6eed83e5df076fea89b5276000a07bed6ee369faeda5
+MISC ChangeLog 12991 RMD160 869c388d049ac09aba27a869fdb7c7bd1ecdb7bb SHA1 2881a5b72c3decaeabc2b261d9d55cfe089f468b SHA256 f4bfed8f5ad4daf5ac1d8077ae998628a7903444191c5af0207e8faca344d12c
 MISC metadata.xml 249 RMD160 b4704f1b46f70badf05ac1549e9feaf260041a08 SHA1 901e48e020cb6dcb722212410e1ac34212e87cf0 SHA256 7bce1abcec735751c95b28394f348e421b525ead1ba86638fc5f884217cdb49a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJO/OSBAAoJEPTTRK0uRVaN9ywP/2VZXHApg4pz5SHT/9fjh5EE
-Z5hXN2ATrKcC1TIuFNqJzYO1kjXvmd4sH46sSDoFgL6mZIsXTCE7O1UiUdA6oTwm
-+rFiMhT03OfsZw5tIzkOVzvrUcLd5e2hjNxLCEHi+7GnZtb2Z9kbLZIx3d5Iwazi
-5qKnskC+ejGh6DPKPdHYjekwwg2evcR0GIHm3b/OiqIvqAKA6WoIV+xDgbjz//t/
-qnK10uAR0rCMUGCviVRrY1eHtpqT7a1cxFrdEOjC4xeIQOcL1cHvUkP93+q1RIJ9
-y6qoxhtusKRG7Fes2Lz6pQ0xYJq8as53v6wnQu9SQPWE5bcWRwvw8Ym4Y8RKtU7r
-EFj63/BTKq3jn7YUVPiNyLEpTyJfbeYqeePwguL9idheoQZgDZ4ApQzKfBOuTJZn
-60mNjWz7MVxCoSTpeB3kAItNIWDjLA4artm5lpVyl0L0NidKVJN3OdDykQPn95ci
-glnEOQHjUkpuFpgp2aL1D9Ieub2cj10DBWVVNs7uW/wSnN7nP8ntVwdLs3XFN06F
-V4hrlXF373bcatFZRtiRChRr7rFXofUsx+ImjHK+kYTictf68TNeUQR8KeG5GW+f
-A4cKJUcyHEC3CoFBW29GAaop5BgHg2xo2+J3Vh9XoymdTvOk2qc/w7ZiAs/mubXd
-73EMfri5JqfuP9/O23WH
-=H6Ue
+iQEcBAEBAgAGBQJPZeZ7AAoJEEdUh39IaPFN3IMH/it/5xZfSnaJ9iSYPBG0I4NT
+hYltHJrB1f0IRpByQYQVwBsy8eCdjX8TshtlxxrA5GFS/3u9rTYcmgqHUohOF4b/
+7gLF2TWnnhf/8GlWBaxiL8ISaEH5eOQT+k+fh3wMewwl28Y0oUvDRt8Fo3MOiHJV
+Sb+t4T0y2IxYXgk6rejRQeguujh8H/mu+DStQWNLlFS0lB/88afFWbUkz55Q9lkc
+wbk61XUrnRnjIqn6ndbBu/xQUrdM6s4yDNyGLGJgyDZaurBu3nmjTCd/6Rj7yWf+
+g+MfJ44DmnyKXaK7v87PsFaCmdRJKLeuY0yv4T40PAgfYQ+s7QDA7GayLo58Qi0=
+=1VEI
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.ebuild b/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.ebuild
index 7aaef3d445b6..f82855fbd0b9 100644
--- a/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.ebuild,v 1.3 2010/07/01 12:39:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.ebuild,v 1.4 2012/03/18 13:43:36 ssuominen Exp $
 
 EAPI="2"
 
@@ -16,10 +16,9 @@ SRC_URI="http://www.festvox.org/packed/festival/1.96/${MY_P}.tar.gz
 LICENSE="FESTIVAL BSD as-is"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="esd nas X"
+IUSE="nas X"
 
-DEPEND="esd? ( media-sound/esound )
-	nas? ( media-libs/nas )
+DEPEND="nas? ( media-libs/nas )
 	X? ( x11-libs/libX11
 		x11-libs/libXt )
 	!<app-accessibility/festival-1.96_beta
@@ -36,9 +35,6 @@ src_prepare() {
 src_configure() {
 	local CONFIG=config/config.in
 	sed -i -e 's/@COMPILERTYPE@/gcc42/' ${CONFIG}
-	if use esd; then
-		sed -i -e "s/#.*\(INCLUDE_MODULES += ESD_AUDIO\)/\1/" ${CONFIG}
-	fi
 	if use nas; then
 		sed -i -e "s/#.*\(INCLUDE_MODULES += NAS_AUDIO\)/\1/" ${CONFIG}
 	fi
diff --git a/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild b/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild
index b7205e637b37..61aa6fde53b6 100644
--- a/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild,v 1.14 2009/07/23 16:49:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild,v 1.15 2012/03/18 13:43:36 ssuominen Exp $
 
 inherit eutils toolchain-funcs
 
@@ -13,10 +13,9 @@ SRC_URI="http://www.festvox.org/packed/festival/latest/${MY_P}.tar.gz"
 LICENSE="FESTIVAL BSD as-is"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="esd nas X"
+IUSE="nas X"
 
-RDEPEND="esd? ( media-sound/esound )
-	nas? ( media-libs/nas )
+RDEPEND="nas? ( media-libs/nas )
 	X? ( x11-libs/libX11
 		x11-libs/libXt )
 	!<app-accessibility/festival-1.96_beta
@@ -39,7 +38,6 @@ src_unpack() {
 	# enable building shared libraries
 	sed -i -e "s/#.*\(SHARED=2\)/\1/" ${CONFIG}
 
-	use esd && sed -i -e "s/#.*\(INCLUDE_MODULES += ESD_AUDIO\)/\1/" ${CONFIG}
 	use nas && sed -i -e "s/#.*\(INCLUDE_MODULES += NAS_AUDIO\)/\1/" ${CONFIG}
 	use X || sed -i -e "s/-lX11 -lXt//" "${S}"/config/modules/esd_audio.mak
 }
diff --git a/app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild b/app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild
index 93796a07ec1d..d7be1c4c0432 100644
--- a/app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild,v 1.3 2010/07/14 00:08:37 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild,v 1.4 2012/03/18 13:43:36 ssuominen Exp $
 
 EAPI="2"
 
@@ -16,10 +16,9 @@ SRC_URI="http://www.festvox.org/packed/festival/${PV%_beta}/${MY_P}.tar.gz
 LICENSE="FESTIVAL BSD as-is"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="esd nas X"
+IUSE="nas X"
 
-DEPEND="esd? ( media-sound/esound )
-	nas? ( media-libs/nas )
+DEPEND="nas? ( media-libs/nas )
 	X? ( x11-libs/libX11
 		x11-libs/libXt )
 	!<app-accessibility/festival-1.96_beta
@@ -36,9 +35,6 @@ src_prepare() {
 src_configure() {
 	local CONFIG=config/config.in
 	sed -i -e 's/@COMPILERTYPE@/gcc42/' ${CONFIG}
-	if use esd; then
-		sed -i -e "s/#.*\(INCLUDE_MODULES += ESD_AUDIO\)/\1/" ${CONFIG}
-	fi
 	if use nas; then
 		sed -i -e "s/#.*\(INCLUDE_MODULES += NAS_AUDIO\)/\1/" ${CONFIG}
 	fi
diff --git a/app-accessibility/speech-tools/speech-tools-2.1-r1.ebuild b/app-accessibility/speech-tools/speech-tools-2.1-r1.ebuild
index bc56762eef7a..2cf2faaef448 100644
--- a/app-accessibility/speech-tools/speech-tools-2.1-r1.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-2.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.1-r1.ebuild,v 1.7 2011/12/29 22:06:51 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.1-r1.ebuild,v 1.8 2012/03/18 13:43:36 ssuominen Exp $
 
 EAPI="2"
 
@@ -16,10 +16,9 @@ SRC_URI="http://www.festvox.org/packed/festival/${PV}/${MY_P}-release.tar.gz
 LICENSE="FESTIVAL BSD as-is"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="esd nas X"
+IUSE="nas X"
 
-DEPEND="esd? ( media-sound/esound )
-	nas? ( media-libs/nas )
+DEPEND="nas? ( media-libs/nas )
 	X? ( x11-libs/libX11
 		x11-libs/libXt )
 	>=media-libs/alsa-lib-1.0.20-r1
@@ -43,9 +42,6 @@ src_prepare() {
 src_configure() {
 	local CONFIG=config/config.in
 	sed -i -e 's/@COMPILERTYPE@/gcc42/' ${CONFIG}
-	if use esd; then
-		sed -i -e "s/#.*\(INCLUDE_MODULES += ESD_AUDIO\)/\1/" ${CONFIG}
-	fi
 	if use nas; then
 		sed -i -e "s/#.*\(INCLUDE_MODULES += NAS_AUDIO\)/\1/" ${CONFIG}
 	fi