Fix compilation with USE=-opengl. For bug #206517.

Package-Manager: portage-2.1.4

4 files changed, 63 insertions, 11 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 83d0dfabfa5d..6c35ee7e8a09 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.420 2008/01/25 19:40:49 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.421 2008/01/27 19:59:36 zlin Exp $
+
+  27 Jan 2008; Bo Ørsted Andresen <zlin@gentoo.org>
+  +files/kdebase-4.0.0-opengl.patch, kdebase-4.0.0.ebuild:
+  Fix compilation with USE=-opengl. For bug #206517.
 
   25 Jan 2008; Markus Rothe <corsair@gentoo.org> kdebase-3.5.7-r6.ebuild:
   Stable on ppc64; bug #207203
diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
index f9df78f3acce..39feeaedf09b 100644
--- a/kde-base/kdebase/Manifest
+++ b/kde-base/kdebase/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX Gentoo_Bugzilla.desktop 283 RMD160 84ec8315ffead9bc04bc358d971e7ab653971f17 SHA1 65d287acd1d1dfc0ce158891fb555877cbad559e SHA256 6c72e294f8e11d2e3fe6ca26d004d6926530e9ed919c2ed4c8f7b1361ef18ddf
 MD5 623e6822f901f18407fc96b8ac0daa30 files/Gentoo_Bugzilla.desktop 283
 RMD160 84ec8315ffead9bc04bc358d971e7ab653971f17 files/Gentoo_Bugzilla.desktop 283
@@ -30,6 +33,10 @@ AUX kate-3.5.7-session-save.patch 830 RMD160 b985212c85c11b563bbeb0a8348e2771e8b
 MD5 4e94724dabfaf7a3abf9ad801bd7ec27 files/kate-3.5.7-session-save.patch 830
 RMD160 b985212c85c11b563bbeb0a8348e2771e8b6e43d files/kate-3.5.7-session-save.patch 830
 SHA256 191b6fea38483d631ba87b8fdeff6ad65ace7f9aba8e0aeb2f8ecfb6bf1d336a files/kate-3.5.7-session-save.patch 830
+AUX kdebase-4.0.0-opengl.patch 1288 RMD160 e19692303e38e430ab288bc40ff6da052670ecc8 SHA1 cc2a01100a99d3a0a72cab04f4f0b07ac99d7549 SHA256 6235835ecf2d1f20a22dc4cac24d6be44594028753d1e029c61a2f4c10007687
+MD5 ba445e356f83511a9b1eb9e6cf51b1af files/kdebase-4.0.0-opengl.patch 1288
+RMD160 e19692303e38e430ab288bc40ff6da052670ecc8 files/kdebase-4.0.0-opengl.patch 1288
+SHA256 6235835ecf2d1f20a22dc4cac24d6be44594028753d1e029c61a2f4c10007687 files/kdebase-4.0.0-opengl.patch 1288
 AUX kdebase-4.0.0-pam-optional.patch 979 RMD160 abdb7293c02507dfd0a032e72f3e449405b6d8a0 SHA1 33e2f936f0548f9b19fe541c0f71db06f9daaf63 SHA256 efa4e0132687dbaa68ab5c8a5911c4a08b5d4e9eb4d2a04879f765b8e44ba9ea
 MD5 1516e497a3b86ea0afbb80f887059959 files/kdebase-4.0.0-pam-optional.patch 979
 RMD160 abdb7293c02507dfd0a032e72f3e449405b6d8a0 files/kdebase-4.0.0-pam-optional.patch 979
@@ -181,14 +188,14 @@ EBUILD kdebase-3.5.8.ebuild 7057 RMD160 5532c9ccf5100febf5e8002fdbec2f5d4dfce8f5
 MD5 37eea3820dbd3438733985f9316abf58 kdebase-3.5.8.ebuild 7057
 RMD160 5532c9ccf5100febf5e8002fdbec2f5d4dfce8f5 kdebase-3.5.8.ebuild 7057
 SHA256 fb3f20fdce989e0b09a994858c5265fb6880407be24a8ff78582b78207b933c6 kdebase-3.5.8.ebuild 7057
-EBUILD kdebase-4.0.0.ebuild 9743 RMD160 dbdcc318a39dda1c787ccac5a2cf115bd6345cf0 SHA1 c2576778da46accad3aebeb2ed94be3dbb61e99a SHA256 db61f16808fc11108efea9137b6eb52953443c4ab857b18ac6055f284ec0ea2f
-MD5 6614e17554d0f7d5204b038563ccd663 kdebase-4.0.0.ebuild 9743
-RMD160 dbdcc318a39dda1c787ccac5a2cf115bd6345cf0 kdebase-4.0.0.ebuild 9743
-SHA256 db61f16808fc11108efea9137b6eb52953443c4ab857b18ac6055f284ec0ea2f kdebase-4.0.0.ebuild 9743
-MISC ChangeLog 70485 RMD160 08ed3911d1da2952b0c9ee243bb3f9be339d2174 SHA1 4b61bd8448c4e3767a625554e8235b381a8d3cc9 SHA256 7dfae2fc91dee66d5e682ac68a243b588f22ba5ffa06b84088c48239dad038ee
-MD5 91ebedfb06cde9288453eb88dc81ab1b ChangeLog 70485
-RMD160 08ed3911d1da2952b0c9ee243bb3f9be339d2174 ChangeLog 70485
-SHA256 7dfae2fc91dee66d5e682ac68a243b588f22ba5ffa06b84088c48239dad038ee ChangeLog 70485
+EBUILD kdebase-4.0.0.ebuild 9772 RMD160 039a56e01c543ad66c3be00ce6543c0db60c1026 SHA1 6d8e213be15c27eb9d11d29c620ae4dd0b54bbaa SHA256 e54932cd590f20f5b7f52833ae31d44af7c42dcf885504ed4a60f46faa8bcfd3
+MD5 fdcc57a32c0453409c56178300522498 kdebase-4.0.0.ebuild 9772
+RMD160 039a56e01c543ad66c3be00ce6543c0db60c1026 kdebase-4.0.0.ebuild 9772
+SHA256 e54932cd590f20f5b7f52833ae31d44af7c42dcf885504ed4a60f46faa8bcfd3 kdebase-4.0.0.ebuild 9772
+MISC ChangeLog 70648 RMD160 248bca9014b1a3c26a9713a4b736d2dfa3f0afd3 SHA1 71200c41d8b019096f79a281eb7be72f6f553408 SHA256 ce27917fa3f87e907436aaea467c646bdacb17ec056326bb1b26ac4fc8a09421
+MD5 5796c0acaa0d25a2bccea6838ce12aa7 ChangeLog 70648
+RMD160 248bca9014b1a3c26a9713a4b736d2dfa3f0afd3 ChangeLog 70648
+SHA256 ce27917fa3f87e907436aaea467c646bdacb17ec056326bb1b26ac4fc8a09421 ChangeLog 70648
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -259,3 +266,10 @@ SHA256 c67e246b3faa04aea42d326d5de158bed1dcebc0a3e544e12cd2b105aa7730a9 files/di
 MD5 ba3d5416a7fa549691633f411b7d8c74 files/digest-kdebase-4.0.0 801
 RMD160 66946bd5d65db73856eebf0be45003e44808f6c6 files/digest-kdebase-4.0.0 801
 SHA256 360920848ccc9d77d68a54495a3a2f2726dd686ea2d2b7249653796cde6e0463 files/digest-kdebase-4.0.0 801
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHnOKbfxJ68Jl1NeERAkwtAKCkiWekDnSXaN+ebE/Y/jKg1ZIvLACgh0jz
+m/WothwQ/KifUmhigogMUdg=
+=YQSz
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdebase/files/kdebase-4.0.0-opengl.patch b/kde-base/kdebase/files/kdebase-4.0.0-opengl.patch
new file mode 100644
index 000000000000..76d5c4ed6439
--- /dev/null
+++ b/kde-base/kdebase/files/kdebase-4.0.0-opengl.patch
@@ -0,0 +1,33 @@
+--- workspace/CMakeLists.txt    (revision 767202)
++++ workspace/CMakeLists.txt    (working copy)
+@@ -16,8 +16,6 @@
+ include (MacroLibrary)
+ include (KDE4Defaults)
+
+-macro_optional_find_package(OpenGL)
+-
+ include(ConfigureChecks.cmake)
+ configure_file(config-unix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-unix.h )
+ configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h )
+--- workspace/kcontrol/screensaver/CMakeLists.txt       (revision 766878)
++++ workspace/kcontrol/screensaver/CMakeLists.txt       (working copy)
+@@ -1,5 +1,7 @@
+
++if(WITH_OpenGL)
+ check_library_exists(GL glXChooseVisual "" HAVE_GLXCHOOSEVISUAL)
++endif(WITH_OpenGL)
+ configure_file (config-screensaver.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-screensaver.h )
+
+ add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
+--- workspace/krunner/lock/CMakeLists.txt       (revision 766878)
++++ workspace/krunner/lock/CMakeLists.txt       (working copy)
+@@ -5,7 +5,9 @@
+ ########### next target ###############
+
+ check_library_exists(Xxf86misc XF86MiscSetGrabKeysState "" HAVE_XF86MISCSETGRABKEYSSTATE)
++if(WITH_OpenGL)
+ check_library_exists(GL glXChooseVisual "" HAVE_GLXCHOOSEVISUAL)
++endif(WITH_OpenGL)
+
+ configure_file(config-krunner-lock.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-krunner-lock.h)
+
diff --git a/kde-base/kdebase/kdebase-4.0.0.ebuild b/kde-base/kdebase/kdebase-4.0.0.ebuild
index eca7321e5e9f..85aba24d8704 100644
--- a/kde-base/kdebase/kdebase-4.0.0.ebuild
+++ b/kde-base/kdebase/kdebase-4.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-4.0.0.ebuild,v 1.4 2008/01/22 04:16:08 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-4.0.0.ebuild,v 1.5 2008/01/27 19:59:36 zlin Exp $
 
 EAPI="1"
 
@@ -115,7 +115,8 @@ PDEPEND="
 
 PATCHES="${FILESDIR}/gentoo-startkde.patch
 	${FILESDIR}/kdm-${PV}-genkdmconf.patch
-	${FILESDIR}/${P}-pam-optional.patch"
+	${FILESDIR}/${P}-pam-optional.patch
+	${FILESDIR}/${P}-opengl.patch"
 
 pkg_setup() {
 	KDE4_BUILT_WITH_USE_CHECK="--missing false kde-base/kdelibs:${SLOT} alsa semantic-desktop