[eclass/kde4-meta, kopete] Move kdepimlibs dependency from kdenetwork where it blongs (kopete)

5 files changed, 41 insertions, 36 deletions

diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index 37757a918d8..8707062ec15 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -30,9 +30,6 @@ case ${KMNAME} in
 	kdebase|kdebase-apps|kdebase-workspace|kdebase-runtime|kdegraphics)
 		COMMONDEPEND+=" >=kde-base/qimageblitz-0.0.4"
 		;;
-	kdenetwork)
-		COMMONDEPEND+=" $(add_kdebase_dep kdepimlibs)"
-		;;
 	kdepim|kdepim-runtime)
 		COMMONDEPEND+="
 			dev-libs/boost
@@ -508,16 +505,17 @@ kde4-meta_change_cmakelists() {
 	comment_all_add_subdirectory ./
 
 	# Restore "add_subdirectory( cmake )" in ${S}/CMakeLists.txt
-	if [[ -f "${S}"/CMakeLists.txt ]]; then
+	if [[ -f CMakeLists.txt ]]; then
 		sed -e '/add_subdirectory[[:space:]]*([[:space:]]*cmake[[:space:]]*)/s/^#DONOTCOMPILE //' \
 			-e '/ADD_SUBDIRECTORY[[:space:]]*([[:space:]]*cmake[[:space:]]*)/s/^#DONOTCOMPILE //' \
-			-i "${S}"/CMakeLists.txt || die "${LINENO}: cmake sed died"
+			-i CMakeLists.txt || die "${LINENO}: cmake sed died"
 	fi
 
 	if [[ -z ${KMNOMODULE} ]]; then
 		# Restore "add_subdirectory" in $KMMODULE subdirectories
-		find "${S}"/${KMMODULE} -name CMakeLists.txt -print0 | xargs -0 sed -i -e 's/^#DONOTCOMPILE //g' || \
-			die "${LINENO}: died in KMMODULE section"
+		find "${S}"/${KMMODULE} -name CMakeLists.txt -print0 | \
+			xargs -0 sed -i -e 's/^#DONOTCOMPILE //g' || \
+				die "${LINENO}: died in KMMODULE section"
 		_change_cmakelists_parent_dirs ${KMMODULE}
 	fi
 
@@ -525,8 +523,9 @@ kde4-meta_change_cmakelists() {
 
 	# KMEXTRACTONLY section - Some ebuilds need to comment out some subdirs in KMMODULE and they use KMEXTRACTONLY
 	for i in ${KMEXTRACTONLY}; do
-		if [[ -d "${S}"/${i} && -f "${S}"/${i}/../CMakeLists.txt ]]; then
-			sed -i -e "/([[:space:]]*$(basename $i)[[:space:]]*)/s/^/#DONOTCOMPILE /" "${S}"/${i}/../CMakeLists.txt || \
+		if [[ -d ${i} && -f ${i}/../CMakeLists.txt ]]; then
+			sed -e "/([[:space:]]*$(basename $i)[[:space:]]*)/s/^/#DONOTCOMPILE /" \
+				-i ${i}/../CMakeLists.txt || \
 				die "${LINENO}: sed died while working in the KMEXTRACTONLY section while processing ${i}"
 		fi
 	done
@@ -558,7 +557,7 @@ kde4-meta_change_cmakelists() {
 		if [[ -d "${S}"/${i} ]]; then
 			find "${S}"/${i} -name CMakeLists.txt -print0 | \
 				xargs -0 sed -i -e 's/^#DONOTCOMPILE //g' || \
-				die "${LINENO}: sed died uncommenting add_subdirectory instructions in KMEXTRA section while processing ${i}"
+					die "${LINENO}: sed died uncommenting add_subdirectory instructions in KMEXTRA section while processing ${i}"
 			_change_cmakelists_parent_dirs ${i}
 		fi
 	done
@@ -568,31 +567,36 @@ kde4-meta_change_cmakelists() {
 			# COLLISION PROTECT section
 			# Install the startkde script just once, as a part of kde-base/kdebase-startkde,
 			# not as a part of every package.
-			if [[ ${PN} != kdebase-startkde && -f "${S}"/CMakeLists.txt ]]; then
+			if [[ ${PN} != kdebase-startkde && -f CMakeLists.txt ]]; then
 				# The startkde script moved to kdebase-workspace for KDE4 versions > 3.93.0.
-				sed -i -e '/startkde/s/^/#DONOTINSTALL /' "${S}"/CMakeLists.txt || \
-					die "${LINENO}: sed died in the kdebase-startkde collision prevention section"
+				sed -e '/startkde/s/^/#DONOTINSTALL /' \
+					-i CMakeLists.txt || die "${LINENO}: sed died in the kdebase-startkde collision prevention section"
 			fi
 			# Strip EXPORT feature section from workspace for KDE4 versions > 4.1.82
 			if [[ ${PN} != libkworkspace ]]; then
-				sed -i \
-					-e '/install(FILES ${CMAKE_CURRENT_BINARY_DIR}\/KDE4WorkspaceConfig.cmake/,/^[[:space:]]*FILE KDE4WorkspaceLibraryTargets.cmake )[[:space:]]*^/d' \
-					CMakeLists.txt || die "${LINENO}: sed died in kdebase-workspace strip config install and fix EXPORT section"
+				sed -e '/install(FILES ${CMAKE_CURRENT_BINARY_DIR}\/KDE4WorkspaceConfig.cmake/,/^[[:space:]]*FILE KDE4WorkspaceLibraryTargets.cmake )[[:space:]]*^/d' \
+					-i CMakeLists.txt || die "${LINENO}: sed died in kdebase-workspace strip config install and fix EXPORT section"
 			fi
 			;;
 		kdebase-runtime)
 			# COLLISION PROTECT section
 			# Only install the kde4 script as part of kde-base/kdebase-data
-			if [[ ${PN} != kdebase-data && -f "${S}"/CMakeLists.txt ]]; then
-				sed -i -e '/^install(PROGRAMS[[:space:]]*[^[:space:]]*\/kde4[[:space:]]/s/^/#DONOTINSTALL /' \
-					"${S}"/CMakeLists.txt || die "Sed to exclude bin/kde4 failed"
+			if [[ ${PN} != kdebase-data && -f CMakeLists.txt ]]; then
+				sed -e '/^install(PROGRAMS[[:space:]]*[^[:space:]]*\/kde4[[:space:]]/s/^/#DONOTINSTALL /' \
+					-i CMakeLists.txt || die "Sed to exclude bin/kde4 failed"
 			fi
 			;;
+		kdenetwork)
+			# Disable hardcoded kdepimlibs check
+			sed -e 's/find_package(KdepimLibs REQUIRED)/macro_optional_find_package(KdepimLibs)/' \
+				-i CMakeLists.txt || die "failed to disable hardcoded checks"
+			;;
 		kdepim)
 			case ${PN} in
 				kaddressbook|kalarm|kmailcvt|kontact|korganizer|korn)
-					sed -i -n -e '/qt4_generate_dbus_interface(.*org\.kde\.kmail\.\(kmail\|mailcomposer\)\.xml/p' \
-						-e '/add_custom_target(kmail_xml /,/)/p' "${S}"/kmail/CMakeLists.txt || die "uncommenting xml failed"
+					sed -n -e '/qt4_generate_dbus_interface(.*org\.kde\.kmail\.\(kmail\|mailcomposer\)\.xml/p' \
+						-e '/add_custom_target(kmail_xml /,/)/p' \
+						-i kmail/CMakeLists.txt || die "uncommenting xml failed"
 					_change_cmakelists_parent_dirs kmail
 				;;
 			esac
@@ -608,12 +612,10 @@ kde4-meta_change_cmakelists() {
 		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 -e '/install(.\+config-openexr\.h.\+)/d' \
-					"${S}"//CMakeLists.txt || \
-					die "${LINENO}: sed died in collision prevention section"
+				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
 
diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index cc33931fe1d..e9eb408dcf0 100644
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -1,5 +1,5 @@
 DIST kdenetwork-4.3.72.tar.lzma 6475613 RMD160 a7cc1517898ef97e783dbc339a78d5f3d2e4713e SHA1 9be97fe13c3a2180784a870254c27a0608309211 SHA256 91af74c6f472fb0721651a4c50fff85279e4db8ae2309d3c4d117bc0419507d8
-EBUILD kopete-4.3.72.ebuild 3470 RMD160 e1d36ba4725d078ad4817b7ff7c2cc983d859934 SHA1 3fa4df3ca391741d95a178fda353f3ea30367b01 SHA256 974ca794252b5a37192fc369d08f045f3f75cdc71dc517cc79520277fe814d61
-EBUILD kopete-4.3.9999.ebuild 3265 RMD160 c9ea7d89b35712777d75084f33afe27b4f3583b2 SHA1 7fb513c73e83607971647b451368494f3c359395 SHA256 faa0e688dedf4ef3d536453b834cffd19e9cd6bef409926214a8110edcae6cda
-EBUILD kopete-9999.ebuild 3428 RMD160 2b767688ca4d696f2be03e23a319feae7ae398ae SHA1 62d4c3adb31aa00c1bd1146d31084c1b02802056 SHA256 473c791577f117e120dbb26c780ab4018d25994f96627dbea64d1185b5306f65
+EBUILD kopete-4.3.72.ebuild 3506 RMD160 2c48ac4845e4cc16b6add3148176c2c6cb6bf294 SHA1 73cb08ee8b5180b1736fb912b5777e4a53d389ca SHA256 3e285d6c8a8d0dc461be349bc61511de2fadfb02b8f82c0d3794d3f10f778682
+EBUILD kopete-4.3.9999.ebuild 3314 RMD160 2264e67cab627946b1ca33a9ea79ab4142ce7d6f SHA1 05aa04288e6b7c3c3a9c588613860cb7842f3780 SHA256 ac22bf30595ca8aab5590cb928e8d159eae0305e2523b83113d17e43cb5743cd
+EBUILD kopete-9999.ebuild 3464 RMD160 d147c7040210be0a82206d2d81ec7e97f45a3bd3 SHA1 2f31ca3269cc25b51a1377c2b4f9d7ab86b2f5a5 SHA256 3ccd1857dd873ddfff8d63ed8390eda1de7d8971884cae43ce49151adaa83c67
 MISC metadata.xml 3000 RMD160 56660131dcebe0af38f1af65fbbea4ac12fcdf92 SHA1 0f4dc92f99609e184747a20c1a7d315e3978104e SHA256 22d7ac3e1ddc57b6a7875630f946328c12e77da51b207c6203eefc8a588d3296
diff --git a/kde-base/kopete/kopete-4.3.72.ebuild b/kde-base/kopete/kopete-4.3.72.ebuild
index 1d19ea7afe9..f6d24efd389 100644
--- a/kde-base/kopete/kopete-4.3.72.ebuild
+++ b/kde-base/kopete/kopete-4.3.72.ebuild
@@ -65,6 +65,7 @@ IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
 COMMONDEPEND="
 	dev-libs/libpcre
+	$(add_kdebase_dep kdepimlibs)
 	x11-libs/libXScrnSaver
 	>=x11-libs/qt-gui-4.4.0:4[mng]
 	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
@@ -96,12 +97,12 @@ PDEPEND="
 "
 
 src_prepare() {
-	sed -i "s:lib/mozilla:$(get_libdir)/mozilla:" kopete/protocols/skype/skypebuttons/CMakeLists.txt || die "sed failed"
-	
+	sed -e "s:lib/mozilla:$(get_libdir)/mozilla:" \
+		-i kopete/protocols/skype/skypebuttons/CMakeLists.txt || die "sed failed"
+
 	kde4-meta_src_prepare
 }
 
-
 src_configure() {
 	local x x2
 	# Disable old msn support.
diff --git a/kde-base/kopete/kopete-4.3.9999.ebuild b/kde-base/kopete/kopete-4.3.9999.ebuild
index b1e3ddc3f1c..e7653813953 100644
--- a/kde-base/kopete/kopete-4.3.9999.ebuild
+++ b/kde-base/kopete/kopete-4.3.9999.ebuild
@@ -65,6 +65,7 @@ IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
 COMMONDEPEND="
 	dev-libs/libpcre
+	>=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=]
 	x11-libs/libXScrnSaver
 	>=x11-libs/qt-gui-4.4.0:4[mng]
 	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
diff --git a/kde-base/kopete/kopete-9999.ebuild b/kde-base/kopete/kopete-9999.ebuild
index 1dcdaf183dc..2189800a665 100644
--- a/kde-base/kopete/kopete-9999.ebuild
+++ b/kde-base/kopete/kopete-9999.ebuild
@@ -65,6 +65,7 @@ IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
 COMMONDEPEND="
 	dev-libs/libpcre
+	$(add_kdebase_dep kdepimlibs)
 	x11-libs/libXScrnSaver
 	>=x11-libs/qt-gui-4.4.0:4[mng]
 	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
@@ -96,12 +97,12 @@ PDEPEND="
 "
 
 src_prepare() {
-	sed -i "s:lib/mozilla:$(get_libdir)/mozilla:" kopete/protocols/skype/skypebuttons/CMakeLists.txt || die "sed failed"
-	
+	sed -e "s:lib/mozilla:$(get_libdir)/mozilla:" \
+		-i kopete/protocols/skype/skypebuttons/CMakeLists.txt || die "sed failed"
+
 	kde4-meta_src_prepare
 }
 
-
 src_configure() {
 	local x x2
 	# Disable old msn support.