[gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/files/, kde-apps/kde4-l10n/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     df6321a2413aa20275f9675bb6a0828b43bb2b99
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 13 20:18:01 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 13 20:18:01 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=df6321a2

kde-apps/kde4-l10n: More conflict cleanup

Conflicting versions of kde-plasma/plasma-workspace are gone,
so just add a blocker for late upgraders.

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 kde-apps/kde4-l10n/files/kde4-l10n-17.04.3-remove-messages | 2 --
 kde-apps/kde4-l10n/kde4-l10n-17.04.3.ebuild                | 1 +
 2 files changed, 1 insertion(+), 2 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
index 493415f1fb..8328a74e81 100644
--- 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
@@ -24,8 +24,6 @@ kde-runtime/drkonqi.po
 kde-runtime/kio_applications.po
 kde-runtime/phonon_kde.po
 kde-runtime/soliduiserver.po
-# fixed in: 5.8.6-r1, 5.9.5.1-r1
-kde-runtime/kio_remote.po
 
 # kde-cli-tools - fixed in: 5.10.0
 # KDE Runtime 4

diff --git a/kde-apps/kde4-l10n/kde4-l10n-17.04.3.ebuild b/kde-apps/kde4-l10n/kde4-l10n-17.04.3.ebuild
index dff133c010..6a44819890 100644
--- a/kde-apps/kde4-l10n/kde4-l10n-17.04.3.ebuild
+++ b/kde-apps/kde4-l10n/kde4-l10n-17.04.3.ebuild
@@ -54,6 +54,7 @@ RDEPEND="
 	!<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
 "
 
 REMOVE_DIRS="${FILESDIR}/${PN}-16.12.3-remove-dirs"