Remove arts related patch and clean ebuilds, wrt bug 291546.

(Portage version: 14270-svn/cvs/Linux i686)

4 files changed, 12 insertions, 51 deletions

diff --git a/media-libs/mediastreamer/ChangeLog b/media-libs/mediastreamer/ChangeLog
index 5a766442c596..3f7666f83863 100644
--- a/media-libs/mediastreamer/ChangeLog
+++ b/media-libs/mediastreamer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/mediastreamer
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/ChangeLog,v 1.19 2009/11/11 13:13:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/ChangeLog,v 1.20 2009/11/15 13:56:03 volkmar Exp $
+
+  15 Nov 2009; Mounir Lamouri <volkmar@gentoo.org>
+  mediastreamer-2.2.3_p1-r1.ebuild,
+  -files/mediastreamer-2.2.3_p1-arts.patch, mediastreamer-2.2.4.ebuild:
+  Remove arts related patch and clean ebuilds, wrt bug 291546
 
   11 Nov 2009; Samuli Suominen <ssuominen@gentoo.org>
   mediastreamer-2.2.3_p1-r1.ebuild, mediastreamer-2.2.4.ebuild:
diff --git a/media-libs/mediastreamer/files/mediastreamer-2.2.3_p1-arts.patch b/media-libs/mediastreamer/files/mediastreamer-2.2.3_p1-arts.patch
deleted file mode 100644
index 32837a0d9467..000000000000
--- a/media-libs/mediastreamer/files/mediastreamer-2.2.3_p1-arts.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- configure.ac.old	2009-04-26 11:59:41.000000000 -0400
-+++ configure.ac	2009-04-26 12:00:24.000000000 -0400
-@@ -216,15 +216,11 @@
- 	],[
- 		dnl Old detection
- 		if test x$artsc = xtrue ; then
--			AC_CHECK_HEADERS(kde/artsc/artsc.h,
--				[ AC_CHECK_LIB(artsc,arts_init, 
--					[ ARTS_LIBS="-lartsc"
--					arts_enabled=true
--					])
--				]
--			)
-+			 MS_CHECK_DEP([ARTS],[ARTS],[/usr/kde/3.5/include],[/usr/kde/3.5/lib],[artsc/artsc.h],[artsc],[arts_init])
-+			 if test "$ARTS_found" = "yes"; then
-+				 arts_enabled=true
-+			 fi
- 		fi
--		AC_SUBST(ARTS_LIBS)
- 	])
- fi
- 
---- src/Makefile.am.old	2009-04-26 12:00:39.000000000 -0400
-+++ src/Makefile.am	2009-04-26 12:01:03.000000000 -0400
-@@ -127,6 +127,7 @@
-                 $(ORTP_CFLAGS)   \
- 		$(SPEEX_CFLAGS)  \
- 		$(GSM_CFLAGS)    \
-+		$(ARTS_CFLAGS)   \
- 		$(STRICT_OPTIONS)
- 
- if BUILD_VIDEO
diff --git a/media-libs/mediastreamer/mediastreamer-2.2.3_p1-r1.ebuild b/media-libs/mediastreamer/mediastreamer-2.2.3_p1-r1.ebuild
index 3fed34c9208c..00dd949ed733 100644
--- a/media-libs/mediastreamer/mediastreamer-2.2.3_p1-r1.ebuild
+++ b/media-libs/mediastreamer/mediastreamer-2.2.3_p1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.2.3_p1-r1.ebuild,v 1.9 2009/11/11 13:13:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.2.3_p1-r1.ebuild,v 1.10 2009/11/15 13:56:03 volkmar Exp $
 
 EAPI="2"
 
@@ -65,9 +65,6 @@ src_prepare() {
 	# fixing doc, oss, jack, gsm, speex, theora and X auto-magic deps
 	epatch "${FILESDIR}"/${P}-autodeps.patch
 
-	# fix arts detection for gentoo
-	epatch "${FILESDIR}"/${P}-arts.patch
-
 	# too hard to have a flexible lib dir in a clean way
 	sed -i -e "s:\(/usr/kde/3.5/\)lib:\1$(get_libdir):" configure.ac \
 		|| die "patching configure.ac failed"
@@ -88,10 +85,6 @@ src_prepare() {
 
 	eautoreconf
 
-	# fix arts include
-	sed -i -e "s:kde/\(artsc/artsc.h\):\1:" src/arts.c \
-		|| die "patching src/arts.c failed"
-
 	# don't build examples in tests/
 	sed -i -e "s:\(SUBDIRS = .*\) tests \(.*\):\1 \2:" Makefile.in \
 		|| die "patching Makefile.in failed"
@@ -101,6 +94,7 @@ src_configure() {
 	# strict: don't want -Werror
 	# macsnd and macaqsnd: macosx related
 	# external-ortp: don't use bundled libs
+	# arts: arts is deprecated
 	econf \
 		--htmldir=/usr/share/doc/${PF}/html \
 		--datadir=/usr/share/${PN} \
@@ -110,8 +104,8 @@ src_configure() {
 		--disable-macaqsnd \
 		--enable-external-ortp \
 		--disable-dependency-tracking \
-		$(use_enable alsa) \
 		--disable-artsc \
+		$(use_enable alsa) \
 		$(use_enable debug) \
 		$(use_enable doc) \
 		$(use_enable gsm) \
diff --git a/media-libs/mediastreamer/mediastreamer-2.2.4.ebuild b/media-libs/mediastreamer/mediastreamer-2.2.4.ebuild
index c95f33d8843d..9f77a0e58586 100644
--- a/media-libs/mediastreamer/mediastreamer-2.2.4.ebuild
+++ b/media-libs/mediastreamer/mediastreamer-2.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.2.4.ebuild,v 1.2 2009/11/11 13:13:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.2.4.ebuild,v 1.3 2009/11/15 13:56:03 volkmar Exp $
 
 EAPI="2"
 
@@ -53,9 +53,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# fix arts detection for gentoo
-	epatch "${FILESDIR}"/${PN}-2.2.3_p1-arts.patch
-
 	# too hard to have a flexible lib dir in a clean way
 	sed -i -e "s:\(/usr/kde/3.5/\)lib:\1$(get_libdir):" configure.ac \
 		|| die "patching configure.ac failed"
@@ -76,10 +73,6 @@ src_prepare() {
 
 	eautoreconf
 
-	# fix arts include
-	sed -i -e "s:kde/\(artsc/artsc.h\):\1:" src/arts.c \
-		|| die "patching src/arts.c failed"
-
 	# don't build examples in tests/
 	sed -i -e "s:\(SUBDIRS = .*\) tests \(.*\):\1 \2:" Makefile.in \
 		|| die "patching Makefile.in failed"
@@ -89,6 +82,7 @@ src_configure() {
 	# strict: don't want -Werror
 	# macsnd and macaqsnd: macosx related
 	# external-ortp: don't use bundled libs
+	# arts: arts is deprecated
 	econf \
 		--htmldir=/usr/share/doc/${PF}/html \
 		--datadir=/usr/share/${PN} \
@@ -98,8 +92,8 @@ src_configure() {
 		--disable-macaqsnd \
 		--enable-external-ortp \
 		--disable-dependency-tracking \
-		$(use_enable alsa) \
 		--disable-artsc \
+		$(use_enable alsa) \
 		$(use_enable debug) \
 		$(use_enable doc) \
 		$(use_enable gsm) \