Upgrade and bug fixes.

Add ebuild for emacspeak 39.0.
Move servers/ out of /usr/share, since it can contain ELF files
(closes bug #298012).
Remove the /usr/bin/emacspeak script downstream, since it is known to
be broken.   Emacspeak's author consistently recommends against its use.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x6521E06D

4 files changed, 114 insertions, 8 deletions

diff --git a/app-accessibility/emacspeak/ChangeLog b/app-accessibility/emacspeak/ChangeLog
index f8bc75024734..3025d637035b 100644
--- a/app-accessibility/emacspeak/ChangeLog
+++ b/app-accessibility/emacspeak/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-accessibility/emacspeak
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/emacspeak/ChangeLog,v 1.48 2013/07/09 02:25:08 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/emacspeak/ChangeLog,v 1.49 2013/12/11 01:20:32 teiresias Exp $
+
+*emacspeak-39.0 (11 Dec 2013)
+
+  11 Dec 2013; Christopher Brannon <teiresias@gentoo.org>
+  +emacspeak-39.0.ebuild, emacspeak-9999.ebuild:
+  Add ebuild for emacspeak 39.0.
+  Move servers/ out of /usr/share, since it can contain ELF files
+  (closes bug #298012).
+  Remove the /usr/bin/emacspeak script downstream, since it is known to
+  be broken.
 
 *emacspeak-38.0 (09 Jul 2013)
 
diff --git a/app-accessibility/emacspeak/Manifest b/app-accessibility/emacspeak/Manifest
index 9f067fc3c644..cd0bda72a577 100644
--- a/app-accessibility/emacspeak/Manifest
+++ b/app-accessibility/emacspeak/Manifest
@@ -8,17 +8,23 @@ DIST emacspeak-30.0.tar.bz2 1662093 SHA256 1b7d28beaf8cd5b5b5a4d63e813896b51e907
 DIST emacspeak-31.0.tar.bz2 1668085 SHA256 2b759ced3fa509ae8773c832f01b1000ea0b726c3fbe40ac1e72ad3f603049af SHA512 56e179c5e64242b2e8c7cc5690ed7592e78b91a3246fc9a23f33172b25a1e972383a59d4b833b95dcf962346beed3d86d49676558366d2eef3a6e479b01239a8 WHIRLPOOL 4895918deb0609c36c8b49603c510366503f248ec2f00b528ce61ea56e23cd09377c793345685ffbf221811f7b890a4f472f7ee27cfedca5edb8399d549d414a
 DIST emacspeak-33.0.tar.bz2 6996664 SHA256 27810e45d29942bf4af23178db6a8947b5f38162445a5b99e6fa9c2eca3f0e9c SHA512 6eafc788ad472c425d26301dd6948222c52c2b2b49bb6b14b19c0c4620cef5de87fdee2a531be3a963c883562461744458aed9e123a9512c2a2945dab73ef4a2 WHIRLPOOL cb9b11c475498137844ef47e502f76f83d1e9b8b63de2f8bfd6b8711b14d759468a967347613dac168fe0acf45bf5df11ac53dcb192b9455188cd1940f1d822f
 DIST emacspeak-38.0.tar.bz2 4957271 SHA256 e06223b1d85b988bb641d99e07557a9d8cfc3f53ec8b5b4e29a5d72a7cf6eecb SHA512 f6cdb8f8e105e3d0fffeebe1be6791d554c042bd46d57a0a80decf4eb632aca8e00a65d4d328644907b4141ac2850ca56175fa54967ea463185417d233a621d2 WHIRLPOOL a385f39bf4bd4cdf2b8aa0927316c7ed71500a27d61b32700c12eeeecae32f8ea7ba3994e861ed252bd4e059a248d9b2226abf09330f5015b0afdc786045fbcb
+DIST emacspeak-39.0.tar.bz2 4989631 SHA256 aff805271ea02ad7e08c121d42886d1a774d1b58a42bf2c570cc6722b903fc71 SHA512 c0a0c503d6ccc2abb53a8be580997b44e0449c2225e8a64cee73c24d69a28c3f47c0e660a95a6e77dd4d660272ad562ff747ce3c0a989f8fe7c8171f60349173 WHIRLPOOL 9f4c3cdd2d2695b7351f83733454afcdfe569921f8d304447132a973fa9a02b572ee149a7b0d0ee0b914c00e37fcacb26aaef270f8fa43a93b528591af12e862
 EBUILD emacspeak-30.0.ebuild 891 SHA256 e4297e6761409627d309b07572abed745c6e1bb77aef982a33ba4e44bcb7888a SHA512 d2470d8b4b1dc9cb0fe4c65b7e9c72ae04eafd88b8581a9d67e5df72dcaf5a7f5b417258c6a626b45343437035d675a4379637855a178fcd548eeb0e6ab93985 WHIRLPOOL 8462f836020c8dbb015456396ef29b12e47fc7247945fbea2961cc7a5b8c1eaaf415838a8b41caec67bf5d3d349d97c7ce5eae4003da28ee839c52b89afe6728
 EBUILD emacspeak-31.0.ebuild 961 SHA256 d987dbc18eb8e532a6ac1408b06d4b1e0ba86f623badf5a8a7aaad9703984f17 SHA512 a8239c2739b6ede83bef4e3388ad8020e26cfc960542992d211766b0f7f99d3c5925190f37a6cd95b725a54e81eb2677635837edbf3fde0515a777c0e62361be WHIRLPOOL 1f4a7a19464d1cf198560a1635ac9f82e0dc5a0e4d2496cb0b6b6b707b8b56be33221e9a3ef92f350b6b54f59aed8305cc938b1e753e9353840d40107bf0d9b2
 EBUILD emacspeak-33.0.ebuild 1127 SHA256 d5f95ec17692d9e345256865802c095d1dc66dcf7eee1b6c3bb171b18f0ce940 SHA512 6be49050720d78292379b3433a764d0784ebbb30e4546a1ede39b46f195ebb1d241ac38e0da0ed1da781f2d0d71fea78606a928faf0b9ea59a4c42d3794e5d8d WHIRLPOOL 6a8fb5a7ddba52b1a91746cd4a297c0a0de68bf56091427b3190ae6162ece9af53d11fc8ed799b6b392352f2500a6dc37895b3fdcdfbcc88d6d55cd6c807104b
 EBUILD emacspeak-38.0.ebuild 1512 SHA256 2921daf4061a7ada6f437bdaf56809fe2063e0b5e23ea64d0adea67e0d560638 SHA512 cf29ff389228f30ac552989b11b699bef6cfb0f5f349ed21f194912667b313b49b1b02f7d3f00be12b029fcead86fb899b9634348e19c7e0e365d34a65c88af5 WHIRLPOOL 96b2b6730af20e16b5f2d348c716111918ea9743ec1b6ddbbfd74a43e9dce69bd01bd497b5177d9ad033f2bdbe1bfe62a31aa16098b233473600d39bb9f27639
-EBUILD emacspeak-9999.ebuild 1512 SHA256 d7f897fda362171fd24741a65476703bb60baff037abe04cf4bff915ad700acb SHA512 978ea77e4d127e4ad36879b6801789bc3e2fee15edbb5e48e839c0047020991a36163588445d2b33cb31b910d4fc29caf632ecab3decf3321cedafc7c0f8cf57 WHIRLPOOL 83eea5dc539f239f5f56a55dd8604709130b6e156850da65f001b5887b7e7acefe269bcde135503b1e48bd58d3c4a7ec3e1b634f6ae80833c8406dba75836cce
-MISC ChangeLog 6538 SHA256 b5850299529e2591fd8455aba9ba5d1abcc05d11ed38ff0ca0655764a80ea32d SHA512 84daef1313a1cf72e6e790b26289aac30e0558cf09858630e1d7c3e2fa99a48bc994931e161721b3ece7e9e3984d85e1280084de50d51f55ca4ca67686b41448 WHIRLPOOL 555a4380ca6b962edbf358e692e3e90352e0fc9dcc4e1c17d29bc3ef82a898851de2abf6b3743277cbb9b7781087ad0fb1a09b8b6c3de1ea9d5ddc23889096d6
+EBUILD emacspeak-39.0.ebuild 2147 SHA256 fd43e69738032724780fe84b24ec4a6372ab52c9fa7e19903bb494eecec35754 SHA512 388406a17c9a51bb9648c624538fa38aaa7e43954b0dd64cbd994404dc209517524f9aa2821681fbd487576a9f9b02f1e641661ff380be0c7eb2863acabc78b0 WHIRLPOOL dd343ad8f114dfc1e7b5619cb48d0b3f3fab866a44ef5dfc6689e5c75f76e3e81c8206039078bc867d1cbe4ff6490222711f9fcf1d86f30ee6354f9aff80b823
+EBUILD emacspeak-9999.ebuild 2147 SHA256 0c2b0f1d0e03bb2618ce61e9f51278b55e89540136a70c62bc99a765ab188c74 SHA512 3f80b24e155fe28d4783cf8b2367e6b8ab7d1b1d1d2963b43e95cc7ad63f2de7169c715c70babd68cb80dc29419565b4822540dcf9c20a0d9e86690af662d0bb WHIRLPOOL a1ff7340c30adb524a5dd29fb8070fe7befaaa999c934e86410facb8c0196ef950ab86eff4ad0451ad57e0d43b3528e636607cc4b0eabb74e9df4ea8b7202e65
+MISC ChangeLog 6886 SHA256 74983dc8614bcddc7683d5fa4dbf898e532457a42eab456bb3705ee96928ddf0 SHA512 15f6e895fd7344e0633b56d94076fcb0ff8a8857473234f5b8dbe7d3d1ab9bd93a8f1f822e5c5a95d3b272d617dabfbc21da0c9b21e114007811c0355c66bbdd WHIRLPOOL 77a2747f77c9fe41e4ea9888f74995d555cf8d12bf128c6e99f2d293349834f929155b65f8f59f70044adc3726f703347f9c45cf10a410df8ec8e69c20e79584
 MISC metadata.xml 743 SHA256 f6b544111ee5baab6eabf74356db8fa47b695258414ff872cc4d7f05e00b72c6 SHA512 3baec80bf094ef340a0075263a0f47414f698cb1366c01dc820ee75e39f41df77544c0d292297b80755139c479e50d78c61a428f550d2db9d2e9400860348c26 WHIRLPOOL 974649f0b45fb66b9920ce2f2dd3b3fe12b9c200a8da007b51385f706ab07ee9ea9114915d5f41649c285ee8fd103a762ac78bdca5612457e96f32bd96010655
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlHbdJEACgkQblQW9DDEZTgJlgCfV4ETvgjjeaOwoc2VuIB4jZ9V
-BPkAnR0w581ik4i/PkNUKgPYJf1ZX2u1
-=mOlB
+iQEcBAEBCAAGBQJSp73mAAoJEH8qFnJlIeBtFOUIAIOjLtY99Io2fU/7yUmalYkz
+YKLfb7c40Qg28XtEEySZWYhVXkaf3Sg32gg/pfifANNcc9mCLe6XyZWmrmn4AkGt
+0fP6oOhyCBI7JfPvUF+nu8b7zvJxOZelrkr9dUVaxv4bBgnphaNrDo4pXOAZp0xn
+tCOvYNpl+dxVFRUaM/vC+WioPJOAe2dG6aCKoyZQUYjiv48NJqTAIensaw5akxGe
+8Zo5hjsrcKWphv2kFUA0QlU8G25mvhhyIGbrYh8G6Es9ByuiBPe7gipHt/CDa3wN
+aIYseUKWsxqi7ua4310J++8mdcDiH+KRrS35H07bFsb8aukiowX3FOxwzt4d1P4=
+=av1v
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/emacspeak/emacspeak-39.0.ebuild b/app-accessibility/emacspeak/emacspeak-39.0.ebuild
new file mode 100644
index 000000000000..8d285f10c484
--- /dev/null
+++ b/app-accessibility/emacspeak/emacspeak-39.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/emacspeak/emacspeak-39.0.ebuild,v 1.1 2013/12/11 01:20:32 teiresias Exp $
+
+EAPI=5
+
+inherit eutils
+
+if [[ ${PV} == "9999" ]] ; then
+	ESVN_REPO_URI="http://${PN}.googlecode.com/svn/trunk"
+	inherit subversion
+else
+	SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+DESCRIPTION="the emacspeak audio desktop"
+HOMEPAGE="http://emacspeak.sourceforge.net/"
+LICENSE="BSD GPL-2"
+SLOT="0"
+IUSE="+espeak"
+
+DEPEND=">=virtual/emacs-22
+	espeak? ( app-accessibility/espeak )"
+
+RDEPEND="${DEPEND}
+	>=dev-tcltk/tclx-8.4"
+
+src_prepare() {
+	# Allow user patches to be applied without modifying the ebuild
+	epatch_user
+}
+
+src_configure() {
+	emake config
+}
+
+src_compile() {
+	emake emacspeak
+	if use espeak; then
+		local tcl_version="$(echo 'puts $tcl_version;exit 0' |tclsh)"
+		if [[ -z $tcl_version ]]; then
+			die 'Unable to detect the installed version of dev-lang/tcl.'
+		fi
+		cd servers/linux-espeak
+		emake TCL_VERSION="${tcl_version}"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	rm "${D}/usr/bin/emacspeak"
+	if use espeak; then
+		pushd servers/linux-espeak > /dev/null || die
+		emake DESTDIR="${D}" install
+		popd > /dev/null || die
+	fi
+	install -dm755 "${D}/usr/$(get_libdir)/emacspeak" || die
+	mv "${D}/usr/share/emacs/site-lisp/emacspeak/servers" \
+		"${D}/usr/$(get_libdir)/emacspeak/servers" || die
+	dosym "/usr/$(get_libdir)/emacspeak/servers" \
+		/usr/share/emacs/site-lisp/emacspeak/servers
+	dodoc README etc/NEWS* etc/FAQ etc/COPYRIGHT
+	dohtml -r install-guide user-guide
+	cd "${D}/usr/share/emacs/site-lisp/${PN}"
+	rm -rf README etc/NEWS* etc/FAQ etc/COPYRIGHT install-guide \
+		user-guide || die
+}
+
+pkg_postinst() {
+	elog "As of version 39.0 and later, the /usr/bin/emacspeak"
+	elog "shell script has been removed downstream in Gentoo."
+	elog "You should launch emacspeak by another method, for instance"
+	elog " by adding the following to your ~/.emacs file:"
+	elog '(load "/usr/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.el")'
+}
diff --git a/app-accessibility/emacspeak/emacspeak-9999.ebuild b/app-accessibility/emacspeak/emacspeak-9999.ebuild
index 6f55decd9357..7b8b3bda3df0 100644
--- a/app-accessibility/emacspeak/emacspeak-9999.ebuild
+++ b/app-accessibility/emacspeak/emacspeak-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/emacspeak/emacspeak-9999.ebuild,v 1.6 2013/07/09 02:25:08 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/emacspeak/emacspeak-9999.ebuild,v 1.7 2013/12/11 01:20:33 teiresias Exp $
 
 EAPI=5
 
@@ -49,14 +49,28 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install
+	rm "${D}/usr/bin/emacspeak"
 	if use espeak; then
 		pushd servers/linux-espeak > /dev/null || die
 		emake DESTDIR="${D}" install
 		popd > /dev/null || die
 	fi
+	install -dm755 "${D}/usr/$(get_libdir)/emacspeak" || die
+	mv "${D}/usr/share/emacs/site-lisp/emacspeak/servers" \
+		"${D}/usr/$(get_libdir)/emacspeak/servers" || die
+	dosym "/usr/$(get_libdir)/emacspeak/servers" \
+		/usr/share/emacs/site-lisp/emacspeak/servers
 	dodoc README etc/NEWS* etc/FAQ etc/COPYRIGHT
 	dohtml -r install-guide user-guide
 	cd "${D}/usr/share/emacs/site-lisp/${PN}"
 	rm -rf README etc/NEWS* etc/FAQ etc/COPYRIGHT install-guide \
 		user-guide || die
 }
+
+pkg_postinst() {
+	elog "As of version 39.0 and later, the /usr/bin/emacspeak"
+	elog "shell script has been removed downstream in Gentoo."
+	elog "You should launch emacspeak by another method, for instance"
+	elog " by adding the following to your ~/.emacs file:"
+	elog '(load "/usr/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.el")'
+}