Version bump

Package-Manager: portage-2.1.10.14/cvs/Linux x86_64

3 files changed, 167 insertions, 15 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 795bc9bc09f0..ebf53e27797f 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.193 2011/08/26 19:46:48 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.194 2011/09/09 18:10:14 dilfridge Exp $
+
+*digikam-2.1.0 (09 Sep 2011)
+
+  09 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org> +digikam-2.1.0.ebuild:
+  Version bump
 
 *digikam-2.0.0-r1 (26 Aug 2011)
 
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 3f1d0a7e4639..6d5a71c24c17 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -10,26 +10,28 @@ AUX digikam-2.0.0-tests-1.patch 1880 RMD160 8961d7cd5cc31469da1e0d338f05b56c0c90
 AUX digikam-2.0.0-underlinking.patch 843 RMD160 c13b49b2703cd3940743fa7f7555510cc04e5568 SHA1 1954ab4b923246f74b225fc5fb1a9ae31536657a SHA256 3d3fbaf8aa006e4f2aea0d258457c7103d3c5c009687a1f2558dc8b6dcb0c514
 DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5
 DIST digikam-2.0.0.tar.bz2 53906557 RMD160 010f6b37920828003fa56159f1a7cf8452226fc6 SHA1 5941681163d90a13d316bd606589354099fd4f8a SHA256 c7d19f0562a06f02479cf84a257fe30aa523f82e668a16b21ce9ae5443034234
+DIST digikam-2.1.0.tar.bz2 53911470 RMD160 034f967a851f6cd748beb0c05e5fbe7d91526fe1 SHA1 4a5477a5665fea4cfaf0b2038a9ffcf2b2d207c7 SHA256 33b35c85b3f7820771a05f4a4e3f22961bbab6402e5159d07c2080158d55cba7
 DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
 EBUILD digikam-1.9.0-r1.ebuild 3347 RMD160 3cdaf055dc0b801a3cd05ce5ebd91a7db10ff819 SHA1 29390bef0da866f1f914ba05e046f15f78297d4e SHA256 2b83becdcae58d502d977afe0551abf24b80365bb42be54144444b969d7342e2
 EBUILD digikam-1.9.0.ebuild 3178 RMD160 1f56c6f8cc4d7595dd751866f7a342974c0b67ea SHA1 e4193070e15b3851ff8fa2b6bb18ec48d3bfb0ac SHA256 b75d893953c1f37396f4f4b6a0c59005b4bf09307cb85aef958bc3910f3e9c75
 EBUILD digikam-2.0.0-r1.ebuild 3733 RMD160 9412cc5c539d304ba2252dc30df950262dc90cc9 SHA1 6550eea307e7cfe3a99e660bec573171456b394d SHA256 c80ad678226847aa563d63d5a151fb9880f99530892c699827ec0f7ec8306cb5
-MISC ChangeLog 32604 RMD160 4842a0227b1a9bd3d88825813c26af03c9cb1f92 SHA1 41c41a22e835441a950569e26d6ac0f8e74336fd SHA256 0126af1daf661e5bbb5a78bb1123cb27ceb50292ec7519f734423850170ba6f3
+EBUILD digikam-2.1.0.ebuild 3801 RMD160 b4eb558ddda0669c41b5846e68873725ae39f587 SHA1 9cd2f6595e3430bbcbd8c84cdf7cecc0195445f4 SHA256 e8245f6ffaed93586eefc2fe715f2f49353b93dabefc3d4c78012562fed8916c
+MISC ChangeLog 32730 RMD160 3aba348447a7aa0177acfb7880c3e36097b96ead SHA1 987b01336ddc1cdec7710daa933d43c2ca585c60 SHA256 7fd6bf57dac4688f4a188dddd6408d5957eafa05d251b585f23588f906fea5bb
 MISC metadata.xml 751 RMD160 b65e7816a03a284f440d296c1853aa913105129a SHA1 c6bf2cf0d471e4d4ffdbb5185889a0e9cd65af39 SHA256 4b8eced4b0649dc935acffac97119bb70862bebd51a686b32778745b407eb0cb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOV/hDAAoJENwGBM22xffeingP/1qotNZ3Y464m/Zs1YDfdYYZ
-BvzkaJp3oLRAMOFaMkdbxNh0ut4JLt2JU96FX1qd1j89G5FJ++kW9WBQ3jaiKZbx
-qHnCLucBSYwDLsNzzVHZJ0E8xNtfRzewYiPK2s+3Z9wwg8dwjqCB1AK2KpcIO3rd
-Y/hoVOVM45uV9rSZUDwNA3Bco4k16JpGqly7L6MY9C4GoervTNOad/7dbSY4GtEY
-2wcXqPyZLAJAky9GlMQCWlij3U5P9Ze5tTTCE9xGDvwbz3TLgcX+/G7G2KwNxFlF
-FcuARt3XTHSSspApn8Kk6KOKU/rWhszPHjhtDFb0KNmwvXCb96OLcrUDtDFIE8Ej
-v86cQyFozCDwNN1JHRZBbk3y8bKiJCUpU9BB6JFnUFbepEXYHMfYxZZEJydQiyzP
-bYwUTHXqu68MKUoVWEbfMOdl3U7HVv1haj9UklQzSyrW5W/r4GXqwUXObUHqGv74
-hdDdJpIdr/cY15xkt+YNcxEsS7Z/RkeR8Q1lG95thJROeQh51E8V1dV6tMW3CfeN
-5VjmKDf14Z8m5W7X99K0iktV4xz12aPOH2zWWB4e69gH4X0lH3tiocUzbT+CgVeD
-hIWQQpw4t8gYKgBxtNtl7J7fr4SRboCG+gcywBCz0Ty3JNOHypY2w0F25OVvkhdi
-s78IQKWicQtpzS5+BuaB
-=F3cQ
+iQIcBAEBCgAGBQJOalacAAoJENwGBM22xffeopYP/A1UCo40OoVCBxipSedHzLss
+vDmM/jlsa+SVbGNGJ23oxlHN6nkkxfLnrm/6D8f+hoRfMaT+/sKwvJFU49wHpKnu
+TrJ5FI09BjYhL6h4fs0YHB7aWd4TR+HzWyIfAwdp12m1AWC6GJayR/6fIplS2VYI
+e4IUECUtFZunXDjqaV/LzrtpP+x9nKYEnnDvhvs8Zau4lr/eHperNu66vSPj+mb9
+QMw4qpzAuPAihkGgNXEWVewk4SwXeZMr4QknC4KlTq4kOvovu8LWi5VNWRJjw2kY
+j4thlRAGVdMoOrQLKh9faz9Z3HPaF4W+eG9Isf/ddp2lc0Y/lxxS0CPI1HkDL9ad
+C9Af54fKdkQDgeIwqC/5FJp87iAg7HuO0vxBKtT8Tw5PU/4zR5fKozWy+qg1+3z4
+66bKWDAGLpc8rC03/Q53diopjnhgd+SrLOvyPgqFiqByTnNJe5d3SMNNBFzDVEpI
+eiW9RpR0Mvo1XVaNs2PElODWnkjGH0GBoqtcQhmBILQlv/SeTxFQOegZdL4TO/2t
+PJupRFsjt3LYd3n6k/129N/pIkRe4tusk/PzOQxmuKr4q0eSE+95BEoKfrwgVXKF
+j62V3KhbJ2/TKiXX2NXOdBmSMERBn4ivezBFpSY+LggITSmZViBKV4RBhs6Ws6b4
+mkT46NHOv6QrAwH9fS49
+=cmJ+
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-2.1.0.ebuild b/media-gfx/digikam/digikam-2.1.0.ebuild
new file mode 100644
index 000000000000..1c5e199ddbbd
--- /dev/null
+++ b/media-gfx/digikam/digikam-2.1.0.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.1.0.ebuild,v 1.1 2011/09/09 18:10:14 dilfridge Exp $
+
+EAPI=4
+
+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.7"
+
+inherit kde4-base
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Digital photo management application for KDE"
+HOMEPAGE="http://www.digikam.org/"
+[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${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"
+
+CDEPEND="
+	$(add_kdebase_dep kdelibs 'semantic-desktop=')
+	$(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-0.2.5
+	>=media-libs/libkface-${PV}
+	>=media-libs/libkgeomap-${PV}
+	media-libs/liblqr
+	>=media-libs/libpgf-6.11.28
+	media-libs/libpng
+	media-libs/tiff
+	virtual/jpeg
+	x11-libs/qt-gui[qt3support]
+	|| ( >=sci-libs/clapack-3.2.1-r6 sci-libs/lapack-atlas )
+	|| ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[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}
+	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
+	mv "${WORKDIR}/${MY_P}/doc/${PN}" doc || die
+	echo "add_subdirectory( digikam )" > doc/CMakeLists.txt
+	echo "add_subdirectory( showfoto )" >> doc/CMakeLists.txt
+
+	# prepare the translations
+	mv "${WORKDIR}/${MY_P}/po" po || die
+	find po -name "kipiplugin_*.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 )" >> 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}/html
+		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
+}