diff options
| author |   Andreas Sturmlechner <andreas.sturmlechner@gmail.com> | 2015-08-27 21:38:20 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <andreas.sturmlechner@gmail.com> | 2015-09-01 22:58:04 +0200 |
| commit | f18276987d7defb2356b79084783c0f24ceb7ea0 (patch) | |
| tree | 4f7c9b186d0cb2f7a3b96936b1b04e5253412f26 | |
| parent | kde-apps/kde4-l10n: Revision bump drops kdepimlibs translations (diff) | |
| download | gentoo-f18276987d7defb2356b79084783c0f24ceb7ea0.tar.gz gentoo-f18276987d7defb2356b79084783c0f24ceb7ea0.tar.bz2 gentoo-f18276987d7defb2356b79084783c0f24ceb7ea0.zip | |
kde-apps/kde4-l10n: Drop block against kde-base/kdepim-l10n
15.08.0 does not contain the conflicting files anymore.
Package-Manager: portage-2.2.20.1
| -rw-r--r-- | kde-apps/kde4-l10n/files/kde4-l10n-15.07.90-remove-dirs | 1 | ||||
| -rw-r--r-- | kde-apps/kde4-l10n/kde4-l10n-15.08.0-r1.ebuild (renamed from kde-apps/kde4-l10n/kde4-l10n-15.08.0.ebuild) | 17 |
2 files changed, 7 insertions, 11 deletions
diff --git a/kde-apps/kde4-l10n/files/kde4-l10n-15.07.90-remove-dirs b/kde-apps/kde4-l10n/files/kde4-l10n-15.07.90-remove-dirs index 4c4ea64b4ae8..005cab196344 100644 --- a/kde-apps/kde4-l10n/files/kde4-l10n-15.07.90-remove-dirs +++ b/kde-apps/kde4-l10n/files/kde4-l10n-15.07.90-remove-dirs @@ -47,4 +47,3 @@ docs/kde-workspace/kcontrol kcmaccess docs/kde-workspace/kcontrol kcmstyle docs/kde-workspace/kcontrol solid-actions docs/kde-workspace/kcontrol splashscreen - diff --git a/kde-apps/kde4-l10n/kde4-l10n-15.08.0.ebuild b/kde-apps/kde4-l10n/kde4-l10n-15.08.0-r1.ebuild index 65c2b29d0f66..ef8076384291 100644 --- a/kde-apps/kde4-l10n/kde4-l10n-15.08.0.ebuild +++ b/kde-apps/kde4-l10n/kde4-l10n-15.08.0-r1.ebuild @@ -16,7 +16,6 @@ DEPEND=" " RDEPEND=" !<kde-apps/kde-l10n-${PV} - !kde-base/kdepim-l10n " KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" @@ -88,8 +87,8 @@ src_prepare() { # Remove dirs while read path; do - if [[ -e "${SDIR}"/${path%\ *}/CMakeLists.txt ]] ; then - sed -e "/${path#*\ }/ s/^/#/"\ + if [[ -n ${path} && -e "${SDIR}"/${path%\ *}/CMakeLists.txt ]] ; then + sed -e ":${path#*\ }: s:^:#:"\ -i "${SDIR}"/${path%\ *}/CMakeLists.txt fi done < <(grep -v "^#" "${REMOVE_DIRS}") @@ -104,14 +103,10 @@ src_prepare() { done else if [[ -d "${KMNAME}-${LNG}-${LV}" ]] ; then - # Create missing kdepim directories - local subdirs="kdepim kdepimlibs kdepim-runtime" - for path in ${subdirs}; do - mkdir -p "${SDIR}"/messages/${path} || die - echo "add_subdirectory(${path})" >> \ - "${SDIR}"/messages/CMakeLists.txt + # Do not try to copy kdepim localisation + for path in kdepim kdepimlibs kdepim-runtime; do + rm -rf "${KMNAME}-${LNG}-${LV}/messages/${path}" || die done - unset subdirs # Merge legacy localisation for path in $(find "${KMNAME}-${LNG}-${LV}" -name "*.po"); do cp -rn "${path}" "${path/${LV}/${PV}/4/${LNG}}" || die @@ -122,6 +117,8 @@ src_prepare() { fi done fi + + kde4-base_src_prepare } src_configure() { |