Remove monolithic KDE 4.0, bug 209586.

(Portage version: 2.1.4.4)

5 files changed, 6 insertions, 133 deletions

diff --git a/kde-base/kdeedu/ChangeLog b/kde-base/kdeedu/ChangeLog
index 68f3b503679c..5009df51371c 100644
--- a/kde-base/kdeedu/ChangeLog
+++ b/kde-base/kdeedu/ChangeLog
@@ -1,6 +1,11 @@
 # 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.234 2008/02/18 13:10:26 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/ChangeLog,v 1.235 2008/02/18 23:56:05 ingmar Exp $
+
+  18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -files/kstars-4.0.0-destdir.patch, -files/marble-4.0.0-fix-tests.patch,
+  -files/kdeedu-4.0.0-opengl.patch, -kdeedu-4.0.0.ebuild:
+  Remove monolithic KDE 4.0, bug 209586.
 
   18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> -kdeedu-3.5.5.ebuild,
   -kdeedu-3.5.6.ebuild, -kdeedu-3.5.7.ebuild:
diff --git a/kde-base/kdeedu/files/kdeedu-4.0.0-opengl.patch b/kde-base/kdeedu/files/kdeedu-4.0.0-opengl.patch
deleted file mode 100644
index 0ca889f566e9..000000000000
--- a/kde-base/kdeedu/files/kdeedu-4.0.0-opengl.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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
-@@ -33,6 +32,10 @@
- 	functionimpl.cpp
- )
- 
-+if(OPENGL_FOUND)
-+   set(kalgebra_SRCS ${kalgebra_SRCS} graph3d.cpp)
-+endif(OPENGL_FOUND)
-+
- kde4_add_library(analitza ${analitza_SRCS})
- target_link_libraries(analitza ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ${KDE4_KDECORE_LIBS})
- 
diff --git a/kde-base/kdeedu/files/kstars-4.0.0-destdir.patch b/kde-base/kdeedu/files/kstars-4.0.0-destdir.patch
deleted file mode 100644
index 4cf63b5f89db..000000000000
--- a/kde-base/kdeedu/files/kstars-4.0.0-destdir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- kstars/kstars/indi/CMakeLists.txt
-+++ kstars/kstars/indi/CMakeLists.txt
-@@ -213,10 +213,10 @@
- #TODO fix for windows.
- if(UNIX)
- file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_lx200generic_symlink.cmake 
--"exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic ${BIN_INSTALL_DIR}/indi_lx200classic)\n
--exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic ${BIN_INSTALL_DIR}/indi_lx200autostar)\n 
--exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic ${BIN_INSTALL_DIR}/indi_lx200_16)\n
--exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic ${BIN_INSTALL_DIR}/indi_lx200gps)\n
-+"exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \"$ENV{D}/${BIN_INSTALL_DIR}/indi_lx200classic\")\n
-+exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \"$ENV{D}/${BIN_INSTALL_DIR}/indi_lx200autostar\")\n
-+exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \"$ENV{D}/${BIN_INSTALL_DIR}/indi_lx200_16\")\n
-+exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \"$ENV{D}/${BIN_INSTALL_DIR}/indi_lx200gps\")\n
- ")
- set_target_properties(indi_lx200generic PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_lx200generic_symlink.cmake)
- endif(UNIX)
diff --git a/kde-base/kdeedu/files/marble-4.0.0-fix-tests.patch b/kde-base/kdeedu/files/marble-4.0.0-fix-tests.patch
deleted file mode 100644
index 50b3df636cad..000000000000
--- a/kde-base/kdeedu/files/marble-4.0.0-fix-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- marble/tests/CMakeLists.txt
-+++ marble/tests/CMakeLists.txt
-@@ -9,7 +9,9 @@
- # source dirs
-   ${CMAKE_CURRENT_SOURCE_DIR}/../src
-   ${CMAKE_CURRENT_SOURCE_DIR}/../src/lib
-+  ${CMAKE_CURRENT_SOURCE_DIR}/../src/lib/AbstractLayer
-+  ${CMAKE_CURRENT_SOURCE_DIR}/../src/lib/geodata/data
- # include dirs
-   ${QT_INCLUDE_DIR}
-   )
- ADD_DEFINITIONS(-DTEST_DATA_DIR="\\"${TEST_DATA_DIR}\\"")
diff --git a/kde-base/kdeedu/kdeedu-4.0.0.ebuild b/kde-base/kdeedu/kdeedu-4.0.0.ebuild
deleted file mode 100644
index 922585355de5..000000000000
--- a/kde-base/kdeedu/kdeedu-4.0.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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.4 2008/01/27 23:02:56 zlin Exp $
-
-EAPI="1"
-
-inherit kde4-base
-
-DESCRIPTION="KDE education module"
-HOMEPAGE="http://www.kde.org/"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="debug htmlhandbook cviewer opengl readline solver kig-scripting fits
-nova sbig usb designer-plugin gps"
-
-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 )"
-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
-		${FILESDIR}/${P}-opengl.patch"
-
-pkg_setup() {
-	use cviewer && QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK} opengl"
-
-	kde4-base_pkg_setup
-}
-
-src_compile() {
-	# 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 solver OCaml)
-		$(cmake-utils_use_with solver Libfacile)
-		$(cmake-utils_use_with kig-scripting BoostPython)
-		$(cmake-utils_use_with fits CFitsio)
-		$(cmake-utils_use_with nova Nova)
-		$(cmake-utils_use_with sbig SBIG)
-		$(cmake-utils_use_with usb USB)
-		$(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)"
-
-	if use gps; then
-		mycmakeargs="${mycmakeargs} -DHAVE_LIBGPS=1"
-	else
-		sed -i -e 's:FIND_LIBRARY(libgps_LIBRARIES gps):# LIBGPS DISABLED &:' \
-			marble/Findlibgps.cmake || die "sed failed."
-	fi
-
-	kde4-base_src_compile
-}