Version bump

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

3 files changed, 186 insertions, 16 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 48342e783435..0eca44045cbf 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.275 2014/12/21 14:59:44 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.276 2014/12/21 21:41:17 dilfridge Exp $
+
+*digikam-4.6.0 (21 Dec 2014)
+
+  21 Dec 2014; Andreas K. Huettel <dilfridge@gentoo.org> +digikam-4.6.0.ebuild:
+  Version bump
 
   21 Dec 2014; Andreas K. Huettel <dilfridge@gentoo.org> -digikam-4.0.0.ebuild,
   -digikam-4.2.0.ebuild, -digikam-4.4.0.ebuild, digikam-4.4.0-r1.ebuild:
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index f0792229c436..e83b688e0fd8 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -5,24 +5,28 @@ AUX digikam-4.4.0-hang.patch 3491 SHA256 c7318579e23e0912940eda369335c34ed545d4a
 AUX digikam-4.4.0-libkexiv2.patch 1886 SHA256 66a8d2c682300d908677d7430b488de9daa4183c91aa4f4e3f7ea8e594f6a102 SHA512 9e797897f4a892d1a9e7aaa6a477a3300c7a11f170eb2a1768e89fa42009b9b30e33e2f3cc2d633b424681d9f37b2f5ecd812a90ad691359c20fd43d782f6c50 WHIRLPOOL a003726a30c9495d47d15eca45bb769ab15990ae246ef069b02c24ae2ddc5ad14158e9021cc6f89f128f338e46323555db5e47e6c2cc9dbdf296f238dd40fccd
 DIST digikam-3.5.0.tar.bz2 65698806 SHA256 57bd2aa4fdde44333d1362b02b26ebf6c1a70675bf5cb40de5172df02857c42a SHA512 d9c4651398ab85490016324ee69d1303e57e6ac646ab48ac5860d2966b3f3f0b5b4112de1d793795aef322d3dc6e7c3aba33bd2b164a084e5b65d38944fb0d73 WHIRLPOOL e7e6527270f3daf6ca97c007253793ea6e02b637f86f3355d675bfc0d562a36d5a7311d2e1be0701bc4f6119037398bbc6f2e9deb4da04f01cc008ec52679aba
 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
 EBUILD digikam-3.5.0.ebuild 4111 SHA256 d372538b818c5269d1cb5d69feb23d8bcc5e32a28651f3a3f0a9a0e456fa2fcb SHA512 f9973a8ee9bf0385b8b1a40c1c41c34400b1d1191228c16890d1677c77518aa63526e9330a26848bd419f28bff07081f37f02f4295aac0703f696c6ff9b0d7a3 WHIRLPOOL 37ac33b748e6f456663af60941fc995002c219e37ecd1b277d8b4b980edda017596e11b0bb3e7ee3bc4b2f60824b40ef548ca30285b06c6879798755410ac7e0
 EBUILD digikam-4.4.0-r1.ebuild 4639 SHA256 637aec1c6c7b6bc12bad9e732d9f55f4856ac7ebdbdbcb685f2cb0c15ef505f6 SHA512 185b59d28596eb400e6d4e39724664fa6773df7308ecf727c73145b7ab1ecab1eb4332da5f1ab2f1b28020453de0779465a9958ed75b6867de37bb77e1b03ef4 WHIRLPOOL 111b7907676a82a79ade34c86608cb88776bf3fb8fb8a12db8c4029d21d7aa51fde86d2f0072a2a0ee4018fc8b339bdce95cd783d7df95ad98c85ad08bb8be7f
-MISC ChangeLog 44630 SHA256 60951768d407bc4c1f208cbef875a9a2d4cdf29ca18c05353f0236b478d198f1 SHA512 5b47e3e43189ac755fed374c44a9b2a3890a74cae9792bb06785e9ded7f2f9c17af7222ee955c17314bddfc83028d2651eeed71ae04a105c8d96445480d73536 WHIRLPOOL c7e0cf03583b7a3458e6705f9d25ceb2e4a19bb3a28542a6d42fe78b14dd1c181291c254290fa1c988261b66b7e20659a6d5e7350301ccc6d9a5f76295385739
+EBUILD digikam-4.6.0.ebuild 4327 SHA256 b1cb9f9f84519052136a808386cee196949e54b1979f3a4914da7d89ab271982 SHA512 faefab98ebfef9d7a24c1c0c49957c25e493c5b1f96540afc666c320c93561ffdbf7fad2b36f4cfdab59487f1817eb3e3e713194d2c6186987b3abe1cf020446 WHIRLPOOL eda439300666e4686da0b236133e4a1b8b88f26c8131b22b36da38031af59e327aa8a8276a68dc6351e5c40ad2146f0c2010256d1e174c028d80c4f9dbc75e78
+MISC ChangeLog 44756 SHA256 0a3cfa22e0b2185ed67cb33cde63f806a07a506c9f0d1ce3ec4173b1d82f8d6e SHA512 61d34c343beec6f073c1acf6ac2cc95ebcd410ebfa8afaed79280b91641c46fdbe479ed49db28e055ed2522cb31f03e82035a60f08e242ffca8ce4a79d379186 WHIRLPOOL ca07c217a8cab637fa7102dde1e00c637ea8c85741dbf18e7060e16d8cb4225135dbe5553578239c08a6b10fb4db25bd9b0247a60bcc594c554984f9c4d64923
 MISC metadata.xml 736 SHA256 86156e040ab866e9a95236a9e4a3943b02ed4b9309e688b0217a7449e9601613 SHA512 d19e6e93b72c8141e778c36b0cd032db08ad2a87fc8f8325a32ab5df3c457787520267a8b86cce7272590d971de835fdf647a1a84a4c7d4c656f605dfe42d01e WHIRLPOOL bcb65d07cc4325fbde7b748da9977ddccb52097398cb0ab9db9599505a477bff1c97388c8143fc747d854d42ecab534d81160cb09c9e868b7c63f7bcea3c53f9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUluC8AAoJEJS/30SErRQvHL0P/jXvRGUjlSa7T5QEah6HQ8VG
-PYY96QQYmx2JTBgLuXaONgCiPEn/HGZ7FXTQku2WVLzYJNGsdM5mgZboPSzJYmvj
-KG+MHmSkMQ5b99C2gYl+jdte4HEFo4jYy1oejt5ZZ2TxSwDSDbmXlkmMQZ/sRivf
-ghNbxnHsCfyBO1iAnXZsVKRwm3a73oGIKWhUHXWxv9z1kCw/TlgZ+CfKuL2l46ft
-WbmBCj9dRCd8zAAjuuBbR1NFjo0iADiAo60+doEVlP5ChkNB6RzXtWvEUQk1J6WP
-DjhL8rrtOOz+unhuh+ybfGcr++anHcPSBw3aD/H4+LaRlGagZllaxAfwLp/H1e0f
-p6hTr/gZ3z0gHd5ckNAodWuylS3UoxPMhzmYM2+dv4QJU5vM5rNyymAwYmCgKK/u
-0v7nbaY/87x1HRpYZ8iWoKEp+O8/17f0n2YPFnSs7jgBmiq5gC9qsVfRzUFrNyhI
-u2q6zuFJyoke/h1Mixsp0GEu9RuSBg6xtqzF1NcudSsA16DwVvsR6Vq5zOg1leAa
-e7GP6iRGG2mPCOJFJIhvYouf6nU+5WWgu68R2YH6WgWnvyaYJC9cONLusF99Cv1x
-dt8spiG4hJgupKMBaAnep158nE/4HBT4K5jCQdzGJ75dwXditYOgBfd9FBrKwftI
-q8NmnYr0CHm/hZdEKhE6
-=KIxt
+iQJ8BAEBCABmBQJUlz5+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcS1YQAOPkMTZCsXuM3qydXbxcs0V0
+CCqF4HuMfhR+mTa6ezJbzbHeS6dbFKBVHzUVUoem1WYgM5Hl09Op6ByTp9C2EBKO
+AMMg1eCOnrD5p+67QmwkZIK10JDxeWc7r6KTswdXZtDaBViaMia6LyY55nY58QUj
+8ek3fpD7C4ttbjk8uZ/mH9+CfihpfHzzoPNW2luyWUS2X0fwaMyWFw2EoETphRfs
+5DyH5gBmbv1qjn0I/rnvvrkdI4sL+CR29L0YaA4HFH3+PoYBvDzAkCBKaQB8+fey
+ro4P/YyfR7eWUZ0mChngk79qq7wzepwv7gfCoN7cduPE6ppfB62gjIRHvpvOOT5T
+s0DmQRPYoGkDhOvEGsEbOXuPgqvVdgursfbC6BstAaMhvlu1PycR0PbBjnrohXiL
+4/RYCH48vqDZtEkExwk1k7Rr36vuOBb8cQWt6b0rBTLe1kJP5iNh0+Yxpk4YEGUB
+oPtZxAf4w8IfOOUyytjXT+sVBUPdhBG/UIe43dZuD5A6I9fklFQEN/ch8ZiJr3tS
+sDE7xEktiMlBxMJiuz+jinh/TUmr5JEL03NNDwVGq6lJvAWGwLCF/wsCu4E51fw3
+LmHSPmY52dYGJZ0XpxZ097jSKe6QUb54SHD5sVfrM9AwBI05OLFmPlLCwPRT+Kxu
+Rq4Gh008Z6Zp5ELpYsj8
+=PV8W
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-4.6.0.ebuild b/media-gfx/digikam/digikam-4.6.0.ebuild
new file mode 100644
index 000000000000..068adada379b
--- /dev/null
+++ b/media-gfx/digikam/digikam-4.6.0.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2014 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.1 2014/12/21 21:41:17 dilfridge 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"
+CMAKE_MIN_VERSION="2.8"
+KDE_MINIMAL="4.10"
+
+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/libkipi:4
+			kde-apps/marble:4=[plasma] )
+		( 	$(add_kdebase_dep kdebase-kioslaves)
+			kde-base/libkdcraw:4=
+			kde-base/libkexiv2:4=
+			$(add_kdebase_dep libkipi)
+			kde-base/marble:4=[plasma] )
+	)
+	media-libs/jasper
+	media-libs/lcms:2
+	>=media-libs/lensfun-0.2.6
+	|| ( kde-apps/libkface:4 >=media-libs/libkface-4.6.0 )
+	>=media-libs/libkgeomap-4.6.0:=
+	media-libs/liblqr
+	>=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
+	|| ( 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)
+	)
+"
+RDEPEND="${CDEPEND}
+	|| ( kde-apps/kreadconfig:4 $(add_kdebase_dep kreadconfig) )
+	media-plugins/kipi-plugins
+	video? (
+		|| (
+			kde-apps/ffmpegthumbs:4
+			kde-apps/mplayerthumbs:4
+			$(add_kdebase_dep mplayerthumbs)
+			$(add_kdebase_dep ffmpegthumbs)
+		)
+	)
+"
+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
+		-DFORCED_UNBUNDLE=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
+}