New version

6 files changed, 101 insertions, 13 deletions

diff --git a/kde-base/kde/ChangeLog b/kde-base/kde/ChangeLog
index 014443b8b3ab..b077d99fdc6e 100644
--- a/kde-base/kde/ChangeLog
+++ b/kde-base/kde/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kde
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/ChangeLog,v 1.48 2004/01/13 16:54:54 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/ChangeLog,v 1.49 2004/01/15 03:46:09 caleb Exp $
+
+*kde-3.1.5 (14 Jan 2004)
+
+  14 Jan 2004; Caleb Tennis <caleb@gentoo.org> kde-3.1.5.ebuild:
+  New version
 
   13 Jan 2004; Aron Griffis <agriffis@gentoo.org> kde-3.1.4.ebuild:
   stable on alpha
diff --git a/kde-base/kde/Manifest b/kde-base/kde/Manifest
index 572b892f37ba..bf5255d46022 100644
--- a/kde-base/kde/Manifest
+++ b/kde-base/kde/Manifest
@@ -1,14 +1,16 @@
-MD5 39278405d4879b2c14b723952cd6c5fe ChangeLog 5692
-MD5 cdbbac4ad107f5f9bd885918b1a585ad kde-3.0.4.ebuild 594
-MD5 8a6302de0a3c80df7e0c1d205df1c265 metadata.xml 323
-MD5 d9f0bde5852ae41f6670ce3ff6bb1a6b kde-3.1.4.ebuild 616
-MD5 517228b72c36990d84aaaec5beba35b0 kde-3.0.5b.ebuild 604
 MD5 f71cef84544741221023480fdecaf1be kde-3.1.2.ebuild 608
-MD5 d95201c23e736d506035d703b438bb31 kde-3.2.0_beta1.ebuild 607
+MD5 d9f0bde5852ae41f6670ce3ff6bb1a6b kde-3.1.4.ebuild 616
 MD5 684a56974794b85e7c13d83d74965284 kde-3.2.0_beta2.ebuild 614
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-3.0.4 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-3.1.4 0
-MD5 b9017c5399befa28b08a2c99cf2c8f6c files/digest-kde-3.0.5b 60
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-3.1.2 0
+MD5 715f67b8a44fa193322b003648285f9f kde-3.1.5.ebuild 621
+MD5 0cd97e2c80d78351457dd794b48aeebd ChangeLog 5798
+MD5 8a6302de0a3c80df7e0c1d205df1c265 metadata.xml 323
+MD5 d95201c23e736d506035d703b438bb31 kde-3.2.0_beta1.ebuild 607
+MD5 517228b72c36990d84aaaec5beba35b0 kde-3.0.5b.ebuild 604
+MD5 cdbbac4ad107f5f9bd885918b1a585ad kde-3.0.4.ebuild 594
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-3.2.0_beta1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-3.2.0_beta2 0
+MD5 b9017c5399befa28b08a2c99cf2c8f6c files/digest-kde-3.0.5b 60
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-3.0.4 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-3.1.2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-3.1.4 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-3.1.5 0
diff --git a/kde-base/kdeaddons/Manifest b/kde-base/kdeaddons/Manifest
index 39b9d0d54636..b7af265b4f17 100644
--- a/kde-base/kdeaddons/Manifest
+++ b/kde-base/kdeaddons/Manifest
@@ -4,8 +4,8 @@ MD5 139064b9ef2931f40df4c8c9baf2d0ed kdeaddons-3.2.0_beta1.ebuild 745
 MD5 7f88d478a715c2c4ea106c0fe4b3be7f kdeaddons-3.1.4.ebuild 1419
 MD5 864417cda5cc151dfe86862ba774c1fa kdeaddons-3.0.5b.ebuild 825
 MD5 3cfcc7fbe121f97b7c769ab281c9bdc5 kdeaddons-3.2.0_beta2.ebuild 978
-MD5 3e710611921a7ed0eaf51416038dae7a ChangeLog 8599
-MD5 1db53cded6220c5ed0a36ba001d24df7 kdeaddons-3.1.5.ebuild 1424
+MD5 fc693b072465de5fff1e473e17a47892 ChangeLog 8759
+MD5 c894ea7ad7218731f157d8e74084e67c kdeaddons-3.1.5.ebuild 1420
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 ee9fff88c4c48e7e34d37f8bb495db0d files/kdeaddons-3.1.5-enable-crashes.diff 1415
 MD5 ee9fff88c4c48e7e34d37f8bb495db0d files/kdeaddons-3.1.3-enable-crashes.diff 1415
diff --git a/kde-base/kdeaddons/files/digest-kdeaddons-3.1.5 b/kde-base/kdeaddons/files/digest-kdeaddons-3.1.5
new file mode 100644
index 000000000000..79aa7ea0a28f
--- /dev/null
+++ b/kde-base/kdeaddons/files/digest-kdeaddons-3.1.5
@@ -0,0 +1 @@
+MD5 789f4ff2037a9ce1ae0219f7e2fc4db6 kdeaddons-3.1.5.tar.bz2 1076411
diff --git a/kde-base/kdeaddons/files/kdeaddons-3.1.5-enable-crashes.diff b/kde-base/kdeaddons/files/kdeaddons-3.1.5-enable-crashes.diff
new file mode 100644
index 000000000000..704eda533e80
--- /dev/null
+++ b/kde-base/kdeaddons/files/kdeaddons-3.1.5-enable-crashes.diff
@@ -0,0 +1,33 @@
+===================================================================
+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.5.ebuild b/kde-base/kdeaddons/kdeaddons-3.1.5.ebuild
new file mode 100644
index 000000000000..fcc3f9c497e6
--- /dev/null
+++ b/kde-base/kdeaddons/kdeaddons-3.1.5.ebuild
@@ -0,0 +1,47 @@
+# 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.5.ebuild,v 1.1 2004/01/15 03:43:58 caleb 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
+}
+