New version - x86 stable and ~unstable on all other arches.

5 files changed, 103 insertions, 13 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 3cee12b47e1a..489763b11038 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.111 2004/01/13 16:47:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.112 2004/01/15 02:45:03 caleb Exp $
+
+*kdelibs-3.1.5 (14 Jan 2004)
+
+  14 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdelibs-3.1.5.ebuild,
+  files/kdelibs-3.1.5-kjs-alphaev6-gcc3-workaround.patch:
+  New version
 
   13 Jan 2004; Aron Griffis <agriffis@gentoo.org> kdelibs-3.1.4.ebuild:
   stable on alpha
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 5ca28d6846ff..afef3b28678d 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,22 +1,25 @@
-MD5 c36393a10843dae946886a8dce512031 ChangeLog 18600
-MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 ea339cdf171dc8b017d7df79ad1edc10 kdelibs-3.0.4-r1.ebuild 2296
-MD5 922dfd3fab1f4078d891c62afdd90148 kdelibs-3.0.5b-r1.ebuild 1990
 MD5 8be197e19e85404d68a4f5270efd4d44 kdelibs-3.1.2-r1.ebuild 2532
-MD5 91a9be08b638d2eb478665d154e9908e kdelibs-3.2.0_beta1.ebuild 2550
 MD5 6bf92d1c01b2fb7165ae97a9917d4e83 kdelibs-3.1.4.ebuild 2386
+MD5 91a9be08b638d2eb478665d154e9908e kdelibs-3.2.0_beta1.ebuild 2550
+MD5 ea339cdf171dc8b017d7df79ad1edc10 kdelibs-3.0.4-r1.ebuild 2296
+MD5 922dfd3fab1f4078d891c62afdd90148 kdelibs-3.0.5b-r1.ebuild 1990
+MD5 a37dd0c2d0206dd695b8caf0812e5826 kdelibs-3.1.5.ebuild 1930
 MD5 4f8a632cd1281ff8b695df7b477858c8 kdelibs-3.2.0_beta2.ebuild 2622
-MD5 09f2cae6a320fd2baef3d56102cb6f62 files/digest-kdelibs-3.0.5b-r1 68
-MD5 adfd3d17be1f45423f07f22cd0c73427 files/digest-kdelibs-3.1.2-r1 68
-MD5 0599a56d65abe28cd41280572b621d2f files/kdelibs-3.0.5b-http.patch 1639
+MD5 d1fbab5c2cf1edd91c1d4cba12a6eac5 ChangeLog 18769
+MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 4232704fe9aeecbb09dbed9cb45b8529 files/kdelibs-3.0.5b-khtml.patch 848
-MD5 067d29e66608e7461f28e94895a0f4a2 files/digest-kdelibs-3.0.4-r1 142
+MD5 acd90863c0847e230aa37f3943d58176 files/kdelibs-3.0.5b-libxml2-2.5.2.diff 703
+MD5 09f2cae6a320fd2baef3d56102cb6f62 files/digest-kdelibs-3.0.5b-r1 68
 MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e files/kdelibs-3.1.4-kjs-alphaev6-gcc3-workaround.patch 477
+MD5 59ee1c9df7f517bf94aa313a96dfc2d6 files/digest-kdelibs-3.1.4 68
+MD5 1e53bd5071cc4fe6ba67fda7252a1cf2 files/digest-kdelibs-3.1.5 68
+MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e files/kdelibs-3.1.2-kjs-alphaev6-gcc3-workaround.patch 477
+MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e files/kdelibs-3.1.5-kjs-alphaev6-gcc3-workaround.patch 477
 MD5 488126241373edef5f0cd3db16aecc63 files/kdelibs-3.1.2-http.patch 1450
 MD5 c087405ca3581f6493850d59c98dcefa files/kdelibs-3.1.2-khtml.patch 1486
 MD5 03137d6470b9ab6532a11303c6d6a2ce files/digest-kdelibs-3.2.0_beta1 69
 MD5 b5157791bb30f64dcb7a318f92c40c8e files/digest-kdelibs-3.2.0_beta2 69
 MD5 256de857a4ee4797da48a5c843ab107c files/kdelibs-3.1.4-alsafix.diff 502
-MD5 59ee1c9df7f517bf94aa313a96dfc2d6 files/digest-kdelibs-3.1.4 68
-MD5 acd90863c0847e230aa37f3943d58176 files/kdelibs-3.0.5b-libxml2-2.5.2.diff 703
-MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e files/kdelibs-3.1.2-kjs-alphaev6-gcc3-workaround.patch 477
+MD5 067d29e66608e7461f28e94895a0f4a2 files/digest-kdelibs-3.0.4-r1 142
+MD5 adfd3d17be1f45423f07f22cd0c73427 files/digest-kdelibs-3.1.2-r1 68
+MD5 0599a56d65abe28cd41280572b621d2f files/kdelibs-3.0.5b-http.patch 1639
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.1.5 b/kde-base/kdelibs/files/digest-kdelibs-3.1.5
new file mode 100644
index 000000000000..c5a8b320325e
--- /dev/null
+++ b/kde-base/kdelibs/files/digest-kdelibs-3.1.5
@@ -0,0 +1 @@
+MD5 6e33c0f7c124e77d807da0ddb537b369 kdelibs-3.1.5.tar.bz2 10549741
diff --git a/kde-base/kdelibs/files/kdelibs-3.1.5-kjs-alphaev6-gcc3-workaround.patch b/kde-base/kdelibs/files/kdelibs-3.1.5-kjs-alphaev6-gcc3-workaround.patch
new file mode 100644
index 000000000000..930776d23a51
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-3.1.5-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.5.ebuild b/kde-base/kdelibs/kdelibs-3.1.5.ebuild
new file mode 100644
index 000000000000..d133f7382132
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-3.1.5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2004 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.5.ebuild,v 1.1 2004/01/15 02:45:03 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 ~amd64"
+HOMEPAGE="http//www.kde.org/"
+SLOT="3.1"
+LICENSE="GPL-2 LGPL-2"
+SRC_URI="mirror://kde/stable/$PV/src/${P}.tar.bz2"
+
+DEPEND=">=sys-devel/autoconf-2.58
+	>=app-arch/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 virtual/alsa )
+	cups? ( >=net-print/cups-1.1.14 )
+	>=media-libs/tiff-3.5.5
+	app-admin/fam
+	virtual/ghostscript
+	media-libs/libart_lgpl
+	sys-devel/gettext
+	>=x11-libs/qt-3.1.0
+	~kde-base/arts-1.1.5"
+
+RDEPEND="$DEPEND
+	doc? ( ~app-doc/kdelibs-apidocs-$PV )
+	app-text/sgml-common
+	cups? ( net-print/cups )
+	dev-lang/python"
+
+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"
+
+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
+}
+