diff options
4 files changed, 124 insertions, 1 deletions
diff --git a/app-accessibility/emacspeak/ChangeLog b/app-accessibility/emacspeak/ChangeLog index 2a4e77077b9d..e4b8566c3a93 100644 --- a/app-accessibility/emacspeak/ChangeLog +++ b/app-accessibility/emacspeak/ChangeLog @@ -1,6 +1,13 @@ # 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.43 2010/11/29 21:32:32 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/emacspeak/ChangeLog,v 1.44 2010/12/02 15:31:41 williamh Exp $ + +*emacspeak-33.0 (02 Dec 2010) + + 02 Dec 2010; William Hubbs <williamh@gentoo.org> +emacspeak-33.0.ebuild, + +files/emacspeak-33.0-greader-garbage.patch, + +files/emacspeak-33.0-respect-ldflags.patch: + version bump 29 Nov 2010; Christian Faulhammer <fauli@gentoo.org> metadata.xml: Add to emacs herd diff --git a/app-accessibility/emacspeak/emacspeak-33.0.ebuild b/app-accessibility/emacspeak/emacspeak-33.0.ebuild new file mode 100644 index 000000000000..30ce4f0d9535 --- /dev/null +++ b/app-accessibility/emacspeak/emacspeak-33.0.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/emacspeak/emacspeak-33.0.ebuild,v 1.1 2010/12/02 15:31:41 williamh Exp $ + +EAPI="2" + +inherit eutils + +DESCRIPTION="the emacspeak audio desktop" +HOMEPAGE="http://emacspeak.sourceforge.net/" +SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.bz2" +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="~ppc ~x86" +IUSE="+espeak" + +DEPEND=">=virtual/emacs-22 + espeak? ( app-accessibility/espeak )" + +RDEPEND="${DEPEND} + >=dev-tcltk/tclx-8.4" + +src_prepare() { + epatch "${FILESDIR}"/${P}-greader-garbage.patch + epatch "${FILESDIR}"/${P}-respect-ldflags.patch +} + +src_configure() { + make config || die +} + +src_compile() { + make emacspeak || die + if use espeak; then + cd servers/linux-espeak + make TCL_VERSION=8.5 || die + fi +} + +src_install() { + make DESTDIR="${D}" install || die + if use espeak; then + cd servers/linux-espeak + make DESTDIR="${D}" install || die "espeak server instalation failed" + fi + dodoc README etc/NEWS* etc/FAQ etc/COPYRIGHT + dohtml -r install-guide user-guide +} diff --git a/app-accessibility/emacspeak/files/emacspeak-33.0-greader-garbage.patch b/app-accessibility/emacspeak/files/emacspeak-33.0-greader-garbage.patch new file mode 100644 index 000000000000..5919d125c88b --- /dev/null +++ b/app-accessibility/emacspeak/files/emacspeak-33.0-greader-garbage.patch @@ -0,0 +1,11 @@ +--- emacspeak-33.0-orig/lisp/g-client/greader.el ++++ emacspeak-33.0/lisp/g-client/greader.el +@@ -704,7 +704,7 @@ + + (defvar greader-contents-rest-url + "http://www.google.com/reader/api/0/stream/items/contents" +- "REST endpoint for getting content.")e ++ "REST endpoint for getting content.") + + (defun greader-search-results (query) + "Return GReader search results." diff --git a/app-accessibility/emacspeak/files/emacspeak-33.0-respect-ldflags.patch b/app-accessibility/emacspeak/files/emacspeak-33.0-respect-ldflags.patch new file mode 100644 index 000000000000..57f4eb65e65c --- /dev/null +++ b/app-accessibility/emacspeak/files/emacspeak-33.0-respect-ldflags.patch @@ -0,0 +1,57 @@ +From aa02a6b3aed32612ca1c2c69fc9d0234efeeef0e Mon Sep 17 00:00:00 2001 +From: William Hubbs <w.d.hubbs@gmail.com> +Date: Wed, 1 Dec 2010 17:41:35 -0600 +Subject: [PATCH] server makefiles should respect LDFLAGS + +--- + servers/linux-espeak/Makefile | 2 +- + servers/linux-outloud/Makefile | 4 ++-- + servers/software-dtk/Makefile | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/servers/linux-espeak/Makefile b/servers/linux-espeak/Makefile +index 2fd8f66..d247b04 100644 +--- a/servers/linux-espeak/Makefile ++++ b/servers/linux-espeak/Makefile +@@ -15,7 +15,7 @@ TTS=tclespeak.so + all: $(TTS) + + $(TTS): tclespeak.o +- $(CXX) -shared -o $@ $< $(LIBS) ++ $(CXX) $(LDFLAGS) -shared -o $@ $< $(LIBS) + + clean: + rm -f *.so *.o +diff --git a/servers/linux-outloud/Makefile b/servers/linux-outloud/Makefile +index 0e5a061..c6915a8 100644 +--- a/servers/linux-outloud/Makefile ++++ b/servers/linux-outloud/Makefile +@@ -15,10 +15,10 @@ LIBS= -ltcl$(TCL_VERSION) -lasound -ldl + all: atcleci.so + + atcleci.so: langswitch.o atcleci.o +- $(CXX) -m32 -shared -o $@ langswitch.o atcleci.o $(LIBS) ++ $(CXX) $(LDFLAGS) -m32 -shared -o $@ langswitch.o atcleci.o $(LIBS) + + alsaparams: alsaparams.o +- $(CC) -o $@ alsaparams.o -lasound ++ $(CC) $(LDFLAGS) -o $@ alsaparams.o -lasound + + clean: + rm -f *.so *.o +diff --git a/servers/software-dtk/Makefile b/servers/software-dtk/Makefile +index 383592e..1b623bd 100644 +--- a/servers/software-dtk/Makefile ++++ b/servers/software-dtk/Makefile +@@ -11,7 +11,7 @@ SERVER_DIR=/usr/share/emacs/site-lisp/emacspeak/servers/software-dtk + FILES=tcldtk.c tcldtk.so tcldtk.o Makefile + + tcldtk.so: tcldtk.o +- $(CC) -shared -o $@ $< $(LIBS) ++ $(CC) $(LDFLAGS) -shared -o $@ $< $(LIBS) + + dist: software-dtk.tar.gz + +-- +1.7.2.2 + |