From 8ec0b775bc2bc49ec4bebd5c9c6a521d8e2e34fb Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Mon, 18 Jan 2016 18:40:04 +0100 Subject: kde-apps/kde-apps-meta: Replace kdebase-meta with kdecore-meta Package-Manager: portage-2.2.26 --- .../kde-apps-meta/kde-apps-meta-15.08.3-r1.ebuild | 40 ---------------------- .../kde-apps-meta/kde-apps-meta-15.08.3-r2.ebuild | 40 ++++++++++++++++++++++ .../kde-apps-meta/kde-apps-meta-15.12.1-r1.ebuild | 36 ------------------- .../kde-apps-meta/kde-apps-meta-15.12.1-r2.ebuild | 36 +++++++++++++++++++ .../kde-apps-meta-15.12.49.9999.ebuild | 2 +- kde-apps/kde-apps-meta/kde-apps-meta-9999.ebuild | 2 +- 6 files changed, 78 insertions(+), 78 deletions(-) delete mode 100644 kde-apps/kde-apps-meta/kde-apps-meta-15.08.3-r1.ebuild create mode 100644 kde-apps/kde-apps-meta/kde-apps-meta-15.08.3-r2.ebuild delete mode 100644 kde-apps/kde-apps-meta/kde-apps-meta-15.12.1-r1.ebuild create mode 100644 kde-apps/kde-apps-meta/kde-apps-meta-15.12.1-r2.ebuild (limited to 'kde-apps') diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-15.08.3-r1.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-15.08.3-r1.ebuild deleted file mode 100644 index 8ffe9dc2d38..00000000000 --- a/kde-apps/kde-apps-meta/kde-apps-meta-15.08.3-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit kde5-meta-pkg - -DESCRIPTION="Meta package for the KDE Applications collection" -KEYWORDS=" ~amd64 ~x86" -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 kdebase-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 'minimal' ${L10N_MINIMAL}) - ) - 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-r2.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-15.08.3-r2.ebuild new file mode 100644 index 00000000000..edc4bffe9ed --- /dev/null +++ b/kde-apps/kde-apps-meta/kde-apps-meta-15.08.3-r2.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit kde5-meta-pkg + +DESCRIPTION="Meta package for the KDE Applications collection" +KEYWORDS=" ~amd64 ~x86" +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 kdecore-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 'minimal' ${L10N_MINIMAL}) + ) + 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.12.1-r1.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-15.12.1-r1.ebuild deleted file mode 100644 index 95eb85d361f..00000000000 --- a/kde-apps/kde-apps-meta/kde-apps-meta-15.12.1-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit kde5-meta-pkg - -DESCRIPTION="Meta package for the KDE Applications collection" -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 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 kdeutils-meta) - accessibility? ( $(add_kdeapps_dep kdeaccessibility-meta) ) - nls? ( - $(add_kdeapps_dep kde-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.1-r2.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-15.12.1-r2.ebuild new file mode 100644 index 00000000000..5e2dd619102 --- /dev/null +++ b/kde-apps/kde-apps-meta/kde-apps-meta-15.12.1-r2.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit kde5-meta-pkg + +DESCRIPTION="Meta package for the KDE Applications collection" +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 kdecore-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 kdeutils-meta) + accessibility? ( $(add_kdeapps_dep kdeaccessibility-meta) ) + nls? ( + $(add_kdeapps_dep kde-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 6176450106a..61e0662c009 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 @@ -15,7 +15,7 @@ IUSE="accessibility minimal nls pim sdk" RDEPEND=" $(add_kdeapps_dep kate) $(add_kdeapps_dep kdeadmin-meta) - $(add_kdeapps_dep kdebase-meta) + $(add_kdeapps_dep kdecore-meta) $(add_kdeapps_dep kdeedu-meta) $(add_kdeapps_dep kdegames-meta) $(add_kdeapps_dep kdegraphics-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 6176450106a..61e0662c009 100644 --- a/kde-apps/kde-apps-meta/kde-apps-meta-9999.ebuild +++ b/kde-apps/kde-apps-meta/kde-apps-meta-9999.ebuild @@ -15,7 +15,7 @@ IUSE="accessibility minimal nls pim sdk" RDEPEND=" $(add_kdeapps_dep kate) $(add_kdeapps_dep kdeadmin-meta) - $(add_kdeapps_dep kdebase-meta) + $(add_kdeapps_dep kdecore-meta) $(add_kdeapps_dep kdeedu-meta) $(add_kdeapps_dep kdegames-meta) $(add_kdeapps_dep kdegraphics-meta) -- cgit v1.2.3