version bump

Package-Manager: portage-2.2.0_alpha6/cvs/Linux i686

5 files changed, 129 insertions, 12 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/Manifest b/app-accessibility/emacspeak/Manifest
index fde3f2f36e10..a2b73d14cc22 100644
--- a/app-accessibility/emacspeak/Manifest
+++ b/app-accessibility/emacspeak/Manifest
@@ -1,18 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX emacspeak-33.0-greader-garbage.patch 372 RMD160 1260a6f7a0bfa93ce7629f1706eec453653fe2fd SHA1 c6949bb8eb382d793faffcb94058b7cb425b8337 SHA256 4170a79826b0c9159bc7da9671e028ccddcec39c2fd8f195eab05175c72d88d0
+AUX emacspeak-33.0-respect-ldflags.patch 1765 RMD160 8801d0452f703e8e6f105c11c8675a113162dd3b SHA1 bcec53941a838d9b39e9e895d99f608c469affa1 SHA256 b76aa6577216970b32cb2be55fe0dbf1bad35de96d72eadfb6a3f2dc82288bab
 DIST emacspeak-30.0-patches.tar.bz2 1609 RMD160 79b4395ee0b74adbdef74f159c7418e4e7ecea26 SHA1 48defa1d34ad9d257fff50c28bd131ad29ebd5e0 SHA256 771c894533f60a2d4fe352255c7d50a2b411fd5f47635d83c95898d41eab3a14
 DIST emacspeak-30.0.tar.bz2 1662093 RMD160 b43d09e979081ef40e6b2c69fc7a9e7d01050443 SHA1 b8bafa3898a003dc1b0f9a8bec6dfa50c213f327 SHA256 1b7d28beaf8cd5b5b5a4d63e813896b51e907dd125e992fbfc85df05feb03e3c
 DIST emacspeak-31.0.tar.bz2 1668085 RMD160 2ae899d82c66db30a19d9252a724133c89cf53a2 SHA1 3717265c427ac045f54c96c3cc72816cefb99735 SHA256 2b759ced3fa509ae8773c832f01b1000ea0b726c3fbe40ac1e72ad3f603049af
+DIST emacspeak-33.0.tar.bz2 6996664 RMD160 cc28ba8329e4060020777e3a305b4c2affe887d2 SHA1 7380f8ecdc53ae6f9183f492335b0229cb639dd1 SHA256 27810e45d29942bf4af23178db6a8947b5f38162445a5b99e6fa9c2eca3f0e9c
 EBUILD emacspeak-30.0.ebuild 891 RMD160 1897506eba07a7464953bde9c10ab9c1b70d535c SHA1 b8e71af57ac3e0c2bd2eacd1cb0ddf6b4b8973be SHA256 e4297e6761409627d309b07572abed745c6e1bb77aef982a33ba4e44bcb7888a
 EBUILD emacspeak-31.0.ebuild 961 RMD160 fbc436b6ae3baa629537f2a66e937193720414bf SHA1 95913b830398ec8e1f7c27bacd75a50b4c1b4a6b SHA256 d987dbc18eb8e532a6ac1408b06d4b1e0ba86f623badf5a8a7aaad9703984f17
+EBUILD emacspeak-33.0.ebuild 1120 RMD160 8ddc32287ee825494a024530c24392b81b09d5a2 SHA1 0959e6dd35791eee6358b93b8ad89eae2999cd30 SHA256 db3b2531ef6dabe141ed400e8320983c45e84dbec1b06220e3428ce0655b1b3c
 EBUILD emacspeak-9999.ebuild 974 RMD160 cc32f66ecb2919da8324b30a4ff29b534e91b449 SHA1 657bce6fc12137f64b3ea6ac506c75372644403d SHA256 db9aa87a7a53035628d2ddd3506971653444fa49ac20a488f6a13c9bb5fd6f5c
-MISC ChangeLog 5720 RMD160 94fef4be8f61bc40fc15c96a832a0a96e02eaaf6 SHA1 04700f3874cb7a0a1b80c20f1f4179354454aae8 SHA256 25d70a53c6c5635ae633c7b92e71d1d0724bd1a5c6739d6fe18fd1c48c7fc3e0
+MISC ChangeLog 5939 RMD160 942074d1a81d8f57f21fc44961c413cbff937a73 SHA1 2c22582b1eb69c5cfb382661aef00763accb0e1a SHA256 5cb3644ebaf9b396c0ca97735de2c5359b9621168f23eb50d6d0201b5433d003
 MISC metadata.xml 663 RMD160 acf42d56ca87e4ae03033cbb5e6a27451bd01533 SHA1 beb04e6cecfc6dff934fc143dcba8dc4d6d75653 SHA256 9b97d1d163d015d1f1c4601cd48ad3e50e009edcfaf107b5fccbabd5d07f0815
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkz0HE8ACgkQNQqtfCuFneOiSACdHC9UMCiWLMBvIsrf9gMAgHtV
-W/4AniMXSsDoPdxK58u8WLs9Xh9NW7Yz
-=qnsL
------END PGP SIGNATURE-----
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
+