Fix compilation issue with not respecting ldflags. Per bug #243032. Fix slot.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 29 insertions, 7 deletions

diff --git a/kde-misc/kkbswitch/ChangeLog b/kde-misc/kkbswitch/ChangeLog
index 5f87bd868667..6ed49d6d9505 100644
--- a/kde-misc/kkbswitch/ChangeLog
+++ b/kde-misc/kkbswitch/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-misc/kkbswitch
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kkbswitch/ChangeLog,v 1.7 2007/02/03 21:47:22 flameeyes Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kkbswitch/ChangeLog,v 1.8 2009/06/13 23:40:55 scarabeus Exp $
+
+  13 Jun 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/1.4.3-fix-ldflags.patch, kkbswitch-1.4.3.ebuild:
+  Fix compilation issue with not respecting ldflags. Per bug #243032. Fix
+  slot.
 
   03 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/kde-misc/kkbswitch/Manifest b/kde-misc/kkbswitch/Manifest
index a01df18d7512..7ad87e8632ca 100644
--- a/kde-misc/kkbswitch/Manifest
+++ b/kde-misc/kkbswitch/Manifest
@@ -1,4 +1,5 @@
+AUX 1.4.3-fix-ldflags.patch 1372 RMD160 ed7f6aee65429593d1466ad97c2aa712c3faa2b2 SHA1 c791eb7be5c20b7d8972281ea530a2975e9ed905 SHA256 8e2e9c5ec401070018252e250d803dbe5606eb57f6a07f99ca010d36a86bd146
 DIST kkbswitch-1.4.3.tar.gz 693625 RMD160 e5663ca0a4d81355b9e8971242014c149e5250c2 SHA1 3286c746facd1f03d206ee018a2bdf8d4e4cc6ad SHA256 1e6a4433783895dbd9819b72a40cd33c06fca2df2d45d5e03b61958b29b6358d
-EBUILD kkbswitch-1.4.3.ebuild 549 RMD160 62921b5495155b58ed4a75d35c261953008457fe SHA1 b777de85fc1ca59f3cda7b25d6be9e522e20e86d SHA256 f47f79894c367a8ade97a543ccd215f6b8fe83e69e4cb85ad82330447c030860
-MISC ChangeLog 974 RMD160 a50ad9da535b376fd41884e300d4584439d4f510 SHA1 37fadd893e1b2818dd4544e0bd4e868aa3722a6d SHA256 7d1d98e063c88f1c2423660a6f700e480dd2903d4ff60c3c785ae8312f10db58
+EBUILD kkbswitch-1.4.3.ebuild 607 RMD160 a78a2dfe14c3879672f1450862fc5360489cd5d4 SHA1 98cc5175587630798779091c692c97228b998bcc SHA256 1b020edccd224ba4af41cb91527364dce2d22f7d75c3837f1be712d739125001
+MISC ChangeLog 1170 RMD160 294eaace9a2a4128f30a618dc795824d207c6dba SHA1 50efd3bf4cac99b2fb2bfd662d5ba9bbd2edcea9 SHA256 bf08c9a95847474545c78df5033707a05af404f318800bad378e5689d475c9e4
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-misc/kkbswitch/files/1.4.3-fix-ldflags.patch b/kde-misc/kkbswitch/files/1.4.3-fix-ldflags.patch
new file mode 100644
index 000000000000..4246bea51fc5
--- /dev/null
+++ b/kde-misc/kkbswitch/files/1.4.3-fix-ldflags.patch
@@ -0,0 +1,12 @@
+diff -Nuar kkbswitch-1.4.3.old/kkbswitch/Makefile.in kkbswitch-1.4.3/kkbswitch/Makefile.in
+--- kkbswitch-1.4.3.old/kkbswitch/Makefile.in	2005-01-24 00:07:33.000000000 +0600
++++ kkbswitch-1.4.3/kkbswitch/Makefile.in	2009-03-12 14:45:17.000000000 +0600
+@@ -260,7 +260,7 @@
+ #>- METASOURCES = AUTO
+ 
+ bin_PROGRAMS = kkbswitch
+-kkbswitch_LDFLAGS = $(KDE_RPATH) $(all_libraries)
++kkbswitch_LDFLAGS = $(KDE_RPATH) $(KDE_LDFLAGS) $(all_libraries)
+ #>- kkbswitch_SOURCES = boldlistboxitem.cpp boldmenuitem.cpp kbconfig.cpp kbconfigdlg.cpp kbgroup.cpp kbpickicondlg.cpp kbswitchapp.cpp kbswitchintf.cpp kbswitchtrayicon.cpp main.cpp pathlistboxitem.cpp xkeyboard.cpp kbswitchintf.skel boldlistboxitem.h boldmenuitem.h kbconfigdlg.h kbconfig.h kbgroup.h kbpickicondlg.h kbswitchapp.h kbswitchintf.h kbswitchtrayicon.h pathlistboxitem.h xkeyboard.h windowwatcher.cpp singlewindowwatcher.cpp windowclasswatcher.cpp
+ #>+ 1
+ kkbswitch_SOURCES=boldlistboxitem.cpp boldmenuitem.cpp kbconfig.cpp kbconfigdlg.cpp kbgroup.cpp kbpickicondlg.cpp kbswitchapp.cpp kbswitchintf.cpp kbswitchtrayicon.cpp main.cpp pathlistboxitem.cpp xkeyboard.cpp  boldlistboxitem.h boldmenuitem.h kbconfigdlg.h kbconfig.h kbgroup.h kbpickicondlg.h kbswitchapp.h kbswitchintf.h kbswitchtrayicon.h pathlistboxitem.h xkeyboard.h windowwatcher.cpp singlewindowwatcher.cpp windowclasswatcher.cpp kbswitchintf_skel.cpp
diff --git a/kde-misc/kkbswitch/kkbswitch-1.4.3.ebuild b/kde-misc/kkbswitch/kkbswitch-1.4.3.ebuild
index 2b51b9bbd646..9babf93fe00e 100644
--- a/kde-misc/kkbswitch/kkbswitch-1.4.3.ebuild
+++ b/kde-misc/kkbswitch/kkbswitch-1.4.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kkbswitch/kkbswitch-1.4.3.ebuild,v 1.7 2005/12/07 23:57:30 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kkbswitch/kkbswitch-1.4.3.ebuild,v 1.8 2009/06/13 23:40:55 scarabeus Exp $
 
 inherit kde
 
@@ -9,12 +9,16 @@ HOMEPAGE="http://kkbswitch.sourceforge.net/"
 SRC_URI="mirror://sourceforge/kkbswitch/${P}.tar.gz"
 LICENSE="GPL-2"
 
-SLOT="0"
+SLOT="3.5"
 KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 
 need-kde 3.1
 
+PATCHES=(
+	"${FILESDIR}/${PV}-fix-ldflags.patch"
+)
+
 src_install() {
 	kde_src_install