New version, remove _rc

10 files changed, 75 insertions, 10 deletions

diff --git a/kde-base/kdeaddons/ChangeLog b/kde-base/kdeaddons/ChangeLog
index 2982dcc537a4..d77359584484 100644
--- a/kde-base/kdeaddons/ChangeLog
+++ b/kde-base/kdeaddons/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdeaddons
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/ChangeLog,v 1.67 2004/01/29 12:54:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/ChangeLog,v 1.68 2004/02/02 14:13:47 caleb Exp $
+
+*kdeaddons-3.2.0 (02 Feb 2004)
+
+  02 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdeaddons-3.2.0.ebuild,
+  kdeaddons-3.2.0_rc1.ebuild, files/kdeaddons-3.2.0-kvim.diff,
+  files/kdeaddons-3.2.0_rc1-kvim.diff:
+  New version, remove _rc
 
   29 Jan 2004; Aron Griffis <agriffis@gentoo.org> kdeaddons-3.1.5.ebuild:
   stable on alpha and ia64
diff --git a/kde-base/kdeaddons/Manifest b/kde-base/kdeaddons/Manifest
index 1c6c3421876b..5d6d88f07c67 100644
--- a/kde-base/kdeaddons/Manifest
+++ b/kde-base/kdeaddons/Manifest
@@ -1,10 +1,9 @@
-MD5 89c2cdda83bf33c5f5749c1335252d07 kdeaddons-3.2.0.ebuild 974
+MD5 8cb06c2b82e46f14bf9c219f992ded03 kdeaddons-3.2.0.ebuild 970
 MD5 7f88d478a715c2c4ea106c0fe4b3be7f kdeaddons-3.1.4.ebuild 1419
 MD5 864417cda5cc151dfe86862ba774c1fa kdeaddons-3.0.5b.ebuild 825
-MD5 59b2ec68a6c695c16f3e6ecbba9f607c ChangeLog 9666
+MD5 8fc33cc00b916edcb5376acbf757d389 ChangeLog 9663
 MD5 75319d59b413ce45edd6852df9466493 kdeaddons-3.1.5.ebuild 1426
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 cda2046841796de1f20527d6dbe0afcc files/digest-kdeaddons-3.2.0_rc1 70
 MD5 ee9fff88c4c48e7e34d37f8bb495db0d files/kdeaddons-3.1.5-enable-crashes.diff 1415
 MD5 3bec1549e74c6f661045a83198e45290 files/kdeaddons-3.2.0-kvim.diff 363
 MD5 ee9fff88c4c48e7e34d37f8bb495db0d files/kdeaddons-3.1.4-enable-crashes.diff 1415
diff --git a/kde-base/kdeaddons/files/digest-kdeaddons-3.2.0 b/kde-base/kdeaddons/files/digest-kdeaddons-3.2.0
new file mode 100644
index 000000000000..26d11f055345
--- /dev/null
+++ b/kde-base/kdeaddons/files/digest-kdeaddons-3.2.0
@@ -0,0 +1 @@
+MD5 e61991c52aa6b76dec0790e76eb889bd kdeaddons-3.2.0.tar.bz2 1312305
diff --git a/kde-base/kdeaddons/files/digest-kdeaddons-3.2.0_rc1 b/kde-base/kdeaddons/files/digest-kdeaddons-3.2.0_rc1
deleted file mode 100644
index 5ae457a2ba7b..000000000000
--- a/kde-base/kdeaddons/files/digest-kdeaddons-3.2.0_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 06625c7ff01537504bdbf53ab5997631 kdeaddons-3.1.95.tar.bz2 1362993
diff --git a/kde-base/kdeaddons/files/kdeaddons-3.2.0_rc1-kvim.diff b/kde-base/kdeaddons/files/kdeaddons-3.2.0-kvim.diff
index 6b1aaa827def..6b1aaa827def 100644
--- a/kde-base/kdeaddons/files/kdeaddons-3.2.0_rc1-kvim.diff
+++ b/kde-base/kdeaddons/files/kdeaddons-3.2.0-kvim.diff
diff --git a/kde-base/kdeaddons/kdeaddons-3.2.0_rc1.ebuild b/kde-base/kdeaddons/kdeaddons-3.2.0.ebuild
index 9b2acba73fed..511d91b1a474 100644
--- a/kde-base/kdeaddons/kdeaddons-3.2.0_rc1.ebuild
+++ b/kde-base/kdeaddons/kdeaddons-3.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.2.0_rc1.ebuild,v 1.1 2004/01/19 03:34:31 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.2.0.ebuild,v 1.1 2004/02/02 14:13:47 caleb Exp $
 inherit kde-dist flag-o-matic
 
 IUSE="sdl svga xmms esd"
@@ -22,4 +22,4 @@ use xmms || export ac_cv_have_xmms=no
 # Make vimpart use /usr/bin/kvim -- fixes bug 33257.
 # This should continue to apply to upcoming versions since it's
 # Gentoo-specific and won't go upstream.
-PATCHES="$FILESDIR/${PN}-3.2.0_rc1-kvim.diff"
+PATCHES="$FILESDIR/${PN}-3.2.0-kvim.diff"
diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog
index 1bfbdbc63800..4b027e7d60d6 100644
--- a/kde-base/kdemultimedia/ChangeLog
+++ b/kde-base/kdemultimedia/ChangeLog
@@ -1,6 +1,11 @@
 # 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.80 2004/01/29 12:53:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.81 2004/02/02 14:10:30 caleb Exp $
+
+*kdemultimedia-3.2.0 (02 Feb 2004)
+
+  02 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdemultimedia-3.2.0.ebuild:
+  New version, remove _rc
 
   29 Jan 2004; Aron Griffis <agriffis@gentoo.org> kdemultimedia-3.1.5.ebuild:
   stable on alpha and ia64
diff --git a/kde-base/kdemultimedia/Manifest b/kde-base/kdemultimedia/Manifest
index fee87aeda15a..ca42e8a5b940 100644
--- a/kde-base/kdemultimedia/Manifest
+++ b/kde-base/kdemultimedia/Manifest
@@ -1,7 +1,8 @@
 MD5 e001e74325bfe345c33b484127cc9455 kdemultimedia-3.1.4-r1.ebuild 2903
 MD5 13f89157acc5e177f4d07139dfc89139 kdemultimedia-3.1.5.ebuild 2782
-MD5 3bfb4504155e810680ed378c91f97c5f kdemultimedia-3.2.0.ebuild 2119
-MD5 ae3f26a52c4d4bb5e4775607a4957548 ChangeLog 12391
+MD5 fb61b76c94643a0f78ebe1c1e640bb05 kdemultimedia-3.2.0_rc1.ebuild 2113
+MD5 80a2f8b71f6f7a09e25f614a3ea31280 kdemultimedia-3.2.0.ebuild 2109
+MD5 29e13faef5bf0f916609f7bbf643a7bc ChangeLog 12526
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 6c4174f9b6cdd177f786361168b08e2b kdemultimedia-3.0.5b.ebuild 2521
 MD5 7b2708e69eb657af7e7487bdb7ee7d4f files/digest-kdemultimedia-3.1.4-r1 73
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.2.0 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.2.0
new file mode 100644
index 000000000000..4114182bb522
--- /dev/null
+++ b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.2.0
@@ -0,0 +1 @@
+MD5 caa8578190d032acd3c8fa996cf9585a kdemultimedia-3.2.0.tar.bz2 4893608
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.2.0.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.2.0.ebuild
new file mode 100644
index 000000000000..3cdc4548ad58
--- /dev/null
+++ b/kde-base/kdemultimedia/kdemultimedia-3.2.0.ebuild
@@ -0,0 +1,52 @@
+# 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.0.ebuild,v 1.1 2004/02/02 14:10:30 caleb Exp $
+inherit kde-dist flag-o-matic
+
+IUSE="nas encode esd motif slang tcltk oggvorbis gtk alsa gstreamer"
+DESCRIPTION="KDE multimedia apps: noatun, kscd, artsbuilder..."
+KEYWORDS="~x86 ~sparc ~amd64"
+
+DEPEND="~kde-base/kdebase-${PV}
+	sys-libs/ncurses
+	media-sound/cdparanoia
+	media-video/xanim
+	media-sound/mpg123
+	encode? ( media-sound/lame )
+	oggvorbis? ( media-libs/libvorbis media-libs/libogg )
+	nas? ( media-libs/nas )
+	esd? ( media-sound/esound )
+	motif? ( x11-libs/openmotif )
+	slang? ( sys-libs/slang )
+	tcltk? ( dev-lang/tk dev-lang/tcl )
+	>=dev-libs/glib-2.2.1
+	>=media-libs/xine-lib-1_beta12
+	gtk? ( =x11-libs/gtk+-1.2* )
+	alsa? ( media-libs/alsa-lib )
+	gstreamer? ( media-libs/gstreamer )
+	media-libs/id3lib media-libs/musicbrainz media-libs/taglib
+	!media-sound/juk"
+
+RDEPEND="$DEPEND"
+
+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
+use ppc && export MAKEOPTS="$MAKEOPTS -j1"
+
+# 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"
+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"
+
+myconf="$myconf $myaudio $myinterface --with-cdda --disable-strict --disable-warnings"
+