Synchronized from official portage tree.

There have been some improvements to some of the packages since the
kde-sunset overlay was created.  Here I try to include these impruvements
into the overlay, as long as they affect packages related to KDE 3.

6 files changed, 129 insertions, 6 deletions

diff --git a/dev-util/kdbg/ChangeLog b/dev-util/kdbg/ChangeLog
index ccd2a427..252c92f3 100644
--- a/dev-util/kdbg/ChangeLog
+++ b/dev-util/kdbg/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for dev-util/kdbg
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdbg/ChangeLog,v 1.62 2009/08/08 22:09:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdbg/ChangeLog,v 1.65 2009/10/05 02:41:45 dirtyepic Exp $
+
+  05 Oct 2009; Ryan Hill <dirtyepic@gentoo.org> kdbg-2.2.0.ebuild,
+  +files/kdbg-2.2.0-glibc-2.10.patch:
+  Fix building with glibc-2.10 again, bug #287633.
+
+  03 Oct 2009; Sebastian Pipping <sping@gentoo.org> kdbg-2.1.0.ebuild,
+  +files/kdbg-2.1.0-move-kde-ldflags-up-front.patch:
+  Fix linking of 2.1.0 on KDE 4 (bug 244694), thanks to Theofilos Intzoglou
+
+*kdbg-2.2.0 (03 Oct 2009)
+
+  03 Oct 2009; Sebastian Pipping <sping@gentoo.org> +kdbg-2.2.0.ebuild:
+  Bump to 2.2.0
 
   08 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> kdbg-2.1.1.ebuild,
   +files/kdbg-2.1.1-glibc-2.10.patch:
diff --git a/dev-util/kdbg/Manifest b/dev-util/kdbg/Manifest
index 5dc828a3..e46d25a5 100644
--- a/dev-util/kdbg/Manifest
+++ b/dev-util/kdbg/Manifest
@@ -1,10 +1,14 @@
 AUX kdbg-2.1.0-desktop-entry.diff 339 RMD160 8e27d4d7eabaa509460b0043c19bd3bd152017c7 SHA1 1ced684aee76ec62bb36f02396ac7ec3b31c308d SHA256 5148129e915579220f841c58715d0323ef46b1b4258fd01245948a329a23bdab
+AUX kdbg-2.1.0-move-kde-ldflags-up-front.patch 802 RMD160 72ae356a81fa74775aea628905ad244c19b73fa0 SHA1 0026ac479a5f0a5a742ff5ce8ab2042ba58d5529 SHA256 6ce676cdc833c57505e57001b8b583d7402e73884862cf112a5edd09879a483c
 AUX kdbg-2.1.1-glibc-2.10.patch 2014 RMD160 e2f5ebe58f7525c360e3aac7a1d73e948962b293 SHA1 b5ee858ad746bcd3f341b1d5e3d4761ae63fffc1 SHA256 14a6d9f330deb0f91db24d27cdb4fa0a7b65e38b766eeba8c84284faec47e3dd
+AUX kdbg-2.2.0-glibc-2.10.patch 2025 RMD160 9cb422b08bf790dfb59343b79fe217a00131e144 SHA1 b352f5fae35824c9714150e229ea4318af3e928e SHA256 95fd451aa628926b6e00bbf21d6e43e6492058e6a826ad79950303e975e21ea2
 DIST kdbg-2.0.5.tar.gz 860205 RMD160 276a80a3c9d6f685d6269086aa933546acd9bf5d SHA1 3578723c340109bd5532aac5f694e64a65453689 SHA256 7a2f01efa94c6fc0b80fd652f6e673136abf986657146e89dd25095072da4cdc
 DIST kdbg-2.1.0.tar.gz 847480 RMD160 51e8be3cdb86ecfa8140c9534d205d493c574580 SHA1 93cb318e643f9317dec296de8627273a3aab5f19 SHA256 22bdf37840fbdb8b0237f2cf6b89c8afa24d9a1e2575ba53f227e24240cce682
 DIST kdbg-2.1.1.tar.gz 887666 RMD160 1e41100859b3efba05851c7eae72a59bc522bbd9 SHA1 e37bde85194bc0b61e193c5ee3af5a46e5d4fed7 SHA256 6f44c8d33548c564c9155055d5c4e79305c460033149cb2a4684ee6058f5ca5e
+DIST kdbg-2.2.0.tar.gz 886688 RMD160 09736acc8c58381103a6e3b1c42ed74c9a51fefa SHA1 212bf576811b86ddffa32464619cf5aded4fd4b3 SHA256 2d7ca1f9f3fd5b679755df9c5010680024601b362175b335929a51f7b2a5fe9f
 EBUILD kdbg-2.0.5.ebuild 475 RMD160 b0479264f73ff4f30465f1562f52a5b40da22e79 SHA1 a8c719487357d838e81b8f28a7624c983963c113 SHA256 7207494bd94842d5cc9d957481fe0899af245b971686032e98521dbf21a55014
-EBUILD kdbg-2.1.0.ebuild 552 RMD160 4df608e293fc493a29b94b4db4489f87e6e43eb2 SHA1 9a5dbae1a538b23193ff1d973d70f2412de398ac SHA256 8973b91a53c8360919c84261589709f1cc994c2f50c3dbd253c230e5412d2935
+EBUILD kdbg-2.1.0.ebuild 616 RMD160 d1582c3e220230e44f3ab050036724a6bf84d9f5 SHA1 b009d40733a76b81d47a7eb9346025e021caadaf SHA256 1279a81f78110eda6928c0b3ba26e8801fd70a88b42d3927b70e65cf8926f129
 EBUILD kdbg-2.1.1.ebuild 592 RMD160 c847197d58ec5e5b335db03cb90ac4f8f8286eb8 SHA1 d61ec68a5f8ce5825a4b1f11699dcfc82fe93503 SHA256 a441d1cd514b407da7fa2aa3875d9cd102df70671518d743fef605920c0fa412
-MISC ChangeLog 7209 RMD160 8640dcd1c7b468b29479c326b23e88f35213e685 SHA1 fd43b0a62da886654d0b6f5641f10c2cd29e9797 SHA256 e5a0faffcfbbaf78df3a71f6f58eaf004214fa10fbded64ad4d248353dec6a53
+EBUILD kdbg-2.2.0.ebuild 592 RMD160 a10db811d2acb438ceb520ec842efaccb1265aa4 SHA1 aa6f3daeb89bf99eaa49e052e5962673633adaa8 SHA256 b863c9ef98da0f8de46b4136663bf46231874339ec54bbb13415f7ce85cba52a
+MISC ChangeLog 7683 RMD160 774c1c8d485678f1346492775218dabbf2b7ba40 SHA1 ba74ac290c402ec448cb688413cf2555601fd3f4 SHA256 15541a187cc89da8e13ad892ef583a5d99a9573c6b8958accd7b1a62f8e62e8d
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/dev-util/kdbg/files/kdbg-2.1.0-move-kde-ldflags-up-front.patch b/dev-util/kdbg/files/kdbg-2.1.0-move-kde-ldflags-up-front.patch
new file mode 100644
index 00000000..286f6182
--- /dev/null
+++ b/dev-util/kdbg/files/kdbg-2.1.0-move-kde-ldflags-up-front.patch
@@ -0,0 +1,25 @@
+From ad62763b029dcb1128a94c32522f2f5294ba02e1 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 3 Oct 2009 21:49:07 +0200
+Subject: [PATCH] Move KDE_LDFLAGS up front
+
+---
+ work/kdbg-2.1.0/configure |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/work/kdbg-2.1.0/configure b/work/kdbg-2.1.0/configure
+index 8b28a89..8847ded 100755
+--- a/work/kdbg-2.1.0/configure
++++ b/work/kdbg-2.1.0/configure
+@@ -29518,7 +29518,7 @@ KDE_DEFAULT_CXXFLAGS="-DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_N
+ 
+ KDE_LDFLAGS="-L$kde_libraries"
+ if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" = "$qt_libraries" ; then
+- all_libraries="$all_libraries $KDE_LDFLAGS"
++ all_libraries="$KDE_LDFLAGS $all_libraries"
+ fi
+ 
+ 
+-- 
+1.6.4.4
+
diff --git a/dev-util/kdbg/files/kdbg-2.2.0-glibc-2.10.patch b/dev-util/kdbg/files/kdbg-2.2.0-glibc-2.10.patch
new file mode 100644
index 00000000..3f056edc
--- /dev/null
+++ b/dev-util/kdbg/files/kdbg-2.2.0-glibc-2.10.patch
@@ -0,0 +1,55 @@
+diff -rupN kdbg-2.2.0/kdbg/gdbdriver.cpp kdbg-2.2.0.new/kdbg/gdbdriver.cpp
+--- kdbg-2.2.0/kdbg/gdbdriver.cpp	2009-05-20 15:24:10.000000000 -0400
++++ kdbg-2.2.0.new/kdbg/gdbdriver.cpp	2009-10-04 01:18:28.000000000 -0400
+@@ -133,7 +133,7 @@ GdbDriver::GdbDriver() :
+ 
+ #ifndef NDEBUG
+     // check command info array
+-    char* perc;
++    const char* perc;
+     for (int i = 0; i < NUM_CMDS; i++) {
+ 	// must be indexable by DbgCommand values, i.e. sorted by DbgCommand values
+ 	assert(i == cmds[i].cmd);
+@@ -669,7 +669,7 @@ static bool parseErrorMessage(const char
+     // skip warnings
+     while (strncmp(output, "warning:", 8) == 0)
+     {
+-	char* end = strchr(output+8, '\n');
++	const char* end = strchr(output+8, '\n');
+ 	if (end == 0)
+ 	    output += strlen(output);
+ 	else
+@@ -1856,8 +1856,10 @@ std::list<ThreadInfo> GdbDriver::parseTh
+ 	    p++;
+ 	    // there follows only whitespace
+ 	}
+-	char* end;
+-	thr.id = strtol(p, &end, 10);
++	const char* end;
++	char *temp_end = NULL; /* we need a non-const 'end' for strtol to use...*/
++	thr.id = strtol(p, &temp_end, 10);
++	end = temp_end;
+ 	if (p == end) {
+ 	    // syntax error: no number found; bail out
+ 	    return threads;
+diff -rupN kdbg-2.2.0/kdbg/xsldbgdriver.cpp kdbg-2.2.0.new/kdbg/xsldbgdriver.cpp
+--- kdbg-2.2.0/kdbg/xsldbgdriver.cpp	2009-05-20 15:24:10.000000000 -0400
++++ kdbg-2.2.0.new/kdbg/xsldbgdriver.cpp	2009-10-04 01:18:56.000000000 -0400
+@@ -115,7 +115,7 @@ DebuggerDriver(), m_gdbMajor(2), m_gdbMi
+ 
+ #ifndef NDEBUG
+     // check command info array
+-    char *perc;
++    const char *perc;
+ 
+     for (int i = 0; i < NUM_CMDS; i++) {
+         // must be indexable by DbgCommand values, i.e. sorted by DbgCommand values
+@@ -771,7 +771,7 @@ parseVar(const char *&s)
+     } else if (strncmp(p, "= ", 2) == 0) {
+         /* we're processing the result of a "print command" */
+         /* find next line */
+-        char *nextLine = strchr(p, '\n');
++        const char *nextLine = strchr(p, '\n');
+ 
+ 	TRACE("Found print expr");
+         if (nextLine) {
diff --git a/dev-util/kdbg/kdbg-2.1.0.ebuild b/dev-util/kdbg/kdbg-2.1.0.ebuild
index 61024cbf..a7e6bb3e 100644
--- a/dev-util/kdbg/kdbg-2.1.0.ebuild
+++ b/dev-util/kdbg/kdbg-2.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdbg/kdbg-2.1.0.ebuild,v 1.6 2008/05/19 17:39:27 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdbg/kdbg-2.1.0.ebuild,v 1.7 2009/10/03 20:04:44 sping Exp $
 
 ARTS_REQUIRED="never"
 
@@ -19,4 +19,5 @@ RDEPEND=">=sys-devel/gdb-5.0"
 
 need-kde 3.5
 
-PATCHES="${FILESDIR}/kdbg-2.1.0-desktop-entry.diff"
+PATCHES=( "${FILESDIR}"/${PN}-2.1.0-desktop-entry.diff
+		"${FILESDIR}"/${PN}-2.1.0-move-kde-ldflags-up-front.patch )
diff --git a/dev-util/kdbg/kdbg-2.2.0.ebuild b/dev-util/kdbg/kdbg-2.2.0.ebuild
new file mode 100644
index 00000000..a16193c0
--- /dev/null
+++ b/dev-util/kdbg/kdbg-2.2.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdbg/kdbg-2.2.0.ebuild,v 1.2 2009/10/05 02:41:45 dirtyepic Exp $
+
+ARTS_REQUIRED="never"
+
+inherit eutils kde
+
+DESCRIPTION="A Graphical Debugger Interface to gdb."
+HOMEPAGE="http://www.kdbg.org/"
+SRC_URI="mirror://sourceforge/kdbg/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=sys-devel/gdb-5.0"
+
+need-kde 3.5
+
+src_unpack() {
+	kde_src_unpack
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
+}