Move various kde-base packages to kde-apps.

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

14 files changed, 50 insertions, 33 deletions

diff --git a/app-office/calligra/ChangeLog b/app-office/calligra/ChangeLog
index a705bc0db2fc..86f28e74813a 100644
--- a/app-office/calligra/ChangeLog
+++ b/app-office/calligra/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/calligra
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.122 2015/02/15 00:59:55 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.123 2015/06/04 19:00:44 kensington Exp $
+
+  04 Jun 2015; Michael Palimaka <kensington@gentoo.org> calligra-2.8.5.ebuild,
+  calligra-2.8.7.ebuild, calligra-9999.ebuild, metadata.xml:
+  Move various kde-base packages to kde-apps.
 
   15 Feb 2015; Andreas K. Huettel <dilfridge@gentoo.org> metadata.xml:
   Make repoman a bit happier
diff --git a/app-office/calligra/calligra-2.8.5.ebuild b/app-office/calligra/calligra-2.8.5.ebuild
index e1c8a393f158..c784bcff62cc 100644
--- a/app-office/calligra/calligra-2.8.5.ebuild
+++ b/app-office/calligra/calligra-2.8.5.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/app-office/calligra/calligra-2.8.5.ebuild,v 1.7 2015/02/14 14:38:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.8.5.ebuild,v 1.8 2015/06/04 19:00:44 kensington Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -74,7 +74,7 @@ RDEPEND="
 	!app-office/kspread
 	!app-office/kword
 	$(add_kdebase_dep kdelibs 'nepomuk?')
-	$(add_kdebase_dep knewstuff)
+	$(add_kdeapps_dep knewstuff)
 	dev-lang/perl
 	dev-libs/boost
 	dev-qt/qtcore:4[exceptions]
@@ -103,17 +103,17 @@ RDEPEND="
 	)
 	jpeg? ( virtual/jpeg:0 )
 	jpeg2k? ( media-libs/openjpeg:0 )
-	kdcraw? ( $(add_kdebase_dep libkdcraw) )
+	kdcraw? ( $(add_kdeapps_dep libkdcraw) )
 	kde? ( $(add_kdebase_dep kactivities) )
 	kdepim? ( $(add_kdebase_dep kdepimlibs) )
 	lcms? (
 		media-libs/lcms:2
 		x11-libs/libX11
 	)
-	marble? ( $(add_kdebase_dep marble) )
+	marble? ( $(add_kdeapps_dep marble) )
 	mysql? ( virtual/mysql )
 	nepomuk? ( dev-libs/soprano )
-	okular? ( $(add_kdebase_dep okular) )
+	okular? ( $(add_kdeapps_dep okular) )
 	opengl? ( virtual/glu )
 	openexr? ( media-libs/openexr )
 	pdf? (
diff --git a/app-office/calligra/calligra-2.8.7.ebuild b/app-office/calligra/calligra-2.8.7.ebuild
index 28898ee2a61a..1045eea17db1 100644
--- a/app-office/calligra/calligra-2.8.7.ebuild
+++ b/app-office/calligra/calligra-2.8.7.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/app-office/calligra/calligra-2.8.7.ebuild,v 1.4 2015/01/28 22:40:16 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.8.7.ebuild,v 1.5 2015/06/04 19:00:44 kensington Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -74,7 +74,7 @@ RDEPEND="
 	!app-office/kspread
 	!app-office/kword
 	$(add_kdebase_dep kdelibs 'nepomuk?')
-	$(add_kdebase_dep knewstuff)
+	$(add_kdeapps_dep knewstuff)
 	dev-lang/perl
 	dev-libs/boost
 	dev-qt/qtcore:4[exceptions]
@@ -103,17 +103,17 @@ RDEPEND="
 	)
 	jpeg? ( virtual/jpeg:0 )
 	jpeg2k? ( media-libs/openjpeg:0 )
-	kdcraw? ( $(add_kdebase_dep libkdcraw) )
+	kdcraw? ( $(add_kdeapps_dep libkdcraw) )
 	kde? ( $(add_kdebase_dep kactivities) )
 	kdepim? ( $(add_kdebase_dep kdepimlibs) )
 	lcms? (
 		media-libs/lcms:2
 		x11-libs/libX11
 	)
-	marble? ( $(add_kdebase_dep marble) )
+	marble? ( $(add_kdeapps_dep marble) )
 	mysql? ( virtual/mysql )
 	nepomuk? ( dev-libs/soprano )
-	okular? ( $(add_kdebase_dep okular) )
+	okular? ( $(add_kdeapps_dep okular) )
 	opengl? ( virtual/glu )
 	openexr? ( media-libs/openexr )
 	pdf? (
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 708e5887ae18..b237d49ee35c 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.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/app-office/calligra/calligra-9999.ebuild,v 1.51 2015/01/28 22:40:16 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.52 2015/06/04 19:00:44 kensington Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -74,7 +74,7 @@ RDEPEND="
 	!app-office/kspread
 	!app-office/kword
 	$(add_kdebase_dep kdelibs 'nepomuk?')
-	$(add_kdebase_dep knewstuff)
+	$(add_kdeapps_dep knewstuff)
 	dev-lang/perl
 	dev-libs/boost
 	dev-qt/qtcore:4[exceptions]
@@ -103,17 +103,17 @@ RDEPEND="
 	)
 	jpeg? ( virtual/jpeg:0 )
 	jpeg2k? ( media-libs/openjpeg:0 )
-	kdcraw? ( $(add_kdebase_dep libkdcraw) )
+	kdcraw? ( $(add_kdeapps_dep libkdcraw) )
 	kde? ( $(add_kdebase_dep kactivities) )
 	kdepim? ( $(add_kdebase_dep kdepimlibs) )
 	lcms? (
 		media-libs/lcms:2
 		x11-libs/libX11
 	)
-	marble? ( $(add_kdebase_dep marble) )
+	marble? ( $(add_kdeapps_dep marble) )
 	mysql? ( virtual/mysql )
 	nepomuk? ( dev-libs/soprano )
-	okular? ( $(add_kdebase_dep okular) )
+	okular? ( $(add_kdeapps_dep okular) )
 	opengl? ( virtual/glu )
 	openexr? ( media-libs/openexr )
 	pdf? (
diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index 31ecdb01bc41..4f6e350562f4 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -10,11 +10,11 @@
 		<flag name="glib">Enable support for C library routines from <pkg>dev-libs/glib</pkg></flag>
 		<flag name="gsf">Enable support for ODT structures extraction via <pkg>gnome-extra/libgsf</pkg></flag>
 		<flag name="import-filter">Enable support for various import filter file formats like WordPerfect, Visio and Apple Keynote</flag>
-		<flag name="kdcraw">Enable support for KDE image manipulating interface via <pkg>kde-base/libkdcraw</pkg></flag>
+		<flag name="kdcraw">Enable support for KDE image manipulating interface via <pkg>kde-apps/libkdcraw</pkg></flag>
 		<flag name="kdepim">Enable support for KDEPIM resources integration</flag>
 		<flag name="marble">Enable displaying of maps using Marble</flag>
 		<flag name="nepomuk">Enable Nepomuk based semantic desktop support (deprecated)</flag>
-		<flag name="okular">Enable bindings for <pkg>kde-base/okular</pkg></flag>
+		<flag name="okular">Enable bindings for <pkg>kde-apps/okular</pkg></flag>
 		<flag name="spacenav">Enable support for the 3Dconnexion spacenav input device via <pkg>dev-libs/libspnav</pkg></flag>
 		<flag name="vc">Enable support for <pkg>dev-libs/vc</pkg>, could be a significant speed boost on krita</flag>
 		<flag name="xbase">Enable support for xbase compatible database formats</flag>
diff --git a/app-office/libreoffice-bin/ChangeLog b/app-office/libreoffice-bin/ChangeLog
index e08cd848ee4c..c217ec0aa581 100644
--- a/app-office/libreoffice-bin/ChangeLog
+++ b/app-office/libreoffice-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libreoffice-bin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.186 2015/05/29 12:58:27 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.187 2015/06/04 19:00:44 kensington Exp $
+
+  04 Jun 2015; Michael Palimaka <kensington@gentoo.org>
+  libreoffice-bin-4.4.3.2.ebuild:
+  Move various kde-base packages to kde-apps.
 
   29 May 2015; Andreas K. Hüttel <dilfridge@gentoo.org>
   -libreoffice-bin-4.4.1.2.ebuild:
diff --git a/app-office/libreoffice-bin/libreoffice-bin-4.4.3.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-4.4.3.2.ebuild
index 2478113befc9..2068acb0706a 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-4.4.3.2.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-4.4.3.2.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/app-office/libreoffice-bin/libreoffice-bin-4.4.3.2.ebuild,v 1.3 2015/05/27 10:58:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-4.4.3.2.ebuild,v 1.4 2015/06/04 19:00:44 kensington Exp $
 
 EAPI=5
 
@@ -150,7 +150,7 @@ RDEPEND="${COMMON_DEPEND}
 	media-fonts/liberation-fonts
 	media-fonts/urw-fonts
 	java? ( >=virtual/jre-1.6 )
-	kde? ( || ( $(add_kdeapps_dep kioclient) $(add_kdebase_dep kioclient) ) )
+	kde? ( $(add_kdeapps_dep kioclient) )
 "
 
 PDEPEND="
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 8012949d2732..aabb863b5c50 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.635 2015/05/29 12:56:30 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.636 2015/06/04 19:00:44 kensington Exp $
+
+  04 Jun 2015; Michael Palimaka <kensington@gentoo.org>
+  libreoffice-4.4.3.2.ebuild, libreoffice-4.4.9999.ebuild,
+  libreoffice-9999.ebuild:
+  Move various kde-base packages to kde-apps.
 
   29 May 2015; Andreas K. Hüttel <dilfridge@gentoo.org>
   -libreoffice-4.4.1.2.ebuild, -libreoffice-4.4.2.2.ebuild:
diff --git a/app-office/libreoffice/libreoffice-4.4.3.2.ebuild b/app-office/libreoffice/libreoffice-4.4.3.2.ebuild
index bf9c7ac9254d..cf9f3bd8936d 100644
--- a/app-office/libreoffice/libreoffice-4.4.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-4.4.3.2.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/app-office/libreoffice/libreoffice-4.4.3.2.ebuild,v 1.4 2015/05/27 10:58:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.4.3.2.ebuild,v 1.5 2015/06/04 19:00:44 kensington Exp $
 
 EAPI=5
 
@@ -192,7 +192,7 @@ RDEPEND="${COMMON_DEPEND}
 	media-fonts/liberation-fonts
 	media-fonts/urw-fonts
 	java? ( >=virtual/jre-1.6 )
-	kde? ( || ( $(add_kdeapps_dep kioclient) $(add_kdebase_dep kioclient) ) )
+	kde? ( $(add_kdeapps_dep kioclient) )
 	vlc? ( media-video/vlc )
 "
 
diff --git a/app-office/libreoffice/libreoffice-4.4.9999.ebuild b/app-office/libreoffice/libreoffice-4.4.9999.ebuild
index e69a7024d9ba..9883c6a9f495 100644
--- a/app-office/libreoffice/libreoffice-4.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-4.4.9999.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/app-office/libreoffice/libreoffice-4.4.9999.ebuild,v 1.13 2015/05/22 22:48:43 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.4.9999.ebuild,v 1.14 2015/06/04 19:00:44 kensington Exp $
 
 EAPI=5
 
@@ -192,7 +192,7 @@ RDEPEND="${COMMON_DEPEND}
 	media-fonts/liberation-fonts
 	media-fonts/urw-fonts
 	java? ( >=virtual/jre-1.6 )
-	kde? ( || ( $(add_kdeapps_dep kioclient) $(add_kdebase_dep kioclient) ) )
+	kde? ( $(add_kdeapps_dep kioclient) )
 	vlc? ( media-video/vlc )
 "
 
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index fa9bfe49136d..1928b0c22589 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.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/app-office/libreoffice/libreoffice-9999.ebuild,v 1.34 2015/05/22 22:48:43 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999.ebuild,v 1.35 2015/06/04 19:00:44 kensington Exp $
 
 EAPI=5
 
@@ -192,7 +192,7 @@ RDEPEND="${COMMON_DEPEND}
 	media-fonts/liberation-fonts
 	media-fonts/urw-fonts
 	java? ( >=virtual/jre-1.6 )
-	kde? ( || ( $(add_kdeapps_dep kioclient) $(add_kdebase_dep kioclient) ) )
+	kde? ( $(add_kdeapps_dep kioclient) )
 	vlc? ( media-video/vlc )
 "
 
diff --git a/app-office/skrooge/ChangeLog b/app-office/skrooge/ChangeLog
index a5706befd9fc..60402858d7ab 100644
--- a/app-office/skrooge/ChangeLog
+++ b/app-office/skrooge/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/skrooge
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/skrooge/ChangeLog,v 1.64 2015/05/15 17:01:48 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/skrooge/ChangeLog,v 1.65 2015/06/04 19:00:44 kensington Exp $
+
+  04 Jun 2015; Michael Palimaka <kensington@gentoo.org> skrooge-1.10.0.ebuild,
+  skrooge-1.12.0.ebuild:
+  Move various kde-base packages to kde-apps.
 
 *skrooge-1.12.0 (15 May 2015)
 
diff --git a/app-office/skrooge/skrooge-1.10.0.ebuild b/app-office/skrooge/skrooge-1.10.0.ebuild
index 9ad1cd3fddb3..43c12e70c47c 100644
--- a/app-office/skrooge/skrooge-1.10.0.ebuild
+++ b/app-office/skrooge/skrooge-1.10.0.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/app-office/skrooge/skrooge-1.10.0.ebuild,v 1.3 2015/05/13 09:32:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/skrooge/skrooge-1.10.0.ebuild,v 1.4 2015/06/04 19:00:44 kensington Exp $
 
 EAPI=5
 
@@ -28,7 +28,7 @@ DEPEND="
 	dev-qt/qtsql:4[sqlite]
 "
 RDEPEND="${DEPEND}
-	$(add_kdebase_dep kde-dev-scripts)
+	$(add_kdeapps_dep kde-dev-scripts)
 "
 
 # upstream does not ship tests in releases
diff --git a/app-office/skrooge/skrooge-1.12.0.ebuild b/app-office/skrooge/skrooge-1.12.0.ebuild
index 3fd7bc14c191..8c58d7c05441 100644
--- a/app-office/skrooge/skrooge-1.12.0.ebuild
+++ b/app-office/skrooge/skrooge-1.12.0.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/app-office/skrooge/skrooge-1.12.0.ebuild,v 1.1 2015/05/15 17:01:48 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/skrooge/skrooge-1.12.0.ebuild,v 1.2 2015/06/04 19:00:44 kensington Exp $
 
 EAPI=5
 
@@ -29,7 +29,7 @@ DEPEND="
 	dev-qt/qtsql:4[sqlite]
 "
 RDEPEND="${DEPEND}
-	$(add_kdebase_dep kde-dev-scripts)
+	$(add_kdeapps_dep kde-dev-scripts)
 "
 
 # upstream does not ship tests in releases