Version bump

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0x7887F787

3 files changed, 176 insertions, 17 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 5450ff693f2a..dec9ac38f021 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.238 2013/03/02 21:34:50 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.239 2013/03/29 16:43:36 dilfridge Exp $
+
+*digikam-3.1.0 (29 Mar 2013)
+
+  29 Mar 2013; Andreas K. Huettel <dilfridge@gentoo.org> +digikam-3.1.0.ebuild:
+  Version bump
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> digikam-2.9.0.ebuild,
   digikam-3.0.0.ebuild:
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 664901f6b664..8c72f361ff39 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -4,26 +4,26 @@ Hash: SHA256
 AUX digikam-2.9.0-mariadb55.patch 946 SHA256 84fd039462d6a8f100584174c30646d554ab7eea2f276b44aa05c49ce911589c SHA512 d10f7c8cf5fa727b36e2f07d604f328e6020d7f67648a1dbbfb5f2e7b8f3dbfe5b7e0c3be1d2591d9f8ddb709b91fa35d4202d7ea3c60357b4f9bbb4f523af1c WHIRLPOOL 55eaac8687424749cc9cafac10b374a8685cfa0a047ba9974f3f9ccd53280b29e336056dbb4eb6cb3b435dc96a7f7ab6a883d0096739c681f5d42b0b2675924e
 DIST digikam-2.9.0.tar.bz2 56765772 SHA256 73dd0f3820fc44bba7b72c98cab73d0391e98687674da8be11ff07590c703ba0 SHA512 ef6b94f3752bd91f3b6da14f509379e3fe7bef166bc617642c531fb0a88b94876f7c59deede3957093070396c4fa9b8c6635ce9a71b7230a2809426a82e721ec WHIRLPOOL 1e5a0d61de5448f11e928f7420eba3a1c548f7a6e65dadc4728ccf304194c9653b97a78da0752d4e92be450759a5fa9fa00c66230d32aa43e581686706023e53
 DIST digikam-3.0.0.tar.bz2 58701849 SHA256 052afa32d36a075afae6d789817c073a2aa6c4037f31c603da4999a4c6579574 SHA512 f544ab2eccacf0864d0f6ad98276228f12a500896867e48048679951fbb05071269e6ff9d660df3fb1ff6dda17d93d1134d79deae38985c756e27c7a77cf6801 WHIRLPOOL 8216c4e40baf3e8996b1cdf6d014e8c9e719d1bb56656a16065d802f6863b1b26071db80232b25904d1cbb721da234b5f0e651745fbe546cf4eb9587f510f8c1
+DIST digikam-3.1.0.tar.bz2 58559707 SHA256 f70fc84f3a680a855642fcc4664710116406bbe4068b0ad4d2cfb4127684c2aa SHA512 dd81049b159f36f80dbd779d2ab4ff11a7b8ec523fe8775af4fd3cd4894ca1eda0608f8838cfb756d96150b7437c0f0f10618303d3f8b4453db92a2590459c8d WHIRLPOOL 741ae9c67e16073dfefe5c1b0d1713ecce0fd9cd6af3bbd298bccf0709bac484ef0c518ab9effe67e2dd79cf1fffc12df962798b91ecd776b7c059e87854a781
 EBUILD digikam-2.9.0.ebuild 4291 SHA256 1031f9e7d6c02f0b5c64b33b2fd4a11ee5ad6ea9d6720a9dba978cd9eeec9f19 SHA512 7f17a3884dd6f492d1967be76abf1fedb49b020404f73fe96fd25d4bb0f60bc35d19c3e85c6b3d67acf75a6184bb555d6c4a64c8c76996c6277137b6d6c66f2d WHIRLPOOL 1360a6e108fffa07f0bde0311a07cbd1cf464dc7ec03cd168e7f8dc352084cf0183dd4a811c5aa483a1ec8eeec567e758977a0f96f98654e405315f35609b919
 EBUILD digikam-3.0.0.ebuild 4182 SHA256 d6159722d5bb6b578d275a9b588412b0a5e921b4fa31a74faf2bb74d864a6794 SHA512 028da798399e01b5ded12f8f93eea4d57c5437109ae131ba756f53b06a30ded841b569f5263c8734f175932bf0fcc8f6d2a1f30078b3d16cb586bb9580d2454e WHIRLPOOL a24857c80c2ea26f7899a9a7f2a084b6f57ac024686a143ba27861daf8a4f9e98d5aea1e9cb5495dea01cfa7e33c62cefe25ebe9de8201af5d6392f53d6f7629
-MISC ChangeLog 39625 SHA256 cfa1f2bd2f6bcc1ca1fae50bb73931e1b0719a96523a69df53aa925b0eb80b14 SHA512 3910b1dd4e7c6c4db538cc9983701f850743f7fea074b5bb871ee25848715da215f4faec41149a3e03833838d47369976ef830e77f8a210faf6ba9e278521324 WHIRLPOOL f95eb1238240a65f20348da02e081e6d1be550e34656dd0d94012406fe07472d06071778a3037b28d2b5a2f593deb722cc1553483fe96824f6d28db2beda889c
+EBUILD digikam-3.1.0.ebuild 4183 SHA256 445e1895db4d4cbc1fd387dce8e62efa12928627e39afa020b0f1311ee0e864d SHA512 ddee784de626bbc50d14e2b590cda59d372fefd164df3eb515b56a092465e4f945d36e78f2723476dc5e7c8dac1025a5916d0ddcd8923e978b6de4f801563c03 WHIRLPOOL a11c5a8696c18aef4d5f5ef52de080037a0c5237c2daf2e783a176121bf2a2544fc4ab01847bf84b660e23cb9b036cea188cee6ea4321dfeee54cf5e50d30f16
+MISC ChangeLog 39752 SHA256 a7c90d2d4525cb5a50950b3c09fbe61abea1c1afc152b209f7ace242e0b3e342 SHA512 049c8aaaf62bfb8266880ac012e6aa3a99a1027379f7f4bf8551ba5fdbdc8f247b01b971c0bfb6ebdaad367bd58d99d7b0cf7eacfd62a826bcd205d8ca9b0f7e WHIRLPOOL a732be76ec40adf7e562b775ff4cf94e3678983c234c41f23e83c955065cad93662d6942a645b0d703bca9176a0a293fb1b5df8cb9bfb35a3575cd658a379dfa
 MISC metadata.xml 648 SHA256 fed8bb77a841bcbc558e06fbe5f729a616152051924fa17fed0e527237f09f8c SHA512 70b5b6c2f5d5ae242a3a3fe287802eaf722cd611ea0db1abe1c2daabf7a960c2f7ebc30e646db52f373efa9f9aa18481abc422bf9b080a8d6248551e0b8bd86d WHIRLPOOL 45976f32e90b1ba1e0b654017400b7e4860cbf5f6a1284fbfd81d05dd3df13654d7cea41a925c6bfc227c63566fc2af80299458c9c866b10628e12d38951803f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMnB6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88OZUQAJkKEfes9O4qr3MjICG9NJp3
-z5pEh6lcXrCqo+HceaVrOUZi4YYVmHC9IDBLLf//QojUTg6Ht8ikSMTGnmXksbpM
-gDULKdamituq8dE4PWkAnQUNrFdcgfB4oWxgJB6OYm/c2GzO5e8WEMzSGB/EOgPN
-+tTTj1ctQ4oa7xgW39SEjp7EljgUjWgFygKo3YKdsM85E+7kTT9y78lXySYxRtUW
-SsBj7oRQtTao93TSuhv1DRsjU5v/kBt93a6ej+1nVVbSt8D9KeQEjwxSn0BwtemG
-8LIb+tH51L9Meo5zlp0vr8DQFHbQ2NIe27fzjCUVOEmn4LfDIWMDzmHdqn3KeSxQ
-jkHpmQARzYqC/8jrlIZ95nQ6w1NeIT9bs+ZblvNvQHR1npOiVGTi0kedf7E2LONL
-eTnJRatzx4veKskOhinDYHjJ5l65I36KzDyN0q4FTsE7hLeCTUlo1yo5U0hbFnAS
-g0bcCR+aTVvVa3tU3Wz1XsE/FhbJTShxhl5/avH3ovwrxRmYolPQovnTlyk6QpFU
-7RRjWFooJd9lZOskgIPLXEXSdst3Dn6NwPb69LNJnOpYrvRWaRGK0nwkF5XdsAPI
-d+nvwDfVA47ZjX2f028d8z1JnNasrifg+u+U4YbFzGgn9Hc8N6xPsocUo3Gml3WQ
-2X7Spc4FtISyDagW7Psy
-=lWBh
+iQIcBAEBCAAGBQJRVcVVAAoJEEb+UGWnxTyHyW4QAJuCO5raOoWcDvwSe63TApFq
+Vz5jyEpSMoG8w4SEZ2T+HVXHwRXYpLBA7zNlU4/PS0BCEmWNhFmSBNzHSJQAnioo
+gjpopi0qL6OeV1AM+PtKcpmMqZmEUfMkW0tFYm/SQ7Goz4/mE6zXSj+kFYudmUw+
+WSBvU/NKYyf2LcN7qt6M5cqUiL1vEtMNziIzUGDpcrINx57BVmhp7KoNJOdlnG4s
+uNIo0AG4qek15mYAQjkRW6LSe66hqjHVs/nj44dUbvnRVVCsYTvv+D7qRjKb+xIS
+kZj+HTEHxXwcR0WsRaNKewt+m7/Ssp3DSVfWfg4bY1SWDMM62KGpPpYYnN+TLio4
+o/rkIuIBS+z/rNTNx/V+Fjtyvw5v4IudCTgJKy5vVWyRoO6ZszuWaqDVZKXbfZVN
+leOZcA2ym5wZAycT3mSvyg6eMH9g7919/KZoGm4ugEEnP7mHLyZRpDpAX6H0IAUk
+wws7KIjWUNUTszWOsBf9LsiTBM5Nsmzrn5yVJzFFamvOmLvs0AXfAHH0u9AaTjZI
+zwkZE//43ailqW25eG2wBvS5V1L0tatQ6OMFdp6rl2F5LS+anzA8WS2BnDxjPYWY
+RXfJ5JzkMXT3kWxIveSTekXFcOeh53EHCJptnPxRAT0L5XXTTxef0HKWFqkXUvWW
+tmKJyTeDVKqCHim8qFfl
+=gQaZ
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-3.1.0.ebuild b/media-gfx/digikam/digikam-3.1.0.ebuild
new file mode 100644
index 000000000000..5bb65b3c619d
--- /dev/null
+++ b/media-gfx/digikam/digikam-3.1.0.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-3.1.0.ebuild,v 1.1 2013/03/29 16:43:36 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 themedesigner +thumbnails video"
+
+#Keep libf2c blocker until bug 433782 is resolved
+CDEPEND="
+	$(add_kdebase_dep kdelibs 'semantic-desktop?')
+	$(add_kdebase_dep kdebase-kioslaves)
+	$(add_kdebase_dep libkdcraw)
+	$(add_kdebase_dep libkexiv2)
+	$(add_kdebase_dep libkipi)
+	$(add_kdebase_dep marble plasma)
+	$(add_kdebase_dep solid)
+	media-libs/jasper
+	media-libs/lcms:0
+	media-libs/lensfun
+	media-libs/libkface
+	media-libs/libkgeomap
+	media-libs/liblqr
+	>=media-libs/libpgf-6.12.27
+	media-libs/libpng:=
+	media-libs/tiff
+	sci-libs/clapack
+	virtual/jpeg
+	dev-qt/qtgui:4[qt3support]
+	|| ( dev-qt/qtsql:4[mysql] dev-qt/qtsql:4[sqlite] )
+	addressbook? ( $(add_kdebase_dep kdepimlibs) )
+	gphoto2? ( media-libs/libgphoto2:= )
+	mysql? ( virtual/mysql )
+"
+RDEPEND="${CDEPEND}
+	$(add_kdebase_dep kreadconfig)
+	media-plugins/kipi-plugins
+	video? (
+		|| (
+			$(add_kdebase_dep mplayerthumbs)
+			$(add_kdebase_dep ffmpegthumbs)
+		)
+	)
+"
+DEPEND="${CDEPEND}
+	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() {
+	local backend
+
+	use semantic-desktop && backend="Nepomuk" || backend="None"
+	# LQR = only allows to choose between bundled/external
+	local mycmakeargs=(
+		-DFORCED_UNBUNDLE=ON
+		-DWITH_LQR=ON
+		-DWITH_LENSFUN=ON
+		-DGWENVIEW_SEMANTICINFO_BACKEND=${backend}
+		$(cmake-utils_use_with addressbook KdepimLibs)
+		-DWITH_MarbleWidget=ON
+		$(cmake-utils_use_enable gphoto2 GPHOTO2)
+		$(cmake-utils_use_with gphoto2)
+		$(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)
+	)
+
+	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
+		elog "The digikam api documentation has been installed at /usr/share/doc/${PF}/html"
+	fi
+}