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

[Johannes Huber]

commit:     6e0480d70a4e0af373a45bf5d2f195699a4d259d
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Apr 11 06:33:12 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 19:06:21 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6e0480d7

kde-apps/kde-l10n: Drop workaround and block conflicting khelpcenter

Package-Manager: portage-2.2.27

Signed-off-by: Johannes Huber <johu <AT> gentoo.org>

 .../{kde-l10n-16.03.90.ebuild => kde-l10n-16.03.90-r1.ebuild}  | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/kde-apps/kde-l10n/kde-l10n-16.03.90.ebuild 
b/kde-apps/kde-l10n/kde-l10n-16.03.90-r1.ebuild
similarity index 92%
rename from kde-apps/kde-l10n/kde-l10n-16.03.90.ebuild
rename to kde-apps/kde-l10n/kde-l10n-16.03.90-r1.ebuild
index cb7df16..231df32 100644
--- a/kde-apps/kde-l10n/kde-l10n-16.03.90.ebuild
+++ b/kde-apps/kde-l10n/kde-l10n-16.03.90-r1.ebuild
@@ -21,6 +21,8 @@ RDEPEND="
        !<kde-apps/kde4-l10n-${PV}
        !kde-apps/kde4-l10n[-minimal]
        !<kde-apps/kdepim-l10n-${PV}:5
+       !<kde-apps/khelpcenter-5.5.5-r1
+       !=kde-apps/khelpcenter-5.6.2
        !<kde-apps/ktp-l10n-${PV}
 "
 
@@ -107,14 +109,8 @@ src_compile() {
        [[ -n ${A} ]] && kde5_src_compile
 }
 
-src_test() {
-       [[ -n ${A} ]] && kde5_src_test
-}
+src_test() { :; }
 
 src_install() {
        [[ -n ${A} ]] && kde5_src_install
-
-       # FIXME: Temporary removal of file conflict with kde-plasma/khelpcenter
-       # Files should be removed in khelpcenter after pkgmove to kde-apps/
-       rm -rf "${ED}"usr/share/locale/*/LC_MESSAGES/khelpcenter.mo || die
 }