new beta

4 files changed, 64 insertions, 2 deletions

diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog
index 343f8f234e6e..de894ea0ad5a 100644
--- a/kde-base/kdemultimedia/ChangeLog
+++ b/kde-base/kdemultimedia/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for kde-base/kdemultimedia
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.112 2004/07/08 22:38:29 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.113 2004/07/23 12:07:38 caleb Exp $
+
+*kdemultimedia-3.3.0_beta2 (23 Jul 2004)
+
+  23 Jul 2004; Caleb Tennis <caleb@gentoo.org>
+  +kdemultimedia-3.3.0_beta2.ebuild:
+  new beta
+
+*kdemultimedia-3.3.0_beta1 (08 Jul 2004)
+
+  08 Jul 2004; Caleb Tennis <caleb@gentoo.org>
+  -kdemultimedia-3.3.0_alpha1.ebuild, +kdemultimedia-3.3.0_beta1.ebuild:
+  New beta, remove alpha
 
 *kdemultimedia-3.3.0_beta1 (08 Jul 2004)
 
diff --git a/kde-base/kdemultimedia/Manifest b/kde-base/kdemultimedia/Manifest
index b67e84b695c2..27716be41662 100644
--- a/kde-base/kdemultimedia/Manifest
+++ b/kde-base/kdemultimedia/Manifest
@@ -1,11 +1,12 @@
 MD5 728a544c6c7320d96abb3c6ac20a9671 kdemultimedia-3.2.1.ebuild 2286
+MD5 4a1cc86a93b6f146330f9be401506eee kdemultimedia-3.3.0_beta2.ebuild 1430
 MD5 6f17211987d69d64b045e7920d823648 kdemultimedia-3.1.5.ebuild 2690
 MD5 f8c2a8c78bf6ae233f97a859ea5cc000 kdemultimedia-3.2.3.ebuild 1457
 MD5 78a5d756b72f651a8038451801e9bee6 kdemultimedia-3.2.0.ebuild 2255
 MD5 4a1cc86a93b6f146330f9be401506eee kdemultimedia-3.3.0_beta1.ebuild 1430
 MD5 6affdbc1c02d7034aecca744fb5128a4 kdemultimedia-3.2.2.ebuild 2290
 MD5 cb93ab2aa47f5cfa2918e4d596a3569a kdemultimedia-3.2.2-r1.ebuild 1460
-MD5 753f6e2a159b8708953fa0f0217defd4 ChangeLog 16207
+MD5 1df87637566c90384e3faa6d86148bdf ChangeLog 16395
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 a39413062132d248ceae0b20ed262e79 files/flac-patch.diff 450
 MD5 373aaabfcb29c89281c6880b2a784c2a files/digest-kdemultimedia-3.2.2-r1 73
@@ -13,6 +14,7 @@ MD5 441c0251c7db96f19b27f29861f65ee9 files/kdemultimedia-3.1.5-alpha.diff 300
 MD5 fe58e9a2bdef8ba1e3b8268714ff5fa7 files/kdemultimedia-3.1.5-ln-sf.diff 1278
 MD5 55cd599c61d48ca121ef4c96a905b6d1 files/kdemultimedia-3.1.5-gentoo-timidity.diff 590
 MD5 effaacba30e9499648ddac465505f7a9 files/digest-kdemultimedia-3.3.0_beta1 74
+MD5 379d2823bdbc488daa9b9483e8b4911e files/digest-kdemultimedia-3.3.0_beta2 74
 MD5 239528cb3f6dd1fcc4e2bc4fd2ba9ba8 files/digest-kdemultimedia-3.1.5 73
 MD5 498d3a9ec387535d759af9fd59f3dc07 files/digest-kdemultimedia-3.2.0 73
 MD5 d000b32f6bf7a0e95a7ccfe6ec89fe69 files/digest-kdemultimedia-3.2.1 73
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.3.0_beta2 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.3.0_beta2
new file mode 100644
index 000000000000..e2b2f0928c27
--- /dev/null
+++ b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.3.0_beta2
@@ -0,0 +1 @@
+MD5 226cd47b41097d3503d2f4aa76a4ec6d kdemultimedia-3.2.92.tar.bz2 5322676
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.3.0_beta2.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.3.0_beta2.ebuild
new file mode 100644
index 000000000000..b5cab8d636e1
--- /dev/null
+++ b/kde-base/kdemultimedia/kdemultimedia-3.3.0_beta2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.3.0_beta2.ebuild,v 1.1 2004/07/23 12:07:38 caleb Exp $
+
+inherit kde-dist flag-o-matic
+
+DESCRIPTION="KDE multimedia apps: noatun, kscd, artsbuilder..."
+
+KEYWORDS="~x86 ~amd64"
+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-sound/trm
+	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
+}