commit: 84cfb8160b35ba5e7ccc2d6349d9bb1e5ae5a404
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Jan 8 01:02:37 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Jan 16 18:11:25 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=84cfb816
kde-apps/kde-apps-meta: Make it an upgrade path for Plasma 5 migration
Package-Manager: portage-2.2.26
...meta-15.12.1.ebuild => kde-apps-meta-15.08.3-r1.ebuild} | 14 +++++++++-----
...meta-15.08.3.ebuild => kde-apps-meta-15.12.1-r1.ebuild} | 9 ++++-----
kde-apps/kde-apps-meta/kde-apps-meta-15.12.49.9999.ebuild | 6 +++---
kde-apps/kde-apps-meta/kde-apps-meta-9999.ebuild | 6 +++---
4 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-15.12.1.ebuild
b/kde-apps/kde-apps-meta/kde-apps-meta-15.08.3-r1.ebuild
similarity index 64%
rename from kde-apps/kde-apps-meta/kde-apps-meta-15.12.1.ebuild
rename to kde-apps/kde-apps-meta/kde-apps-meta-15.08.3-r1.ebuild
index ce4c425..8ffe9dc 100644
--- a/kde-apps/kde-apps-meta/kde-apps-meta-15.12.1.ebuild
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-15.08.3-r1.ebuild
@@ -8,29 +8,33 @@ inherit kde5-meta-pkg
DESCRIPTION="Meta package for the KDE Applications collection"
KEYWORDS=" ~amd64 ~x86"
-IUSE="accessibility nls pim sdk"
+IUSE="accessibility minimal nls pim sdk"
[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
+# KDE PIM 15.08.3 is not going to be in tree and
+# will conflict with other packages from 15.08.3
+# Raise kdeedu-meta dep whenever it hits portage
RDEPEND="
$(add_kdeapps_dep kate)
$(add_kdeapps_dep kdeadmin-meta)
- $(add_kdeapps_dep kdeartwork-meta '' 15.08.0)
$(add_kdeapps_dep kdebase-meta)
- $(add_kdeapps_dep kdeedu-meta)
+ $(add_kdeapps_dep kdeedu-meta '' 4.14.3)
$(add_kdeapps_dep kdegames-meta)
$(add_kdeapps_dep kdegraphics-meta)
$(add_kdeapps_dep kdemultimedia-meta)
$(add_kdeapps_dep kdenetwork-meta)
+ $(add_kdeapps_dep kdetoys-meta)
$(add_kdeapps_dep kdeutils-meta)
accessibility? ( $(add_kdeapps_dep kdeaccessibility-meta) )
nls? (
$(add_kdeapps_dep kde-l10n '' ${L10N_MINIMAL})
- $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL})
+ $(add_kdeapps_dep kde4-l10n 'minimal' ${L10N_MINIMAL})
)
- pim? ( $(add_kdeapps_dep kdepim-meta) )
+ pim? ( >=kde-apps/kdepim-meta-4.4.2015:4 )
sdk? (
$(add_kdeapps_dep kdesdk-meta)
$(add_kdeapps_dep kdewebdev-meta)
)
+ !minimal? ( $(add_kdeapps_dep kdeartwork-meta 'minimal') )
"
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-15.08.3.ebuild
b/kde-apps/kde-apps-meta/kde-apps-meta-15.12.1-r1.ebuild
similarity index 81%
rename from kde-apps/kde-apps-meta/kde-apps-meta-15.08.3.ebuild
rename to kde-apps/kde-apps-meta/kde-apps-meta-15.12.1-r1.ebuild
index 6433dbc..95eb85d 100644
--- a/kde-apps/kde-apps-meta/kde-apps-meta-15.08.3.ebuild
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-15.12.1-r1.ebuild
@@ -7,31 +7,30 @@ EAPI=5
inherit kde5-meta-pkg
DESCRIPTION="Meta package for the KDE Applications collection"
-KEYWORDS=" ~amd64 ~x86"
-IUSE="accessibility nls pim sdk"
+KEYWORDS="~amd64 ~x86"
+IUSE="accessibility minimal nls pim sdk"
[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
RDEPEND="
$(add_kdeapps_dep kate)
$(add_kdeapps_dep kdeadmin-meta)
- $(add_kdeapps_dep kdeartwork-meta '' 15.08.0)
$(add_kdeapps_dep kdebase-meta)
$(add_kdeapps_dep kdeedu-meta)
$(add_kdeapps_dep kdegames-meta)
$(add_kdeapps_dep kdegraphics-meta)
$(add_kdeapps_dep kdemultimedia-meta)
$(add_kdeapps_dep kdenetwork-meta)
- $(add_kdeapps_dep kdetoys-meta)
$(add_kdeapps_dep kdeutils-meta)
accessibility? ( $(add_kdeapps_dep kdeaccessibility-meta) )
nls? (
$(add_kdeapps_dep kde-l10n '' ${L10N_MINIMAL})
- $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL})
+ $(add_kdeapps_dep kde4-l10n 'minimal' ${L10N_MINIMAL})
)
pim? ( $(add_kdeapps_dep kdepim-meta) )
sdk? (
$(add_kdeapps_dep kdesdk-meta)
$(add_kdeapps_dep kdewebdev-meta)
)
+ !minimal? ( $(add_kdeapps_dep kdeartwork-meta 'minimal' 15.08.3) )
"
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-15.12.49.9999.ebuild
b/kde-apps/kde-apps-meta/kde-apps-meta-15.12.49.9999.ebuild
index c3dbdfd..6176450 100644
--- a/kde-apps/kde-apps-meta/kde-apps-meta-15.12.49.9999.ebuild
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-15.12.49.9999.ebuild
@@ -8,14 +8,13 @@ inherit kde5-meta-pkg
DESCRIPTION="Meta package for the KDE Applications collection"
KEYWORDS=""
-IUSE="accessibility nls pim sdk"
+IUSE="accessibility minimal nls pim sdk"
[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
RDEPEND="
$(add_kdeapps_dep kate)
$(add_kdeapps_dep kdeadmin-meta)
- $(add_kdeapps_dep kdeartwork-meta '' 15.08.0)
$(add_kdeapps_dep kdebase-meta)
$(add_kdeapps_dep kdeedu-meta)
$(add_kdeapps_dep kdegames-meta)
@@ -26,11 +25,12 @@ RDEPEND="
accessibility? ( $(add_kdeapps_dep kdeaccessibility-meta) )
nls? (
$(add_kdeapps_dep kde-l10n '' ${L10N_MINIMAL})
- $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL})
+ $(add_kdeapps_dep kde4-l10n 'minimal' ${L10N_MINIMAL})
)
pim? ( $(add_kdeapps_dep kdepim-meta) )
sdk? (
$(add_kdeapps_dep kdesdk-meta)
$(add_kdeapps_dep kdewebdev-meta)
)
+ !minimal? ( $(add_kdeapps_dep kdeartwork-meta 'minimal' 15.08.3) )
"
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 c3dbdfd..6176450 100644
--- a/kde-apps/kde-apps-meta/kde-apps-meta-9999.ebuild
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-9999.ebuild
@@ -8,14 +8,13 @@ inherit kde5-meta-pkg
DESCRIPTION="Meta package for the KDE Applications collection"
KEYWORDS=""
-IUSE="accessibility nls pim sdk"
+IUSE="accessibility minimal nls pim sdk"
[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
RDEPEND="
$(add_kdeapps_dep kate)
$(add_kdeapps_dep kdeadmin-meta)
- $(add_kdeapps_dep kdeartwork-meta '' 15.08.0)
$(add_kdeapps_dep kdebase-meta)
$(add_kdeapps_dep kdeedu-meta)
$(add_kdeapps_dep kdegames-meta)
@@ -26,11 +25,12 @@ RDEPEND="
accessibility? ( $(add_kdeapps_dep kdeaccessibility-meta) )
nls? (
$(add_kdeapps_dep kde-l10n '' ${L10N_MINIMAL})
- $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL})
+ $(add_kdeapps_dep kde4-l10n 'minimal' ${L10N_MINIMAL})
)
pim? ( $(add_kdeapps_dep kdepim-meta) )
sdk? (
$(add_kdeapps_dep kdesdk-meta)
$(add_kdeapps_dep kdewebdev-meta)
)
+ !minimal? ( $(add_kdeapps_dep kdeartwork-meta 'minimal' 15.08.3) )
"
