[media-gfx/digikam] QA cleanups

(Portage version: 2.1.9.48/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

3 files changed, 32 insertions, 31 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index d8a92d1..380f301 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -3,6 +3,10 @@
 # $Header: $
 
   11 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  digikam-2.0.0_beta5.ebuild:
+  QA cleanups
+
+  11 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -digikam-2.0.0_beta2.ebuild, -digikam-2.0.0_beta3.ebuild,
   -digikam-2.0.0_beta4.ebuild, digikam-2.0.0_beta5.ebuild:
   Remove old; drop ppc keyword
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 7ab4094..f0335e3 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -31,23 +31,23 @@ EBUILD digikam-1.2.0-r4.ebuild 3241 RMD160 97240d9bf66f91276583380abb44abcca32ae
 EBUILD digikam-1.8.0.ebuild 3247 RMD160 86c84f6dea0b55764dad9cf4c6427b1b2fbc7742 SHA1 4ea44c2e1e30d7dfdb28bbeb8defbd740199fad9 SHA256 b93cb62a5f973e48ec99716183ee339dcd0c90791594a982b6d70bd216a425c4
 EBUILD digikam-1.9.0-r1.ebuild 3260 RMD160 9a81da4a6a320bc4f86b05665654c4b7e0cbacdf SHA1 5bfc5984b6f9bdc9b724b9a6196123ec812bc703 SHA256 a4b15d1c633ad4f793471d09563a1c4ee14d3889de3cc09afed8df85e83d5a28
 EBUILD digikam-1.9.0.ebuild 3242 RMD160 04df3e2432a19d01a07851d8a8a3821279aa4af0 SHA1 c80b1939a52ab7aa7c0032373022f3cb931fee81 SHA256 e5bc2256f812d90206d99b3ec6f6ffbad75e5dd0bbcccaa8e349e894eef73d53
-EBUILD digikam-2.0.0_beta5.ebuild 3328 RMD160 4191160ab7e4a047fd2238ea36a2f67182afc14b SHA1 d10210b393f1d9cd50bfe5bb9fb3ae790726ecb5 SHA256 ebd0196594424cba08993acc98669c87b11c47a8460544cdb9d50051cf521a03
-MISC ChangeLog 10220 RMD160 5c32a7cd08f5ed1fd140ec8d7e4c2434ffea3779 SHA1 42eaf019fdbd422eff3e4dafd1d7a7a303f8a635 SHA256 d1ce6d4198ffcc18c1f3f411dfbc5f2840ffa55a7305f55bd1c6782a49168b1e
+EBUILD digikam-2.0.0_beta5.ebuild 3205 RMD160 143f3e02e6f3c5b36b69036ccc3b7dbe4d71ff84 SHA1 029cfd682758e50516045f4ae523bf18c6995fe7 SHA256 aac452e2e1a9aa1234627df76a67fbf36ef2f8d242e83db3637e1fcf66567c17
+MISC ChangeLog 10322 RMD160 5557f560f9bf482584dc81d06b95468628356554 SHA1 d9fe7c8aef1193ad14ace94745352c6132997957 SHA256 687de0ef9b609b8d3537ab73947688e59788935ebe1c02b8fe894f2809449585
 MISC metadata.xml 626 RMD160 c40d623ad086f0d2f47a8f1092b486b4ae92faef SHA1 fb1c2209b4eac3dc43fa09a7946d47c0156cee67 SHA256 a5d01bcd7e500161aed9a6a4fe9b65422091a375d1ee9cc0490e7776f8f925a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNyvlPAAoJENwGBM22xffe00MP+wbLx5aIHyzr62TjQzSRVVza
-yHgVanW/f9RpH5vSeb8hd1a3Hsy6enEABR/oM1VmYkKmm3EfGbeIIjDmEAgOP77E
-MhqaeRwPet8hMNDQ/uzLa+OKKsQNZhr9QL6XaL7wrkKtl3wKu9U5b0LazpgnV0GR
-FjmMi00Mb3+BO0kNTtZ0+D1S0fnshkA3vOQvxNu6/qY0ZpFUcFfRCe+YY3yKUz4M
-Hc3StUecwgGh8z4JMv6YxAXIswbfQZHdeJi875EIwxdJOpjASK0ezZh+PIyqGJRR
-RG7usR49kVawKbpS2FuwRuB+Gp6nVDxFBMQ+aPjY2HAd+4JfBaBv+077QRhUuHMb
-k5oZH7kYZtr+VQ679RsBZhowepHeIVoziidJ4X4lDIK04Gj836UJ89jzp5G08g4N
-mrNiktnrDMoLJD+XSH/uEyMwETBnDbG4oKY9mf9wAHbUbfu+PtzRtPfuVq+8Zsfx
-I6XZt+eigmGX5nP/B6j1pTLPuDrS+DM1xgMVQUi9W2ehJU/sbR/Ps8PkOqxAZil9
-eaZNfCLmIMUYrIfa2+PMTq/TmeGh7oAF9FlkbGcIpaMmuPUevyocUf39gLkJfo2w
-r377YB0Li5Z7qV5Cqil/NZ1IxmZwvMKOWvBAoJrQvB6p9BIDVqBykdZqSx53ck+B
-gDO1zWP38l6GjyT/mNYL
-=oI/F
+iQIcBAEBCgAGBQJNyvqUAAoJENwGBM22xffejYgP/jUTMG3wD+ZF/b2W7NgZ9n/R
+NAOVjiLcNpS5GX2HbVVgfWB+48MI7g7M6P1p0FYaHUWhSYmC23hadI4aFjw24qZ2
+80mEBcXAMciddoJ8k0KuauCaRqz3P7PmN2eZdbJtF5v01cYlPCuLrZxWTRcZscFB
+pcIpmIhc2c3YQieZHky7Wkm9RbkhCK3mnwfpVT7J/31FYAT0G6IXNjjcWli6LQ7u
+czAJ+DuszKbDcxAFs4G1O7g455zJ7g/UAFHqXcUURMdhgy2hiCeXe4tawq87Lym6
+rxDB3IzSnuTpGpJBSYUqyoGWdwLDnJsbt5RyNuuwAEMSFuvUeq72csTCYMdCEeEB
+HdTbdW7Ls3EG4xQMk17tUcPHXmHEOsmwp3eD3jypODFIN0rT3/EBEFoJsNt5Kc5d
+gWImcIVueF0cY/eiOLitsa60bF3wX43Z+foCBIz2/UIjFXcqbigyGyDuV6hnLgua
+tPav0kkcbTGpc4P7nzYrllfr/aZiuHfjRw/6/Wpeju8dvHy/eqIYPO2iciwk6KQD
+29igEfsjf8sM4M72wSzITRhyS6qvhd4cKXmqFGLD2kJ/Wc6+Jc94Qnotpre3ojss
+UK7ONfj0P/DGcNapOt5ccerxyKLWky22MWS+aRVm/gAQn7a11np0faNiRaaqoI+T
+yhpGzlw7jh5yQukcbzDf
+=HB0h
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-2.0.0_beta5.ebuild b/media-gfx/digikam/digikam-2.0.0_beta5.ebuild
index 758c687..4a7ad3b 100644
--- a/media-gfx/digikam/digikam-2.0.0_beta5.ebuild
+++ b/media-gfx/digikam/digikam-2.0.0_beta5.ebuild
@@ -4,13 +4,11 @@
 
 EAPI=4
 
-if [ "${PV}" != "9999" ]; then
-	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"
-else
-	KMNAME="extragear/graphics"
-fi
+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
 
@@ -29,7 +27,7 @@ LICENSE="GPL-2
 	handbook? ( FDL-1.2 )"
 KEYWORDS="~amd64 ~x86"
 SLOT="4"
-IUSE="addressbook debug doc gphoto2 handbook semantic-desktop themedesigner +thumbnails video"
+IUSE="addressbook debug doc gphoto2 semantic-desktop themedesigner +thumbnails video"
 
 CDEPEND="
 	$(add_kdebase_dep kdelibs semantic-desktop)
@@ -53,15 +51,15 @@ CDEPEND="
 	virtual/mysql
 	x11-libs/qt-gui[qt3support]
 	|| ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
-	addressbook? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
+	addressbook? ( $(add_kdebase_dep kdepimlibs) )
 	gphoto2? ( media-libs/libgphoto2 )
 "
 RDEPEND="${CDEPEND}
-	>=kde-base/kreadconfig-${KDE_MINIMAL}
+	$(add_kdebase_dep kreadconfig)
 	video? (
 		|| (
-			>=kde-base/mplayerthumbs-${KDE_MINIMAL}
-			>=kde-base/ffmpegthumbs-${KDE_MINIMAL}
+			$(add_kdebase_dep mplayerthumbs)
+			$(add_kdebase_dep ffmpegthumbs)
 		)
 	)
 "
@@ -94,7 +92,7 @@ src_configure() {
 
 	use semantic-desktop && backend="Nepomuk" || backend="None"
 	# LQR = only allows to choose between bundled/external
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DFORCED_UNBUNDLE=ON
 		-DWITH_LQR=ON
 		-DWITH_LENSFUN=ON
@@ -117,9 +115,8 @@ src_install() {
 
 	if use doc; then
 		# install the api documentation
-		dodir /usr/share/doc/${PF}/html || die
 		insinto /usr/share/doc/${PF}/html
-		doins -r ${CMAKE_BUILD_DIR}/api/html/* || die
+		doins -r ${CMAKE_BUILD_DIR}/api/html/*
 	fi
 }
 
@@ -127,6 +124,6 @@ pkg_postinst() {
 	kde4-base_pkg_postinst
 
 	if use doc; then
-		elog The digikam api documentation has been installed at /usr/share/doc/${PF}/html
+		elog "The digikam api documentation has been installed at /usr/share/doc/${PF}/html"
 	fi
 }