add patch to compile without arts, bug #61366

4 files changed, 47 insertions, 4 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index 2dfc6cff44a6..a4f5f1b5ce30 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/k3b
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.74 2004/09/23 19:58:21 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.75 2004/09/25 15:45:39 lanius Exp $
+
+  25 Sep 2004; Heinrich Wendel <lanius@gentoo.org>
+  +files/k3b-0.11.17-noarts.patch, k3b-0.11.17.ebuild:
+  add patch to compile without arts, bug #61366
 
 *k3b-0.11.17 (23 Sep 2004)
 
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index 8cb6c8d5cf51..ad8a371e7b9e 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -1,11 +1,12 @@
-MD5 ad6cc23d8c2894be5446f01ff44215df k3b-0.11.17.ebuild 3304
+MD5 82cab9fe0bc93478908908ad60ad0a6e k3b-0.11.17.ebuild 3377
 MD5 9616c81d25a5d0b68a5a1ac9f3d65106 k3b-0.11.14.ebuild 3286
 MD5 35905c7d679952e6848332c01fd19d5e k3b-0.11.16.ebuild 3286
 MD5 c016b365aa32b8fccc4e2aba09872ff1 k3b-0.11.12-r1.ebuild 3438
 MD5 c62ec660ddb5d4799019a2c6dd0b261a k3b-0.11.10.ebuild 3485
-MD5 b77ff66402f4bbf36792d70ac07e222b ChangeLog 10723
+MD5 49a4e07404adde5458de1686edfd5068 ChangeLog 10879
 MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
 MD5 090e222085c5d03ed73630217ec680ea files/digest-k3b-0.11.12-r1 205
+MD5 513df86e2c91f7c1209b63cea7d41b84 files/k3b-0.11.17-noarts.patch 893
 MD5 457551a84f78e8240d3b588d35892208 files/digest-k3b-0.11.10 205
 MD5 0ac0fbb1d64aa75bb3b32c9a31f791ed files/digest-k3b-0.11.14 132
 MD5 a6dc23f5f1b7b71b14d773aac51954d7 files/digest-k3b-0.11.16 132
diff --git a/app-cdr/k3b/files/k3b-0.11.17-noarts.patch b/app-cdr/k3b/files/k3b-0.11.17-noarts.patch
new file mode 100644
index 000000000000..ccb15bdd389a
--- /dev/null
+++ b/app-cdr/k3b/files/k3b-0.11.17-noarts.patch
@@ -0,0 +1,33 @@
+--- kdeextragear-1/k3b/configure.in.in	2004/03/16 14:07:22	1.49
++++ kdeextragear-1/k3b/configure.in.in	2004/07/12 19:47:47	1.50
+@@ -204,16 +204,22 @@ AC_SUBST(LIBSAMPLERATE)
+ AM_CONDITIONAL(compile_libsamplerate, [test -z "$LIBSAMPLERATE"])
+ 
+ 
+-dnl Find aRts
+ ARTS_LIBS=""
+-KDE_CHECK_HEADERS(arts/artsflow.h,
+-	[KDE_CHECK_HEADERS(arts/kmedia2.h,
+-		[arts_available=yes
+-	 	 ARTS_LIBS="-lartskde"],
+-		[arts_available=no]
+-	)]
+-)
++if test "$build_arts" == "yes"; then
++	dnl Find aRts
++	KDE_CHECK_HEADERS(arts/artsflow.h,
++		[KDE_CHECK_HEADERS(arts/kmedia2.h,
++			[arts_available=yes
++		 	 ARTS_LIBS="-lartskde"],
++			[arts_available=no]
++		)]
++	)
++fi
+ AC_SUBST(ARTS_LIBS)
++AM_CONDITIONAL(include_arts, [test -n "$ARTS_LIBS"])
++if test "$build_arts" == "yes"; and test x$arts_available = xyes; then
++	AC_DEFINE(WITH_ARTS,1,[defined if arts support is compiled in])
++fi
+ 
+ KDE_CHECK_THREADING
+ 
diff --git a/app-cdr/k3b/k3b-0.11.17.ebuild b/app-cdr/k3b/k3b-0.11.17.ebuild
index ebd7eca5cb2d..3e0caa4d23c8 100644
--- a/app-cdr/k3b/k3b-0.11.17.ebuild
+++ b/app-cdr/k3b/k3b-0.11.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.11.17.ebuild,v 1.1 2004/09/23 19:58:21 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.11.17.ebuild,v 1.2 2004/09/25 15:45:39 lanius Exp $
 
 inherit kde
 
@@ -52,6 +52,11 @@ if [ -n "$MAKE_PO" ] ; then
 	SRC_URI="${SRC_URI} mirror://sourceforge/k3b/${I18N}.tar.bz2"
 fi
 
+src_unpack() {
+	kde_src_unpack
+	epatch ${FILESDIR}/${P}-noarts.patch
+}
+
 src_compile() {
 	local _S=${S}
 	local myconf="--enable-libsuffix= $(use_with kde k3bsetup) $(use_with arts)"