Permalink
Browse files

glorious funtoo updates

merged:

  funtoo-overlay: c983d06f29405935b76c197e80d990ca69afa628
  foo-overlay: f7dfe75b6d07da7d211e64f6fc213b9c68f6bd49
  bar-overlay: 0093f8c8d47e0fff61b04424d49241600c99e539
  flora: dbd185f49bc8af154f38e18958ceb41d6cf27078
  for-gentoo: 94f75b16ecfb363c5629fad19a06de20aca10873
  • Loading branch information...
1 parent 652112d commit 3d8c02334b65733e2d83e5e25617b4908361bbc2 @danielrobbins danielrobbins committed Mar 17, 2013
Showing 535 changed files with 2,525 additions and 1,279 deletions.
@@ -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
@@ -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(-)
+
@@ -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
+
@@ -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>
@@ -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."
+}
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <herd>proxy-maintainers</herd>
<maintainer>
<email>patrick@gentoo.org</email>
</maintainer>
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+<herd>proxy-maintainers</herd>
<maintainer>
<email>c1pher@gentoo.org</email>
<name>Dane Smith</name>
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <herd>proxy-maintainers</herd>
<maintainer>
<email>lxnay@gentoo.org</email>
</maintainer>
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <herd>proxy-maintainers</herd>
<maintainer>
<email>lxnay@gentoo.org</email>
</maintainer>
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <herd>proxy-maintainers</herd>
<maintainer>
<email>lxnay@gentoo.org</email>
</maintainer>
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <herd>proxy-maintainers</herd>
<maintainer>
<email>lxnay@gentoo.org</email>
</maintainer>
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+<herd>proxy-maintainers</herd>
<maintainer>
<email>xmw@gentoo.org</email>
<name>Michael Weber</name>
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <herd>proxy-maintainers</herd>
<maintainer>
<email>billie@gentoo.org</email>
<name>Daniel Pielmeier</name>
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+<herd>proxy-maintainers</herd>
<maintainer>
<email>c1pher@gentoo.org</email>
<name>Dane Smith</name>
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <herd>proxy-maintainers</herd>
<maintainer>
<email>hasufell@gentoo.org</email>
<name>Julian Ospald</name>
@@ -1,4 +1,2 @@
-DIST puppet-2.7.18.gem 1920000 SHA256 147cd18ec39d2768bbc40f2735a84f770d9dde1b5679ba21f37edd6f7db19089 SHA512 e51c09baf2eee908f3b4ad1d90c252eb0eca3a1eb550522d0b612db919de305b724a13fdcc7abac51da31291b4a703b2478d2fc9ebfc5aa995ad677aabc42c83 WHIRLPOOL 9f2f4d30acfddd78f0d57ab0a58f400d6c1218e6f5e6541a5f224b9243f5ef5c2dee64bde5a69dff16df42242fa3f44ee226b4aa411a249fc8acafdd1ae17bf3
-DIST puppet-2.7.19.gem 1936384 SHA256 aaa225d83a8fe545a6bcd1b1b6c10373f9cec7c41e38caf56bd0d956892cf2f3 SHA512 3d003c22663226996aa6422d18af446768bd81b67e76e8d1aedf18430bb85df73c3695de9d49340e51f948f661f4c6e24bc83d9d428c9f10634219e01fd641b6 WHIRLPOOL 0ffd63338cc55c13f6bb49bf1487f3b890be04a5ce83939848bace35dd51ff4b01b93ddde146197888455cc65cf8fb4228056c749c7802cd471d9b43dcca5c8c
DIST puppet-2.7.21.gem 2031616 SHA256 a5eecdbe68cde5ebfd576a9af5ddb0c8c17dae224a7d0b3ec240ef54e6bd88a1 SHA512 638c188b945791fe86c1657343f9d7ec3ef7e86342c35e03dacfae4e99e63d8c09160dd1faf840f244b275e6a0aea3b969668debe9dc1b60cef68cb2513068b5 WHIRLPOOL a4bcb4181e57bda6aaf79fdd484903114e94dcf5196105203538d6d8a1bfefcd6db44f74cbef1c209b086d7b2bfab53d62069da1be034e6c35fe686fd00898bc
DIST puppet-3.1.1.tar.gz 1587190 SHA256 4401f6388bb96b1301a107f247af6fa558127d78467bb5cef1a1e0ff66b4463d SHA512 48759776b68f83a125a0c703ecc9ad3efe34f10e6cfd9ddcd9e596ff082c9f40bdb7e0489bf7eb0bb0ce8bdb4ad0ae87049d2ad3133e839d0a5a6caa8419074e WHIRLPOOL d7152ba5397edadba9784f3c1800c8cf31ddd547691b35567ad52a42e82e741256326d2ee0bccec0642e82f533ffb74babcaddf3a0ee54361626b875cc618b2f
Oops, something went wrong.

0 comments on commit 3d8c023

Please sign in to comment.