Eclass updates:

- reordered mycmakeargs - ebuild -> kde4-meta -> kde4-base
- applied some automagic deps prevention in kdewebdev

2 files changed, 28 insertions, 5 deletions

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index ea46411ccf5..45a9d828ca3 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -462,13 +462,13 @@ kde4-base_src_configure() {
 	fi
 
 	# Build tests in src_test only, where we override this value
-	mycmakeargs="${mycmakeargs} -DKDE4_BUILD_TESTS=OFF"
+	local cmakeargs="-DKDE4_BUILD_TESTS=OFF"
 
 	# Set distribution name
-	[[ ${PN} = kdelibs ]] && mycmakeargs="${mycmakeargs} -DKDE_DISTRIBUTION_TEXT=Gentoo"
+	[[ ${PN} = kdelibs ]] && cmakeargs="${cmakeargs} -DKDE_DISTRIBUTION_TEXT=Gentoo"
 
 	# Here we set the install prefix
-	mycmakeargs="${mycmakeargs} -DCMAKE_INSTALL_PREFIX=${PREFIX}"
+	cmakeargs="${cmakeargs} -DCMAKE_INSTALL_PREFIX=${PREFIX}"
 
 	# Set environment
 	QTEST_COLORED=1
@@ -490,12 +490,14 @@ kde4-base_src_configure() {
 	if has kdeprefix ${IUSE//+} && use kdeprefix; then
 		# Set cmake prefixes to allow buildsystem to localize valid KDE installation
 		# when more are present
-		mycmakeargs="${mycmakeargs} -DCMAKE_SYSTEM_PREFIX_PATH=${KDEDIR}"
+		cmakeargs="${cmakeargs} -DCMAKE_SYSTEM_PREFIX_PATH=${KDEDIR}"
 	else
 		# If prefix is /usr, sysconf needs to be /etc, not /usr/etc
-		mycmakeargs="${mycmakeargs} -DSYSCONF_INSTALL_DIR=/etc"
+		cmakeargs="${cmakeargs} -DSYSCONF_INSTALL_DIR=/etc"
 	fi
 
+	mycmakeargs="${cmakeargs} ${mycmakeargs}"
+
 	cmake-utils_src_configure
 }
 
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index a34d5b980ac..7294d1f11d3 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -588,6 +588,14 @@ kde4-meta_change_cmakelists() {
 				;;
 			esac
 			;;
+		kdewebdev)
+			# Disable hardcoded kdepimlibs check
+			sed -e 's/find_package(KdepimLibs REQUIRED)/macro_optional_find_package(KdepimLibs)/' \
+				-e 's/find_package(LibXml2 REQUIRED)/macro_optional_find_package(LibXml2 REQUIRED)/' \
+				-e 's/find_package(LibXslt REQUIRED)/macro_optional_find_package(LibXslt REQUIRED)/' \
+				-e 's/find_package(Boost REQUIRED)/macro_optional_find_package(Boost REQUIRED)/' \
+				-i CMakeLists.txt || die "failed to disable hardcoded checks"
+			;;
 		koffice)
 			# prevent collisions
 			if [[ ${PN} != koffice-data ]]; then
@@ -610,6 +618,19 @@ kde4-meta_change_cmakelists() {
 kde4-meta_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
 
+	# Set some cmake default values here (usually workarounds for automagic deps)
+	case ${KMNAME} in
+		kdewebdev)
+			mycmakeargs="
+				-DWITH_KdepimLibs=OFF
+				-DWITH_LibXml2=OFF
+				-DWITH_LibXslt=OFF
+				-DWITH_Boost=OFF
+				-DWITH_LibTidy=OFF
+				${mycmakeargs}"
+			;;
+	esac
+
 	kde4-base_src_configure
 }