Version bump; remove old

Package-Manager: portage-2.2.19/cvs/Linux x86_64
Manifest-Sign-Key: 0x0B08240A96F66571

3 files changed, 39 insertions, 22 deletions

diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog
index 39ec8917c53f..e879ecce1e69 100644
--- a/media-plugins/kipi-plugins/ChangeLog
+++ b/media-plugins/kipi-plugins/ChangeLog
@@ -1,6 +1,12 @@
 # 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.178 2015/04/03 19:47:41 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.179 2015/05/19 21:59:34 dilfridge Exp $
+
+*kipi-plugins-4.10.0 (19 May 2015)
+
+  19 May 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kipi-plugins-4.6.0.ebuild, +kipi-plugins-4.10.0.ebuild:
+  Version bump; remove old
 
   03 Apr 2015; Michael Palimaka <kensington@gentoo.org>
   kipi-plugins-4.4.0.ebuild, kipi-plugins-4.6.0.ebuild,
diff --git a/media-plugins/kipi-plugins/Manifest b/media-plugins/kipi-plugins/Manifest
index 64edefcd1a69..a733e98bb3b0 100644
--- a/media-plugins/kipi-plugins/Manifest
+++ b/media-plugins/kipi-plugins/Manifest
@@ -4,29 +4,30 @@ Hash: SHA256
 AUX kipi-plugins-3.0.0-options.patch 1069 SHA256 064e9b865c21491eec7947cf0e12160866983f982243a4cc715efbf9116b172e SHA512 d58edfe3955e480e34c3ee64313c5ada15a664df7dc2369791f1bd5d7e05bc5f1666681d5b008a580de6cb00ff6c87d13dd1845ed0d7ad70a76e9888edce96cd WHIRLPOOL e59b098d5f8fcb2b487ae1dda07ed0cbc9cfa81095655eb120e985defa2aadb7e2bca6db015f1f1c6ef1645e2c8b1f329cb595c588ffc3f09c977b2cd69d856e
 AUX kipi-plugins-3.4.0-staticar.patch 877 SHA256 43e67c5da27331664c3ab3b97d8a481b4836ffd1498db55bee1bbac5489c9d5a SHA512 bd904c38b5acf4247707ea20e3c99ba602225969f1b9f006aa0f69f01ed8c127c4c1fe5183f1bf1bf71dd3fba36d6de787294a3b0de023520352066e10ab0047 WHIRLPOOL d9190cc44b6e1536806b42ecfe43edf6f9b6cbc980722a1407247d1fe2440db92e9831b61e1e089da0d5fa4867f204fff4d803aa8e064cf684b37053f377dbe1
 AUX kipi-plugins-4.6.0-options.patch 879 SHA256 ee42da1469c0aae8eb8ddfc9a80db44db9ff99fb467eec1c7fe1aaadb627213d SHA512 95a34cb4077390ac8b827e870fb501b87e27a9e624bd19f30cfee774282b4abe6e7da7d5f7d57ebfc962ea6b88c92ff793e0867ce97c474b34beec347370fddc WHIRLPOOL 0bfb2a446130a50de78507d371436f54a2293fa189072bc157631e70428c6bfea815a3aa38efaf40e38fa65856a8db1292072e9e99ecf2fc6ed94ac0029fa7d1
+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.6.0.tar.bz2 70266430 SHA256 b047a3172203e036c35f73dbb93cc7e71408c05bedaa8f7f1e0cc539a355a345 SHA512 557133712c88f987fdde4c9b3d97c09c7f744a7d5bc7056803a2bf828a7f8fbe0534f9a131b82175c1bf2a5a76fb4ea06c21a70f9925082239a9fce74efa4b92 WHIRLPOOL cc07964fe78e0fbbf6753344a74d51dee88caaa70ba3d68fbac7f766f8ee1996eb435bf56a2d51882c842b54d5a3429763e358b58b5ce6ccc1870fdd2438101e
 DIST digikam-4.7.0-1.tar.bz2 70151058 SHA256 230a5841754107d273c953ad4aeef2b57265c4623decc74a454c437175468002 SHA512 a9e162c83d83b2183a4e8f254b971993b884677e24676b3dd58dcf8e90ca87f1046c099ea33083ee0f58eedd13aee69a242fbc3d1eab70e285956393637f3dd4 WHIRLPOOL e454bd9c95b3aa9a4c9007065c8ee3e1da595b389fc868a6a21cacba761d8101d4be507c299fd7651d8ab0c0ddff5fb4038bf49f73213a8ec2b69bcdce02808b
+EBUILD kipi-plugins-4.10.0.ebuild 4139 SHA256 0591fc02ee9bd5c19a5b813b4ec5f02d6e277dda6e033c5ed725a9187fded960 SHA512 d650d2c2b93f118beffed0a479a4bcc9af7a7ee32e05354d9fef724266a2782cf5641198d31039a8890a818c52a821c5c66f5f58664ee7d4a299cb68b394b0ac WHIRLPOOL 9b6a3879ece472279b1a07eaabc0d63ae9ac9bf809e0759a7d6363ec26f7704762450db53efb00a11c749e92655e817b5fcd5c85d906ee17ab8712cacbad466d
 EBUILD kipi-plugins-4.4.0.ebuild 3794 SHA256 aa9cd7eeeb61d21571c27f7a65621c7443846f410c250758422657c647562187 SHA512 47cf1c852a330bbcc6cc9a027a30868d878acfb3e3bc5383805a5766d8c6504717bc6c03ae8d310964a30edd78600a97a25839e5afc8e06e012f38a1c1dcd1b4 WHIRLPOOL e67dbe9ea4750a1eab73025380d39bce49203e888960365a193dbddcfee8b32fbde7a801a9275a02c8f4eeb1e6732ffe031872eb3cbc614160bb5c9778616238
-EBUILD kipi-plugins-4.6.0.ebuild 3903 SHA256 f8e22639d9bad002935006682884e9137ba5d881ede012e6f21885765c6ff7d6 SHA512 c3d515843385af52f5547172cb8bfcc88816af2b5cc1ed7ff51cc75c159a29741cc1606d8449a0fe6eb131f4ff58e82aaa3926f210bb0e07177adaed734ab538 WHIRLPOOL 1268fce14779da1d5259b1046c7f663af41a896df38bbe1e64bc5f79d26005c6d41cd716aa2f4381a1105a5d61e544b91b1d62cdd54e9cd920a4320f41b0fc05
 EBUILD kipi-plugins-4.7.0.ebuild 4137 SHA256 6f85b37509f7ab62578660a173f809cd4c9f7e22df41f8a8c033620b924f3237 SHA512 e13c48ee834a9da68de6093509de2caaf20d7026549e78103c2129e4f5181b9f3df80d0d0fef79f60b3aedcdc782711b46505f6ff61f23ae6260b480b5fc25be WHIRLPOOL 8338817245639ad0df760b175bda3c11f7a4d368d1af1757fc1bf489d150cf78305fb539a67ce16cacb409d3a1c1cdfde7d48cee0d56139b32943c7d52abcc51
-MISC ChangeLog 29148 SHA256 3834eaa32a9aa2a29def1530455487edfd1718b4556a0f7870833aa586e78886 SHA512 914bf7d6df996dd7e4cb6830708be63134ca3ddb10ff8f7c312ba1726c520a235198ac6c2a55df11a3805160aa03f07f87fbaeeb46d47065ee6210278cd2d72e WHIRLPOOL 839b1bef17821d11eea6180b0ac311bb4570e61442a968bb1b0348122642947fee8721222648953765fd3e1edce5f7584bc9fe068c63d75365adf4e0ea0eef89
+MISC ChangeLog 29327 SHA256 f4b0313c8c10f6a3032e2e38a239ad178e761f0270a3c58e086f0bf2ec19f4e8 SHA512 ebc10106016693a6e9660d846f60da2e74141d806cf6ebf93bad6b5bd1b9f386d9dec72b8b359c8d3c1d1ee3b8f56888d0205ca33e1edb9feac0f2c608cc0fa4 WHIRLPOOL 7d74d3aa0caf0a16f94b37a24fa193ebf5f309cfa0cc2195158a409910fbc04adf6490f1b6652f9652575ec8285979790714fdba683cec292ff4cdc51af812f7
 MISC metadata.xml 978 SHA256 f1df3fb3204ef561b5d97017015dcc5e88f232518a16029c515345a8268cb8ed SHA512 e217ecdaea2dc2b89cc4c221277c01c053bb04302041da05b98392b82c84461f06b0f71242dccd0ae0d30ddc4875ef1965aa25405b957c06a2003e18857127b3 WHIRLPOOL 387912c880772d1b36a707540420b1a69023769722ceca63e4a14bc3ceb53589c9e050f26a76f9b51547ed9bb372d8f96926afe2f8b1632c3cd630deed966cf2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJVHu5bRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7OH8D/wPI8WNKY5PZ4h1NwyjUU+E12Gy+gjj5reQRdsQpqSGJd+qRslutKcLB+LB
-CnF3gbXJii3sDJG2vl05GSkyh9OQPHeRhzwRE9DO/z2Ka091DOfnNFetaiq89nfN
-oZwhtLFzkC0/q4goL2q6n8NdGcaFP4f0NSu6ag594DskHWZldy/ITnnKrYDliz/j
-BB6H9MZwBIy/Wb2cOFuLLbT107QRFBjEm+f0yjART4Ha+FPU5GU8oI/Tk1U69CXy
-hLLLQDQ7OHDeLBMFCuAIvEpz7/PtI4t/Rfan7ou8bqc9oucYeKUVzQNwhoR1xEVd
-MG1ce9wlKkKAXpFPh7h39JqR6LrQDPxjGGxjoHukfIXEJJe2nUHECI6eD/w/Tf7E
-8XiE4Uut5mii73AI+Fq6myZ5ohYgnjGsoUTLwbA72sPW+zqPj8B/llfKFdImIQAV
-yV3oaxVh2nGXlhNhRFzvZ9dKkwELqYi6LWZieRz1X4UDAc/cUhXbod/FWdY95ANJ
-x0hq9QVWmxkGjNwUXivIIzeE2zi3veoJGFJQsYlOZmBgp9CLrW5g20G2TxHiKxN2
-oIe6BT7Da5wJY9QtVgdgGOXOjKkHb5yqPBAzyJC1B0D8fBKSyrx0Irk1pEFGciss
-sx/OAeGtaJHjjm0kF7rb1RZIofSQ6ww7DITQ+yy57uHOviLD+A==
-=kbzZ
+iQJ8BAEBCABmBQJVW7JHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5Q8EQAKsM8zvz7ei3xt6n2M+DypoH
+YLINZ2ywTKz2UXmqSj318z64fEb7uRQY6kbVtcqwcwvNb7TdC8KXm7ugiUgbTxRN
+9BWF5DJ6Tfg4VDC/e+LYdGVsD7WGdxzn4DbsUTRs46QwN6nWOxcPvOH4OS813xwm
+5Wx2eJjFePMQGYkR8rzGbkV8T9ewNFxnP8shNA+AD92XPI2QjCh0Ns9SLNz6UVQ3
+FCJbDxOwBJolo6XMbRve2ebnIFbwqgK02ux4IYz2BP2yp6W1p0uEv/wJ4AXiVQSt
+rggZo5KnhNWkmTydeGpmNzPDLnD0DhmrcEwpLFYWo2gYkzUCui03v4aetSy/TLQl
+zeNSEelrA38N5FBVv2xioeIp37T1cED/ddsYfXEPiojOsvkhLrKwguZyCYC1xrso
+yQOW4L7qD8UPRq9CBTYnyMRuCoFTDR220LEMvy9vJDwem+mTNAreF9dPel8Uhx4D
+ml67gubryLvap+4vBYgjA4nv82b9KwJBqaZ9laAAqUPv/NktWj44/0v7KkbdIMaB
+m2n7Fut7DhWZZWoZqjlto0nI7LhsAHyayqCCsm0i0SVLbii2F2Rmswm/KxHX9iOb
+te/0fYOCFvUaVzZ+cPAMyVqslZu0pSPvc4QgITjgGvpp+gQBvlxHzluDHpJMzzU4
+P/7+SrLsy4ZXdtVX37yw
+=hUZU
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/kipi-plugins/kipi-plugins-4.6.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-4.10.0.ebuild
index 435046b06252..15fa65cd94e7 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-4.6.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.6.0.ebuild,v 1.3 2015/04/03 19:47:41 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-4.10.0.ebuild,v 1.1 2015/05/19 21:59:34 dilfridge Exp $
 
 #
 # TODO: complete packaging of qtsoap and qtkoauth, see dilfridge overlay for work in progress
@@ -43,10 +43,11 @@ COMMONDEPEND="
 	dev-libs/libxml2
 	dev-libs/libxslt
 	dev-libs/qjson
+	dev-qt/qtxmlpatterns:4
 	gpssync?	( >=media-libs/libkgeomap-4.6.0 )
 	media-libs/libpng:0=
-	media-libs/tiff
-	virtual/jpeg
+	media-libs/tiff:0
+	virtual/jpeg:0
 	calendar?	( $(add_kdebase_dep kdepimlibs) )
 	crypt?		( app-crypt/qca:2[qt4(+)] )
 	ipod?		(
@@ -54,6 +55,10 @@ COMMONDEPEND="
 			  x11-libs/gtk+:2
 			)
 	mediawiki?	( >=net-libs/libmediawiki-3.0.0 )
+	opengl?		(
+				media-libs/phonon[qt4]
+				x11-libs/libXrandr
+			)
 	redeyes?	( >=media-libs/opencv-2.4.9 )
 	scanner? 	(
 			|| ( kde-apps/libksane:4 $(add_kdebase_dep libksane) )
@@ -106,6 +111,10 @@ src_prepare() {
 	echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
 	echo "add_subdirectory( po )" >> CMakeLists.txt
 
+	if ! use redeyes ; then
+		sed -i -e "/DETECT_OPENCV/d" CMakeLists.txt || die
+	fi
+
 	kde4-base_src_prepare
 }
 
@@ -124,11 +133,12 @@ src_configure() {
 		$(cmake-utils_use_with calendar KdepimLibs)
 		$(cmake-utils_use_with gpssync KGeoMap)
 		$(cmake-utils_use_with mediawiki Mediawiki)
-		$(cmake-utils_use_with redeyes OpenCV)
+		$(cmake-utils_use_find_package redeyes OpenCV)
 		$(cmake-utils_use_with opengl OpenGL)
 		$(cmake-utils_use_with crypt QCA2)
 		$(cmake-utils_use_with scanner KSane)
 		$(cmake-utils_use_with upnp Hupnp)
+		$(cmake-utils_use_with vkontakte LibKVkontakte)
 		$(cmake-utils_use_with videoslideshow QtGStreamer)
 		$(cmake-utils_use_enable expoblending)
 		$(cmake-utils_use_enable panorama)