x86 stable and version bump

12 files changed, 16 insertions, 230 deletions

diff --git a/kde-base/kdeaddons/ChangeLog b/kde-base/kdeaddons/ChangeLog
index 10e320b31774..0d53bf768ff2 100644
--- a/kde-base/kdeaddons/ChangeLog
+++ b/kde-base/kdeaddons/ChangeLog
@@ -1,6 +1,10 @@
 # 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.75 2004/03/09 16:06:45 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/ChangeLog,v 1.76 2004/03/12 20:55:48 caleb Exp $
+
+  12 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdeaddons-3.1.4.ebuild,
+  kdeaddons-3.2.1.ebuild, files/kdeaddons-3.1.4-enable-crashes.diff:
+  x86 stable and version cleanups
 
 *kdeaddons-3.2.1 (09 Mar 2004)
 
diff --git a/kde-base/kdeaddons/files/digest-kdeaddons-3.1.4 b/kde-base/kdeaddons/files/digest-kdeaddons-3.1.4
deleted file mode 100644
index 3a1492a87475..000000000000
--- a/kde-base/kdeaddons/files/digest-kdeaddons-3.1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1e9e3159994583a38e2451380bccdae2 kdeaddons-3.1.4.tar.bz2 1082853
diff --git a/kde-base/kdeaddons/files/kdeaddons-3.1.4-enable-crashes.diff b/kde-base/kdeaddons/files/kdeaddons-3.1.4-enable-crashes.diff
deleted file mode 100644
index 704eda533e80..000000000000
--- a/kde-base/kdeaddons/files/kdeaddons-3.1.4-enable-crashes.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-===================================================================
-RCS file: /home2/webcvs/mirror/kdeaddons/konq-plugins/Makefile.am,v
-retrieving revision 1.12
-retrieving revision 1.13
-diff -u -p -r1.12 -r1.13
---- konq-plugins/Makefile.am	2002/06/24 22:34:10	1.12
-+++ konq-plugins/Makefile.am	2002/11/28 14:08:20	1.13
-@@ -1,2 +1,2 @@
--SUBDIRS = khtmlsettingsplugin kimgalleryplugin dirfilter uachanger \
-+SUBDIRS = crashes khtmlsettingsplugin kimgalleryplugin dirfilter uachanger \
-           babelfish validators domtreeviewer webarchiver sidebar kuick smbmounter
-===================================================================
-RCS file: /home2/webcvs/mirror/kdeaddons/konq-plugins/crashes/crashesplugin.cpp,v
-retrieving revision 1.8
-retrieving revision 1.9
-diff -u -p -r1.8 -r1.9
---- konq-plugins/crashes/crashesplugin.cpp	2002/09/18 09:37:52	1.8
-+++ konq-plugins/crashes/crashesplugin.cpp	2002/11/28 14:08:20	1.9
-@@ -135,12 +135,12 @@ void CrashesPlugin::slotAboutToShow()
- 
- void CrashesPlugin::newBookmarkCallback( const QString & text, const QCString & url, const QString & additionnalInfo )
- {
--  m_crashesList << qMakePair(text,url);
-+  m_crashesList.prepend(qMakePair(text,url));
- }
- 
- void CrashesPlugin::endFolderCallback( )
- {
--  m_crashesList << qMakePair(QString("-"),QCString("-"));
-+  m_crashesList.prepend(qMakePair(QString("-"),QCString("-")));
- }
- 
- void CrashesPlugin::slotClearCrashes() {
diff --git a/kde-base/kdeaddons/kdeaddons-3.1.4.ebuild b/kde-base/kdeaddons/kdeaddons-3.1.4.ebuild
deleted file mode 100644
index a8bd2dc62dda..000000000000
--- a/kde-base/kdeaddons/kdeaddons-3.1.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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.1.4.ebuild,v 1.11 2004/01/13 16:54:25 agriffis Exp $
-inherit kde-dist flag-o-matic
-
-IUSE="sdl svga xmms esd"
-DESCRIPTION="KDE addon modules: plugins for konqueror, noatun etc"
-KEYWORDS="x86 ppc sparc hppa amd64 alpha"
-
-DEPEND="=kde-base/kdebase-${PV}*
-	~kde-base/kdenetwork-${PV}
-	~kde-base/kdemultimedia-${PV}
-	~kde-base/arts-${PV//3./1.}
-	esd? ( media-sound/esound )
-	sdl? ( >=media-libs/libsdl-1.2 )
-	svga? ( media-libs/svgalib )
-	xmms? ( media-sound/xmms )"
-RDEPEND="$DEPEND"
-
-use sdl && myconf="$myconf --with-sdl --with-sdl-prefix=/usr" || myconf="$myconf --without-sdl --disable-sdltest"
-
-use xmms || export ac_cv_have_xmms=no
-
-# fix bug #7625
-if [ "$COMPILER" == "gcc3" ]; then
-	if [ -n "`is-flag -march=pentium4`" -o -n "`is-flag -mcpu=pentium4`" ]; then
-		append-flags -mno-sse2
-	fi
-fi
-
-# enable building of konqueror carsh recovery plugin. it was disabled accidentally
-# in the orig kde 3.1 release and was reenabled soon after in cvs head
-PATCHES="$FILESDIR/$P-enable-crashes.diff"
-
-need-automake 1.7
-need-autoconf 2.5
-
-src_compile() {
-	AMVERSION="`automake --version | head -n 1 | cut -d " " -f4`"
-	if [ "$AMVERSION" != "1.7.2" ]; then
-		rm -f configure configure.in
-	fi
-
-	kde_src_compile configure
-	kde_src_compile make
-}
-
diff --git a/kde-base/kdeaddons/kdeaddons-3.2.1.ebuild b/kde-base/kdeaddons/kdeaddons-3.2.1.ebuild
index 449611576901..f58d5a1fdb24 100644
--- a/kde-base/kdeaddons/kdeaddons-3.2.1.ebuild
+++ b/kde-base/kdeaddons/kdeaddons-3.2.1.ebuild
@@ -1,12 +1,12 @@
 # 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.1.ebuild,v 1.1 2004/03/09 16:06:45 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.2.1.ebuild,v 1.2 2004/03/12 20:55:48 caleb Exp $
 
 inherit kde-dist flag-o-matic
 
 DESCRIPTION="KDE addon modules: plugins for konqueror, noatun etc"
 
-KEYWORDS="~x86 ~ppc ~sparc ~hppa ~amd64 ~alpha ~ia64"
+KEYWORDS="x86 ~ppc ~sparc ~hppa ~amd64 ~alpha ~ia64"
 IUSE="sdl svga xmms esd"
 
 DEPEND="~kde-base/kdepim-${PV}
diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog
index 3f8a8a4e667c..84f878591189 100644
--- a/kde-base/kdemultimedia/ChangeLog
+++ b/kde-base/kdemultimedia/ChangeLog
@@ -1,6 +1,12 @@
 # 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.92 2004/03/09 12:35:46 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.93 2004/03/12 20:55:14 caleb Exp $
+
+  12 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdemultimedia-3.1.4-r1.ebuild,
+  kdemultimedia-3.2.1.ebuild, files/kdemultimedia-3.1.4-alpha.diff,
+  files/kdemultimedia-3.1.4-gentoo-timidity.diff,
+  files/kdemultimedia-3.1.4-ln-sf.diff:
+  x86 stable and version bump
 
 *kdemultimedia-3.2.1 (09 Mar 2004)
 
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1.4-r1 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1.4-r1
deleted file mode 100644
index 2fbee1983af0..000000000000
--- a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f9f2b0b79a6a9ced3ae601b57da53129 kdemultimedia-3.1.4.tar.bz2 5932776
diff --git a/kde-base/kdemultimedia/files/kdemultimedia-3.1.4-alpha.diff b/kde-base/kdemultimedia/files/kdemultimedia-3.1.4-alpha.diff
deleted file mode 100644
index ec18135fcdde..000000000000
--- a/kde-base/kdemultimedia/files/kdemultimedia-3.1.4-alpha.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- mpeglib/lib/input/cdromAccess_Linux.cpp.agriffis	2004-01-11 23:03:27.000000000 -0500
-+++ mpeglib/lib/input/cdromAccess_Linux.cpp	2004-01-11 23:03:37.000000000 -0500
-@@ -10,7 +10,9 @@
- 
-  */
- 
-+#if 0
- typedef unsigned long long __u64;
-+#endif
- 
- #include "cdromToc.h"
- #include "cdromRawAccess.h"
diff --git a/kde-base/kdemultimedia/files/kdemultimedia-3.1.4-gentoo-timidity.diff b/kde-base/kdemultimedia/files/kdemultimedia-3.1.4-gentoo-timidity.diff
deleted file mode 100644
index f392a244212e..000000000000
--- a/kde-base/kdemultimedia/files/kdemultimedia-3.1.4-gentoo-timidity.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru kdemultimedia-2.2.1.orig/kmidi/TIMIDITY/motif_p.c kdemultimedia-2.2.1/kmidi/TIMIDITY/motif_p.c
---- kmidi/TIMIDITY/motif_p.c	Mon Feb 28 19:07:37 2000
-+++ kmidi/TIMIDITY/motif_p.c	Fri Oct 19 04:00:10 2001
-@@ -22,6 +22,7 @@
-     pipe communication between motif interface and sound generator
-
-     */
-+#include <sys/errno.h>
- #ifdef IA_MOTIF
-
- #include <stdio.h>
---- kmidi/TIMIDITY/tk_c.c       2002-04-04 21:15:35.000000000 -0600
-+++ kmidi/TIMIDITY/tk_c.c       2002-04-04 21:17:06.000000000 -0600
-@@ -12,6 +12,7 @@
-  *================================================================*/
- #ifdef TCLTK
-
-+#include <sys/errno.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
diff --git a/kde-base/kdemultimedia/files/kdemultimedia-3.1.4-ln-sf.diff b/kde-base/kdemultimedia/files/kdemultimedia-3.1.4-ln-sf.diff
deleted file mode 100644
index ee6daa91f3dc..000000000000
--- a/kde-base/kdemultimedia/files/kdemultimedia-3.1.4-ln-sf.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- kmidi/TIMIDITY/makelinks	Sat Aug 24 11:36:27 2002
-+++ kmidi/TIMIDITY/makelinks	Sat Aug 24 11:36:15 2002
-@@ -3,7 +3,7 @@ srcdir=$1
- for header in common config controls ctl effects filter instrum mix \
-               output playmidi readmidi resample sbk sflayer tables \
-               version ; do
--    if [ ! -h ${header}.h ]; then ln -s ${srcdir}/${header}.h . ; fi
-+    if [ ! -h ${header}.h ]; then ln -sf ${srcdir}/${header}.h . ; fi
- done
- 
- for cfile in alsa_a arts_a b_out bag bsd20_a celeste_e chorus_e \
-@@ -13,14 +13,14 @@ for cfile in alsa_a arts_a b_out bag bsd
- 	     playmidi raw_a readmidi readsbk resample resample_f \
- 	     resample_l reverb_e sbktext sf2cfg slang_c sndfont \
- 	     sun_a tables timidity wav2pat wave_a ; do
--    if [ ! -h ${cfile}.c ]; then ln -s ${srcdir}/${cfile}.cpp ${cfile}.c ; fi
-+    if [ ! -h ${cfile}.c ]; then ln -sf ${srcdir}/${cfile}.cpp ${cfile}.c ; fi
- done
- 
- for lfile in cfg ; do
--    if [ ! -h ${lfile}.l ]; then ln -s ${srcdir}/${lfile}.l . ; fi
-+    if [ ! -h ${lfile}.l ]; then ln -sf ${srcdir}/${lfile}.l . ; fi
- done
- 
- # LEAVE THIS ONE AT THE END!!
- for other in BITMAPS ; do
--    if [ ! -h ${other} ]; then ln -s ${srcdir}/${other} . ; fi
-+    if [ ! -h ${other} ]; then ln -sf ${srcdir}/${other} . ; fi
- done
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.1.4-r1.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.1.4-r1.ebuild
deleted file mode 100644
index 4763a17bc528..000000000000
--- a/kde-base/kdemultimedia/kdemultimedia-3.1.4-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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.1.4-r1.ebuild,v 1.15 2004/03/01 12:35:24 aliz Exp $
-inherit kde-dist flag-o-matic
-
-IUSE="nas esd motif slang tcltk oggvorbis cdr"
-DESCRIPTION="KDE multimedia apps: noatun, kscd, artsbuilder..."
-KEYWORDS="x86 sparc ppc hppa amd64 alpha"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	>=media-sound/cdparanoia-3.9.8
-	>=media-libs/libvorbis-1.0_beta4
-	!hppa? ( >=media-video/xanim-2.80.1 )
-	nas? ( >=media-libs/nas-1.4.1 )
-	esd? ( >=media-sound/esound-0.2.22 )
-	motif? ( x11-libs/openmotif )
-	slang? ( >=sys-libs/slang-1.4.4 )
-	virtual/mpg123
-	tcltk? ( >=dev-lang/tk-8.0.5-r2 )
-	>=dev-libs/glib-1.3.3
-	oggvorbis? ( media-libs/libvorbis )
-	>=media-libs/xine-lib-1_beta10"
-	#gtk? ( =x11-libs/gtk+-1.2* )
-#	alsa? ( >=media-libs/alsa-lib-0.5.9 )"
-
-RDEPEND="$DEPEND
-	cdr? ( app-cdr/cdrtools
-	>=app-cdr/cdrdao-1.1.5 )"
-
-replace-flags "-O3" "-O2"
-filter-flags "-fno-default-inline"
-
-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
-export MAKEOPTS="$MAKEOPTS -j1"
-
-PATCHES="$FILESDIR/$P-gentoo-timidity.diff
-	$FILESDIR/$P-ln-sf.diff
-	$FILESDIR/$P-alpha.diff"
-	#$FILESDIR/${P}-gcc33.diff"
-
-# 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"
-# kmidi/TIMIDITY miscompiles with gtk
-#use gtk		&& myinterface="$myinterface,gtk"   && myconf="$myconf --enable-gtk"
-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"
-
-use cdr		|| KDE_REMOVE_DIR="kaudiocreator"
-
-[ -z "`use cdr`" ] && KDE_REMOVE_DIR="$KDE_REMOVE_DIR kaudiocreator"
-
-myconf="$myconf $myaudio $myinterface"
-
-src_unpack() {
-	kde_src_unpack
-	cd ${S} && aclocal
-}
-
-src_compile() {
-	kde_src_compile myconf
-	kde_fix_head_instances acinclude.m4 aclocal.m4 admin/cvs.sh admin/libtool.m4.in configure
-	kde_src_compile configure make
-}
-
-pkg_postinst() {
-	if [ -n "`use alsa`" ]; then
-	einfo "WARNING: alsa support has been removed becuase of a bug in kdemm sources.
-For further information see bug #2324 on bugs.gentoo.org and bug #39574 on bugs.kde.org.
-Meanwhile, you can use the alsa oss emulation."
-	fi
-}
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.2.1.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.2.1.ebuild
index 6266e479442c..de56dd660974 100644
--- a/kde-base/kdemultimedia/kdemultimedia-3.2.1.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-3.2.1.ebuild
@@ -1,12 +1,12 @@
 # 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.1.ebuild,v 1.2 2004/03/11 13:50:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.2.1.ebuild,v 1.3 2004/03/12 20:55:14 caleb Exp $
 
 inherit kde-dist flag-o-matic
 
 DESCRIPTION="KDE multimedia apps: noatun, kscd, artsbuilder..."
 
-KEYWORDS="~x86 ~ppc ~sparc ~alpha hppa ~amd64 ~ia64"
+KEYWORDS="x86 ~ppc ~sparc ~alpha hppa ~amd64 ~ia64"
 IUSE="nas encode esd motif slang tcltk oggvorbis gtk alsa gstreamer"
 
 DEPEND="~kde-base/kdebase-${PV}