Updated Manifest wrt bug #435518. Removed keyworded versions.

(Portage version: 2.2.0_alpha125/cvs/Linux i686)

4 files changed, 6 insertions, 326 deletions

diff --git a/app-accessibility/festival/ChangeLog b/app-accessibility/festival/ChangeLog
index 3a397ef8bec3..ca171a31f260 100644
--- a/app-accessibility/festival/ChangeLog
+++ b/app-accessibility/festival/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-accessibility/festival
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/ChangeLog,v 1.105 2012/05/31 02:14:16 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/ChangeLog,v 1.106 2012/09/20 19:58:15 neurogeek Exp $
+
+  20 Sep 2012; Jesus Rivero <neurogeek@gentoo.org>
+  -festival-1.96_beta-r1.ebuild, -festival-2.0.95_beta.ebuild,
+  -files/festival-2.0.95_beta-init-scm.patch:
+  Updated Manifest wrt bug #435518. Removed keyworded versions.
 
   31 May 2012; Zac Medico <zmedico@gentoo.org> festival-1.96_beta-r1.ebuild,
   festival-1.96_beta.ebuild, festival-2.0.95_beta.ebuild, festival-2.1.ebuild:
diff --git a/app-accessibility/festival/festival-1.96_beta-r1.ebuild b/app-accessibility/festival/festival-1.96_beta-r1.ebuild
deleted file mode 100644
index b825de95b676..000000000000
--- a/app-accessibility/festival/festival-1.96_beta-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-1.96_beta-r1.ebuild,v 1.10 2012/05/31 02:14:16 zmedico Exp $
-
-inherit eutils multilib toolchain-funcs user
-
-DESCRIPTION="Festival Text to Speech engine"
-HOMEPAGE="http://www.cstr.ed.ac.uk/projects/festival/"
-SITE="http://www.festvox.org/packed/festival/1.96"
-MY_P=${PN}-1.96-beta
-SRC_URI="${SITE}/${MY_P}.tar.gz
-	${SITE}/festlex_CMU.tar.gz
-	${SITE}/festlex_OALD.tar.gz
-	${SITE}/festlex_POSLEX.tar.gz
-	${SITE}/festvox_cmu_us_awb_arctic_hts.tar.gz
-	${SITE}/festvox_cmu_us_bdl_arctic_hts.tar.gz
-	${SITE}/festvox_cmu_us_jmk_arctic_hts.tar.gz
-	${SITE}/festvox_cmu_us_slt_arctic_hts.tar.gz
-	${SITE}/festvox_kallpc16k.tar.gz
-	${SITE}/festvox_kedlpc16k.tar.gz
-	${SITE}/speech_tools-1.2.96-beta.tar.gz
-	mbrola? (
-		${SITE}/festvox_us1.tar.gz
-		${SITE}/festvox_us2.tar.gz
-		${SITE}/festvox_us3.tar.gz )"
-LICENSE="FESTIVAL BSD as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="alsa mbrola"
-
-SP_DEPEND="~app-accessibility/speech-tools-1.2.96_beta"
-
-DEPEND="${SP_DEPEND}
-	alsa? ( media-sound/alsa-utils )"
-RDEPEND="${SP_DEPEND}
-	mbrola? ( <=app-accessibility/mbrola-3.0.1h-r5 )"
-
-S=${WORKDIR}/festival
-
-pkg_setup() {
-	enewuser festival -1 -1 -1 audio
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# tell festival to use the speech-tools we have installed.
-	sed -i -e "s:\(EST=\).*:\1/usr/share/speech-tools:" "${S}"/config/config.in
-	sed -i -e "s:\$(EST)/lib:/usr/$(get_libdir):" "${S}"/config/project.mak
-
-	# fix the reference  to /usr/lib/festival
-	sed -i -e "s:\(FTLIBDIR.*=.*\)\$.*:\1/usr/share/festival:" "${S}"/config/project.mak
-
-	# Fix path for examples in festival.scm
-	sed -i -e "s:\.\./examples/:/usr/share/doc/${PF}/examples/:" "${S}"/lib/festival.scm
-
-	# Fix the HTS voices.
-	epatch "${FILESDIR}"/${P}-hts-voices.patch
-
-	# patch init.scm to look for siteinit.scm and sitevars.scm in /etc/festival
-	epatch "${FILESDIR}"/${P}-init-scm.patch
-
-	# Apply patches for gcc4.3.
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-	epatch "${FILESDIR}"/speech-tools-1.2.96_beta-gcc43-include.patch
-
-	# copy what we need for MultiSyn from speech_tools.
-	cp -pr "${WORKDIR}"/speech_tools/base_class "${S}"/src/modules/MultiSyn
-
-	if use alsa; then
-		echo "(Parameter.set 'Audio_Command \"aplay -q -c 1 -t raw -f s16 -r \$SR \$FILE\")" >> ${S}/lib/siteinit.scm
-		echo "(Parameter.set 'Audio_Method 'Audio_Command)" >> ${S}/lib/siteinit.scm
-	fi
-}
-
-src_compile() {
-	econf || die
-	emake -j1 PROJECT_LIBDEPS="" REQUIRED_LIBDEPS="" LOCAL_LIBDEPS="" OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
-}
-
-src_install() {
-	# Install the binaries
-	dobin src/main/festival
-	dobin lib/etc/*Linux*/audsp
-	dolib.a src/lib/libFestival.a
-
-	# Install the main libraries
-	insinto /usr/share/festival
-	doins -r lib/*
-
-	# Install the examples
-	insinto /usr/share/doc/${PF}
-	doins -r examples
-
-	# Need to fix saytime, etc. to look for festival in the correct spot
-	for ex in "${D}"/usr/share/doc/${PF}/examples/*.sh; do
-		exnoext=${ex%%.sh}
-		chmod a+x "${exnoext}"
-		dosed "s:${S}/bin/festival:/usr/bin/festival:" "${exnoext##$D}"
-	done
-
-	# Install the header files
-	insinto /usr/include/festival
-	doins src/include/*.h
-
-	insinto /etc/festival
-	# Sample server.scm configuration for the server
-	doins "${FILESDIR}"/server.scm
-	doins lib/site*
-
-	# Install the init script
-	newinitd "${FILESDIR}"/festival.rc festival
-
-	# Install the docs
-	dodoc "${S}"/{ACKNOWLEDGMENTS,NEWS,README}
-	doman "${S}"/doc/{festival.1,festival_client.1}
-
-	# create the directory where our log file will go.
-	diropts -m 0755 -o festival -g audio
-	keepdir /var/log/festival
-
-	use mbrola && mbrola_voices
-}
-
-pkg_postinst() {
-	elog
-	elog "    Useful examples include saytime, text2wave. For example, try:"
-	elog "        \"/usr/share/doc/${PF}/examples/saytime\""
-	elog
-	elog "    Or for something more fun:"
-	elog '        "echo "Gentoo can speak" | festival --tts"'
-	elog
-	elog "    To enable the festival server at boot, run"
-	elog "       rc-update add festival default"
-	elog
-	elog "    You must setup the server's port, access list, etc in this file:"
-	elog "       /etc/festival/server.scm"
-	elog
-	elog "This version also allows configuration of site specific"
-	elog "initialization in /etc/festival/siteinit.scm and"
-	elog "variables in /etc/festival/sitevars.scm."
-	elog
-}
-
-# Fix mbrola databases: create symbolic links from festival voices
-# directories to MBROLA install dirs.
-mbrola_voices() {
-
-	# This is in case there is no mbrola voice for a particular language.
-	local shopts=$(shopt -p nullglob)
-	shopt -s nullglob
-
-	# This assumes all mbrola voices are named after the voices defined
-	# in MBROLA, i.e. if MBROLA contains a voice fr1, then the Festival
-	# counterpart should be named fr1_mbrola.
-	for language in "${S}"/lib/voices/*; do
-		for mvoice in ${language}/*_mbrola; do
-			voice=${mvoice##*/}
-			database=${voice%%_mbrola}
-			dosym /opt/mbrola/${database} /usr/share/festival/voices/${language##*/}/${voice}/${database}
-		done
-	done
-
-	# Restore shopts
-	${shopts}
-}
diff --git a/app-accessibility/festival/festival-2.0.95_beta.ebuild b/app-accessibility/festival/festival-2.0.95_beta.ebuild
deleted file mode 100644
index 28a404a8f82b..000000000000
--- a/app-accessibility/festival/festival-2.0.95_beta.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-2.0.95_beta.ebuild,v 1.5 2012/05/31 02:14:16 zmedico Exp $
-
-EAPI="2"
-inherit eutils multilib toolchain-funcs user
-
-MY_PV=${PV/_beta/-beta}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Festival Text to Speech engine"
-HOMEPAGE="http://www.cstr.ed.ac.uk/projects/festival/"
-SITE="http://www.festvox.org/packed/${PN}/${MY_PV%-beta}"
-SRC_URI="${SITE}/${MY_P}.tar.gz
-	${SITE}/festlex_CMU.tar.gz
-	${SITE}/festlex_OALD.tar.gz
-	${SITE}/festlex_POSLEX.tar.gz
-	${SITE}/festvox_cmu_us_awb_cg.tar.gz
-	${SITE}/festvox_cmu_us_rms_cg.tar.gz
-	${SITE}/festvox_cmu_us_slt_arctic_hts.tar.gz
-	${SITE}/festvox_rablpc16k.tar.gz
-	${SITE}/festvox_kallpc16k.tar.gz
-	${SITE}/speech_tools-${MY_PV}.tar.gz"
-
-LICENSE="FESTIVAL BSD as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="alsa"
-
-SP_DEPEND="~app-accessibility/speech-tools-2.0.95_beta"
-
-DEPEND="${SP_DEPEND}
-	alsa? ( media-sound/alsa-utils )"
-RDEPEND="${SP_DEPEND}"
-
-S=${WORKDIR}/festival
-
-pkg_setup() {
-	enewuser festival -1 -1 -1 audio
-}
-
-src_prepare() {
-	# tell festival to use the speech-tools we have installed.
-	sed -i -e "s:\(EST=\).*:\1/usr/share/speech-tools:" "${S}"/config/config.in
-	sed -i -e "s:\$(EST)/lib:/usr/$(get_libdir):" "${S}"/config/project.mak
-
-	# fix the reference  to /usr/lib/festival
-	sed -i -e "s:\(FTLIBDIR.*=.*\)\$.*:\1/usr/share/festival:" "${S}"/config/project.mak
-
-	# Fix path for examples in festival.scm
-	sed -i -e "s:\.\./examples/:/usr/share/doc/${PF}/examples/:" "${S}"/lib/festival.scm
-
-	epatch "${FILESDIR}/${P}-init-scm.patch"
-
-	# copy what we need for MultiSyn from speech_tools.
-	cp -pr "${WORKDIR}"/speech_tools/base_class "${S}"/src/modules/MultiSyn
-
-	if use alsa; then
-		echo "(Parameter.set 'Audio_Command \"aplay -q -c 1 -t raw -f s16 -r \$SR \$FILE\")" >> "${S}"/lib/siteinit.scm
-		echo "(Parameter.set 'Audio_Method 'Audio_Command)" >> "${S}"/lib/siteinit.scm
-	fi
-}
-
-src_configure() {
-	econf || die "econf failed"
-}
-
-src_compile() {
-	emake -j1 PROJECT_LIBDEPS="" REQUIRED_LIBDEPS="" LOCAL_LIBDEPS="" \
-		OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die "emake failed"
-}
-
-src_install() {
-	# Install the binaries
-	dobin src/main/festival
-	dobin lib/etc/*Linux*/audsp
-	dolib.a src/lib/libFestival.a
-
-	# Install the main libraries
-	insinto /usr/share/festival
-	doins -r lib/*
-
-	# Install the examples
-	insinto /usr/share/doc/${PF}
-	doins -r examples
-
-	# Need to fix saytime, etc. to look for festival in the correct spot
-	for ex in "${D}"/usr/share/doc/${PF}/examples/*.sh; do
-		exnoext=${ex%%.sh}
-		chmod a+x "${exnoext}"
-		dosed "s:${S}/bin/festival:/usr/bin/festival:" "${exnoext##$D}"
-	done
-
-	# Install the header files
-	insinto /usr/include/festival
-	doins src/include/*.h
-
-	insinto /etc/festival
-	# Sample server.scm configuration for the server
-	doins "${FILESDIR}"/server.scm
-	doins lib/site*
-
-	# Install the init script
-	newinitd "${FILESDIR}"/festival.rc festival
-
-	# Install the docs
-	dodoc "${S}"/{ACKNOWLEDGMENTS,NEWS,README}
-	doman "${S}"/doc/{festival.1,festival_client.1}
-
-	# create the directory where our log file will go.
-	diropts -m 0755 -o festival -g audio
-	keepdir /var/log/festival
-
-}
-
-pkg_postinst() {
-	elog
-	elog "    Useful examples include saytime, text2wave. For example, try:"
-	elog "        \"/usr/share/doc/${PF}/examples/saytime\""
-	elog
-	elog "    Or for something more fun:"
-	elog '        "echo "Gentoo can speak" | festival --tts"'
-	elog
-	elog "    To enable the festival server at boot, run"
-	elog "       rc-update add festival default"
-	elog
-	elog "    You must setup the server's port, access list, etc in this file:"
-	elog "       /etc/festival/server.scm"
-	elog
-	elog "This version also allows configuration of site specific"
-	elog "initialization in /etc/festival/siteinit.scm and"
-	elog "variables in /etc/festival/sitevars.scm."
-	elog
-}
diff --git a/app-accessibility/festival/files/festival-2.0.95_beta-init-scm.patch b/app-accessibility/festival/files/festival-2.0.95_beta-init-scm.patch
deleted file mode 100644
index efe575b0c2b7..000000000000
--- a/app-accessibility/festival/files/festival-2.0.95_beta-init-scm.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- festival/lib/init.scm	2006-09-15 01:34:32.000000000 -0500
-+++ festival/lib/init.scm	2006-09-15 01:50:30.000000000 -0500
-@@ -52,8 +52,8 @@
- 
- ;;;  A chance to set various variables to a local setting e.g.
- ;;;  lexdir, voices_dir audio etc etc.
--(if (probe_file (path-append libdir "sitevars.scm"))
--    (load (path-append libdir "sitevars.scm")))
-+(if (probe_file "/etc/festival/sitevars.scm")
-+    (load "/etc/festival/sitevars.scm"))
- 
- ;;; CSTR siod extensions
- (require 'cstr)
-@@ -133,8 +133,8 @@
- ;;;
- ;;;  Local site initialization, if the file exists load it
- ;;;
--(if (probe_file (path-append libdir "siteinit.scm"))
--    (load (path-append libdir "siteinit.scm")))
-+(if (probe_file "/etc/festival/siteinit.scm")
-+    (load "/etc/festival/siteinit.scm"))
- 
- ;;;  User initialization, if a user has a personal customization
- ;;;  file loaded it