New version

7 files changed, 141 insertions, 3 deletions

diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog
index 77f21787684b..efcc8f7e8056 100644
--- a/kde-base/kdemultimedia/ChangeLog
+++ b/kde-base/kdemultimedia/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdemultimedia
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.75 2004/01/13 16:44:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.76 2004/01/15 03:19:38 caleb Exp $
+
+*kdemultimedia-3.1.5 (14 Jan 2004)
+
+  14 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdemultimedia-3.1.5.ebuild,
+  files/kdemultimedia-3.1.5-alpha.diff,
+  files/kdemultimedia-3.1.5-gentoo-timidity.diff,
+  files/kdemultimedia-3.1.5-ln-sf.diff:
+  New version
 
   13 Jan 2004; Aron Griffis <agriffis@gentoo.org>
   kdemultimedia-3.1.4-r1.ebuild:
diff --git a/kde-base/kdemultimedia/Manifest b/kde-base/kdemultimedia/Manifest
index d679f9978ccd..6fd2d5286e15 100644
--- a/kde-base/kdemultimedia/Manifest
+++ b/kde-base/kdemultimedia/Manifest
@@ -1,11 +1,11 @@
 MD5 e001e74325bfe345c33b484127cc9455 kdemultimedia-3.1.4-r1.ebuild 2903
-MD5 bd2a54bd9568da268f51ea756977b417 kdemultimedia-3.1.5.ebuild 2659
+MD5 2413cf141181836cfbc6cabec5d24a90 kdemultimedia-3.1.5.ebuild 2652
 MD5 d5c217233c94c5ca8ab5ab457b8cc05e kdemultimedia-3.0.4.ebuild 2516
 MD5 e3bfada65f8cc1a231f1f9e3d01a8e43 kdemultimedia-3.2.0_beta2.ebuild 2117
 MD5 0226309c051b10cd5f73010fd9b734c3 kdemultimedia-3.1.2.ebuild 2701
 MD5 3d255d9be005918d42e3ff1bebade4e2 kdemultimedia-3.1.2-r1.ebuild 2742
 MD5 6d0c8d1c120e3539556fc705ef230401 kdemultimedia-3.2.0_beta1.ebuild 2058
-MD5 a9da030fa4760a97d65f7732f9ee6404 ChangeLog 11361
+MD5 124daf28d8f49a50207d6d4630cb22ae ChangeLog 11614
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 5ba5ef8edef46a60644ba401b24c9332 kdemultimedia-3.0.5b.ebuild 2524
 MD5 c40a9c32c318c81150a0d45d13501e75 files/digest-kdemultimedia-3.1.2-r1 73
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1.5 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1.5
new file mode 100644
index 000000000000..eb9ea1377baa
--- /dev/null
+++ b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1.5
@@ -0,0 +1 @@
+MD5 f588d3aeb6f25387dee74befa096de0b kdemultimedia-3.1.5.tar.bz2 5925820
diff --git a/kde-base/kdemultimedia/files/kdemultimedia-3.1.5-alpha.diff b/kde-base/kdemultimedia/files/kdemultimedia-3.1.5-alpha.diff
new file mode 100644
index 000000000000..ec18135fcdde
--- /dev/null
+++ b/kde-base/kdemultimedia/files/kdemultimedia-3.1.5-alpha.diff
@@ -0,0 +1,12 @@
+--- mpeglib/lib/input/cdromAccess_Linux.cpp.agriffis	2004-01-11 23:03:27.000000000 -0500
++++ mpeglib/lib/input/cdromAccess_Linux.cpp	2004-01-11 23:03:37.000000000 -0500
+@@ -10,7 +10,9 @@
+ 
+  */
+ 
++#if 0
+ typedef unsigned long long __u64;
++#endif
+ 
+ #include "cdromToc.h"
+ #include "cdromRawAccess.h"
diff --git a/kde-base/kdemultimedia/files/kdemultimedia-3.1.5-gentoo-timidity.diff b/kde-base/kdemultimedia/files/kdemultimedia-3.1.5-gentoo-timidity.diff
new file mode 100644
index 000000000000..67eaaf67319b
--- /dev/null
+++ b/kde-base/kdemultimedia/files/kdemultimedia-3.1.5-gentoo-timidity.diff
@@ -0,0 +1,20 @@
+--- kmidi/TIMIDITY/motif_p.c	Mon Feb 28 19:07:37 2000
++++ kmidi/TIMIDITY/motif_p.c	Fri Oct 19 04:00:10 2001
+@@ -22,6 +22,7 @@
+     pipe communication between motif interface and sound generator
+
+     */
++#include <sys/errno.h>
+ #ifdef IA_MOTIF
+
+ #include <stdio.h>
+--- kmidi/TIMIDITY/tk_c.c       2002-04-04 21:15:35.000000000 -0600
++++ kmidi/TIMIDITY/tk_c.c       2002-04-04 21:17:06.000000000 -0600
+@@ -12,6 +12,7 @@
+  *================================================================*/
+ #ifdef TCLTK
+
++#include <sys/errno.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
diff --git a/kde-base/kdemultimedia/files/kdemultimedia-3.1.5-ln-sf.diff b/kde-base/kdemultimedia/files/kdemultimedia-3.1.5-ln-sf.diff
new file mode 100644
index 000000000000..ee6daa91f3dc
--- /dev/null
+++ b/kde-base/kdemultimedia/files/kdemultimedia-3.1.5-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.5.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.1.5.ebuild
new file mode 100644
index 000000000000..98db6e29b3ee
--- /dev/null
+++ b/kde-base/kdemultimedia/kdemultimedia-3.1.5.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.1.5.ebuild,v 1.1 2004/01/15 03:19:38 caleb Exp $
+inherit kde-dist flag-o-matic
+
+IUSE="nas esd motif slang tcltk oggvorbis cdr"
+DESCRIPTION="KDE multimedia apps: noatun, kscd, artsbuilder..."
+KEYWORDS="x86 ~sparc ~ppc ~hppa ~amd64 ~alpha"
+
+DEPEND=">=sys-libs/ncurses-5.2
+	>=media-sound/cdparanoia-3.9.8
+	>=media-libs/libvorbis-1.0_beta4
+	!hppa? ( >=media-video/xanim-2.80.1 )
+	nas? ( >=media-libs/nas-1.4.1 )
+	esd? ( >=media-sound/esound-0.2.22 )
+	motif? ( x11-libs/openmotif )
+	slang? ( >=sys-libs/slang-1.4.4 )
+	>=media-sound/mpg123-0.59r
+	tcltk? ( >=dev-lang/tk-8.0.5-r2 )
+	>=dev-libs/glib-1.3.3
+	oggvorbis? ( media-libs/libvorbis )
+	>=media-libs/xine-lib-1_beta10"
+	#gtk? ( =x11-libs/gtk+-1.2* )
+#	alsa? ( >=media-libs/alsa-lib-0.5.9 )"
+
+RDEPEND="$DEPEND
+	cdr? ( app-cdr/cdrtools
+	>=app-cdr/cdrdao-1.1.5 )"
+
+replace-flags "-O3" "-O2"
+filter-flags "-fno-default-inline"
+
+myaudio="--enable-audio=oss"
+myinterface="--enable-interface=xaw,ncurses"
+myconf="$myconf --enable-xaw --enable-ncurses"
+myconf="$myconf --with-xine-prefix=/usr"
+
+# make -j2 fails, at least on ppc
+export MAKEOPTS="$MAKEOPTS -j1"
+
+PATCHES="$FILESDIR/$P-gentoo-timidity.diff
+	$FILESDIR/$P-ln-sf.diff
+	$FILESDIR/$P-alpha.diff"
+
+# alsa 0.9 not supported
+#use alsa	&& myconf="$myconf --with-alsa --with-arts-alsa" && myaudio="$myaudio,alsa" || myconf="$myconf --without-alsa --disable-alsa"
+use nas		&& myaudio="$myaudio,nas --with-nas-library=/usr/X11R6/lib/libaudio.so --with-nas-includes=/usr/X11R6/include" || myconf="$myconf --disable-nas"
+use esd		&& myaudio="$myaudio,esd"			|| myconf="$myconf --disable-esd"
+use motif	&& myinterface="$myinterface,motif" && myconf="$myconf --enable-motif"
+# kmidi/TIMIDITY miscompiles with gtk
+#use gtk		&& myinterface="$myinterface,gtk"   && myconf="$myconf --enable-gtk"
+use slang	&& myinterface="$myinterface,slang" && myconf="$myconf --enable-slang"
+use tcltk	&& myinterface="$myinterface,tcltk" && myconf="$myconf --enable-tcltk"
+use oggvorbis	&& myconf="$myconf --with-vorbis=/usr"		|| myconf="$myconf --without-vorbis"
+
+use cdr		|| KDE_REMOVE_DIR="kaudiocreator"
+
+[ -z "`use cdr`" ] && KDE_REMOVE_DIR="$KDE_REMOVE_DIR kaudiocreator"
+
+myconf="$myconf $myaudio $myinterface"
+
+pkg_postinst() {
+	if [ -n "`use alsa`" ]; then
+	einfo "WARNING: alsa support has been removed becuase of a bug in kdemm sources.
+For further information see bug #2324 on bugs.gentoo.org and bug #39574 on bugs.kde.org.
+Meanwhile, you can use the alsa oss emulation."
+	fi
+}