[media-gfx/digikam] Remove old, sort mycmakeargs by USE flag, move some things to RDEPEND-only, add ffmpegthumbs as optional thumbnail provider, sync ebuilds

7 files changed, 61 insertions, 473 deletions

diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index cad051a2e9..b9571d3729 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,11 +1,6 @@
-AUX digikam-1.2.0-kde232628.patch 413 RMD160 b7e86997019fa16590a565b8e18fb43c287c7e88 SHA1 aa90381903000f28c105677e12f4b6813363659a SHA256 48cf828b847cd4346b9f5512fa1a010565680d31996bf2492c7bf256caf04231
-AUX digikam-1.2.0-lapack.patch 6429 RMD160 e42b9600822fbd28b31c751fe6515a691db4cb0b SHA1 a495d7734c355419e4cba629354e4e9077f15782 SHA256 02169ca57f86f3f7d40dced07b7c54f612bd8fe3b03d2a5808184c47b5b360c0
 AUX digikam-1.3.0-lapack.patch 6328 RMD160 83e23b30997bf8daf3666a1ff5ea3d9d5868b34b SHA1 9bcf99ca5f6358c8cd548497ec082d9b989c147f SHA256 f6c528835edb0778bcff726658145c1e6318b7526cbcaabf4cfe4ad7a7b85b8e
 AUX digikam-1.3.0-libpgf.patch 8816 RMD160 5c20af5bc50799a1184ff9e6ffc3a1c187bb3e03 SHA1 4f5a53dd955ac8ced1b565cd7b8193fd489715a0 SHA256 ee7f5b36d98f0c674d01fb123f5e9fea5586633d7963c212dd46c48a148bb0d9
-AUX libpgf-unbundled-digikam-1.2.0-r0.patch 8505 RMD160 524cfb182518f45e6d2a683642486eb84a3471d3 SHA1 d86fec9b63442f472d0ce7dd0d20939fe389eadc SHA256 8c603858103f056d17d4e8d9a3cb1d6464de6d174d82ff50882611e27564f465
-DIST digikam-1.2.0.tar.bz2 13970098 RMD160 f8177241536b2f099499977d9c3cbd2dc9880853 SHA1 7f12caf737a05043c7a9a5291a448684e5a4e2e6 SHA256 930539b5bb53af345f4bef3d06c7121c22af3dbd7ae7b338fa3d173a6a631206
 DIST digikam-1.3.0.tar.bz2 14990462 RMD160 45f6bc4ee80df278eb85f3de9eab9b221ee94377 SHA1 99ab242f075d7d5368b66996fffeed5dfd738cbe SHA256 76184c5e193b8338894db6a8c4af4bc773beb819856a83ae163529aefcc10321
-EBUILD digikam-1.2.0-r1.ebuild 2374 RMD160 9c118635c282c0de641f27a4f3a680ad07731100 SHA1 fd32b728e2ede347afb8713f6555e2bb355c5a89 SHA256 6c398cea1aea96d85077690ccd62658023bdf2f2d2061ebcca602b11b3a883f2
-EBUILD digikam-1.3.0.ebuild 2544 RMD160 7e90364b7793f609e2c73354810acdacacd70fac SHA1 328feaa76be052b78e08f74d8180363abd1833d0 SHA256 7250b80a3a435e37e7c6e9f3f59a51d64bec9b6f770afb5c085a9e7644f105fd
-EBUILD digikam-9999.ebuild 2150 RMD160 9ce885eb8e79546c194b8aa6e86c02c390d0b7cd SHA1 ad51c546133110e431376c5272d21348385cde0a SHA256 d412f30e0d1dd261cd0f4b928d7471cc023e1486eea0cde2cd03bff14e6644a3
+EBUILD digikam-1.3.0.ebuild 2587 RMD160 495881463fb23de91222e4d6e0275b6f185fe5cd SHA1 f8e61478af94f45031c6b0ff1a0699083aba2161 SHA256 2bd41200634a994e38323b580d7bd999ac68f605f983fee69c7af9e1617b7932
+EBUILD digikam-9999.ebuild 2559 RMD160 d0af6503b68638ef264ae07e8fd80c964e03081d SHA1 ea2c8b27f5a34c74bf87f7c87031de17e6d23080 SHA256 435c6b18119eacc6a9c9871343da2da15e8cee48496733609f982b20ced3b87f
 MISC metadata.xml 561 RMD160 4cd500a827d9f01fb799b34f126312c0462f0e7b SHA1 91432be778e43c9381a7bcdd602b3bc7d773b472 SHA256 002c1784fab700752d25b556bc16caec89d8c764e19fb1d950006a8adc4af939
diff --git a/media-gfx/digikam/digikam-1.2.0-r1.ebuild b/media-gfx/digikam/digikam-1.2.0-r1.ebuild
deleted file mode 100644
index 7e12c9756c..0000000000
--- a/media-gfx/digikam/digikam-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-KDE_LINGUAS="ar be bg ca cs da de el es et eu fa fi fr ga gl he hi is it ja km
-ko lt lv lb 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"
-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"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="addressbook debug doc geolocation gphoto2 lensfun semantic-desktop +thumbnails"
-
-RDEPEND="
-	>=kde-base/kdelibs-${KDE_MINIMAL}[semantic-desktop?]
-	>=kde-base/libkdcraw-${KDE_MINIMAL}
-	>=kde-base/libkexiv2-${KDE_MINIMAL}
-	>=kde-base/libkipi-${KDE_MINIMAL}
-	>=kde-base/solid-${KDE_MINIMAL}
-	>=kde-base/kreadconfig-${KDE_MINIMAL}
-	media-libs/jasper
-	>=media-libs/jpeg-8
-	media-libs/lcms:0
-	media-libs/liblqr
-	media-libs/libpng
-	media-libs/tiff
-	media-libs/libpgf
-	>=media-plugins/kipi-plugins-1.2.0-r1
-	virtual/lapack
-	x11-libs/qt-gui[qt3support]
-	x11-libs/qt-sql[sqlite]
-	addressbook? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
-	geolocation? ( >=kde-base/marble-${KDE_MINIMAL} )
-	gphoto2? ( media-libs/libgphoto2 )
-	lensfun? ( media-libs/lensfun )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gcc[fortran]
-	sys-devel/gettext
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Patch to prevent a crash on startup in RatingWidget (kde#232628)
-	epatch "${FILESDIR}/digikam-1.2.0-kde232628.patch"
-	# Patch to unbundled libpgf.
-	epatch "${FILESDIR}/libpgf-unbundled-digikam-1.2.0-r0.patch"
-	# Patch to unbundle lapack.
-	epatch "${FILESDIR}/digikam-1.2.0-lapack.patch"
-
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	local backend
-
-	use semantic-desktop && backend="Nepomuk" || backend="None"
-	# LQR = only allows to choose between bundled/external
-	mycmakeargs=(
-		-DWITH_LQR=ON
-		-DENABLE_THEMEDESIGNER=OFF
-		-DGWENVIEW_SEMANTICINFO_BACKEND=${backend}
-		$(cmake-utils_use_enable gphoto2 GPHOTO2)
-		$(cmake-utils_use_with gphoto2)
-		$(cmake-utils_use_enable thumbnails THUMBS_DB)
-		$(cmake-utils_use_with addressbook KdepimLibs)
-		$(cmake-utils_use_with geolocation MarbleWidget)
-		$(cmake-utils_use_with lensfun LensFun)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_build doc)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/media-gfx/digikam/digikam-1.3.0.ebuild b/media-gfx/digikam/digikam-1.3.0.ebuild
index a534fd7654..e3f1adac35 100644
--- a/media-gfx/digikam/digikam-1.3.0.ebuild
+++ b/media-gfx/digikam/digikam-1.3.0.ebuild
@@ -10,7 +10,6 @@ KMNAME="extragear/graphics"
 
 # needed for sufficiently new libkdcraw
 KDE_MINIMAL="4.4"
-
 inherit kde4-base
 
 MY_P="${PN}-${PV/_/-}"
@@ -24,13 +23,12 @@ KEYWORDS="~amd64 ~x86"
 SLOT="4"
 IUSE="addressbook debug doc geolocation gphoto2 lensfun semantic-desktop themedesigner +thumbnails video"
 
-RDEPEND="
+CDEPEND="
 	>=kde-base/kdelibs-${KDE_MINIMAL}[semantic-desktop?]
 	>=kde-base/libkdcraw-${KDE_MINIMAL}
 	>=kde-base/libkexiv2-${KDE_MINIMAL}
 	>=kde-base/libkipi-${KDE_MINIMAL}
 	>=kde-base/solid-${KDE_MINIMAL}
-	>=kde-base/kreadconfig-${KDE_MINIMAL}
 	media-libs/jasper
 	>=media-libs/jpeg-8
 	media-libs/lcms:0
@@ -46,12 +44,19 @@ RDEPEND="
 	geolocation? ( >=kde-base/marble-${KDE_MINIMAL} )
 	gphoto2? ( media-libs/libgphoto2 )
 	lensfun? ( media-libs/lensfun )
-	video? ( >=kde-base/mplayerthumbs-${KDE_MINIMAL} )
 "
-
-# gcc[fortran] is required since we cannot otherwise link to the lapack library 
+RDEPEND="${CDEPEND}
+	>=kde-base/kreadconfig-${KDE_MINIMAL}
+	video? (
+		|| (
+			>=kde-base/mplayerthumbs-${KDE_MINIMAL}
+			>=kde-base/ffmpegthumbs-${KDE_MINIMAL}
+		)
+	)
+"
+# gcc[fortran] is required since we cannot otherwise link to the lapack library
 #   (the fun of unbundling)
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
 	sys-devel/gcc[fortran]
 	sys-devel/gettext
 "
@@ -60,9 +65,9 @@ S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	# Patch to unbundled libpgf.
-	epatch "${FILESDIR}/digikam-1.3.0-libpgf.patch"
+	epatch "${FILESDIR}/${PN}-1.3.0-libpgf.patch"
 	# Patch to unbundle lapack.
-	epatch "${FILESDIR}/digikam-1.3.0-lapack.patch"
+	epatch "${FILESDIR}/${PN}-1.3.0-lapack.patch"
 
 	kde4-base_src_prepare
 }
@@ -74,17 +79,16 @@ src_configure() {
 	# LQR = only allows to choose between bundled/external
 	mycmakeargs=(
 		-DWITH_LQR=ON
-		-DENABLE_THEMEDESIGNER=OFF
 		-DGWENVIEW_SEMANTICINFO_BACKEND=${backend}
-		$(cmake-utils_use_enable gphoto2 GPHOTO2)
-		$(cmake-utils_use_with gphoto2)
-		$(cmake-utils_use_enable thumbnails THUMBS_DB)
 		$(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 lensfun LensFun)
 		$(cmake-utils_use_with semantic-desktop Soprano)
 		$(cmake-utils_use_enable themedesigner)
-		$(cmake-utils_use_build doc)
+		$(cmake-utils_use_enable thumbnails THUMBS_DB)
 	)
 
 	kde4-base_src_configure
diff --git a/media-gfx/digikam/digikam-9999.ebuild b/media-gfx/digikam/digikam-9999.ebuild
index 7ec5542b9b..7427028fde 100644
--- a/media-gfx/digikam/digikam-9999.ebuild
+++ b/media-gfx/digikam/digikam-9999.ebuild
@@ -2,18 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-#
-# ***
-# Note that this ebuild is outdated; the changes from the latest .x.y.z still have to be ported here!!!
-# ***
-#
-
-
 EAPI="2"
 
 #KDE_LINGUAS="ar be bg ca cs da de el es et eu fa fi fr ga gl he hi is it ja km
 #ko lt lv lb 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.4"
 inherit kde4-base
 
 MY_P="${PN}-${PV/_/-}"
@@ -25,37 +21,53 @@ HOMEPAGE="http://www.digikam.org/"
 LICENSE="GPL-2"
 KEYWORDS=""
 SLOT="4"
-IUSE="addressbook debug geolocation +gphoto2 lensfun semantic-desktop"
+IUSE="addressbook debug doc geolocation gphoto2 lensfun semantic-desktop themedesigner +thumbnails video"
 
-DEPEND="
-	dev-db/sqlite:3
+CDEPEND="
 	>=kde-base/kdelibs-${KDE_MINIMAL}[semantic-desktop?]
 	>=kde-base/libkdcraw-${KDE_MINIMAL}
 	>=kde-base/libkexiv2-${KDE_MINIMAL}
 	>=kde-base/libkipi-${KDE_MINIMAL}
 	>=kde-base/solid-${KDE_MINIMAL}
-	>=media-libs/jasper-1.701.0
-	media-libs/jpeg
+	media-libs/jasper
+	>=media-libs/jpeg-8
 	media-libs/lcms:0
-	>=media-libs/libpng-1.2.26-r1
-	>=media-libs/tiff-3.8.2-r3
-	sys-devel/gettext
-	x11-libs/qt-core[qt3support]
+	media-libs/liblqr
+	media-libs/libpng
+	media-libs/tiff
+	media-libs/libpgf
+	>=media-plugins/kipi-plugins-1.2.0-r1
+	virtual/lapack
+	x11-libs/qt-gui[qt3support]
 	x11-libs/qt-sql[sqlite]
 	addressbook? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
 	geolocation? ( >=kde-base/marble-${KDE_MINIMAL} )
-	gphoto2? ( >=media-libs/libgphoto2-2.4.1-r1 )
+	gphoto2? ( media-libs/libgphoto2 )
 	lensfun? ( media-libs/lensfun )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${CDEPEND}
+	>=kde-base/kreadconfig-${KDE_MINIMAL}
+	video? (
+		|| (
+			>=kde-base/mplayerthumbs-${KDE_MINIMAL}
+			>=kde-base/ffmpegthumbs-${KDE_MINIMAL}
+		)
+	)
+"
+# gcc[fortran] is required since we cannot otherwise link to the lapack library
+#   (the fun of unbundling)
+DEPEND="${CDEPEND}
+	sys-devel/gcc[fortran]
+	sys-devel/gettext
+"
 
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	# Fix files collision, use icon from kdebase-data rather that digikam ones
-	rm -rf data/icons/oxygen/{16x16,22x22,32x32,64x64,48x48,128x128,scalable\
-}/{actions/{view-object-histogram-linear,transform-crop-and-resize,\
-view-object-histogram-logarithmic},apps/{digikam,showfoto}}.{svgz,png}
+	# Patch to unbundled libpgf.
+	epatch "${FILESDIR}/${PN}-1.3.0-libpgf.patch"
+	# Patch to unbundle lapack.
+	epatch "${FILESDIR}/${PN}-1.3.0-lapack.patch"
 
 	kde4-base_src_prepare
 }
@@ -64,13 +76,19 @@ src_configure() {
 	local backend
 
 	use semantic-desktop && backend="Nepomuk" || backend="None"
+	# LQR = only allows to choose between bundled/external
 	mycmakeargs=(
+		-DWITH_LQR=ON
 		-DGWENVIEW_SEMANTICINFO_BACKEND=${backend}
-		$(cmake-utils_use_enable gphoto2)
 		$(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 lensfun LensFun)
 		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_enable themedesigner)
+		$(cmake-utils_use_enable thumbnails THUMBS_DB)
 	)
 
 	kde4-base_src_configure
diff --git a/media-gfx/digikam/files/digikam-1.2.0-kde232628.patch b/media-gfx/digikam/files/digikam-1.2.0-kde232628.patch
deleted file mode 100644
index 02d4cce4d3..0000000000
--- a/media-gfx/digikam/files/digikam-1.2.0-kde232628.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trunk/extragear/graphics/digikam/digikam/ratingwidget.cpp	2010/03/30 18:15:12	1109176
-+++ trunk/extragear/graphics/digikam/digikam/ratingwidget.cpp	2010/03/30 18:15:25	1109177
-@@ -165,7 +165,7 @@
- void RatingWidget::setFadingValue(int value)
- {
-     d->fadingValue = value;
--    if (d->fadingValue >= 255)
-+    if (d->fadingValue >= 255 && d->fadingTimeLine)
-     {
-         d->fadingTimeLine->stop();
-     }
diff --git a/media-gfx/digikam/files/digikam-1.2.0-lapack.patch b/media-gfx/digikam/files/digikam-1.2.0-lapack.patch
deleted file mode 100644
index f7310788be..0000000000
--- a/media-gfx/digikam/files/digikam-1.2.0-lapack.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff -r -u digikam-1.2.0.orig/CMakeLists.txt digikam-1.2.0/CMakeLists.txt
---- digikam-1.2.0.orig/CMakeLists.txt	2010-05-30 21:38:14.189946492 +0200
-+++ digikam-1.2.0/CMakeLists.txt	2010-05-30 21:39:46.679946458 +0200
-@@ -3,6 +3,8 @@
- #OPTION(ENABLE_THEMEDESIGNER "Build digiKam theme designer (default=OFF)" OFF)
- OPTION(ENABLE_THUMBS_DB "Build digiKam with thumbnails database support (default=ON)" ON)
- 
-+ENABLE_LANGUAGE(Fortran)
-+
- # ==================================================================================================
- # Information to update before to release this package.
- 
-@@ -123,6 +125,9 @@
- # This function call the script cmake/modules/FindPGF.cmake
- FIND_PACKAGE(PGF)
- 
-+# Included to unbundle lapack that is in portage tree.
-+FIND_PACKAGE(LAPACK)
-+
- FIND_PACKAGE(Jasper)
- FIND_PACKAGE(Kdcraw)
- FIND_PACKAGE(Kexiv2)
-@@ -320,13 +325,13 @@
-     MESSAGE(STATUS "")
- ENDIF(DOXYGEN_FOUND)
- 
--IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND)
-+IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND AND LAPACK_FOUND)
-     MESSAGE(STATUS " digiKam will be compiled................. YES")
-     SET(DIGIKAM_CAN_BE_COMPILED true)
--ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND)
-+ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND AND LAPACK_FOUND)
-     MESSAGE(FATAL_ERROR " digiKam will be compiled................. NO  (Look README file for more details about dependencies)")
-     SET(DIGIKAM_CAN_BE_COMPILED false)
--ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND)
-+ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND AND LAPACK_FOUND)
- 
- MESSAGE(STATUS "----------------------------------------------------------------------------------")
- MESSAGE(STATUS "")
-@@ -484,39 +489,7 @@
-         ${CMAKE_CURRENT_SOURCE_DIR}/libs/dimg/loaders/pgfsettings.cpp
-        )
- 
--    SET(libclapack_SRCS
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/abort_.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgesv.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dlaswp.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/endfile.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/idamax.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/open.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/sig_die.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/wref.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/close.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgetf2.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dscal.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/err.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/ieeeck.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/s_cmp.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/s_stop.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/wrtfmt.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgemm.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgetrf.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dswap.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/fmt.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/ilaenv.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/s_copy.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/wsfe.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dger.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgetrs.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dtrsm.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/fmtlib.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/lsame.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/sfe.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/util.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/xerbla.c
--       )
-+    INCLUDE_DIRECTORIES(${LAPACK_INCLUDE_DIRS})
- 
-     SET(libdimgfilters_SRCS
-         ${libclapack_SRCS}
-Nur in digikam-1.2.0: CMakeLists.txt.orig.
-diff -r -u digikam-1.2.0.orig/digikam/CMakeLists.txt digikam-1.2.0/digikam/CMakeLists.txt
---- digikam-1.2.0.orig/digikam/CMakeLists.txt	2010-05-30 21:38:14.191892532 +0200
-+++ digikam-1.2.0/digikam/CMakeLists.txt	2010-05-30 21:39:46.680979177 +0200
-@@ -89,6 +89,7 @@
-                      ${PNG_PNG_INCLUDE_DIR}
-                      ${TIFF_INCLUDE_DIR}
- 		     ${PGF_INCLUDE_DIRS}
-+		     ${LAPACK_INCLUDE_DIRS}
-                    )
- 
- IF(LENSFUN_LIBRARY)
-@@ -172,6 +173,7 @@
- 		      ${PGF_LIBRARIES}
-                       ${LCMS_LIBRARIES}
-                       ${JASPER_LIBRARIES}
-+		      ${LAPACK_LIBRARIES}
- 
-                       # Require by CImg library which use pthread internally.
-                       ${CMAKE_THREAD_LIBS_INIT}
-@@ -237,6 +239,7 @@
-                       ${QT_QTGUI_LIBRARY}
-                       ${QT_QTSQL_LIBRARY}
- 		      ${PGF_LIBRARIES}
-+		      ${LAPACK_LIBRARIES}
-                      )
- 
- SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSION 1 )
-Nur in digikam-1.2.0/digikam: CMakeLists.txt.orig.
-diff -r -u digikam-1.2.0.orig/libs/CMakeLists.txt digikam-1.2.0/libs/CMakeLists.txt
---- digikam-1.2.0.orig/libs/CMakeLists.txt	2010-05-30 21:38:14.191892532 +0200
-+++ digikam-1.2.0/libs/CMakeLists.txt	2010-05-30 21:41:20.226778777 +0200
-@@ -14,12 +14,12 @@
-                      imageproperties
-                      dialogs
-                      3rdparty/cimg
--                     3rdparty/clapack
-                      ${JPEG_INCLUDE_DIR}
-                      ${TIFF_INCLUDE_DIR}
-                      ${PNG_INCLUDE_DIR}
-                      ${PGF_INCLUDE_DIRS}
-                      ${JASPER_INCLUDE_DIR}
-+                     ${LAPACK_INCLUDE_DIRS}
-                    )
- ADD_SUBDIRECTORY( histogram )
- ADD_SUBDIRECTORY( dmetadata )
diff --git a/media-gfx/digikam/files/libpgf-unbundled-digikam-1.2.0-r0.patch b/media-gfx/digikam/files/libpgf-unbundled-digikam-1.2.0-r0.patch
deleted file mode 100644
index e788cf0e00..0000000000
--- a/media-gfx/digikam/files/libpgf-unbundled-digikam-1.2.0-r0.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-diff -ruN old/cmake/modules/FindPGF.cmake new/cmake/modules/FindPGF.cmake
---- old/cmake/modules/FindPGF.cmake	1969-12-31 21:00:00.000000000 -0300
-+++ new/cmake/modules/FindPGF.cmake	2010-03-30 13:54:13.520854878 -0300
-@@ -0,0 +1,15 @@
-+# - 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
-+
-+# PKG-CONFIG is required.
-+INCLUDE(FindPkgConfig REQUIRED)
-+
-+IF(PKG_CONFIG_FOUND)
-+	INCLUDE(FindPkgConfig)
-+
-+	PKG_CHECK_MODULES(PGF libpgf)
-+ENDIF(PKG_CONFIG_FOUND)
-diff -ruN old/CMakeLists.txt new/CMakeLists.txt
---- old/CMakeLists.txt	2010-03-28 19:26:06.000000000 -0300
-+++ new/CMakeLists.txt	2010-03-30 19:50:55.537108644 -0300
-@@ -34,6 +34,9 @@
-     "${DIGIKAM_VERSION_SHORT}${DIGIKAM_SUFFIX_VERSION}"
-    )
- 
-+# Path to find FindPGF.cmake script.
-+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules")
-+
- # ==================================================================================================
- # Debug area codes
- # These codes will be set for every project specific path automatically, so
-@@ -115,6 +118,11 @@
- FIND_PACKAGE(JPEG)
- FIND_PACKAGE(PNG)
- FIND_PACKAGE(TIFF)
-+
-+# Included to unbundle libpgf that is on portage tree.
-+# This function call the script cmake/modules/FindPGF.cmake
-+FIND_PACKAGE(PGF)
-+
- FIND_PACKAGE(Jasper)
- FIND_PACKAGE(Kdcraw)
- FIND_PACKAGE(Kexiv2)
-@@ -210,6 +218,7 @@
- 
- PRINT_QTMODULE_STATUS("Qt4 SQL" QT_QTSQL_FOUND)
- PRINT_LIBRARY_STATUS("libtiff" "http://www.remotesensing.org/libtiff" "" TIFF_FOUND)
-+PRINT_LIBRARY_STATUS("libpgf" "http://www.libpgf.org" "" PGF_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)
- PRINT_LIBRARY_STATUS("liblcms" "http://www.littlecms.com" "" LCMS_FOUND)
-@@ -311,13 +320,13 @@
-     MESSAGE(STATUS "")
- ENDIF(DOXYGEN_FOUND)
- 
--IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND)
-+IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND)
-     MESSAGE(STATUS " digiKam will be compiled................. YES")
-     SET(DIGIKAM_CAN_BE_COMPILED true)
--ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND)
-+ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND)
-     MESSAGE(FATAL_ERROR " digiKam will be compiled................. NO  (Look README file for more details about dependencies)")
-     SET(DIGIKAM_CAN_BE_COMPILED false)
--ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND)
-+ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND)
- 
- MESSAGE(STATUS "----------------------------------------------------------------------------------")
- MESSAGE(STATUS "")
-@@ -952,14 +961,7 @@
-         ${CMAKE_CURRENT_SOURCE_DIR}/libs/threadimageio/pgfutils.cpp
-        )
- 
--    SET(libpgf_SRCS
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Decoder.cpp
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Encoder.cpp
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/PGFimage.cpp
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Stream.cpp
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Subband.cpp
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/WaveletTransform.cpp
--       )
-+    INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS})
- 
-     SET(libsqlite2_SRCS
-         ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/attach.c
-@@ -1258,18 +1260,41 @@
- # ==================================================================================================
- # API documentation generation
- 
--IF(DOXYGEN_FOUND)
-+# Checks if user ask to build documentation.
-+IF(BUILD_DOC)
-+    IF(DOXYGEN_FOUND)
-+
-+        MESSAGE(STATUS "")
-+        MESSAGE(STATUS "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)
--    SET(WARNFILE ${CMAKE_BINARY_DIR}/doxygen-warn.log)
-+        SET(API_DIR ${CMAKE_BINARY_DIR}/api)
-+        SET(SOURCE_DIR ${CMAKE_SOURCE_DIR})
-+        SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile)
-+        SET(WARNFILE ${CMAKE_BINARY_DIR}/doxygen-warn.log)
- 
--    CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE})
-+        CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE})
- 
--    ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE}
--                      WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-+        ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE}
-+                          WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-+
-+    ELSE(DOXYGEN_FOUND)
-+    
-+        MESSAGE(STATUS "")
-+        MESSAGE(STATUS "Documentation will NOT be installed")
-+	MESSAGE(STATUS "Doxygen wasn't found on the system")
-+	MESSAGE(STATUS "")
-+
-+    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)
- 
--ENDIF(DOXYGEN_FOUND)
- include(MacroOptionalAddSubdirectory)
- macro_optional_add_subdirectory( po )
-diff -ruN old/digikam/CMakeLists.txt new/digikam/CMakeLists.txt
---- old/digikam/CMakeLists.txt	2010-03-28 19:19:21.000000000 -0300
-+++ new/digikam/CMakeLists.txt	2010-03-30 19:44:00.296860646 -0300
-@@ -52,7 +52,6 @@
-                      # specific libs and utilities
-                      ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/lprof
-                      ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/sqlite2
--                     ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/libpgf
-                      ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/clapack
-                      ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/cimg
-                      ${CMAKE_CURRENT_SOURCE_DIR}/../libs/themeengine
-@@ -89,6 +88,7 @@
-                      ${JPEG_INCLUDE_DIR}
-                      ${PNG_PNG_INCLUDE_DIR}
-                      ${TIFF_INCLUDE_DIR}
-+		     ${PGF_INCLUDE_DIRS}
-                    )
- 
- IF(LENSFUN_LIBRARY)
-@@ -100,9 +100,6 @@
- # Disable Clapack C code warnings.
- SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS "-w")
- 
--# Disable libpgf warnings.
--SET_SOURCE_FILES_PROPERTIES(${libpgf_SRCS} PROPERTIES COMPILE_FLAGS "-w")
--
- # Disable liblqr C code warnings.
- SET_SOURCE_FILES_PROPERTIES(${liblqr_SRCS} PROPERTIES COMPILE_FLAGS "-w")
- 
-@@ -121,7 +118,6 @@
-                         ${libjpegutils_SRCS}
-                         ${libthreadimageio_SRCS}
-                         ${libthemeengine_SRCS}
--                        ${libpgf_SRCS}
-                         ${pgfutils_SRCS}
-                         ${libdigikamhelpers_SRCS}
- 
-@@ -173,6 +169,7 @@
-                       ${JPEG_LIBRARIES}
-                       ${TIFF_LIBRARIES}
-                       ${PNG_LIBRARIES}
-+		      ${PGF_LIBRARIES}
-                       ${LCMS_LIBRARIES}
-                       ${JASPER_LIBRARIES}
- 
-@@ -225,7 +222,6 @@
-                              ${libhaar_SRCS}
-                              ${libdatabasemodels_SRCS}
-                              ${libsqlite2_SRCS}
--                             ${libpgf_SRCS}
-                              ${pgfutils_SRCS}
-    )
- 
-@@ -240,6 +236,7 @@
-                       ${QT_QTCORE_LIBRARY}
-                       ${QT_QTGUI_LIBRARY}
-                       ${QT_QTSQL_LIBRARY}
-+		      ${PGF_LIBRARIES}
-                      )
- 
- SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSION 1 )
-diff -ruN old/libs/CMakeLists.txt new/libs/CMakeLists.txt
---- old/libs/CMakeLists.txt	2010-03-28 19:19:02.000000000 -0300
-+++ new/libs/CMakeLists.txt	2010-03-30 14:03:07.365604017 -0300
-@@ -18,6 +18,7 @@
-                      ${JPEG_INCLUDE_DIR}
-                      ${TIFF_INCLUDE_DIR}
-                      ${PNG_INCLUDE_DIR}
-+                     ${PGF_INCLUDE_DIRS}
-                      ${JASPER_INCLUDE_DIR}
-                    )
- ADD_SUBDIRECTORY( histogram )