app-accessibility/speech-dispatcher: Fix linking with gold, #442332; move to new python eclasses, #456978

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

7 files changed, 208 insertions, 12 deletions

diff --git a/app-accessibility/speech-dispatcher/ChangeLog b/app-accessibility/speech-dispatcher/ChangeLog
index 993915368316..1d8c9297423a 100644
--- a/app-accessibility/speech-dispatcher/ChangeLog
+++ b/app-accessibility/speech-dispatcher/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-accessibility/speech-dispatcher
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/ChangeLog,v 1.81 2013/01/01 11:33:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/ChangeLog,v 1.82 2013/03/17 12:15:09 jlec Exp $
+
+*speech-dispatcher-0.7.1-r2 (17 Mar 2013)
+
+  17 Mar 2013; Justin Lecher <jlec@gentoo.org>
+  +speech-dispatcher-0.7.1-r2.ebuild, +files/speech-dispatcher-0.7.1-doc.patch,
+  +files/speech-dispatcher-0.7.1-gold.patch,
+  +files/speech-dispatcher-0.7.1-pthread.patch, metadata.xml:
+  Fix linking with gold, #442332; move to new python eclasses, #456978
 
   01 Jan 2013; Agostino Sarubbo <ago@gentoo.org>
   speech-dispatcher-0.7.1-r1.ebuild:
diff --git a/app-accessibility/speech-dispatcher/Manifest b/app-accessibility/speech-dispatcher/Manifest
index d9ac0df4a5ed..84a48a099abe 100644
--- a/app-accessibility/speech-dispatcher/Manifest
+++ b/app-accessibility/speech-dispatcher/Manifest
@@ -1,4 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX speech-dispatcher-0.7.1-doc.patch 564 SHA256 ae1ab5673c23add5f7e4fbf7f9b3f9ce64f6c0226f00da159a16101d1ffc181d SHA512 83b51fb68eb9b8349d6fc354a9fbfff928a0befbaa382f9fb15d48a1a8fb830cf82352925ef6e9148d12a072900f177b9ad126d7762294601ff375510068e622 WHIRLPOOL 191d8d3023238625b85185272d2ff6b04eb4124357d09f0f261237f136afc45a79ea9fd892cee9db150e3f7841f2e77366820337f1167a22641531a3f3311221
+AUX speech-dispatcher-0.7.1-gold.patch 1035 SHA256 9de1677b2636630f339ece6b884b9201ac1cedfcc6463091356151b8a5c97d16 SHA512 236eb471948e2b9f9b8fcb0f9a563936cf8fd4e2e3767482e17d3816cca56d1ebcd76435333b6fa3193a98398501e6b1876ce96e68b6c5429ca2efb61c8761e7 WHIRLPOOL 5d6289a16e2c08759c19c7e2b11a86e90124bc7ebd497c3bfd9c6c069b6a9a694ddb8ffc6b551e2f8ce985d5981a4ac6d29d706e8eae26d67443dcb17d373cee
+AUX speech-dispatcher-0.7.1-pthread.patch 680 SHA256 462a4b146ca7a3bcbbe24cfb7330d8809e3bd9c5c2979b69f2d9a72b1ab4360b SHA512 90047941aad2062b31990969f635edadffcbf5aa89628619d67139f51e31f0ded74a03a25014e10bb2fba06edd8a3f74716272e8cfe65d0912410f3c539868f3 WHIRLPOOL dcd3fea8807d6f4860b7a0975ec4dd1d62afead291966edb9f69ea99565c785e3922ab6513248e4515aed76d2de49bb7b6f9ccdb4c1710ca1d14daec0001ebab
 DIST speech-dispatcher-0.7.1.tar.gz 1144818 SHA256 a8a9cf299447df4645d36c649977e007a3050ccaecb7f77e2165001ec5794a51 SHA512 a2d5c68a729967b5c93e52793f1b7f5173ad5069f2970e8ea7e8df267f73b9b3930e22ef1ec91fce87d82b94aaaf1c847d19d8ccc837de843e3a3e308fb0b352 WHIRLPOOL aa39e1eca1a7e05cbe9908707d26cc5a26e85f688d0cdf0518fdc067f843f127adf5e9d0d176aed25fe0dcaa30b55c4a59d1671531d5ae7f441eb26d436aa887
 EBUILD speech-dispatcher-0.7.1-r1.ebuild 3071 SHA256 7e2f6de7734486b499f0e6cd88a36fee2ffd5ec59f5bd700e145276a27ab2268 SHA512 e0469cef081fda35d6595e8464190768dcd421545545888866050547f4e39d1d9a112e658a32409a1697d76343f4551335450951f17a073c9fbce37ba408ab79 WHIRLPOOL d4656b1010b445831a2e2672cfbb128523f9694f094c84315316f5af0cfd1015a3d4f157cfdd1353859c6395d4c221921ec18f11b9416c2399fb61118fe5b0f9
-MISC ChangeLog 13501 SHA256 dcb751140c04df2f49b21464ab9195700f35e476463e7f7314d27c31fd4dcb0f SHA512 8957079b7c7bb064a74ecf5ff0c021b08912fbf641097cf043c73bcd9d259c1d907b398f3acc61b1b7be824f6e4a37c99d5b439db234a8b4cfd63112ed57ae98 WHIRLPOOL 68c25b6dfd7308161318c07e18742a8ba5b38c186054ceeaae7b5d95b59406c3933b28245032102351dd866fe30a69ec5e79a27080fa512c562ecc74453fecc8
-MISC metadata.xml 391 SHA256 189a78287c14ae09d0badf2a576e0d4830d0d55c1b6d343b378cf2f77d7f73f7 SHA512 ee80920b36dd0af22ff074078a5e585d267e46eea39a05b7819e310f7560d6867ebb38250634684e7ccad7a2183d610e552e897d286e4172c89fb64bbc5547ae WHIRLPOOL d00913530e1653d8be4a5612f004b555a4ab9988054e2a4b38805ba9c50747a0ba0ccd9aaff98fca1253d9ab390bd15bc947e7c3ec98daa94a7192d7ac2566db
+EBUILD speech-dispatcher-0.7.1-r2.ebuild 3043 SHA256 75c7596c2f1ee7d8b02c7983287d18a732f4332f6c55b6d17197c9263195366d SHA512 b9f964b9144a3a3e7c25ee573353b705069c1581a2da6e7d89a7ca13d1bab087ce11da3033fb818eae92560c2548386fe252be9aeb2d8eac468c7dbc278a0c1a WHIRLPOOL 580a2e9610586cc0d20caebe5b62a7ecb3e2a1457ddf3660b4f54a972984f23105b18630fd2e8a8600a2e6dcb5db6bc28fadc8d2f9895c3c03453fbb2806f4bf
+MISC ChangeLog 13851 SHA256 1e99a641458744c429590acf963c561a27864ac5a31b41f7f35e93efdcc0c7bf SHA512 c94bff9fa5bf6e738b117ad95f1a30dc3b84201dae14cd82485707b344cdddfcd73713b0402b8db0c6b08ca5bfe06cbad17c338651a7f500c220d99ffe93799c WHIRLPOOL 674a1b7aba3eba801b235c6eb2fc8256b7c34d292d2d95b27c1654eb993849047a2995bcf6f828a4ba7fb82a3a5bc694474b7f8b39d30af8f1e23995c9cccdfa
+MISC metadata.xml 412 SHA256 f03dfc51c83a001a6017cabba62b69f201d3a527831c1fbf111bbd4e2b3987cf SHA512 9736a290321013fea14ecdb72a7841b69bb5fdf35d22777470a37ba3e9cf5f55d9ca58e9abd8d891911d980ef0b5c12a805d174e72899150a49b8eb530d9ffb3 WHIRLPOOL feb7be9013b13f3ea41f237dfe575533e4d6a4a6ba9431f816257ecb820837f284ebaa192813b77bcf896a4927d2a2d2e562b9bc842dd44e200a9cb601ba28e9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREKAAYFAlFFs9IACgkQgAnW8HDreRYzbwCfUTqSekBXMgseGBEqVrLSvoSj
+hwYAnRxzH7iV45Y/Hf5H2OPQ2VBimJrz
+=Ee0J
+-----END PGP SIGNATURE-----
diff --git a/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.7.1-doc.patch b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.7.1-doc.patch
new file mode 100644
index 000000000000..af9b0896c261
--- /dev/null
+++ b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.7.1-doc.patch
@@ -0,0 +1,10 @@
+Index: speech-dispatcher/doc/Makefile.am
+===================================================================
+--- speech-dispatcher.orig/doc/Makefile.am	2010-09-13 17:50:28.000000000 +0200
++++ speech-dispatcher/doc/Makefile.am	2010-09-13 17:50:36.000000000 +0200
+@@ -1,3 +1,3 @@
+ 
+-info_TEXINFOS = ssip.texi speech-dispatcher.texi spd-say.texi
+-EXTRA_DIST = figures gpl.texi fdl.texi speech-dispatcher-cs.texi speech-dispatcher-cs.texi
++info_TEXINFOS = ssip.texi speech-dispatcher.texi spd-say.texi speech-dispatcher-cs.texi
++EXTRA_DIST = figures gpl.texi fdl.texi
diff --git a/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.7.1-gold.patch b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.7.1-gold.patch
new file mode 100644
index 000000000000..54f87d290c07
--- /dev/null
+++ b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.7.1-gold.patch
@@ -0,0 +1,29 @@
+ src/audio/Makefile.am | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am
+index 3b596f6..ec23c9f 100644
+--- a/src/audio/Makefile.am
++++ b/src/audio/Makefile.am
+@@ -11,7 +11,7 @@ endif
+ 
+ if pulse_support
+ PULSE_FLAGS = -DWITH_PULSE
+-PULSE_LIBS = -lpulse-simple
++PULSE_LIBS = -lpulse-simple -lpulse
+ endif
+ 
+ if alsa_support
+@@ -31,7 +31,8 @@ endif
+ EXTRA_DIST = alsa.c libao.c oss.c nas.c pulse.c
+ 
+ AM_CFLAGS = $(am_cflags) $(NAS_FLAGS) $(PULSE_FLAGS) $(ALSA_FLAGS) $(LIBAO_FLAGS) $(LIBOSS_FLAGS)
+-libsdaudio_la_LDFLAGS = -version-info @LIB_SDAUDIO_CURRENT@:@LIB_SDAUDIO_REVISION@:@LIB_SDAUDIO_AGE@ -lpthread $(NAS_LIBS) $(PULSE_LIBS) $(ALSA_LIBS) $(LIBAO_LIBS)
++libsdaudio_la_LDFLAGS = -version-info @LIB_SDAUDIO_CURRENT@:@LIB_SDAUDIO_REVISION@:@LIB_SDAUDIO_AGE@
++libsdaudio_la_LIBADD = -lpthread $(NAS_LIBS) $(PULSE_LIBS) $(ALSA_LIBS) $(LIBAO_LIBS)
+ 
+ spdlib_LTLIBRARIES = libsdaudio.la
+ 
+ src/audio/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
diff --git a/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.7.1-pthread.patch b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.7.1-pthread.patch
new file mode 100644
index 000000000000..8b9577144482
--- /dev/null
+++ b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.7.1-pthread.patch
@@ -0,0 +1,13 @@
+Index: speech-dispatcher/src/c/api/Makefile.am
+===================================================================
+--- speech-dispatcher.orig/src/c/api/Makefile.am	2010-10-01 20:17:24.000000000 +0200
++++ speech-dispatcher/src/c/api/Makefile.am	2010-10-01 20:17:26.000000000 +0200
+@@ -8,6 +8,6 @@
+ libspeechd_la_SOURCES = libspeechd.c
+ libspeechd_la_HEADERS = libspeechd.h
+ libspeechd_ladir = $(includedir)
+-libspeechd_la_LDFLAGS = -version-info @LIB_SPD_CURRENT@:@LIB_SPD_REVISION@:@LIB_SPD_AGE@ -lpthread
+-libspeechd_la_LIBADD = @glib_libs@
++libspeechd_la_LDFLAGS = -version-info @LIB_SPD_CURRENT@:@LIB_SPD_REVISION@:@LIB_SPD_AGE@
++libspeechd_la_LIBADD = @glib_libs@ -lpthread
+ 
diff --git a/app-accessibility/speech-dispatcher/metadata.xml b/app-accessibility/speech-dispatcher/metadata.xml
index 64fdbe0bae0d..9c608d4058b8 100644
--- a/app-accessibility/speech-dispatcher/metadata.xml
+++ b/app-accessibility/speech-dispatcher/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>accessibility</herd>
-<herd>sound</herd>
-<maintainer>
-	<email>williamh@gentoo.org</email>
-</maintainer>
-<use>
-	<flag name='espeak'>Adds support for espeak speech engine</flag>
-	<flag name='flite'>Adds support for flite speech engine</flag>
-</use>
+  <herd>accessibility</herd>
+  <herd>sound</herd>
+  <maintainer>
+    <email>williamh@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="espeak">Adds support for espeak speech engine</flag>
+    <flag name="flite">Adds support for flite speech engine</flag>
+  </use>
 </pkgmetadata>
diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.7.1-r2.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.7.1-r2.ebuild
new file mode 100644
index 000000000000..53fd040d31e1
--- /dev/null
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.7.1-r2.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/speech-dispatcher-0.7.1-r2.ebuild,v 1.1 2013/03/17 12:15:09 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils python-r1
+
+DESCRIPTION="Speech synthesis interface"
+HOMEPAGE="http://www.freebsoft.org/speechd"
+SRC_URI="http://www.freebsoft.org/pub/projects/speechd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="alsa ao +espeak flite nas pulseaudio python static-libs"
+
+RDEPEND="
+	dev-libs/dotconf
+	>=dev-libs/glib-2
+	alsa? ( media-libs/alsa-lib )
+	ao? ( media-libs/libao )
+	espeak? ( app-accessibility/espeak )
+	flite? ( app-accessibility/flite )
+	nas? ( media-libs/nas )
+	pulseaudio? ( media-sound/pulseaudio )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-pthread.patch
+	"${FILESDIR}"/${P}-doc.patch
+	"${FILESDIR}"/${P}-gold.patch
+	)
+
+src_prepare() {
+	# Python bindings are built/installed manually.
+	sed -e "/SUBDIRS += python/d" -i src/Makefile.am || die
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable python)
+		$(use_with alsa)
+		$(use_with ao libao)
+		$(use_with espeak)
+		$(use_with flite)
+		$(use_with pulseaudio pulse)
+		$(use_with nas)
+		)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	use python && python_copy_sources
+
+	autotools-utils_src_compile all
+
+	if use python; then
+		building() {
+			cd src/python || die
+			emake \
+				pyexecdir="$(python_get_sitedir)" \
+				pythondir="$(python_get_sitedir)"
+		}
+		python_foreach_impl run_in_build_dir building
+	fi
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	if use python; then
+		installation() {
+			cd src/python || die
+			emake \
+				DESTDIR="${D}" \
+				pyexecdir="$(python_get_sitedir)" \
+				pythondir="$(python_get_sitedir)" \
+				install
+		}
+		python_foreach_impl run_in_build_dir installation
+		python_replicate_script "${ED}"/usr/bin/spd-conf
+	fi
+
+	local f
+	for f in clibrary clibrary2 connection_recovery long_message run_test; do
+		rm "${ED}"/usr/bin/${f} || die
+	done
+}
+
+pkg_postinst() {
+	local editconfig="n"
+	if ! use espeak; then
+		ewarn "You have disabled espeak, which is speech-dispatcher's"
+		ewarn "default speech synthesizer."
+		ewarn
+		editconfig="y"
+	fi
+	if ! use pulseaudio; then
+		ewarn "You have disabled pulseaudio support."
+		ewarn "pulseaudio is speech-dispatcher's default audio subsystem."
+		ewarn
+		editconfig="y"
+	fi
+	if [[ "${editconfig}" == "y" ]]; then
+		ewarn "You must edit ${EROOT}etc/speech-dispatcher/speechd.conf"
+		ewarn "and make sure the settings there match your system."
+		ewarn
+	fi
+	ewarn "This version does not include a system wide startup script"
+	ewarn "since it is not intended to be run in system-wide mode."
+	ewarn
+	elog "For festival support, you need to"
+	elog "install app-accessibility/festival-freebsoft-utils."
+}