Install handbooks, bug 338757

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

3 files changed, 30 insertions, 15 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 87850066ac2a..cafd041ec902 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.210 2012/01/16 23:56:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.211 2012/02/12 15:47:41 dilfridge Exp $
+
+  12 Feb 2012; Andreas K. Huettel <dilfridge@gentoo.org> digikam-2.5.0.ebuild:
+  Install handbooks, bug 338757
 
   16 Jan 2012; Agostino Sarubbo <ago@gentoo.org> digikam-2.4.1.ebuild:
   Stable for amd64, wrt bug #396359
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 39d045f1ebcb..212944e66312 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -7,17 +7,23 @@ DIST digikam-2.4.1.tar.bz2 54531119 RMD160 2a07c061927e7cec7a0128a68e60f9d7c6d1e
 DIST digikam-2.5.0.tar.bz2 54976375 RMD160 4ff1b5fbc2cc4a8cb9994f7c7796086418dd43fb SHA1 6cadb838669d1bdcbd6abb677889f7d68d696383 SHA256 55292c79b41fd2c20ce0a821f388645436acb18b3b06b486747e17129114851a
 EBUILD digikam-2.3.0.ebuild 4028 RMD160 74cce2a2938d6e61330fe95d36908151bd7d8dba SHA1 d7c7c31ac88be7d9bd87e5505809ae34e4fb7db0 SHA256 aec4ad32c59a0fd905afb7748f9ddee474ec25ad5618fa7e927fb53e104e641f
 EBUILD digikam-2.4.1.ebuild 3757 RMD160 097a981bd17b9aa21e9612e84176c3dad2cab2c4 SHA1 1ade22b74fce755ef4c007320312a35e87ca6758 SHA256 0e1c0447fac97cc89c59b8883db60e866c7a27d0d6379ccf4bcfbffb20b87bc9
-EBUILD digikam-2.5.0.ebuild 3811 RMD160 1472cf4b1b724abd0cc8525ca872c4dd254e3cb4 SHA1 9cba02eede7356cecb197cf64f830438b835db60 SHA256 63d65a2f13b22620cc85d312385105069665a10810c44142d1d9e6aad534309c
-MISC ChangeLog 35540 RMD160 9b0966fdf64c97f4497a1b839e00cf569d7a53e3 SHA1 60d424fe7de3e15b89f2d776d828ed922e946e04 SHA256 354f85d4dc00cbdadc286f742d81d06388749ad2480baa63d4871449bf1d3d1d
+EBUILD digikam-2.5.0.ebuild 4152 RMD160 5d5e1fbb9f82c0d64a8db07384f7887461239c8a SHA1 5e5a0a7b1ce56e7070ebe65f1879d01acc322776 SHA256 7b34c8dc04e57574f31494cea918e6bc8cf8622a770971206ff5a904e551f55c
+MISC ChangeLog 35658 RMD160 105eb200c2382c5a9eb1cd1274d98be1ea0d92ee SHA1 73df95311ca6b7e5f85f370c439b60accdf22b30 SHA256 016a2b0ddfdb1311bc250f57b4e96e84c69e8b42db12ab1ab9b7a0d18e9b8525
 MISC metadata.xml 695 RMD160 be0a2e9e1cac78c5baf4a0b0f542d1f53ee5a77b SHA1 7d9256d5cd6a8f8250b82f65a77816cdc66d4434 SHA256 38ad4a53bb528bcbd2f970811d9ceae59351a6e600c38e8d561970f390664d7c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPFLlMAAoJEOTDgjZ80txdblMH/2VsOvIPso0yospmGqLUEtmV
-MdtIEfBMTYwyXGtpLW4wd3h24d2YBzys5pN9+EQZsKQjEoDSUqXTKpVzVM1wo3QW
-ERRw6myMLYusjocin+Ygo3W3KFI4ruTv3DDjmgfY8hlIPKbzh+YfoJoOfkiZchNi
-WTRnEYpX8fmVlDA7okpNNtv3KxZAzKt4ORYO1IyfXDn3Rks0YQyVaK9MllLPZULx
-g8zCUrMu3cu3WuTLzeuleXJ0VCeVDhsHePzKX9wSfL+sBOJFAouRTX1wXPWUrnV9
-Z1yuZh7fe7Z5IDVxgs+90uKkAHIms70QXIirYwdKckBYqNBInrw893/RiIwvnI8=
-=3V4N
+iQIcBAEBCgAGBQJPN99MAAoJEEb+UGWnxTyHW+YQAJa2iJ3AXa48MDqvf92dvbA6
+0sGyKoeybaJA8jbcEVgEKRn9AykwrUwYO4lWnjPqFIVZCwO1+9GC6YU350A27tfX
+D8rzYOmyw+1GYAJsBMjJVGEdlwNAtrvwYcL2mFX0JIKk9HbEk9Cgae9p7vNvOvnZ
+5Qto8PDcJZZpvG0HntgE+2FE9xmi4SDISRyGq5ifs0rTGqR4SAKwVuYP7heyIZc8
+7FYg12DiZwi+CoXbol1tR0tW1aijKDfIi+a7p2wqj0pPcRL/j/U/mEgb3Hh9J+sF
+pDIxnjtKzGIBZu8FzLGLpDke7n4dpv7jPR5KiIU9iZ7S5n0YH3lhnaM3YAFuFfrM
+V57Ez8Do9inpYfhuIRHWuaY2XMigcNJ6qlKFrPG10JbZJVn+v2mIr7GIDV0WK5W4
+0oSwdqA6Nrq8melqmPL4/69JXp0fCM7tUGjRHh9leO9YzFDTAGBEJksRruC61Oja
+N0tAssCZ1VUJyfkCZmQRLg1hJrg7BO3dIZ1Ql/pxVClL2Oh0iEcUP9MWM+mn/P59
+pqErEyi3DF8HjZsTfGdUm9n1TnwbV623AGeNtOwlOa8U+uGMMyIimWJ4Us6rIqu0
+qhbZW9fufxNn8Qx+fPu+dMW/IVKwOCUQMUAcSHyy33oVnopAr46F5AehxXv1xCnX
+q2fjQP78xVNXqpEDF7iz
+=o94b
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-2.5.0.ebuild b/media-gfx/digikam/digikam-2.5.0.ebuild
index 2dfdbbc31c60..54091bd8ad4d 100644
--- a/media-gfx/digikam/digikam-2.5.0.ebuild
+++ b/media-gfx/digikam/digikam-2.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.5.0.ebuild,v 1.1 2012/01/03 16:30:11 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.5.0.ebuild,v 1.2 2012/02/12 15:47:41 dilfridge Exp $
 
 EAPI=4
 
@@ -12,6 +12,8 @@ KDE_HANDBOOK="optional"
 CMAKE_MIN_VERSION="2.8"
 KDE_MINIMAL="4.7"
 
+KDE_DOC_DIRS="doc-digikam doc-showfoto"
+
 inherit kde4-base
 
 MY_P="${PN}-${PV/_/-}"
@@ -77,9 +79,12 @@ src_prepare() {
 	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
+	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
@@ -92,7 +97,8 @@ src_prepare() {
 	kde4-base_src_prepare
 
 	if use handbook; then
-		echo "add_subdirectory( doc )" >> CMakeLists.txt
+		echo "add_subdirectory( doc-digikam )" >> CMakeLists.txt
+		echo "add_subdirectory( doc-showfoto )" >> CMakeLists.txt
 	fi
 }