1 files changed, 25 insertions, 15 deletions

diff --git a/kde-apps/kdepim-l10n/kdepim-l10n-16.08.3.ebuild b/kde-apps/kdepim-l10n/kdepim-l10n-16.08.3.ebuild
index 42970eaa7179..9a572c14caf4 100644
--- a/kde-apps/kdepim-l10n/kdepim-l10n-16.08.3.ebuild
+++ b/kde-apps/kdepim-l10n/kdepim-l10n-16.08.3.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 KDE_HANDBOOK="optional"
 KDE_L10N=(
 	ar ast bg bs ca ca-valencia cs da de el en-GB eo es et eu fa fi fr ga gl he
-	hi hr hu ia id is it ja kk km ko lt lv mr nb nds nl nn pa pl pt pt-BR ro ru
+	hi hr hu ia is it ja kk km ko lt lv mr nb nds nl nn pa pl pt pt-BR ro ru
 	sk sl sr sr-ijekavsk sr-Latn sr-Latn-ijekavsk sv tr ug uk wa zh-CN zh-TW
 )
 KMNAME="kde-l10n"
@@ -49,31 +49,41 @@ src_prepare() {
 	# Handbook optional
 	find -type f -name CMakeLists.txt -exec \
 		sed -i -e "/find_package.*KF5DocTools/ s/ REQUIRED//" {} + || die
-	if ! use handbook ; then
-		find -mindepth 4 -maxdepth 4 -type f -name CMakeLists.txt -exec \
-			sed -i -e '/add_subdirectory(docs)/ s/^/#DONT/' {} + || die
-	fi
+	# Disable all by default, pim dirs are added manually if found
+	find -mindepth 4 -maxdepth 4 -type f -name CMakeLists.txt -exec \
+		sed -i -e '/^add_subdirectory/ s/^/#ONLYPIM/' {} + || die
 
 	# Remove everything except kdepim, kdepimlibs, kdepim-runtime and pim
 	for lng in ${KDE_L10N[@]}; do
-		local dir sdir
-		dir="kde-l10n-$(kde_l10n2lingua ${lng})-${PV}"
-		sdir="${S}/${dir}/5/$(kde_l10n2lingua ${lng})"
-		if [[ -d "${dir}" ]] ; then
-			einfo " L10N: ${lng}"
+		local sdir="${S}/kde-l10n-$(kde_l10n2lingua ${lng})-${PV}/5/$(kde_l10n2lingua ${lng})"
+		if [[ -d "${sdir}" ]] ; then
+			local gotpim=false
+			einfo "L10N: ${lng}"
 
 			for subdir in data docs messages scripts ; do
 				if [[ -d "${sdir}/${subdir}" ]] ; then
-					einfo "   ${subdir} subdirectory"
-					echo > "${sdir}/${subdir}/CMakeLists.txt"
+					rm "${sdir}/${subdir}/CMakeLists.txt" || die
+					local pim
 					for pim in ${PIM_L10N}; do
-						[[ -d "${sdir}/${subdir}/${pim}" ]] && \
-							( echo "add_subdirectory(${pim})" >> "${sdir}/${subdir}/CMakeLists.txt" )
+						if [[ -d "${sdir}/${subdir}/${pim}" ]]; then
+							echo "add_subdirectory(${subdir}/${pim})" >> "${sdir}/CMakeLists.txt"
+							gotpim=true
+						fi
 					done
 				fi
 			done
+			if ! ${gotpim}; then
+				einfo "F: ${lng} contains no KDE PIM translations and should be dropped"
+				sed -e "/kde-l10n-$(kde_l10n2lingua ${lng})-${PV}/ s/^/#WRONG/" \
+					-i CMakeLists.txt || die "Failed to disable no-op ${lng}"
+			fi
 		fi
 	done
+
+	if ! use handbook ; then
+		find -mindepth 4 -maxdepth 4 -type f -name CMakeLists.txt -exec \
+			sed -i -e '/^add_subdirectory(docs/ s/^/#DONT/' {} + || die
+	fi
 }
 
 src_configure() {
@@ -89,5 +99,5 @@ src_test() {
 }
 
 src_install() {
-	[[ -n ${A} ]] && kde5_src_install
+	[[ $(grep -sc "^add" CMakeLists.txt) -gt 0 ]] && kde5_src_install
 }