new version

9 files changed, 111 insertions, 6 deletions

diff --git a/kde-base/kde/ChangeLog b/kde-base/kde/ChangeLog
index 812bebe73d80..033fea66650f 100644
--- a/kde-base/kde/ChangeLog
+++ b/kde-base/kde/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kde
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/ChangeLog,v 1.37 2003/09/17 01:44:19 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/ChangeLog,v 1.38 2003/09/17 02:33:39 caleb Exp $
+
+*kde-3.1.4 (16 Sep 2003)
+
+  16 Sep 2003; Caleb Tennis <caleb@gentoo.org> kde-3.1.4.ebuild:
+  new version
 
   16 Sep 2003; Jason Wever <weeve@gentoo.org> kde-3.1.3.ebuild:
   Marked stable for sparc.
diff --git a/kde-base/kde/Manifest b/kde-base/kde/Manifest
index c5b309a859ba..2075b34ecc73 100644
--- a/kde-base/kde/Manifest
+++ b/kde-base/kde/Manifest
@@ -1,9 +1,9 @@
 MD5 f71cef84544741221023480fdecaf1be kde-3.1.2.ebuild 608
-MD5 7ef874221631cfb03cb91564d30abe4d kde-3.1.4.ebuild 597
+MD5 70bd8ede4e291d194d562a6a07333a86 kde-3.1.4.ebuild 599
 MD5 b01b23f93afb9df95bcd9477b82cf1ef kde-2.2.2-r1.ebuild 608
 MD5 7ef874221631cfb03cb91564d30abe4d kde-3.1.3.ebuild 597
 MD5 6fd31fa85d8d638c506c34290d29a2b6 kde-3.1.1a.ebuild 624
-MD5 80b50233820983d1f2f803a004ae79ea ChangeLog 4520
+MD5 40917cee25f0ed357b23512b37ac18fa ChangeLog 4626
 MD5 8a6302de0a3c80df7e0c1d205df1c265 metadata.xml 323
 MD5 517228b72c36990d84aaaec5beba35b0 kde-3.0.5b.ebuild 604
 MD5 cdbbac4ad107f5f9bd885918b1a585ad kde-3.0.4.ebuild 594
diff --git a/kde-base/kde/files/digest-kde-3.1.4 b/kde-base/kde/files/digest-kde-3.1.4
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/kde-base/kde/files/digest-kde-3.1.4
diff --git a/kde-base/kde/kde-3.1.4.ebuild b/kde-base/kde/kde-3.1.4.ebuild
new file mode 100644
index 000000000000..edb0cc4a6368
--- /dev/null
+++ b/kde-base/kde/kde-3.1.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/kde-3.1.4.ebuild,v 1.1 2003/09/17 02:33:39 caleb Exp $
+
+IUSE=""
+KEYWORDS="~x86 ~ppc ~sparc"
+DESCRIPTION="KDE 3.1 - merge this to pull in all non-developer kde-base/* packages"
+HOMEPAGE="http://www.kde.org/"
+# removed: kdebindings, kdesdk, kdoc since these are developer-only packages
+RDEPEND="`echo ~kde-base/kde{libs,base,addons,admin,artwork,edu,games,graphics,multimedia,network,pim,toys,utils}-${PV}`"
+
+LICENSE="GPL-2"
+
+SLOT="3.1"
diff --git a/kde-base/kdeaddons/ChangeLog b/kde-base/kdeaddons/ChangeLog
index f1ead489ab6d..c854b4e7cfc0 100644
--- a/kde-base/kdeaddons/ChangeLog
+++ b/kde-base/kdeaddons/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdeaddons
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/ChangeLog,v 1.48 2003/09/17 01:35:46 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/ChangeLog,v 1.49 2003/09/17 02:32:22 caleb Exp $
+
+*kdeaddons-3.1.4 (16 Sep 2003)
+
+  16 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdeaddons-3.1.4.ebuild,
+  files/kdeaddons-3.1.4-enable-crashes.diff:
+  new version
 
   16 Sep 2003; Jason Wever <weeve@gentoo.org> kdeaddons-3.1.3.ebuild:
   Marked stable for sparc.
diff --git a/kde-base/kdeaddons/Manifest b/kde-base/kdeaddons/Manifest
index 555b17e61f02..e3c7ac28e11d 100644
--- a/kde-base/kdeaddons/Manifest
+++ b/kde-base/kdeaddons/Manifest
@@ -1,15 +1,16 @@
 MD5 3bf9136d3c3c79a44517a60b6c82bddf kdeaddons-3.0.4.ebuild 817
 MD5 dc2120a4612d763b0a60e63586a52858 kdeaddons-3.1.2.ebuild 1381
-MD5 5e055245e4d5307daa71eee4d184618b kdeaddons-3.1.4.ebuild 1354
+MD5 4e8ecb8630fe03a80c96f78fa9fa410b kdeaddons-3.1.4.ebuild 1353
 MD5 40bf9097b4157cd3b95641d8e729479a kdeaddons-2.2.2-r1.ebuild 463
 MD5 ef7a807e0785aefe0b5b0d1df93557ec kdeaddons-3.1.1.ebuild 939
 MD5 cf8efeae531c50192c4b43441148aa96 kdeaddons-3.0.5b.ebuild 826
 MD5 72137849841d18f504b9087a5b652eec kdeaddons-3.1.3.ebuild 1349
-MD5 999399bfb063d59f337ea931a307d5e8 ChangeLog 6607
+MD5 c1e9aee5ae7f521a19ae16d1331112a4 ChangeLog 6770
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 098c455a204e173354058b9d6f6c57d1 files/digest-kdeaddons-2.2.2-r1 68
 MD5 ee9fff88c4c48e7e34d37f8bb495db0d files/kdeaddons-3.1.3-enable-crashes.diff 1415
 MD5 ee9fff88c4c48e7e34d37f8bb495db0d files/kdeaddons-3.1.1-enable-crashes.diff 1415
+MD5 ee9fff88c4c48e7e34d37f8bb495db0d files/kdeaddons-3.1.4-enable-crashes.diff 1415
 MD5 ee9fff88c4c48e7e34d37f8bb495db0d files/kdeaddons-3.1.2-enable-crashes.diff 1415
 MD5 c6085bb9e78b909f1e887b6a60e86979 files/digest-kdeaddons-3.0.5b 69
 MD5 daf284d1e03ab78bef056c0b4c2a9285 files/digest-kdeaddons-3.0.4 68
diff --git a/kde-base/kdeaddons/files/digest-kdeaddons-3.1.4 b/kde-base/kdeaddons/files/digest-kdeaddons-3.1.4
new file mode 100644
index 000000000000..3a1492a87475
--- /dev/null
+++ b/kde-base/kdeaddons/files/digest-kdeaddons-3.1.4
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000000..704eda533e80
--- /dev/null
+++ b/kde-base/kdeaddons/files/kdeaddons-3.1.4-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.4.ebuild b/kde-base/kdeaddons/kdeaddons-3.1.4.ebuild
new file mode 100644
index 000000000000..13848eac5233
--- /dev/null
+++ b/kde-base/kdeaddons/kdeaddons-3.1.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2003 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.1 2003/09/17 02:32:22 caleb Exp $
+inherit kde-dist flag-o-matic
+
+IUSE="sdl svga xmms"
+DESCRIPTION="KDE addon modules: plugins for konqueror, noatun etc"
+KEYWORDS="~x86 ~ppc ~sparc"
+
+newdepend "=kde-base/kdebase-${PV}*
+	~kde-base/kdenetwork-${PV}
+	~kde-base/kdemultimedia-${PV}
+	~kde-base/arts-${PV//3./1.}
+	sdl? ( >=media-libs/libsdl-1.2 )
+	svga? ( media-libs/svgalib )
+	xmms? ( media-sound/xmms )"
+
+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
+}
+