Fix handbook handling, bug 386711; remove old

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

6 files changed, 29 insertions, 246 deletions

diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog
index 3c45dde8e746..4bf41385575d 100644
--- a/media-plugins/kipi-plugins/ChangeLog
+++ b/media-plugins/kipi-plugins/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/kipi-plugins
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.102 2011/10/03 19:40:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.103 2011/10/16 11:01:42 dilfridge Exp $
+
+  16 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  kipi-plugins-1.9.0.ebuild, -kipi-plugins-2.0.0.ebuild,
+  -kipi-plugins-2.1.0.ebuild, kipi-plugins-2.2.0.ebuild:
+  Fix handbook handling, bug 386711; remove old
 
 *kipi-plugins-2.2.0 (03 Oct 2011)
 
diff --git a/media-plugins/kipi-plugins/Manifest b/media-plugins/kipi-plugins/Manifest
index e14d2583ffe4..18b319c80c02 100644
--- a/media-plugins/kipi-plugins/Manifest
+++ b/media-plugins/kipi-plugins/Manifest
@@ -4,31 +4,27 @@ Hash: SHA512
 AUX kipi-plugins-1.7.0-expoblending.patch 570 RMD160 c08b628dceb39b4a2dbe15fd376256785dd8cacf SHA1 763aec7f286f4cd208aa38f5665c62986bcfaddb SHA256 31788bac46a0af39e2b8475bdd84e07710af5d6655efbdaa6939795eb8b7d7f0
 AUX kipi-plugins-1.9.0-tests.patch 1153 RMD160 40fdf55531219fbeebf7ed8ac60981e05222f2d1 SHA1 f8c3b30fbc9bbf0b95518acc3e86bfaa5581d6de SHA256 a675fa82a67f6e99d60f108d5c6479f39a2afb2c1a596c4468908ff51ae74c09
 AUX kipi-plugins-2.0.0-tests.patch 933 RMD160 bcd1974a98a0471f381cde6ea91b2e980df63b74 SHA1 a77124e7c2b66616546b218ae9bc5e0bc0644ee0 SHA256 b8640df52463422dd53f0a4ac411eac67f15e8652157f820171ae85acd3ccb9f
-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-2.2.0.tar.bz2 54181796 RMD160 5053a1f63e242d841f94ce707e235a5ccacb8698 SHA1 b4ce7c8b17978f3c76b107a1535cd4b21d3bb6fb SHA256 d7597d8817d2ebd363def6042022b25b665e91ea59c431ead3def4634221b616
 DIST kipi-plugins-1.9.0.tar.bz2 5775775 RMD160 9bc1ae309e556335fa770e20b31b2527ddc4856b SHA1 fc12c018f4f73f7a7d025d7af2af99d4ae2dedc5 SHA256 d52466586725492788514c1b8d7bbea02f95c9deb744a0814d221c99c34e934c
 DIST kipi-plugins-doc-1.5.0.tar.bz2 1689039 RMD160 f4342798caf14817b96afdb11959f53ab175ae1d SHA1 55a57e1fffbd291ed2f31dbbe840ccd85cb499cc SHA256 13dfda13a1f5e276020dbae3f7c2227f5cc1ac4264070250eeff0a3eb59b67cf
-EBUILD kipi-plugins-1.9.0.ebuild 2697 RMD160 b42df2225066d816b710a7e76ef615c57ddc6b01 SHA1 ed22d2c0cab6e53944de8f6b739f5926ccb30d29 SHA256 5b6cf08ba75620d9701a997e243d205e8543187e3c95fc65372089d50aed37be
-EBUILD kipi-plugins-2.0.0.ebuild 2992 RMD160 2644a07d862e2588e9c928533e3e7723e6e7c4c8 SHA1 70dc979aaad53e95d4ce8fbee0d551b7a748125b SHA256 50eeb605f896a92ee2767080633d75ee8d2ab73f0b294389a40bba91d18f851d
-EBUILD kipi-plugins-2.1.0.ebuild 3277 RMD160 4faa70e12bd4b809c9670373404ebbc28de7e7a5 SHA1 ba4ecc4cd11bc72496de0a5a4dd8055bee717391 SHA256 ad736449139ee22dfe7ddcd544376872e0468d7b31d55dbb75b24ffb6e0a0887
-EBUILD kipi-plugins-2.2.0.ebuild 3277 RMD160 c93520ab0ecb1d52c2e323c4dc951164e9c35cdc SHA1 0327594edda47570fe5a11b1ca151295d5a8e430 SHA256 2d31ae171018a57b2ea8b5433f8af43c6add7d7d1138e8273f282e181f6e8cdc
-MISC ChangeLog 17336 RMD160 b8ead5622f0a4697ccbf6bb63c82b75ac5e02840 SHA1 72ffdc725fdd7bca2adc7f5ec4cea1b89dbf005d SHA256 6ad4f0f0860134540f286bf6423b11b8db52fff4fb55733a40b3f714163317b7
+EBUILD kipi-plugins-1.9.0.ebuild 2713 RMD160 4c4c6567a948f3186524f4b2cd29449702157a93 SHA1 7e845183506a14463199f9fe87cf5fa1208b7709 SHA256 0f1f3a47ce70fc910de82d9e6c6d286694b1286fbfeb34e842e1b73b504b078b
+EBUILD kipi-plugins-2.2.0.ebuild 3293 RMD160 d7ff21786a8c30ed585dc07e33d3a82013354fb5 SHA1 16383ca85ec5e6111777a0237e352372523cc25a SHA256 1d0b31ebd8b952459501c4f9568bf294460241aa9fc09a2ece030f81df70324f
+MISC ChangeLog 17556 RMD160 215330d59cc6c302cac522dcc257e66b7e269ec2 SHA1 ab44d8ab90aac591dc73570c7e1e5f35c11cf6fb SHA256 8813c12fdc75856517770db2bca1d561df6abb58ce92f15c1b966dfebd9d6462
 MISC metadata.xml 961 RMD160 767e890545236003bd89a73778ca0ef347a67e9a SHA1 a5d91c03c129d0ed92d792806ff6ccb22da972b6 SHA256 8a137c5797a41e37989bd78aa7761c84a42b685b59b7f5b3ddbd1639b4637af0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOig/VAAoJENwGBM22xffeQjcQAJ8hNKsjEEsQ8Nfhr0dfxeyN
-sehxZCfx5p9fJC0vAkTKKQDYo4lRHaqLOAt8yZ0yHI1Y/OiOP7w3eSFOyZ7iwoDe
-2uxPux7PWgg915Khx+X4NOER4gjbdsZuMdWZKZ8WaS/TxODgEYPBhs408K/tnZ7V
-7dWa2G/7i+/GmiIU41jsP3IRDj3LK21URZguhEDHXY4P2cbtAytu+NeK1jg5IIKf
-j7jyCnzqXgcw1YIzXviZKtjdiOOysRebPxM4Z7GKmfH4BLI51vmH0nWy0JtVRlyG
-4luHQWNgrzp77QrFl7uw22gejPFfYkBoAxpw/dAcbkqB8v6AKJUJkplVt70mvcM7
-ZSPjA5T5NTxhkxZfCxNqSwTz8fnSiaYpMXE8cg8lUA/V7Sv2mfOdFdCnzWB83ss2
-kiEK3+qrC29vA1JZBt6AdImKPL7pHk8e8g2PNmiqeEgMTN+kQak/XEHcfeltBe85
-xOVxcabjZKOpBlVvF8oSeXHHJDNW8ds+W/C0GeMNj75qFTPw1A3MetK96aY402P8
-jXvlYFY+d+8Ez9g8W4QSteTZByEhlLhIzRw3ymshH0py2EXotCciMbA+nZMYLj67
-wWPevAu+cqCeZQf1nZM1gK3D2QVwyyoMLGdYGHBfXkR7txqGC1kLH3WRfXddo3k1
-VPfFStQAz3XRTWAs3Vmc
-=pJXz
+iQIcBAEBCgAGBQJOmrnbAAoJEEb+UGWnxTyHZkoP/0rEpCt8dGh/p62HLocfLyXs
+1ycgXVicSocSSdqDCM/2yM/Srw6oBN3NxqMWA0L1KnolPXvOofao1e98Gj9P50zG
+EAsdCoAcGw0AUCaC0zvMmlM/z9Zgd3t74ErpMe2/dxjMRq2T2hofmZ6LM1/7dfBn
+FIgf/wugr6prxfwDSR9ori+nH7+799Q1ISp8cIqrqXny++pFpvTpVM5NRklH+YRx
+FoEtE6QX420hIsmP/tcnCnpb47ZabnCMOCqnyIBroWoNLf1soC5THNzZ3nvsRPNf
+XLwhHjQGFS2gMoSxwXA7bPrVYQvey4zTvseuQhqPVoK3YrDCrybv8lPqYHogTRpc
+YZPBR3A2zPc0umX8lg+LUPYr6+PNIkZxzrAunoOJ4M/yWPNPuKSVDNWSOxz4DCUd
+GIujFTQ/Z+T80WMQavSulZZZv/nVU2s5SSfJ8kZD+I1t1ulxRThwOLQru1nusyA9
+oersH1Cw4HK83zZvoVUPsGhUdpPJnhHdp/qM4Tv9FKxeQVsvpdZxRN9odDQdoMog
+9MhaAWzvA1xomlZvjAQWeOXLQgq0hE37kFkYqvNsi+XMpaZquNvhmSNCfFmd/rCQ
+IUl9WzSF6K8neijwKUmgbRRznCU92E/+d5kBfLCGGEcUZo800QIu0pMzCMgADoHG
+h584CXKB4NJfrQl7Ip7O
+=ZeEf
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/kipi-plugins/kipi-plugins-1.9.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-1.9.0.ebuild
index 8ea973341555..9251e73463e5 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-1.9.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-1.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-1.9.0.ebuild,v 1.4 2011/05/09 23:10:57 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-1.9.0.ebuild,v 1.5 2011/10/16 11:01:42 dilfridge Exp $
 
 EAPI=3
 
@@ -9,6 +9,7 @@ KDE_LINGUAS="ar ast be bg ca ca@valencia cs da de el en_GB eo es et eu fi fr ga
 lt lv mai ms nb nds nl nn oc pa pl pt pt_BR ro ru se sk sv th tr uk zh_CN zh_TW"
 KMNAME="extragear/graphics"
 KDE_MINIMAL="4.5"
+KDE_HANDBOOK="optional"
 inherit flag-o-matic kde4-base
 
 DESCRIPTION="Plugins for the KDE Image Plugin Interface"
@@ -20,7 +21,7 @@ LICENSE="GPL-2
 	handbook? ( FDL-1.2 )"
 KEYWORDS="amd64 ~ppc x86"
 SLOT="4"
-IUSE="cdr calendar crypt debug expoblending handbook +imagemagick ipod mjpeg redeyes scanner"
+IUSE="cdr calendar crypt debug expoblending +imagemagick ipod mjpeg redeyes scanner"
 
 DEPEND="
 	>=dev-libs/expat-2.0.1
diff --git a/media-plugins/kipi-plugins/kipi-plugins-2.0.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-2.0.0.ebuild
deleted file mode 100644
index 71864ff5a27e..000000000000
--- a/media-plugins/kipi-plugins/kipi-plugins-2.0.0.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-2.0.0.ebuild,v 1.4 2011/09/06 21:05:11 dilfridge Exp $
-
-EAPI=4
-
-OPENGL_REQUIRED="optional"
-
-KDE_MINIMAL="4.7"
-
-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"
-
-inherit flag-o-matic kde4-base
-
-MY_P="digikam-${PV/_/-}"
-
-DESCRIPTION="Plugins for the KDE Image Plugin Interface"
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://sourceforge/digikam/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2
-	handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="cdr calendar crypt debug expoblending gpssync handbook +imagemagick ipod +mediawiki mjpeg redeyes scanner"
-
-DEPEND="
-	$(add_kdebase_dep libkipi)
-	$(add_kdebase_dep libkdcraw)
-	$(add_kdebase_dep libkexiv2)
-	dev-libs/expat
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/qjson
-	gpssync?	( >=media-libs/libkgeomap-${PV} )
-	mediawiki?	( >=media-libs/libmediawiki-${PV} )
-	media-libs/libpng
-	media-libs/tiff
-	virtual/jpeg
-	calendar?	( $(add_kdebase_dep kdepimlibs) )
-	crypt?		( app-crypt/qca:2 )
-	ipod?		(
-			  media-libs/libgpod
-			  x11-libs/gtk+:2
-			)
-	redeyes?	( >=media-libs/opencv-2.2.0-r10 )
-	scanner? 	(
-			  $(add_kdebase_dep libksane)
-			  media-gfx/sane-backends
-			)
-"
-RDEPEND="${DEPEND}
-	cdr? 		( app-cdr/k3b )
-	expoblending? 	( media-gfx/hugin )
-	imagemagick? 	( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) )
-	mjpeg? 		( media-video/mjpegtools )
-"
-
-S=${WORKDIR}/${MY_P}/extra/${PN}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.7.0-expoblending.patch"
-	"${FILESDIR}/${PN}-2.0.0-tests.patch"
-)
-
-src_prepare() {
-	# prepare the handbook
-	mv "${WORKDIR}/${MY_P}/doc/${PN}" "${WORKDIR}/${MY_P}/extra/${PN}/doc" || die
-	if use handbook; then
-		echo "add_subdirectory( doc )" >> CMakeLists.txt
-	fi
-
-	# prepare the translations
-	mv "${WORKDIR}/${MY_P}/po" po || die
-	find po -name "digikam.po" -exec rm {} +
-	echo "add_subdirectory( po )" >> CMakeLists.txt
-
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	# Remove flags -floop-block -floop-interchange
-	# -floop-strip-mine due to bug #305443.
-	filter-flags -floop-block
-	filter-flags -floop-interchange
-	filter-flags -floop-strip-mine
-
-	mycmakeargs+=(
-		$(cmake-utils_use_with ipod GLIB2)
-		$(cmake-utils_use_with ipod GObject)
-		$(cmake-utils_use_with ipod Gdk)
-		$(cmake-utils_use_with ipod Gpod)
-		$(cmake-utils_use_with calendar KdepimLibs)
-		$(cmake-utils_use_with mediawiki Mediawiki)
-		$(cmake-utils_use_with gpssync KGeoMap)
-		$(cmake-utils_use_with redeyes OpenCV)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with scanner Sane)
-		$(cmake-utils_use_enable expoblending)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/media-plugins/kipi-plugins/kipi-plugins-2.1.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-2.1.0.ebuild
deleted file mode 100644
index 104bd2c24e26..000000000000
--- a/media-plugins/kipi-plugins/kipi-plugins-2.1.0.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-2.1.0.ebuild,v 1.1 2011/09/09 19:51:57 dilfridge Exp $
-
-EAPI=4
-
-OPENGL_REQUIRED="optional"
-
-KDE_MINIMAL="4.7"
-
-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"
-
-inherit flag-o-matic kde4-base
-
-MY_P="digikam-${PV/_/-}"
-
-DESCRIPTION="Plugins for the KDE Image Plugin Interface"
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://sourceforge/digikam/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2
-	handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="cdr calendar crypt debug expoblending gpssync handbook +imagemagick ipod +mediawiki mjpeg panorama redeyes scanner vkontakte"
-
-DEPEND="
-	$(add_kdebase_dep libkipi)
-	$(add_kdebase_dep libkdcraw)
-	$(add_kdebase_dep libkexiv2)
-	dev-libs/expat
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/qjson
-	gpssync?	( >=media-libs/libkgeomap-${PV} )
-	mediawiki?	( >=media-libs/libmediawiki-${PV} )
-	media-libs/libpng
-	media-libs/tiff
-	virtual/jpeg
-	calendar?	( $(add_kdebase_dep kdepimlibs) )
-	crypt?		( app-crypt/qca:2 )
-	ipod?		(
-			  media-libs/libgpod
-			  x11-libs/gtk+:2
-			)
-	redeyes?	( >=media-libs/opencv-2.2.0-r10 )
-	scanner? 	(
-			  $(add_kdebase_dep libksane)
-			  media-gfx/sane-backends
-			)
-	vkontakte?	( net-libs/libkvkontakte )
-"
-RDEPEND="${DEPEND}
-	cdr? 		( app-cdr/k3b )
-	expoblending? 	( media-gfx/hugin )
-	imagemagick? 	( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) )
-	mjpeg? 		( media-video/mjpegtools )
-	panorama?	(
-			  media-gfx/enblend
-			  >=media-gfx/hugin-2011.0.0
-			)
-"
-
-S=${WORKDIR}/${MY_P}/extra/${PN}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.7.0-expoblending.patch"
-	"${FILESDIR}/${PN}-2.0.0-tests.patch"
-)
-
-src_prepare() {
-	# prepare the handbook
-	mv "${WORKDIR}/${MY_P}/doc/${PN}" "${WORKDIR}/${MY_P}/extra/${PN}/doc" || die
-	if use handbook; then
-		echo "add_subdirectory( doc )" >> CMakeLists.txt
-	fi
-
-	# prepare the translations
-	mv "${WORKDIR}/${MY_P}/po" po || die
-	find po -name "*.po" -and -not -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
-
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	# Remove flags -floop-block -floop-interchange
-	# -floop-strip-mine due to bug #305443.
-	filter-flags -floop-block
-	filter-flags -floop-interchange
-	filter-flags -floop-strip-mine
-
-	mycmakeargs+=(
-		$(cmake-utils_use_with ipod GLIB2)
-		$(cmake-utils_use_with ipod GObject)
-		$(cmake-utils_use_with ipod Gdk)
-		$(cmake-utils_use_with ipod Gpod)
-		$(cmake-utils_use_with calendar KdepimLibs)
-		$(cmake-utils_use_with mediawiki Mediawiki)
-		$(cmake-utils_use_with gpssync KGeoMap)
-		$(cmake-utils_use_with redeyes OpenCV)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with scanner Sane)
-		$(cmake-utils_use_enable expoblending)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/media-plugins/kipi-plugins/kipi-plugins-2.2.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-2.2.0.ebuild
index 3a9ffed03eb2..5f0dc5f56758 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-2.2.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-2.2.0.ebuild,v 1.1 2011/10/03 19:40:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-2.2.0.ebuild,v 1.2 2011/10/16 11:01:42 dilfridge Exp $
 
 EAPI=4
 
@@ -13,6 +13,8 @@ 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 n
 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"
+
 inherit flag-o-matic kde4-base
 
 MY_P="digikam-${PV/_/-}"
@@ -25,7 +27,7 @@ LICENSE="GPL-2
 	handbook? ( FDL-1.2 )"
 KEYWORDS="~amd64 ~x86"
 SLOT="4"
-IUSE="cdr calendar crypt debug expoblending gpssync handbook +imagemagick ipod +mediawiki mjpeg panorama redeyes scanner vkontakte"
+IUSE="cdr calendar crypt debug expoblending gpssync +imagemagick ipod +mediawiki mjpeg panorama redeyes scanner vkontakte"
 
 DEPEND="
 	$(add_kdebase_dep libkipi)