Version bump, bug #515874.

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

3 files changed, 178 insertions, 18 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 7847844bb969..38edfc0694d1 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.265 2014/06/07 13:57:37 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.266 2014/08/15 18:58:17 johu Exp $
+
+*digikam-4.2.0 (15 Aug 2014)
+
+  15 Aug 2014; Johannes Huber <johu@gentoo.org> +digikam-4.2.0.ebuild:
+  Version bump, bug #515874.
 
 *digikam-4.0.0 (07 Jun 2014)
 
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index d70849a0e424..c2a1f0287cb4 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -3,26 +3,26 @@ Hash: SHA256
 
 DIST digikam-3.5.0.tar.bz2 65698806 SHA256 57bd2aa4fdde44333d1362b02b26ebf6c1a70675bf5cb40de5172df02857c42a SHA512 d9c4651398ab85490016324ee69d1303e57e6ac646ab48ac5860d2966b3f3f0b5b4112de1d793795aef322d3dc6e7c3aba33bd2b164a084e5b65d38944fb0d73 WHIRLPOOL e7e6527270f3daf6ca97c007253793ea6e02b637f86f3355d675bfc0d562a36d5a7311d2e1be0701bc4f6119037398bbc6f2e9deb4da04f01cc008ec52679aba
 DIST digikam-4.0.0.tar.bz2 68931371 SHA256 984f7a47a3fdd5b5b30991b436848ed420fbcfffa01ffaa3abdf7202848b17ae SHA512 d76dbdc72fc5c42e2628d43bf669cce53b82e21eb5dbfa3c908740ec10f2bc949f6faba595f36e3a376f9d9c8b9db8af2c10a4921bd5b21d9c744b0bd8570661 WHIRLPOOL 55463465f2b1a6b9fa8bb9e63e1ac1fd5fa8a21f41ed94bf5a7e9ba8404ebf0cc3e4d027d51179881736a4cd40734774c2c666e7f3a4a40396230330f69b21c2
+DIST digikam-4.2.0.tar.bz2 68849613 SHA256 e86575b76672dfd0a7ed5f1d7b8b74425171804d7f16b0d743a5d2375c1c1b08 SHA512 ff9442360a343beff1643ef95f4dcff81e764a03cf18d8de800b45ca19b0a3727e59916ca0613cf4977c8e19ebc87f3f6682a48d5ab78b313b1d0189fbaa1169 WHIRLPOOL 5aee618acf79301a08d5efc30cc6a754d884b491fbf28bd555ac109b304725a8da1ff75c26af8d241414549957827665c9bf6299c030df5b7e71c74a4ca5886f
 EBUILD digikam-3.5.0.ebuild 4111 SHA256 d372538b818c5269d1cb5d69feb23d8bcc5e32a28651f3a3f0a9a0e456fa2fcb SHA512 f9973a8ee9bf0385b8b1a40c1c41c34400b1d1191228c16890d1677c77518aa63526e9330a26848bd419f28bff07081f37f02f4295aac0703f696c6ff9b0d7a3 WHIRLPOOL 37ac33b748e6f456663af60941fc995002c219e37ecd1b277d8b4b980edda017596e11b0bb3e7ee3bc4b2f60824b40ef548ca30285b06c6879798755410ac7e0
 EBUILD digikam-4.0.0.ebuild 4123 SHA256 f444ae5b2bd336fa9756764747da661dfbeddf8cec72f0b207c9803e6eccbf45 SHA512 d94f9e7f2d2d574ae33407e153955a81dbfb3d33e4e411b8ed10f5ff5d4a712d64668ea7c4024d7ed3bf5f301ee2cfa7e6790c1e8c73eb9f452f7fd710ce201f WHIRLPOOL 1cac3eee95763cc96038feb0e3b11aebef2fb02a85b1bb3d6082cf3b8ecbea132cb411dc2e921e2a734206b18866541222d3fb37109dbbfb03e7c940db07f374
-MISC ChangeLog 43238 SHA256 e602a54245eab055bed7230589b268e9d9e11490604bb2a047ac6d9fc1f3d24b SHA512 0d7275cf436448dfd11db318268c652c8359e43eafd0ab409d46eee4a66a87b40ccf59daaaa51aa860d18b5414a115d46e8b0f8ec00098f03fd884da8a68f9bd WHIRLPOOL 0ea03951277402936b8b05f2940753119a786457012515269de3750946db194337ef290283b4dc535063f8e5b39fef67f290e30be8f0eda41817d54988ba6b02
+EBUILD digikam-4.2.0.ebuild 4127 SHA256 0b46bf2a20fdb51cf44e41283442d91b492b90a92865b8b67a447376bd18de94 SHA512 18929d7568c8c4c9a69850176ca548c5518146b98fa0bcba5b32bd3e77861aa1656452a3eea8224e56465f1e85aa13bd854fe2a5cdda2b5aed577f147e84329d WHIRLPOOL 048ff290d9a4736b1458fe6aea3a2680e8eefce64ece8fd41ed07d53ffa3abeb34af894ef8a1508cc5956c2ffb71536efac6c23e6dbdb779615eba985f688ff7
+MISC ChangeLog 43364 SHA256 2aff8036f6ce354913da88b5233d2fe2177130267955c66120a62f5a5e2785ef SHA512 b64078fd1cf66751e4c130abfeeb9f94089f1132a35e316d92bf51110ea95ddfb82e07adb6d928a2b589b92672f27cf53de193e1e0cb9542045a649fc2717b35 WHIRLPOOL b2b5d2c1e0bb94eb7f2c980e3706076e01baace1aa5d3c076d7fce1b67ebddc43eca65d170e56cf100be6bb92203d9b9db54a0e32ff6ba56c7840f4ec6527a45
 MISC metadata.xml 736 SHA256 86156e040ab866e9a95236a9e4a3943b02ed4b9309e688b0217a7449e9601613 SHA512 d19e6e93b72c8141e778c36b0cd032db08ad2a87fc8f8325a32ab5df3c457787520267a8b86cce7272590d971de835fdf647a1a84a4c7d4c656f605dfe42d01e WHIRLPOOL bcb65d07cc4325fbde7b748da9977ddccb52097398cb0ab9db9599505a477bff1c97388c8143fc747d854d42ecab534d81160cb09c9e868b7c63f7bcea3c53f9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTkxpSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcsZsQAObQg6SZa5HU9EiokUK5mp2L
-A5TSS0p7eDvIDQcvG/Ot5VfGCcDdH2FvXzhOIynts1W/ix98pgRyn0a6VbFKkJoj
-rK3e78t0vd6B2lgNRs0vuQybTouJmhSwiFU6jplXWpBo3S/5I+gWEUIbd0fkwBKv
-6Kw0EHl0Tf3b8tfCNIiEDdr0wPKMyZqZzE0Pg+IYK4tfx7PC5QdHaJgI206NykXA
-PLxm1CWBj/jYKLUJ5sMQNBLWMYWRW2YPPj5zizjnRVXjsTVn6ruB8GW563mwZUkk
-+BKBwQgVdN2Lh9s/LKmsT2cASLOrhLGs45J1bbqOWbXSqG8SItcGTBwSr47hgXHF
-j9t5K0y3Lb5UhDqR3P+2pgHm/xyDM8FGISNhDUHbOg3gWrsVr6t7vCtDZccCZKr3
-Igw2k9itTxEWKHp3JirC2q5HS9+xTCjNvbfdV/zuFCFIjN4z1z3FUgweOFsxiZZt
-3cTnvHDzU16XMWOsH26nSY9DZ+zY6mRcTwLdhvs0V6BR3NnHrI2Ypfs2Mv5/Xtrf
-W6vbMfaUSn+Ak5uXuBFwfrBGI+u8TeBE29X+du8z9/RM9OQTvRWHTCiWc8i01/Qw
-C4iBC56GPVYEecCcZzRP3onl37NCGi76p+XI/WGqqbJhCZIUxHEMpM5M/1VIC0aC
-8fiSemVPg7GQj0+6vXrY
-=YV7L
+iQIcBAEBCAAGBQJT7lhOAAoJEGVpnaTzz9K9i5kQAI5ey/cOABtBXlD8VA9+sRxV
+oHzxR7v/PONmfhr0crQotAbrhBXZPUGC/qnmGBys30Sdxu4aU/aF2+uelRA9cR5T
+kNT1q1YTNlnDDmRmgXbNlYV0ZAAAnTom0R4gIUkJHdmI7sIKfcG4bTlko3uhwgOP
+KqpMYiPbsX6caRQQIr8LglDbUwTJJp4wyGyIupyxbX0qRzkcmP5VxY4YBRLzPJVU
+Jk1nVj46CIWWUobbJfplNpo4xNqs/gXi9Ji16gB+LxpKtw1VGMy9uySS23fTM6je
+0ATPJDDJzeVQQ6m4KPLU9zq2euSE0adqL4BbjS/mFMTd/A5yMTyKQwELN6IEDMnD
+bx4XET3BStVOyF2k7hYlL0R9Af1sHaS6gdoxe1ESVug9RiI9CQs4rMj1m1Z6Hnnc
+vFDjvgWslhQWqXJxwBIYJCgilF4yFqiE8U6wO25B4FB0lFSFTOctFSoTww6VmAba
+nEwBZoMLDhQqRWgHqyHBT4R21ISqwqdpj2PdlXZ/I5cAdOaM0vl71rbflN1rPcuw
+P4lJWSGEkOg8uMDq6+8lFfJzrQHzVOngZkLoXToSDi85l8ZtQ1Ei4z1I8wWWan15
+Ccd4CH3+rz4jS6mM+rI30eMD51y1Fhded39fHdj0DVlU916X+Eg7aqqzmU/lH4aa
+jLkrGO178LUjIL3Zxaxi
+=EuVE
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-4.2.0.ebuild b/media-gfx/digikam/digikam-4.2.0.ebuild
new file mode 100644
index 000000000000..8637679f3dfa
--- /dev/null
+++ b/media-gfx/digikam/digikam-4.2.0.ebuild
@@ -0,0 +1,155 @@
+# 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.2.0.ebuild,v 1.1 2014/08/15 18:58:17 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"
+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 nepomuk themedesigner +thumbnails video"
+
+CDEPEND="
+	$(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
+	>=media-libs/libkface-3.3.0
+	media-libs/libkgeomap
+	media-libs/liblqr
+	>=media-libs/libpgf-6.12.27
+	media-libs/libpng:0=
+	media-libs/tiff
+	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 )
+	nepomuk? (
+		dev-libs/shared-desktop-ontologies
+		dev-libs/soprano
+		$(add_kdebase_dep kdelibs 'semantic-desktop(+)')
+		$(add_kdebase_dep nepomuk-core)
+	)
+"
+RDEPEND="${CDEPEND}
+	$(add_kdebase_dep kreadconfig)
+	media-plugins/kipi-plugins
+	video? (
+		|| (
+			$(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_with nepomuk 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)
+		$(cmake-utils_use_enable nepomuk NEPOMUKSUPPORT)
+	)
+
+	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
+}