diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2017-07-13 22:18:01 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-07-13 22:18:01 +0200 |
| commit | df6321a2413aa20275f9675bb6a0828b43bb2b99 (patch) | |
| tree | cc23662b01e189f5759de782100646c291819a50 /kde-apps | |
| parent | 672bb71c3e8b5206e63bccb6346c56193f4eeee9 (diff) | |
| download | kde-df6321a2413aa20275f9675bb6a0828b43bb2b99.tar.gz kde-df6321a2413aa20275f9675bb6a0828b43bb2b99.tar.bz2 kde-df6321a2413aa20275f9675bb6a0828b43bb2b99.zip | |
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
Diffstat (limited to 'kde-apps')
| -rw-r--r-- | kde-apps/kde4-l10n/files/kde4-l10n-17.04.3-remove-messages | 2 | ||||
| -rw-r--r-- | kde-apps/kde4-l10n/kde4-l10n-17.04.3.ebuild | 1 |
2 files changed, 1 insertions, 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 493415f1fb9..8328a74e813 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 dff133c0106..6a44819890a 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" |