Move various kde-base packages to kde-apps.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

5 files changed, 39 insertions, 35 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/Manifest b/media-plugins/kipi-plugins/Manifest
index 1d4373905ee2..47038206bdec 100644
--- a/media-plugins/kipi-plugins/Manifest
+++ b/media-plugins/kipi-plugins/Manifest
@@ -8,27 +8,26 @@ AUX kipi-plugins-4.6.0-options.patch 879 SHA256 ee42da1469c0aae8eb8ddfc9a80db44d
 DIST digikam-4.10.0.tar.bz2 69413654 SHA256 4207e68b6221307111b66bb69485d3e88150df95dae014a99f6f161a3da0c725 SHA512 a2f1d5f44719409ee45158106cc44541e7226e3c948b722045e104bc398f96233481d60e11dd198e96bfe3028201dac335be403ec74af1ef07e3137c3e9221a4 WHIRLPOOL 5d7997787c549318e5d7d677edc68ee2ebaa95c789b7d5f05e3ea5dea48d56afc23aa7bf3afa33f44353f4189644df7573683580486c0d248352ffb534215f37
 DIST digikam-4.4.0.tar.bz2 68871203 SHA256 5c68a2d200f5b502706128ea64839319aad333fb79548f49ecc92594e280d4e9 SHA512 4992fad1e574fc44eac53f3ac8d4ab78ccbf8e04beb54a211a9afc20af1efb6f8bacedea07e403f490e7f70a74ed5ac02d4f9b939dfaf25f64a4a9bda0a7d94a WHIRLPOOL 7a05ab9926227232a1cf52bf68da45b849b982e840b171f702610acce85a1ce8e59967a02e845a0ef19c316daee835861573aca40dc7b28422cf7d6d56119e2c
 DIST digikam-4.7.0-1.tar.bz2 70151058 SHA256 230a5841754107d273c953ad4aeef2b57265c4623decc74a454c437175468002 SHA512 a9e162c83d83b2183a4e8f254b971993b884677e24676b3dd58dcf8e90ca87f1046c099ea33083ee0f58eedd13aee69a242fbc3d1eab70e285956393637f3dd4 WHIRLPOOL e454bd9c95b3aa9a4c9007065c8ee3e1da595b389fc868a6a21cacba761d8101d4be507c299fd7651d8ab0c0ddff5fb4038bf49f73213a8ec2b69bcdce02808b
-EBUILD kipi-plugins-4.10.0.ebuild 4178 SHA256 99970f01abf8daddaf412f5b8b996321180ab8b88229c5b39db8c5a7ff137c73 SHA512 fea59be5c3d3693eb10fa9b025f70abafc918da9a63c444d48d9d49610189e3f7b8a5ece843bf78e88cfca93c91f7a3e9beeb8b77e1dd929359cfaa20075433a WHIRLPOOL 74ea26ef571d17ac5080fe639c3e05b5b1674567b8e93bec8ec8ff55deea3ee2481c1688e36551a6a248dfe6025461caf0bafd27ecf80629c6f39f279b7c8060
-EBUILD kipi-plugins-4.4.0.ebuild 3794 SHA256 aa9cd7eeeb61d21571c27f7a65621c7443846f410c250758422657c647562187 SHA512 47cf1c852a330bbcc6cc9a027a30868d878acfb3e3bc5383805a5766d8c6504717bc6c03ae8d310964a30edd78600a97a25839e5afc8e06e012f38a1c1dcd1b4 WHIRLPOOL e67dbe9ea4750a1eab73025380d39bce49203e888960365a193dbddcfee8b32fbde7a801a9275a02c8f4eeb1e6732ffe031872eb3cbc614160bb5c9778616238
-EBUILD kipi-plugins-4.7.0.ebuild 4137 SHA256 6f85b37509f7ab62578660a173f809cd4c9f7e22df41f8a8c033620b924f3237 SHA512 e13c48ee834a9da68de6093509de2caaf20d7026549e78103c2129e4f5181b9f3df80d0d0fef79f60b3aedcdc782711b46505f6ff61f23ae6260b480b5fc25be WHIRLPOOL 8338817245639ad0df760b175bda3c11f7a4d368d1af1757fc1bf489d150cf78305fb539a67ce16cacb409d3a1c1cdfde7d48cee0d56139b32943c7d52abcc51
-MISC ChangeLog 29490 SHA256 b9212161168d49ddccabe0f86980bcfd950533034a70295598fa1fb0adf9b74e SHA512 e239e6cb7bd7547a0e53f9610b6bc96eb079b1932747e852113151810a710c41cc715955854a88b32b095cf7de144410542b24a46804802b1c211946ead14554 WHIRLPOOL 36384c40f64eeb6b3482e8ce40a22560233ecf99e45fcb1b1d48d2f3e7ab3771ab58ae3539867aad5258c5e6c94605b98eb9af4529922c720e9d896ead352c4c
+EBUILD kipi-plugins-4.10.0.ebuild 4062 SHA256 8d243667ff00c5f50b4b7958581b4f4d12d0097391393e3c0c575858a8dd5eb9 SHA512 e041b52abb6f8acb485cc82b7205f11e87c0572bdb7c79cc0ec7dd65350b5cbd49fde7a69aef0a6367a964dfe663c1ebbfb49d332c24d66f310d68d914e1c006 WHIRLPOOL 7aba55dd681e4e8d3be659825f11b4681a25d5e9d6b8d306dfc74c7771e94158e27c347b86632a401eb6abeec1e6daffc21df1789cd0c74efc154622e7ee3064
+EBUILD kipi-plugins-4.4.0.ebuild 3677 SHA256 c2580bebf3cc164919c5f695c371fd94b9e231b39817a2817e744d91d5912cb4 SHA512 70323c9ad3be8f8bd3b4e23e1343ddb258aa22bbcf8c0a56c81d270fdf1f52e133cd2ec988411ca43eda17d77dc76570a2ae454e94c9381401412763cdb21ccd WHIRLPOOL a0077a44ee739028ec8bdd8a0596f63413bee018b601f2d907757b952233c10048d1b225d23b6df24dd5822014dfe399b19411b92926f16ebd0f83a3c4bedfa2
+EBUILD kipi-plugins-4.7.0.ebuild 4020 SHA256 85aac631fb836cbc62a82e607c8f53a83ed7e2b40c6a830cb990b1c82ab21c92 SHA512 44da049b64ab3cdf2ee942ade266e2157d3615b6da52fead6ff71454e136550a6034183e0e6518a5d861d58a51141f1f630a1a3582319b8a47e5b7f4c88434c1 WHIRLPOOL 1dfc2f723ef2228b03ac7995872b45480da32ad7edb39bc266cffa22c366b80cb7dd9d59830123f22d245f6e90052b5ac5a7319fc2494a9268896f7e359d66d2
+MISC ChangeLog 29680 SHA256 a906818c74d987e347de925229f65ebf7f2884b32c641ac4a19511d811229c3c SHA512 5b2c29ddf9de9cc1d33bdda9895dece8524af617acac97be4e82bca2e41b4cac46121723116cb79e31e70e0cba2b4d8b300bf89c2c603652dadd85e42d63624f WHIRLPOOL 755ccf1edeaf3ae35be72330889f7f1d53b68b08f7a22c865ef0bd3748ad5d81bf74cab82d232f488305911cc22185865eb0de571c714ae3d238bfc174a9f0fa
 MISC metadata.xml 978 SHA256 f1df3fb3204ef561b5d97017015dcc5e88f232518a16029c515345a8268cb8ed SHA512 e217ecdaea2dc2b89cc4c221277c01c053bb04302041da05b98392b82c84461f06b0f71242dccd0ae0d30ddc4875ef1965aa25405b957c06a2003e18857127b3 WHIRLPOOL 387912c880772d1b36a707540420b1a69023769722ceca63e4a14bc3ceb53589c9e050f26a76f9b51547ed9bb372d8f96926afe2f8b1632c3cd630deed966cf2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVYOB4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
-MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5li4P/2aF1pfpnYNFWz+NWUdxV05P
-V2eEsQQOfbHfyW6phfym3WiLRH6RFquWSMeeMhSxNITLiTgbllPfJsMPoWzE3mbi
-H+b3ztDXZWG01JrybBfxYgaWdsd0dHuBcN7ZCb1F+ap7fgxETaS3uyIO/stsEfPD
-oydjfH8f3ZNx4iIaTGJUp2xj9jZGnbOBhI4W7KQbJI2K0TE23lTqlv9PV8Uj46Wj
-t2BCffUglq400/2PehlnHdQWpdnx7PHrVKz1bKargRUWxp/ED+FcI4gTlcWIGYok
-dzVeiZLyHwQmH26lW4npb0fsHTGhV6EUORepVBtzE+mzRnNB6gH9vqRky/OM+6WB
-zJYxj+U2gjiLVOhke3rd5YbVE5Xj0RN+nZoH89RXye1jOs7lydhhjaY4ObKJPG5S
-IelBDIBx4sZMRsW6BCZB7z5ZVWR59O0dqT7/35xq2YScMvduCNUl3jOAjEd8l2sC
-szqDE/VBS98jfc+vJxnR1keEo/aPfpYtSiA6Flh/LvyJs7bCSZeHiYmtA0Y7WBSo
-kojhBuzSQGhiVGadEbfcPp1rrYGaqpHI4OoQlQa5I51pY4KmQM3nVgKGI1B8PFBr
-fI4J9CUFVcH7bdUJtSNiBQKPGFxAhFKL6IuN1N5unLS7ok5fOeahYognKf8yAWfu
-G3h3IF9MftPBP7zbqdVK
-=YWDl
+iQJiBAEBCABMBQJVcKIBRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7N8JD/93HofbAIS2uvsppNdzPaMKgc/yIavgZnBRWYFzYOfJ6kN4AFYUTVus1Ott
+or60NIrDt3BVzKadKIDMpjG5C7PKmEFYqhTnIZaVpB94EKmV5jCHT3iljovC0J7S
+bf5NT2ihpEKHAS27M7yh68hldjxY60Rnt2Gxfn7hRTtiACy4NX8zE6cCv/eHchgf
+sHe32sVhiPnsrCkWy4R1TYHBhdOm8k/IeYdXAJLkFh8ATxsZJqyaxfkGoY9NgVWE
+7sRi1fTbSsa4K5xUIgtiTYu9rSOGD7DnEtxFv4vy3R0/QukN0SYDasHZy/NBoUNL
+YTfNOA5H4cZszzCmDx7l1GLLPLcWNh93PzKwiEQrBI88WDihrPvg5qTD1eAZaexS
+n+mIhdW33ay1k6ert82MBQIn2yTAYMBlnqF5Llzji+/dBfwxRt1iOQy1knIv0QqV
+HDbia5MGAsIRrd6wjl1/F61QyRaMAFyvDsLJQbd/xKPV3thN0cqAMmRQrhVTaG5c
+jQhKOBrlJjhsN3poIIk6WQ8amFFbUuOI8oIoHn6ZK6ell2I1zqCCD95QEYtShxyF
+LHrukRHqZcdOgLzYumipSJeCHtuib+W0itmACqYWkaCHTBx9UMXMnJLhmxAvc8j3
+07fyZtHRex2tLoYcnltErwhIJjA2HOALR3fpspA6Pkw4vDgqJw==
+=nfis
 -----END PGP SIGNATURE-----
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 )