new version

6 files changed, 139 insertions, 3 deletions

diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog
index cee5c1e871b0..cfd1ea4fe87c 100644
--- a/kde-base/kdemultimedia/ChangeLog
+++ b/kde-base/kdemultimedia/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdemultimedia
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.55 2003/09/17 01:35:09 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.56 2003/09/17 02:18:24 caleb Exp $
+
+*kdemultimedia-3.1.4 (16 Sep 2003)
+
+  16 Sep 2003; Caleb <caleb@gentoo.org> kdemultimedia-3.1.4.ebuild,
+  files/kdemultimedia-3.1.4-gentoo-timidity.diff,
+  files/kdemultimedia-3.1.4-ln-sf.diff:
+  new version
 
   16 Sep 2003; Jason Wever <weeve@gentoo.org> kdemultimedia-3.1.3.ebuild:
   Marked stable for sparc.
diff --git a/kde-base/kdemultimedia/Manifest b/kde-base/kdemultimedia/Manifest
index f16493ba1d1d..3320ddc52d9e 100644
--- a/kde-base/kdemultimedia/Manifest
+++ b/kde-base/kdemultimedia/Manifest
@@ -3,12 +3,14 @@ MD5 d5c217233c94c5ca8ab5ab457b8cc05e kdemultimedia-3.0.4.ebuild 2516
 MD5 ad5e44c7442e5a17f4473679209966c8 kdemultimedia-3.1.2.ebuild 2698
 MD5 9346d26a0ffe17b3c90792d410c5543d kdemultimedia-3.1.2-r1.ebuild 2739
 MD5 694e2e4f8dff3bda3c35a1e3a3a9bb78 kdemultimedia-2.2.2-r1.ebuild 1474
-MD5 1bb4bb09e3acef2547411539dbd0bbc1 kdemultimedia-3.1.4.ebuild 2887
-MD5 348e484f6b34867ecf18f3861375bd5d ChangeLog 7861
+MD5 4aada2b90d2f5d2e15a48238cac01059 kdemultimedia-3.1.4.ebuild 2887
+MD5 6cacb1c4e8a88573bfde2e9992e9bb4b ChangeLog 8070
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 710052fafcbf2fc26709fc3801a045e7 kdemultimedia-3.1.1.ebuild 2699
 MD5 5ba5ef8edef46a60644ba401b24c9332 kdemultimedia-3.0.5b.ebuild 2524
 MD5 c40a9c32c318c81150a0d45d13501e75 files/digest-kdemultimedia-3.1.2-r1 73
+MD5 fe58e9a2bdef8ba1e3b8268714ff5fa7 files/kdemultimedia-3.1.4-ln-sf.diff 1278
+MD5 353aca022c26e07139bf35ad2433fabd files/kdemultimedia-3.1.4-gentoo-timidity.diff 694
 MD5 00b4c2daf6b715380269812b4931047f files/kdemultimedia-3.1.3-gcc33.diff 529
 MD5 353aca022c26e07139bf35ad2433fabd files/kdemultimedia-3.0.4-gentoo-timidity.diff 694
 MD5 353aca022c26e07139bf35ad2433fabd files/kdemultimedia-3.1.2-gentoo-timidity.diff 694
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1.4 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1.4
new file mode 100644
index 000000000000..4e8eaf6028c9
--- /dev/null
+++ b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1.4
@@ -0,0 +1 @@
+MD5 82429a0af3885d5405ac80ab544d7e4b kdemultimedia-3.1.4.tar.bz2 5932864
diff --git a/kde-base/kdemultimedia/files/kdemultimedia-3.1.4-gentoo-timidity.diff b/kde-base/kdemultimedia/files/kdemultimedia-3.1.4-gentoo-timidity.diff
new file mode 100644
index 000000000000..f392a244212e
--- /dev/null
+++ b/kde-base/kdemultimedia/files/kdemultimedia-3.1.4-gentoo-timidity.diff
@@ -0,0 +1,21 @@
+diff -ru kdemultimedia-2.2.1.orig/kmidi/TIMIDITY/motif_p.c kdemultimedia-2.2.1/kmidi/TIMIDITY/motif_p.c
+--- 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.4-ln-sf.diff b/kde-base/kdemultimedia/files/kdemultimedia-3.1.4-ln-sf.diff
new file mode 100644
index 000000000000..ee6daa91f3dc
--- /dev/null
+++ b/kde-base/kdemultimedia/files/kdemultimedia-3.1.4-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.4.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.1.4.ebuild
new file mode 100644
index 000000000000..ddfd71da1109
--- /dev/null
+++ b/kde-base/kdemultimedia/kdemultimedia-3.1.4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2003 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.4.ebuild,v 1.1 2003/09/17 02:18:24 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"
+
+newdepend ">=sys-libs/ncurses-5.2
+	>=media-sound/cdparanoia-3.9.8
+	>=media-libs/libvorbis-1.0_beta4
+	>=media-video/xanim-2.80.1
+	nas? ( >=media-libs/nas-1.4.1 )
+	esd? ( >=media-sound/esound-0.2.22 )
+	motif? ( virtual/motif )
+	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-0.9.14" # not yet available
+	#gtk? ( =x11-libs/gtk+-1.2* )
+#	alsa? ( >=media-libs/alsa-lib-0.5.9 )"
+
+RDEPEND="$RDEPEND
+	cdr? ( app-cdr/cdrtools
+	>=app-cdr/cdrdao-1.1.5 )"
+
+replace-flags "-O3" "-O2"
+
+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}-gcc33.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"
+
+# xine doesn't compile yet
+# also turn off kaudiocreator if cdr isn't in use
+KDE_REMOVE_DIR="xine_artsplugin"
+[ -z "`use cdr`" ] && KDE_REMOVE_DIR="$KDE_REMOVE_DIR kaudiocreator"
+
+myconf="$myconf $myaudio $myinterface"
+
+src_compile() {
+	kde_src_compile myconf
+	kde_fix_head_instances acinclude.m4 aclocal.m4 admin/cvs.sh admin/libtool.m4.in configure
+	kde_src_compile configure make
+}
+
+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
+}