Eclass updates - drop kdepimlibs

2 files changed, 108 insertions, 49 deletions

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 881d23b1857..ca10ae76d70 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -35,9 +35,14 @@ kde4-base_set_qt_dependencies() {
 		x11-libs/qt-script:4
 		x11-libs/qt-sql:4[qt3support]
 		x11-libs/qt-svg:4
-		x11-libs/qt-test:4"
-	qtwebkitdepend="x11-libs/qt-webkit:4"
-	qtopengldepend="x11-libs/qt-opengl:4"
+		x11-libs/qt-test:4
+	"
+	qtwebkitdepend="
+		x11-libs/qt-webkit:4
+	"
+	qtopengldepend="
+		x11-libs/qt-opengl:4
+	"
 
 	case ${WEBKIT_REQUIRED} in
 		always)
@@ -55,12 +60,14 @@ kde4-base_set_qt_dependencies() {
 	case ${OPENGL_REQUIRED} in
 		always)
 			qtdepend="${qtdepend}
-				${qtopengldepend}"
+				${qtopengldepend}
+			"
 			;;
 		optional)
 			IUSE="${IUSE} opengl"
 			qtdepend="${qtdepend}
-				opengl? ( ${qtopengldepend} )"
+				opengl? ( ${qtopengldepend} )
+			"
 			;;
 		*) OPENGL_REQUIRED="never" ;;
 	esac
@@ -81,7 +88,7 @@ COMMONDEPEND="${COMMONDEPEND}
 	x11-libs/libXxf86vm
 "
 
-# localization deps
+# localization deps 
 # DISABLED UNTIL PMS decide correct approach :(
 if [[ -n ${KDE_LINGUAS} ]]; then
 	LNG_DEP=""
@@ -131,12 +138,15 @@ CPPUNIT_REQUIRED="${CPPUNIT_REQUIRED:-never}"
 
 case ${CPPUNIT_REQUIRED} in
 	always)
-		DEPEND="${DEPEND} dev-util/cppunit"
+		DEPEND="${DEPEND}
+			dev-util/cppunit
+		"
 		;;
 	optional)
 		IUSE="${IUSE} test"
 		DEPEND="${DEPEND}
-			test? ( dev-util/cppunit )"
+			test? ( dev-util/cppunit )
+		"
 		;;
 	*)
 		CPPUNIT_REQUIRED="never"
@@ -338,33 +348,29 @@ if [[ ${NEED_KDE} != none ]]; then
 		# we do this only if we do not depend on any version of kde
 		if [[ ${SLOT} != ${KDE_SLOT} ]]; then
 			DEPEND="${DEPEND}
-				!kdeprefix? ( !kde-base/${PN}:${KDE_SLOT}[-kdeprefix] )"
+				!kdeprefix? ( !kde-base/${PN}:${KDE_SLOT}[-kdeprefix] )
+			"
 			RDEPEND="${RDEPEND}
-				!kdeprefix? ( !kde-base/${PN}:${KDE_SLOT}[-kdeprefix] )"
+				!kdeprefix? ( !kde-base/${PN}:${KDE_SLOT}[-kdeprefix] )
+			"
 		fi
 	done
 
-	# Adding kdelibs, kdepimlibs and kdebase-data deps to all other packages.
-	# We only need to add the dependencies if ${PN} is not "kdelibs" or "kdepimlibs"
+	# Adding kdelibs and kdebase-data deps to all other packages.
 	if [[ ${PN} != kdelibs ]]; then
 		DEPEND="${DEPEND}
-				kdeprefix? ( ${_operator}kde-base/kdelibs${_pv}[kdeprefix] )
-				!kdeprefix? ( ${_operator}kde-base/kdelibs${_pvn}[-kdeprefix] )"
+			kdeprefix? ( ${_operator}kde-base/kdelibs${_pv}[kdeprefix] )
+			!kdeprefix? ( ${_operator}kde-base/kdelibs${_pvn}[-kdeprefix] )
+		"
 		RDEPEND="${RDEPEND}
-				kdeprefix? ( ${_operator}kde-base/kdelibs${_pv}[kdeprefix] )
-				!kdeprefix? ( ${_operator}kde-base/kdelibs${_pvn}[-kdeprefix] )"
-		if [[ ${PN} != kdepimlibs ]]; then
-			DEPEND="${DEPEND}
-				kdeprefix? ( ${_operator}kde-base/kdepimlibs${_pv}[kdeprefix] )
-				!kdeprefix? ( ${_operator}kde-base/kdepimlibs${_pvn}[-kdeprefix] )"
+			kdeprefix? ( ${_operator}kde-base/kdelibs${_pv}[kdeprefix] )
+			!kdeprefix? ( ${_operator}kde-base/kdelibs${_pvn}[-kdeprefix] )
+		"
+		if [[ ${PN} != kdepimlibs && ${PN} != kdebase-data ]]; then
 			RDEPEND="${RDEPEND}
-				kdeprefix? ( ${_operator}kde-base/kdepimlibs${_pv}[kdeprefix] )
-				!kdeprefix? ( ${_operator}kde-base/kdepimlibs${_pvn}[-kdeprefix] )"
-			if [[ ${PN} != kdebase-data ]]; then
-				RDEPEND="${RDEPEND}
-					kdeprefix? ( ${_operator}kde-base/kdebase-data${_pv}[kdeprefix] )
-					!kdeprefix? ( ${_operator}kde-base/kdebase-data${_pvn}[-kdeprefix] )"
-			fi
+				kdeprefix? ( ${_operator}kde-base/kdebase-data${_pv}[kdeprefix] )
+				!kdeprefix? ( ${_operator}kde-base/kdebase-data${_pvn}[-kdeprefix] )
+			"
 		fi
 	fi
 	unset _operator _pv _pvn
@@ -527,7 +533,7 @@ kde4-base_src_prepare() {
 		enable_selected_linguas
 	fi
 
-	base_src_prepare
+	cmake-utils_src_prepare
 
 	# Save library dependencies
 	if [[ -n ${KMSAVELIBS} ]] ; then
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index 897f6584b75..c8104731486 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -33,59 +33,106 @@ esac
 
 # Add dependencies that all packages in a certain module share.
 case ${KMNAME} in
-	kdebase|kdebase-workspace|kdebase-runtime)
-		DEPEND="${DEPEND} >=kde-base/qimageblitz-0.0.4"
-		RDEPEND="${RDEPEND} >=kde-base/qimageblitz-0.0.4"
+	kdebase|kdebase-{apps,workspace,runtime})
+		DEPEND="${DEPEND}
+			>=kde-base/qimageblitz-0.0.4
+		"
+		RDEPEND="${RDEPEND}
+			>=kde-base/qimageblitz-0.0.4
+		"
+		;;
+	kdenetwork)
+		DEPEND="${DEPEND}
+			>=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=]
+		"
+		RDEPEND="${RDEPEND}
+			>=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=]
+		"
 		;;
 	kdepim)
-		DEPEND="${DEPEND} dev-libs/boost app-office/akonadi-server"
-		RDEPEND="${RDEPEND} dev-libs/boost"
+		DEPEND="${DEPEND}
+			dev-libs/boost
+			>=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=]
+		"
+		RDEPEND="${RDEPEND}
+			dev-libs/boost
+			>=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=]
+		"
 		if [[ ${PN} != kode ]]; then
-			DEPEND="${DEPEND} >=kde-base/kode-${PV}:${SLOT}[kdeprefix=]"
-			RDEPEND="${RDEPEND} >=kde-base/kode-${PV}:${SLOT}[kdeprefix=]"
+			DEPEND="${DEPEND}
+				>=kde-base/kode-${PV}:${SLOT}[kdeprefix=]
+			"
+			RDEPEND="${RDEPEND}
+				>=kde-base/kode-${PV}:${SLOT}[kdeprefix=]
+			"
 		fi
 		case ${PN} in
 			akregator|kaddressbook|kjots|kmail|kmobiletools|knode|knotes|korganizer|ktimetracker)
 				IUSE="+kontact"
-				DEPEND="${DEPEND} kontact? ( >=kde-base/kontactinterfaces-${PV}:${SLOT}[kdeprefix=] )"
-				RDEPEND="${RDEPEND} kontact? ( >=kde-base/kontactinterfaces-${PV}:${SLOT}[kdeprefix=] )"
+				DEPEND="${DEPEND}
+					kontact? ( >=kde-base/kontactinterfaces-${PV}:${SLOT}[kdeprefix=] )
+				"
+				RDEPEND="${RDEPEND}
+					kontact? ( >=kde-base/kontactinterfaces-${PV}:${SLOT}[kdeprefix=] )
+				"
 				;;
 		esac
 		;;
 	kdegames)
 		if [[ ${PN} != libkdegames ]]; then
-			DEPEND="${DEPEND} >=kde-base/libkdegames-${PV}:${SLOT}[kdeprefix=]"
-			RDEPEND="${RDEPEND} >=kde-base/libkdegames-${PV}:${SLOT}[kdeprefix=]"
+			DEPEND="${DEPEND}
+				>=kde-base/libkdegames-${PV}:${SLOT}[kdeprefix=]
+			"
+			RDEPEND="${RDEPEND}
+				>=kde-base/libkdegames-${PV}:${SLOT}[kdeprefix=]
+			"
 		fi
 		;;
 	koffice)
 		[[ ${PN} != koffice-data ]] && IUSE="debug"
 		case ${PV} in
-			9999*) DEPEND="${DEPEND} !app-office/${PN}:2" ;;
-			1.9*|2*) DEPEND="${DEPEND} !app-office/${PN}:live" ;;
+			9999*)
+				DEPEND="${DEPEND}
+					!app-office/${PN}:2
+				"
+				;;
+			1.9*|2*)
+				DEPEND="${DEPEND}
+					!app-office/${PN}:live
+				"
+				;;
 		esac
 		DEPEND="${DEPEND}
 			!app-office/${PN}:0
 			!app-office/koffice:0
-			!app-office/koffice-meta:0"
+			!app-office/koffice-meta:0
+		"
 		case ${PN} in
 			koffice-data)
-				DEPEND="${DEPEND} media-libs/lcms"
-				RDEPEND="${RDEPEND} media-libs/lcms"
+				DEPEND="${DEPEND}
+					media-libs/lcms
+				"
+				RDEPEND="${RDEPEND}
+					media-libs/lcms
+				"
 				;;
 			*)
-				DEPEND="${DEPEND}
+				COMMON_DEPEND="
 					dev-cpp/eigen:2
 					media-gfx/imagemagick[openexr?]
 					media-libs/fontconfig
 					media-libs/freetype:2
 				"
-				RDEPEND="${DEPEND}"
+				DEPEND="${DEPEND} ${COMMON_DEPEND}"
+				RDEPEND="${RDEPEND} ${COMMON_DEPEND}"
+				unset COMMON_DEPEND
 				if [[ ${PN} != koffice-libs && ${PN} != koffice-data ]]; then
 					DEPEND="${DEPEND}
-					>=app-office/koffice-libs-${PV}:${SLOT}[kdeprefix=]"
+						>=app-office/koffice-libs-${PV}:${SLOT}[kdeprefix=]
+					"
 					RDEPEND="${RDEPEND}
-					>=app-office/koffice-libs-${PV}:${SLOT}[kdeprefix=]"
+						>=app-office/koffice-libs-${PV}:${SLOT}[kdeprefix=]
+					"
 				fi
 				;;
 		esac
@@ -247,10 +294,16 @@ kde4-meta_src_extract() {
 
 		kde4-meta_create_extractlists
 
+		# Go one level deeper for kdebase-apps in tarballs (releases)
+		if [[ ${KMNAME} == kdebase-apps && ${BUILD_TYPE} == release ]]; then
+			moduleprefix=apps/
+			KMTARPARAMS="${KMTARPARAMS} --transform=s|apps/||"
+		fi
+
 		for f in cmake/ CMakeLists.txt ConfigureChecks.cmake config.h.cmake \
 			AUTHORS COPYING INSTALL README NEWS ChangeLog
 		do
-			extractlist="${extractlist} ${KMNAME}-${PV}/${f}"
+			extractlist="${extractlist} ${KMNAME}-${PV}/${moduleprefix}${f}"
 		done
 		extractlist="${extractlist} $(__list_needed_subdirectories)"
 		KMTARPARAMS="${KMTARPARAMS} -j"