Move various kde-base packages to kde-apps.

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

4 files changed, 21 insertions, 16 deletions

diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog
index f099692bf36a..f893f9dc9e01 100644
--- a/media-plugins/kipi-plugins/ChangeLog
+++ b/media-plugins/kipi-plugins/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/kipi-plugins
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.180 2015/05/23 20:17:59 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.181 2015/06/04 19:07:45 kensington Exp $
+
+  04 Jun 2015; Michael Palimaka <kensington@gentoo.org>
+  kipi-plugins-4.10.0.ebuild, kipi-plugins-4.4.0.ebuild,
+  kipi-plugins-4.7.0.ebuild:
+  Move various kde-base packages to kde-apps.
 
   23 May 2015; Andreas K. Huettel <dilfridge@gentoo.org>
   kipi-plugins-4.10.0.ebuild, +files/kipi-plugins-4.10.0-jpeg.patch:
diff --git a/media-plugins/kipi-plugins/kipi-plugins-4.10.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-4.10.0.ebuild
index 6a672ed9c05f..5287d01ffe7c 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-4.10.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-4.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/media-plugins/kipi-plugins/kipi-plugins-4.10.0.ebuild,v 1.2 2015/05/23 20:17:59 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-4.10.0.ebuild,v 1.3 2015/06/04 19:07:45 kensington Exp $
 
 #
 # TODO: complete packaging of qtsoap and qtkoauth, see dilfridge overlay for work in progress
@@ -35,9 +35,9 @@ SLOT="4"
 IUSE="cdr calendar crypt debug expoblending gpssync +imagemagick ipod mediawiki panorama redeyes scanner upnp videoslideshow vkontakte"
 
 COMMONDEPEND="
-	|| ( kde-apps/libkipi:4 $(add_kdebase_dep libkipi) )
-	|| ( kde-apps/libkdcraw:4= kde-base/libkdcraw:4= )
-	|| ( kde-apps/libkexiv2:4= kde-base/libkexiv2:4= )
+	kde-apps/libkipi:4
+	kde-apps/libkdcraw:4=
+	kde-apps/libkexiv2:4=
 	dev-libs/expat
 	dev-libs/kqoauth
 	dev-libs/libxml2
@@ -61,7 +61,7 @@ COMMONDEPEND="
 			)
 	redeyes?	( >=media-libs/opencv-2.4.9 )
 	scanner? 	(
-			|| ( kde-apps/libksane:4 $(add_kdebase_dep libksane) )
+			  $(add_kdeapps_dep libksane)
 			  media-gfx/sane-backends
 			)
 	upnp?		( media-libs/herqq )
diff --git a/media-plugins/kipi-plugins/kipi-plugins-4.4.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-4.4.0.ebuild
index b4b69ac28e7c..39aeb34409de 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-4.4.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-4.4.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/media-plugins/kipi-plugins/kipi-plugins-4.4.0.ebuild,v 1.7 2015/04/03 19:47:41 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-4.4.0.ebuild,v 1.8 2015/06/04 19:07:45 kensington Exp $
 
 EAPI=5
 
@@ -31,9 +31,9 @@ SLOT="4"
 IUSE="cdr calendar crypt debug expoblending gpssync +imagemagick ipod mediawiki panorama redeyes scanner upnp videoslideshow vkontakte"
 
 COMMONDEPEND="
-	|| ( kde-apps/libkipi:4 $(add_kdebase_dep libkipi) )
-	|| ( kde-apps/libkdcraw:4= kde-base/libkdcraw:4= )
-	|| ( kde-apps/libkexiv2:4= kde-base/libkexiv2:4= )
+	kde-apps/libkipi:4
+	kde-apps/libkdcraw:4=
+	kde-apps/libkexiv2:4=
 	dev-libs/expat
 	dev-libs/kqoauth
 	dev-libs/libxml2
@@ -52,7 +52,7 @@ COMMONDEPEND="
 	mediawiki?	( >=net-libs/libmediawiki-3.0.0 )
 	redeyes?	( >=media-libs/opencv-2.4.9 )
 	scanner? 	(
-			|| ( kde-apps/libksane:4 $(add_kdebase_dep libksane) )
+			  $(add_kdeapps_dep libksane)
 			  media-gfx/sane-backends
 			)
 	upnp?		( media-libs/herqq )
diff --git a/media-plugins/kipi-plugins/kipi-plugins-4.7.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-4.7.0.ebuild
index 7b1d83f32d29..0c6aee5d3d99 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-4.7.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-4.7.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/media-plugins/kipi-plugins/kipi-plugins-4.7.0.ebuild,v 1.2 2015/04/03 19:47:41 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-4.7.0.ebuild,v 1.3 2015/06/04 19:07:45 kensington Exp $
 
 #
 # TODO: complete packaging of qtsoap and qtkoauth, see dilfridge overlay for work in progress
@@ -35,9 +35,9 @@ SLOT="4"
 IUSE="cdr calendar crypt debug expoblending gpssync +imagemagick ipod mediawiki panorama redeyes scanner upnp videoslideshow vkontakte"
 
 COMMONDEPEND="
-	|| ( kde-apps/libkipi:4 $(add_kdebase_dep libkipi) )
-	|| ( kde-apps/libkdcraw:4= kde-base/libkdcraw:4= )
-	|| ( kde-apps/libkexiv2:4= kde-base/libkexiv2:4= )
+	kde-apps/libkipi:4
+	kde-apps/libkdcraw:4=
+	kde-apps/libkexiv2:4=
 	dev-libs/expat
 	dev-libs/kqoauth
 	dev-libs/libxml2
@@ -61,7 +61,7 @@ COMMONDEPEND="
 			)
 	redeyes?	( >=media-libs/opencv-2.4.9 )
 	scanner? 	(
-			|| ( kde-apps/libksane:4 $(add_kdebase_dep libksane) )
+			  $(add_kdeapps_dep libksane)
 			  media-gfx/sane-backends
 			)
 	upnp?		( media-libs/herqq )