Rewrite documentation handling, add doc useflag to disable documentation entirely, split documentation in packages. Add kdehiddenvisibility flag as this package can build with visibility support.

Package-Manager: portage-2.1_rc3-r1

7 files changed, 210 insertions, 74 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index d5594ed06cee..162976e8d531 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.49 2006/05/20 16:41:14 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.50 2006/05/30 00:58:30 flameeyes Exp $
+
+  30 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  digikam-0.8.1-r1.ebuild, digikam-0.8.2_rc1.ebuild:
+  Rewrite documentation handling, add doc useflag to disable documentation
+  entirely, split documentation in packages. Add kdehiddenvisibility flag as
+  this package can build with visibility support.
 
 *digikam-0.8.2_rc1 (20 May 2006)
 
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 6e956a95af61..0d0c8f32e2fe 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,10 +1,60 @@
-MD5 cdb60434a4d504f674cb266faac80351 ChangeLog 7018
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST digikam-0.7.4.tar.bz2 2322119 RMD160 c69b2b90ec56cf5e3f536b017db2310e325927b8 SHA256 38139c41863064d7d388b1d927747392f43f2c97cb55700d7a8f697378cc8cc2
+DIST digikam-0.8.1.tar.bz2 3783559 RMD160 36e034cf1ddc783d7c8f9e28899862e1dce6ef0d SHA1 1bd89b9568c5b1edded6632edf73775ef9e798ff SHA256 4f0ad787fe8a4bf651cb1db7b896024fbb6abfd47527a64cb712b18e5ea4d87f
+DIST digikam-0.8.2-rc1.tar.bz2 3817463
+DIST digikam-doc-0.7.4.tar.bz2 22977314 RMD160 fbab3112317f7b3ba3dec1a37d308196dfe187e7 SHA256 7bc6ddb8637b821b4939b33e827141e798234d28145cdaeb9d52eb13e4c64c40
+DIST digikam-doc-0.8.0-da.tar.bz2 50493 RMD160 50fe4b8deb3c5edb759c3844cf3f52c7f2bcaade SHA1 1ca628f4541d19c91b76f5e35e4b34f9dfb1c725 SHA256 9a0c5a0c8d5e86b5836aba3adb22fbfe50b968b7bd19320c967443fbe1860182
+DIST digikam-doc-0.8.0-es.tar.bz2 10816588 RMD160 d031a6d0601b2a5a98a7d11762bc32a210b80b82 SHA1 6e8fa92cf60b4512d19ca6c116ddfc08e70d3db7 SHA256 de17de6816895db79b56aaeb2106286ad351e51b1acf124eeaf29e3baeb055a0
+DIST digikam-doc-0.8.0-et.tar.bz2 41384 RMD160 d7d57533d8cdf7d4919c4107e7baa6c2f77b03c9 SHA1 e57bc79d252ec79287c72259441f56d9eacb1ac4 SHA256 ba02a828fbbeb1243e97195b5a333d12b1b4f88456082b6e615709bd07f20b83
+DIST digikam-doc-0.8.0-gentoo.tar.bz2 19396732 RMD160 22ac0d7fa874dc853ab3957a145c54d9737a3d2e SHA1 00d6a10aa87d03a4dfa0d4579ff83c38cb3a6cc3 SHA256 c0f7448e02378f2ef559b9b0e887327422d849c9ba607a254448dcc00eb3699c
+DIST digikam-doc-0.8.0-it.tar.bz2 702416 RMD160 bc89f465e073eb64944ef2a9914bb2291878b365 SHA1 9d3af568db4b0f0bd02d075f00a2b08f6e17ad68 SHA256 07fa5ef11f9544b4f3a2b0be8759ea1d7041d56f9188a15101bb53aae8dca3f3
+DIST digikam-doc-0.8.0-nl.tar.bz2 9764577 RMD160 30968073fedb980b821f332044194b63873c8785 SHA1 6504d138616baf6aae37be5c8f7dc09909b28a6a SHA256 f8d7d934bc25270686b81183dd1dfd3c43d6f479e9961c3d8218f2ae114b7c15
+DIST digikam-doc-0.8.0-pt.tar.bz2 52611 RMD160 5f5e400f79dcfb5f527afe8cc31de261bd05f421 SHA1 e3be24f622e88e7f8c4ccc64868ca6455fe027bc SHA256 727a21963504cd2b1e3b67bfa7fb872b5f9d45d32f770861b51eceaeff763431
+DIST digikam-doc-0.8.0-pt_BR.tar.bz2 1988378 RMD160 ddcd056964e48b294e6bfb8a5c1e8f1c7390d0c4 SHA1 0880b790eac83df79bf3ed1d2d82160932e31832 SHA256 82a036d609ad4bfc2f74d9ec291dd463641d4456b2493f03b15cb16337273391
+DIST digikam-doc-0.8.0-sv.tar.bz2 261061 RMD160 e682527412ebd4732e5010c6bbbd4619159dd0f3 SHA1 37ab03035d7662076f2147565dc306f9c3644f39 SHA256 bbbc383c04fb16df562126d4d0523364753d26fbf95291922792e03477c378d0
+DIST digikam-doc-0.8.0.tar.bz2 43156836 RMD160 94d6abb1e58ba8ed91b11a86608d5dce8c9ba3a2 SHA1 5d482202f8c1e9c25a1bb4b79b6f57140ca01ce4 SHA256 9aa84a94187e0f40939373b264de7ce73e73be44b976f8b890538a68aa1f3f22
+EBUILD digikam-0.7.4-r1.ebuild 985 RMD160 37bbc538022c3fb7f0e47d9b55b079012a9f9277 SHA1 af7af97eb9baee77383ed1374cc1cfb886117798 SHA256 fe52967f734d934da75ce443ff6298ad658e222d67b240b39342af66bc515c4e
 MD5 f362c685c57eea5ebe2321250582e2a8 digikam-0.7.4-r1.ebuild 985
+RMD160 37bbc538022c3fb7f0e47d9b55b079012a9f9277 digikam-0.7.4-r1.ebuild 985
+SHA256 fe52967f734d934da75ce443ff6298ad658e222d67b240b39342af66bc515c4e digikam-0.7.4-r1.ebuild 985
+EBUILD digikam-0.7.4-r2.ebuild 1112 RMD160 b693efa120d08320ff8fdc2326a0a037b50e030e SHA1 e6f4854fa63c2185a6ac8d1662983142fa31b5aa SHA256 f7ef9ef84b6e2d2494dbb635b937150b1048983c661f3a2805efdd73d4509c0f
 MD5 6bc39209444c4f7101c045f2baade0b7 digikam-0.7.4-r2.ebuild 1112
-MD5 65daf5b20fb4fe288f93d616c21c6174 digikam-0.8.1-r1.ebuild 2408
-MD5 c28470d6a325d4dc2c9b84b40c9c5670 digikam-0.8.2_rc1.ebuild 2476
-MD5 55bccecf6ae17fe2365bc62da5ab1640 files/digest-digikam-0.7.4-r1 139
-MD5 abbdf9d37c5fe072a9554cb85028aaf2 files/digest-digikam-0.7.4-r2 509
-MD5 c4affbd1c3faa88a332982caae5b4d4b files/digest-digikam-0.8.1-r1 509
-MD5 a4efd39118323adb56feea9b62134b9d files/digest-digikam-0.8.2_rc1 143
+RMD160 b693efa120d08320ff8fdc2326a0a037b50e030e digikam-0.7.4-r2.ebuild 1112
+SHA256 f7ef9ef84b6e2d2494dbb635b937150b1048983c661f3a2805efdd73d4509c0f digikam-0.7.4-r2.ebuild 1112
+EBUILD digikam-0.8.1-r1.ebuild 2587 RMD160 51448f514f0ad144eca2684024484f7b5bc9375b SHA1 1f82d32ec7dd62a6d11908dad32bd1bd841ac8bb SHA256 2788f6aa5198a3c84c170bc36a6c4a42980fc571fb2d080d4c9212abed7d2b50
+MD5 62f4265abc6059727efe8f1c8880f91f digikam-0.8.1-r1.ebuild 2587
+RMD160 51448f514f0ad144eca2684024484f7b5bc9375b digikam-0.8.1-r1.ebuild 2587
+SHA256 2788f6aa5198a3c84c170bc36a6c4a42980fc571fb2d080d4c9212abed7d2b50 digikam-0.8.1-r1.ebuild 2587
+EBUILD digikam-0.8.2_rc1.ebuild 2599 RMD160 059ce2df9b7956f2d010ee19c0d43d025b36129c SHA1 ed999bcaddec4f8a68af601ff28b6353bb46a5ba SHA256 2fceb4f1b6eb40e1a7bace113fd30a01b6561459cbbf6becfad8e82c523f3622
+MD5 4ef85a342613bb4d9e6dae6eb947ec21 digikam-0.8.2_rc1.ebuild 2599
+RMD160 059ce2df9b7956f2d010ee19c0d43d025b36129c digikam-0.8.2_rc1.ebuild 2599
+SHA256 2fceb4f1b6eb40e1a7bace113fd30a01b6561459cbbf6becfad8e82c523f3622 digikam-0.8.2_rc1.ebuild 2599
+MISC ChangeLog 7331 RMD160 20b217b61c1bbb8ad089bdd0d93581ce0e85edaa SHA1 f1f601f479ab38f64866d72f9daa276b515d4dcc SHA256 217cbd0ff2e6f9d4c16c53a41034ace0e20a92fb98acfa877058e5c7cc70dbf2
+MD5 15613278f45ea907e9acdc0066885711 ChangeLog 7331
+RMD160 20b217b61c1bbb8ad089bdd0d93581ce0e85edaa ChangeLog 7331
+SHA256 217cbd0ff2e6f9d4c16c53a41034ace0e20a92fb98acfa877058e5c7cc70dbf2 ChangeLog 7331
+MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
+SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
+MD5 abbdf9d37c5fe072a9554cb85028aaf2 files/digest-digikam-0.7.4-r1 509
+RMD160 d92e1b6fd91ceee87d6d22085eb8776502b9c3c9 files/digest-digikam-0.7.4-r1 509
+SHA256 b702b73ce21e6c97cfc055278900c54bfe00e986d614be3554113a5f12159c8c files/digest-digikam-0.7.4-r1 509
+MD5 abbdf9d37c5fe072a9554cb85028aaf2 files/digest-digikam-0.7.4-r2 509
+RMD160 d92e1b6fd91ceee87d6d22085eb8776502b9c3c9 files/digest-digikam-0.7.4-r2 509
+SHA256 b702b73ce21e6c97cfc055278900c54bfe00e986d614be3554113a5f12159c8c files/digest-digikam-0.7.4-r2 509
+MD5 9f4b850488bd889d3e307418c0ddaf36 files/digest-digikam-0.8.1-r1 2924
+RMD160 4ced29f4b9593ea0bea69061c91cf187be35a8e0 files/digest-digikam-0.8.1-r1 2924
+SHA256 34076189088011992e7d9f6cc39b70949fff8c7cdf66bcce09785de841d6245c files/digest-digikam-0.8.1-r1 2924
+MD5 3123cf1845860a7e7c4bd2c0141ab63c files/digest-digikam-0.8.2_rc1 2748
+RMD160 8d617bae6f14edc8e11c83795e0d43d4b6eb8db7 files/digest-digikam-0.8.2_rc1 2748
+SHA256 d0b28c14c184823976462675d18d47517944a4f1c699e1dbf3c907cbf7685ce3 files/digest-digikam-0.8.2_rc1 2748
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEe5jBAiZjviIA2XgRAs/VAKCzFWdy3KliiKdkcNGjvSdHDHv6YACg03rj
+6j+Iry9E0978x3B3PL2s/f4=
+=4jCI
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-0.8.1-r1.ebuild b/media-gfx/digikam/digikam-0.8.1-r1.ebuild
index d595e73f71a8..49c8016c9e18 100644
--- a/media-gfx/digikam/digikam-0.8.1-r1.ebuild
+++ b/media-gfx/digikam/digikam-0.8.1-r1.ebuild
@@ -1,22 +1,21 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.8.1-r1.ebuild,v 1.3 2006/03/17 01:05:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.8.1-r1.ebuild,v 1.4 2006/05/30 00:58:30 flameeyes Exp $
 
 inherit kde
 
 P_DOC="${PN}-doc-0.8.0"
-MY_P=${P/_/-}
-S=${WORKDIR}/${MY_P}
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+S_DOC="${WORKDIR}/${P_DOC}"
 
 DESCRIPTION="A digital photo management application for KDE."
 HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://sourceforge/digikam/${MY_P}.tar.bz2
-	mirror://sourceforge/digikam/${P_DOC}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
-IUSE="nfs"
+IUSE="nfs doc kdehiddenvisibility"
 
 DEPEND=">=media-libs/libgphoto2-2
 	>=media-libs/libkexif-0.2.1
@@ -31,52 +30,63 @@ RDEPEND="${DEPEND}
 need-kde 3.4
 
 LANGS="bg br ca cs cy da de el en_GB es et fi fr ga gl he hu is it ja lt mk mt nb nl nn pa pl pt pt_BR ro ru rw sl sr sr@Latn sv ta tr zh_CN"
-LANGS_DOC_DC="da es et it nl pt_BR pt sv"
-LANGS_DOC_SF="da et it nl pt sv"
+LANGS_DOC="da es et it nl pt_BR pt sv"
+
+DOC_URI="mirror://sourceforge/digikam/${P_DOC}.tar.bz2"
+SRC_URI="${DOC_URI}"
+
+for lang in ${LANGS}; do
+	IUSE="${IUSE} linguas_${lang}"
+	[[ " ${LANGS_DOC} " != *" ${lang} "* ]] && SRC_URI="!linguas_${lang}? ( ${SRC_URI} )"
+done
+
+for lang in ${LANGS_DOC}; do
+	IUSE="${IUSE} linguas_${lang}"
+	SRC_URI="linguas_${lang}? (
+		mirror://gentoo/${P_DOC}-${lang}.tar.bz2
+		mirror://gentoo/${P_DOC}-gentoo.tar.bz2
+		)
+		!linguas_${lang}? ( ${SRC_URI} )"
+done
+
+SRC_URI="mirror://sourceforge/digikam/${MY_P}.tar.bz2
+	doc? ( linguas_en? ( mirror://gentoo/${P_DOC}-gentoo.tar.bz2 )
+		!linguas_en? ( ${SRC_URI} ) )"
 
 pkg_setup(){
 	slot_rebuild "media-libs/libkipi media-libs/libkexif" && die
+	kde_pkg_setup
 }
 
 src_unpack(){
 	kde_src_unpack
+	rm -f "${S}/configure" "${S_DOC}/configure"
 
-	local MAKE_PO=$(echo $(echo "${LINGUAS} ${LANGS}" | fmt -w 1 | sort | uniq -d))
-	einfo "Enabling translations for: ${MAKE_PO}"
+	local MAKE_PO=$(echo "${LINGUAS} ${LANGS}" | fmt -w 1 | sort | uniq -d | tr '\n' ' ')
+	einfo "Enabling translations for: en ${MAKE_PO}"
+	sed -i -e "s:^SUBDIRS =.*:SUBDIRS = . ${MAKE_PO}:" "${S}/po/Makefile.am" || die "sed for locale failed"
 
-	local MAKE_DOC_DC=$(echo $(echo "${LINGUAS} ${LANGS_DOC_DC}" | fmt -w 1 | sort | uniq -d))
-	local MAKE_DOC_SF=$(echo $(echo "${LINGUAS} ${LANGS_DOC_SF}" | fmt -w 1 | sort | uniq -d))
-	einfo "Enabling documentation for: $(echo $(echo "${MAKE_DOC_DC} ${MAKE_DOC_SF}" | fmt -w 1 | sort -u))"
-
-	local MAKE_DOC
-	for i in ${MAKE_DOC_DC} ; do MAKE_DOC="${MAKE_DOC} ${i}_digikam" ; done
-	for i in ${MAKE_DOC_SF} ; do MAKE_DOC="${MAKE_DOC} ${i}_showfoto" ; done
-
-	sed -i -e "s:^SUBDIRS =.*:SUBDIRS = . ${MAKE_PO}:" ${S}/po/Makefile.am || die "sed for locale failed"
-	sed -i -e "s:^SUBDIRS =.*:SUBDIRS = ${MAKE_DOC} ${PN}:" ${WORKDIR}/${P_DOC}/doc/Makefile.am || die "sed for locale failed"
+	if use doc; then
+		local MAKE_DOC=$(echo "${LINGUAS} ${LANGS_DOC}" | fmt -w 1 | sort | uniq -d | tr '\n' ' ')
+		einfo "Enabling documentation for: en ${LANG_DOCS}"
+	fi
 }
 
 src_compile(){
+	local myconf
+
 	myconf="$(use_enable nfs nfs-hack)"
 	kde_src_compile
 	myconf=""
-	_S=${S}
-	S=${WORKDIR}/${P_DOC}
-	cd ${S}
-	kde_src_compile
-	S=${_S}
+	[[ -d "${S_DOC}" ]] && KDE_S="${S_DOC}" kde_src_compile
 }
 
 src_install(){
 	kde_src_install
-	_S=${S}
-	S=${WORKDIR}/${P_DOC}
-	cd ${S}
-	kde_src_install
-	S=${_S}
+	[[ -d "${S_DOC}" ]] && KDE_S="${S_DOC}" kde_src_install
 
 	# Install the .desktop in FDO's suggested directory
 	dodir /usr/share/applications/kde
-	mv ${D}/usr/share/applnk/Graphics/digikam.desktop \
-		${D}/usr/share/applications/kde
+	mv "${D}/usr/share/applnk/Graphics/digikam.desktop" \
+		"${D}/usr/share/applications/kde"
 }
diff --git a/media-gfx/digikam/digikam-0.8.2_rc1.ebuild b/media-gfx/digikam/digikam-0.8.2_rc1.ebuild
index 30b136ad0f20..5ad3df9bd8dc 100644
--- a/media-gfx/digikam/digikam-0.8.2_rc1.ebuild
+++ b/media-gfx/digikam/digikam-0.8.2_rc1.ebuild
@@ -1,22 +1,21 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.8.2_rc1.ebuild,v 1.1 2006/05/20 16:41:14 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.8.2_rc1.ebuild,v 1.2 2006/05/30 00:58:30 flameeyes Exp $
 
 inherit kde
 
 P_DOC="${PN}-doc-0.8.0"
-MY_P=${P/_/-}
-S=${WORKDIR}/${MY_P}
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+S_DOC="${WORKDIR}/${P_DOC}"
 
 DESCRIPTION="A digital photo management application for KDE."
 HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://sourceforge/digikam/${MY_P}.tar.bz2
-	mirror://sourceforge/digikam/${P_DOC}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
-IUSE="nfs"
+IUSE="nfs doc kdehiddenvisibility"
 
 DEPEND=">=media-libs/libgphoto2-2
 	>=media-libs/libkexif-0.2.1
@@ -30,54 +29,65 @@ RDEPEND="${DEPEND}
 
 need-kde 3.4
 
-LANGS="bg br ca cs cy da de el en_GB es et eu fi fr ga gl he hu is it ja km lt mk ms mt nb nl nn pa pl pt pt_BR ro ru rw sl sr sr@Latn sv ta tr uk zh_CN"
-LANGS_DOC_DC="da es et it nl pt_BR pt sv"
-LANGS_DOC_SF="da et it nl pt sv"
+LANGS="bg br ca cs cy da de el en_GB es et e fi fr ga gl he hu is it ja km lt mk
+ms mt nb nl nn pa pl pt pt_BR ro ru rw sl sr sr@Latn sv ta tr uk zh_CN"
+LANGS_DOC="da es et it nl pt_BR pt sv"
+
+DOC_URI="mirror://sourceforge/digikam/${P_DOC}.tar.bz2"
+SRC_URI="${DOC_URI}"
+
+for lang in ${LANGS}; do
+	IUSE="${IUSE} linguas_${lang}"
+	[[ " ${LANGS_DOC} " != *" ${lang} "* ]] && SRC_URI="!linguas_${lang}? ( ${SRC_URI} )"
+done
+
+for lang in ${LANGS_DOC}; do
+	IUSE="${IUSE} linguas_${lang}"
+	SRC_URI="linguas_${lang}? (
+		mirror://gentoo/${P_DOC}-${lang}.tar.bz2
+		mirror://gentoo/${P_DOC}-gentoo.tar.bz2
+		)
+		!linguas_${lang}? ( ${SRC_URI} )"
+done
+
+SRC_URI="mirror://sourceforge/digikam/${MY_P}.tar.bz2
+	doc? ( linguas_en? ( mirror://gentoo/${P_DOC}-gentoo.tar.bz2 )
+		!linguas_en? ( ${SRC_URI} ) )"
 
 pkg_setup(){
-	kde_pkg_setup
 	slot_rebuild "media-libs/libkipi media-libs/libkexif" && die
+	kde_pkg_setup
 }
 
 src_unpack(){
 	kde_src_unpack
+	rm -f "${S}/configure" "${S_DOC}/configure"
 
-	local MAKE_PO=$(echo "${LINGUAS} ${LANGS}" | tr ' ' $'\n' | sort | uniq -d | tr $'\n' ' ')
-	einfo "Enabling translations for: ${MAKE_PO}"
-
-	local MAKE_DOC_DC=$(echo "${LINGUAS} ${LANGS_DOC_DC}" | tr ' ' $'\n' | sort | uniq -d | tr $'\n' ' ')
-	local MAKE_DOC_SF=$(echo "${LINGUAS} ${LANGS_DOC_SF}" | tr ' ' $'\n' | sort | uniq -d | tr $'\n' ' ')
-	einfo "Enabling documentation for: $(echo "${MAKE_DOC_DC} ${MAKE_DOC_SF}" | tr ' ' $'\n' | sort -u | tr $'\n' ' ')"
-
-	local MAKE_DOC
-	for i in ${MAKE_DOC_DC} ; do MAKE_DOC="${MAKE_DOC} ${i}_digikam" ; done
-	for i in ${MAKE_DOC_SF} ; do MAKE_DOC="${MAKE_DOC} ${i}_showfoto" ; done
+	local MAKE_PO=$(echo "${LINGUAS} ${LANGS}" | fmt -w 1 | sort | uniq -d | tr '\n' ' ')
+	einfo "Enabling translations for: en ${MAKE_PO}"
+	sed -i -e "s:^SUBDIRS =.*:SUBDIRS = . ${MAKE_PO}:" "${S}/po/Makefile.am" || die "sed for locale failed"
 
-	sed -i -e "s:^SUBDIRS =.*:SUBDIRS = . ${MAKE_PO}:" ${S}/po/Makefile.am || die "sed for locale failed"
-	sed -i -e "s:^SUBDIRS =.*:SUBDIRS = ${MAKE_DOC} ${PN}:" ${WORKDIR}/${P_DOC}/doc/Makefile.am || die "sed for locale failed"
+	if use doc; then
+		local MAKE_DOC=$(echo "${LINGUAS} ${LANGS_DOC}" | fmt -w 1 | sort | uniq -d | tr '\n' ' ')
+		einfo "Enabling documentation for: en ${LANG_DOCS}"
+	fi
 }
 
 src_compile(){
+	local myconf
+
 	myconf="$(use_enable nfs nfs-hack)"
 	kde_src_compile
 	myconf=""
-	_S=${S}
-	S=${WORKDIR}/${P_DOC}
-	cd ${S}
-	kde_src_compile
-	S=${_S}
+	[[ -d "${S_DOC}" ]] && KDE_S="${S_DOC}" kde_src_compile
 }
 
 src_install(){
 	kde_src_install
-	_S=${S}
-	S=${WORKDIR}/${P_DOC}
-	cd ${S}
-	kde_src_install
-	S=${_S}
+	[[ -d "${S_DOC}" ]] && KDE_S="${S_DOC}" kde_src_install
 
 	# Install the .desktop in FDO's suggested directory
 	dodir /usr/share/applications/kde
-	mv ${D}/usr/share/applnk/Graphics/digikam.desktop \
-		${D}/usr/share/applications/kde
+	mv "${D}/usr/share/applnk/Graphics/digikam.desktop" \
+		"${D}/usr/share/applications/kde"
 }
diff --git a/media-gfx/digikam/files/digest-digikam-0.7.4-r1 b/media-gfx/digikam/files/digest-digikam-0.7.4-r1
index d5b15dc7618b..59207e7e5a71 100644
--- a/media-gfx/digikam/files/digest-digikam-0.7.4-r1
+++ b/media-gfx/digikam/files/digest-digikam-0.7.4-r1
@@ -1,2 +1,6 @@
 MD5 3df53700ff78caca60cab4ea4116c7c5 digikam-0.7.4.tar.bz2 2322119
+RMD160 c69b2b90ec56cf5e3f536b017db2310e325927b8 digikam-0.7.4.tar.bz2 2322119
+SHA256 38139c41863064d7d388b1d927747392f43f2c97cb55700d7a8f697378cc8cc2 digikam-0.7.4.tar.bz2 2322119
 MD5 05b7ac518f482ad5689cbf5dea562d34 digikam-doc-0.7.4.tar.bz2 22977314
+RMD160 fbab3112317f7b3ba3dec1a37d308196dfe187e7 digikam-doc-0.7.4.tar.bz2 22977314
+SHA256 7bc6ddb8637b821b4939b33e827141e798234d28145cdaeb9d52eb13e4c64c40 digikam-doc-0.7.4.tar.bz2 22977314
diff --git a/media-gfx/digikam/files/digest-digikam-0.8.1-r1 b/media-gfx/digikam/files/digest-digikam-0.8.1-r1
index 7f84a1dc8c62..323a1aa8e2c7 100644
--- a/media-gfx/digikam/files/digest-digikam-0.8.1-r1
+++ b/media-gfx/digikam/files/digest-digikam-0.8.1-r1
@@ -1,6 +1,33 @@
 MD5 2672c510a78256a034a666f0e237eb3f digikam-0.8.1.tar.bz2 3783559
 RMD160 36e034cf1ddc783d7c8f9e28899862e1dce6ef0d digikam-0.8.1.tar.bz2 3783559
 SHA256 4f0ad787fe8a4bf651cb1db7b896024fbb6abfd47527a64cb712b18e5ea4d87f digikam-0.8.1.tar.bz2 3783559
+MD5 a18e5e9a4fd17994da5089ddcd9bc0c1 digikam-doc-0.8.0-da.tar.bz2 50493
+RMD160 50fe4b8deb3c5edb759c3844cf3f52c7f2bcaade digikam-doc-0.8.0-da.tar.bz2 50493
+SHA256 9a0c5a0c8d5e86b5836aba3adb22fbfe50b968b7bd19320c967443fbe1860182 digikam-doc-0.8.0-da.tar.bz2 50493
+MD5 06bcc36d7a4dc42c42978f7d1059c2f3 digikam-doc-0.8.0-es.tar.bz2 10816588
+RMD160 d031a6d0601b2a5a98a7d11762bc32a210b80b82 digikam-doc-0.8.0-es.tar.bz2 10816588
+SHA256 de17de6816895db79b56aaeb2106286ad351e51b1acf124eeaf29e3baeb055a0 digikam-doc-0.8.0-es.tar.bz2 10816588
+MD5 6d2c381f78ea883c4bbc925756012b98 digikam-doc-0.8.0-et.tar.bz2 41384
+RMD160 d7d57533d8cdf7d4919c4107e7baa6c2f77b03c9 digikam-doc-0.8.0-et.tar.bz2 41384
+SHA256 ba02a828fbbeb1243e97195b5a333d12b1b4f88456082b6e615709bd07f20b83 digikam-doc-0.8.0-et.tar.bz2 41384
+MD5 7fa628fe68a39efa27fc73aa7430ea90 digikam-doc-0.8.0-gentoo.tar.bz2 19396732
+RMD160 22ac0d7fa874dc853ab3957a145c54d9737a3d2e digikam-doc-0.8.0-gentoo.tar.bz2 19396732
+SHA256 c0f7448e02378f2ef559b9b0e887327422d849c9ba607a254448dcc00eb3699c digikam-doc-0.8.0-gentoo.tar.bz2 19396732
+MD5 a4d535948f5d738e3030beae99bcc674 digikam-doc-0.8.0-it.tar.bz2 702416
+RMD160 bc89f465e073eb64944ef2a9914bb2291878b365 digikam-doc-0.8.0-it.tar.bz2 702416
+SHA256 07fa5ef11f9544b4f3a2b0be8759ea1d7041d56f9188a15101bb53aae8dca3f3 digikam-doc-0.8.0-it.tar.bz2 702416
+MD5 2c1061c24bbf8482d814b1e1ab8c1c89 digikam-doc-0.8.0-nl.tar.bz2 9764577
+RMD160 30968073fedb980b821f332044194b63873c8785 digikam-doc-0.8.0-nl.tar.bz2 9764577
+SHA256 f8d7d934bc25270686b81183dd1dfd3c43d6f479e9961c3d8218f2ae114b7c15 digikam-doc-0.8.0-nl.tar.bz2 9764577
+MD5 9b71a31b61c5679e699365d21b31d1f5 digikam-doc-0.8.0-pt.tar.bz2 52611
+RMD160 5f5e400f79dcfb5f527afe8cc31de261bd05f421 digikam-doc-0.8.0-pt.tar.bz2 52611
+SHA256 727a21963504cd2b1e3b67bfa7fb872b5f9d45d32f770861b51eceaeff763431 digikam-doc-0.8.0-pt.tar.bz2 52611
+MD5 29d2ae35f8aac6109fd98fb630fcbb4f digikam-doc-0.8.0-pt_BR.tar.bz2 1988378
+RMD160 ddcd056964e48b294e6bfb8a5c1e8f1c7390d0c4 digikam-doc-0.8.0-pt_BR.tar.bz2 1988378
+SHA256 82a036d609ad4bfc2f74d9ec291dd463641d4456b2493f03b15cb16337273391 digikam-doc-0.8.0-pt_BR.tar.bz2 1988378
+MD5 7c76dca73e22ca1457387d740f819b83 digikam-doc-0.8.0-sv.tar.bz2 261061
+RMD160 e682527412ebd4732e5010c6bbbd4619159dd0f3 digikam-doc-0.8.0-sv.tar.bz2 261061
+SHA256 bbbc383c04fb16df562126d4d0523364753d26fbf95291922792e03477c378d0 digikam-doc-0.8.0-sv.tar.bz2 261061
 MD5 b958495f3830949bc9c2cd6fd1cd53e6 digikam-doc-0.8.0.tar.bz2 43156836
 RMD160 94d6abb1e58ba8ed91b11a86608d5dce8c9ba3a2 digikam-doc-0.8.0.tar.bz2 43156836
 SHA256 9aa84a94187e0f40939373b264de7ce73e73be44b976f8b890538a68aa1f3f22 digikam-doc-0.8.0.tar.bz2 43156836
diff --git a/media-gfx/digikam/files/digest-digikam-0.8.2_rc1 b/media-gfx/digikam/files/digest-digikam-0.8.2_rc1
index ab3071ec9ac2..bae0b8fdacb7 100644
--- a/media-gfx/digikam/files/digest-digikam-0.8.2_rc1
+++ b/media-gfx/digikam/files/digest-digikam-0.8.2_rc1
@@ -1,2 +1,31 @@
 MD5 ef9bcad20cfc7ef41015c7c18b2c2075 digikam-0.8.2-rc1.tar.bz2 3817463
+MD5 a18e5e9a4fd17994da5089ddcd9bc0c1 digikam-doc-0.8.0-da.tar.bz2 50493
+RMD160 50fe4b8deb3c5edb759c3844cf3f52c7f2bcaade digikam-doc-0.8.0-da.tar.bz2 50493
+SHA256 9a0c5a0c8d5e86b5836aba3adb22fbfe50b968b7bd19320c967443fbe1860182 digikam-doc-0.8.0-da.tar.bz2 50493
+MD5 06bcc36d7a4dc42c42978f7d1059c2f3 digikam-doc-0.8.0-es.tar.bz2 10816588
+RMD160 d031a6d0601b2a5a98a7d11762bc32a210b80b82 digikam-doc-0.8.0-es.tar.bz2 10816588
+SHA256 de17de6816895db79b56aaeb2106286ad351e51b1acf124eeaf29e3baeb055a0 digikam-doc-0.8.0-es.tar.bz2 10816588
+MD5 6d2c381f78ea883c4bbc925756012b98 digikam-doc-0.8.0-et.tar.bz2 41384
+RMD160 d7d57533d8cdf7d4919c4107e7baa6c2f77b03c9 digikam-doc-0.8.0-et.tar.bz2 41384
+SHA256 ba02a828fbbeb1243e97195b5a333d12b1b4f88456082b6e615709bd07f20b83 digikam-doc-0.8.0-et.tar.bz2 41384
+MD5 7fa628fe68a39efa27fc73aa7430ea90 digikam-doc-0.8.0-gentoo.tar.bz2 19396732
+RMD160 22ac0d7fa874dc853ab3957a145c54d9737a3d2e digikam-doc-0.8.0-gentoo.tar.bz2 19396732
+SHA256 c0f7448e02378f2ef559b9b0e887327422d849c9ba607a254448dcc00eb3699c digikam-doc-0.8.0-gentoo.tar.bz2 19396732
+MD5 a4d535948f5d738e3030beae99bcc674 digikam-doc-0.8.0-it.tar.bz2 702416
+RMD160 bc89f465e073eb64944ef2a9914bb2291878b365 digikam-doc-0.8.0-it.tar.bz2 702416
+SHA256 07fa5ef11f9544b4f3a2b0be8759ea1d7041d56f9188a15101bb53aae8dca3f3 digikam-doc-0.8.0-it.tar.bz2 702416
+MD5 2c1061c24bbf8482d814b1e1ab8c1c89 digikam-doc-0.8.0-nl.tar.bz2 9764577
+RMD160 30968073fedb980b821f332044194b63873c8785 digikam-doc-0.8.0-nl.tar.bz2 9764577
+SHA256 f8d7d934bc25270686b81183dd1dfd3c43d6f479e9961c3d8218f2ae114b7c15 digikam-doc-0.8.0-nl.tar.bz2 9764577
+MD5 9b71a31b61c5679e699365d21b31d1f5 digikam-doc-0.8.0-pt.tar.bz2 52611
+RMD160 5f5e400f79dcfb5f527afe8cc31de261bd05f421 digikam-doc-0.8.0-pt.tar.bz2 52611
+SHA256 727a21963504cd2b1e3b67bfa7fb872b5f9d45d32f770861b51eceaeff763431 digikam-doc-0.8.0-pt.tar.bz2 52611
+MD5 29d2ae35f8aac6109fd98fb630fcbb4f digikam-doc-0.8.0-pt_BR.tar.bz2 1988378
+RMD160 ddcd056964e48b294e6bfb8a5c1e8f1c7390d0c4 digikam-doc-0.8.0-pt_BR.tar.bz2 1988378
+SHA256 82a036d609ad4bfc2f74d9ec291dd463641d4456b2493f03b15cb16337273391 digikam-doc-0.8.0-pt_BR.tar.bz2 1988378
+MD5 7c76dca73e22ca1457387d740f819b83 digikam-doc-0.8.0-sv.tar.bz2 261061
+RMD160 e682527412ebd4732e5010c6bbbd4619159dd0f3 digikam-doc-0.8.0-sv.tar.bz2 261061
+SHA256 bbbc383c04fb16df562126d4d0523364753d26fbf95291922792e03477c378d0 digikam-doc-0.8.0-sv.tar.bz2 261061
 MD5 b958495f3830949bc9c2cd6fd1cd53e6 digikam-doc-0.8.0.tar.bz2 43156836
+RMD160 94d6abb1e58ba8ed91b11a86608d5dce8c9ba3a2 digikam-doc-0.8.0.tar.bz2 43156836
+SHA256 9aa84a94187e0f40939373b264de7ce73e73be44b976f8b890538a68aa1f3f22 digikam-doc-0.8.0.tar.bz2 43156836