New upstream version.

Added a patch, so that the package will work with emacs >=23.3.
This patch is included in upstream's git.

Also, added a "brltty" local use flag.

Package-Manager: portage-2.1.9.50/cvs/Linux i686

5 files changed, 135 insertions, 8 deletions

diff --git a/app-accessibility/speechd-el/ChangeLog b/app-accessibility/speechd-el/ChangeLog
index 56cd65611088..febd4caa052b 100644
--- a/app-accessibility/speechd-el/ChangeLog
+++ b/app-accessibility/speechd-el/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for app-accessibility/speechd-el
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speechd-el/ChangeLog,v 1.15 2010/12/29 19:25:46 ulm Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speechd-el/ChangeLog,v 1.16 2011/06/06 20:01:12 cbrannon Exp $
+
+  06 Jun 2011; Christopher Brannon <cbrannon@gentoo.org>
+  +speechd-el-2.4.ebuild, +files/speechd-el-2.4-emacs23.patch, metadata.xml:
+  Added the brltty use flag.
+
+*speechd-el-2.4 (06 Jun 2011)
+
+  06 Jun 2011; Christopher Brannon <cbrannon@gentoo.org>
+  +speechd-el-2.4.ebuild, +files/speechd-el-2.4-emacs23.patch:
+  Added new upstream version.
+
+  This also includes a patch, so that the package will work with
+  emacs >= 23.3.
 
   29 Dec 2010; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add package to emacs herd too.
diff --git a/app-accessibility/speechd-el/Manifest b/app-accessibility/speechd-el/Manifest
index 41d9cbee8fad..9849e6ab9545 100644
--- a/app-accessibility/speechd-el/Manifest
+++ b/app-accessibility/speechd-el/Manifest
@@ -1,18 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX speechd-el-2.4-emacs23.patch 2154 RMD160 23985ab02ac90710a7cba4163989516afc599350 SHA1 7940098bb3813d1f287057938817f0e4d12f5344 SHA256 825b873c8dffc9628a2f32d72ae0c19f56fd085d35df29be22810e384411d129
 DIST speechd-el-0.4.tar.gz 131535 RMD160 b1b3eeb28588acffe4df91638dd70e1fb0fa2151 SHA1 67a9aa92196a28ee4175ca659bc295119194d310 SHA256 a34e3093a788e948420965144f6f79fffbe15e64e611eb2a2278e9004199c5cd
 DIST speechd-el-1.0.tar.gz 145875 RMD160 3e475bde5513ef425f62cf316362030043637ba3 SHA1 eca1f6fbff17a6cfe39ad651afb054636c81be57 SHA256 30373c44b843052b8e25b80ec8433b23a743dc92302e3d6fb1b5888131ac665f
 DIST speechd-el-2.2.tar.gz 177968 RMD160 d25f49b49d36b1f09d14c42bec4e173c6aa99423 SHA1 570564fe39bd6ed5cb307db246d540e5436c6735 SHA256 6d57638fb20ef09207bea02b5d6cd65834aa4bbaf9b1b24833ae43c883298657
+DIST speechd-el-2.4.tar.gz 182959 RMD160 64bccb09b8e7bdd2321a003cf9eab00e1911c3b4 SHA1 f83b424d4ea3651b3f57b3c74c5988d8871fdc89 SHA256 bccf6a26cdb6123001473b5a618dc658fef6630014eddaf12fde4b7628458fda
 EBUILD speechd-el-0.4.ebuild 892 RMD160 b56a2ee9810776777242f8512840638368a3a964 SHA1 8434762bdc8c9e12779bb2cdbaa5237509630386 SHA256 2b12817259520212b413d713c09a67e530ae875d8a4aad366a52e2b361bba79a
 EBUILD speechd-el-1.0.ebuild 926 RMD160 7aab8c73e418f5018a688968ad825be044263e11 SHA1 0fb679df94f50b308af621511a9088f9595d3e52 SHA256 1ef79788fdc18eaf6a8fe639089d151db53fa4748dafffaced5f4320ad573339
 EBUILD speechd-el-2.2.ebuild 1093 RMD160 c0419a58b10612834333adfbc4f3054b4c45ae50 SHA1 55a793c7a9e3165a614d2087727bf4f92439ddbb SHA256 941c4cc6860191be1c4313ae1deb062412d84260358cba845cb83900cb2eee0d
-MISC ChangeLog 1808 RMD160 516cbca840c0962e771db264faea2e7926b73988 SHA1 8f395246e79ed2e51efe7058e0a2232a96eb5e3f SHA256 f0aa2cb1fe00dca486ae2ae1b8aa20b6a760990e0e44ba96c8eb2b22ecf86909
-MISC metadata.xml 247 RMD160 58b6cef5ae3798ddea006f3a945209e67363d07d SHA1 dda1314d1bc7008c30ef95f2b30b9ab972de0e70 SHA256 26a1ea83403e2ba1dfeeacadedfcd9b53cf732635e58ce9da73f50eb2c674677
+EBUILD speechd-el-2.4.ebuild 1148 RMD160 dc3e2eb1f71fc736a503ea2a0da8b446e63cb851 SHA1 4dc2135491aadbf33d4dd2e1048197efa0b3c26e SHA256 6f6d062a26c0af8da5a46a00831541658acba5c299d08b33bf954c964a645550
+MISC ChangeLog 2242 RMD160 a9056f660da6d78786f42eee09af7242eaa72c89 SHA1 9766e7dda31963dac9536f28890ec8940cf8e21f SHA256 8ba60d7c1cb82b8781d0f97ed4f938849413bbf94e552a40ffe81b4095bf780f
+MISC metadata.xml 305 RMD160 adc01388aedb75b781a8cfbf6f4fce930fdc2e99 SHA1 377bf391ccc1508750ae46196d55ecdde0989f8d SHA256 41f4cd9ca3f6bbf54539e378b84b3fa141eae4b43e723a6b0aee43cc640a8661
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk0bjEoACgkQOeoy/oIi7uxzGgCggm6yWakCWy3VdJ1X7BuyXS3+
-HbAAoLO99Rlge+5D/Qix+RGaR+drwlAU
-=kH25
+iEYEARECAAYFAk3tMhkACgkQg6Dbfc6NLuhqnwCgjXv9ajotkvAmoWbW7eYnu05w
+WJgAn18k6RqFRuOX6xWJ4ObCGtqMMy+B
+=T6pJ
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/speechd-el/files/speechd-el-2.4-emacs23.patch b/app-accessibility/speechd-el/files/speechd-el-2.4-emacs23.patch
new file mode 100644
index 000000000000..913e366598d3
--- /dev/null
+++ b/app-accessibility/speechd-el/files/speechd-el-2.4-emacs23.patch
@@ -0,0 +1,62 @@
+diff --git a/speechd-braille.el b/speechd-braille.el
+index a79b24e..dfbae4b 100644
+--- a/speechd-braille.el
++++ b/speechd-braille.el
+@@ -116,9 +116,14 @@
+ 
+ (defclass speechd-braille-emu-driver (speechd-driver)
+   ((name :initform 'braille-emu)
+-   (manager :initform (lambda () (speechd-braille--create-manager
+-                                  #'speechd-braille--display)))
+-   (priority :initform (lambda () speechd-default-text-priority))))
++  (manager)
++  (priority)))
++
++(defmethod initialize-instance :after
++    ((this speechd-braille-emu-driver) slots)
++  (progn
++    (oset this priority speechd-default-text-priority)
++    (oset this manager (speechd-braille--create-manager #'speechd-braille--display))))
+ 
+ (defmethod speechd-braille--make-message
+     ((driver speechd-braille-emu-driver) text cursor)
+diff --git a/speechd-brltty.el b/speechd-brltty.el
+index f6bf353..ec89d04 100644
+--- a/speechd-brltty.el
++++ b/speechd-brltty.el
+@@ -237,10 +237,14 @@ is not recommended to assign or call user commands here."
+ 
+ (defclass speechd-brltty-driver (speechd-braille-emu-driver)
+   ((name :initform 'brltty)
+-   (manager :initform (lambda () (speechd-brltty--create-manager)))
++   (manager)
+    (brltty-connection :initform 'uninitialized)
+    (brltty-last-try-time :initform 0)))
+ 
++(defmethod initialize-instance :after
++    ((this speechd-brltty-driver) slots)
++  (oset this manager (speechd-brltty--create-manager)))
++
+ (defmethod speechd-braille--make-message
+     ((driver speechd-brltty-driver) text message)
+   (list (speechd-brltty--connection driver) text message))
+diff --git a/speechd-out.el b/speechd-out.el
+index aa82f10..0a484e3 100644
+--- a/speechd-out.el
++++ b/speechd-out.el
+@@ -87,9 +87,14 @@
+ 
+ 
+ (defclass speechd-driver ()
+-  ((name :initform (error "Driver name not given") :initarg :name
++  ((name :initarg :name
+          :reader speechd-driver.name)))
+ 
++(defmethod initialize-instance :after
++    ((this speechd-driver) slots)
++  (if (not (slot-boundp this 'name))
++    (error "Driver name not given")))
++
+ (defun speechd-out-register-driver (driver)
+   (let ((class (class-of driver)))
+     (labels ((replace (list)
diff --git a/app-accessibility/speechd-el/metadata.xml b/app-accessibility/speechd-el/metadata.xml
index 1d0ddd0ea74c..dc145bb72d02 100644
--- a/app-accessibility/speechd-el/metadata.xml
+++ b/app-accessibility/speechd-el/metadata.xml
@@ -6,4 +6,7 @@
 <maintainer>
 <email>williamh@gentoo.org</email>
 </maintainer>
+ <use>
+  <flag name="brltty">brltty support</flag>
+</use>
 </pkgmetadata>
diff --git a/app-accessibility/speechd-el/speechd-el-2.4.ebuild b/app-accessibility/speechd-el/speechd-el-2.4.ebuild
new file mode 100644
index 000000000000..22fb86bb6a56
--- /dev/null
+++ b/app-accessibility/speechd-el/speechd-el-2.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speechd-el/speechd-el-2.4.ebuild,v 1.1 2011/06/06 20:01:12 cbrannon Exp $
+
+EAPI="4"
+NEED_EMACS=23
+inherit elisp
+
+DESCRIPTION="Emacs speech support"
+HOMEPAGE="http://www.freebsoft.org/speechd-el"
+SRC_URI="http://www.freebsoft.org/pub/projects/speechd-el/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE="brltty"
+
+DEPEND=""
+RDEPEND=">=app-accessibility/speech-dispatcher-0.7
+	brltty? ( app-accessibility/brltty )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-emacs23.patch
+}
+
+src_compile() {
+	emake
+}
+
+src_install() {
+	elisp-install ${PN} *.el *.elc
+	dobin speechd-log-extractor
+	dodoc ANNOUNCE NEWS README speechd-speak.pdf
+	doinfo speechd-el.info
+}
+
+pkg_postinst() {
+	elog "Execute the following commands from within emacs to get it to speak:"
+	elog "  M-x load-library RET speechd-speak RET"
+	elog "  M-x speechd-speak RET"
+	elog
+	elog "or add the following to your ~/.emacs file:"
+	elog
+	elog "(autoload 'speechd-speak \"speechd-speak\" nil t)"
+	elog '(speechd-speak)'
+}