add gstreamer support, bug #85673

(Portage version: 2.0.51.19)

4 files changed, 121 insertions, 5 deletions

diff --git a/kde-base/kdeaccessibility/ChangeLog b/kde-base/kdeaccessibility/ChangeLog
index a81c01cc776c..8b477c3bf3e1 100644
--- a/kde-base/kdeaccessibility/ChangeLog
+++ b/kde-base/kdeaccessibility/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeaccessibility
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility/ChangeLog,v 1.62 2005/05/11 22:06:59 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility/ChangeLog,v 1.63 2005/05/16 11:08:27 lanius Exp $
+
+  16 May 2005; Heinrich Wendel <lanius@gentoo.org>
+  +files/kdeaccessibility-3.4.0-noarts.patch, kdeaccessibility-3.4.0.ebuild:
+  add gstreamer support, bug #85673
 
   11 May 2005; Aron Griffis <agriffis@gentoo.org>
   kdeaccessibility-3.4.0.ebuild:
diff --git a/kde-base/kdeaccessibility/Manifest b/kde-base/kdeaccessibility/Manifest
index 979adfeb0506..9ca634d6885a 100644
--- a/kde-base/kdeaccessibility/Manifest
+++ b/kde-base/kdeaccessibility/Manifest
@@ -1,8 +1,9 @@
 MD5 2e40ce3fda5da95b08f1183688cce9cc kdeaccessibility-3.3.2.ebuild 365
-MD5 2783057f6568e5717c5810f63c6f89f3 kdeaccessibility-3.4.0.ebuild 661
+MD5 140c31692d96e10e8313b9838e6e6b3c kdeaccessibility-3.4.0.ebuild 963
 MD5 5465f58f6ff6e91216286364a7d94a50 kdeaccessibility-3.2.3.ebuild 355
 MD5 245d9a66d9250d29e56f6c25a21b4706 ChangeLog 7657
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 a4a2fe961dac0445daa5ceffc2e2c841 files/kdeaccessibility-3.4.0-noarts.patch 3826
 MD5 eb6b70285e7b5fdaae76722a87edf929 files/digest-kdeaccessibility-3.2.3 76
 MD5 39b0d45ba034c139eed4599fe33074d0 files/digest-kdeaccessibility-3.3.2 76
 MD5 9bcbcb53359a15a0ba58301d37537222 files/digest-kdeaccessibility-3.4.0 76
diff --git a/kde-base/kdeaccessibility/files/kdeaccessibility-3.4.0-noarts.patch b/kde-base/kdeaccessibility/files/kdeaccessibility-3.4.0-noarts.patch
new file mode 100644
index 000000000000..f5fbabeb26f5
--- /dev/null
+++ b/kde-base/kdeaccessibility/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/kdeaccessibility/kdeaccessibility-3.4.0.ebuild b/kde-base/kdeaccessibility/kdeaccessibility-3.4.0.ebuild
index 51cc862733a8..3e61c47b2797 100644
--- a/kde-base/kdeaccessibility/kdeaccessibility-3.4.0.ebuild
+++ b/kde-base/kdeaccessibility/kdeaccessibility-3.4.0.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/kdeaccessibility/kdeaccessibility-3.4.0.ebuild,v 1.4 2005/05/11 22:06:59 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility/kdeaccessibility-3.4.0.ebuild,v 1.5 2005/05/16 11:08:27 lanius Exp $
 
 inherit kde-dist
 
@@ -14,10 +14,25 @@ RDEPEND="${DEPEND}
 	arts? ( || ( app-accessibility/festival
 		     app-accessibility/epos
 		     app-accessibility/flite
-		     app-accessibility/freetts ) )"
+		     app-accessibility/freetts ) )
+
+	gstreamer? ( || ( app-accessibility/festival
+		     app-accessibility/epos
+		     app-accessibility/flite ) )"
+
+pkg_setup() {
+	kde_pkg_setup
+	use gstreamer && {
+		ewarn "gstreamer support in kdeaccessibility is experimental"
+	}
+}
+
+src_unpack() {
+	kde_src_unpack
+	epatch ${FILESDIR}/${P}-noarts.patch
+}
 
 src_compile() {
 	myconf="$(use_enable gstreamer kttsd-gstreamer)"
-
 	kde_src_compile
 }