[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     3d0a6fbb272494dd0f44d36c27443636044799bd
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  2 10:17:41 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Aug  2 10:17:41 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3d0a6fbb

[eclass] Remove obsolete koffice handling.

---
 eclass/kde4-base.eclass      |   24 +++-------------------
 eclass/kde4-functions.eclass |    5 +---
 eclass/kde4-meta.eclass      |   44 ------------------------------------------
 3 files changed, 5 insertions(+), 68 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index c0c73e3..a5e3177 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -66,9 +66,6 @@ case ${KDEBASE} in
 		SLOT=4
 		KDE_MINIMAL="${PV}"
 		;;
-	koffice)
-		SLOT="2"
-		;;
 	kdevelop)
 		if [[ ${KDE_BUILD_TYPE} = live ]]; then
 			# @ECLASS-VARIABLE: KDEVELOP_VERSION
@@ -190,10 +187,6 @@ case ${KDEBASE} in
 				;;
 		esac
 		;;
-	koffice)
-		HOMEPAGE="http://www.koffice.org/"
-		LICENSE="GPL-2"
-		;;
 	kdevelop)
 		HOMEPAGE="http://www.kdevelop.org/"
 		LICENSE="GPL-2"
@@ -421,7 +414,7 @@ RDEPEND+=" ${COMMONDEPEND}"
 unset COMMONDEPEND
 
 # Fetch section - If the ebuild's category is not 'kde-base' and if it is not a
-# koffice ebuild, the URI should be set in the ebuild itself
+# kdevelop ebuild, the URI should be set in the ebuild itself
 _calculate_src_uri() {
 	debug-print-function ${FUNCNAME} "$@"
 
@@ -464,12 +457,6 @@ _calculate_src_uri() {
 					SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.xz" ;;
 			esac
 			;;
-		koffice)
-			case ${PV} in
-				2.[1234].[6-9]*) SRC_URI="mirror://kde/unstable/${_kmname_pv}/${_kmname_pv}.tar.bz2" ;;
-				*) SRC_URI="mirror://kde/stable/${_kmname_pv}/${_kmname_pv}.tar.bz2" ;;
-			esac
-			;;
 		kdevelop|kdevelop-php*|kdevplatform)
 			case ${KDEVELOP_VERSION} in
 				4.[12].[6-9]*) SRC_URI="mirror://kde/unstable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.bz2" ;;
@@ -537,9 +524,6 @@ _calculate_live_repo() {
 						ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}/${KMMODULE}"
 						ESVN_PROJECT="${PN}${ESVN_PROJECT_SUFFIX}"
 						;;
-					koffice)
-						ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}"
-						;;
 					*)
 						ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}/${KMMODULE}"
 						;;
@@ -552,9 +536,9 @@ _calculate_live_repo() {
 			# @ECLASS-VARIABLE: ESVN_UP_FREQ
 			# @DESCRIPTION:
 			# This variable is used for specifying the timeout between svn synces
-			# for kde-base and koffice modules. Does not affect misc apps.
+			# for kde-base modules. Does not affect misc apps.
 			# Default value is 1 hour.
-			[[ ${KDEBASE} = kde-base || ${KDEBASE} = koffice ]] && ESVN_UP_FREQ=${ESVN_UP_FREQ:-1}
+			[[ ${KDEBASE} = kde-base ]] && ESVN_UP_FREQ=${ESVN_UP_FREQ:-1}
 			;;
 		git)
 			local _kmname
@@ -735,7 +719,7 @@ kde4-base_src_prepare() {
 		load_library_dependencies
 	fi
 
-	# Hack for manuals relying on outdated DTD, only outside kde-base/koffice/...
+	# Hack for manuals relying on outdated DTD, only outside kde-base/...
 	if [[ -z ${KDEBASE} ]]; then
 		find "${S}" -name "*.docbook" \
 			-exec sed -i -r \

diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index 63fc43c..9ab80ea 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -32,13 +32,10 @@ esac
 # @ECLASS-VARIABLE: KDEBASE
 # @DESCRIPTION:
 # This gets set to a non-zero value when a package is considered a kde or
-# koffice ebuild.
+# kdevelop ebuild.
 if [[ ${CATEGORY} = kde-base ]]; then
 	debug-print "${ECLASS}: KDEBASE ebuild recognized"
 	KDEBASE=kde-base
-elif [[ ${KMNAME-${PN}} = koffice ]]; then
-	debug-print "${ECLASS}: KOFFICE ebuild recognized"
-	KDEBASE=koffice
 elif [[ ${KMNAME-${PN}} = kdevelop ]]; then
 	debug-print "${ECLASS}: KDEVELOP ebuild recognized"
 	KDEBASE=kdevelop

diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index ff21679..3631eb8 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -37,28 +37,6 @@ case ${KMNAME} in
 			COMMONDEPEND+=" $(add_kdebase_dep libkdegames)"
 		fi
 		;;
-	koffice)
-		[[ ${PN} != koffice-data ]] && IUSE+=" debug"
-		RDEPEND+="
-			!app-office/${PN}:0
-			!app-office/koffice:0
-			!app-office/koffice-meta:0
-		"
-		if has openexr ${IUSE//+}; then
-			COMMONDEPEND+=" media-gfx/imagemagick[openexr?]"
-		else
-			COMMONDEPEND+=" media-gfx/imagemagick"
-		fi
-
-		COMMONDEPEND+="
-			dev-cpp/eigen:2
-			media-libs/fontconfig
-			media-libs/freetype:2
-		"
-		if [[ ${PN} != koffice-libs && ${PN} != koffice-data ]]; then
-			COMMONDEPEND+=" >=app-office/koffice-libs-${PV}:${SLOT}"
-		fi
-		;;
 esac
 
 DEPEND+=" ${COMMONDEPEND}"
@@ -356,20 +334,6 @@ kde4-meta_create_extractlists() {
 			KMEXTRACTONLY+="
 				kdeutils-version.h"
 			;;
-		koffice)
-			KMEXTRACTONLY+="
-				filters/config-filters.h.cmake
-			"
-			case ${PV} in
-				2.[12].*)
-					KMEXTRACTONLY+="
-						config-endian.h.cmake
-						config-openexr.h.cmake
-						config-opengl.h.cmake
-						config-prefix.h.cmake"
-				;;
-			esac
-			;;
 	esac
 	# Don't install cmake modules for split ebuilds, to avoid collisions.
 	# note: kdegraphics >= 4.6.2 does not even have code to do that, so we
@@ -619,14 +583,6 @@ kde4-meta_change_cmakelists() {
 				-e 's/find_package(Boost REQUIRED)/macro_optional_find_package(Boost)/' \
 				-i CMakeLists.txt || die "failed to disable hardcoded checks"
 			;;
-		koffice)
-			# Prevent collisions
-			if [[ ${PN} != koffice-data ]]; then
-				sed -e '/install(.*FindKOfficeLibs.cmake/,/)/ d' \
-					-i cmake/modules/CMakeLists.txt || die "${LINENO}: sed died in collision prevention section"
-				sed -e '/install(.\+config-openexr\.h.\+)/d' \
-					-i CMakeLists.txt || die "${LINENO}: sed died in collision prevention section"
-			fi
 	esac
 
 	popd > /dev/null