3.3.0 final

5 files changed, 21 insertions, 12 deletions

diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog
index 0023060f6680..6e3b324752fd 100644
--- a/kde-base/kdemultimedia/ChangeLog
+++ b/kde-base/kdemultimedia/ChangeLog
@@ -1,6 +1,12 @@
 # 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.117 2004/08/10 14:54:13 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.118 2004/08/19 14:30:00 caleb Exp $
+
+*kdemultimedia-3.3.0 (19 Aug 2004)
+
+  19 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdemultimedia-3.3.0.ebuild,
+  kdemultimedia-3.3.0_beta2.ebuild:
+  3.3.0 final
 
 *kdemultimedia-3.3.0_rc2 (10 Aug 2004)
 
diff --git a/kde-base/kdemultimedia/Manifest b/kde-base/kdemultimedia/Manifest
index db1eb1421342..6e4ef01f97b6 100644
--- a/kde-base/kdemultimedia/Manifest
+++ b/kde-base/kdemultimedia/Manifest
@@ -1,11 +1,11 @@
 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 bcacada464ac76da45b79ee9825cbc87 kdemultimedia-3.2.3.ebuild 1460
 MD5 78a5d756b72f651a8038451801e9bee6 kdemultimedia-3.2.0.ebuild 2255
 MD5 6affdbc1c02d7034aecca744fb5128a4 kdemultimedia-3.2.2.ebuild 2290
 MD5 cb93ab2aa47f5cfa2918e4d596a3569a kdemultimedia-3.2.2-r1.ebuild 1460
-MD5 cb6c82d597099f6bb897fd7a3470aa77 ChangeLog 17064
+MD5 1ee8988bcea51170ab19459379228ead kdemultimedia-3.3.0.ebuild 1607
+MD5 d4a975d546afdab74b773515c4ce5c91 ChangeLog 17226
 MD5 fc8e2f2a3a509414fad24f77ed36e28a kdemultimedia-3.3.0_rc2.ebuild 1611
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 a39413062132d248ceae0b20ed262e79 files/flac-patch.diff 450
@@ -14,9 +14,9 @@ MD5 441c0251c7db96f19b27f29861f65ee9 files/kdemultimedia-3.1.5-alpha.diff 300
 MD5 fe58e9a2bdef8ba1e3b8268714ff5fa7 files/kdemultimedia-3.1.5-ln-sf.diff 1278
 MD5 6ded8f8f933702420927ea07cfc7f3eb files/digest-kdemultimedia-3.3.0_rc2 77
 MD5 55cd599c61d48ca121ef4c96a905b6d1 files/kdemultimedia-3.1.5-gentoo-timidity.diff 590
-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
 MD5 373aaabfcb29c89281c6880b2a784c2a files/digest-kdemultimedia-3.2.2 73
 MD5 ddadc716d5d607434a4fa830a241ac65 files/digest-kdemultimedia-3.2.3 73
+MD5 ff71f209a5c07db1d7ba70b4109484f0 files/digest-kdemultimedia-3.3.0 73
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.3.0 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.3.0
new file mode 100644
index 000000000000..31a96a96ac22
--- /dev/null
+++ b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.3.0
@@ -0,0 +1 @@
+MD5 2579f41004b39168da25cb4db0043f00 kdemultimedia-3.3.0.tar.bz2 5356679
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.3.0_beta2 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.3.0_beta2
deleted file mode 100644
index e2b2f0928c27..000000000000
--- a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.3.0_beta2
+++ /dev/null
@@ -1 +0,0 @@
-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.ebuild
index 910c7146a5c2..1dea8fcf3e74 100644
--- a/kde-base/kdemultimedia/kdemultimedia-3.3.0_beta2.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-3.3.0.ebuild
@@ -1,24 +1,24 @@
 # 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.2 2004/07/28 13:51:09 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.3.0.ebuild,v 1.1 2004/08/19 14:30:00 caleb Exp $
 
 inherit kde-dist flag-o-matic
 
 DESCRIPTION="KDE multimedia apps: noatun, kscd, artsbuilder..."
 
 KEYWORDS="~x86 ~amd64"
-IUSE="flac encode oggvorbis alsa xine speex"
+IUSE="alsa audiofile cdparanoia encode flac oggvorbis speex xine"
 
 DEPEND="~kde-base/kdebase-${PV}
-	media-sound/cdparanoia
+	audiofile? ( media-libs/audiofile )
+	cdparanoia? ( media-sound/cdparanoia )
 	flac? ( media-libs/flac )
 	encode? ( media-sound/lame )
-	oggvorbis? ( media-libs/libvorbis media-libs/libogg )
+	oggvorbis? ( media-sound/vorbis-tools )
 	xine? ( >=media-libs/xine-lib-1_beta12 )
 	alsa? ( media-libs/alsa-lib )
 	speex? ( media-libs/speex )
-	media-sound/trm
-	media-libs/taglib
+	media-libs/taglib media-libs/tunepimp
 	!media-sound/juk"
 
 src_unpack() {
@@ -30,7 +30,10 @@ 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"
+	use xine || DO_NOT_COMPILE="$DO_NOT_COMPILE xine_artsplugin"
+
+	myconf="${myconf} `use_with cdparanoia`"
 
 	# make -j2 fails, at least on ppc
 	use ppc && export MAKEOPTS="$MAKEOPTS -j1"