kde-apps/kde4-l10n: Drop REMOVE_MSGS file, block old Plasma instead

Package-Manager: Portage-2.3.6, Repoman-2.3.3

2 files changed, 4 insertions, 59 deletions

diff --git a/kde-apps/kde4-l10n/files/kde4-l10n-17.04.3-remove-messages b/kde-apps/kde4-l10n/files/kde4-l10n-17.04.3-remove-messages
deleted file mode 100644
index 8328a74e813..00000000000
--- a/kde-apps/kde4-l10n/files/kde4-l10n-17.04.3-remove-messages
+++ /dev/null
@@ -1,36 +0,0 @@
-# Remove any path listed here. Comments are ignored
-# KDE SDK 4
-kdesdk/umbrello.po
-
-# plasma-desktop - fixed in: 5.10.0
-# KDELIBS 4
-kdelibs/kcm_baloofile.po
-# KDE Runtime 4
-kde-runtime/attica_kde.po
-kde-runtime/kcm_device_automounter.po
-kde-runtime/kcm_emoticons.po
-kde-runtime/kcm_phonon.po
-kde-runtime/kcmicons.po
-kde-runtime/kcmkded.po
-kde-runtime/kcmnotify.po
-kde-runtime/kcmcomponentchooser.po
-kde-runtime/knetattach.po
-
-# plasma-workspace - fixed in: 5.10.0
-# KDELIBS 4
-kdelibs/plasma_runner_baloosearchrunner.po
-# KDE Runtime 4
-kde-runtime/drkonqi.po
-kde-runtime/kio_applications.po
-kde-runtime/phonon_kde.po
-kde-runtime/soliduiserver.po
-
-# kde-cli-tools - fixed in: 5.10.0
-# KDE Runtime 4
-kde-runtime/filetypes.po
-kde-runtime/kcmshell.po
-kde-runtime/kmimetypefinder.po
-kde-runtime/kdesu.po
-kde-runtime/kioclient.po
-kde-runtime/kstart.po
-kde-runtime/ktraderclient.po
diff --git a/kde-apps/kde4-l10n/kde4-l10n-17.08.0.ebuild b/kde-apps/kde4-l10n/kde4-l10n-17.08.0.ebuild
index ac3f3b36abd..142d8847a54 100644
--- a/kde-apps/kde4-l10n/kde4-l10n-17.08.0.ebuild
+++ b/kde-apps/kde4-l10n/kde4-l10n-17.08.0.ebuild
@@ -52,14 +52,16 @@ RDEPEND="
 	!kde-apps/kde-l10n:5
 	!<kde-apps/khelpcenter-17.04.1:5
 	!<kde-apps/kio-extras-17.04.1:5
+	!<kde-apps/umbrello-17.08.0:5
 	!<kde-frameworks/baloo-5.34.0:5
 	!<kde-frameworks/baloo-widgets-5.34.0:5
 	!<kde-frameworks/kfilemetadata-5.34.0:5
-	!<kde-plasma/plasma-workspace-5.9.5.1-r1:5
+	!<kde-plasma/kde-cli-tools-5.10.0:5
+	!<kde-plasma/plasma-desktop-5.10.0:5
+	!<kde-plasma/plasma-workspace-5.10.0:5
 "
 
 REMOVE_DIRS="${FILESDIR}/${PN}-16.12.3-remove-dirs"
-REMOVE_MSGS="${FILESDIR}/${PN}-17.04.3-remove-messages"
 
 IUSE="test $(printf 'l10n_%s ' ${KDE_L10N[@]})"
 
@@ -115,7 +117,6 @@ src_prepare() {
 
 	einfo "Removing file collisions with Plasma 5 and Applications"
 	[[ -f ${REMOVE_DIRS} ]] || die "Error: ${REMOVE_DIRS} not found!"
-	[[ -f ${REMOVE_MSGS} ]] || die "Error: ${REMOVE_MSGS} not found!"
 
 	use test && einfo "Tests enabled: Listing LINGUAS causing file collisions"
 
@@ -140,26 +141,6 @@ src_prepare() {
 			einfo "F: ${path}"	# run with L10N="*" to cut down list
 		fi
 	done < <(grep -ve "^$\|^\s*\#" "${REMOVE_DIRS}")
-	einfo
-	einfo "Messages..."
-	while read path; do
-		if use test ; then	# build a report w/ L10N="*" to submit @upstream
-			local lngs
-			for lng in $(kde_l10n2lingua ${KDE_L10N[@]}); do
-				SDIR="${S}/${KMNAME}-${lng}-${PV}/4/${lng}"
-				if [[ -e "${SDIR}"/messages/${path} ]] ; then
-					lngs+=" ${lng}"
-				fi
-			done
-			[[ -n "${lngs}" ]] && einfo "${path}${lngs}"
-			unset lngs
-		fi
-		if ls -U ./*/4/*/messages/${path} > /dev/null 2>&1; then
-			rm ./*/4/*/messages/${path} || die "Failed to remove ${path}"
-		else
-			einfo "F: ${path}"	# run with L10N="*" to cut down list
-		fi
-	done < <(grep -ve "^$\|^\s*\#" "${REMOVE_MSGS}")
 }
 
 src_configure() {