Disable automagic linking to x11-libs/libXxf86misc on request from scarabeus

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

4 files changed, 44 insertions, 4 deletions

diff --git a/kde-base/krunner/ChangeLog b/kde-base/krunner/ChangeLog
index faaf612a38f6..0d30feb0b5ff 100644
--- a/kde-base/krunner/ChangeLog
+++ b/kde-base/krunner/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/krunner
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/ChangeLog,v 1.86 2011/04/06 14:19:09 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/ChangeLog,v 1.87 2011/04/07 22:11:32 dilfridge Exp $
+
+  07 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  krunner-4.6.2.ebuild, +files/krunner-4.6.2-noxf86misc.patch:
+  Disable automagic linking to x11-libs/libXxf86misc on request from
+  scarabeus
 
 *krunner-4.6.2 (06 Apr 2011)
 
diff --git a/kde-base/krunner/Manifest b/kde-base/krunner/Manifest
index 3ba93ed2fb6c..9fb64d454a81 100644
--- a/kde-base/krunner/Manifest
+++ b/kde-base/krunner/Manifest
@@ -1,6 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX krunner-4.6.2-noxf86misc.patch 545 RMD160 6ff6bde6dbb5fa29462cd1ee1409624b52ca0a8e SHA1 1b2d43e33dec1e894a7edd83b42f48b20931bca7 SHA256 a9a0542977e501df445988fe02c07b5eff3303fc978667a5541a5a3a5848d87e
 DIST kdebase-workspace-4.4.5.tar.bz2 77036766 RMD160 3f6e9ceb0df277b73ca6ec38de6c85f578077640 SHA1 d0defe431a760503f8fbb9ee2413b666b3c84cd7 SHA256 53475dacd95955ef01378d4de7e46602be13e81a1afac73fbed449bb367c20e6
 DIST kdebase-workspace-4.6.2.tar.bz2 69356153 RMD160 23856ab63e17e3971071f2ccd02bd78d546c71e0 SHA1 63efb68733f347d0b7d24a7a061c5a0e3f84dee7 SHA256 6a55a53282a0ec7dd61f16f87fb8d0097d945891504982eb5122c96238b711e1
 EBUILD krunner-4.4.5.ebuild 1140 RMD160 10610cefe61e56fe2ea88ce8faf795ea959a74ad SHA1 7187e419f8d66f04d3eb249289718360f9c2f8f9 SHA256 08f3f4ce3fa0124162de84699efa635163da9d9c441e6daf3b8adf836af56df6
-EBUILD krunner-4.6.2.ebuild 1162 RMD160 e9c47bdfe3d44f2a7cb88a1e095973aa4b996f18 SHA1 1eba63fc54a29fb299100965e0ae9b0b7c0e9dec SHA256 b41e0e5106e7e9a4c1cf1c053cab8eb3537b0fcb231420708c5d286efeea677c
-MISC ChangeLog 11830 RMD160 77dbe69250de7bb6b7704a97a4d845e82a70d57f SHA1 32851c7d5ae672d4efcdee2ddeabbe40068bf743 SHA256 8396e7ae9ff4e60ceaf06eb7d16faca9bea824875e38da0d45e8322d97bde068
+EBUILD krunner-4.6.2.ebuild 1218 RMD160 48a8a5d16245203c90cca8109983cbf32a1b299f SHA1 fccd525f5630fb5daf5696afee09879840801932 SHA256 31bc3147185a8417313531a4cdb88a5827628ef0bee07fb138a9fa629232dd63
+MISC ChangeLog 12032 RMD160 114d475a6d919b24707a1849d298d31a22f2375b SHA1 5ed39bb603242462e3a1f7b243056601abf94913 SHA256 ac2f6f4d89e4bba643af4ce52c1c903400549d56c47434bb5eb41940643c463e
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJNnjdSAAoJENwGBM22xffe1CUP/juV0dLhcKqXDUu6AdvlUveV
+rU03NBiAyMgVCJtJeZ7QndVbYaUR70HF4kkqc86E4dxdTztwXoLq2TQwXLMArUcN
+kAfAwXQ/+YC9IOp2u75ZVxziqQMKuJkFTSnQW8YLuwCJflPzih6jKASAIPGUmJcG
+9XyKdRo/gZD9BeG0iQPPfqZoArGxcrw5sLy+NqtvZmmbWF/c1Y/jiE0TbpPY1xEM
++dp3DCXEqNQ8wFlZJpAK4JZ+4q4ati5eqZ+909F2iycUzbACwW8eYCDptJWfqLf3
+U6uoSD0fh+1rZ2o0COBbR/q/rsc9TsVKz6NZrNxCm0/1LdYAxySq5DvEqFYleNoA
+hrV0qfAUNR1zG3P89GTJVWaKk02TJYPdNT5rLZsI/m7+M5x0KNxn2J7edSqv2AcX
+skfdFg0eZLXSj8FS6yDPNBTuG8OHtbjfw4/isvbMB7dLAAKvt84T0p2aT8GJJMI0
+D7qtW3giUpGDAlUFyWuCVMDoMdrWvQ4z/qx6jvBLyPcZ4lSa7tNBXFhCiHdDuczf
+f1JPyBylM+NecqVT/ma4loiOayXVb37enJnsIV42lDcoBNPdPzFHGtzpy6QndKlK
++94GxN3uDxaHo4+PbcUazV3G5TuSDcq+eSSW4iVJo11UbZwRofWmV1XMgC2UY11Z
+HC11s54m/voPhwc5a+Df
+=1sJJ
+-----END PGP SIGNATURE-----
diff --git a/kde-base/krunner/files/krunner-4.6.2-noxf86misc.patch b/kde-base/krunner/files/krunner-4.6.2-noxf86misc.patch
new file mode 100644
index 000000000000..b6bfaf8d1e01
--- /dev/null
+++ b/kde-base/krunner/files/krunner-4.6.2-noxf86misc.patch
@@ -0,0 +1,12 @@
+diff -ruN krunner-4.6.2.orig/krunner/lock/CMakeLists.txt krunner-4.6.2/krunner/lock/CMakeLists.txt
+--- krunner-4.6.2.orig/krunner/lock/CMakeLists.txt	2011-02-25 22:54:48.000000000 +0100
++++ krunner-4.6.2/krunner/lock/CMakeLists.txt	2011-04-08 00:09:58.749240497 +0200
+@@ -2,7 +2,7 @@
+ 
+ ########### next target ###############
+ 
+-check_library_exists(Xxf86misc XF86MiscSetGrabKeysState "" HAVE_XF86MISCSETGRABKEYSSTATE)
++set(HAVE_XF86MISC 0)
+ if(WITH_OpenGL)
+ check_library_exists(GL glXChooseVisual "" HAVE_GLXCHOOSEVISUAL)
+ endif(WITH_OpenGL)
diff --git a/kde-base/krunner/krunner-4.6.2.ebuild b/kde-base/krunner/krunner-4.6.2.ebuild
index bca180ea010c..076fceaa9802 100644
--- a/kde-base/krunner/krunner-4.6.2.ebuild
+++ b/kde-base/krunner/krunner-4.6.2.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-base/krunner/krunner-4.6.2.ebuild,v 1.1 2011/04/06 14:19:09 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/krunner-4.6.2.ebuild,v 1.2 2011/04/07 22:11:32 dilfridge Exp $
 
 EAPI=3
 
@@ -32,6 +32,8 @@ DEPEND="${COMMONDEPEND}
 "
 RDEPEND="${COMMONDEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}"-4.6.2-noxf86misc.patch )
+
 KMEXTRACTONLY="
 	libs/kdm/
 	libs/kephal/