Fix compilation with USE="-cviewer -opengl".

Package-Manager: portage-2.1.4

4 files changed, 51 insertions, 14 deletions

diff --git a/kde-base/kdeedu/ChangeLog b/kde-base/kdeedu/ChangeLog
index 3e38afc324dd..d8a72f94fd86 100644
--- a/kde-base/kdeedu/ChangeLog
+++ b/kde-base/kdeedu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeedu
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/ChangeLog,v 1.225 2008/01/18 09:31:21 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/ChangeLog,v 1.226 2008/01/27 23:02:56 zlin Exp $
+
+  27 Jan 2008; Bo Ørsted Andresen <zlin@gentoo.org>
+  +files/kdeedu-4.0.0-opengl.patch, kdeedu-4.0.0.ebuild:
+  Fix compilation with USE="-cviewer -opengl".
 
   18 Jan 2008; Ingmar Vanhassel <ingmar@gentoo.org>
   files/digest-kdeedu-4.0.0, Manifest:
diff --git a/kde-base/kdeedu/Manifest b/kde-base/kdeedu/Manifest
index eda6e3b5a1f6..0cf811032e38 100644
--- a/kde-base/kdeedu/Manifest
+++ b/kde-base/kdeedu/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX kdeedu-4.0.0-opengl.patch 614 RMD160 8ceb1ff5bdac87ed5f5415e17b12a0720dec6560 SHA1 cce8c3d5d7405049b7bf551547b8d67458132428 SHA256 3efc03b2cf5428d5ef57d1fbf83b60663182745ba24364110d7b7b0c8b059a4f
+MD5 92e80e3be29f5d1f585931c4adf920b8 files/kdeedu-4.0.0-opengl.patch 614
+RMD160 8ceb1ff5bdac87ed5f5415e17b12a0720dec6560 files/kdeedu-4.0.0-opengl.patch 614
+SHA256 3efc03b2cf5428d5ef57d1fbf83b60663182745ba24364110d7b7b0c8b059a4f files/kdeedu-4.0.0-opengl.patch 614
 AUX kstars-4.0.0-destdir.patch 1440 RMD160 fd6f3c895be42182017c812ca3f4170f460751e8 SHA1 02c1136812b0aaf1cb0ef4419ee73130caf06a9b SHA256 cad8aa86d2c7490f92873e4ed28d6e74f15c65f8bf5e436b68deb121d3da2c5c
 MD5 baea48e5b970f3b9b9fbf272a2262efb files/kstars-4.0.0-destdir.patch 1440
 RMD160 fd6f3c895be42182017c812ca3f4170f460751e8 files/kstars-4.0.0-destdir.patch 1440
@@ -27,14 +34,14 @@ EBUILD kdeedu-3.5.8.ebuild 1426 RMD160 feb86b901724ad7d9cc76dd619540749dc9de6a4
 MD5 51955333b439c3bf55ea1f373ce708d9 kdeedu-3.5.8.ebuild 1426
 RMD160 feb86b901724ad7d9cc76dd619540749dc9de6a4 kdeedu-3.5.8.ebuild 1426
 SHA256 86bc43d9a1601ffb9bc9e13686963edc5013480f69c0a088e71e103f74431821 kdeedu-3.5.8.ebuild 1426
-EBUILD kdeedu-4.0.0.ebuild 2303 RMD160 fec64cfaeecdddabbbac380307e9a69b66004a3c SHA1 f83407dcb77adff79109fab61dcd043756c00a1f SHA256 7c5650b48aedb05e820862ba27091031b9e37e01cf577e8622913690a304d336
-MD5 8d60dd65c1ffee9ce2043a67782a182d kdeedu-4.0.0.ebuild 2303
-RMD160 fec64cfaeecdddabbbac380307e9a69b66004a3c kdeedu-4.0.0.ebuild 2303
-SHA256 7c5650b48aedb05e820862ba27091031b9e37e01cf577e8622913690a304d336 kdeedu-4.0.0.ebuild 2303
-MISC ChangeLog 26939 RMD160 bd9536011a78d6ff4e1b84619c3b78d37161321a SHA1 ed42ae721ba8b26c96e8971ec2ca3cd7959174ae SHA256 db1b7c0e5f5acfe36af0e5d2c2e6dbf3be9e74cd857b4f4cea8a57e6226fdfd4
-MD5 0c62bf8957e0adbc830488a94d38bc43 ChangeLog 26939
-RMD160 bd9536011a78d6ff4e1b84619c3b78d37161321a ChangeLog 26939
-SHA256 db1b7c0e5f5acfe36af0e5d2c2e6dbf3be9e74cd857b4f4cea8a57e6226fdfd4 ChangeLog 26939
+EBUILD kdeedu-4.0.0.ebuild 2307 RMD160 3e4ca6162ee4418d1e008c8e5c87ae395ce3371f SHA1 4cba245ad397154b07b5d23bf0d5193c4ee163d5 SHA256 ac0619c6f2b1e8f9f49ed362d1cb390018c88adde7a503d1e3f24c89227c9333
+MD5 f905780c51bcb18ffe79b65da92952ec kdeedu-4.0.0.ebuild 2307
+RMD160 3e4ca6162ee4418d1e008c8e5c87ae395ce3371f kdeedu-4.0.0.ebuild 2307
+SHA256 ac0619c6f2b1e8f9f49ed362d1cb390018c88adde7a503d1e3f24c89227c9333 kdeedu-4.0.0.ebuild 2307
+MISC ChangeLog 27095 RMD160 a2c259b90608d0039db75ae4a5f40b91687eb86a SHA1 51a9dbd771e55b8bbb2621abed2b5dda13514633 SHA256 4738fdd48ef73ce36ea9e0d5f8240e31797518dee7c12b7eda63cd80163785b5
+MD5 c9ca935552aa657a549c08c6e060784a ChangeLog 27095
+RMD160 a2c259b90608d0039db75ae4a5f40b91687eb86a ChangeLog 27095
+SHA256 4738fdd48ef73ce36ea9e0d5f8240e31797518dee7c12b7eda63cd80163785b5 ChangeLog 27095
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -54,3 +61,10 @@ SHA256 4f40ebcf2b46f22bb6712d559d81040c6c20c0a0257afd0b5becc1bf3e138dca files/di
 MD5 fa608683f66be0a8b9b00ad3f0fbbae5 files/digest-kdeedu-4.0.0 247
 RMD160 bc8eeabe5d2ae3895d2e304be12a55d8eb3fec6c files/digest-kdeedu-4.0.0 247
 SHA256 a245b11f6f06334002ed9b23be7d03582f34c310e95f8e0664c6cc662226d835 files/digest-kdeedu-4.0.0 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHnQ2VfxJ68Jl1NeERAqWZAKC8fTzCVvZdi1p0A6W12H4dcHbcGACeI0vu
+7+I8A+Ck2Td+uwp105roHi4=
+=cZ0w
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdeedu/files/kdeedu-4.0.0-opengl.patch b/kde-base/kdeedu/files/kdeedu-4.0.0-opengl.patch
new file mode 100644
index 000000000000..d29e975d37eb
--- /dev/null
+++ b/kde-base/kdeedu/files/kdeedu-4.0.0-opengl.patch
@@ -0,0 +1,20 @@
+Index: kalgebra/src/CMakeLists.txt
+===================================================================
+--- kalgebra/src/CMakeLists.txt	(revision 767350)
++++ kalgebra/src/CMakeLists.txt	(working copy)
+@@ -24,7 +24,6 @@
+ 	functionedit.cpp
+ 	varedit.cpp
+ 	main.cpp
+-	graph3d.cpp
+ 	algebrahighlighter.cpp
+ 	expressionedit.cpp
+ 	graph2d.cpp
+@@ -45,6 +44,7 @@
+ target_link_libraries(kalgebra  ${KDE4_KHTML_LIBS} analitza)
+ 
+ if(OPENGL_FOUND)
++   set(kalgebra_SRCS ${kalgebra_SRCS} graph3d.cpp)
+    target_link_libraries(kalgebra  ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY})
+ endif(OPENGL_FOUND)
+ 
diff --git a/kde-base/kdeedu/kdeedu-4.0.0.ebuild b/kde-base/kdeedu/kdeedu-4.0.0.ebuild
index 5f4379b31d18..922585355de5 100644
--- a/kde-base/kdeedu/kdeedu-4.0.0.ebuild
+++ b/kde-base/kdeedu/kdeedu-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/kdeedu/kdeedu-4.0.0.ebuild,v 1.3 2008/01/18 04:38:46 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-4.0.0.ebuild,v 1.4 2008/01/27 23:02:56 zlin Exp $
 
 EAPI="1"
 
@@ -36,12 +36,11 @@ RDEPEND="${COMMONDEPEND}
 		>=kde-base/kdebase-${PV}:${SLOT} )"
 
 PATCHES="${FILESDIR}/kstars-4.0.0-destdir.patch
-		${FILESDIR}/marble-4.0.0-fix-tests.patch"
+		${FILESDIR}/marble-4.0.0-fix-tests.patch
+		${FILESDIR}/${P}-opengl.patch"
 
 pkg_setup() {
-	if use cviewer || use opengl; then
-		QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK} opengl"
-	fi
+	use cviewer && QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK} opengl"
 
 	kde4-base_pkg_setup
 }