Remove old version, and make emacspeak-9999 up-to-date.

It needs to be the same ebuild as 39.0-r2, not 39.0-r1.

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

4 files changed, 32 insertions, 110 deletions

diff --git a/app-accessibility/emacspeak/ChangeLog b/app-accessibility/emacspeak/ChangeLog
index 364e2d41d9bd..4d58be18dae8 100644
--- a/app-accessibility/emacspeak/ChangeLog
+++ b/app-accessibility/emacspeak/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-accessibility/emacspeak
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/emacspeak/ChangeLog,v 1.59 2014/12/31 16:21:52 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/emacspeak/ChangeLog,v 1.60 2015/01/28 00:00:35 teiresias Exp $
+
+  27 Jan 2015; Christopher Brannon <teiresias@gentoo.org>
+  -emacspeak-39.0-r1.ebuild, emacspeak-9999.ebuild:
+  Remove old version, and make emacspeak-9999 up-to-date.
 
   31 Dec 2014; Agostino Sarubbo <ago@gentoo.org> emacspeak-39.0-r2.ebuild:
   Stable for ppc, wrt bug #532738
diff --git a/app-accessibility/emacspeak/Manifest b/app-accessibility/emacspeak/Manifest
index 4a2abb418abe..96d2a2ab79cc 100644
--- a/app-accessibility/emacspeak/Manifest
+++ b/app-accessibility/emacspeak/Manifest
@@ -2,25 +2,18 @@
 Hash: SHA256
 
 DIST emacspeak-39.0.tar.bz2 4989631 SHA256 aff805271ea02ad7e08c121d42886d1a774d1b58a42bf2c570cc6722b903fc71 SHA512 c0a0c503d6ccc2abb53a8be580997b44e0449c2225e8a64cee73c24d69a28c3f47c0e660a95a6e77dd4d660272ad562ff747ce3c0a989f8fe7c8171f60349173 WHIRLPOOL 9f4c3cdd2d2695b7351f83733454afcdfe569921f8d304447132a973fa9a02b572ee149a7b0d0ee0b914c00e37fcacb26aaef270f8fa43a93b528591af12e862
-EBUILD emacspeak-39.0-r1.ebuild 2227 SHA256 df1ff1f9b9574632d35a87723345cccf03f7ecd64f997fa7d900b0441fb2703d SHA512 3e7675e84d11df57fe4ecc5bba9169bc683694e8e75c671bf3ab5af3ed8815a7afff679e8fe8c170c6fe0e7c6fa842bf5c7e852038d7bce3b3b7eebf824ceca8 WHIRLPOOL f747aa70b7b3c213a20023bca749d5f89b49dd3d21048f8da890d6d8a4ed88e2b8425ca0103f8897fbe52941ba24f449bd7ad1fd73356c43490dfe31ea3b010c
 EBUILD emacspeak-39.0-r2.ebuild 2269 SHA256 cc3e927ce8c208a5adbc5cfdfef5b9bdf18943a80664af042c90b15b3fcc123c SHA512 9f614dd7ab3d20e252f0532858af42d4ce13470feaff9b6e2d23464f794dd7fda8944c0d4c19eea532cd6953cf3bf25655f3c9543819dabf897f560dc968b3dd WHIRLPOOL 102b15b2175ef7e525bedd9e9beac4ef180c200808328ed0c5df29be6e66c620c8c055bd8ad02ec80e28f65914af279a1606b8ea56ea1327254da8cc39913b99
-EBUILD emacspeak-9999.ebuild 2233 SHA256 7e217f56b69bf783f67494b7c1acd3e60e32c9f8bc5d8ba93506d3b38eac4814 SHA512 e9ecb5bc8d45325cd9571211f3ac8eda8320d46bad98f0ccddc2c5609d69c3733961a53d53c1f38ebb198f347d626e7537d3df876c7830268a77b609e35b60ee WHIRLPOOL 84e547c97806f82ae648101fa9c21b81350bbf4be545de44d83dce5dad1c50c49dfa2417f9622a7c5d5d7cca694d9fff63a05d21eff4a96dbac0f60baad96f8d
-MISC ChangeLog 8454 SHA256 2178c80414ca1181f55023cccd389cfe7424118172b60a262b40da6db8f4c416 SHA512 99e23d240e1c6991fb47cde4073a34fec7e42d362e48cf75857a774fbc8933cabe1672821c3d05ab10700bf25d5634c03f5aaf4fd6b0d98ecb486581420b961d WHIRLPOOL 790f0b84534fdbd832c4944952a3e88cacb51ff87dce6492d2997a2b7ecaceba80f133d5f57c9c8ecf05c3b9f51a7462e8f23079fbe730f10e227973198ddaac
+EBUILD emacspeak-9999.ebuild 2272 SHA256 d2bcba8dbe2ec652603981df0ce648a0b5c8d04fa2d1a49f901907244dd2d72a SHA512 63bed19f55b08dbde835938810c100a209d2e1826c49bf4109d38a99046fdd626a1dc6890beebe9b5cd9e683dc3271c5813211b24f1c6995b035e6fc73da0cd3 WHIRLPOOL 5645e7ce5a2958579885d81e5c3ee422eb6b825e50e5cf4da9b6b95c7018b28cc234e07d6f4ffb6e04d964a8f49fd5d38b38f2b77c1270ebbc33648137ff699a
+MISC ChangeLog 8629 SHA256 e40ea9d4dca6887373725bb2152bc5b5bd666bc347d8d8a998f6ba4fe0f0372f SHA512 da39b9299381fc7b6b4af1fe3be4e7c8606e91c8b87dc5a3c88f151c030aa69a73f15f49e84e4d46269a9b9db75d09fe7e9a2729f9573b067830bc562ed1a617 WHIRLPOOL 9a00faa7d967c76254ad4a3dcf48753353c6fe2f81a4067f67c4c35ce6992c73831c62d3da1bb7c3a2dd359fd14b483f0c81763bc675bb871b7e9874dbc7ef9b
 MISC metadata.xml 744 SHA256 fc8b490c971d6cb897f22e313284e398e3c9d7a9eaa898a34edfd96d05a99a80 SHA512 a959b8027cc8c78d73ec2d2cab26b12c9ad05fd7c9698073862aec3a1ec403d449061fc4636d6a23bed9521970844c331f96eafa87ab0d64092a167b581ae4e3 WHIRLPOOL 2454a834c35597b5b53c95c955a2a0a5cd4e7f3afdff81fcc5aa5fb31bb99747de73a5de2f95cdcd7a52003360737e6f2bb1c60d1f5bfb82532f5a4d46d1bd72
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUpCKhAAoJELp701BxlEWfgbMQAJ+MQCbrZhBw5Hv212jFthSb
-leJt5io6NNtyORrhmDavbces9tT/95ktKHT+JK7rz+76C3b+o7emoCKFmNRNeKNS
-xXuPLGpXbdOfE1J5719p2ARcCo/AgVlqz83OphkpBIgKexT5oxmW/cLfY25qemYg
-+AO2crD+j4VU3cK3Yi6U60/wH6Z/pBSM76IA/oSYRpx9bUjTSZZJpuTxpZbOCeB1
-JKBlUW1SVzaXdtUGUPeMalgw2wAydRMGnHsHf0lsfSQ8dY5ZM8+yMWd081x4lkZc
-TFnL9XOTczK8+g31m6P+iYQNUufTbuZ4BKUXvcW0DuU2JF2f68V7GLDDzGyWVT00
-F30OLHrvp5ZAptPHX14Aj5/aVcrKaHecyZTdQ+KRkcu8HcVBWR005k766RLWJre9
-f142HP6eiM1kBu6temMY5zghIsooWg5nUVJQafZS8XNx1Nes2hnfeA2GbSk6/JhW
-kMypvGiAYmbqnCDHnqy9o1Utdw3wXn+pzFmuBFN5xP5X+ZpIkktCpzH+6SFZrOf4
-06xGXUt1x4PRYQ2bYO/fTcVNTGWhf2hnRLYRgUMNK/rDYfZcv8vwwJb0uUv0OKlJ
-gBiKHwnGGx9cXuBXMZV9+glj9cce2+ajC4QqPsJ0RWZkQ0ZWvW4AOmL1sxpoWsVC
-6G5vU3Uyo/mRUxaPrmgD
-=z0et
+iQEbBAEBCAAGBQJUyCakAAoJEH8qFnJlIeBt2OgH+LnvIYce0UrTxAJoZR4EiMmB
+ysQaIB5SD590mU8HZcBeue9GtCmlrR2nQ0H6gMj2cPqSEX3ObM9lr+VobX7Oe5Au
+U5OFuRMFy3D4Vi53vhSwsZDU8xHqSOeuIlg2T9kjjT8P9sjVeKOHJWZkH/Stu/fz
+W+Oe5K2xiRvClJnARM+qJLhFSIor7X3PE9IbnEshVYBk38F3sQJ1sq7Ct4feGkJr
+s7CCs4PRhvVxe6wFS42QKSDXcXGHQrn8xTK63Cj4fjHLBrd3L72VtYgt1qkdugvv
++JQ1gLMDp9HNyRayShdbBhNpx3sYHOErMcd1lUolcxs4xorDxgGUQJwvNbUClA==
+=Mspw
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/emacspeak/emacspeak-39.0-r1.ebuild b/app-accessibility/emacspeak/emacspeak-39.0-r1.ebuild
deleted file mode 100644
index 0b11345d4faf..000000000000
--- a/app-accessibility/emacspeak/emacspeak-39.0-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/emacspeak/emacspeak-39.0-r1.ebuild,v 1.4 2014/01/26 10:56:03 ago 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
-		local orig_serverdir="/usr/share/emacs/site-lisp/emacspeak/servers/linux-espeak"
-		local serverfile="${D}${orig_serverdir}/tclespeak.so"
-		install -Dm755  "$serverfile" \
-			"${D}/usr/$(get_libdir)/emacspeak/tclespeak.so" || die
-		rm -f "$serverfile" || die
-		dosym "/usr/$(get_libdir)/emacspeak/tclespeak.so" \
-			"$orig_serverdir/tclespeak.so"
-		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
-}
-
-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 a3df722fb07d..0c67122add6d 100644
--- a/app-accessibility/emacspeak/emacspeak-9999.ebuild
+++ b/app-accessibility/emacspeak/emacspeak-9999.ebuild
@@ -1,17 +1,20 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 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.8 2013/12/12 17:45:37 teiresias Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/emacspeak/emacspeak-9999.ebuild,v 1.9 2015/01/28 00:00:35 teiresias Exp $
 
 EAPI=5
 
-inherit eutils
+NEED_EMACS=24
+FORCE_PRINT_ELOG=1
+DISABLE_AUTOFORMATTING=1
+inherit eutils readme.gentoo elisp
 
 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"
+	KEYWORDS="amd64 ppc x86"
 fi
 
 DESCRIPTION="the emacspeak audio desktop"
@@ -20,12 +23,19 @@ LICENSE="BSD GPL-2"
 SLOT="0"
 IUSE="+espeak"
 
-DEPEND=">=virtual/emacs-22
-	espeak? ( app-accessibility/espeak )"
+	DEPEND="espeak? ( app-accessibility/espeak )"
 
 RDEPEND="${DEPEND}
 	>=dev-tcltk/tclx-8.4"
 
+DOC_CONTENTS='
+As of version 39.0 and later, the /usr/bin/emacspeak
+shell script has been removed downstream in Gentoo.
+You should launch emacspeak by another method, for instance
+by adding the following to your ~/.emacs file:
+(load "/usr/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.el")
+'
+
 src_prepare() {
 	# Allow user patches to be applied without modifying the ebuild
 	epatch_user
@@ -67,12 +77,5 @@ src_install() {
 	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")'
+	readme.gentoo_create_doc
 }