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

[Andreas Hüttel]

commit:     e83f2381f773c385f905b755911ffd2b09db6814
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Aug 31 20:23:50 2015 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Sep  1 21:06:07 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e83f2381

kde-apps/kde-l10n: Drop ktp translations

Before move to kde applications, translations were kept internal -
that makes old ktp:4 packages collide with kde-apps/kde-l10n

Package-Manager: portage-2.2.20.1

 kde-apps/kde-l10n/kde-l10n-15.08.0-r1.ebuild | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/kde-apps/kde-l10n/kde-l10n-15.08.0-r1.ebuild 
b/kde-apps/kde-l10n/kde-l10n-15.08.0-r1.ebuild
index 2e5e8a5..4c2dbb9 100644
--- a/kde-apps/kde-l10n/kde-l10n-15.08.0-r1.ebuild
+++ b/kde-apps/kde-l10n/kde-l10n-15.08.0-r1.ebuild
@@ -17,6 +17,7 @@ RDEPEND="
        !<kde-apps/kde4-l10n-${PV}
        !kde-apps/kde4-l10n[-minimal]
        !<kde-apps/kdepim-l10n-${PV}
+       !<kde-apps/ktp-l10n-${PV}
 "
 
 KEYWORDS=" ~amd64 ~x86"
@@ -71,6 +72,13 @@ src_prepare() {
                                                -exec sed -i -e 
"/add_subdirectory( *${subdir} *)/ s/^/#/" {} +
                                done
 
+                               # Remove ktp translations (part of 
kde-apps/ktp-l10n)
+                               # Drop that hack (and kde-apps/ktp-l10n) after 
ktp:4 removal
+                               find "${S}"/${DIR}/5/${LNG}/messages/kdenetwork 
-type f \
+                                       \( -name kaccounts*po -o -name 
kcm_ktp*po -o -name kcmtelepathy*po \
+                                       -o -name kded_ktp*po -o -name ktp*po -o 
-name plasma*ktp*po \) \
+                                       -delete
+
                                # Handbook optional
                                sed -e '/KF5DocTools/ s/ REQUIRED//'\
                                        -i 
"${S}"/${DIR}/5/${LNG}/CMakeLists.txt || die