Version bump for bug #176991 and removed old versions.

(Portage version: 2.1.4)

9 files changed, 192 insertions, 73 deletions

diff --git a/app-accessibility/emacspeak/ChangeLog b/app-accessibility/emacspeak/ChangeLog
index b561ad328123..0911d7fe2b33 100644
--- a/app-accessibility/emacspeak/ChangeLog
+++ b/app-accessibility/emacspeak/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-accessibility/emacspeak
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/emacspeak/ChangeLog,v 1.24 2007/12/26 22:16:46 phreak Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/emacspeak/ChangeLog,v 1.25 2008/01/13 16:18:11 williamh Exp $
+
+*emacspeak-27.0 (13 Jan 2008)
+
+  13 Jan 2008; William Hubbs <williamh@gentoo.org>
+  +files/emacspeak-27.0-makefile.patch, +files/emacspeak-27.0-tcl84.patch,
+  -emacspeak-22.ebuild, -emacspeak-23.ebuild, +emacspeak-27.0.ebuild:
+  Version bump for bug #176991 and removed old versions..
 
   26 Dec 2007; Christian Heim <phreak@gentoo.org> emacspeak-22.ebuild,
   emacspeak-23.ebuild, emacspeak-24.ebuild, emacspeak-25.ebuild:
diff --git a/app-accessibility/emacspeak/emacspeak-22.ebuild b/app-accessibility/emacspeak/emacspeak-22.ebuild
deleted file mode 100644
index 8c8710352f04..000000000000
--- a/app-accessibility/emacspeak/emacspeak-22.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/emacspeak/emacspeak-22.ebuild,v 1.5 2007/12/26 22:16:46 phreak Exp $
-
-DESCRIPTION="the emacspeak audio desktop"
-HOMEPAGE="http://emacspeak.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-RESTRICT="mirror"
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="ppc x86"
-IUSE=""
-
-RDEPEND="virtual/emacs
-	>=dev-tcltk/tclx-8.3"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4.0.7"
-
-S=${WORKDIR}/${P}.0
-
-src_compile() {
-	make config SRC=`pwd` || die
-	make emacspeak || die
-}
-
-src_install() {
-	make \
-		prefix="${D}"/usr \
-		install || die
-	dodoc README etc/NEWS* etc/FAQ etc/COPYRIGHT
-	dohtml -r install-guide user-guide
-	sed -i -e "s@/.*image/@@" "${D}"/usr/bin/emacspeak
-}
diff --git a/app-accessibility/emacspeak/emacspeak-23.ebuild b/app-accessibility/emacspeak/emacspeak-23.ebuild
deleted file mode 100644
index 24d57c2909b8..000000000000
--- a/app-accessibility/emacspeak/emacspeak-23.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/emacspeak/emacspeak-23.ebuild,v 1.2 2007/12/26 22:16:46 phreak Exp $
-
-DESCRIPTION="the emacspeak audio desktop"
-HOMEPAGE="http://emacspeak.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.0.tar.bz2"
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE=""
-
-RDEPEND="virtual/emacs
-	>=dev-tcltk/tclx-8.3"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-S=${WORKDIR}/${P}.505
-
-src_compile() {
-	make config SRC=`pwd` || die
-	make emacspeak || die
-}
-
-src_install() {
-	make \
-		prefix="${D}"/usr \
-		install || die
-	dodoc README etc/NEWS* etc/FAQ etc/COPYRIGHT
-	dohtml -r install-guide user-guide
-	sed -i -e "s@/.*image/@@" "${D}"/usr/bin/emacspeak
-}
diff --git a/app-accessibility/emacspeak/emacspeak-27.0.ebuild b/app-accessibility/emacspeak/emacspeak-27.0.ebuild
new file mode 100644
index 000000000000..b5afb0acce6a
--- /dev/null
+++ b/app-accessibility/emacspeak/emacspeak-27.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/emacspeak/emacspeak-27.0.ebuild,v 1.1 2008/01/13 16:18:11 williamh Exp $
+
+inherit eutils
+
+DESCRIPTION="the emacspeak audio desktop"
+HOMEPAGE="http://emacspeak.sourceforge.net/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.bz2"
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE=""
+
+DEPEND=">=virtual/emacs-22"
+RDEPEND="${DEPEND}
+	>=dev-tcltk/tclx-8.4"
+
+src_unpack() {
+	unpack "${A}"
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	epatch "${FILESDIR}"/${P}-tcl84.patch
+}
+
+src_compile() {
+	make config || die
+	make emacspeak || die
+}
+
+src_install() {
+	make prefix="${D}"/usr install || die
+	dodoc README etc/NEWS* etc/FAQ etc/COPYRIGHT
+	dohtml -r install-guide user-guide
+	dosed "s:/.*image/::" /usr/bin/emacspeak
+}
diff --git a/app-accessibility/emacspeak/files/digest-emacspeak-22 b/app-accessibility/emacspeak/files/digest-emacspeak-22
deleted file mode 100644
index 21a71785289c..000000000000
--- a/app-accessibility/emacspeak/files/digest-emacspeak-22
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5a3e820d46b45ad6937d1ad969312766 emacspeak-22.tar.bz2 1357030
-RMD160 f7b229e6765961f3a9a71829d0d3ef2ba2c5518d emacspeak-22.tar.bz2 1357030
-SHA256 3f620de71d872c19b4cf437afe0cdd701fb3e26389b4b47d888569ce3133bbb2 emacspeak-22.tar.bz2 1357030
diff --git a/app-accessibility/emacspeak/files/digest-emacspeak-23 b/app-accessibility/emacspeak/files/digest-emacspeak-23
deleted file mode 100644
index 784d438e078a..000000000000
--- a/app-accessibility/emacspeak/files/digest-emacspeak-23
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 95c09468fb4cc8d2d0cf1f7502f39ee2 emacspeak-23.0.tar.bz2 1391525
-RMD160 1976ed402d5cd3c15b7d59c18738f1628aeda7c1 emacspeak-23.0.tar.bz2 1391525
-SHA256 a673ae4361490b0e77fa069e3254afdd53442371bc0a706ed6b7b4eaaecb32c2 emacspeak-23.0.tar.bz2 1391525
diff --git a/app-accessibility/emacspeak/files/digest-emacspeak-27.0 b/app-accessibility/emacspeak/files/digest-emacspeak-27.0
new file mode 100644
index 000000000000..a85c851105ba
--- /dev/null
+++ b/app-accessibility/emacspeak/files/digest-emacspeak-27.0
@@ -0,0 +1,3 @@
+MD5 b80037c2220a32c03ef183c82689fa84 emacspeak-27.0.tar.bz2 1508054
+RMD160 7ad04eccde55078e6d096fc426eea587551f8831 emacspeak-27.0.tar.bz2 1508054
+SHA256 3a686c84c53ffbc520117322072e1bf1ded63315e63bdf5d1e130a714229f516 emacspeak-27.0.tar.bz2 1508054
diff --git a/app-accessibility/emacspeak/files/emacspeak-27.0-makefile.patch b/app-accessibility/emacspeak/files/emacspeak-27.0-makefile.patch
new file mode 100644
index 000000000000..d106a33ca91f
--- /dev/null
+++ b/app-accessibility/emacspeak/files/emacspeak-27.0-makefile.patch
@@ -0,0 +1,10 @@
+--- emacspeak-27.0/Makefile.old	2008-01-13 09:02:20.000000000 -0600
++++ emacspeak-27.0/Makefile	2008-01-13 09:03:16.000000000 -0600
+@@ -162,7 +162,6 @@
+ OUTLOUD=${ECI}/eci.ini \
+ ${ECI}/*.h \
+ ${ECI}/*.cpp \
+-${ECI}/*.so \
+ ${ECI}/VIAVOICE ${ECI}/ALSA ${ECI}/asoundrc \
+ ${ECI}/Makefile ${ECI}/makefile.tcl83
+ 
diff --git a/app-accessibility/emacspeak/files/emacspeak-27.0-tcl84.patch b/app-accessibility/emacspeak/files/emacspeak-27.0-tcl84.patch
new file mode 100644
index 000000000000..bd11f039df7e
--- /dev/null
+++ b/app-accessibility/emacspeak/files/emacspeak-27.0-tcl84.patch
@@ -0,0 +1,135 @@
+--- emacspeak-27.0.orig/servers/dtk-exp	2007-07-25 20:15:16.000000000 -0500
++++ emacspeak-27.0/servers/dtk-exp	2008-01-12 20:39:54.000000000 -0600
+@@ -1,4 +1,4 @@
+-#!/usr/bin/tcl
++#!/usr/bin/tclsh
+ # $Id: emacspeak-27.0-tcl84.patch,v 1.1 2008/01/13 16:18:12 williamh Exp $
+ # Description:  Interfacing to a Dectalk via TCL.
+ # Keywords: Emacspeak, Dectalk, TCL
+@@ -58,6 +58,7 @@
+ # }}}
+ # {{{source common code
+ 
++package require Tclx
+ set wd [file dirname $argv0]
+ source $wd/tts-lib.tcl
+ # }}}
+@@ -363,7 +364,7 @@
+ set tts(speech_rate)  225
+ set tts(say_rate) [round \
+                        [expr $tts(speech_rate) * $tts(char_factor)]]
+-set tts(input) file0
++set tts(input) stdin
+ if {[info exists server_p]} {
+     set tts(input) sock0
+ }
+--- emacspeak-27.0.orig/servers/espeak	2007-07-01 21:10:31.000000000 -0500
++++ emacspeak-27.0/servers/espeak	2008-01-12 20:40:53.000000000 -0600
+@@ -1,4 +1,4 @@
+-#!/usr/bin/tcl
++#!/usr/bin/tclsh
+ # Keywords: Emacspeak, eSpeak , TCL
+ # {{{ LCD Entry: 
+ 
+@@ -34,6 +34,7 @@
+ # }}}
+ # {{{source common code 
+ 
++package require Tclx
+ set wd [file dirname $argv0]
+ source $wd/tts-lib.tcl
+ 
+--- emacspeak-27.0.orig/servers/outloud	2007-06-23 23:12:04.000000000 -0500
++++ emacspeak-27.0/servers/outloud	2008-01-12 20:42:33.000000000 -0600
+@@ -1,4 +1,4 @@
+-#!/usr/bin/tcl
++#!/usr/bin/tclsh
+ # Keywords: Emacspeak, ViaVoice Outloud , TCL
+ # {{{ LCD Entry: 
+ 
+@@ -34,6 +34,7 @@
+ # }}}
+ # {{{source common code 
+ 
++package require Tclx
+ set wd [file dirname $argv0]
+ source $wd/tts-lib.tcl
+ 
+@@ -472,7 +473,7 @@
+ tts_initialize
+ set tts(speech_rate)  75
+ beep_initialize
+-set tts(input) file0
++set tts(input) stdin
+ if {[info exists server_p]} {
+     set tts(input) sock0
+ }
+--- emacspeak-27.0.orig/servers/speech-server	2007-07-01 21:12:27.000000000 -0500
++++ emacspeak-27.0/servers/speech-server	2008-01-12 20:49:29.000000000 -0600
+@@ -1,4 +1,4 @@
+-#!/usr/bin/tcl
++#!/usr/bin/tclsh
+ # $Id: emacspeak-27.0-tcl84.patch,v 1.1 2008/01/13 16:18:12 williamh Exp $
+ # Description:  Speech server
+ #Usage: tcl speech-server port device-specific-script
+@@ -39,6 +39,8 @@
+ # }}}
+ # {{{Initialize and get ready
+ 
++package require Tclx
++
+ set port [lindex $argv 0]
+ #start up the server
+ set server [server_create -myport  $port -reuseaddr]
+--- emacspeak-27.0.orig/servers/ssh-dtk-exp	2007-06-23 22:00:40.000000000 -0500
++++ emacspeak-27.0/servers/ssh-dtk-exp	2008-01-12 20:51:57.000000000 -0600
+@@ -1,4 +1,4 @@
+-#!/usr/bin/tcl
++#!/usr/bin/tclsh
+ #$Id: emacspeak-27.0-tcl84.patch,v 1.1 2008/01/13 16:18:12 williamh Exp $
+ #Description: Launch a TTS server on a remote host.
+ #Copyright (C) 1995 -- 2007, T. V. Raman 
+@@ -18,6 +18,8 @@
+ #"do you want to continue connecting" question.
+ 
+ # }}}
++package require Tclx
++
+ set localhost [exec hostname]
+ puts stderr "running on host <$localhost>"
+ if [expr $argc == 0] {
+@@ -35,7 +37,7 @@
+ set user [lindex $user_host 0]
+ set host [lindex $user_host 1]
+ if {$user == ""} {set  user env($USER)}
+-set tcl /usr/bin/tcl 
++set tcl /usr/bin/tcl sh
+ regsub {/ssh-}  $argv0 {/} tts
+ puts stderr "Running <ssh $host -l $user -p $port   $tcl $tts>"
+ exec     ssh -o StrictHostKeyChecking=no $host \
+--- emacspeak-27.0.orig/servers/ssh-outloud	2007-06-23 22:00:42.000000000 -0500
++++ emacspeak-27.0/servers/ssh-outloud	2008-01-12 20:53:46.000000000 -0600
+@@ -1,4 +1,4 @@
+-#!/usr/bin/tcl
++#!/usr/bin/tclsh
+ #$Id: emacspeak-27.0-tcl84.patch,v 1.1 2008/01/13 16:18:12 williamh Exp $
+ #Description: Launch a TTS server on a remote host.
+ #Copyright (C) 1995 -- 2007, T. V. Raman 
+@@ -18,6 +18,8 @@
+ #"do you want to continue connecting" question.
+ 
+ # }}}
++package require Tclx
++
+ set localhost [exec hostname]
+ puts stderr "running on host <$localhost>"
+ if [expr $argc == 0] {
+@@ -35,7 +37,7 @@
+ set user [lindex $user_host 0]
+ set host [lindex $user_host 1]
+ if {$user == ""} {set  user env($USER)}
+-set tcl /usr/bin/tcl 
++set tcl /usr/bin/tclsh
+ regsub {/ssh-}  $argv0 {/} tts
+ puts stderr "Running <ssh $host -l $user -p $port   $tcl $tts>"
+ exec     ssh -o StrictHostKeyChecking=no $host \