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

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

[Manuel Rüger]

commit:     5146febc7e747ed0dcd66c99394e693c32d8b9ca
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Jul 31 19:59:27 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Fri Jul 31 20:59:11 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5146febc

Remove conflicting KDE4-based RDEPENDs from meta

kgpg - depends on kde-base/kdepimlibs:4
kopete - depends on kde-base/kdepimlibs:4
kuser - depends on kde-base/kdepimlibs:4

Package-Manager: portage-2.2.20

Signed-off-by: Manuel Rüger <mrueg <AT> gentoo.org>

 kde-apps/kdeadmin-meta/kdeadmin-meta-15.07.80.ebuild          | 5 +++--
 kde-apps/kdeadmin-meta/kdeadmin-meta-15.08.49.9999.ebuild     | 3 ++-
 kde-apps/kdenetwork-meta/kdenetwork-meta-15.07.80.ebuild      | 5 +++--
 kde-apps/kdenetwork-meta/kdenetwork-meta-15.08.49.9999.ebuild | 3 ++-
 kde-apps/kdeutils-meta/kdeutils-meta-15.07.80.ebuild          | 5 +++--
 kde-apps/kdeutils-meta/kdeutils-meta-15.08.49.9999.ebuild     | 3 ++-
 6 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-15.07.80.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-15.07.80.ebuild
index a0fd2d0..938a219 100644
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-15.07.80.ebuild
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-15.07.80.ebuild
@@ -7,11 +7,12 @@ EAPI=5
 inherit kde5-meta-pkg
 
 DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE="+cron"
 
+# FIXME: Add back when ported
+# $(add_kdeapps_dep kuser)
 RDEPEND="
 	$(add_kdeapps_dep ksystemlog)
-	$(add_kdeapps_dep kuser)
 	cron? ( $(add_kdeapps_dep kcron) )
 "

diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-15.08.49.9999.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-15.08.49.9999.ebuild
index 084822c..938a219 100644
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-15.08.49.9999.ebuild
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-15.08.49.9999.ebuild
@@ -10,8 +10,9 @@ DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-deriv
 KEYWORDS=""
 IUSE="+cron"
 
+# FIXME: Add back when ported
+# $(add_kdeapps_dep kuser)
 RDEPEND="
 	$(add_kdeapps_dep ksystemlog)
-	$(add_kdeapps_dep kuser)
 	cron? ( $(add_kdeapps_dep kcron) )
 "

diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-15.07.80.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-15.07.80.ebuild
index 9de8b42..ba20d38 100644
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-15.07.80.ebuild
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-15.07.80.ebuild
@@ -7,13 +7,14 @@ EAPI=5
 inherit kde5-meta-pkg
 
 DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE="ppp"
 
+# FIXME: Add back when ported
+# $(add_kdeapps_dep kopete)
 RDEPEND="
 	$(add_kdeapps_dep kdenetwork-filesharing)
 	$(add_kdeapps_dep kget)
-	$(add_kdeapps_dep kopete)
 	$(add_kdeapps_dep krdc)
 	$(add_kdeapps_dep krfb)
 	$(add_kdeapps_dep plasma-telepathy-meta)

diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-15.08.49.9999.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-15.08.49.9999.ebuild
index 27b87a1..ba20d38 100644
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-15.08.49.9999.ebuild
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-15.08.49.9999.ebuild
@@ -10,10 +10,11 @@ DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"
 KEYWORDS=""
 IUSE="ppp"
 
+# FIXME: Add back when ported
+# $(add_kdeapps_dep kopete)
 RDEPEND="
 	$(add_kdeapps_dep kdenetwork-filesharing)
 	$(add_kdeapps_dep kget)
-	$(add_kdeapps_dep kopete)
 	$(add_kdeapps_dep krdc)
 	$(add_kdeapps_dep krfb)
 	$(add_kdeapps_dep plasma-telepathy-meta)

diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-15.07.80.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-15.07.80.ebuild
index 8c5fe0a..aafae4f 100644
--- a/kde-apps/kdeutils-meta/kdeutils-meta-15.07.80.ebuild
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-15.07.80.ebuild
@@ -8,16 +8,17 @@ inherit kde5-meta-pkg
 
 DESCRIPTION="kdeutils - merge this to pull in all kdeutils-derived packages"
 HOMEPAGE="http://www.kde.org/applications/utilities http://utils.kde.org"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE="cups floppy lirc"
 
+# FIXME: Add back when ported
+# $(add_kdeapps_dep kgpg)
 RDEPEND="
 	$(add_kdeapps_dep ark)
 	$(add_kdeapps_dep filelight)
 	$(add_kdeapps_dep kcalc)
 	$(add_kdeapps_dep kcharselect)
 	$(add_kdeapps_dep kdf)
-	$(add_kdeapps_dep kgpg)
 	$(add_kdeapps_dep ktimer)
 	$(add_kdeapps_dep kwalletmanager)
 	$(add_kdeapps_dep superkaramba)

diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-15.08.49.9999.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-15.08.49.9999.ebuild
index 2124052..aafae4f 100644
--- a/kde-apps/kdeutils-meta/kdeutils-meta-15.08.49.9999.ebuild
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-15.08.49.9999.ebuild
@@ -11,13 +11,14 @@ HOMEPAGE="http://www.kde.org/applications/utilities http://utils.kde.org"
 KEYWORDS=""
 IUSE="cups floppy lirc"
 
+# FIXME: Add back when ported
+# $(add_kdeapps_dep kgpg)
 RDEPEND="
 	$(add_kdeapps_dep ark)
 	$(add_kdeapps_dep filelight)
 	$(add_kdeapps_dep kcalc)
 	$(add_kdeapps_dep kcharselect)
 	$(add_kdeapps_dep kdf)
-	$(add_kdeapps_dep kgpg)
 	$(add_kdeapps_dep ktimer)
 	$(add_kdeapps_dep kwalletmanager)
 	$(add_kdeapps_dep superkaramba)