commit: bbab981b365657a514d91df425e665686b3a93d5
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 5 16:18:57 2015 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> 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(-)
