version bump and remove old version

Package-Manager: portage-2.2_rc88/cvs/Linux i686

4 files changed, 83 insertions, 63 deletions

diff --git a/app-accessibility/speech-dispatcher/ChangeLog b/app-accessibility/speech-dispatcher/ChangeLog
index 8a9631d1ba1a..baba4fe8b725 100644
--- a/app-accessibility/speech-dispatcher/ChangeLog
+++ b/app-accessibility/speech-dispatcher/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-accessibility/speech-dispatcher
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/ChangeLog,v 1.68 2010/07/20 18:31:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/ChangeLog,v 1.69 2010/10/05 21:11:18 williamh Exp $
+
+*speech-dispatcher-0.7.1 (05 Oct 2010)
+
+  05 Oct 2010; William Hubbs <williamh@gentoo.org>
+  -speech-dispatcher-0.6.6.ebuild, +speech-dispatcher-0.7.1.ebuild:
+  version bump and removed old version
 
   20 Jul 2010; Jeroen Roovers <jer@gentoo.org>
   speech-dispatcher-0.6.7.ebuild:
diff --git a/app-accessibility/speech-dispatcher/Manifest b/app-accessibility/speech-dispatcher/Manifest
index a469e4c866c2..b553063e765c 100644
--- a/app-accessibility/speech-dispatcher/Manifest
+++ b/app-accessibility/speech-dispatcher/Manifest
@@ -1,9 +1,9 @@
 AUX speech-dispatcher 670 RMD160 ed69fcbfad2cd63dd41b6ef6077eea6aede14483 SHA1 029059d50e6b0b55120d1bb393abec33fca181c4 SHA256 754aa3810c448804b1693036a46c31375165d7d37abd654a23b85c18c9d78adb
-DIST speech-dispatcher-0.6.6.tar.gz 1038719 RMD160 2925de539cfb59f9eaa0095188166623bc65e15c SHA1 e78bbe8f70ffe95dbe75f99b96c8a47a563d879a SHA256 c664ee801d1bc0500ae75739fa98bcc8ad410474c98a6757d3d1ee24a8241462
 DIST speech-dispatcher-0.6.7-patches-3.tar.gz 1148 RMD160 4f7acc4f84d49baf8c98fbf083425e2e2b942875 SHA1 cee28bdc2beb948eb9e1d90fc2d7226b01eabd36 SHA256 bbf6cef610a4b072f771316666c59629e4e54fd0282a24add0903ee873b0478c
 DIST speech-dispatcher-0.6.7.tar.gz 1186677 RMD160 8527d83927c7827e67c91938a28a15084c693d99 SHA1 00fe5051930a00c2bcdf67683410beedfa066d4e SHA256 3b5c8b9df90f8e2069c92e1e0d9760c9b940aaec9994491a9e255c892e62434b
-EBUILD speech-dispatcher-0.6.6.ebuild 1531 RMD160 f82ee2a9d79b3b16e7c09c39475d8c8b0eaea493 SHA1 9f285adeae59d72fbab44bda8f926121bc562fb2 SHA256 055b39be5d59441410b3f1016208ead6eab3fa41b5507a8501052072fc82a9f3
+DIST speech-dispatcher-0.7.1.tar.gz 1144818 RMD160 13f889c25341985ce2c75787f260dc999091b1f0 SHA1 be911de1ef334fa1708a7489f9dde51b499ab265 SHA256 a8a9cf299447df4645d36c649977e007a3050ccaecb7f77e2165001ec5794a51
 EBUILD speech-dispatcher-0.6.7-r1.ebuild 1930 RMD160 c4db76e3ca0150504b27e1c3c8d4c836acc14239 SHA1 6d120e8ec80c68aa2c46eefdc7ac8be0bdebb09a SHA256 c98dd993481cdff2ae9c3217c10e94b5ffcb814e70cbf1a416e9b834ed682625
 EBUILD speech-dispatcher-0.6.7.ebuild 1893 RMD160 3e83616f71d45f8a2991c15cb59c12cbfa7165cf SHA1 a6579c165093cddfa417060e05bc8d753de5a82e SHA256 28bc97b99c07085398b00681ecebe85a390f0fa7ab345d0022be91769de04457
-MISC ChangeLog 11729 RMD160 5198da5ddd59c87788372bfcb8bbaaeec591955f SHA1 2de46c37cca04ae0dc6f8df3dbc6697942f63752 SHA256 f92e5bb1e736ed6a99abe9e18ca2f764fae00dfd7aea2aa5cbfa6c5e44da43b9
+EBUILD speech-dispatcher-0.7.1.ebuild 1993 RMD160 a42f20589fa42f0a1d3f0460ceecb2650d73c57f SHA1 658d0a3fe3b86ae85bf1ec3e8863f2d3bc79d08a SHA256 dd6d742bf3ef81238d5a9b9bfdabb709b1f2537fbbacefb66d9ff8ded003b789
+MISC ChangeLog 11933 RMD160 ec6f6e3bfe838a184f47fe16971cbde865c81e0d SHA1 32469215f3c224940aa4caf02b3194bb52ae42fe SHA256 60b447cabde9c4a07002b80eb531de345f78360a061de8e60ce84a3c93efa5ce
 MISC metadata.xml 391 RMD160 470dc37d4b091c32417820c9e60dd4a8646423c2 SHA1 b7f5b0ecdd4f5f6799676d34a56703bf924cf1a2 SHA256 189a78287c14ae09d0badf2a576e0d4830d0d55c1b6d343b378cf2f77d7f73f7
diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.6.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.6.ebuild
deleted file mode 100644
index dcfefb3f2da1..000000000000
--- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.6.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.6.ebuild,v 1.9 2010/03/03 07:34:06 williamh Exp $
-
-inherit eutils
-
-DESCRIPTION="speech-dispatcher speech synthesis interface"
-HOMEPAGE="http://www.freebsoft.org/speechd"
-SRC_URI="http://www.freebsoft.org/pub/projects/speechd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc sparc x86"
-IUSE="alsa flite nas pulseaudio python"
-
-RDEPEND="dev-libs/dotconf
-	>=dev-libs/glib-2
-	alsa? ( media-libs/alsa-lib )
-	flite? ( <app-accessibility/flite-1.4 )
-	nas? ( media-libs/nas )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( dev-lang/python )
-	app-accessibility/espeak"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	sed -i -e 's/\(SUBDIRS.*\)python/\1/' "${S}"/src/Makefile.in
-}
-
-src_compile() {
-	econf \
-	$(use_with alsa) \
-	$(use_with flite) \
-	$(use_with pulseaudio pulse) \
-	$(use_with nas) || die "configure failed"
-	make all || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	if use python; then
-		cd "${S}"/src/python
-		./setup.py install --root="${D}" --no-compile
-		cd "${S}"
-	fi
-
-	insinto /usr/include
-	doins "${S}"/src/c/api/libspeechd.h
-
-	dodoc AUTHORS ChangeLog NEWS TODO
-	newinitd "${FILESDIR}"/speech-dispatcher speech-dispatcher
-}
-
-pkg_postinst() {
-	elog "To enable Festival support, you must install app-accessibility/festival-freebsoft-utils."
-}
diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.7.1.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.7.1.ebuild
new file mode 100644
index 000000000000..e976bae630e5
--- /dev/null
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.7.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/speech-dispatcher-0.7.1.ebuild,v 1.1 2010/10/05 21:11:18 williamh Exp $
+
+EAPI="3"
+
+inherit eutils
+
+DESCRIPTION="speech-dispatcher speech synthesis interface"
+HOMEPAGE="http://www.freebsoft.org/speechd"
+SRC_URI="http://www.freebsoft.org/pub/projects/speechd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="alsa ao +espeak flite nas pulseaudio python"
+
+RDEPEND="dev-libs/dotconf
+	>=dev-libs/glib-2
+	alsa? ( media-libs/alsa-lib )
+	ao? ( media-libs/libao )
+	espeak? ( app-accessibility/espeak )
+	flite? ( app-accessibility/flite )
+	nas? ( media-libs/nas )
+	pulseaudio? ( media-sound/pulseaudio )
+	python? ( dev-lang/python )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_configure() {
+	econf \
+		$(use_enable python) \
+		$(use_with alsa) \
+		$(use_with ao libao) \
+		$(use_with espeak) \
+		$(use_with flite) \
+		$(use_with pulseaudio pulse) \
+		$(use_with nas)
+}
+
+src_compile() {
+	emake all || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS NEWS TODO
+}
+
+pkg_postinst() {
+	if ! use espeak; then
+		ewarn "You have disabled espeak, which is speech-dispatcher's"
+		ewarn "default speech synthesizer."
+		ewarn
+		editconfig="y"
+	fi
+	if ! use pulseaudio; then
+		ewarn "You have disabled pulseaudio support."
+		ewarn "pulseaudio is speech-dispatcher's default audio subsystem."
+		ewarn
+		editconfig="y"
+	fi
+	if [ -n "$editconfig" ]; then
+		ewarn "You must edit ${EROOT}etc/speech-dispatcher/speechd.conf"
+		ewarn "and make sure the settings there match your system."
+		ewarn
+	fi
+	ewarn "This version does not include a system wide startup script"
+	ewarn "since it is not intended to be run in system-wide mode."
+	ewarn
+	elog "For festival support, you need to"
+	elog "install app-accessibility/festival-freebsoft-utils."
+}