public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Hüttel" <dilfridge@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/kde-l10n/
Date: Sat,  5 Sep 2015 16:20:26 +0000 (UTC)	[thread overview]
Message-ID: <1441141567.e83f2381f773c385f905b755911ffd2b09db6814.dilfridge@gentoo> (raw)

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


             reply	other threads:[~2015-09-05 16:20 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-05 16:20 Andreas Hüttel [this message]
  -- strict thread matches above, loose matches on Subject: below --
2016-12-18 10:03 [gentoo-commits] repo/gentoo:master commit in: kde-apps/kde-l10n/ Johannes Huber
2016-07-03 16:08 Michał Górny
2016-05-17  8:15 Johannes Huber
2016-05-17  8:15 Johannes Huber
2016-04-16 13:49 Johannes Huber
2016-04-15 19:11 Johannes Huber
2016-04-15 19:11 Johannes Huber
2016-04-08 22:12 Andreas Hüttel
2015-09-22 21:21 Andreas Hüttel
2015-09-05 16:20 Andreas Hüttel
2015-08-25 22:19 Johannes Huber

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1441141567.e83f2381f773c385f905b755911ffd2b09db6814.dilfridge@gentoo \
    --to=dilfridge@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox