Move various kde-base packages to kde-apps.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)

8 files changed, 24 insertions, 16 deletions

diff --git a/dev-vcs/kdesvn/ChangeLog b/dev-vcs/kdesvn/ChangeLog
index d35af24397d9..83a0fddf0d9a 100644
--- a/dev-vcs/kdesvn/ChangeLog
+++ b/dev-vcs/kdesvn/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-vcs/kdesvn
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/kdesvn/ChangeLog,v 1.38 2014/08/10 21:23:25 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/kdesvn/ChangeLog,v 1.39 2015/06/04 19:02:30 kensington Exp $
+
+  04 Jun 2015; Michael Palimaka <kensington@gentoo.org> kdesvn-1.6.0-r1.ebuild:
+  Move various kde-base packages to kde-apps.
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> kdesvn-1.6.0-r1.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/dev-vcs/kdesvn/kdesvn-1.6.0-r1.ebuild b/dev-vcs/kdesvn/kdesvn-1.6.0-r1.ebuild
index 6b374a47f358..4ad1ed5bb143 100644
--- a/dev-vcs/kdesvn/kdesvn-1.6.0-r1.ebuild
+++ b/dev-vcs/kdesvn/kdesvn-1.6.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/kdesvn/kdesvn-1.6.0-r1.ebuild,v 1.5 2014/08/10 21:23:25 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/kdesvn/kdesvn-1.6.0-r1.ebuild,v 1.6 2015/06/04 19:02:30 kensington Exp $
 
 EAPI=5
 
@@ -28,7 +28,7 @@ DEPEND="
 	dev-qt/qtsql:4[sqlite]
 "
 RDEPEND="${DEPEND}
-	!kde-base/kdesdk-kioslaves:4[subversion(+)]
+	!kde-apps/kdesdk-kioslaves:4[subversion(+)]
 "
 
 PATCHES=( "${FILESDIR}/${P}-bug-address.patch" )
diff --git a/dev-vcs/subversion/ChangeLog b/dev-vcs/subversion/ChangeLog
index 7fb302658f30..a85590ed8f10 100644
--- a/dev-vcs/subversion/ChangeLog
+++ b/dev-vcs/subversion/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-vcs/subversion
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.237 2015/06/02 05:05:28 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.238 2015/06/04 19:02:30 kensington Exp $
+
+  04 Jun 2015; Michael Palimaka <kensington@gentoo.org>
+  subversion-1.7.19.ebuild, subversion-1.7.20.ebuild, subversion-1.8.11.ebuild,
+  subversion-1.8.13-r1.ebuild, subversion-1.8.13-r2.ebuild:
+  Move various kde-base packages to kde-apps.
 
   02 Jun 2015; Jack Morgan <jmorgan@gentoo.org> subversion-1.7.20.ebuild,
   subversion-1.8.13-r1.ebuild:
diff --git a/dev-vcs/subversion/subversion-1.7.19.ebuild b/dev-vcs/subversion/subversion-1.7.19.ebuild
index aac456153e13..d9cc6bf959d2 100644
--- a/dev-vcs/subversion/subversion-1.7.19.ebuild
+++ b/dev-vcs/subversion/subversion-1.7.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.19.ebuild,v 1.12 2015/04/08 17:53:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.19.ebuild,v 1.13 2015/06/04 19:02:30 kensington Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -40,7 +40,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.6.18[threadsafe(+)]
 RDEPEND="${COMMON_DEPEND}
 	apache2? ( www-servers/apache[apache2_modules_dav] )
 	java? ( >=virtual/jre-1.5 )
-	kde? ( kde-base/kwalletd )
+	kde? ( kde-apps/kwalletd:4 )
 	nls? ( virtual/libintl )
 	perl? ( dev-perl/URI )"
 # Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
diff --git a/dev-vcs/subversion/subversion-1.7.20.ebuild b/dev-vcs/subversion/subversion-1.7.20.ebuild
index 3dec4d2c0bb9..77dae8c8025e 100644
--- a/dev-vcs/subversion/subversion-1.7.20.ebuild
+++ b/dev-vcs/subversion/subversion-1.7.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.20.ebuild,v 1.6 2015/06/02 05:05:28 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.20.ebuild,v 1.7 2015/06/04 19:02:30 kensington Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -40,7 +40,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.6.18[threadsafe(+)]
 RDEPEND="${COMMON_DEPEND}
 	apache2? ( www-servers/apache[apache2_modules_dav] )
 	java? ( >=virtual/jre-1.5 )
-	kde? ( kde-base/kwalletd )
+	kde? ( kde-apps/kwalletd:4 )
 	nls? ( virtual/libintl )
 	perl? ( dev-perl/URI )"
 # Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
diff --git a/dev-vcs/subversion/subversion-1.8.11.ebuild b/dev-vcs/subversion/subversion-1.8.11.ebuild
index c5c9197ef9e8..b117b00dd044 100644
--- a/dev-vcs/subversion/subversion-1.8.11.ebuild
+++ b/dev-vcs/subversion/subversion-1.8.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.8.11.ebuild,v 1.12 2015/04/08 17:53:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.8.11.ebuild,v 1.13 2015/06/04 19:02:30 kensington Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -40,7 +40,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.7.12
 RDEPEND="${COMMON_DEPEND}
 	apache2? ( www-servers/apache[apache2_modules_dav] )
 	java? ( >=virtual/jre-1.5 )
-	kde? ( || ( kde-apps/kwalletd:4 kde-base/kwalletd ) )
+	kde? ( kde-apps/kwalletd:4 )
 	nls? ( virtual/libintl )
 	perl? ( dev-perl/URI )"
 # Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
diff --git a/dev-vcs/subversion/subversion-1.8.13-r1.ebuild b/dev-vcs/subversion/subversion-1.8.13-r1.ebuild
index 586db2602bd6..60e437104a4f 100644
--- a/dev-vcs/subversion/subversion-1.8.13-r1.ebuild
+++ b/dev-vcs/subversion/subversion-1.8.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.8.13-r1.ebuild,v 1.6 2015/06/02 05:05:28 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.8.13-r1.ebuild,v 1.7 2015/06/04 19:02:30 kensington Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -41,7 +41,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.7.12
 RDEPEND="${COMMON_DEPEND}
 	apache2? ( www-servers/apache[apache2_modules_dav] )
 	java? ( >=virtual/jre-1.5 )
-	kde? ( || ( kde-apps/kwalletd:4 kde-base/kwalletd ) )
+	kde? ( kde-apps/kwalletd:4 )
 	nls? ( virtual/libintl )
 	perl? ( dev-perl/URI )"
 # Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
diff --git a/dev-vcs/subversion/subversion-1.8.13-r2.ebuild b/dev-vcs/subversion/subversion-1.8.13-r2.ebuild
index 4d49beae91f5..07ee89d39d27 100644
--- a/dev-vcs/subversion/subversion-1.8.13-r2.ebuild
+++ b/dev-vcs/subversion/subversion-1.8.13-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.8.13-r2.ebuild,v 1.1 2015/05/30 14:55:09 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.8.13-r2.ebuild,v 1.2 2015/06/04 19:02:30 kensington Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -41,7 +41,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.7.12
 RDEPEND="${COMMON_DEPEND}
 	apache2? ( www-servers/apache[apache2_modules_dav] )
 	java? ( >=virtual/jre-1.5 )
-	kde? ( || ( kde-apps/kwalletd:4 kde-base/kwalletd ) )
+	kde? ( kde-apps/kwalletd:4 )
 	nls? ( virtual/libintl )
 	perl? ( dev-perl/URI )"
 # Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once