Fix dependency. Emacspeak 39.0 won't work with < app-editors/emacs-24.

Closes bug #505074.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x6521e06d)

2 files changed, 89 insertions, 1 deletions

diff --git a/app-accessibility/emacspeak/ChangeLog b/app-accessibility/emacspeak/ChangeLog
index ea2621e83328..210b8b48a709 100644
--- a/app-accessibility/emacspeak/ChangeLog
+++ b/app-accessibility/emacspeak/ChangeLog
@@ -1,6 +1,13 @@
 # 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.55 2014/03/19 13:14:19 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/emacspeak/ChangeLog,v 1.56 2014/03/19 22:07:36 teiresias Exp $
+
+*emacspeak-39.0-r2 (19 Mar 2014)
+
+  19 Mar 2014; Christopher Brannon <teiresias@gentoo.org>
+  +emacspeak-39.0-r2.ebuild:
+  Fix dependency. Emacspeak 39.0 won't work with < app-editors/emacs-24.
+  Closes bug #505074.
 
   19 Mar 2014; William Hubbs <williamh@gentoo.org> metadata.xml:
   fix maintainer
diff --git a/app-accessibility/emacspeak/emacspeak-39.0-r2.ebuild b/app-accessibility/emacspeak/emacspeak-39.0-r2.ebuild
new file mode 100644
index 000000000000..28a2622c2700
--- /dev/null
+++ b/app-accessibility/emacspeak/emacspeak-39.0-r2.ebuild
@@ -0,0 +1,81 @@
+# 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-r2.ebuild,v 1.1 2014/03/19 22:07:36 teiresias Exp $
+
+EAPI=5
+
+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"
+fi
+
+DESCRIPTION="the emacspeak audio desktop"
+HOMEPAGE="http://emacspeak.sourceforge.net/"
+LICENSE="BSD GPL-2"
+SLOT="0"
+IUSE="+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
+}
+
+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
+	readme.gentoo_create_doc
+}