From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B24D81385E0 for ; Sat, 5 Sep 2015 16:20:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 54644143CD; Sat, 5 Sep 2015 16:20:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0F8C7143C9 for ; Sat, 5 Sep 2015 16:20:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2E81C34096D for ; Sat, 5 Sep 2015 16:20:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 41D83191 for ; Sat, 5 Sep 2015 16:20:27 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <1441469937.bbab981b365657a514d91df425e665686b3a93d5.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: / X-VCS-Repository: repo/gentoo X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: bbab981b365657a514d91df425e665686b3a93d5 X-VCS-Branch: master Date: Sat, 5 Sep 2015 16:20:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ff0fa468-4363-4ff2-87bc-b10aba5d7045 X-Archives-Hash: 301862616085ef38af1d7a04d086ce0c commit: bbab981b365657a514d91df425e665686b3a93d5 Author: Andreas K. Huettel (dilfridge) gentoo org> AuthorDate: Sat Sep 5 16:18:57 2015 +0000 Commit: Andreas Hüttel gentoo org> CommitDate: Sat Sep 5 16:18:57 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbab981b Merge remote-tracking branch 'remotes/github/pr/45' Closes gentoo/gentoo#45 Fix file collisions between kde4, kdepim and telepathy internationalization ...n-15.08.0.ebuild => kde-l10n-15.08.0-r1.ebuild} | 16 +++ .../kde4-l10n/files/kde4-l10n-15.07.90-remove-dirs | 1 - ...-15.08.0.ebuild => kde4-l10n-15.08.0-r1.ebuild} | 17 ++- ...0n-4.14.3.ebuild => kde4-l10n-4.14.3-r1.ebuild} | 45 ++++--- kde-apps/kde4-l10n/kde4-l10n-4.14.3.ebuild | 2 +- kde-apps/{kde-l10n => kdepim-l10n}/Manifest | 0 .../kdepim-l10n-15.08.0.ebuild} | 52 ++++++-- .../kdepim-l10n}/metadata.xml | 0 kde-apps/{kde-l10n => ktp-l10n}/Manifest | 0 kde-apps/ktp-l10n/ktp-l10n-15.08.0.ebuild | 131 +++++++++++++++++++++ .../oxygen-gtk => kde-apps/ktp-l10n}/metadata.xml | 0 ...-4.14.3.ebuild => kdepim-l10n-4.14.3-r1.ebuild} | 39 +++--- kde-base/kdepim-l10n/kdepim-l10n-4.14.3.ebuild | 2 +- .../kdepim-l10n/kdepim-l10n-4.4.11.1-r1.ebuild | 4 +- ....1-r1.ebuild => kdepim-l10n-4.4.11.1-r2.ebuild} | 29 +++-- kde-base/kdepim-meta/kdepim-meta-4.14.10.ebuild | 13 +- kde-base/kdepim-meta/kdepim-meta-4.14.3.ebuild | 13 +- kde-base/kdepim-meta/kdepim-meta-4.14.8.ebuild | 13 +- .../kdepim-meta/kdepim-meta-4.4.2015.06.ebuild | 13 +- 19 files changed, 283 insertions(+), 107 deletions(-)