add 2 patches to fix compilation as per #6939; one of them also removes the need for disabling emake (-j2), so I've reenabled that - we'll wait and see what happens

3 files changed, 50 insertions, 9 deletions

diff --git a/kde-base/kdemultimedia/files/kdemultimedia-3.1_beta1-kaudiocreator.diff b/kde-base/kdemultimedia/files/kdemultimedia-3.1_beta1-kaudiocreator.diff
new file mode 100644
index 000000000000..f4bc8e848df2
--- /dev/null
+++ b/kde-base/kdemultimedia/files/kdemultimedia-3.1_beta1-kaudiocreator.diff
@@ -0,0 +1,16 @@
+Index: kaudiocreator/cdconfigimp.cpp
+===================================================================
+RCS file: /home/kde/kdemultimedia/kaudiocreator/cdconfigimp.cpp,v
+retrieving revision 1.6
+retrieving revision 1.7
+diff -u -r1.6 -r1.7
+--- kaudiocreator/cdconfigimp.cpp	2002/05/30 11:46:14		1.6
++++ kaudiocreator/cdconfigimp.cpp	2002/08/07 01:38:02		1.7
+@@ -74,7 +74,7 @@
+ #include "cdconfigimp.h"
+ #include "cddb.h"
+ 
+-using namespace KIO;
++//using namespace KIO;
+ 
+ #define MAX_IPC_SIZE (1024*32)
diff --git a/kde-base/kdemultimedia/files/kdemultimedia-3.1_beta1-ln-sf.diff b/kde-base/kdemultimedia/files/kdemultimedia-3.1_beta1-ln-sf.diff
new file mode 100644
index 000000000000..ee6daa91f3dc
--- /dev/null
+++ b/kde-base/kdemultimedia/files/kdemultimedia-3.1_beta1-ln-sf.diff
@@ -0,0 +1,29 @@
+--- kmidi/TIMIDITY/makelinks	Sat Aug 24 11:36:27 2002
++++ kmidi/TIMIDITY/makelinks	Sat Aug 24 11:36:15 2002
+@@ -3,7 +3,7 @@ srcdir=$1
+ for header in common config controls ctl effects filter instrum mix \
+               output playmidi readmidi resample sbk sflayer tables \
+               version ; do
+-    if [ ! -h ${header}.h ]; then ln -s ${srcdir}/${header}.h . ; fi
++    if [ ! -h ${header}.h ]; then ln -sf ${srcdir}/${header}.h . ; fi
+ done
+ 
+ for cfile in alsa_a arts_a b_out bag bsd20_a celeste_e chorus_e \
+@@ -13,14 +13,14 @@ for cfile in alsa_a arts_a b_out bag bsd
+ 	     playmidi raw_a readmidi readsbk resample resample_f \
+ 	     resample_l reverb_e sbktext sf2cfg slang_c sndfont \
+ 	     sun_a tables timidity wav2pat wave_a ; do
+-    if [ ! -h ${cfile}.c ]; then ln -s ${srcdir}/${cfile}.cpp ${cfile}.c ; fi
++    if [ ! -h ${cfile}.c ]; then ln -sf ${srcdir}/${cfile}.cpp ${cfile}.c ; fi
+ done
+ 
+ for lfile in cfg ; do
+-    if [ ! -h ${lfile}.l ]; then ln -s ${srcdir}/${lfile}.l . ; fi
++    if [ ! -h ${lfile}.l ]; then ln -sf ${srcdir}/${lfile}.l . ; fi
+ done
+ 
+ # LEAVE THIS ONE AT THE END!!
+ for other in BITMAPS ; do
+-    if [ ! -h ${other} ]; then ln -s ${srcdir}/${other} . ; fi
++    if [ ! -h ${other} ]; then ln -sf ${srcdir}/${other} . ; fi
+ done
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.1_beta1.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.1_beta1.ebuild
index eeed25f9e527..95df4f585399 100644
--- a/kde-base/kdemultimedia/kdemultimedia-3.1_beta1.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-3.1_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.1_beta1.ebuild,v 1.3 2002/08/29 11:46:20 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.1_beta1.ebuild,v 1.4 2002/08/30 07:06:17 danarmak Exp $
 inherit kde-dist flag-o-matic 
 
 DESCRIPTION="KDE $PV - multimedia apps"
@@ -32,7 +32,7 @@ myconf="$myconf --enable-xaw --enable-ncurses"
 myconf="$myconf --with-xine-prefix=/usr"
 
 # make -j2 fails
-export MAKEOPTS="-j1"
+#export MAKEOPTS="-j1" # fixed by the ln-sf patch
 
 # alsa 0.9 not supported
 #use alsa	&& myconf="$myconf --with-alsa --with-arts-alsa" && myaudio="$myaudio,alsa" ||
@@ -50,13 +50,9 @@ export DO_NOT_COMPILE="xine_artsplugin"
 
 myconf="$myconf $myaudio $myinterface"
 
-src_unpack() {
-    
-    base_src_unpack
-    cd ${S}
-    patch -p0 < ${FILESDIR}/${P}-gentoo-timidity.diff || die
-    
-}
+PATCHES="$FILESDIR/${P}-gentoo-timidity.diff
+	$FILESDIR/${P}-ln-sf.diff
+	$FILESDIR/${P}-kaudiocreator.diff"
 
 pkg_postinst() {