1 |
commit: 7d3c956c9cbd3baafc67e7a221f5fc0b18cd3ba6 |
2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Jul 27 20:53:47 2015 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jul 28 20:47:25 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7d3c956c |
7 |
|
8 |
[kde-apps/kde-apps-meta] Fall back to released kde-l10n versions |
9 |
|
10 |
Fixes repoman complaint and USE=nls in live ebuilds |
11 |
|
12 |
Package-Manager: portage-2.2.20 |
13 |
|
14 |
kde-apps/kde-apps-meta/kde-apps-meta-15.08.49.9999.ebuild | 6 ++++-- |
15 |
kde-apps/kde-apps-meta/kde-apps-meta-9999.ebuild | 6 ++++-- |
16 |
2 files changed, 8 insertions(+), 4 deletions(-) |
17 |
|
18 |
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 |
19 |
index ea05275..8ddc5ee 100644 |
20 |
--- a/kde-apps/kde-apps-meta/kde-apps-meta-15.08.49.9999.ebuild |
21 |
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-15.08.49.9999.ebuild |
22 |
@@ -10,6 +10,8 @@ DESCRIPTION="Meta package for the KDE Applications collection" |
23 |
KEYWORDS="" |
24 |
IUSE="accessibility nls sdk" |
25 |
|
26 |
+[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL} |
27 |
+ |
28 |
RDEPEND=" |
29 |
$(add_kdeapps_dep kate) |
30 |
$(add_kdeapps_dep kdeadmin-meta) |
31 |
@@ -24,8 +26,8 @@ RDEPEND=" |
32 |
$(add_kdeapps_dep kdeutils-meta) |
33 |
accessibility? ( $(add_kdeapps_dep kdeaccessibility-meta) ) |
34 |
nls? ( |
35 |
- $(add_kdeapps_dep kde-l10n) |
36 |
- $(add_kdeapps_dep kde4-l10n) |
37 |
+ $(add_kdeapps_dep kde-l10n '' ${L10N_MINIMAL}) |
38 |
+ $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) |
39 |
) |
40 |
sdk? ( |
41 |
$(add_kdeapps_dep kdesdk-meta) |
42 |
|
43 |
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-9999.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-9999.ebuild |
44 |
index ea05275..8ddc5ee 100644 |
45 |
--- a/kde-apps/kde-apps-meta/kde-apps-meta-9999.ebuild |
46 |
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-9999.ebuild |
47 |
@@ -10,6 +10,8 @@ DESCRIPTION="Meta package for the KDE Applications collection" |
48 |
KEYWORDS="" |
49 |
IUSE="accessibility nls sdk" |
50 |
|
51 |
+[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL} |
52 |
+ |
53 |
RDEPEND=" |
54 |
$(add_kdeapps_dep kate) |
55 |
$(add_kdeapps_dep kdeadmin-meta) |
56 |
@@ -24,8 +26,8 @@ RDEPEND=" |
57 |
$(add_kdeapps_dep kdeutils-meta) |
58 |
accessibility? ( $(add_kdeapps_dep kdeaccessibility-meta) ) |
59 |
nls? ( |
60 |
- $(add_kdeapps_dep kde-l10n) |
61 |
- $(add_kdeapps_dep kde4-l10n) |
62 |
+ $(add_kdeapps_dep kde-l10n '' ${L10N_MINIMAL}) |
63 |
+ $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) |
64 |
) |
65 |
sdk? ( |
66 |
$(add_kdeapps_dep kdesdk-meta) |