[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/

["Michael Palimaka" <kensington@gentoo.org>]

commit:     9c74e7823258cab5a8b515768bff6aad85563bc4
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 22 13:08:28 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Oct 22 13:18:11 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c74e782

media-gfx/digikam: restore accidentally-removed version

This partially reverts commit 4ec36b7ff9a87f3a4706dd194b2155fe64c32c14.

 media-gfx/digikam/Manifest                         |  2 +-
 ...digikam-4.10.0.ebuild => digikam-4.12.0.ebuild} | 30 ++++++++--------------
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 6f15b0b..978ab34 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,3 +1,3 @@
-DIST digikam-4.10.0.tar.bz2 69413654 SHA256 4207e68b6221307111b66bb69485d3e88150df95dae014a99f6f161a3da0c725 SHA512 a2f1d5f44719409ee45158106cc44541e7226e3c948b722045e104bc398f96233481d60e11dd198e96bfe3028201dac335be403ec74af1ef07e3137c3e9221a4 WHIRLPOOL 5d7997787c549318e5d7d677edc68ee2ebaa95c789b7d5f05e3ea5dea48d56afc23aa7bf3afa33f44353f4189644df7573683580486c0d248352ffb534215f37
+DIST digikam-4.12.0.tar.bz2 69527960 SHA256 15043afb04733e059460165bc3cdf58dc42a67d7a349fbe12c2ebbe1946e3420 SHA512 a5ebe481ef9803475cd2d4d198b0d093753ecb71367662f0e83a151ab34a2ff071139b28c1d9600279463fed96745b025db86d24b059b0794bc4a2b50338df85 WHIRLPOOL cf29c3555ce41a298c9760287996d8edee76ff8a6ec42b503f55059e40b35f91cf56afb054f641e800f6e630d851491c2f77e0bd67020feefe8d6adf36a643f5
 DIST digikam-4.14.0.tar.bz2 59805228 SHA256 9d7bcb689d8c29be2e81976f0a043220f442a24f2071284044e7f1a799a7fdad SHA512 3029e9b67d9d055bd9aee0d6d01e87950702e026f9f44b513155946ba087ec58b300f945a035a418afae45365ed007d8db6a1a90ed1d391e5e0e4cb679168ccf WHIRLPOOL 35a3caedc9a4799f161b26b3b4df51da18a31be50a8a6da5b12a339a353755d73a47f103099087e3dc8e6926f65ae19638efea3585c86f72173a086056bf48ce
 DIST digikam-4.4.0.tar.bz2 68871203 SHA256 5c68a2d200f5b502706128ea64839319aad333fb79548f49ecc92594e280d4e9 SHA512 4992fad1e574fc44eac53f3ac8d4ab78ccbf8e04beb54a211a9afc20af1efb6f8bacedea07e403f490e7f70a74ed5ac02d4f9b939dfaf25f64a4a9bda0a7d94a WHIRLPOOL 7a05ab9926227232a1cf52bf68da45b849b982e840b171f702610acce85a1ce8e59967a02e845a0ef19c316daee835861573aca40dc7b28422cf7d6d56119e2c

diff --git a/media-gfx/digikam/digikam-4.10.0.ebuild b/media-gfx/digikam/digikam-4.12.0.ebuild
similarity index 91%
rename from media-gfx/digikam/digikam-4.10.0.ebuild
rename to media-gfx/digikam/digikam-4.12.0.ebuild
index adee011..bb4c04b 100644
--- a/media-gfx/digikam/digikam-4.10.0.ebuild
+++ b/media-gfx/digikam/digikam-4.12.0.ebuild
@@ -7,12 +7,8 @@ EAPI=5
 KDE_LINGUAS="af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa fi fo fr fy ga gl ha he hi hr hsb
 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 pa pl pt pt_BR ro ru
 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"
-KDE_MINIMAL="4.10"
-
 KDE_DOC_DIRS="doc-digikam doc-showfoto"
-
 inherit kde4-base
 
 MY_PV=${PV/_/-}
@@ -32,12 +28,13 @@ CDEPEND="
 	kde-apps/kdebase-kioslaves:4
 	kde-apps/libkdcraw:4=
 	kde-apps/libkexiv2:4=
-	>=kde-apps/libkface-4.6.0:4
-	>=kde-apps/libkgeomap-4.6.0:4=
+	>=kde-apps/libkface-4.12.0:4
+	>=kde-appslibkgeomap-4.12.0:4=
 	kde-apps/libkipi:4
 	kde-apps/marble:4=[plasma]
 	kde-apps/kcmshell:4
 	dev-qt/qtgui:4
+	|| ( dev-qt/qtsql:4[mysql] dev-qt/qtsql:4[sqlite] )
 	media-libs/jasper
 	media-libs/lcms:2
 	>=media-libs/lensfun-0.2.6
@@ -49,25 +46,18 @@ CDEPEND="
 	>=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)
-	)
+	semantic-desktop? ( $(add_kdebase_dep baloo '' 4.12.0) )
 "
 RDEPEND="${CDEPEND}
-	kde-apps/kreadconfig:4
-	media-plugins/kipi-plugins
-	video? (
-		|| (
-			kde-apps/ffmpegthumbs:4
-			kde-apps/mplayerthumbs:4
-			$(add_kdeapps_dep mplayerthumbs)
-			$(add_kdeapps_dep ffmpegthumbs)
-		)
-	)
+	$(add_kdeapps_dep kreadconfig)
+	media-plugins/kipi-plugins:4
+	video? ( || (
+		$(add_kdeapps_dep ffmpegthumbs)
+		$(add_kdeapps_dep mplayerthumbs)
+	) )
 "
 DEPEND="${CDEPEND}
 	dev-cpp/eigen:3