Both the cviewer and the opengl USE flags enable opengl support, fixed x11-libs/qt:4[opengl] USE-check, fix empty DEPEND.

Package-Manager: portage-2.1.4

4 files changed, 53 insertions, 37 deletions

diff --git a/kde-base/kdeedu/ChangeLog b/kde-base/kdeedu/ChangeLog
index 11de345ca137..d29a98725b99 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.223 2008/01/18 00:13:20 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/ChangeLog,v 1.224 2008/01/18 04:38:46 ingmar Exp $
+
+  18 Jan 2008; Ingmar Vanhassel <ingmar@gentoo.org> kdeedu-4.0.0.ebuild:
+  Both the cviewer and the opengl USE flags enable opengl support, fixed
+  x11-libs/qt:4[opengl] USE-check, fix empty DEPEND.
 
   18 Jan 2008; Wulf C. Krueger <philantrop@gentoo.org>
   +files/kstars-4.0.0-destdir.patch, +files/marble-4.0.0-fix-tests.patch:
diff --git a/kde-base/kdeedu/Manifest b/kde-base/kdeedu/Manifest
index 62e87d7aa26a..7cd03f954ecb 100644
--- a/kde-base/kdeedu/Manifest
+++ b/kde-base/kdeedu/Manifest
@@ -10,7 +10,7 @@ DIST kdeedu-3.5.5.tar.bz2 30016358 RMD160 f431bd83c17a483e9cacbbfdc19bee4bcc692e
 DIST kdeedu-3.5.6.tar.bz2 30049452 RMD160 ca70c9c9d9637154736c9f8978cbde8bfd2460ee SHA1 c081f33f8333fdf25cfd602facd511252152109a SHA256 d3b8471f26c83c05cadfb0ff48b5d8170034c5e6e436d514529e640037350a61
 DIST kdeedu-3.5.7.tar.bz2 30158516 RMD160 7fb9d10314d2617cb40b51cc4e8663838780633a SHA1 9a27207e63721da4869f4196b45ad1bbec2660d0 SHA256 59e8638f9fc3481159c8f841ab7493f978464e288ce43ea9e13ea1178ded059b
 DIST kdeedu-3.5.8.tar.bz2 30158456 RMD160 e15dc74c572da3035b3daceb66c75b14d6e14818 SHA1 7e225d8e9c6c0d69b780f96babbed569d31b0b70 SHA256 dddd4bef001ece864afe9502fe82c460dcf6329b9522ae0a4a2d0b94b5648b9b
-DIST kdeedu-4.0.0.tar.bz2 41886885 RMD160 667ba2904a235daf6e041bba3e9b19cae9147e19 SHA1 c338d3187e2f7441b872d3fb65760895d6424910 SHA256 e4cd9607cb0e821e8a6f0687cfe03573de3517aba7f360360d2b46756a0e5ef2
+DIST kdeedu-4.0.0.tar.bz2 41887194 RMD160 468d00e6eee05ec62ae1c42199067597de92b661 SHA1 2328dd356a8de7814ed2cf6f28bc9ae797a2fa8c SHA256 9fa5f6af13a4101f0c83a428624f22835d2f5696157ccd0e23944beacf86a0d1
 EBUILD kdeedu-3.5.5.ebuild 541 RMD160 cdde50dde6f63a587b22d3962d48c2512174f8b7 SHA1 9d54486eef596d6111d0b29a795273c3b1fb8b47 SHA256 fd71a0dd18209c4ba434a803eed57938c498b64a877c149fa9a0ba546f6e2ff1
 MD5 f84b5b8e31e8a7e906a6b03b6fb92280 kdeedu-3.5.5.ebuild 541
 RMD160 cdde50dde6f63a587b22d3962d48c2512174f8b7 kdeedu-3.5.5.ebuild 541
@@ -27,14 +27,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 2044 RMD160 81aaa63ff80b1444408d0862918444ed6e83e7a6 SHA1 2489e576cb4f436d45ceefdc010da56713720262 SHA256 d4afc35d2af77ba3a08b53e6302a696b33fe71bb50354aa86946cb6d50fea8f6
-MD5 4baee13c457c9697e425a6ea869073ca kdeedu-4.0.0.ebuild 2044
-RMD160 81aaa63ff80b1444408d0862918444ed6e83e7a6 kdeedu-4.0.0.ebuild 2044
-SHA256 d4afc35d2af77ba3a08b53e6302a696b33fe71bb50354aa86946cb6d50fea8f6 kdeedu-4.0.0.ebuild 2044
-MISC ChangeLog 26640 RMD160 eab5ad8cd4f6d80c6d4597f9513c9cfbb7887994 SHA1 6cd58e793fbce63413c4336ebe6819ceffd4b309 SHA256 a758d0e5aa476e07d4052da0d4729f12cde065084480d22e57e2bd07ddb13751
-MD5 c9017651934c44bc137efe7784a5b289 ChangeLog 26640
-RMD160 eab5ad8cd4f6d80c6d4597f9513c9cfbb7887994 ChangeLog 26640
-SHA256 a758d0e5aa476e07d4052da0d4729f12cde065084480d22e57e2bd07ddb13751 ChangeLog 26640
+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 26836 RMD160 de7d8737e287905631a41ace9c4852aac203f2d1 SHA1 f57cae4167629fb993719b738f1aebc1b9f5d322 SHA256 67faede4dea4623d7df4062d9d5a4609f259f74cc0c3e7cf16b981178f176f9d
+MD5 9a5240f70e76e1c38b601ba8c40e59b9 ChangeLog 26836
+RMD160 de7d8737e287905631a41ace9c4852aac203f2d1 ChangeLog 26836
+SHA256 67faede4dea4623d7df4062d9d5a4609f259f74cc0c3e7cf16b981178f176f9d ChangeLog 26836
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -51,6 +51,6 @@ SHA256 3b5556c639688cef33f35757e5dc39d97f9a16862b063b9e9b950dfd58b28e63 files/di
 MD5 5484ccc30043075426937f14d11f88fd files/digest-kdeedu-3.5.8 247
 RMD160 791421a5ab7fd2d85121e253e20bd0a7ff1497dc files/digest-kdeedu-3.5.8 247
 SHA256 4f40ebcf2b46f22bb6712d559d81040c6c20c0a0257afd0b5becc1bf3e138dca files/digest-kdeedu-3.5.8 247
-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
+MD5 70d65b92c383d3d585d00b989dcf489d files/digest-kdeedu-4.0.0 247
+RMD160 4aff9ab69ac965d94a6d8bbc383dc1813129e349 files/digest-kdeedu-4.0.0 247
+SHA256 5fe3f0264323a1c9ff8e52228a5bab53675725391f9c1818d425ab5fc868d204 files/digest-kdeedu-4.0.0 247
diff --git a/kde-base/kdeedu/files/digest-kdeedu-4.0.0 b/kde-base/kdeedu/files/digest-kdeedu-4.0.0
index ce8d81390226..c852e263e141 100644
--- a/kde-base/kdeedu/files/digest-kdeedu-4.0.0
+++ b/kde-base/kdeedu/files/digest-kdeedu-4.0.0
@@ -1,3 +1,3 @@
-MD5 73924e158e4a2de2107be441c808251f kdeedu-4.0.0.tar.bz2 41886885
-RMD160 667ba2904a235daf6e041bba3e9b19cae9147e19 kdeedu-4.0.0.tar.bz2 41886885
-SHA256 e4cd9607cb0e821e8a6f0687cfe03573de3517aba7f360360d2b46756a0e5ef2 kdeedu-4.0.0.tar.bz2 41886885
+MD5 76eb6108388e287ecdcc0bea099cebe8 kdeedu-4.0.0.tar.bz2 41887194
+RMD160 468d00e6eee05ec62ae1c42199067597de92b661 kdeedu-4.0.0.tar.bz2 41887194
+SHA256 9fa5f6af13a4101f0c83a428624f22835d2f5696157ccd0e23944beacf86a0d1 kdeedu-4.0.0.tar.bz2 41887194
diff --git a/kde-base/kdeedu/kdeedu-4.0.0.ebuild b/kde-base/kdeedu/kdeedu-4.0.0.ebuild
index 4df3c14b8363..5f4379b31d18 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.2 2008/01/18 03:06:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-4.0.0.ebuild,v 1.3 2008/01/18 04:38:46 ingmar Exp $
 
 EAPI="1"
 
@@ -17,38 +17,50 @@ LICENSE="GPL-2 LGPL-2"
 
 RESTRICT="test"
 
-COMMONDEPEND="gps? ( sci-geosciences/gpsd )
-		fits? ( sci-libs/cfitsio )
-		nova? ( >=sci-libs/libnova-0.12.1 )
-		sbig? ( sci-libs/indilib
-			usb? ( dev-libs/libusb ) )
-		cviewer? ( >=dev-cpp/eigen-1.0.5
-			>=sci-chemistry/openbabel-2.1
-			virtual/opengl )
-		solver? ( dev-ml/facile )
-		opengl? ( virtual/opengl )
-		readline? ( sys-libs/readline )
-		kig-scripting? ( >=dev-libs/boost-1.32 )"
-
-RDEPEND="${RDEPEND} ${COMMONDEPEND}
-	|| ( >=kde-base/kdebase-${PV}:${SLOT}
-		( >=kde-base/knotify-${PV}:${SLOT} >=kde-base/phonon-${PV}:${SLOT} ) )"
+COMMONDEPEND="
+	gps? ( sci-geosciences/gpsd )
+	fits? ( sci-libs/cfitsio )
+	nova? ( >=sci-libs/libnova-0.12.1 )
+	sbig? ( sci-libs/indilib
+		usb? ( dev-libs/libusb ) )
+	cviewer? ( >=dev-cpp/eigen-1.0.5
+		>=sci-chemistry/openbabel-2.1
+		virtual/opengl )
+	solver? ( dev-ml/facile )
+	opengl? ( virtual/opengl )
+	readline? ( sys-libs/readline )
+	kig-scripting? ( >=dev-libs/boost-1.32 )"
+DEPEND="${COMMONDEPEND}"
+RDEPEND="${COMMONDEPEND}
+	|| ( ( >=kde-base/knotify-${PV}:${SLOT} >=kde-base/phonon-${PV}:${SLOT} )
+		>=kde-base/kdebase-${PV}:${SLOT} )"
 
 PATCHES="${FILESDIR}/kstars-4.0.0-destdir.patch
 		${FILESDIR}/marble-4.0.0-fix-tests.patch"
 
 pkg_setup() {
-	use cviewer && QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK} opengl"
+	if use cviewer || use opengl; then
+		QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK} opengl"
+	fi
 
 	kde4-base_pkg_setup
 }
 
 src_compile() {
-	mycmakeargs="$(cmake-utils_use_with readline Readline)
-		$(cmake-utils_use_with opengl OpenGL)
+	# Either of these needs OpenGL support, but using cmake-utils_use_with
+	# and appending that to $mycmakeargs would let them override each other.
+	if use cviewer || use opengl; then
+		mycmakeargs="${mycmakeargs}
+			-DWITH_OpenGL=ON"
+	else
+		mycmakeargs="${mycmakeargs}
+			-DWITH_OpenGL=OFF"
+	fi
+
+	mycmakeargs="${mycmakeargs}
+		$(cmake-utils_use_with readline Readline)
 		$(cmake-utils_use_with cviewer Eigen)
 		$(cmake-utils_use_with cviewer OpenBabel2)
-		$(cmake-utils_use_with cviewer OpenGL)
 		$(cmake-utils_use_with solver OCaml)
 		$(cmake-utils_use_with solver Libfacile)
 		$(cmake-utils_use_with kig-scripting BoostPython)