Version bump - still in testing phase

4 files changed, 98 insertions, 2 deletions

diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 65ca78220ff7..6ed8b048e01a 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -2,10 +2,11 @@ MD5 91af2953e64ba4168ad04792c0e85407 kdelibs-3.1.2.ebuild 2440
 MD5 8a21daa4525f5d8edef9d9be0d4a3354 kdelibs-3.0.4-r1.ebuild 2303
 MD5 cc47efcd70a7e332a245ebb59833142d kdelibs-3.1.1a.ebuild 2645
 MD5 b738a6c4ff97493257f186b1dfb853ee kdelibs-3.0.5b.ebuild 1921
-MD5 91af2953e64ba4168ad04792c0e85407 kdelibs-3.1.3.ebuild 2440
+MD5 aa5a51f469ace2f163b3be24ba45c2f1 kdelibs-3.1.3.ebuild 2444
 MD5 ecb842ef67a00a4a3348c92a784cc3b7 kdelibs-2.2.2a-r2.ebuild 2570
-MD5 6ca2d972ee72d43b9b5bff91611effeb ChangeLog 14078
+MD5 82105bf985c10a5053c841a2ac2ce528 ChangeLog 14193
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
+MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e files/kdelibs-3.1.3-kjs-alphaev6-gcc3-workaround.patch 477
 MD5 24190dc0508cd29ea5adecc4cefc0db2 files/kdelibs-2.2.2a-crosside.diff 1267
 MD5 09f2cae6a320fd2baef3d56102cb6f62 files/digest-kdelibs-3.0.5b 68
 MD5 fe5064a43dd8ed966e50aee8b8f3364a files/digest-kdelibs-3.1.1a 136
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.1.3 b/kde-base/kdelibs/files/digest-kdelibs-3.1.3
new file mode 100644
index 000000000000..fb70000de154
--- /dev/null
+++ b/kde-base/kdelibs/files/digest-kdelibs-3.1.3
@@ -0,0 +1 @@
+MD5 db6b03c5b2c9ca5365aae3578c1e612f kdelibs-3.1.3.tar.bz2 10533300
diff --git a/kde-base/kdelibs/files/kdelibs-3.1.3-kjs-alphaev6-gcc3-workaround.patch b/kde-base/kdelibs/files/kdelibs-3.1.3-kjs-alphaev6-gcc3-workaround.patch
new file mode 100644
index 000000000000..930776d23a51
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-3.1.3-kjs-alphaev6-gcc3-workaround.patch
@@ -0,0 +1,19 @@
+--- kjs/ustring.cpp.orig	2003-01-23 15:49:49.000000000 -0500
++++ kjs/ustring.cpp	2003-01-27 19:49:00.000000000 -0500
+@@ -421,8 +421,15 @@
+ {
+   double d = toDouble();
+   bool b = true;
++  /* useless temporary variable to work around gcc optimization bug */
++  bool nan = false;
+ 
+-  if (isNaN(d) || d != static_cast<unsigned long>(d)) {
++  if (isNaN(d)) {
++    d = 0;
++    nan = true;
++  }
++
++  if (nan || d != static_cast<unsigned long>(d)) {
+     b = false;
+     d = 0;
+   }
diff --git a/kde-base/kdelibs/kdelibs-3.1.3.ebuild b/kde-base/kdelibs/kdelibs-3.1.3.ebuild
new file mode 100644
index 000000000000..12db779d51bd
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-3.1.3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.1.3.ebuild,v 1.1 2003/07/20 21:00:58 caleb Exp $
+inherit kde
+#don't inherit  kde-base or kde-dist! it calls need-kde which adds kdelibs to depend!
+
+IUSE="alsa cups ipv6 ssl"
+DESCRIPTION="KDE libraries needed by all kde programs" 
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa"
+HOMEPAGE="http//www.kde.org/"
+SLOT="3.1"
+LICENSE="GPL-2 LGPL-2"
+SRC_URI="mirror://kde/stable/$PV/src/${P}.tar.bz2"
+
+# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
+# so we recreate the entire DEPEND from scratch.
+DEPEND=""
+RDEPEND="doc? ( ~app-doc/kdelibs-apidocs-$PV )"
+newdepend "dev-lang/perl
+	>=media-libs/audiofile-0.1.9
+	>=sys-apps/bzip2-1.0.1
+	>=dev-libs/libxslt-1.0.7
+	>=dev-libs/libpcre-3.5
+	>=dev-libs/libxml2-2.4.10
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	alsa? ( >=media-libs/alsa-lib-0.5.9 >=media-sound/alsa-driver-0.5.9 )
+	cups? ( >=net-print/cups-1.1.14 )
+	>=media-libs/tiff-3.5.5
+	app-admin/fam-oss
+	app-text/ghostscript
+	media-libs/libart_lgpl
+	sys-devel/gettext
+	~kde-base/arts-1.1.3"
+
+newdepend "/autotools"
+
+RDEPEND="$RDEPEND
+	app-text/sgml-common
+	cups? ( net-print/cups )
+	dev-lang/python
+	>=sys-apps/portage-2.0.36" # for #7359
+
+myconf="$myconf --with-distribution=Gentoo --enable-libfam --enable-dnotify"
+use ipv6	|| myconf="$myconf --with-ipv6-lookup=no"
+use ssl		&& myconf="$myconf --with-ssl-dir=/usr"	|| myconf="$myconf --without-ssl"
+use alsa	&& myconf="$myconf --with-alsa"			|| myconf="$myconf --without-alsa"
+use cups	&& myconf="$myconf --enable-cups"		|| myconf="$myconf --disable-cups"
+
+use x86 && myconf="$myconf --enable-fast-malloc=full"
+
+qtver-from-kdever ${PV}
+need-qt $selected_version
+
+set-kdedir $PV
+
+src_unpack() {
+	kde_src_unpack
+	kde_sandbox_patch ${S}/kio/misc/kpac
+	use alpha && cd ${S} && epatch ${FILESDIR}/${P}-kjs-alphaev6-gcc3-workaround.patch
+}
+
+src_install() {
+	kde_src_install
+	dohtml *.html
+
+	# kdelibs-apidocs is provided by kdelibs-apidocs ebuild, kdelibs ebuild
+	# shouldn't install anything into kdelibs-apidocs (bug #15102)
+	rm -r ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs
+}
+
+pkg_postinst() {
+	einfo "If you have kde 3.0.x installed, please upgrade to kdeils-3.0.5a-r2 and kdebase-3.0.5a-r1.
+	If they don't have your arch's keywords, edit /etc/env.d/65kdelibs-3.0.*, remove the KDEDIRS=
+	line and env-update."
+}