From 17579be5f8e56b46596ddda517822305a697b8de Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sping@gentoo.org>
Date: Sat, 3 Oct 2009 20:04:44 +0000
Subject: Fix linking of 2.1.0 on KDE 4 (bug 244694) (Portage version:
 2.1.6.13/cvs/Linux i686)

---
 dev-util/kdbg/ChangeLog                            |  6 +++++-
 .../kdbg-2.1.0-move-kde-ldflags-up-front.patch     | 25 ++++++++++++++++++++++
 dev-util/kdbg/kdbg-2.1.0.ebuild                    |  7 +++---
 3 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 dev-util/kdbg/files/kdbg-2.1.0-move-kde-ldflags-up-front.patch

(limited to 'dev-util')

diff --git a/dev-util/kdbg/ChangeLog b/dev-util/kdbg/ChangeLog
index 7bdfb13b7654..af0207c16cb3 100644
--- a/dev-util/kdbg/ChangeLog
+++ b/dev-util/kdbg/ChangeLog
@@ -1,6 +1,10 @@
 # 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.63 2009/10/03 19:19:38 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdbg/ChangeLog,v 1.64 2009/10/03 20:04:44 sping Exp $
+
+  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)
 
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 000000000000..286f6182f599
--- /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/kdbg-2.1.0.ebuild b/dev-util/kdbg/kdbg-2.1.0.ebuild
index 61024cbf1623..a7e6bb3ecd85 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 )
-- 
cgit v1.2.3-65-gdbad