Fix underlinking, bug 372051

Package-Manager: portage-2.1.10.10/cvs/Linux x86_64

diff --git a/kde-misc/kvkbd/ChangeLog b/kde-misc/kvkbd/ChangeLog
index 402f0430f1479c83e78f8400b30054679004c9d7..016e4fa58021094732400bea68c8e0ea0d13638e 100644 (file)
--- a/kde-misc/kvkbd/ChangeLog
+++ b/kde-misc/kvkbd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/kvkbd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kvkbd/ChangeLog,v 1.5 2011/06/17 13:21:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kvkbd/ChangeLog,v 1.6 2011/08/11 20:10:51 dilfridge Exp $
+
+  11 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> kvkbd-0.6.ebuild,
+  +files/kvkbd-0.6-underlinking.patch:
+  Fix underlinking, bug 372051
 
   17 Jun 2011; Samuli Suominen <ssuominen@gentoo.org> metadata.xml:
   Switch maintainers from desktop-misc to kde.

diff --git a/kde-misc/kvkbd/Manifest b/kde-misc/kvkbd/Manifest
index a5ef9e7bf8b089b3e634806ddf26523657d7fc80..ff488ea9cd6d2c5285497ef667d6ed1ad9b77a57 100644 (file)
--- a/kde-misc/kvkbd/Manifest
+++ b/kde-misc/kvkbd/Manifest
@@ -1,14 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
+AUX kvkbd-0.6-underlinking.patch 507 RMD160 710b5d9b622caa00728b2cc75a6a1548669f3c89 SHA1 c37da3db72b569d24bb5381c8402080634762840 SHA256 8843cf49fc61f7ea547b2cdd6cf4e313b1c6dc61ac1a2b2185a2407ccc1114f8
 DIST 94374-kvkbd-0.6.tar.bz2 76990 RMD160 4589d06fb43562b8261bb46bba68971199fb9092 SHA1 a4e8b79013d7961953595df693d922d1eaa7c0e6 SHA256 a4406db59ffcaa5858486adaa67873250c6074b45ce7c8151ac10464372c52fa
-EBUILD kvkbd-0.6.ebuild 511 RMD160 2990153e033d2375eadffc53d21368d2fbdae437 SHA1 731896cda4b9f89bc6c4eca317ac30053d566b1b SHA256 cfe947da108b5ebb008cc129ae5c7e894dd8ef69c37a7a5a9f9065ce69387049
-MISC ChangeLog 869 RMD160 76ddf56deb838c272428361368d04dd426b9837b SHA1 7d154194e6e0750a7de490bea2e22829bdf6a415 SHA256 45325a9194ae350b64946422b8aa54327b01f84f60e1e254c71e6f61cf186e8c
+EBUILD kvkbd-0.6.ebuild 563 RMD160 ba5c442ee70141190a5f9c049cbbd7d69ca5bf15 SHA1 805c282ce3791f600868d9b50a3f8bb3dc80e2b7 SHA256 454408f6459ce821bd76f45815a1ec952a7f96871aaab9e7f554df4355817567
+MISC ChangeLog 1015 RMD160 c2d8bc954aff1bf2c5d01be14c71a5466ee1eff5 SHA1 8d054fd67bd8307e746cec692dd23d803bd7bc9e SHA256 5b3d3518d386bd7215e0810a8b86802a8c3f4021049bb2677250e659991f332a
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk37VLcACgkQXkR9YqOcLPEanQEAgvUdtXooGiJ23D4MSFUJLnVw
-WqBQJDMpjg5z2xK5k7EBAI6o86JFYPbjHknOmwSZqAp/T7eM9vfnTncaUCW/oXe0
-=clAm
+iQIcBAEBCgAGBQJORDdaAAoJENwGBM22xffezK0QAKhopREZw1/dWheKu1nYPToF
+0vxC7zsCTs6/YzK6m+ESXIOxmLhASDAZ1AY+OJRvDuQ6Fg5/pmFnipDEmuzUa1p8
+0xN3RFbFJEv3Tdru7yTB6rOSUZvu2YC9ttwR0VrEmi9pxiobJB5qYPOvwZh/AkAS
+Gbz1ou+bBuNdYn2fRkvfaJ7l7YxLGuGgQZ71hq9lkcnjDhTEZk3vYSYXsl5IcEiw
+P/KPRWf4fRp+UHZdusYtJ5YRvE+PMau9e/YjhopvFMgO48vQFQSHsQ4X/ormCXxL
+7jW0HcLw00rPVu5gpZ0e4TKfcm5I2RyuIi+Setsh+YAKi3bwwEm+MOEJOC5q9Zaw
+X/Pon3Sw9HDB4mt7phzzhV5DswV50yj7454wZjpVBzqOSiO7ARl3IsFGw9m4kQSz
+Kh/ytJHCZNKr664oWyePgxm+LzXTBhwXu3DIjRUThgmtS8Wc5DyFRbnRGqzXTPcG
+SkAu+hENvINDOLzjCqQ2iJPoNuxPFEvvhTF4k7Sj3xrvKRI5CKUeYjK0/S6yjLr7
+zxje3l5KKUWZvuIdusmpMpfTyRSFnnYcyFKH2C5aW6P9W7aMYhfJuLW20PNqebYz
+bn9eYCB2TzvA50r6kPJNs9i8saltCn5U/Ss4ID13ARIVNPANuwtyw32dmkP2Hd2A
+CDNc+xCKsWS8FfvxT3Ve
+=/3sr
 -----END PGP SIGNATURE-----

diff --git a/kde-misc/kvkbd/files/kvkbd-0.6-underlinking.patch b/kde-misc/kvkbd/files/kvkbd-0.6-underlinking.patch
new file mode 100644 (file)
index 0000000..dddb96c
--- /dev/null
+++ b/kde-misc/kvkbd/files/kvkbd-0.6-underlinking.patch
@@ -0,0 +1,12 @@
+diff -ruN kvkbd-0.6.orig/src/CMakeLists.txt kvkbd-0.6/src/CMakeLists.txt
+--- kvkbd-0.6.orig/src/CMakeLists.txt  2008-10-11 14:28:19.000000000 +0200
++++ kvkbd-0.6/src/CMakeLists.txt       2011-08-11 22:09:05.129295607 +0200
+@@ -22,7 +22,7 @@
+ 
+ kde4_add_executable(kvkbd ${kvkbd_SRCS})
+ 
+-target_link_libraries(kvkbd ${KDE4_KDECORE_LIBS} Xtst ${KDE4_KDEUI_LIBS})
++target_link_libraries(kvkbd ${KDE4_KDECORE_LIBS} Xtst ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES})
+ 
+ install(TARGETS kvkbd ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 

diff --git a/kde-misc/kvkbd/kvkbd-0.6.ebuild b/kde-misc/kvkbd/kvkbd-0.6.ebuild
index 208848056ed7852e63d6c6e9c9d7342ab691d566..cec6f691497a5659b43241cf5f828eb3c47c9892 100644 (file)
--- a/kde-misc/kvkbd/kvkbd-0.6.ebuild
+++ b/kde-misc/kvkbd/kvkbd-0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kvkbd/kvkbd-0.6.ebuild,v 1.2 2011/01/31 06:10:47 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kvkbd/kvkbd-0.6.ebuild,v 1.3 2011/08/11 20:10:51 dilfridge Exp $
 
 EAPI=3
 
@@ -16,3 +16,7 @@ LICENSE="GPL-2"
 SLOT="4"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+
+PATCHES=(
+       "${FILESDIR}/${P}-underlinking.patch"
+)