Add a patch to make it compile without arts support

4 files changed, 43 insertions, 3 deletions

diff --git a/kde-base/kdeartwork/ChangeLog b/kde-base/kdeartwork/ChangeLog
index b9b37243593b..645b21eec363 100644
--- a/kde-base/kdeartwork/ChangeLog
+++ b/kde-base/kdeartwork/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdeartwork
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/ChangeLog,v 1.85 2004/08/19 19:26:06 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/ChangeLog,v 1.86 2004/08/26 15:29:39 caleb Exp $
+
+  26 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdeartwork-3.3.0.ebuild,
+  files/3.3.0-kfiresaver-Makefile.am.patch,
+  files/3.3.0-kfiresaver-configure.in.in.patch:
+  Add a patch to make it compile without arts support
 
 *kdeartwork-3.3.0 (19 Aug 2004)
 
diff --git a/kde-base/kdeartwork/files/3.3.0-kfiresaver-Makefile.am.patch b/kde-base/kdeartwork/files/3.3.0-kfiresaver-Makefile.am.patch
new file mode 100644
index 000000000000..ab76a60672b4
--- /dev/null
+++ b/kde-base/kdeartwork/files/3.3.0-kfiresaver-Makefile.am.patch
@@ -0,0 +1,19 @@
+--- kscreensaver/kdesavers/Makefile.am	2004-06-22 12:13:59.000000000 -0500
++++ kscreensaver/kdesavers/Makefile.am	2004-08-12 15:53:33.366143312 -0500
+@@ -21,9 +21,14 @@
+ endif
+ LIBART_KSAVERS_LDADD = $(AM_LDADD) $(LIBART_LIBS)
+ 
++if COMPILE_ARTS_KSAVERS
++ARTS_KSAVERS = kfiresaver.kss
++ARTS_DESKTOP_FILES = KFiresaver.desktop
++endif
++
+ if COMPILE_GL_KSAVERS
+-GL_KSAVERS=kfountain.kss kwave.kss kgravity.kss kflux.kss keuphoria.kss ksolarwinds.kss krotation.kss kpendulum.kss kfiresaver.kss
+-GL_DESKTOP_FILES=KGravity.desktop KWave.desktop KFountain.desktop KFlux.desktop KEuphoria.desktop KSolarWinds.desktop KRotation.desktop KPendulum.desktop KFiresaver.desktop
++GL_KSAVERS=kfountain.kss kwave.kss kgravity.kss kflux.kss keuphoria.kss ksolarwinds.kss krotation.kss kpendulum.kss $(ARTS_KSAVERS)
++GL_DESKTOP_FILES=KGravity.desktop KWave.desktop KFountain.desktop KFlux.desktop KEuphoria.desktop KSolarWinds.desktop KRotation.desktop KPendulum.desktop $(ARTS_DESKTOP_FILES)
+ endif
+ GL_KSAVERS_LDADD = $(AM_LDADD) $(GLLIB)
+ 
diff --git a/kde-base/kdeartwork/files/3.3.0-kfiresaver-configure.in.in.patch b/kde-base/kdeartwork/files/3.3.0-kfiresaver-configure.in.in.patch
new file mode 100644
index 000000000000..b2f59f32fb22
--- /dev/null
+++ b/kde-base/kdeartwork/files/3.3.0-kfiresaver-configure.in.in.patch
@@ -0,0 +1,10 @@
+--- kscreensaver/configure.in.in.orig	2004-08-12 16:08:58.452508808 -0500
++++ kscreensaver/configure.in.in	2004-08-12 16:10:38.628279776 -0500
+@@ -32,6 +32,7 @@
+ AC_HAVE_GL( have_gl=yes, have_gl=no )
+ 
+ AM_CONDITIONAL(COMPILE_GL_XSAVERS, test x$have_gl = xyes)
++AM_CONDITIONAL(COMPILE_ARTS_KSAVERS, test x$have_arts = xyes)
+ AM_CONDITIONAL(COMPILE_GL_KSAVERS, test x$ac_cv_kde_qt_has_opengl = xyes)
+ AM_CONDITIONAL(COMPILE_X11_KSAVERS, test "x$ac_x_includes" != x && test "x$ac_x_libraries" != x)
+ 
diff --git a/kde-base/kdeartwork/kdeartwork-3.3.0.ebuild b/kde-base/kdeartwork/kdeartwork-3.3.0.ebuild
index dc76850182fd..3a4495e3cf6b 100644
--- a/kde-base/kdeartwork/kdeartwork-3.3.0.ebuild
+++ b/kde-base/kdeartwork/kdeartwork-3.3.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-3.3.0.ebuild,v 1.1 2004/08/19 19:26:06 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-3.3.0.ebuild,v 1.2 2004/08/26 15:29:39 caleb Exp $
 
-inherit kde-dist
+inherit kde-dist eutils
 
 DESCRIPTION="KDE artwork package"
 
@@ -15,6 +15,12 @@ DEPEND="opengl? ( virtual/opengl )
 src_unpack() {
 	kde_src_unpack
 	sed -ie "s:X11R6/lib\(/X11\)\?:lib:g" kscreensaver/kxsconfig/Makefile.in
+	if ! use arts; then
+		epatch ${FILESDIR}/3.3.0-kfiresaver-configure.in.in.patch
+		epatch ${FILESDIR}/3.3.0-kfiresaver-Makefile.am.patch 
+		cd ${S} 
+		make -f admin/Makefile.common
+	fi
 }
 
 src_compile() {