Koffice play NO 1. now i probably break koffice but reaver wants to continue so i am sharing my work

2 files changed, 26 insertions, 59 deletions

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index aeec3622ca5..d0284830344 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -567,23 +567,6 @@ kde4-base_src_configure() {
 			-DCMAKE_SYSTEM_PROGRAM_PATH=${KDEDIR}/bin"
 	fi
 
-	# additonal arguments for KOFFICE
-	if [[ ${KMNAME} = koffice ]]; then
-		case ${PN} in
-			koffice-data) : ;;
-			*)
-				mycmakeargs="${mycmakeargs}
-					-DWITH_OpenEXR=ON
-					$(cmake-utils_use_with crypt QCA2)
-					$(cmake-utils_use_with opengl OpenGL)"
-				if use crypt; then
-					mycmakeargs="${mycmakeargs}
-						-DQCA2_LIBRARIES=/usr/$(get_libdir)/qca2/libqca.so.2"
-				fi
-				;;
-		esac
-	fi
-
 	[ -e CMakeLists.txt ] && cmake-utils_src_configure
 }
 
@@ -617,7 +600,8 @@ kde4-base_src_test() {
 
 	# Override this value, set in kde4-base_src_configure()
 	mycmakeargs="${mycmakeargs} -DKDE4_BUILD_TESTS=ON"
-	cmake-utils_src_compile
+	cmake-utils_src_configure
+	kde4-base_src_compile
 
 	cmake-utils_src_test
 }
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index 1e04e12e8c0..fc6f7561992 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -12,17 +12,6 @@
 # You must define KMNAME to use this eclass, and do so before inheriting it. All other variables are optional.
 # Do not include the same item in more than one of KMMODULE, KMMEXTRA, KMCOMPILEONLY, KMEXTRACTONLY.
 
-# we want opengl optional in each koffice package
-if [[ ${KMNAME} = koffice ]]; then
-	case ${PN} in
-		koffice-data)
-			;;
-		*)
-			OPENGL_REQUIRED=optional
-			;;
-	esac
-fi
-
 inherit kde4-base versionator
 
 EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_postinst pkg_postrm
@@ -84,12 +73,16 @@ case ${KMNAME} in
 				RDEPEND="${RDEPEND} media-libs/lcms"
 				;;
 			*)
-				IUSE="+crypt"
-				DEPEND="${DEPEND} crypt? ( >=app-crypt/qca-2 )"
-				RDEPEND="${RDEPEND} crypt? ( >=app-crypt/qca-2 )"
-				if [[ $PN != koffice-libs ]]; then
-					DEPEND="${DEPEND} >=app-office/koffice-libs-${PV}:${SLOT}"
-					RDEPEND="${RDEPEND} >=app-office/koffice-libs-${PV}:${SLOT}"
+				DEPEND="${DEPEND}
+					dev-cpp/eigen:2
+					media-gfx/imagemagick
+					media-libs/fontconfig
+					media-libs/freetype:2
+				"
+				RDEPEND="${DEPEND}"
+				if [[ ${PN} != koffice-libs && ${PN} != koffice-data ]]; then
+					DEPEND="${DEPEND} >=app-office/koffice-libs-${PV}:${SLOT}[kdeprefix=]"
+					RDEPEND="${RDEPEND} >=app-office/koffice-libs-${PV}:${SLOT}[kdepreifx=]"
 				fi
 				;;
 		esac
@@ -282,9 +275,9 @@ kde4-meta_src_extract() {
 		kde4-base_src_unpack
 	fi
 	# fix koffice linking
-	if [[ ${KMNAME} = koffice ]]; then
-		koffice_fix_libraries
-	fi
+	#if [[ ${KMNAME} = koffice ]]; then
+		#koffice_fix_libraries # in progress magic
+	#fi
 }
 
 # @FUNCTION: kde4-meta_create_extractlists
@@ -354,20 +347,6 @@ kde4-meta_create_extractlists() {
 				config-openexr.h.cmake
 				config-opengl.h.cmake
 				config-prefix.h.cmake"
-			case ${PN} in
-				koffice-libs|koffice-data)
-					;;
-				*)
-					# add basic extract for all packages
-					KMEXTRACTONLY="${KMEXTRACTONLY}
-						filters/
-						libs/
-						plugins/"
-					if [[ ${PN} != kplato ]]; then
-						KMEXTRA="${KMEXTRA} filters/${PN}"
-					fi
-					;;
-			esac
 			;;
 	esac
 	# Don't install cmake modules for split ebuilds, to avoid collisions.
@@ -572,6 +551,16 @@ kde4-meta_change_cmakelists() {
 				;;
 			esac
 			;;
+		koffice)
+			# prevent collisions
+			if [[ ${PN} != koffice-data ]]; then
+				sed -i -e '/install(.*FindKOfficeLibs.cmake/,/)/ d' \
+					"${S}"/cmake/modules/CMakeLists.txt || \
+					die "${LINENO}: sed died in collision prevention section"
+				sed -i -n -e '1h;1!H;${g;s/install(.\+config-openexr.h.\+)//;p}' \
+					"${S}"/CMakeLists.txt || \
+					die "${LINENO}: sed died in collision prevention section"
+			fi
 	esac
 
 	popd > /dev/null
@@ -583,7 +572,7 @@ kde4-meta_change_cmakelists() {
 # ebuilds.
 kde4-meta_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
-
+	
 	kde4-base_src_configure
 }
 
@@ -619,12 +608,6 @@ kde4-meta_src_install() {
 	if [[ -n ${KMSAVELIBS} ]]; then
 		install_library_dependencies
 	fi
-
-	# remove unvanted koffice stuff
-	if [[ ${KMNAME} = koffice && ${PN} != koffice-data ]]; then
-		rm "$D/$KDEDIR/include/config-openexr.h"
-		rm "$D/$KDEDIR/share/apps/cmake/modules/FindKOfficeLibs.cmake"
-	fi
 }
 
 # @FUNCTION: kde4-meta_src_make_doc