Remove old

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

9 files changed, 23 insertions, 559 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 000a88fad0c5..a3b878682859 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.206 2011/12/07 22:08:39 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.207 2011/12/25 22:34:59 dilfridge Exp $
+
+  25 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -files/digikam-1.8.0-tests.patch, -digikam-1.9.0.ebuild,
+  -digikam-1.9.0-r1.ebuild, -files/digikam-1.9.0-docs.patch,
+  -files/digikam-1.9.0-newpgf.patch, -files/digikam-1.9.0-nomysql.patch,
+  -files/digikam-1.9.0-turbo.patch:
+  Remove old
 
   07 Dec 2011; Markos Chandras <hwoarang@gentoo.org> digikam-2.3.0.ebuild:
   Stable on amd64 wrt bug #388279
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 54a957477a49..8a924c2e5500 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,35 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX digikam-1.8.0-tests.patch 914 RMD160 520675d0fb1080549a0c3f5c67fc51d36bb19b1d SHA1 1e80a74d91f593939a69a7f77870cbefbbb73235 SHA256 29a7e68abd804019b1ae533a62920e931d5057aaa10bf20cd81358cf8bfcee1c
-AUX digikam-1.9.0-docs.patch 1466 RMD160 d12a4bd9e825d88863da954763641157a87f11bd SHA1 7496668276f5a54d6ffde0a71ff7dfc6252ff3e3 SHA256 f348ab1a931af78e1aa752676a9515a50183dc07c32a99cdfd59a32dd2ece2af
-AUX digikam-1.9.0-newpgf.patch 3463 RMD160 4e5c506e81436aaafe5b789d79adcb1caee4407b SHA1 3bb97db282fbb0c50e03cd4ba6c5ac6821558620 SHA256 9ca068c87868b9709d75441795bfff2790d13957354b675a9aa94d5f3d55eca8
-AUX digikam-1.9.0-nomysql.patch 3323 RMD160 9b03cc09f81188a9373212af0bfc079eeced3c37 SHA1 7fe8a51f5d8c5eddfc22f37f6741f0c96ca64f16 SHA256 c3e09ee35172c9e38d13fe20b5e65ae1d53e954e3c50be1fbddd0223990cac5c
-AUX digikam-1.9.0-turbo.patch 2265 RMD160 ecff0e0fa2ba6d51cdb6ec5bb90b41c3ed7310a2 SHA1 e9383e730b81348656c3482700dec59a3ba5a499 SHA256 765338d842b39622428c068d9e190cf0f97933cd66845fea2ff0b5f79ed7b2cc
-DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5
 DIST digikam-2.3.0.tar.bz2 54522109 RMD160 304bce5841f5d36a72a064784c90c91960c9a7c3 SHA1 15b8b16d7cce6ac50fb958d30166214f2f2b83ee SHA256 29ddf83a160817314e9274a35d678678da58006e41d961dcebc6afb0ab200a33
 DIST digikam-2.4.1.tar.bz2 54531119 RMD160 2a07c061927e7cec7a0128a68e60f9d7c6d1e78b SHA1 2ec3a20225462d277d5f0c3aa17b1ecfbb61f98c SHA256 aca967a4cc5312923cb2340502eb10a571684c14cf63896a68a1796d0483de3b
-DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
-EBUILD digikam-1.9.0-r1.ebuild 3375 RMD160 0410e84e1cc4198b7b5c19173134f255b2c5430e SHA1 0977262dc4a989ba66d72c7cdc31e86553a2e37a SHA256 8800ac8885b2b89420ebf3c7c331b516c551f35c6df6ceab8983d0f23e4b66cd
-EBUILD digikam-1.9.0.ebuild 3211 RMD160 972639e3c03ab008a58961e8b086914df384b762 SHA1 33b7d4248ede2dbd34cc4f3da068323d835627ba SHA256 196b32e6a10beebfff8a0600fba696c7e3dc6e8963ad7ca7c5d267ff59879649
 EBUILD digikam-2.3.0.ebuild 4028 RMD160 74cce2a2938d6e61330fe95d36908151bd7d8dba SHA1 d7c7c31ac88be7d9bd87e5505809ae34e4fb7db0 SHA256 aec4ad32c59a0fd905afb7748f9ddee474ec25ad5618fa7e927fb53e104e641f
 EBUILD digikam-2.4.1.ebuild 3765 RMD160 dbe0954204a8797a0dfd65679254130bd6049b1d SHA1 5bc2fa5cb1ac62a7ec3f7b94f797ee3ec71694c0 SHA256 3b9c7a689681fe584e25a091f80208b8ad50c36a559624789abc9d16c0917442
-MISC ChangeLog 34852 RMD160 b9459c2ac33c522a2d3211ed36fa376267a1a3ab SHA1 368b57b8520a43cb6b63b77aa0e6b1c0300a9b3a SHA256 83d2013aa975d89d6f391f6874f39ffeedd48a7c59d6043f42c6fe62e11d13ac
+MISC ChangeLog 35153 RMD160 495c9dda0ee60f4685e9c1b79c76a1be6aa0986d SHA1 c09f6c96daeeda1880eb5d5356993525e1a2d9c2 SHA256 557a9c33dad3089fc055cfea4a1214a0b7d7e7a439ced8cebe32500d3775533e
 MISC metadata.xml 751 RMD160 b65e7816a03a284f440d296c1853aa913105129a SHA1 c6bf2cf0d471e4d4ffdbb5185889a0e9cd65af39 SHA256 4b8eced4b0649dc935acffac97119bb70862bebd51a686b32778745b407eb0cb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJO3+PqAAoJEPqDWhW0r/LCf/0QAIZsqX+GezVNcMjAX3rain+I
-V8pb4QOZnY0qs9GeWMXlT5k+irPs6XzH5eZbVanxOmTnxz4Aiw+RnZrR5/FiMkfI
-AWc8AvzDmmzYojH6btg3d0/GXQmTzLJ/tb5fDIFJ/JiE8Sag50RbSQFdLdUxN0yx
-Bi68dYYB/eqBO6/w4hiWl9jXOPDx+JnvHJ1CCIlfXTL5HnSKF8Cf0NXv9WinTxF2
-EUMAr1Nd11R9JeRrzjPpEBdMPr63HWMgy3CmWQy4sUS+jiHQJ/3c6PQmKk12doES
-Kt6pmypK2np2VhhMiAcnawUcuDgH4KhlCU77119oVrlu3RPbZt8dRCjdatMyv2z/
-DmiFCXzPTHhOb8Pnmk6auPzv2IFDzqnZstHggosen9JFu8qcNUEe6nekCuvcLl9Q
-3LkUnGaT6fvnAfk89y4q7BbXfRrOxAHW4RRDO5OsqkqlYIMCs8nEXDlcIkykbx2B
-2HCMtli4Mw1quN2IMPA51Xx3jTKoTfsjV+KYZJtzddQV5JxPvUtNHmIpBGWW7sHS
-5AhKMbCW4Lrx45vv+QY+qyPNC4c5sDYvufp4xBB/gW/HgRN3w44VkjUk2ZBmxsbh
-LtIRYd8xVQjgBy8vlJvuZPYOaMabmao77pA7CSonQzbv9kEGDtxm7EqcXtaNpkAE
-0euVjpKmjwazDC0QeuxX
-=XDqs
+iQIcBAEBCgAGBQJO96WeAAoJEEb+UGWnxTyHxgkQALejcrI6niqSVh1XdTUNaxUT
+faeDnyK+llvyPqbHno2vfH0UXyLLTPIM+/4+8feWhyVlg7ucPDxGDBT5+7uqo447
+woPAdflWhGNOySPiaJyY6HK2fhYyhJG5SU9h97mCNzTcXEVsMWy6Lpc2vtnPTfw5
+AyQqESLoKMmf9YtqvFVKX73bpSrpKxL8QIIkKM9njkRflfmRDLQARm+uCk5H/eVX
+7grAd6U2ifN1pE8PyoM1yEa7kxx2MlOmMRoXqXHb4NZkCBqsfzU4VhwBDtbp5+V7
+emsz1S6GvO1h1foE5RcQ3nk0uZwPAMVBMDBJBE6nTxwZIions8rBSTghaZ3we6mm
+5jjz1jcfJD0ctxtEk9dZmIbAVLMZuOMmKagTOWyucWEADzWxKCcuNOahHnSR9ANC
+er5YofH7gJGO/KuquqAkEcUyjaZ5k2QZT7NwZx0/ydpL47zeJaJNLMwgFQbhp8pD
+TNuWWHL5JrW16fAvuYvuGPrGMz5bxeFIT5e+QPavKISUg8yu09ytWXLxskHbo2xU
+wcu4YZaGVMkn8o/Z9pgUQXCN1aHl8ulbPDBN5u+6iA6rqIr/3tjiWdvvZfKSqMXE
+67wZq1OV3zEUH22G7GrVTljk6JzzCszFINoIHxUUBQq1b2Z29Tdh0OGGvLT72Jr2
+BksR79423ELOgXCkgNjc
+=0jon
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-1.9.0-r1.ebuild b/media-gfx/digikam/digikam-1.9.0-r1.ebuild
deleted file mode 100644
index 2f3093fd91aa..000000000000
--- a/media-gfx/digikam/digikam-1.9.0-r1.ebuild
+++ /dev/null
@@ -1,133 +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.9.0-r1.ebuild,v 1.6 2011/11/22 23:02:54 dilfridge Exp $
-
-EAPI=4
-
-KDE_LINGUAS="ar be bg ca ca@valencia cs da de el en_GB eo es et eu fa fi fr ga gl he hi hne hr hu is it ja km
-ko lt lv ms nb nds ne nl nn pa pl pt pt_BR ro ru se sk sl sv th tr uk vi zh_CN zh_TW"
-KMNAME="extragear/graphics"
-KDE_HANDBOOK="optional"
-# needed for sufficiently new libkdcraw
-KDE_MINIMAL="4.5"
-inherit kde4-base
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="A digital photo management application for KDE."
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
-	handbook? ( mirror://gentoo/${PN}-doc-1.4.0.tar.bz2 )"
-
-LICENSE="GPL-2
-	handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="4"
-IUSE="addressbook debug doc geolocation gphoto2 mysql semantic-desktop themedesigner +thumbnails video"
-
-CDEPEND="
-	$(add_kdebase_dep kdelibs 'semantic-desktop=')
-	$(add_kdebase_dep libkdcraw)
-	$(add_kdebase_dep libkexiv2)
-	$(add_kdebase_dep libkipi)
-	$(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
-	x11-libs/qt-gui[qt3support]
-	|| ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
-	addressbook? ( $(add_kdebase_dep kdepimlibs) )
-	geolocation? ( $(add_kdebase_dep marble 'plasma') )
-	gphoto2? ( media-libs/libgphoto2 )
-	mysql? ( virtual/mysql )
-"
-RDEPEND="${CDEPEND}
-	$(add_kdebase_dep kreadconfig)
-	video? (
-		|| (
-			( $(add_kdebase_dep ffmpegthumbs) )
-			( $(add_kdebase_dep mplayerthumbs) )
-		)
-	)
-"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-	doc? ( app-doc/doxygen )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT=test
-# bug 366505
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-1.9.0-docs.patch
-	"${FILESDIR}/${PN}"-1.8.0-tests.patch
-	"${FILESDIR}/${PN}"-1.9.0-nomysql.patch
-	"${FILESDIR}/${PN}"-1.9.0-turbo.patch
-	"${FILESDIR}/${PN}"-1.9.0-newpgf.patch
-)
-
-src_prepare() {
-	if use handbook; then
-		mv "${WORKDIR}/${PN}"-1.4.0/* "${S}/" || die
-	else
-		mkdir doc || die
-		echo > doc/CMakeLists.txt || die
-	fi
-
-	kde4-base_src_prepare
-}
-
-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)
-		$(cmake-utils_use_with geolocation MarbleWidget)
-		$(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)
-		$(cmake-utils_use_enable mysql MYSQL)
-	)
-
-	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/* || die
-	fi
-
-	if use handbook; then
-		dodoc readme-handbook.txt || die
-	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
-}
diff --git a/media-gfx/digikam/digikam-1.9.0.ebuild b/media-gfx/digikam/digikam-1.9.0.ebuild
deleted file mode 100644
index bbdc662383c4..000000000000
--- a/media-gfx/digikam/digikam-1.9.0.ebuild
+++ /dev/null
@@ -1,128 +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.9.0.ebuild,v 1.6 2011/11/22 23:02:54 dilfridge Exp $
-
-EAPI=3
-
-KDE_LINGUAS="ar be bg ca ca@valencia cs da de el en_GB eo es et eu fa fi fr ga gl he hi hne hr hu is it ja km
-ko lt lv ms nb nds ne nl nn pa pl pt pt_BR ro ru se sk sl sv th tr uk vi zh_CN zh_TW"
-KMNAME="extragear/graphics"
-
-# needed for sufficiently new libkdcraw
-KDE_MINIMAL="4.5"
-inherit kde4-base
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="A digital photo management application for KDE."
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
-	handbook? ( mirror://gentoo/${PN}-doc-1.4.0.tar.bz2 )"
-
-LICENSE="GPL-2
-	handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 ~ppc x86"
-SLOT="4"
-IUSE="addressbook debug doc geolocation gphoto2 handbook semantic-desktop themedesigner +thumbnails video"
-
-CDEPEND="
-	$(add_kdebase_dep kdelibs 'semantic-desktop?')
-	$(add_kdebase_dep libkdcraw)
-	$(add_kdebase_dep libkexiv2)
-	$(add_kdebase_dep libkipi)
-	$(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
-	virtual/mysql
-	x11-libs/qt-gui[qt3support]
-	|| ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
-	addressbook? ( $(add_kdebase_dep kdepimlibs) )
-	geolocation? ( $(add_kdebase_dep marble plasma) )
-	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 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT=test
-# bug 366505
-
-PATCHES=( "${FILESDIR}/${PN}"-1.9.0-docs.patch
-	"${FILESDIR}/${PN}"-1.8.0-tests.patch )
-
-src_prepare() {
-	if use handbook; then
-		mv "${WORKDIR}/${PN}"-1.4.0/* "${S}/" || die
-	else
-		mkdir doc || die
-		echo > doc/CMakeLists.txt || die
-	fi
-
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	local backend
-
-	use semantic-desktop && backend="Nepomuk" || backend="None"
-	# LQR = only allows to choose between bundled/external
-	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)
-		$(cmake-utils_use_with geolocation MarbleWidget)
-		$(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
-		dodir /usr/share/doc/${PF}/html || die
-		insinto /usr/share/doc/${PF}/html
-		doins -r ${CMAKE_BUILD_DIR}/api/html/* || die
-	fi
-
-	if use handbook; then
-		dodoc readme-handbook.txt || die
-	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
-}
diff --git a/media-gfx/digikam/files/digikam-1.8.0-tests.patch b/media-gfx/digikam/files/digikam-1.8.0-tests.patch
deleted file mode 100644
index ce03d2e5887d..000000000000
--- a/media-gfx/digikam/files/digikam-1.8.0-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ruN digikam-1.8.0.orig/tests/CMakeLists.txt digikam-1.8.0/tests/CMakeLists.txt
---- digikam-1.8.0.orig/tests/CMakeLists.txt	2011-01-23 20:24:49.000000000 +0100
-+++ digikam-1.8.0/tests/CMakeLists.txt	2011-01-28 19:56:04.000000000 +0100
-@@ -176,9 +176,9 @@
- 
- SET(qtpgftest_SRCS qtpgftest.cpp ${libpgf_SRCS} ${pgfutils_SRCS})
- KDE4_ADD_EXECUTABLE(qtpgftest NOGUI ${qtpgftest_SRCS})
--TARGET_LINK_LIBRARIES(qtpgftest ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-+TARGET_LINK_LIBRARIES(qtpgftest ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PGF_LIBRARIES})
- 
- SET(pgfscaled_SRCS pgfscaled.cpp ${libpgf_SRCS} ${pgfutils_SRCS})
- KDE4_ADD_EXECUTABLE(pgfscaled NOGUI ${pgfscaled_SRCS})
--TARGET_LINK_LIBRARIES(pgfscaled ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-+TARGET_LINK_LIBRARIES(pgfscaled ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PGF_LIBRARIES})
- 
diff --git a/media-gfx/digikam/files/digikam-1.9.0-docs.patch b/media-gfx/digikam/files/digikam-1.9.0-docs.patch
deleted file mode 100644
index 588cfb907031..000000000000
--- a/media-gfx/digikam/files/digikam-1.9.0-docs.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ruN digikam-1.9.0-vanilla/CMakeLists.txt digikam-1.9.0/CMakeLists.txt
---- digikam-1.9.0-vanilla/CMakeLists.txt	2011-02-27 21:16:18.000000000 +0100
-+++ digikam-1.9.0/CMakeLists.txt	2011-02-28 18:56:39.000000000 +0100
-@@ -1421,8 +1421,15 @@
- # ==================================================================================================
- # API documentation generation
- 
-+# Checks if user ask to build documentation.
-+IF(BUILD_DOC)
-+
- IF(DOXYGEN_FOUND)
- 
-+    MESSAGE(STATUS "")
-+    MESSAGE(STATUS "API documentation will be installed")
-+    MESSAGE(STATUS "")
-+
-     SET(API_DIR ${CMAKE_BINARY_DIR}/api)
-     SET(SOURCE_DIR ${CMAKE_SOURCE_DIR})
-     SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile)
-@@ -1430,10 +1437,29 @@
- 
-     CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE})
- 
--    ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE}
-+    ADD_CUSTOM_TARGET(doc ALL ${DOXYGEN_EXECUTABLE} ${DOXYFILE}
-                       WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-+
-+ELSE(DOXYGEN_FOUND)
-+
-+    MESSAGE(FATAL_ERROR "API documentation requested but doxygen not found")
-+
- ENDIF(DOXYGEN_FOUND)
-+
-+ELSE(BUILD_DOC)
-+
-+    MESSAGE(STATUS "")
-+    MESSAGE(STATUS "Documentation will NOT be installed")
-+    MESSAGE(STATUS "Because the option -DBUILD_DOC=ON wasn't passed to cmake")
-+    MESSAGE(STATUS "")
-+
-+ENDIF(BUILD_DOC)
-+
- find_package(Msgfmt REQUIRED)
- find_package(Gettext REQUIRED)
- add_subdirectory( po )
- 
-+# Build the handbook
-+add_subdirectory( doc )
-+
-+
diff --git a/media-gfx/digikam/files/digikam-1.9.0-newpgf.patch b/media-gfx/digikam/files/digikam-1.9.0-newpgf.patch
deleted file mode 100644
index ed5c1bd64c34..000000000000
--- a/media-gfx/digikam/files/digikam-1.9.0-newpgf.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff -ruN digikam-1.9.0.prepared/cmake/modules/FindPGF.cmake digikam-1.9.0/cmake/modules/FindPGF.cmake
---- digikam-1.9.0.prepared/cmake/modules/FindPGF.cmake	2011-02-27 19:58:23.000000000 +0100
-+++ digikam-1.9.0/cmake/modules/FindPGF.cmake	2011-07-05 12:03:41.000000000 +0200
-@@ -1,9 +1,10 @@
- # - Try to find libpgf
- # Once done this will define
- #
--#  PGF_FOUND - system has libgf
--#  PGF_INCLUDE_DIRS - the libpgf include directory
--#  PGF_LIBRARIES - Link these to use libpgf
-+#  PGF_FOUND            - system has libgf
-+#  PGF_INCLUDE_DIRS     - the libpgf include directory
-+#  PGF_LIBRARIES        - Link these to use libpgf
-+#  PGF_CODEC_VERSION_ID - PGF codec version ID.
- 
- # PKG-CONFIG is required.
- INCLUDE(FindPkgConfig REQUIRED)
-@@ -12,4 +13,15 @@
- 	INCLUDE(FindPkgConfig)
- 
- 	PKG_CHECK_MODULES(PGF libpgf)
-+
-+	MESSAGE(STATUS "PGF_INCLUDE_DIRS     = ${PGF_INCLUDE_DIRS}")
-+	MESSAGE(STATUS "PGF_INCLUDEDIR       = ${PGF_INCLUDEDIR}")
-+	MESSAGE(STATUS "PGF_LIBRARIES        = ${PGF_LIBRARIES}")
-+	MESSAGE(STATUS "PGF_LDFLAGS          = ${PGF_LDFLAGS}")
-+	MESSAGE(STATUS "PGF_CFLAGS           = ${PGF_CFLAGS}")
-+	MESSAGE(STATUS "PGF_VERSION          = ${PGF_VERSION}")
-+
-+	STRING(REPLACE "." "" PGF_CODEC_VERSION_ID "${PGF_VERSION}")
-+	MESSAGE(STATUS "PGF_CODEC_VERSION_ID = ${PGF_CODEC_VERSION_ID}")
-+
- ENDIF(PKG_CONFIG_FOUND)
-diff -ruN digikam-1.9.0.prepared/config-digikam.h.cmake digikam-1.9.0/config-digikam.h.cmake
---- digikam-1.9.0.prepared/config-digikam.h.cmake	2011-02-27 19:58:07.000000000 +0100
-+++ digikam-1.9.0/config-digikam.h.cmake	2011-07-05 12:05:59.000000000 +0200
-@@ -54,6 +54,8 @@
- /* Define to 1 if you have Nepomuk shared libraries installed */
- #cmakedefine HAVE_NEPOMUK 1
- 
-+#define PGFCodecVersionID 0x${PGF_CODEC_VERSION_ID}
-+
- #define LIBEXEC_INSTALL_DIR "${LIBEXEC_INSTALL_DIR}"
- 
- #endif /* CONFIG_DIGIKAM_H */
-diff -ruN digikam-1.9.0.prepared/libs/dimg/loaders/pgfloader.cpp digikam-1.9.0/libs/dimg/loaders/pgfloader.cpp
---- digikam-1.9.0.prepared/libs/dimg/loaders/pgfloader.cpp	2011-02-27 19:58:08.000000000 +0100
-+++ digikam-1.9.0/libs/dimg/loaders/pgfloader.cpp	2011-07-05 12:22:56.000000000 +0200
-@@ -29,6 +29,7 @@
- //#define ENABLE_DEBUG_MESSAGES
- 
- #include "pgfloader.h"
-+#include "config-digikam.h"
- 
- // C Ansi includes
- 
-@@ -435,7 +436,11 @@
-                          CallbackForLibPGF, this);
- 
-         UINT32 nWrittenBytes = 0;
-+#if PGFCodecVersionID >= 0x061124
-+        pgf.Write(&stream, &nWrittenBytes, CallbackForLibPGF, this);
-+#else
-         pgf.Write(&stream, 0, CallbackForLibPGF, &nWrittenBytes, this);
-+#endif
- 
- #ifdef ENABLE_DEBUG_MESSAGES
-         kDebug() << "PGF width     = " << header.width;
-diff -ruN digikam-1.9.0.prepared/libs/threadimageio/pgfutils.cpp digikam-1.9.0/libs/threadimageio/pgfutils.cpp
---- digikam-1.9.0.prepared/libs/threadimageio/pgfutils.cpp	2011-02-27 19:58:07.000000000 +0100
-+++ digikam-1.9.0/libs/threadimageio/pgfutils.cpp	2011-07-05 12:19:15.000000000 +0200
-@@ -46,6 +46,7 @@
- // LibPGF includes
- 
- #include "PGFimage.h"
-+#include "config-digikam.h"
- 
- namespace Digikam
- {
-@@ -136,7 +137,12 @@
-         // TODO : optimize memory allocation...
-         CPGFMemoryStream stream(256000);
-         UINT32 nWrittenBytes = 0;
-+
-+#if PGFCodecVersionID >= 0x061124
-+        pgfImg.Write(&stream, &nWrittenBytes);
-+#else
-         pgfImg.Write(&stream, 0, NULL, &nWrittenBytes);
-+#endif
- 
-         data = QByteArray((const char*)stream.GetBuffer(), nWrittenBytes);
-     }
diff --git a/media-gfx/digikam/files/digikam-1.9.0-nomysql.patch b/media-gfx/digikam/files/digikam-1.9.0-nomysql.patch
deleted file mode 100644
index 50dec5480869..000000000000
--- a/media-gfx/digikam/files/digikam-1.9.0-nomysql.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- digikam-1.9.0-vanilla/CMakeLists.txt	2011-02-28 02:16:18.000000000 +0600
-+++ digikam-1.9.0-vanilla/CMakeLists.txt	2011-05-09 19:45:02.000000000 +0700
-@@ -2,6 +2,7 @@ 
- 
- OPTION(ENABLE_THEMEDESIGNER "Build digiKam theme designer (default=OFF)" OFF)
- OPTION(ENABLE_THUMBS_DB "Build digiKam with thumbnails database support (default=ON)" ON)
-+OPTION(ENABLE_MYSQL "Build digiKam with MySQL database support (default=ON)" ON)
- 
- # ==================================================================================================
- # Information to update before to release this package.
-@@ -189,20 +190,22 @@ 
-     SET(KEXIV2_FOR_DIGIKAM TRUE)
- ENDIF(NOT WIN32)
- 
-+IF (ENABLE_MYSQL)
- # Check MySQL executables
--FIND_PROGRAM( SERVERCMD_MYSQL mysqld
--              PATHS /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec /opt/local/libexec
--                    /opt/mysql/libexec /usr/mysql/bin /opt/mysql/sbin ${MYSQLD_PATH}
--                    ENV MYSQLD_PATH )
--MESSAGE(STATUS "Found MySQL server executable at: ${SERVERCMD_MYSQL}")
-+	FIND_PROGRAM( SERVERCMD_MYSQL mysqld
-+        	      PATHS /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec /opt/local/libexec
-+                	    /opt/mysql/libexec /usr/mysql/bin /opt/mysql/sbin ${MYSQLD_PATH}
-+	                    ENV MYSQLD_PATH )
-+	MESSAGE(STATUS "Found MySQL server executable at: ${SERVERCMD_MYSQL}")
- 
- # NOTE: under windows, mysql_install_db PERL script is named "mysql_install_db.pl"
- #       under MACOS-X, through macports project, mysql_install_db PERL script is named "mysql_install_db5"
--FIND_PROGRAM( INITCMD_MYSQL mysql_install_db mysql_install_db5 mysql_install_db.pl
--              PATHS /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec
--                    /opt/mysql/libexec /usr/mysql/bin /opt/mysql/bin ${MYSQL_TOOLS_PATH}
--                    ENV MYSQL_TOOLS_PATH )
--MESSAGE(STATUS "Found MySQL install_db executable at: ${INITCMD_MYSQL}")
-+	FIND_PROGRAM( INITCMD_MYSQL mysql_install_db mysql_install_db5 mysql_install_db.pl
-+        	      PATHS /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec
-+                	    /opt/mysql/libexec /usr/mysql/bin /opt/mysql/bin ${MYSQL_TOOLS_PATH}
-+	                    ENV MYSQL_TOOLS_PATH )
-+	MESSAGE(STATUS "Found MySQL install_db executable at: ${INITCMD_MYSQL}")
-+ENDIF (ENABLE_MYSQL)
- 
- # ==================================================================================================
- # Optional dependencies
-@@ -274,10 +277,12 @@ 
- MESSAGE(STATUS "")
- 
- PRINT_QTMODULE_STATUS("Qt4 SQL" QT_QTSQL_FOUND)
--PRINT_EXECUTABLE_STATUS("MySQL Server" mysqld MYSQLD_PATH SERVERCMD_MYSQL)
--IF (NOT WIN32)
--    PRINT_EXECUTABLE_STATUS("MySQL install_db tool" mysql_install_db MYSQL_TOOLS_PATH INITCMD_MYSQL)
--ENDIF (NOT WIN32)
-+IF (ENABLE_MYSQL)
-+	PRINT_EXECUTABLE_STATUS("MySQL Server" mysqld MYSQLD_PATH SERVERCMD_MYSQL)
-+	IF (NOT WIN32)
-+	    PRINT_EXECUTABLE_STATUS("MySQL install_db tool" mysql_install_db MYSQL_TOOLS_PATH INITCMD_MYSQL)
-+	ENDIF (NOT WIN32)
-+ENDIF (ENABLE_MYSQL)
- PRINT_LIBRARY_STATUS("libtiff" "http://www.remotesensing.org/libtiff" "" TIFF_FOUND)
- PRINT_LIBRARY_STATUS("libpng" "http://www.libpng.org/pub/png/libpng.html" " (version >= 1.2.7)" PNG_FOUND)
- PRINT_LIBRARY_STATUS("libjasper" "http://www.ece.uvic.ca/~mdadams/jasper" "" JASPER_FOUND)
diff --git a/media-gfx/digikam/files/digikam-1.9.0-turbo.patch b/media-gfx/digikam/files/digikam-1.9.0-turbo.patch
deleted file mode 100644
index bd105529b0bd..000000000000
--- a/media-gfx/digikam/files/digikam-1.9.0-turbo.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 1ad9ae102ea1a82a72e31401fe840954a791219f Mon Sep 17 00:00:00 2001
-From: Riccardo Iaconelli <riccardo@kde.org>
-Date: Sun, 15 May 2011 16:18:44 +0200
-Subject: [PATCH] Don't fail CMake check: compile with libjpeg-turbo
-
-Patch by Rex Dieter
-
-BUG: 265431
-
-Signed-off-by: Riccardo Iaconelli <riccardo@kde.org>
----
- CMakeLists.txt |   28 +++++++++++++++++-----------
- 1 files changed, 17 insertions(+), 11 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 43293ef..63402e9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -166,17 +166,23 @@ ELSE(NOT APPLE)
-     SET(CLAPACK_FOUND FALSE)
- ENDIF(NOT APPLE)
- 
--# Extract version of libjpeg so that we can use the appropriate dir
--# See bug #227313, #228483
--FILE(READ "${JPEG_INCLUDE_DIR}/jpeglib.h" jpeglib_h_content)
--STRING(REGEX REPLACE ".*#define +JPEG_LIB_VERSION +([0-9]+).*" "\\1" jpeglib_version "${jpeglib_h_content}")
--MESSAGE(STATUS "Identified libjpeg version: ${jpeglib_version}")
--
--IF ("${jpeglib_version}" LESS 80)
--    SET(DIGIKAM_LIBJPEG_DIR libjpeg-62)
--ELSE ("${jpeglib_version}" LESS 80)
--    SET(DIGIKAM_LIBJPEG_DIR libjpeg-80)
--ENDIF ("${jpeglib_version}" LESS 80)
-+# check version of libjpeg so that we can use the appropriate dir
-+# See bug #227313
-+set(_jpeglib_version_source "#include <stddef.h>\n#include<stdio.h>\n#include <jpeglib.h>\n int main()\n {\n #if (JPEG_LIB_VERSION >= 80) \n #error JPEG_LIB_VERSION >= 80 found \n #endif \n }\n")
-+set(_jpeglib_version_source_file ${CMAKE_BINARY_DIR}/CMakeTmp/cmake_jpeglib_version_check.cpp)
-+file(WRITE "${_jpeglib_version_source_file}" "${_jpeglib_version_source}")
-+set(_jpeglib_version_include_dirs "-DINCLUDE_DIRECTORIES:STRING=${JPEG_INCLUDE_DIR}")
-+
-+try_compile(_jpeglib_version_compile_result ${CMAKE_BINARY_DIR} ${_jpeglib_version_source_file} CMAKE_FLAGS "${_jpeglib_version_include_dirs}" COMPILE_OUTPUT_VARIABLE _jpeglib_version_compile_output_var)
-+
-+if(_jpeglib_version_compile_result)
-+MESSAGE(STATUS "Identified libjpeg version: 62")
-+set(DIGIKAM_LIBJPEG_DIR libjpeg-62)
-+else(_jpeglib_version_compile_result)
-+MESSAGE(STATUS "Identified libjpeg version: 80+")
-+set(DIGIKAM_LIBJPEG_DIR libjpeg-80)
-+endif(_jpeglib_version_compile_result)
-+
- 
- IF (ENABLE_INTERNALMYSQL)
- # Check MySQL executables
--- 
-1.7.3.4
-