[gentoo-commits] proj/kde:master commit in: kde-apps/kde-apps-meta/

[Johannes Huber]

commit:     7d3c956c9cbd3baafc67e7a221f5fc0b18cd3ba6
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Jul 27 20:53:47 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Jul 28 20:47:25 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7d3c956c

[kde-apps/kde-apps-meta] Fall back to released kde-l10n versions

Fixes repoman complaint and USE=nls in live ebuilds

Package-Manager: portage-2.2.20

 kde-apps/kde-apps-meta/kde-apps-meta-15.08.49.9999.ebuild | 6 ++++--
 kde-apps/kde-apps-meta/kde-apps-meta-9999.ebuild          | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-15.08.49.9999.ebuild 
b/kde-apps/kde-apps-meta/kde-apps-meta-15.08.49.9999.ebuild
index ea05275..8ddc5ee 100644
--- a/kde-apps/kde-apps-meta/kde-apps-meta-15.08.49.9999.ebuild
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-15.08.49.9999.ebuild
@@ -10,6 +10,8 @@ DESCRIPTION="Meta package for the KDE Applications collection"
 KEYWORDS=""
 IUSE="accessibility nls sdk"
 
+[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
+
 RDEPEND="
        $(add_kdeapps_dep kate)
        $(add_kdeapps_dep kdeadmin-meta)
@@ -24,8 +26,8 @@ RDEPEND="
        $(add_kdeapps_dep kdeutils-meta)
        accessibility? ( $(add_kdeapps_dep kdeaccessibility-meta) )
        nls? (
-               $(add_kdeapps_dep kde-l10n)
-               $(add_kdeapps_dep kde4-l10n)
+               $(add_kdeapps_dep kde-l10n '' ${L10N_MINIMAL})
+               $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL})
        )
        sdk? (
                $(add_kdeapps_dep kdesdk-meta)

diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-9999.ebuild 
b/kde-apps/kde-apps-meta/kde-apps-meta-9999.ebuild
index ea05275..8ddc5ee 100644
--- a/kde-apps/kde-apps-meta/kde-apps-meta-9999.ebuild
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-9999.ebuild
@@ -10,6 +10,8 @@ DESCRIPTION="Meta package for the KDE Applications collection"
 KEYWORDS=""
 IUSE="accessibility nls sdk"
 
+[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
+
 RDEPEND="
        $(add_kdeapps_dep kate)
        $(add_kdeapps_dep kdeadmin-meta)
@@ -24,8 +26,8 @@ RDEPEND="
        $(add_kdeapps_dep kdeutils-meta)
        accessibility? ( $(add_kdeapps_dep kdeaccessibility-meta) )
        nls? (
-               $(add_kdeapps_dep kde-l10n)
-               $(add_kdeapps_dep kde4-l10n)
+               $(add_kdeapps_dep kde-l10n '' ${L10N_MINIMAL})
+               $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL})
        )
        sdk? (
                $(add_kdeapps_dep kdesdk-meta)