Add a patch to fix kdemultimedia-kioslaves building against arts with USE="-arts". Thanks to jmbsvicetto and Shealdon Hearn, bug 170388.

(Portage version: 2.1.2.2)

4 files changed, 24 insertions, 4 deletions

diff --git a/kde-base/kdemultimedia-kioslaves/ChangeLog b/kde-base/kdemultimedia-kioslaves/ChangeLog
index 201ba4e2a236..8ed0838853e3 100644
--- a/kde-base/kdemultimedia-kioslaves/ChangeLog
+++ b/kde-base/kdemultimedia-kioslaves/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for kde-base/kdemultimedia-kioslaves
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/ChangeLog,v 1.67 2007/02/04 02:09:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/ChangeLog,v 1.68 2007/05/07 08:20:18 masterdriverz Exp $
+
+*kdemultimedia-kioslaves-3.5.6-r1 (07 May 2007)
+
+  07 May 2007; Charlie Shepherd <masterdriverz@gentoo.org>
+  +files/kdemultimedia-kioslaves-3.5.6-arts.patch,
+  -kdemultimedia-kioslaves-3.5.6.ebuild,
+  +kdemultimedia-kioslaves-3.5.6-r1.ebuild:
+  Add a patch to fix kdemultimedia-kioslaves building against arts with
+  USE="-arts". Thanks to jmbsvicetto and Shealdon Hearn, bug 170388.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -kdemultimedia-kioslaves-3.5.2.ebuild:
diff --git a/kde-base/kdemultimedia-kioslaves/files/digest-kdemultimedia-kioslaves-3.5.6 b/kde-base/kdemultimedia-kioslaves/files/digest-kdemultimedia-kioslaves-3.5.6-r1
index 189f4e8bd94c..d00517ec5784 100644
--- a/kde-base/kdemultimedia-kioslaves/files/digest-kdemultimedia-kioslaves-3.5.6
+++ b/kde-base/kdemultimedia-kioslaves/files/digest-kdemultimedia-kioslaves-3.5.6-r1
@@ -1,3 +1,2 @@
-MD5 57c50bfcb0147324a1af02ebcc103376 kdemultimedia-3.5.6.tar.bz2 6291692
 RMD160 7411019e2765f740ad0f3fd592e74f62e04b8387 kdemultimedia-3.5.6.tar.bz2 6291692
 SHA256 1a08f71c73cacb1da1d2269d0376193c23de727235a255866f869caeea300719 kdemultimedia-3.5.6.tar.bz2 6291692
diff --git a/kde-base/kdemultimedia-kioslaves/files/kdemultimedia-kioslaves-3.5.6-arts.patch b/kde-base/kdemultimedia-kioslaves/files/kdemultimedia-kioslaves-3.5.6-arts.patch
new file mode 100644
index 000000000000..4552ebe0784b
--- /dev/null
+++ b/kde-base/kdemultimedia-kioslaves/files/kdemultimedia-kioslaves-3.5.6-arts.patch
@@ -0,0 +1,11 @@
+--- kdemultimedia-kioslaves/configure.in.in.orig	2007-03-18 17:47:52.000000000 -0100
++++ kdemultimedia-kioslaves/configure.in.in	2007-03-18 17:49:06.000000000 -0100
+@@ -397,7 +397,7 @@
+   dnl but if we find arts we need the include
+   dnl path for it.
+ 
+-  if test x$kde_artsplug_compiles = xyes; then
++  if test "x$build_arts" = "xyes" && test x$kde_artsplug_compiles = xyes; then
+     ARTSC_INCLUDE=`${ARTSCCONFIG} --cflags`
+     AC_MSG_RESULT([arts includes... $ARTSC_INCLUDE])
+     AC_SUBST(ARTSC_INCLUDE)
diff --git a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.6.ebuild b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.6-r1.ebuild
index eaee91106d93..a91ec37d924e 100644
--- a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.6.ebuild
+++ b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.6.ebuild,v 1.2 2007/01/17 11:14:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.6-r1.ebuild,v 1.1 2007/05/07 08:20:18 masterdriverz Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=kioslave
@@ -26,7 +26,8 @@ KMCOMPILEONLY="
 	kscd/libwm
 	libkcddb"
 
-PATCHES="${FILESDIR}/kdemultimedia-3.5.5+flac-1.1.3.patch"
+PATCHES="${FILESDIR}/kdemultimedia-3.5.5+flac-1.1.3.patch
+	${FILESDIR}/${P}-arts.patch"
 
 src_compile() {
 	myconf="--with-cdparanoia --enable-cdparanoia"