Added work in progess, does not build yet

(Portage version: 2.1.10.7/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key B6C5F7DE)

4 files changed, 51 insertions, 174 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 51e1807..29166b6 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*digikam-2.0.0 (28 Jul 2011)
+
+  28 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -digikam-2.0.0_beta5.ebuild, -digikam-2.0.0_beta6.ebuild,
+  +digikam-2.0.0.ebuild:
+  Added work in progess, does not build yet
+
   27 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org> digikam-1.9.0.ebuild,
   digikam-1.9.0-r1.ebuild, +files/digikam-1.9.0-newpgf.patch,
   digikam-2.0.0_rc.ebuild:
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 6b434ee..2e146d5 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -29,32 +29,30 @@ AUX digikam-2.0.0_rc-officialpgf2.patch 824 RMD160 54715604f3ca772253fee111f3110
 AUX digikam-2.0.0_rc-oldpgf.patch 866 RMD160 36d94d476bdd02647fe4071b6ca2d9d09c851282 SHA1 3c49b420987df7db854a6a426daa848c42a36f3c SHA256 11389b36e669ae65522f439672d0409963f86eba0d2f439402311e67650dc89c
 DIST digikam-1.8.0.tar.bz2 23376636 RMD160 aa86cae8048a8f7122285c5e27aaa59e5dbcc47c SHA1 65430990896b56b7ec76b9a6bc5f8472145f44fd SHA256 210de9d949265e910c65c9ab8b19efab13839f6a2ef761a5915d267ddfe494aa
 DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5
-DIST digikam-2.0.0-beta5.tar.bz2 43494127 RMD160 715f9f3f1695bad8e74dbeb9313da7a5303f0473 SHA1 97432e5997f00028c1acff38e2e0a791294c2aaf SHA256 118ea42cebaec6795b89cbb6018bdfa1d0e664eeda9b09ac0fd4083e3969f394
-DIST digikam-2.0.0-beta6.tar.bz2 43533320 RMD160 eb50febc2ade359f8d92e6673e4f73a6b57b6fa5 SHA1 3ca5356da07d6484ce2299627e9d54acf14e06a2 SHA256 5f81ce581ff8e1148c023b71365928509d497f0bd248f27c925ea3038cea2cea
 DIST digikam-2.0.0-rc.tar.bz2 45397480 RMD160 20fa3790c8ca950960020cdf3a32410689005db3 SHA1 b0067f99de1244723c45650d9a684b1e8f743954 SHA256 564354c34b41287e951005707b84b8a1f82c691189083c5943abed5e0aebe691
+DIST digikam-2.0.0.tar.bz2 53906557 RMD160 010f6b37920828003fa56159f1a7cf8452226fc6 SHA1 5941681163d90a13d316bd606589354099fd4f8a SHA256 c7d19f0562a06f02479cf84a257fe30aa523f82e668a16b21ce9ae5443034234
 DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
 EBUILD digikam-1.8.0.ebuild 3247 RMD160 86c84f6dea0b55764dad9cf4c6427b1b2fbc7742 SHA1 4ea44c2e1e30d7dfdb28bbeb8defbd740199fad9 SHA256 b93cb62a5f973e48ec99716183ee339dcd0c90791594a982b6d70bd216a425c4
 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_beta5.ebuild 3245 RMD160 cc3e08c7da4a3bd909edb43f6b33ad3aff64b762 SHA1 a8501a880d6cc3c9e22153fc8288908de09c1d2a SHA256 8b5dfd0865866bb01fcfe6d5055b798194ea6e3dfefa29821dac73dd997643bf
-EBUILD digikam-2.0.0_beta6.ebuild 3226 RMD160 939ed0020e35608d4140e73b40f9266093c0e2a8 SHA1 6baad3fab16f5f406295f7e7e084e67e9c233e48 SHA256 b6ee9123131a9b97c984d7bfc05a9b69ce644083499702c0c18d394c5854ba75
+EBUILD digikam-2.0.0.ebuild 3615 RMD160 effa4c716dc295c077abb2316303909092a31c22 SHA1 8a1e48212e8fbfb2355fe4d93f68a4a7d4e26cfd SHA256 0eaa68b9a008bf8b222492854204d51a8ab6e7ea909d57c88a55f6b760180bc8
 EBUILD digikam-2.0.0_rc.ebuild 3500 RMD160 34a75d9a7b3aea4e5065cfc94d1674672a9a5ce3 SHA1 17abcd6e5996cc57a83fee9f9b0088aeaf1f4054 SHA256 2254955af12fb79aebdaec5dbaa6c3fe8e747ce47c42c22f2067ddddbf37f89a
-MISC ChangeLog 12203 RMD160 dad8c089a58312af04a5df63bae02cf38af3209d SHA1 9558c98e432bc61204e9782d1fb9c4c050fccfe3 SHA256 4a85e9b0a2cbc911a6ee392c357d7d603bd2cb9b4095b125c14d1cb6921f9044
+MISC ChangeLog 12420 RMD160 a141058d391b2035ed86bf0c380e7a576ad8b027 SHA1 6e70d14f65f91b00b51ac9d3b9bd61d5485a0e48 SHA256 1f9671289485fd404433c9f2e583fbe5e63ab0626b64de3d54e88b13e6861d2b
 MISC metadata.xml 553 RMD160 7de4b2dc583e17cfab08965015c5bb6291b968d8 SHA1 c7eecc86fd6539448bc2a8296f77c2bc4796e3a1 SHA256 f3280886ea9f988ca1315148380f1c89c6c042d0bc511105f3b2c3a926e17b80
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOMInJAAoJENwGBM22xffeoecQAJ5dNaTo+foLdjZAnYQOqzAO
-ZemA7GnO/84v0P2YFJJfDaKMmhvy1YFl1fXZBHNk1Ivk10LJhMXKcSHpkwP8BDwp
-BOUVJqWIRVmBXNjsoNbwWG08P3zs4nkjWRPFBwYjuW2SOld3Kt0zZ2/2YqvkMaT9
-Pxgw9HAVmOFrBo+jiDU3lCGM+zaplUIBXuXf4Uz/RH8nCgBAtpQ4rsFDbBNgrPJh
-4NjgK/3qGJ9EUsLNQaPuynlrM0JqUajylrOEPMrI4ZqGG+o/KIDMTQTipkgVQAHq
-jVQMDptS0u3cGmArOOGTdv23PIPWVI9iqLoAE2jhS6M2t+JG54OqaNhh+zd9fEkb
-MlDAA0ISxdQeEj5tgpA/U2zv9W9WtH9TpN087OCc5ZXXlmN+36oWfGSw3eOdXdrZ
-e3Xfhgpbia/35/nmbxh/tpEfRBuMBGdsI/oZVToeQXqVRyfzX5hIhpvSIiUuKGz6
-NillqL7oSAUnNEAhi95ZTXtSMTyChkrVXV2kuDrN4SdRE3Wjwphdf2XR2pYwHrrB
-KFGwXwClNn6hmHVFh2Jvr2jrQUronIWlaXdun+w1F50Gv0CbDCl6KcLFM3zrjL60
-dFSr3s2ynmxaRH2Qgv73aL/BvPcz2pOaBaPuLIoAjwSjsvTRtA6w8Cmx2uPiJGK8
-yCtbfrJpTKyukhs4vo/f
-=feu8
+iQIcBAEBCgAGBQJOMeZ/AAoJENwGBM22xffeSrEP/jYRZKVsPWTNNuGLWzdaPX3M
+Y3l2t5YJ4VJOHX1X73wbduY1FGqj8SoGVbfEPDiS89ezfwREwFREf4c2AD7LlI4a
+AS1Z4ydewHhBryE9E4p/uXEOoDe8r2Cc0YghByTiOwh5wxjdC27Fg56D8yM2EBED
+H/b2YMEl3iqsgJKcuDp13o8aJNVk+UxROIW8TwJELxhPdlnWm/qu9SR1eWCS/+se
+MwuNYRLjf2zxT1tubNbCIyGjwLuz747C9kPKDtB97dzmJPKEMi1lvWf4Z34Zuohb
+UiVOeFY0SqhPYWbTsiFZcZfjt9jrXFF/rY35nzJpFuuvLkIoFQP91eomQNgjuWIN
+nU84vJUV3HGA1mqRKgXgCdJJkbpe2fdR/GVUg9A20GP8lbiHN9LqNPxOZhDHjO3E
++LvZ0kgdT4XM04jpikY8Mopq8Yl7i5PGlYE9nizEkEHmXpPZH6poT/NggGmKsDZg
+f+VX+Qk+OeleV7DVeut03a/VHkKfBWJewMdAfciLyH54B/KIhcFHvlpgoARryMJr
+MYQkNyiHNi+RZPLlDod/MJIQfgr0QopmVW5QgPIG+45mNR7V4GAyd0W+2sXEVcTy
+8wXxDdNKySdSXvkzdwIU/Ktjb4287qvF5Fz1NoSTe9LR/40gFlNnWAndfQaq+xY0
+meruCDTchw5qGtBnlFxt
+=gU0/
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-2.0.0_beta6.ebuild b/media-gfx/digikam/digikam-2.0.0.ebuild
index be5c2a8..74034dd 100644
--- a/media-gfx/digikam/digikam-2.0.0_beta6.ebuild
+++ b/media-gfx/digikam/digikam-2.0.0.ebuild
@@ -1,63 +1,59 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.0.0_rc.ebuild,v 1.1 2011/07/27 20:51:56 dilfridge Exp $
 
 EAPI=4
 
-KDE_LINGUAS=""
-#KDE_LINGUAS="be ca ca@valencia de el en_GB eo es et eu fi fr he hi hne hu is it km
-#	ko lt lv nds nn pa pl pt pt_BR ro se sl sv th tr vi zh_CN zh_TW"
+KDE_LINGUAS="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 ss sv ta te tg th tr tt uk uz ven vi wa xh 
+zh_CN zh_HK zh_TW zu"
 
 KDE_HANDBOOK="optional"
-
-CMAKE_MIN_VERSION=2.8
-
-KDE_MINIMAL="4.6"
-
-KDEGRAPHICS_MINIMAL="4.6.30"
-# please leave the weird number here for the moment
+CMAKE_MIN_VERSION="2.8"
+KDE_MINIMAL="4.7"
 
 inherit kde4-base
 
 MY_P="${PN}-${PV/_/-}"
 
-DESCRIPTION="A digital photo management application for KDE."
+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"
+KEYWORDS=""
 SLOT="4"
-IUSE="addressbook debug doc gphoto2 semantic-desktop themedesigner +thumbnails video"
+IUSE="addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video"
 
 CDEPEND="
 	$(add_kdebase_dep kdelibs semantic-desktop)
-	$(add_kdebase_dep marble plasma)
-	$(add_kdebase_dep libkipi)
+	$(add_kdebase_dep libkdcraw)
 	$(add_kdebase_dep libkexiv2)
-	>=kde-base/libkdcraw-${KDEGRAPHICS_MINIMAL}
-	>=media-libs/libkface-${PV}
-	>=media-libs/libkmap-${PV}
+	$(add_kdebase_dep libkipi)
+	$(add_kdebase_dep marble plasma)
 	$(add_kdebase_dep solid)
 	media-libs/jasper
-	virtual/jpeg
 	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
-	media-libs/libpgf
-	>=media-plugins/kipi-plugins-1.2.0-r1
-	|| ( >=sci-libs/clapack-3.2.1-r6 sci-libs/lapack-atlas )
-	virtual/mysql
+	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-${PV}
 	video? (
 		|| (
 			$(add_kdebase_dep mplayerthumbs)
@@ -76,10 +72,17 @@ 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 "add_subdirectory( po )" >> CMakeLists.txt
+
 	kde4-base_src_prepare
 
 	if use handbook; then
@@ -104,6 +107,7 @@ src_configure() {
 		$(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)
 	)
 
diff --git a/media-gfx/digikam/digikam-2.0.0_beta5.ebuild b/media-gfx/digikam/digikam-2.0.0_beta5.ebuild
deleted file mode 100644
index b8e43c9..0000000
--- a/media-gfx/digikam/digikam-2.0.0_beta5.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# 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-1.6.0.ebuild,v 1.1 2010/11/25 20:30:29 dilfridge Exp $
-
-EAPI=4
-
-KDE_LINGUAS=""
-#KDE_LINGUAS="be ca ca@valencia de el en_GB eo es et eu fi fr he hi hne hu is it km
-#	ko lt lv nds nn pa pl pt pt_BR ro se sl sv th tr vi zh_CN zh_TW"
-
-KDE_HANDBOOK="optional"
-
-CMAKE_MIN_VERSION=2.8
-
-KDE_MINIMAL="4.6"
-KDEGRAPHICS_MINIMAL="4.6.29"
-
-inherit kde4-base
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="A 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 semantic-desktop themedesigner +thumbnails video"
-
-CDEPEND="
-	$(add_kdebase_dep kdelibs semantic-desktop)
-	$(add_kdebase_dep marble plasma)
-	$(add_kdebase_dep libkipi)
-	$(add_kdebase_dep libkexiv2)
-	>=kde-base/libkdcraw-${KDEGRAPHICS_MINIMAL}
-	>=media-libs/libkface-${PV}
-	>=media-libs/libkmap-${PV}
-	$(add_kdebase_dep solid)
-	media-libs/jasper
-	virtual/jpeg
-	media-libs/lcms:0
-	>=media-libs/lensfun-0.2.5
-	media-libs/liblqr
-	media-libs/libpng
-	media-libs/tiff
-	media-libs/libpgf
-	>=media-plugins/kipi-plugins-1.2.0-r1
-	|| ( >=sci-libs/clapack-3.2.1-r3 sci-libs/lapack-atlas )
-	virtual/mysql
-	x11-libs/qt-gui[qt3support]
-	|| ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
-	addressbook? ( $(add_kdebase_dep kdepimlibs) )
-	gphoto2? ( media-libs/libgphoto2 )
-"
-RDEPEND="${CDEPEND}
-	$(add_kdebase_dep kreadconfig)
-	video? (
-		|| (
-			$(add_kdebase_dep mplayerthumbs)
-			$(add_kdebase_dep ffmpegthumbs)
-		)
-	)
-"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-	doc? ( app-doc/doxygen )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-2.0.0_beta5-docs.patch
-	"${FILESDIR}/${PN}"-1.9.0-turbo.patch
-)
-
-S="${WORKDIR}/${MY_P}/core"
-
-src_prepare() {
-	# just to make absolutely sure
-	rm -rf "${WORKDIR}/${MY_P}/extra" || die
-
-	mv "${WORKDIR}/${MY_P}/doc/${PN}" doc || die
-	echo "add_subdirectory( digikam )" > doc/CMakeLists.txt
-	echo "add_subdirectory( showfoto )" >> doc/CMakeLists.txt
-
-	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)
-		$(cmake-utils_use_build doc)
-		-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)
-	)
-
-	kde4-base_src_configure
-}
-
-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
-}