Readd support for xine now that it's available

4 files changed, 78 insertions, 2 deletions

diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog
index 8f35ce72e576..51b499e365ed 100644
--- a/kde-base/kdemultimedia/ChangeLog
+++ b/kde-base/kdemultimedia/ChangeLog
@@ -1,6 +1,11 @@
 # 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.46 2003/06/22 19:08:14 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.47 2003/07/07 19:56:22 caleb Exp $
+
+*kdemultimedia-3.1.2-r1 (07 Jul 2003)
+
+  07 Jul 2003; Caleb Tennis <caleb@gentoo.org>: kdemultimedia-3.1.2-r1.ebuild:
+  Reintegrate support for xine - closes bug #23486
 
   21 Jun 2003; Caleb Tennis <caleb@gentoo.org>:
   Removing old ebuilds: 3.0.5a, 3.1, 3.1-r1
diff --git a/kde-base/kdemultimedia/Manifest b/kde-base/kdemultimedia/Manifest
index 4e33fe83167b..f1ba0f048665 100644
--- a/kde-base/kdemultimedia/Manifest
+++ b/kde-base/kdemultimedia/Manifest
@@ -1,9 +1,12 @@
 MD5 6f1ef1d0aeddc81da816f138ee90e778 kdemultimedia-3.0.4.ebuild 2517
 MD5 5e2801cef56980212b29759a12c06c03 kdemultimedia-3.1.2.ebuild 2698
+MD5 ce465ad5036391c4b43736c205b1d165 kdemultimedia-3.1.2-r1.ebuild 2615
 MD5 6ef1a62b5177796e9dc01e5037031786 kdemultimedia-2.2.2-r1.ebuild 1475
-MD5 12c0790bc186bb9d59c3ad0a1eb38917 ChangeLog 6723
+MD5 b1de118a75931b5728a698407337ed6e ChangeLog 6893
+MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 7deb57de3796a481b67fa061bbde893d kdemultimedia-3.1.1.ebuild 2697
 MD5 8fb79646776cf184ad0689232821cf49 kdemultimedia-3.0.5b.ebuild 2525
+MD5 c40a9c32c318c81150a0d45d13501e75 files/digest-kdemultimedia-3.1.2-r1 73
 MD5 353aca022c26e07139bf35ad2433fabd files/kdemultimedia-3.0.4-gentoo-timidity.diff 694
 MD5 353aca022c26e07139bf35ad2433fabd files/kdemultimedia-3.1.2-gentoo-timidity.diff 694
 MD5 d37340290c8c5fd5d8dc6345ec9dee75 files/digest-kdemultimedia-3.0.5b 74
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1.2-r1 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1.2-r1
new file mode 100644
index 000000000000..1ef80cf7cf2c
--- /dev/null
+++ b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1.2-r1
@@ -0,0 +1 @@
+MD5 63ffa8b3c6b3151acdaaa22afd7e55ea kdemultimedia-3.1.2.tar.bz2 5927084
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.1.2-r1.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.1.2-r1.ebuild
new file mode 100644
index 000000000000..65ec39531c84
--- /dev/null
+++ b/kde-base/kdemultimedia/kdemultimedia-3.1.2-r1.ebuild
@@ -0,0 +1,67 @@
+# 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.2-r1.ebuild,v 1.1 2003/07/07 19:56:22 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 ~ppc sparc alpha"
+
+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-1_beta12"
+	#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"
+
+# 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"
+
+# turn off kaudiocreator if cdr isn't in use
+[ -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
+}