[gentoo-commits] proj/kde:master commit in: kde-apps/kde-apps-meta/, kde-apps/kdeutils-meta/, kde-apps/kdemultimedia-meta/, ...

[Andreas Sturmlechner]

commit:     d9c6fe3e39b72ec0b99336f1bff2c12e2aaaeae6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 22 14:30:20 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 22 15:55:54 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d9c6fe3e

kde-apps: Drop slot 4 RDEPENDs from live meta ebuilds

KDE Applications git master is 17.12, which is dropping kdelibs-4 rdeps.
See also: https://mail.kde.org/pipermail/release-team/2016-November/009849.html

 kde-apps/kde-apps-meta/kde-apps-meta-9999.ebuild             |  7 ++-----
 .../kdeaccessibility-meta/kdeaccessibility-meta-9999.ebuild  | 10 +---------
 kde-apps/kdegames-meta/kdegames-meta-9999.ebuild             | 10 +---------
 kde-apps/kdegraphics-meta/kdegraphics-meta-9999.ebuild       | 12 ++----------
 kde-apps/kdemultimedia-meta/kdemultimedia-meta-9999.ebuild   |  9 +--------
 kde-apps/kdenetwork-meta/kdenetwork-meta-9999.ebuild         | 12 +-----------
 kde-apps/kdeutils-meta/kdeutils-meta-9999.ebuild             |  9 +--------
 7 files changed, 9 insertions(+), 60 deletions(-)

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 e1450e0964..87cd7cfdb4 100644
--- a/kde-apps/kde-apps-meta/kde-apps-meta-9999.ebuild
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-9999.ebuild
@@ -7,7 +7,7 @@ inherit kde5-meta-pkg
 
 DESCRIPTION="Meta package for the KDE Applications collection"
 KEYWORDS=""
-IUSE="accessibility pim +qt4 sdk"
+IUSE="accessibility pim sdk"
 
 RDEPEND="
 	$(add_kdeapps_dep kate)
@@ -21,8 +21,5 @@ RDEPEND="
 	$(add_kdeapps_dep kdeutils-meta)
 	accessibility? ( $(add_kdeapps_dep kdeaccessibility-meta) )
 	pim? ( $(add_kdeapps_dep kdepim-meta) )
-	sdk? (
-		$(add_kdeapps_dep kdesdk-meta)
-		qt4? ( $(add_kdeapps_dep kdewebdev-meta) )
-	)
+	sdk? ( $(add_kdeapps_dep kdesdk-meta) )
 "

diff --git a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-9999.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-9999.ebuild
index 0448ce09e4..2f6e073adf 100644
--- a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-9999.ebuild
+++ b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-9999.ebuild
@@ -7,17 +7,9 @@ inherit kde5-meta-pkg
 
 DESCRIPTION="kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages"
 KEYWORDS=""
-IUSE="nls +qt4"
-
-[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
+IUSE=""
 
 RDEPEND="
 	$(add_kdeapps_dep kmag)
 	$(add_kdeapps_dep kmousetool)
-	qt4? (
-		$(add_kdeapps_dep jovie)
-		$(add_kdeapps_dep kaccessible)
-		$(add_kdeapps_dep kmouth)
-		nls? ( $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) )
-	)
 "

diff --git a/kde-apps/kdegames-meta/kdegames-meta-9999.ebuild b/kde-apps/kdegames-meta/kdegames-meta-9999.ebuild
index d581655d47..f8108a6e90 100644
--- a/kde-apps/kdegames-meta/kdegames-meta-9999.ebuild
+++ b/kde-apps/kdegames-meta/kdegames-meta-9999.ebuild
@@ -8,9 +8,7 @@ inherit kde5-meta-pkg
 DESCRIPTION="kdegames - merge this to pull in all kdegames-derived packages"
 HOMEPAGE="https://games.kde.org/"
 KEYWORDS=""
-IUSE="nls opengl python +qt4"
-
-[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
+IUSE="opengl python"
 
 RDEPEND="
 	$(add_kdeapps_dep bomber)
@@ -53,10 +51,4 @@ RDEPEND="
 		$(add_kdeapps_dep kubrick)
 	)
 	python? ( $(add_kdeapps_dep kajongg) )
-	qt4? (
-		$(add_kdeapps_dep kolf)
-		$(add_kdeapps_dep ksirk)
-		$(add_kdeapps_dep palapeli)
-		nls? ( $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) )
-	)
 "

diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-9999.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-9999.ebuild
index 4d13778e43..b391831a4e 100644
--- a/kde-apps/kdegraphics-meta/kdegraphics-meta-9999.ebuild
+++ b/kde-apps/kdegraphics-meta/kdegraphics-meta-9999.ebuild
@@ -8,9 +8,7 @@ inherit kde5-meta-pkg
 DESCRIPTION="kdegraphics - merge this to pull in all kdegraphics-derived packages"
 HOMEPAGE="https://www.kde.org/applications/graphics/"
 KEYWORDS=""
-IUSE="nls +qt4 scanner"
-
-[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
+IUSE="scanner"
 
 RDEPEND="
 	$(add_kdeapps_dep gwenview)
@@ -26,11 +24,5 @@ RDEPEND="
 	$(add_kdeapps_dep spectacle)
 	$(add_kdeapps_dep svgpart)
 	$(add_kdeapps_dep thumbnailers)
-	scanner? (
-		$(add_kdeapps_dep libksane)
-		qt4? (
-			$(add_kdeapps_dep ksaneplugin)
-			nls? ( $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) )
-		)
-	)
+	scanner? ( $(add_kdeapps_dep libksane) )
 "

diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-9999.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-9999.ebuild
index b594b69d9b..7041ed94fd 100644
--- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-9999.ebuild
+++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-9999.ebuild
@@ -11,9 +11,7 @@ HOMEPAGE="
 	https://multimedia.kde.org/
 "
 KEYWORDS=""
-IUSE="+cdrom +ffmpeg nls +qt4"
-
-[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
+IUSE="+cdrom +ffmpeg"
 
 RDEPEND="
 	$(add_kdeapps_dep dragon)
@@ -27,9 +25,4 @@ RDEPEND="
 		$(add_kdeapps_dep libkcompactdisc)
 	)
 	ffmpeg? ( $(add_kdeapps_dep ffmpegthumbs) )
-	qt4? (
-		$(add_kdeapps_dep juk)
-		cdrom? ( $(add_kdeapps_dep kscd) )
-		nls? ( $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) )
-	)
 "

diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-9999.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-9999.ebuild
index 0d5998fb38..596e6dadb6 100644
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-9999.ebuild
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-9999.ebuild
@@ -7,21 +7,11 @@ inherit kde5-meta-pkg
 
 DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"
 KEYWORDS=""
-IUSE="nls ppp +qt4"
+IUSE=""
 
-[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
-
-# FIXME: Add back whenever it gets ported
-# $(add_kdeapps_dep kopete)
 RDEPEND="
 	$(add_kdeapps_dep kdenetwork-filesharing)
 	$(add_kdeapps_dep krdc)
 	$(add_kdeapps_dep krfb)
 	$(add_kdeapps_dep plasma-telepathy-meta)
-	qt4? (
-		$(add_kdeapps_dep kget)
-		$(add_kdeapps_dep zeroconf-ioslave)
-		nls? ( $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) )
-		ppp? ( $(add_kdeapps_dep kppp) )
-	)
 "

diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-9999.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-9999.ebuild
index 825170606d..cb1ed98ca7 100644
--- a/kde-apps/kdeutils-meta/kdeutils-meta-9999.ebuild
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-9999.ebuild
@@ -8,9 +8,7 @@ inherit kde5-meta-pkg
 DESCRIPTION="kdeutils - merge this to pull in all kdeutils-derived packages"
 HOMEPAGE="https://www.kde.org/applications/utilities https://utils.kde.org"
 KEYWORDS=""
-IUSE="cups floppy lirc nls +qt4"
-
-[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
+IUSE="cups floppy"
 
 RDEPEND="
 	$(add_kdeapps_dep ark)
@@ -25,9 +23,4 @@ RDEPEND="
 	$(add_kdeapps_dep kwalletmanager)
 	cups? ( $(add_kdeapps_dep print-manager) )
 	floppy? ( $(add_kdeapps_dep kfloppy) )
-	qt4? (
-		$(add_kdeapps_dep sweeper)
-		lirc? ( $(add_kdeapps_dep kremotecontrol) )
-		nls? ( $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) )
-	)
 "