add gstreamer patch, same as in kdeaccessibility

Package-Manager: portage-2.0.51.22-r1

4 files changed, 141 insertions, 13 deletions

diff --git a/kde-base/kttsd/ChangeLog b/kde-base/kttsd/ChangeLog
index e36a1de4f5ec..5b29204071a5 100644
--- a/kde-base/kttsd/ChangeLog
+++ b/kde-base/kttsd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kttsd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kttsd/ChangeLog,v 1.8 2005/05/25 21:23:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kttsd/ChangeLog,v 1.9 2005/06/15 16:06:23 lanius Exp $
+
+  15 Jun 2005; Heinrich Wendel <lanius@gentoo.org>
+  +files/kdeaccessibility-3.4.0-noarts.patch, kttsd-3.4.1.ebuild:
+  add gstreamer patch, same as in kdeaccessibility
 
 *kttsd-3.4.1 (25 May 2005)
 
diff --git a/kde-base/kttsd/Manifest b/kde-base/kttsd/Manifest
index 96312e15b275..4ac8d1276fec 100644
--- a/kde-base/kttsd/Manifest
+++ b/kde-base/kttsd/Manifest
@@ -1,6 +1,17 @@
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 4e55b46c39fc5599d29903a90ead99cf ChangeLog 1378
-MD5 f687259cfb980d33961040a5a479c14b kttsd-3.4.1.ebuild 748
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 f7ef7f16a7433d1c9b70f642cf09913c kttsd-3.4.0.ebuild 747
+MD5 3595d6be7404b6573d3713b5eddc1a84 ChangeLog 1545
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 df7a4d014258cdbe722ea1d17636fe3e kttsd-3.4.1.ebuild 1168
+MD5 a4a2fe961dac0445daa5ceffc2e2c841 files/kdeaccessibility-3.4.0-noarts.patch 3826
 MD5 9bcbcb53359a15a0ba58301d37537222 files/digest-kttsd-3.4.0 76
 MD5 a2ff872942277aa4226570c6c728c417 files/digest-kttsd-3.4.1 236
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCsFIgevY57Fted3ERAlJEAJ0b3PK53lBGSb3dUp98aaVpI+1UCwCgs4uL
+WcRIo8DBYYCj6Eqn6PYUVL4=
+=Mzng
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kttsd/files/kdeaccessibility-3.4.0-noarts.patch b/kde-base/kttsd/files/kdeaccessibility-3.4.0-noarts.patch
new file mode 100644
index 000000000000..f5fbabeb26f5
--- /dev/null
+++ b/kde-base/kttsd/files/kdeaccessibility-3.4.0-noarts.patch
@@ -0,0 +1,96 @@
+--- kttsd/configure.in.in.org	2005-03-17 22:25:56.000000000 +0100
++++ kttsd/configure.in.in	2005-03-17 22:26:25.000000000 +0100
+@@ -2,10 +2,6 @@
+ 
+ ### AM_INIT_AUTOMAKE(kttsd,0.2.0)
+ 
+-if test "x$build_arts" = "xno"; then
+-	DO_NOT_COMPILE="$DO_NOT_COMPILE kttsd"
+-fi
+-
+ AC_ARG_ENABLE(kttsd-gstreamer,
+               AC_HELP_STRING([--enable-kttsd-gstreamer],
+                              [build KTTSD GStreamer audio plugin [default=no]]),
+--- kttsd/plugins/freetts/configure.in.in.org	2005-03-17 22:29:06.000000000 +0100
++++ kttsd/plugins/freetts/configure.in.in	2005-03-17 22:29:13.000000000 +0100
+@@ -13,6 +13,10 @@
+ if test "x$freetts_plugin" = "xno"; then
+   compile_freetts_plugin="no"
+ fi
++if test "x$build_arts" = "xno"; then
++  compile_freetts_plugin="no"
++fi
++
+ 
+ dnl Check for festival executable.
+ dnl Note that Festival Interactive plugin is always built
+--- kttsd/configure.in.in.org	2005-03-17 22:25:56.000000000 +0100
++++ kttsd/configure.in.in	2005-03-17 22:49:26.000000000 +0100
+@@ -126,6 +126,7 @@
+ fi
+ 
+ AM_CONDITIONAL(include_kttsd_gstplayer, [test "x$have_gst" = "xyes" && test "x$gstreamer_plugin" = "xyes"])
++AM_CONDITIONAL(include_kttsd_arts, [test "x$build_arts" = "xyes"])
+ 
+ dnl ================================================================================
+ 
+--- kttsd/players/Makefile.am.orig	2005-03-17 22:55:21.000000000 +0100
++++ kttsd/players/Makefile.am	2005-03-17 22:54:34.000000000 +0100
+@@ -3,8 +3,10 @@
+     gstplayer_DIR = gstplayer
+ endif
+ 
+-SUBDIRS = \
+-    artsplayer \
+-    $(gstplayer_DIR)
++if include_kttsd_arts
++   artsplayer_DIR = artsplayer
++endif
++
++SUBDIRS = $(artsplayer_DIR) $(gstplayer_DIR)
+ 
+ kde_servicetypes_DATA = kttsd_audioplugin.desktop
+--- kttsd/plugins/command/Makefile.am.org	2005-03-17 22:59:24.000000000 +0100
++++ kttsd/plugins/command/Makefile.am	2005-03-17 22:59:58.000000000 +0100
+@@ -16,7 +16,7 @@
+         commandproc.cpp \
+         commandplugin.cpp
+ libkttsd_commandplugin_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
+-libkttsd_commandplugin_la_LIBADD = $(top_builddir)/kttsd/libkttsd/libkttsd.la -lartskde
++libkttsd_commandplugin_la_LIBADD = $(top_builddir)/kttsd/libkttsd/libkttsd.la
+ 
+ services_DATA = kttsd_commandplugin.desktop
+ servicesdir = $(kde_servicesdir)
+--- kttsd/plugins/epos/Makefile.am.org	2005-03-17 22:59:35.000000000 +0100
++++ kttsd/plugins/epos/Makefile.am	2005-03-17 23:00:05.000000000 +0100
+@@ -16,7 +16,7 @@
+         eposproc.cpp \
+         eposplugin.cpp 
+ libkttsd_eposplugin_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
+-libkttsd_eposplugin_la_LIBADD = $(top_builddir)/kttsd/libkttsd/libkttsd.la -lartskde
++libkttsd_eposplugin_la_LIBADD = $(top_builddir)/kttsd/libkttsd/libkttsd.la
+ 
+ services_DATA = kttsd_eposplugin.desktop
+ servicesdir = $(kde_servicesdir)
+--- kttsd/plugins/flite/Makefile.am.org	2005-03-17 22:59:42.000000000 +0100
++++ kttsd/plugins/flite/Makefile.am	2005-03-17 23:00:11.000000000 +0100
+@@ -16,7 +16,7 @@
+         fliteproc.cpp \
+         fliteplugin.cpp 
+ libkttsd_fliteplugin_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
+-libkttsd_fliteplugin_la_LIBADD = $(top_builddir)/kttsd/libkttsd/libkttsd.la -lartskde
++libkttsd_fliteplugin_la_LIBADD = $(top_builddir)/kttsd/libkttsd/libkttsd.la
+ 
+ services_DATA = kttsd_fliteplugin.desktop
+ servicesdir = $(kde_servicesdir)
+--- kttsd/plugins/hadifix/Makefile.am.org	2005-03-17 22:59:50.000000000 +0100
++++ kttsd/plugins/hadifix/Makefile.am	2005-03-17 23:00:20.000000000 +0100
+@@ -17,7 +17,7 @@
+ 	hadifixconfigui.ui \
+ 	voicefileui.ui
+ libkttsd_hadifixplugin_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
+-libkttsd_hadifixplugin_la_LIBADD = $(LIB_KDECORE) $(LIB_KFILE) -lartskde $(top_builddir)/kttsd/libkttsd/libkttsd.la
++libkttsd_hadifixplugin_la_LIBADD = $(LIB_KDECORE) $(LIB_KFILE) $(top_builddir)/kttsd/libkttsd/libkttsd.la
+ 
+ EXTRA_DIST = male.png female.png 
+ 
diff --git a/kde-base/kttsd/kttsd-3.4.1.ebuild b/kde-base/kttsd/kttsd-3.4.1.ebuild
index 0362a36b49d6..e183489a73f3 100644
--- a/kde-base/kttsd/kttsd-3.4.1.ebuild
+++ b/kde-base/kttsd/kttsd-3.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kttsd/kttsd-3.4.1.ebuild,v 1.2 2005/05/26 17:14:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kttsd/kttsd-3.4.1.ebuild,v 1.3 2005/06/15 16:06:23 lanius Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
@@ -9,17 +9,34 @@ inherit kde-meta
 DESCRIPTION="KDE text-to-speech subsystem"
 KEYWORDS="~x86 ~amd64 ~ppc64 ~ppc ~sparc"
 IUSE="gstreamer"
-DEPEND="$(deprange $PV $MAXKDEVER kde-base/arts)
+DEPEND="arts? ( $(deprange $PV $MAXKDEVER kde-base/arts) )
 	$(deprange-dual $PV $MAXKDEVER kde-base/kcontrol)
 	gstreamer? ( >=media-libs/gstreamer-0.8.7 )
 	>=dev-util/pkgconfig-0.9.0"
 
-RDEPEND="
-|| ( app-accessibility/festival
-app-accessibility/epos
-app-accessibility/flite
-app-accessibility/freetts
-)"
+RDEPEND="${DEPEND}
+	arts? ( || ( app-accessibility/festival
+		     app-accessibility/epos
+		     app-accessibility/flite
+		     app-accessibility/freetts ) )
 
-myconf="$(use_enable gstreamer kttsd-gstreamer)"
+	gstreamer? ( || ( app-accessibility/festival
+		     app-accessibility/epos
+		     app-accessibility/flite ) )"
 
+pkg_setup() {
+	kde_pkg_setup
+	if use gstreamer; then
+		ewarn "gstreamer support in kdeaccessibility is experimental"
+	fi
+}
+
+src_unpack() {
+	kde-meta_src_unpack
+	epatch ${FILESDIR}/kdeaccessibility-3.4.0-noarts.patch
+}
+
+src_compile() {
+	myconf="$(use_enable gstreamer kttsd-gstreamer)"
+	kde-meta_src_compile
+}