Version bump for bug #476188. Thanks to Chris Brannon. Also sync live ebuild.

Package-Manager: portage-2.2.0_alpha187/cvs/Linux i686
Manifest-Sign-Key: 0x30C46538

4 files changed, 103 insertions, 16 deletions

diff --git a/app-accessibility/emacspeak/ChangeLog b/app-accessibility/emacspeak/ChangeLog
index b6a054a680ab..f8bc75024734 100644
--- a/app-accessibility/emacspeak/ChangeLog
+++ b/app-accessibility/emacspeak/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-accessibility/emacspeak
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/emacspeak/ChangeLog,v 1.47 2010/12/03 18:35:56 williamh Exp $
+# 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 $
+
+*emacspeak-38.0 (09 Jul 2013)
+
+  09 Jul 2013; William Hubbs <williamh@gentoo.org> +emacspeak-38.0.ebuild,
+  emacspeak-9999.ebuild:
+  Version bump for bug #476188. Thanks to Chris Brannon. Also sync live ebuild.
 
   03 Dec 2010; William Hubbs <williamh@gentoo.org> emacspeak-33.0.ebuild,
   emacspeak-9999.ebuild:
diff --git a/app-accessibility/emacspeak/Manifest b/app-accessibility/emacspeak/Manifest
index 9c07cf4e9d3f..9f067fc3c644 100644
--- a/app-accessibility/emacspeak/Manifest
+++ b/app-accessibility/emacspeak/Manifest
@@ -1,12 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX emacspeak-33.0-greader-garbage.patch 372 SHA256 4170a79826b0c9159bc7da9671e028ccddcec39c2fd8f195eab05175c72d88d0 SHA512 81ad97e65715061d4af3a3a9e5e03392be27841d5291e2937df4fee90d70f889199fe05685884dd79cc516dcc1bd577ba40080709c2b41a4ce1c7e0b62c425ec WHIRLPOOL ddd436e5e0fb2a57716ce76388139f16fcece5e6549f02785013d5b553428c45390c5bae9b7e13e5a40af065cc13ac9fb71127e7cf099c8720d96b3920d49a3d
 AUX emacspeak-33.0-respect-ldflags.patch 1765 SHA256 b76aa6577216970b32cb2be55fe0dbf1bad35de96d72eadfb6a3f2dc82288bab SHA512 5f20f61d297e27c57f91adaf88d57c8d7272781b022718324a5b6103af04ce55bdd09f61e6d8dfca0749b7d7847954cd451fe65e3b6d171d447c1db86dc1d362 WHIRLPOOL dd827fc1e0595b7b2cb4cd2a3dbf30423aae5a348bdd04609a3799592ce0c5c572cdcd4f30b65ff39840d2dc149473dead4dc7cbdc1cb00df65731846afe6512
 DIST emacspeak-30.0-patches.tar.bz2 1609 SHA256 771c894533f60a2d4fe352255c7d50a2b411fd5f47635d83c95898d41eab3a14 SHA512 1c51fc7915107a58465e7892b64cd10232977ffd1c6a04b0a30ebd484d7c650c69e13fc7a1061459e185b24a6e06b96941e2074c4dbd046fd4cc8343aac3a7b2 WHIRLPOOL 8a04e6e838d7020bf45d3e25da3d348d8e52d99547ac591c76db76e5b9743ef67fdbe3667f9b6c6ca4c178c990b03f1c111cdacdd72572fd67fb5f1eb7115789
 DIST emacspeak-30.0.tar.bz2 1662093 SHA256 1b7d28beaf8cd5b5b5a4d63e813896b51e907dd125e992fbfc85df05feb03e3c SHA512 65c2e26dd935e98d2e01deaec23ffdd6bbbe51df2df44401ef443789d9f32141a93631d5456c0863b20712a688faed247086ddb56ea2c8aafebfb4e21d6077d0 WHIRLPOOL 58373b1bdb7a1b0f72b63ee2f61ed3ae64db9ed5706dcd99e8e42990d8a148c2b534ad0d0a371dd2dbce4f825d09bdf4cb2a42f4ba514cdf339f928ca6d7320b
 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
 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-9999.ebuild 1196 SHA256 92ab22f5d8a95f935c2a040b6a8a59aa4b698ba72cc50f55460a74b9c9ad7e3d SHA512 b7f1144310e65b418fda23c0478b26fa6cecf8a8211de57bd84c8d0f5c56a53cb23cb131f7b2c2ca9205a42ec50b3f4f27f42b61c94687fa71a46010973e6ff9 WHIRLPOOL e2a56b97e62795bba699a068e561526050b80b4e749672e9d9c8feb13c8cd0f29879efdaa80005b238dd689f15342956d3fcdaa996c850344881596a7d4cd2bf
-MISC ChangeLog 6326 SHA256 d51fe6d0187b92c2c7760df676deea38ba93cc298ca9ac6653ee4c9fc4010ba4 SHA512 a60b885863b0a013cce89efd0b4f52dde09f8dd8ccaf905ae8c1165f617b38f59077597d9d488aebf2e05007ab63fbafe990b33838735db6335b926b61771822 WHIRLPOOL 7131c4eedb2a28c8206fe5c68139d920ce61cac8a19800961d7ab7eab0d94fe840a167cd2eeaae1ef570b89b721a9e9bba38f3dbfb3eda8a81c664fe9e20d3b8
+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
 MISC metadata.xml 743 SHA256 f6b544111ee5baab6eabf74356db8fa47b695258414ff872cc4d7f05e00b72c6 SHA512 3baec80bf094ef340a0075263a0f47414f698cb1366c01dc820ee75e39f41df77544c0d292297b80755139c479e50d78c61a428f550d2db9d2e9400860348c26 WHIRLPOOL 974649f0b45fb66b9920ce2f2dd3b3fe12b9c200a8da007b51385f706ab07ee9ea9114915d5f41649c285ee8fd103a762ac78bdca5612457e96f32bd96010655
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iEYEAREIAAYFAlHbdJEACgkQblQW9DDEZTgJlgCfV4ETvgjjeaOwoc2VuIB4jZ9V
+BPkAnR0w581ik4i/PkNUKgPYJf1ZX2u1
+=mOlB
+-----END PGP SIGNATURE-----
diff --git a/app-accessibility/emacspeak/emacspeak-38.0.ebuild b/app-accessibility/emacspeak/emacspeak-38.0.ebuild
new file mode 100644
index 000000000000..64554489d576
--- /dev/null
+++ b/app-accessibility/emacspeak/emacspeak-38.0.ebuild
@@ -0,0 +1,62 @@
+# 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-38.0.ebuild,v 1.1 2013/07/09 02:25:08 williamh 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
+	if use espeak; then
+		pushd servers/linux-espeak > /dev/null || die
+		emake DESTDIR="${D}" install
+		popd > /dev/null || die
+	fi
+	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
+}
diff --git a/app-accessibility/emacspeak/emacspeak-9999.ebuild b/app-accessibility/emacspeak/emacspeak-9999.ebuild
index a24b85b5b7a6..6f55decd9357 100644
--- a/app-accessibility/emacspeak/emacspeak-9999.ebuild
+++ b/app-accessibility/emacspeak/emacspeak-9999.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.5 2010/12/03 18:35:56 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/emacspeak/emacspeak-9999.ebuild,v 1.6 2013/07/09 02:25:08 williamh Exp $
 
-EAPI="2"
+EAPI=5
 
 inherit eutils
 
 if [[ ${PV} == "9999" ]] ; then
 	ESVN_REPO_URI="http://${PN}.googlecode.com/svn/trunk"
 	inherit subversion
-	KEYWORDS=""
 else
 	SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~ppc ~x86"
@@ -33,23 +32,31 @@ src_prepare() {
 }
 
 src_configure() {
-	make config || die
+	emake config
 }
 
 src_compile() {
-	make emacspeak || die
+	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
-		make TCL_VERSION=8.5 || die
+		emake TCL_VERSION="${tcl_version}"
 	fi
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc README etc/NEWS* etc/FAQ etc/COPYRIGHT
-	dohtml -r install-guide user-guide
+	emake DESTDIR="${D}" install
 	if use espeak; then
-		cd servers/linux-espeak
-		make DESTDIR="${D}" install
+		pushd servers/linux-espeak > /dev/null || die
+		emake DESTDIR="${D}" install
+		popd > /dev/null || die
 	fi
+	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
 }