add _rc1, remove _beta1

5 files changed, 15 insertions, 8 deletions

diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog
index 1544a1ee1f47..f221d1a2d71c 100644
--- a/kde-base/kdemultimedia/ChangeLog
+++ b/kde-base/kdemultimedia/ChangeLog
@@ -1,6 +1,11 @@
 # 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.114 2004/07/28 13:51:09 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.115 2004/08/06 18:39:50 caleb Exp $
+
+*kdemultimedia-3.3.0_rc1 (06 Aug 2004)
+
+  06 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdemultimedia-3.3.0_rc1.ebuild:
+  New _rc1, remove _beta1
 
   28 Jul 2004; Caleb Tennis <caleb@gentoo.org>
   kdemultimedia-3.3.0_beta2.ebuild:
diff --git a/kde-base/kdemultimedia/Manifest b/kde-base/kdemultimedia/Manifest
index 963ef41c4cfc..42da157692d7 100644
--- a/kde-base/kdemultimedia/Manifest
+++ b/kde-base/kdemultimedia/Manifest
@@ -1,6 +1,7 @@
 MD5 728a544c6c7320d96abb3c6ac20a9671 kdemultimedia-3.2.1.ebuild 2286
 MD5 3bb82947f96c1cb2ffbdbda5895e5f37 kdemultimedia-3.3.0_beta2.ebuild 1433
 MD5 6f17211987d69d64b045e7920d823648 kdemultimedia-3.1.5.ebuild 2690
+MD5 4d890a96b0369bc79450c8bdb60ac5d5 kdemultimedia-3.3.0_rc1.ebuild 1460
 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
@@ -12,6 +13,7 @@ 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 792981bbb032ff38a8fc8f9da04ca876 files/digest-kdemultimedia-3.3.0_rc1 77
 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
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.3.0_beta1 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.3.0_beta1
deleted file mode 100644
index 78d54235aff7..000000000000
--- a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.3.0_beta1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 df70dd138b15a24aa185299bd5da7643 kdemultimedia-3.2.91.tar.bz2 5341164
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.3.0_rc1 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.3.0_rc1
new file mode 100644
index 000000000000..38eeefe2705e
--- /dev/null
+++ b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.3.0_rc1
@@ -0,0 +1 @@
+MD5 e15adddc6db026884282d78ea8454619 kdemultimedia-3.3.0-rc1.tar.bz2 5442756
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.3.0_beta1.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.3.0_rc1.ebuild
index a696af245339..4099624c7da6 100644
--- a/kde-base/kdemultimedia/kdemultimedia-3.3.0_beta1.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-3.3.0_rc1.ebuild
@@ -1,22 +1,22 @@
 # 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_beta1.ebuild,v 1.1 2004/07/08 22:38:29 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.3.0_rc1.ebuild,v 1.1 2004/08/06 18:39:50 caleb Exp $
 
 inherit kde-dist flag-o-matic
 
 DESCRIPTION="KDE multimedia apps: noatun, kscd, artsbuilder..."
 
 KEYWORDS="~x86 ~amd64"
-IUSE="flac encode oggvorbis alsa gstreamer"
+IUSE="alsa cdparanoia encode flac oggvorbis speex xine"
 
 DEPEND="~kde-base/kdebase-${PV}
-	media-sound/cdparanoia
+	cdparanoia? ( media-sound/cdparanoia )
 	flac? ( media-libs/flac )
 	encode? ( media-sound/lame )
 	oggvorbis? ( media-libs/libvorbis media-libs/libogg )
-	>=media-libs/xine-lib-1_beta12
+	xine? ( >=media-libs/xine-lib-1_beta12 )
 	alsa? ( media-libs/alsa-lib )
-	gstreamer? ( media-libs/gstreamer )
+	speex? ( media-libs/speex )
 	media-sound/trm
 	media-libs/taglib
 	!media-sound/juk"
@@ -30,7 +30,7 @@ src_compile() {
 	# Still persists with 3.2.1 - kaboodle
 	filter-flags "-fno-default-inline"
 
-	myconf="$myconf --with-xine-prefix=/usr"
+	use xine && myconf="$myconf --with-xine-prefix=/usr"
 
 	# make -j2 fails, at least on ppc
 	use ppc && export MAKEOPTS="$MAKEOPTS -j1"