Cleanup, re-add accidentally dropped useflag mysql, depend on kde-4.7

(Portage version: 2.1.10.7/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key B6C5F7DE)

3 files changed, 40 insertions, 18 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 1a0a59a..a4bf127 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  digikam-2.0.0_rc.ebuild:
+  Cleanup, re-add accidentally dropped useflag mysql, depend on kde-4.7
+
   06 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   digikam-2.0.0_rc.ebuild:
   Although not strictly required, it is probably safer to use libpgf-6.11.24
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 97e0382..1deea89 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX digikam-1.1.0-libpgf.patch 8996 RMD160 4f1a7ad7b28c43b3fe2e454eb3351f27a14bde6f SHA1 fd2b98e23c31d880a2a32f28161f279abef82c22 SHA256 f2001099ee5538a31a9660c223e59a25a19eb7c36a191831b849e1b81c58856d
 AUX digikam-1.1.0-libpng14.patch 1580 RMD160 769e9bf4030d795349cb260854e26c189471ccbc SHA1 9b3123dad7bd7530db6833296dc1de7ec240fd54 SHA256 0ae5e279aedc80857cb27ace7d1609b6cf632853513445896b88a7365b763fb9
 AUX digikam-1.2.0-docs-r3.patch 1926 RMD160 963f134c1bdb2e6b1a59b82efb7009733294ce6a SHA1 7cf403d5fd8f20142b7c1c6f6de225b5e66c28b9 SHA256 0687cd39780c1e40fec424f6ae5cce851e460681d02088eec763902c170ecb28
@@ -34,6 +37,23 @@ EBUILD digikam-1.9.0-r1.ebuild 3299 RMD160 c4f0ffdc7d1bb89581c721a4a85310e7ca4b7
 EBUILD digikam-1.9.0.ebuild 3242 RMD160 04df3e2432a19d01a07851d8a8a3821279aa4af0 SHA1 c80b1939a52ab7aa7c0032373022f3cb931fee81 SHA256 e5bc2256f812d90206d99b3ec6f6ffbad75e5dd0bbcccaa8e349e894eef73d53
 EBUILD digikam-2.0.0_beta5.ebuild 3245 RMD160 cc3e08c7da4a3bd909edb43f6b33ad3aff64b762 SHA1 a8501a880d6cc3c9e22153fc8288908de09c1d2a SHA256 8b5dfd0865866bb01fcfe6d5055b798194ea6e3dfefa29821dac73dd997643bf
 EBUILD digikam-2.0.0_beta6.ebuild 3226 RMD160 939ed0020e35608d4140e73b40f9266093c0e2a8 SHA1 6baad3fab16f5f406295f7e7e084e67e9c233e48 SHA256 b6ee9123131a9b97c984d7bfc05a9b69ce644083499702c0c18d394c5854ba75
-EBUILD digikam-2.0.0_rc.ebuild 3370 RMD160 58668a86e9f0fa77cf9d9ea6a39917616e207912 SHA1 8e567e80d44070618bb46de55d75ca1160321f70 SHA256 ffd574d11ee097c8eb4e2eb05e67095c870741ccb0292ef2dca7d3795c7bcfc5
-MISC ChangeLog 11853 RMD160 6361e822cb4cdbde9002995d53ac87a20507d611 SHA1 2a683af8732dd884e3fab61d9af3720815ec5c23 SHA256 0c1e5476878ffcd0d82514cd3c10f44de389cee11dae9a62b73c195b05406f83
+EBUILD digikam-2.0.0_rc.ebuild 3346 RMD160 be0115573261b514fa58148436c2c49c015c5826 SHA1 00b5733fbb44c4b345113749945cdc8c1d92cb96 SHA256 c49e09577600adad9478a9702a79f2003c99a132a22fee68ecc33b928e698111
+MISC ChangeLog 12010 RMD160 9ae712c69a3ad32799d2cc72d130bda5ee4fcc3c SHA1 363ad373e7411f9978cfba67cd1765ff1c596f8b SHA256 8376c41406c84a03ce41474a6d0db69d7512c59cd37bc9a0a04edb7ca9c93c43
 MISC metadata.xml 553 RMD160 7de4b2dc583e17cfab08965015c5bb6291b968d8 SHA1 c7eecc86fd6539448bc2a8296f77c2bc4796e3a1 SHA256 f3280886ea9f988ca1315148380f1c89c6c042d0bc511105f3b2c3a926e17b80
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJOMHWOAAoJENwGBM22xffeO84QAIp63v4ceC7fhc7ulFETs7fh
++hTa0NmQW3//A6idGCSXTinnpZcaFOVRf8ny0uKXuzSPJ1enN3FeQHRrdhttR2UM
+EsfhGN1Z7IMug1rzyk3d24xwf1mxAA2YCvFnZ4kVo813i/fGYIv52/isCDRrB0mC
+eL36N1+xdOgNIXCtsqHTfSnNLXjxPvuFH0fea2YTN25qCDZTEIEdwrDp4EIzMQQa
+XkcrwiaIAEdEqYRBOGsR1ncKm/T1Q4iK6SSUTq8Szmay+fxgZZuMLfVndrABgp4g
+7nWQkjj8CoU34ZC3LTBzQQJcnmSSWbug9UceU3tGJ6556T3jjwRCtdzk6yvN4e9r
+eWqpW7jaSs44J9GczO4jxhAUFkXLb/GrmO1NhL1EIrBqN/gWfeVlArQzb5BD4sQK
+xOw8PJLYaa6GwTzxvT68xzJxQ6TdMYTvypuqBM/1V/gXQeadS9miqdc53TC3sdMS
+ps9pp8pWr+P4+pSfWbUQGNZLOmG/Ml+c6bAy3ILpWd86rb/WM5E/HI3BBi56PQA5
+knUxDzCS9L47yIfOZhFWprYG8sFxmIJQ0VvxGL/UUkh40TOE7U4S9a1tlq/nuA5Q
+x4+oZ09npmNp7qHIUwmtTVyrb3r7FtqEMvnWA9eghUkxx0BYbB4I9Ta2XO+eJajU
+XqIAlP6OfYvXanby8cGl
+=P5KI
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-2.0.0_rc.ebuild b/media-gfx/digikam/digikam-2.0.0_rc.ebuild
index 12bade4..d3834ff 100644
--- a/media-gfx/digikam/digikam-2.0.0_rc.ebuild
+++ b/media-gfx/digikam/digikam-2.0.0_rc.ebuild
@@ -9,11 +9,8 @@ KDE_LINGUAS=""
 #	ko lt lv nds nn pa pl pt pt_BR ro se sl sv th tr vi zh_CN zh_TW"
 
 KDE_HANDBOOK="optional"
-
-CMAKE_MIN_VERSION=2.8
-
-KDEGRAPHICS_MINIMAL="4.6.31"
-# please leave the weird number here for the moment
+CMAKE_MIN_VERSION="2.8"
+KDE_MINIMAL="4.7"
 
 inherit kde4-base
 
@@ -27,32 +24,32 @@ LICENSE="GPL-2
 	handbook? ( FDL-1.2 )"
 KEYWORDS="~amd64 ~x86"
 SLOT="4"
-IUSE="addressbook debug doc gphoto2 semantic-desktop themedesigner +thumbnails video"
+IUSE="addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video"
 
 CDEPEND="
 	$(add_kdebase_dep kdelibs semantic-desktop)
-	$(add_kdebase_dep marble plasma)
-	$(add_kdebase_dep libkipi)
+	$(add_kdebase_dep libkdcraw)
 	$(add_kdebase_dep libkexiv2)
-	>=kde-base/libkdcraw-${KDEGRAPHICS_MINIMAL}
-	>=media-libs/libkface-${PV}
-	>=media-libs/libkmap-${PV}
+	$(add_kdebase_dep libkipi)
+	$(add_kdebase_dep marble plasma)
 	$(add_kdebase_dep solid)
 	media-libs/jasper
-	virtual/jpeg
 	media-libs/lcms:0
 	>=media-libs/lensfun-0.2.5
+	>=media-libs/libkface-${PV}
+	>=media-libs/libkmap-${PV}
 	media-libs/liblqr
+	>=media-libs/libpgf-6.11.24
 	media-libs/libpng
 	media-libs/tiff
-	>=media-libs/libpgf-6.11.24
-	>=media-plugins/kipi-plugins-1.2.0-r1
-	|| ( >=sci-libs/clapack-3.2.1-r6 sci-libs/lapack-atlas )
-	virtual/mysql
+	media-plugins/kipi-plugins
+	virtual/jpeg
 	x11-libs/qt-gui[qt3support]
+	|| ( >=sci-libs/clapack-3.2.1-r6 sci-libs/lapack-atlas )
 	|| ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
 	addressbook? ( $(add_kdebase_dep kdepimlibs) )
 	gphoto2? ( media-libs/libgphoto2 )
+	mysql? ( virtual/mysql )
 "
 RDEPEND="${CDEPEND}
 	$(add_kdebase_dep kreadconfig)
@@ -108,6 +105,7 @@ src_configure() {
 		$(cmake-utils_use_with semantic-desktop Soprano)
 		$(cmake-utils_use_enable themedesigner)
 		$(cmake-utils_use_enable thumbnails THUMBS_DB)
+		$(cmake-utils_use_enable mysql INTERNALMYSQL)
 		$(cmake-utils_use_enable debug DEBUG_MESSAGES)
 	)