Fix automagic dependency on libXxf86misc, bug 358655

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

4 files changed, 27 insertions, 26 deletions

diff --git a/kde-base/kscreensaver/ChangeLog b/kde-base/kscreensaver/ChangeLog
index 63c0ea97c472..978b51335520 100644
--- a/kde-base/kscreensaver/ChangeLog
+++ b/kde-base/kscreensaver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kscreensaver
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/ChangeLog,v 1.184 2011/06/10 21:30:10 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/ChangeLog,v 1.185 2011/06/13 20:38:26 dilfridge Exp $
+
+  13 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  kscreensaver-4.6.4.ebuild, +files/kscreensaver-4.6.4-xf86misc.patch:
+  Fix automagic dependency on libXxf86misc, bug 358655
 
   10 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> Manifest:
   Remanifest as tarball was changed
diff --git a/kde-base/kscreensaver/Manifest b/kde-base/kscreensaver/Manifest
index 9a74b125f935..37c99578149f 100644
--- a/kde-base/kscreensaver/Manifest
+++ b/kde-base/kscreensaver/Manifest
@@ -1,30 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX kdebase-4.0.2-pam-optional.patch 979 RMD160 abdb7293c02507dfd0a032e72f3e449405b6d8a0 SHA1 33e2f936f0548f9b19fe541c0f71db06f9daaf63 SHA256 efa4e0132687dbaa68ab5c8a5911c4a08b5d4e9eb4d2a04879f765b8e44ba9ea
 AUX kscreensaver-4.5.95-nsfw.patch 1232 RMD160 3b74f5968006817b92ff7e19ca12434ae731ea14 SHA1 b6e7e4cd4e2566e5d2bf3f51eb6157d7946afbf2 SHA256 2741df667e564dec6834848b3e185efcc4f976b82c52755289fea1b87c6f86db
+AUX kscreensaver-4.6.4-xf86misc.patch 723 RMD160 dd4ef13c5b8e48fb481b984b994e5ecb76310dc9 SHA1 adee744807f862d4d1822fbc929b04496a61beef SHA256 01921713a45c76a635bbb90443f89dfb16166a53327369096b6ee9a6ea3fb401
 DIST kdebase-workspace-4.6.2.tar.bz2 69356153 RMD160 23856ab63e17e3971071f2ccd02bd78d546c71e0 SHA1 63efb68733f347d0b7d24a7a061c5a0e3f84dee7 SHA256 6a55a53282a0ec7dd61f16f87fb8d0097d945891504982eb5122c96238b711e1
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 DIST kdebase-workspace-4.6.4.tar.bz2 69240482 RMD160 a528bee8b8b36e30708f5efea085df16bbd41d6f SHA1 44aef9ad37cf291e9e7528b2c915f8fc129d735e SHA256 84ee9a3f98fef7d1e70aecc1fe5f2ee0a3438c2560a70df88cfcf83432da077a
 EBUILD kscreensaver-4.6.2.ebuild 904 RMD160 ee1eac2fab74818e789b0ea44c2a90ac7faed38e SHA1 a54307c44c6cf1c955da5b19d03a7e29290003f9 SHA256 214ad4053484e039a22fc3dc146a3d8d7d47d07a4ae706ec376ef3012b5526dc
 EBUILD kscreensaver-4.6.3.ebuild 907 RMD160 a6c27939a38da093c79b030729dfd280f02789a8 SHA1 e345b8ded478daa9a3c228dfd9d6165564fb4423 SHA256 6294879e978d7e0fda62b5f40d8d423e58e3b8dca5101823e3409c7d0d0d8d5d
-EBUILD kscreensaver-4.6.4.ebuild 910 RMD160 bbcd93f77b47d3805938e540357258e8b44db477 SHA1 bfcdb0fe1f516d6486b1687c293b273cc8a0304e SHA256 66d78efc6acbd9064f90ee490331aaef9eb8e67e3bfb7e17db7e7ce1b137a193
-MISC ChangeLog 24155 RMD160 7f7dc58a69f5d74447ef9455b04a1c4c524e7831 SHA1 3eb83a27602ffb4ec2415c2910f269626c64bcd0 SHA256 915751d38b725e84f6cfcfc7df4cd6caf51a34881c0d87bebe376700557f4ca8
+EBUILD kscreensaver-4.6.4.ebuild 975 RMD160 d1561e07208e35a2b59e0a41b30bd99728dcc411 SHA1 b7f1322fbe6437421d3894f4fad1fb45b9fa2874 SHA256 9d956c01fb8ff845b7291b6d227378ad69e03aa23e03aed04fb225200e73161b
+MISC ChangeLog 24339 RMD160 323dabf3b15f38adcc5b838ac3caaa2c13f64ef1 SHA1 4d636215dfc40f54423379b5a11cc71f249db827 SHA256 e5b27ac14c2336ae6e5edb508753f0814e79fa018031ce33f3a93663fbcd2040
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJN8ozoAAoJENwGBM22xffe+8oP/i7dJiYzlIlYNBlmnwdQ3kZS
-f7hfEfzcE9+64NvqQVIEtd+R+qK8LyeVqGXMctH4xTSkLVTjo0mL0/H+WAdB1Nwb
-d6Rr5Rtl2SwH/VbX/qDicQqa5bfFNhXnFbdXHLKx1DLh4mCn6VQBxCpCgU+214dW
-S/qp2zjQJgdbjeISpkVDEngUN9QHSLYPcdSm46BBCo3YBky+cGxVIZIhEacId4/b
-FflhJa1nKbttjO6eGfsqFUNr+SI9Yftl4jSikxHqjERX8NqG/PwBPjfz+8x01DFo
-4tqBvVOCAN1lv5NgWsZTgzh8ZKHjG6dcHCI6+Mah3yofb0sLH3aeanz4E3YIujwU
-cBKovJLvha4RXCcRaKBplfC0LYOkpPnb4K7DQTsiJe7wuOWdu1AQRi6EhukYaO51
-tblmF3jFOJEQCzzKfP5radshxruXFyBWRfauiocGNxQLm2OaPy3VRNo/tk6U+UgE
-p57ZuuCZ3hNNNpb3SD42Q/A71K/d4beerLZp7ox2VDODIwz46EK4J4v7Dmx5THrg
-vaUy3DCtpH/f/4p/oNxpDz8vGiBfHemTrVKtSh7T9gzKrJOVwS0PvHG38rr/OczL
-zEMYMlOTOch84ZeYbvMH2lapwzFSAPnykb9imnCau54YmUWANkVVzgFyvN6dgoTc
-2uanX7IkQFmYHtrrGs6H
-=rUIR
------END PGP SIGNATURE-----
diff --git a/kde-base/kscreensaver/files/kscreensaver-4.6.4-xf86misc.patch b/kde-base/kscreensaver/files/kscreensaver-4.6.4-xf86misc.patch
new file mode 100644
index 000000000000..7eb00b6f860d
--- /dev/null
+++ b/kde-base/kscreensaver/files/kscreensaver-4.6.4-xf86misc.patch
@@ -0,0 +1,12 @@
+diff -ruN kscreensaver-4.6.4.orig/ConfigureChecks.cmake kscreensaver-4.6.4/ConfigureChecks.cmake
+--- kscreensaver-4.6.4.orig/ConfigureChecks.cmake	2011-02-25 22:54:48.000000000 +0100
++++ kscreensaver-4.6.4/ConfigureChecks.cmake	2011-06-13 22:34:10.713760997 +0200
+@@ -73,7 +73,7 @@
+ macro_bool_to_01(X11_Xinerama_FOUND HAVE_XINERAMA)
+ macro_bool_to_01(X11_Xrandr_FOUND HAVE_XRANDR) # kwin
+ macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER) # kcontrol/style, kicker
+-macro_bool_to_01(X11_xf86misc_FOUND HAVE_XF86MISC) # kdesktop and kcontrol/lock
++macro_bool_to_01(FALSE HAVE_XF86MISC) # kdesktop and kcontrol/lock
+ macro_bool_to_01(X11_dpms_FOUND HAVE_DPMS) # kdesktop
+ macro_bool_to_01(X11_XSync_FOUND HAVE_XSYNC) # kwin
+ 
diff --git a/kde-base/kscreensaver/kscreensaver-4.6.4.ebuild b/kde-base/kscreensaver/kscreensaver-4.6.4.ebuild
index 1988b275bc49..7d9e1a5b4cc7 100644
--- a/kde-base/kscreensaver/kscreensaver-4.6.4.ebuild
+++ b/kde-base/kscreensaver/kscreensaver-4.6.4.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/kscreensaver/kscreensaver-4.6.4.ebuild,v 1.1 2011/06/10 17:59:45 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/kscreensaver-4.6.4.ebuild,v 1.2 2011/06/13 20:38:26 dilfridge Exp $
 
 EAPI=4
 
@@ -25,13 +25,17 @@ DEPEND="${RDEPEND}
 	x11-proto/randrproto
 "
 
-PATCHES=( "${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
-	"${FILESDIR}/${PN}-4.5.95-nsfw.patch" )
+PATCHES=(
+	"${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
+	"${FILESDIR}/${PN}-4.5.95-nsfw.patch" 
+	"${FILESDIR}/${PN}-4.6.4-xf86misc.patch" 
+)
 
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_with opengl OpenGL)
 		$(cmake-utils_use_with pam)
+		-DHAVE_XF86MISC=0
 	)
 
 	kde4-meta_src_configure