Version bump; remove old

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

3 files changed, 33 insertions, 26 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index fc43c003e255..69436b46de68 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.279 2015/02/21 10:43:45 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.280 2015/05/19 22:41:45 dilfridge Exp $
+
+*digikam-4.10.0 (19 May 2015)
+
+  19 May 2015; Andreas K. Huettel <dilfridge@gentoo.org> -digikam-4.6.0.ebuild,
+  +digikam-4.10.0.ebuild:
+  Version bump; remove old
 
 *digikam-4.7.0 (21 Feb 2015)
 
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index e8d027d24535..77d35a70790f 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -3,29 +3,30 @@ Hash: SHA256
 
 AUX digikam-4.4.0-hang.patch 3491 SHA256 c7318579e23e0912940eda369335c34ed545d4a36391b414dffb357740493364 SHA512 91977b6184181624db3e0aa21d20a74452d839090b59187f98be6dbf25959fe211fb8c19d88722e6efe3f75b4867bee139f8bfa3deaaf9bf37d33869de804d1d WHIRLPOOL cc5d96e5fac6d088dbb757824715691d9ab73aa37177fc2d086e279c6d506ef79151393ed68a5ec49468d9b055619417fb7c10361e2a722b4b12f9844e3a6dc4
 AUX digikam-4.4.0-libkexiv2.patch 1886 SHA256 66a8d2c682300d908677d7430b488de9daa4183c91aa4f4e3f7ea8e594f6a102 SHA512 9e797897f4a892d1a9e7aaa6a477a3300c7a11f170eb2a1768e89fa42009b9b30e33e2f3cc2d633b424681d9f37b2f5ecd812a90ad691359c20fd43d782f6c50 WHIRLPOOL a003726a30c9495d47d15eca45bb769ab15990ae246ef069b02c24ae2ddc5ad14158e9021cc6f89f128f338e46323555db5e47e6c2cc9dbdf296f238dd40fccd
+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 digikam-4.10.0.ebuild 4336 SHA256 19ee62389f9c25e4498f50017dbf24dba4147a8fb4a4b61789190e35ced39ed7 SHA512 72e60a7767cf1491f5c0a618606b73823171d030d1236f169f4178c7e5bf29542c7387b85c170432a9209bc0695dde71f8601c86f91351bb3a1ae9db6ba28e72 WHIRLPOOL 7ee651fe8a56a27cda1c98950307e50c67571a72a52b4fcd26d970f055e989887c13692fd302434122bd7cdfe7a7210624cf130291284abb5393757fbda23972
 EBUILD digikam-4.4.0-r1.ebuild 4632 SHA256 aef653925f3f39d6e0d756e32e30c504ae80463d7b5f183a8640136676136240 SHA512 c7905ee042cd7f37c9abebcbecd83d91fbff3a7ef81f162c0aa79008e64062b5fae63e4218f31d8aa3a1ede4185e3870de46a02cdc6b737c1a9928255030eaa8 WHIRLPOOL 4607589ea5427a5c450eeb932bdb8e5b4b952b2e228da98cfdb1c8f8601f6f377e748faed0f9c23c3812dbd4bf6abba4f772aa58eeec3908ec54561ed8b818a6
-EBUILD digikam-4.6.0.ebuild 4337 SHA256 9219dcd0f530ca809027e264e55e5d4526bd13877d9bfbdce3a5813cf1ab1ed2 SHA512 7f47c11866c13384b79cb66b295f00318717f7d8129ed7c41a5839243392557eb4a8c533661c5e8fed7395e5a1539de9fef312560c74b82d43db20fed4769e96 WHIRLPOOL d08552378b0b922c3fcd7eceabb40abadf6efdbae9c6cb60e4c2ff4dfb76be5ffea7e00859452bd1006017d0fa88981c26e8b051448d6c326080f1aade043adb
 EBUILD digikam-4.7.0.ebuild 4334 SHA256 bf5390b02da324f761b867044ac41a242921c70f858fe42ab8b2d26f071fe49f SHA512 443a24cb55254ce6689bbb80161190d1b72232679658e4f1edb153d30268f565a50d51512df09fccf01c79de4c5268d25ee8194d1f98f19d5b0b2531668e72e8 WHIRLPOOL bce96ee9cdbf2f2d50fae89e74629549643f0347b2162978b3227c5c282a8a7840f696ee22c9462a7f239943aad33570ca05800158155be9182e3fc156fd19c7
-MISC ChangeLog 45167 SHA256 923e030126b4a4c859fef572f7c5f6cb0f6c0b384f8492a0995944eb3a9345c4 SHA512 465537a076a2e240f650bffa0aced76b014cd68925521f94d46addb6c1736b10cf0635179164d27d00cb001ca0e132d2c669c18702e5b12ff81e4dd777ca25cd WHIRLPOOL 986f1af251b6967e52c484b19ba644a5baff27cb60f8ab8e6ce3795fd8f23764436c9531d0511f9bd30fe36e4f1338e34ac7815da60c0f11d8fd2a506e9ca4cf
+MISC ChangeLog 45331 SHA256 a213e05be9c743cbf45b19e4d55fe070fbcf13a4bdd79d573ba1805a36124468 SHA512 fd0ceccbc26add97e5ccc49270be4451d29893f1f96ac588a609bd285b70d381097daaebe089c3d4e6e5b2b2fd0b744200d316e5d8640b1c58669d8d97aa2812 WHIRLPOOL 6ddada2de12f2002600491acea449ab4163c35c31729c47c785d7635970d139bc710b498cd3ae5df4848b4945824743c301e5e1a2dc3888655a5c9bd2ec5e451
 MISC metadata.xml 736 SHA256 86156e040ab866e9a95236a9e4a3943b02ed4b9309e688b0217a7449e9601613 SHA512 d19e6e93b72c8141e778c36b0cd032db08ad2a87fc8f8325a32ab5df3c457787520267a8b86cce7272590d971de835fdf647a1a84a4c7d4c656f605dfe42d01e WHIRLPOOL bcb65d07cc4325fbde7b748da9977ddccb52097398cb0ab9db9599505a477bff1c97388c8143fc747d854d42ecab534d81160cb09c9e868b7c63f7bcea3c53f9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJU6GFjRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7Jc9D/4kUQGCnbqt6K+PhrWkCKRTjPNAg2kviQQN1/2z+CPWeEWUShMmbOQmcxcN
-bZzbDvc1ChMhrnqVWyxLL1gQEj36jpkQSxmfhZcmFYDCEg1BoLGgmGda3HA9E4gY
-RQep0mNIiCk3O6IUJJB3a163DBQJbicO9Cs1JkzW0t7J8lo++iy59Q7cpiW9GnM9
-x3r9pDR+RK/lzsI/G9ADITVn7tnLIJOefHTBzYmmBNif7eEHSoD8Sl9lofAhY2eq
-pnVxwEbn6dQoaezWob9rrmPd+KodA5TI0XA67FcJKzoAfDLg5z3B+NY8Wi5eFG5K
-rKLhNnasIyV3XICEU6N8K109OjzeuMl7GG40gYFt8e7WTC4Rnr8u1B67uLaY/VAY
-zenCkfbXG4lHlWj96pxdvr7BfcEeCvJtgazzRi0o5FhlSvSu5WRMYN1aDo/7KlYM
-soDXxMF3O+RUKmFdzCcZ8mDEp+9ZIrsjHsh29nsKJgFE8UH9+ipN32VS8ycK1Swx
-ToXJ/o2O5Afu6L6mLuXZy/x4NEMV7xD62/uPWWcuBh8PfKw2f0tpkruAnwU5Lij/
-r8qsH2AgSCOQCMmTHignd+Oaa/O29LHF0D7JaL038jKHE73wSbqDjkHB8mXel+iq
-xj2AYdXLdQcpQMH+/gn8Z4TfqKRyB9pJ7xbBqsq54oS05xXuQA==
-=Lne+
+iQJ8BAEBCABmBQJVW7wqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5TbsQAKyTzwFqedqLt+dHoaoWQFwo
+uC3ws5/ZZ16ryK7D+C0Ye7aAliZXuW+4pcz260s5DRM562v+eV6iWAAjvCNaBg5x
+D370PtLD9yIVJf8ur0I2HUYDsWdlzgEhOrSWPeY59YzRjrS7rqfFIPfzaPJtAB/J
+lHmlSmvO+8RK2TTYcC8OUUw3jdi1v5ZRiKB2HIoP52kxUc4cEB7/L4Zs2sPOq/mX
+8iT1MKHodl8qfFi8U01DHjaMpWgfXViAnjD1Aj4YXFswiQTDohZKGQvXrSaEOZTE
+i7QFyNsE437BAvdd5Js1NmJfxSHIW2huHDgmbhYsWADO7s4tcNfB2PgoY8gkTju9
+QOZMLW6iAZJLsD94eCz39PWoRnXBS3JqvEb8ejvb5oIxClhWQNRxyedQ1RGYTeO7
+jYxuswZckXgAPHqJKD4efHL1hKxcDYs8yeXImCM6Y2GCb2f2P9S+dZgmVBCJaHqI
+L8C7aNLDPtPbpBFD7oVRFDM9+8P3/0T5pgPIpWvoHfrGcK9g0zl8l7brJZcqrbYD
+LskrlKjcbrzhUudGA+loLsrlQpjQO17ytwNVWKq4xwZSeXLKr7SlEJn/Isj1T73X
+ulFNjtJb41g6s/A3cHgqp2jwJSL8rnCEfI6cXCLlpQf/7epgNwECVoywAe5DHKf4
+bVER/FFio8f4pia/A4jz
+=D1Jl
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-4.6.0.ebuild b/media-gfx/digikam/digikam-4.10.0.ebuild
index 1cadc8ade2dc..0278daada25d 100644
--- a/media-gfx/digikam/digikam-4.6.0.ebuild
+++ b/media-gfx/digikam/digikam-4.10.0.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/media-gfx/digikam/digikam-4.6.0.ebuild,v 1.2 2014/12/21 21:46:01 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-4.10.0.ebuild,v 1.1 2015/05/19 22:41:45 dilfridge Exp $
 
 EAPI=5
 
@@ -9,7 +9,6 @@ hu id is it ja ka kk km ko ku lb lo lt lv mi mk mn ms mt nb nds ne nl nn nso oc
 rw se sk sl sq sr sr@Latn ss sv ta te tg th tr tt uk uz uz@cyrillic ven vi wa xh zh_CN zh_HK zh_TW zu"
 
 KDE_HANDBOOK="optional"
-CMAKE_MIN_VERSION="2.8"
 KDE_MINIMAL="4.10"
 
 KDE_DOC_DIRS="doc-digikam doc-showfoto"
@@ -42,6 +41,7 @@ CDEPEND="
 			$(add_kdebase_dep libkipi)
 			kde-base/marble:4=[plasma] )
 	)
+	dev-qt/qtgui:4
 	media-libs/jasper
 	media-libs/lcms:2
 	>=media-libs/lensfun-0.2.6
@@ -51,15 +51,16 @@ CDEPEND="
 	>=media-libs/libpgf-6.12.27
 	media-libs/libpng:0=
 	>=media-libs/opencv-2.4.9
-	>=media-libs/tiff-3.8.2
-	virtual/jpeg
-	dev-qt/qtgui:4
+	media-libs/phonon[qt4]
+	>=media-libs/tiff-3.8.2:0
+	virtual/jpeg:0
+	x11-libs/libX11
 	|| ( dev-qt/qtsql:4[mysql] dev-qt/qtsql:4[sqlite] )
 	addressbook? ( $(add_kdebase_dep kdepimlibs) )
 	gphoto2? ( media-libs/libgphoto2:= )
 	mysql? ( virtual/mysql )
 	semantic-desktop? (
-		$(add_kdebase_dep baloo "" 4.12.0)
+		$(add_kdebase_dep baloo '' 4.12.0)
 	)
 "
 RDEPEND="${CDEPEND}
@@ -118,7 +119,6 @@ src_configure() {
 	# LQR = only allows to choose between bundled/external
 	local mycmakeargs=(
 		-DENABLE_LCMS2=ON
-		-DFORCED_UNBUNDLE=ON
 		-DWITH_LQR=ON
 		-DWITH_LENSFUN=ON
 		$(cmake-utils_use_enable addressbook KDEPIMLIBSSUPPORT)