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

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

5 files changed, 23 insertions, 32 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/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