Radical change to kdemultimedia - it's been a long time coming - see bug #48484

4 files changed, 55 insertions, 2 deletions

diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog
index eccf637081eb..f56f57426cf3 100644
--- a/kde-base/kdemultimedia/ChangeLog
+++ b/kde-base/kdemultimedia/ChangeLog
@@ -1,6 +1,9 @@
 # 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.98 2004/04/20 01:42:22 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.99 2004/04/21 01:26:10 caleb Exp $
+
+  20 Apr 2004; Caleb Tennis <caleb@gentoo.org> : kdemultimedia-3.2.2-r1.ebuild
+  Radical changes to the ebuild - see bug #48484
 
 *kdemultimedia-3.2.2 (19 Apr 2004)
 
diff --git a/kde-base/kdemultimedia/Manifest b/kde-base/kdemultimedia/Manifest
index 673e70256772..f72a716dd3ce 100644
--- a/kde-base/kdemultimedia/Manifest
+++ b/kde-base/kdemultimedia/Manifest
@@ -2,10 +2,12 @@ MD5 72c357a662504fe0e81791df16a07afa kdemultimedia-3.2.1.ebuild 2289
 MD5 d8bb815e221f341f2a452af42e72bb62 kdemultimedia-3.1.5.ebuild 2778
 MD5 03b3e51b9f88243705fdcaebbf8568d3 kdemultimedia-3.2.0.ebuild 2254
 MD5 fa072f60749716b8f8726938fbc6779a kdemultimedia-3.2.2.ebuild 2296
-MD5 cfa7a3594d62d50f9cb3b2665fe9d437 ChangeLog 14569
+MD5 3e0bc00c76916562cf8ed427e5130751 kdemultimedia-3.2.2-r1.ebuild 1474
+MD5 18a944484907083d8873da652b2a9310 ChangeLog 14698
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 47f7212785d91a2608aaeec76694d65e kdemultimedia-3.0.5b.ebuild 2509
 MD5 a39413062132d248ceae0b20ed262e79 files/flac-patch.diff 450
+MD5 373aaabfcb29c89281c6880b2a784c2a files/digest-kdemultimedia-3.2.2-r1 73
 MD5 441c0251c7db96f19b27f29861f65ee9 files/kdemultimedia-3.1.5-alpha.diff 300
 MD5 fe58e9a2bdef8ba1e3b8268714ff5fa7 files/kdemultimedia-3.1.5-ln-sf.diff 1278
 MD5 d37340290c8c5fd5d8dc6345ec9dee75 files/digest-kdemultimedia-3.0.5b 74
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.2.2-r1 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.2.2-r1
new file mode 100644
index 000000000000..3e9ad457e1ea
--- /dev/null
+++ b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.2.2-r1
@@ -0,0 +1 @@
+MD5 062249563cbf66d77e61b41e5126f806 kdemultimedia-3.2.2.tar.bz2 4911246
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.2.2-r1.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.2.2-r1.ebuild
new file mode 100644
index 000000000000..03d2f94f2837
--- /dev/null
+++ b/kde-base/kdemultimedia/kdemultimedia-3.2.2-r1.ebuild
@@ -0,0 +1,47 @@
+# 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.2.2-r1.ebuild,v 1.1 2004/04/21 01:26:10 caleb Exp $
+
+inherit kde-dist flag-o-matic
+
+DESCRIPTION="KDE multimedia apps: noatun, kscd, artsbuilder..."
+
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
+IUSE="flac encode oggvorbis alsa gstreamer"
+
+DEPEND="~kde-base/kdebase-${PV}
+	media-sound/cdparanoia
+	flac? ( media-libs/flac )
+	encode? ( media-sound/lame )
+	oggvorbis? ( media-libs/libvorbis media-libs/libogg )
+	>=media-libs/xine-lib-1_beta12
+	alsa? ( media-libs/alsa-lib )
+	gstreamer? ( media-libs/gstreamer )
+	media-libs/musicbrainz
+	media-libs/taglib
+	!media-sound/juk"
+
+src_unpack() {
+	kde_src_unpack
+}
+
+src_compile() {
+	replace-flags -O3 -O2
+	# Still persists with 3.2.1 - kaboodle
+	filter-flags "-fno-default-inline"
+
+	myconf="$myconf --with-xine-prefix=/usr"
+
+	# make -j2 fails, at least on ppc
+	use ppc && export MAKEOPTS="$MAKEOPTS -j1"
+	use hppa && append-flags -ffunction-sections
+
+	# alsa 0.9 not supported
+	use alsa	&& myconf="$myconf --with-alsa --with-arts-alsa" || myconf="$myconf --without-alsa --disable-alsa"
+	use oggvorbis	&& myconf="$myconf --with-vorbis=/usr"		|| myconf="$myconf --without-vorbis"
+	use encode	&& myconf="$myconf --with-lame=/usr" || myconf="$myconf --without-lame"
+
+	myconf="$myconf --disable-strict --disable-warnings"
+
+	kde_src_compile
+}