Version bump by Andreas Sturmlechner <andreas.sturmlechner@gmail.com>, bug #553366. Fixes build with gcc-5.1, bug #550374.

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

3 files changed, 171 insertions, 17 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 5aa68ce5cffc..17aac60a9045 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.282 2015/06/04 19:03:59 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.283 2015/08/08 08:50:15 johu Exp $
+
+*digikam-4.12.0 (08 Aug 2015)
+
+  08 Aug 2015; Johannes Huber <johu@gentoo.org> +digikam-4.12.0.ebuild:
+  Version bump by Andreas Sturmlechner <andreas.sturmlechner@gmail.com>, bug
+  #553366. Fixes build with gcc-5.1, bug #550374.
 
   04 Jun 2015; Michael Palimaka <kensington@gentoo.org> digikam-4.10.0.ebuild,
   digikam-4.4.0-r1.ebuild, digikam-4.7.0.ebuild:
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index b59a5e706b04..e6ef7ea62d67 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -4,28 +4,31 @@ 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.12.0.tar.bz2 69527960 SHA256 15043afb04733e059460165bc3cdf58dc42a67d7a349fbe12c2ebbe1946e3420 SHA512 a5ebe481ef9803475cd2d4d198b0d093753ecb71367662f0e83a151ab34a2ff071139b28c1d9600279463fed96745b025db86d24b059b0794bc4a2b50338df85 WHIRLPOOL cf29c3555ce41a298c9760287996d8edee76ff8a6ec42b503f55059e40b35f91cf56afb054f641e800f6e630d851491c2f77e0bd67020feefe8d6adf36a643f5
 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 digikam-4.10.0.ebuild 4144 SHA256 164decedbee23ac479e1205c713af027ecac380e2f326969183ab491e0939688 SHA512 16ac06556cea525340352f9fad9e720789fcca216dcd84432e4cd7cfb8ccd3f3e655d3f01a8de065f78311625767a226e818f142f8a421d7a06ea95df6569e86 WHIRLPOOL d2e1975b96931a1b5bce8e4a91f3a8211a99e481bc331f33b03fbd4c12b83d9b64b7cf2d0b36dced3c592ad74faed98ce49b1aa01c9fa6c4908bd914ad9e0814
+EBUILD digikam-4.12.0.ebuild 4084 SHA256 f3b9ccb25c9b67c4ae156b6ddd625dbc588a2b3297b728671264e272f5a68c69 SHA512 a99bca49ed6ec251f0750dc58d8d9fd6616da7ffcb8980603b855e9e8ad60a51d5f186761ddcc0f1df535ff50e167c9088a8290652a3afa17305b368bf373edc WHIRLPOOL 5af974340c26ecf2d539027980ddf099ea26b30993de65cfa9ef729fdd9514f73ce3b0cbeba67c6c0d664a99dfe259a762d4c3b0b8f916931e68ec48eb0ac6a6
 EBUILD digikam-4.4.0-r1.ebuild 4425 SHA256 323e2136dfc6179afce5b922ed0186625ed349e6479301ad01bcfdf272c4af94 SHA512 4a804c33e411731c681841fafaa829202b778776b5a85558e8a5b56183fef2202d1820df546d84a4908f0d22daaa48ca7187bec2d5d90e395b211f50f8f75213 WHIRLPOOL 9d036d77afb63fc8c5a54a6c8471cc0a76283c2820d272be2ae14a5119a4e1e65e1cd7ff58388c450b2e12fa079bf4d47401e09aa88a0cea9aca88f280c6627b
 EBUILD digikam-4.7.0.ebuild 4120 SHA256 7a95d02672b605d1b1adac11e61ab8a16ce4da6c3338cf0b76cbd5458c83a390 SHA512 7dad23410a0a15c6d132028d7e58e809ee4d57ea30269df2c9c2c30754a284746a84720eda388470e533c50a230aded9b78b92bc64dca7a2665846955a1b2b01 WHIRLPOOL 3e4595164cfcd770fc1a40306b46f047212d724e1c98015001c721981613cfe7ecfc154ec485f4a554f33d0315bfedb10094ce49e58909cfefc33d4a7d920ded
-MISC ChangeLog 45650 SHA256 fec1adeecc817c4b9dd0a273d63e26cbdefd2cecc6ef9f4f7ba8c175a4c11d71 SHA512 fa77e30a4e2b4f07f70e746f3abc8aba0f48ea69ddaa12ce3dbe24becdec389951d5ec73360ad25cfede8d06f62013f5ea92a0222977df7aeba41f9c122db4ee WHIRLPOOL 5589526572163a37d253a5dadbc54545d6c5b0864186a6d28c9f43e7e8f6ca6339c2555eac24f8128571ed12b989ec15004f95a1fa5cc3c230fb0cfde0092bce
+MISC ChangeLog 45875 SHA256 b1324873b9728f31410ed0fa181335f50629c14fbcee2c5c26410b21633ecf8c SHA512 6e1edc01ad27802b6db00f8bf7cb45a36654fc9f11b66c63a22473715771f8528f45cc092cdfe28f6953af071ca865d294d2ecab024b760a0b5816944354dea7 WHIRLPOOL 17329f0a8e1ac9364e477006c7225b508cf0aa745b3e28744490b686a18266c115ef004276425ab9c725401b5be875e03cc883dd5edb0bcf1223a6efb4e47f2f
 MISC metadata.xml 736 SHA256 86156e040ab866e9a95236a9e4a3943b02ed4b9309e688b0217a7449e9601613 SHA512 d19e6e93b72c8141e778c36b0cd032db08ad2a87fc8f8325a32ab5df3c457787520267a8b86cce7272590d971de835fdf647a1a84a4c7d4c656f605dfe42d01e WHIRLPOOL bcb65d07cc4325fbde7b748da9977ddccb52097398cb0ab9db9599505a477bff1c97388c8143fc747d854d42ecab534d81160cb09c9e868b7c63f7bcea3c53f9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJiBAEBCABMBQJVcKEgRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7HwqD/9xLHq9eTsE7leFhZ7KmRLRZsZLkdWchmVsn43aCyyRRiKNdXjsQSH19a81
-HIa6lzqByl6p6DvGGILWNn6LHObnOLtEdagQMz6gDI+Nzy6LuQMtcFF3u2OXCVvG
-U2+YHeRoVCWO3QCxYNunUnVnGUnOJVfCyvbXY78YL+txr0FSA5gUvETSKxJ7xszT
-k28E+3nSqlf8t4Gbfuj645sqhrJQMItTa2G/WOypHGEunwZK0TDRQtS0kLQEl9bS
-k7ywhE2G4wNmLdSzveLwLP0wGs0kEVWUXYnDJJ5BH2f0Qzg0CxsmkJge2R9swZWG
-YmW/cXcntfvJcKwyJuzl3HLlyjWUNaFijSZBCqZQLUUykfkLFJkXbV8yHuIgTCxT
-eSyih1IJeWS57JfCekHv8p5sdIgkuxS774G/17GAGUqTItFogGvl2wUKqywT4DD8
-++ff4zgCjjILeHq54QLqhrE/9fEfY8wnGbTlBndXHY6y2ZLq8WUBUTHN9RD1KysW
-xrHSxk3ZLrr9vjeku3jNIIP2gj7hem1rsB1OqlViTFOCheW9ljsAZ0gCcy7A3pi2
-ppiTJKWHxjd8ewBFgm56LQa7Lyr81FC3ZlV9obsazQ46hmrH7cmlNWeRgQ3OjSjh
-aslXuKxPa6nctVrr1785w8w9pPQ9ayhEIliUDjk2nHUkoH6HPw==
-=o3W6
+iQJ8BAEBCABmBQJVxcNSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0N0Y0MTczMjZGRTRGODM5M0MzOTU4RDAy
+OTU0NDVDRUY5MDcyRDJGAAoJEClURc75By0v2PcP/13Gbyx8bs1GVX1plIWJhNZc
+YRAYZLIlIGmFQPgpXnP1/PB1qnXX6kxseRC7WFx/8TlLNTuWgUlooWOljOjnyM9I
+p/0bNHtfTQr9AKE7S/zlarFEQH9pRG6CzMoC8/BYPaTZDN2jQ+j9wRRr2mJbHPgT
+RKkCoOFXF54J3OPINusPo+FvBNo1cQ4jOVySnjW1wvuLSGs1QEcrwjYiyNhwFMDX
+RinDykhTJLGRNfor40gUwv4cIOCvBsxp/40uQThDELzesw0LmFgMBdHGmarenRCB
+L5zHxBeBrQ39K5KJ2ndkSiWikO/tkdLbzNIxRgYeXTPGCncLhXC37cpmK368evic
+JIpE4Klbr91jsTO7S+N7PNsdeShhA4Pe4a9k1qQG5r4UgVuG3j4mmOyri56Wp5n8
+7U8dcNIKdzoESLPCN494/58/o4FS6QwqcE86Rd7Oy3akzzJB6uBPh3Ybj7T5eruB
+5Tye4tbrhkKLnL5R5iMppR76gaRv8Itcu7VAdWtakG4wTd5kK9FlRIY/vLWUQIiM
+003t2iB4UJpXN4QvxxoSf2o/tjsHpTO9itusUFS/o/AT4rNzrW7BJvZuU0zMXvaf
+Efh6Qt1WleiQS9xVTylOxik6GiRbbw5xEy80WxR7B0WgNcWQKsKiIMkZ4V2/ok7H
+o1K45UjD/vZcwhJ5b2Si
+=D6rZ
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-4.12.0.ebuild b/media-gfx/digikam/digikam-4.12.0.ebuild
new file mode 100644
index 000000000000..49c7b8f3eea8
--- /dev/null
+++ b/media-gfx/digikam/digikam-4.12.0.ebuild
@@ -0,0 +1,145 @@
+# 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.12.0.ebuild,v 1.1 2015/08/08 08:50:15 johu Exp $
+
+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_DOC_DIRS="doc-digikam doc-showfoto"
+inherit kde4-base
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Digital photo management application for KDE"
+HOMEPAGE="http://www.digikam.org/"
+SRC_URI="mirror://kde/stable/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2
+	handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="addressbook debug doc gphoto2 mysql semantic-desktop +thumbnails video"
+
+CDEPEND="
+	kde-apps/kdebase-kioslaves:4
+	kde-apps/libkdcraw:4=
+	kde-apps/libkexiv2:4=
+	|| ( kde-apps/libkface:4 >=media-libs/libkface-4.12.0 )
+	|| ( kde-apps/libkgeomap:4= >=media-libs/libkgeomap-4.12.0:= )
+	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
+	media-libs/liblqr
+	>=media-libs/libpgf-6.12.27
+	media-libs/libpng:0=
+	>=media-libs/opencv-2.4.9
+	media-libs/phonon[qt4]
+	>=media-libs/tiff-3.8.2:0
+	virtual/jpeg:0
+	x11-libs/libX11
+	addressbook? ( $(add_kdebase_dep kdepimlibs) )
+	gphoto2? ( media-libs/libgphoto2:= )
+	mysql? ( virtual/mysql )
+	semantic-desktop? ( $(add_kdebase_dep baloo '' 4.12.0) )
+"
+RDEPEND="${CDEPEND}
+	$(add_kdeapps_dep kreadconfig)
+	media-plugins/kipi-plugins:4
+	video? ( || (
+		$(add_kdeapps_dep ffmpegthumbs)
+		$(add_kdeapps_dep mplayerthumbs)
+	) )
+"
+DEPEND="${CDEPEND}
+	dev-cpp/eigen:3
+	dev-libs/boost
+	sys-devel/gettext
+	doc? ( app-doc/doxygen )
+"
+
+S="${WORKDIR}/${MY_P}/core"
+
+RESTRICT=test
+# bug 366505
+
+src_prepare() {
+	# just to make absolutely sure
+	rm -rf "${WORKDIR}/${MY_P}/extra" || die
+
+	# prepare the handbook
+	mkdir doc-digikam doc-showfoto || die
+	echo "add_subdirectory( en )" > doc-digikam/CMakeLists.txt || die
+	mv "${WORKDIR}/${MY_P}/doc/${PN}/digikam" doc-digikam/en || die
+	echo "add_subdirectory( en )" > doc-showfoto/CMakeLists.txt || die
+	mv "${WORKDIR}/${MY_P}/doc/${PN}/showfoto" doc-showfoto/en || die
+	sed -i -e 's:../digikam/:../../doc-digikam/en/:g' doc-showfoto/en/index.docbook || die
+
+	# prepare the translations
+	mv "${WORKDIR}/${MY_P}/po" po || die
+	find po -name "*.po" -and -not -name "digikam.po" -exec rm {} +
+
+	echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die
+	echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
+	echo "add_subdirectory( po )" >> CMakeLists.txt || die
+
+	kde4-base_src_prepare
+
+	if use handbook; then
+		echo "add_subdirectory( doc-digikam )" >> CMakeLists.txt
+		echo "add_subdirectory( doc-showfoto )" >> CMakeLists.txt
+	fi
+}
+
+src_configure() {
+	# LQR = only allows to choose between bundled/external
+	local mycmakeargs=(
+		-DENABLE_LCMS2=ON
+		-DWITH_LQR=ON
+		-DWITH_LENSFUN=ON
+		$(cmake-utils_use_enable addressbook KDEPIMLIBSSUPPORT)
+		-DWITH_MarbleWidget=ON
+		$(cmake-utils_use_enable gphoto2 GPHOTO2)
+		$(cmake-utils_use_with gphoto2)
+		$(cmake-utils_use_enable thumbnails THUMBS_DB)
+		$(cmake-utils_use_enable mysql INTERNALMYSQL)
+		$(cmake-utils_use_enable mysql MYSQLSUPPORT)
+		$(cmake-utils_use_enable debug DEBUG_MESSAGES)
+		$(cmake-utils_use_enable semantic-desktop BALOOSUPPORT)
+	)
+
+	kde4-base_src_configure
+}
+
+src_compile() {
+	local mytargets="all"
+	use doc && mytargets+=" doc"
+
+	kde4-base_src_compile ${mytargets}
+}
+
+src_install() {
+	kde4-base_src_install
+
+	if use doc; then
+		# install the api documentation
+		insinto /usr/share/doc/${PF}/
+		doins -r ${CMAKE_BUILD_DIR}/api/html
+	fi
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	if use doc; then
+		einfo "The digikam api documentation has been installed at /usr/share/doc/${PF}/html"
+	fi
+}