Fix compilation with USE=-opengl.

Package-Manager: portage-2.1.4

4 files changed, 48 insertions, 18 deletions

diff --git a/kde-base/kalgebra/ChangeLog b/kde-base/kalgebra/ChangeLog
index 03f6753725cc..5286c2ad7f9b 100644
--- a/kde-base/kalgebra/ChangeLog
+++ b/kde-base/kalgebra/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kalgebra
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalgebra/ChangeLog,v 1.1 2008/01/17 23:31:09 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalgebra/ChangeLog,v 1.2 2008/01/27 23:15:57 zlin Exp $
+
+  27 Jan 2008; Bo Ørsted Andresen <zlin@gentoo.org>
+  +files/kdeedu-4.0.0-opengl.patch, kalgebra-4.0.0.ebuild:
+  Fix compilation with USE=-opengl.
 
 *kalgebra-4.0.0 (17 Jan 2008)
 
diff --git a/kde-base/kalgebra/Manifest b/kde-base/kalgebra/Manifest
index d280a6559f43..b6a6df43b4a5 100644
--- a/kde-base/kalgebra/Manifest
+++ b/kde-base/kalgebra/Manifest
@@ -1,15 +1,19 @@
 -----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
 DIST kdeedu-4.0.0.tar.bz2 41886885 RMD160 667ba2904a235daf6e041bba3e9b19cae9147e19 SHA1 c338d3187e2f7441b872d3fb65760895d6424910 SHA256 e4cd9607cb0e821e8a6f0687cfe03573de3517aba7f360360d2b46756a0e5ef2
-EBUILD kalgebra-4.0.0.ebuild 882 RMD160 926d40982b33d7fa3234636841b8ad215ef05dbd SHA1 c83468424f96fd4477268a3f637be81326a86528 SHA256 0d6e2f7db702af222d0b417054db905c02b1781589b95b749489af257c97c2d2
-MD5 e948e6412a2f975cda21867ffbbb506e kalgebra-4.0.0.ebuild 882
-RMD160 926d40982b33d7fa3234636841b8ad215ef05dbd kalgebra-4.0.0.ebuild 882
-SHA256 0d6e2f7db702af222d0b417054db905c02b1781589b95b749489af257c97c2d2 kalgebra-4.0.0.ebuild 882
-MISC ChangeLog 354 RMD160 54e15380d384b868fb8b1212a96882ecf69d5c55 SHA1 db7cb87672d3bd24ada3cc6bdf196b6781146af7 SHA256 1fbc5ae8461428de9ea29a5518b889b6269f1c92d4be08f640ae9ec6ad99dbe1
-MD5 c92e111aaaf890be3afc469e9e24aac3 ChangeLog 354
-RMD160 54e15380d384b868fb8b1212a96882ecf69d5c55 ChangeLog 354
-SHA256 1fbc5ae8461428de9ea29a5518b889b6269f1c92d4be08f640ae9ec6ad99dbe1 ChangeLog 354
+EBUILD kalgebra-4.0.0.ebuild 881 RMD160 089f32daa8bb2279720f4ef683a8a6444a0ff58b SHA1 d5ddd19a36886e926762ac782edaf40eed5446c3 SHA256 114fdd775de680d24554055c4842203fb871c0a4a49b1bb7baf28add136f0f3c
+MD5 20988d93ac274c5a70d49cfbfe1233d7 kalgebra-4.0.0.ebuild 881
+RMD160 089f32daa8bb2279720f4ef683a8a6444a0ff58b kalgebra-4.0.0.ebuild 881
+SHA256 114fdd775de680d24554055c4842203fb871c0a4a49b1bb7baf28add136f0f3c kalgebra-4.0.0.ebuild 881
+MISC ChangeLog 497 RMD160 29b64de3963c75a20f3fd86c4952021cc55b0e67 SHA1 c1e930819b49ed1cbfc37efd6bdf62500eeff00f SHA256 da2466a1a9be004282bf93f5d13378ec195aec6ac652932d66726194c15811ca
+MD5 1d866dc587221165822ffd77e85c411c ChangeLog 497
+RMD160 29b64de3963c75a20f3fd86c4952021cc55b0e67 ChangeLog 497
+SHA256 da2466a1a9be004282bf93f5d13378ec195aec6ac652932d66726194c15811ca ChangeLog 497
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -20,7 +24,7 @@ SHA256 a245b11f6f06334002ed9b23be7d03582f34c310e95f8e0664c6cc662226d835 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHj+VECkvF58q80IkRAvrvAKCiN6bQRe7DZZN2OKVqYqKc6ssSsACgmbnI
-QSNgHw0J9a8dzhZhiuuqZ9g=
-=tbfz
+iD8DBQFHnRCRfxJ68Jl1NeERAhs+AJ9AHh5uQRdNzRXsMSrv8+FU7Z8g9wCcDYIX
+QZFZ9gJDIH0kcTt9hykYNgA=
+=nTH+
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kalgebra/files/kdeedu-4.0.0-opengl.patch b/kde-base/kalgebra/files/kdeedu-4.0.0-opengl.patch
new file mode 100644
index 000000000000..d29e975d37eb
--- /dev/null
+++ b/kde-base/kalgebra/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/kalgebra/kalgebra-4.0.0.ebuild b/kde-base/kalgebra/kalgebra-4.0.0.ebuild
index 5a728fea49b2..602ae1cd726b 100644
--- a/kde-base/kalgebra/kalgebra-4.0.0.ebuild
+++ b/kde-base/kalgebra/kalgebra-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/kalgebra/kalgebra-4.0.0.ebuild,v 1.1 2008/01/17 23:31:09 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalgebra/kalgebra-4.0.0.ebuild,v 1.2 2008/01/27 23:15:57 zlin Exp $
 
 EAPI="1"
 
@@ -11,15 +11,17 @@ DESCRIPTION="MathML-based graph calculator for KDE."
 KEYWORDS="~amd64 ~x86"
 IUSE="debug htmlhandbook opengl readline"
 
-COMMONDEPEND="opengl? ( virtual/opengl )
-	      readline? ( sys-libs/readline )"
-DEPEND="${DEPEND} ${COMMONDEPEND}"
-RDEPEND="${RDEPEND} ${COMMONDEPEND}"
+DEPEND="opengl? ( virtual/opengl )
+	readline? ( sys-libs/readline )"
+RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY=libkdeedu/kdeeduui
 
+PATCHES="${FILESDIR}/${KMNAME}-${PV}-opengl.patch"
+
 src_compile() {
-	mycmakeargs="$(cmake-utils_use_with readline Readline)
+	mycmakeargs="${mycmakeargs}
+		$(cmake-utils_use_with readline Readline)
 		$(cmake-utils_use_with opengl OpenGL)"
 
 	kde4-meta_src_compile