commit: a64207703f11885d0e8e8cee83df9dd0855a4bf3 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Apr 6 23:50:37 2017 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Apr 6 23:50:37 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a6420770
kde-apps: Drop kde-apps/kde-l10n from RDEPEND Changes in translation handling with >= 17.03.90: https://mail.kde.org/pipermail/kde-distro-packagers/2017-April/000276.html Package-Manager: Portage-2.3.3, Repoman-2.3.1 kde-apps/kdeadmin-meta/kdeadmin-meta-17.04.49.9999.ebuild | 5 +---- kde-apps/kdeadmin-meta/kdeadmin-meta-9999.ebuild | 5 +---- kde-apps/kdecore-meta/kdecore-meta-17.04.49.9999.ebuild | 5 +---- kde-apps/kdecore-meta/kdecore-meta-9999.ebuild | 5 +---- kde-apps/kdeedu-meta/kdeedu-meta-17.04.49.9999.ebuild | 5 +---- kde-apps/kdeedu-meta/kdeedu-meta-9999.ebuild | 5 +---- kde-apps/kdegames-meta/kdegames-meta-17.04.49.9999.ebuild | 5 +---- kde-apps/kdegames-meta/kdegames-meta-9999.ebuild | 5 +---- kde-apps/kdegraphics-meta/kdegraphics-meta-17.04.49.9999.ebuild | 5 +---- kde-apps/kdegraphics-meta/kdegraphics-meta-9999.ebuild | 5 +---- kde-apps/kdemultimedia-meta/kdemultimedia-meta-17.04.49.9999.ebuild | 5 +---- kde-apps/kdemultimedia-meta/kdemultimedia-meta-9999.ebuild | 5 +---- kde-apps/kdenetwork-meta/kdenetwork-meta-17.04.49.9999.ebuild | 5 +---- kde-apps/kdenetwork-meta/kdenetwork-meta-9999.ebuild | 5 +---- kde-apps/kdesdk-meta/kdesdk-meta-17.04.49.9999.ebuild | 5 +---- kde-apps/kdesdk-meta/kdesdk-meta-9999.ebuild | 5 +---- kde-apps/kdeutils-meta/kdeutils-meta-17.04.49.9999.ebuild | 5 +---- kde-apps/kdeutils-meta/kdeutils-meta-9999.ebuild | 5 +---- .../plasma-telepathy-meta/plasma-telepathy-meta-17.04.49.9999.ebuild | 1 - kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-9999.ebuild | 1 - 20 files changed, 18 insertions(+), 74 deletions(-) diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-17.04.49.9999.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-17.04.49.9999.ebuild index 63a7da2607..4236a770e4 100644 --- a/kde-apps/kdeadmin-meta/kdeadmin-meta-17.04.49.9999.ebuild +++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-17.04.49.9999.ebuild @@ -7,12 +7,9 @@ inherit kde5-meta-pkg DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages" KEYWORDS="" -IUSE="+cron nls" - -[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL} +IUSE="+cron" RDEPEND=" $(add_kdeapps_dep ksystemlog) cron? ( $(add_kdeapps_dep kcron) ) - nls? ( $(add_kdeapps_dep kde-l10n '' ${L10N_MINIMAL}) ) " diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-9999.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-9999.ebuild index 63a7da2607..4236a770e4 100644 --- a/kde-apps/kdeadmin-meta/kdeadmin-meta-9999.ebuild +++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-9999.ebuild @@ -7,12 +7,9 @@ inherit kde5-meta-pkg DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages" KEYWORDS="" -IUSE="+cron nls" - -[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL} +IUSE="+cron" RDEPEND=" $(add_kdeapps_dep ksystemlog) cron? ( $(add_kdeapps_dep kcron) ) - nls? ( $(add_kdeapps_dep kde-l10n '' ${L10N_MINIMAL}) ) " diff --git a/kde-apps/kdecore-meta/kdecore-meta-17.04.49.9999.ebuild b/kde-apps/kdecore-meta/kdecore-meta-17.04.49.9999.ebuild index 8bcb4dec72..f07224e7ce 100644 --- a/kde-apps/kdecore-meta/kdecore-meta-17.04.49.9999.ebuild +++ b/kde-apps/kdecore-meta/kdecore-meta-17.04.49.9999.ebuild @@ -7,9 +7,7 @@ inherit kde5-meta-pkg DESCRIPTION="kdecore - merge this to pull in the most basic applications" KEYWORDS="" -IUSE="+handbook nls" - -[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL} +IUSE="+handbook" RDEPEND=" $(add_kdeapps_dep dolphin) @@ -20,5 +18,4 @@ RDEPEND=" $(add_kdeapps_dep konsole) $(add_kdeapps_dep kwrite) handbook? ( $(add_kdeapps_dep khelpcenter) ) - nls? ( $(add_kdeapps_dep kde-l10n '' ${L10N_MINIMAL}) ) " diff --git a/kde-apps/kdecore-meta/kdecore-meta-9999.ebuild b/kde-apps/kdecore-meta/kdecore-meta-9999.ebuild index 8bcb4dec72..f07224e7ce 100644 --- a/kde-apps/kdecore-meta/kdecore-meta-9999.ebuild +++ b/kde-apps/kdecore-meta/kdecore-meta-9999.ebuild @@ -7,9 +7,7 @@ inherit kde5-meta-pkg DESCRIPTION="kdecore - merge this to pull in the most basic applications" KEYWORDS="" -IUSE="+handbook nls" - -[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL} +IUSE="+handbook" RDEPEND=" $(add_kdeapps_dep dolphin) @@ -20,5 +18,4 @@ RDEPEND=" $(add_kdeapps_dep konsole) $(add_kdeapps_dep kwrite) handbook? ( $(add_kdeapps_dep khelpcenter) ) - nls? ( $(add_kdeapps_dep kde-l10n '' ${L10N_MINIMAL}) ) " diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-17.04.49.9999.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-17.04.49.9999.ebuild index 8a00d50933..e9117cf7ea 100644 --- a/kde-apps/kdeedu-meta/kdeedu-meta-17.04.49.9999.ebuild +++ b/kde-apps/kdeedu-meta/kdeedu-meta-17.04.49.9999.ebuild @@ -8,9 +8,7 @@ inherit kde5-meta-pkg DESCRIPTION="KDE educational apps - merge this to pull in all kdeedu-derived packages" HOMEPAGE="https://edu.kde.org"; KEYWORDS="" -IUSE="nls" - -[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL} +IUSE="" RDEPEND=" $(add_kdeapps_dep analitza) @@ -39,5 +37,4 @@ RDEPEND=" $(add_kdeapps_dep parley) $(add_kdeapps_dep rocs) $(add_kdeapps_dep step) - nls? ( $(add_kdeapps_dep kde-l10n '' ${L10N_MINIMAL}) ) " diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-9999.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-9999.ebuild index 8a00d50933..e9117cf7ea 100644 --- a/kde-apps/kdeedu-meta/kdeedu-meta-9999.ebuild +++ b/kde-apps/kdeedu-meta/kdeedu-meta-9999.ebuild @@ -8,9 +8,7 @@ inherit kde5-meta-pkg DESCRIPTION="KDE educational apps - merge this to pull in all kdeedu-derived packages" HOMEPAGE="https://edu.kde.org"; KEYWORDS="" -IUSE="nls" - -[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL} +IUSE="" RDEPEND=" $(add_kdeapps_dep analitza) @@ -39,5 +37,4 @@ RDEPEND=" $(add_kdeapps_dep parley) $(add_kdeapps_dep rocs) $(add_kdeapps_dep step) - nls? ( $(add_kdeapps_dep kde-l10n '' ${L10N_MINIMAL}) ) " diff --git a/kde-apps/kdegames-meta/kdegames-meta-17.04.49.9999.ebuild b/kde-apps/kdegames-meta/kdegames-meta-17.04.49.9999.ebuild index d0ef97f0cf..e18b21c272 100644 --- a/kde-apps/kdegames-meta/kdegames-meta-17.04.49.9999.ebuild +++ b/kde-apps/kdegames-meta/kdegames-meta-17.04.49.9999.ebuild @@ -51,10 +51,7 @@ RDEPEND=" $(add_kdeapps_dep lskat) $(add_kdeapps_dep palapeli) $(add_kdeapps_dep picmi) - nls? ( - $(add_kdeapps_dep kde-l10n '' ${L10N_MINIMAL}) - $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) - ) + nls? ( $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) ) opengl? ( $(add_kdeapps_dep ksudoku) $(add_kdeapps_dep kubrick) diff --git a/kde-apps/kdegames-meta/kdegames-meta-9999.ebuild b/kde-apps/kdegames-meta/kdegames-meta-9999.ebuild index d0ef97f0cf..e18b21c272 100644 --- a/kde-apps/kdegames-meta/kdegames-meta-9999.ebuild +++ b/kde-apps/kdegames-meta/kdegames-meta-9999.ebuild @@ -51,10 +51,7 @@ RDEPEND=" $(add_kdeapps_dep lskat) $(add_kdeapps_dep palapeli) $(add_kdeapps_dep picmi) - nls? ( - $(add_kdeapps_dep kde-l10n '' ${L10N_MINIMAL}) - $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) - ) + nls? ( $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) ) opengl? ( $(add_kdeapps_dep ksudoku) $(add_kdeapps_dep kubrick) diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-17.04.49.9999.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-17.04.49.9999.ebuild index 3a3197aed3..86e870f616 100644 --- a/kde-apps/kdegraphics-meta/kdegraphics-meta-17.04.49.9999.ebuild +++ b/kde-apps/kdegraphics-meta/kdegraphics-meta-17.04.49.9999.ebuild @@ -26,10 +26,7 @@ RDEPEND=" $(add_kdeapps_dep spectacle) $(add_kdeapps_dep svgpart) $(add_kdeapps_dep thumbnailers) - nls? ( - $(add_kdeapps_dep kde-l10n '' ${L10N_MINIMAL}) - $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) - ) + nls? ( $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) ) scanner? ( $(add_kdeapps_dep ksaneplugin) $(add_kdeapps_dep libksane) diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-9999.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-9999.ebuild index 3a3197aed3..86e870f616 100644 --- a/kde-apps/kdegraphics-meta/kdegraphics-meta-9999.ebuild +++ b/kde-apps/kdegraphics-meta/kdegraphics-meta-9999.ebuild @@ -26,10 +26,7 @@ RDEPEND=" $(add_kdeapps_dep spectacle) $(add_kdeapps_dep svgpart) $(add_kdeapps_dep thumbnailers) - nls? ( - $(add_kdeapps_dep kde-l10n '' ${L10N_MINIMAL}) - $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) - ) + nls? ( $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) ) scanner? ( $(add_kdeapps_dep ksaneplugin) $(add_kdeapps_dep libksane) diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-17.04.49.9999.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-17.04.49.9999.ebuild index 3f6ffa1e68..28c23d4b0f 100644 --- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-17.04.49.9999.ebuild +++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-17.04.49.9999.ebuild @@ -27,8 +27,5 @@ RDEPEND=" $(add_kdeapps_dep libkcddb) $(add_kdeapps_dep libkcompactdisc) ffmpeg? ( $(add_kdeapps_dep ffmpegthumbs) ) - nls? ( - $(add_kdeapps_dep kde-l10n '' ${L10N_MINIMAL}) - $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) - ) + nls? ( $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) ) " diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-9999.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-9999.ebuild index 3f6ffa1e68..28c23d4b0f 100644 --- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-9999.ebuild +++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-9999.ebuild @@ -27,8 +27,5 @@ RDEPEND=" $(add_kdeapps_dep libkcddb) $(add_kdeapps_dep libkcompactdisc) ffmpeg? ( $(add_kdeapps_dep ffmpegthumbs) ) - nls? ( - $(add_kdeapps_dep kde-l10n '' ${L10N_MINIMAL}) - $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) - ) + nls? ( $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) ) " diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-17.04.49.9999.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-17.04.49.9999.ebuild index fee97f2638..e28e0ec04a 100644 --- a/kde-apps/kdenetwork-meta/kdenetwork-meta-17.04.49.9999.ebuild +++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-17.04.49.9999.ebuild @@ -20,9 +20,6 @@ RDEPEND=" $(add_kdeapps_dep krfb) $(add_kdeapps_dep plasma-telepathy-meta) $(add_kdeapps_dep zeroconf-ioslave) - nls? ( - $(add_kdeapps_dep kde-l10n '' ${L10N_MINIMAL}) - $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) - ) + nls? ( $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) ) ppp? ( $(add_kdeapps_dep kppp) ) " diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-9999.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-9999.ebuild index fee97f2638..e28e0ec04a 100644 --- a/kde-apps/kdenetwork-meta/kdenetwork-meta-9999.ebuild +++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-9999.ebuild @@ -20,9 +20,6 @@ RDEPEND=" $(add_kdeapps_dep krfb) $(add_kdeapps_dep plasma-telepathy-meta) $(add_kdeapps_dep zeroconf-ioslave) - nls? ( - $(add_kdeapps_dep kde-l10n '' ${L10N_MINIMAL}) - $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) - ) + nls? ( $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) ) ppp? ( $(add_kdeapps_dep kppp) ) " diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-17.04.49.9999.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-17.04.49.9999.ebuild index 58171b3ccf..852c5b1ebb 100644 --- a/kde-apps/kdesdk-meta/kdesdk-meta-17.04.49.9999.ebuild +++ b/kde-apps/kdesdk-meta/kdesdk-meta-17.04.49.9999.ebuild @@ -28,8 +28,5 @@ RDEPEND=" $(add_kdeapps_dep poxml) $(add_kdeapps_dep umbrello) cvs? ( $(add_kdeapps_dep cervisia) ) - nls? ( - $(add_kdeapps_dep kde-l10n '' ${L10N_MINIMAL}) - $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) - ) + nls? ( $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) ) " diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-9999.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-9999.ebuild index 58171b3ccf..852c5b1ebb 100644 --- a/kde-apps/kdesdk-meta/kdesdk-meta-9999.ebuild +++ b/kde-apps/kdesdk-meta/kdesdk-meta-9999.ebuild @@ -28,8 +28,5 @@ RDEPEND=" $(add_kdeapps_dep poxml) $(add_kdeapps_dep umbrello) cvs? ( $(add_kdeapps_dep cervisia) ) - nls? ( - $(add_kdeapps_dep kde-l10n '' ${L10N_MINIMAL}) - $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) - ) + nls? ( $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) ) " diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-17.04.49.9999.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-17.04.49.9999.ebuild index 265aae1791..0aa432bfa4 100644 --- a/kde-apps/kdeutils-meta/kdeutils-meta-17.04.49.9999.ebuild +++ b/kde-apps/kdeutils-meta/kdeutils-meta-17.04.49.9999.ebuild @@ -27,8 +27,5 @@ RDEPEND=" cups? ( $(add_kdeapps_dep print-manager) ) floppy? ( $(add_kdeapps_dep kfloppy) ) lirc? ( $(add_kdeapps_dep kremotecontrol) ) - nls? ( - $(add_kdeapps_dep kde-l10n '' ${L10N_MINIMAL}) - $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) - ) + nls? ( $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) ) " diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-9999.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-9999.ebuild index 265aae1791..0aa432bfa4 100644 --- a/kde-apps/kdeutils-meta/kdeutils-meta-9999.ebuild +++ b/kde-apps/kdeutils-meta/kdeutils-meta-9999.ebuild @@ -27,8 +27,5 @@ RDEPEND=" cups? ( $(add_kdeapps_dep print-manager) ) floppy? ( $(add_kdeapps_dep kfloppy) ) lirc? ( $(add_kdeapps_dep kremotecontrol) ) - nls? ( - $(add_kdeapps_dep kde-l10n '' ${L10N_MINIMAL}) - $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) - ) + nls? ( $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) ) " diff --git a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-17.04.49.9999.ebuild b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-17.04.49.9999.ebuild index f517510b68..ee404257eb 100644 --- a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-17.04.49.9999.ebuild +++ b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-17.04.49.9999.ebuild @@ -28,7 +28,6 @@ RDEPEND=" $(add_kdeapps_dep ktp-text-ui) !kde-apps/plasma-telepathy-meta:4 gstreamer? ( $(add_kdeapps_dep ktp-call-ui) ) - nls? ( $(add_kdeapps_dep kde-l10n '' ${L10N_MINIMAL}) ) " pkg_postinst() { diff --git a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-9999.ebuild b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-9999.ebuild index f517510b68..ee404257eb 100644 --- a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-9999.ebuild +++ b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-9999.ebuild @@ -28,7 +28,6 @@ RDEPEND=" $(add_kdeapps_dep ktp-text-ui) !kde-apps/plasma-telepathy-meta:4 gstreamer? ( $(add_kdeapps_dep ktp-call-ui) ) - nls? ( $(add_kdeapps_dep kde-l10n '' ${L10N_MINIMAL}) ) " pkg_postinst() {
