Added missing dependency on doxygen; removed old version

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

7 files changed, 30 insertions, 479 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index e9342e755b41..f98898283e42 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.162 2010/10/26 19:14:54 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.163 2010/10/28 19:18:16 dilfridge Exp $
+
+  28 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
+  digikam-1.2.0-r3.ebuild, -files/digikam-1.3.0-pgf.patch,
+  -digikam-1.4.0-r1.ebuild, -files/digikam-1.4.0-clapack.patch,
+  digikam-1.5.0.ebuild:
+  Added missing dependency on doxygen; removed old version
 
   26 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
   digikam-1.5.0.ebuild:
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 0f3bb333fdbd..48c52b1f4691 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -7,36 +7,32 @@ AUX digikam-1.2.0-docs-r3.patch 1926 RMD160 963f134c1bdb2e6b1a59b82efb7009733294
 AUX digikam-1.2.0-lapack.patch 6429 RMD160 e42b9600822fbd28b31c751fe6515a691db4cb0b SHA1 a495d7734c355419e4cba629354e4e9077f15782 SHA256 02169ca57f86f3f7d40dced07b7c54f612bd8fe3b03d2a5808184c47b5b360c0
 AUX digikam-1.2.0-libpgf-r3.patch 6824 RMD160 cf771745da65673a6783a3ed9d6d2a0e74c69923 SHA1 857589931a4c2acefcc822b664dd02ce324ea152 SHA256 0424234746611e2b75b74725e53705277308fc3596ac095013de985cc6a01622
 AUX digikam-1.2.0-ratingwidget.patch 413 RMD160 b7e86997019fa16590a565b8e18fb43c287c7e88 SHA1 aa90381903000f28c105677e12f4b6813363659a SHA256 48cf828b847cd4346b9f5512fa1a010565680d31996bf2492c7bf256caf04231
-AUX digikam-1.3.0-pgf.patch 6006 RMD160 bfda7c95a633f4967935545f66d850fd94db9566 SHA1 43295130d7a62dc27097ed9730b3b47e13f2ab3f SHA256 84c219c7238790288b90acdb255bce2e40e3c5f19476885a2d456698e2f57205
-AUX digikam-1.4.0-clapack.patch 7429 RMD160 a10cf8ff044e42cfbb3880ed543b3df0221655e6 SHA1 7cd6461ff474503124a3116b8dfd8bb264c5afb6 SHA256 1e2f1d11a612f1cff63acc46db5e5818a438d35d5aaef5b40ea6633b1f4b079e
 AUX digikam-1.4.0-docs.patch 1953 RMD160 c90ab96aea6e08bca963a22bee5f7868de22a708 SHA1 dbdb4ff0d4697006a12b18be1b5cf5f903b3cb70 SHA256 d4f439b2b6d86833b82c0101ed1f34cd1fc8611a4917db8ca4611437757cdce6
 AUX digikam-1.5.0-unbundle.patch 11772 RMD160 a593a67bd5d1ea02f695dc51f6240917e4f7ccdc SHA1 b989dc93f5949b1d313234d28b24b4e024d82861 SHA256 28320a7d1beb3ad8caf7fd011a93ab3f6835191183477c673c2f27662417d8ad
 DIST digikam-1.1.0-libjpeg-8a.patch.bz2 14552 RMD160 8ecf249a0e4db45ccd13b7013b543483cb1a7af5 SHA1 137402f1727f8fcb76f38c33ad1ba0ae036e298e SHA256 c728940524ef7089c842319134aa3346de154e546f8dbf5f2b9d3a7096c33456
 DIST digikam-1.1.0.tar.bz2 15385611 RMD160 a4bd749adf24be7cd349e7be464cf22018d21eca SHA1 5ee482ff209c0a29b898e57278d62c428b743ba5 SHA256 6d26921e83bdb85342a0455df919f33bc2f23533c96e9293e80cd79ff92bfa8f
 DIST digikam-1.2.0.tar.bz2 13970098 RMD160 f8177241536b2f099499977d9c3cbd2dc9880853 SHA1 7f12caf737a05043c7a9a5291a448684e5a4e2e6 SHA256 930539b5bb53af345f4bef3d06c7121c22af3dbd7ae7b338fa3d173a6a631206
-DIST digikam-1.4.0.tar.bz2 14907229 RMD160 a78656044bcc42f21794c1c4a25dcaaf869df38d SHA1 a3370f2d2c469fa5b90966bb0141b5a8956c71df SHA256 d37afaad8808f78ecda93d7498c64b72eee3bb61911fbeff87d3a528a7247eba
 DIST digikam-1.5.0.tar.bz2 14131989 RMD160 2c881e8e48acccd45bb42e4f6021844c9518e528 SHA1 8cf1ba55092dbf4c64cd8b2521b4bb3ab00effe8 SHA256 5f6d2df1fc22c45c065754e43c03286fcf94145683fdb0c50f4c702546e07fef
 DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
 EBUILD digikam-1.1.0-r1.ebuild 2145 RMD160 8ac789bca92424a4e138b5f8d5f02445bdf43532 SHA1 0cb45162c3686b51414d6e109f721834a5adb496 SHA256 a18f53845b79ada790e740ef7f638a24cf179cf8cfd82a92adccd8694baff608
-EBUILD digikam-1.2.0-r3.ebuild 3200 RMD160 925d574a91b6734ae697001b6bc48516fe60141d SHA1 839b1dd6eb7e8bbb96d6456c6571c115cb1e8c22 SHA256 7a2426d63b4c481b262f00333735c8857dc4195aee6524cd173dfb2560763cb3
-EBUILD digikam-1.4.0-r1.ebuild 3199 RMD160 a1ce94d6113d6f081d26f90c6237f7ab5b77caed SHA1 5db566725a35c4502daa2716982e7ba12482c0a9 SHA256 e82636ed9b1a8d0e9bfb68b560cc14e7a66d5af3b64296ab8fd491d69185ce01
-EBUILD digikam-1.5.0.ebuild 3205 RMD160 6d26b7e319c77be682aae54b6fd0d13f2ede7671 SHA1 f7092fdbc85baad9eddbf9d8e4241d4b119e39c3 SHA256 f64e717fbe9b52a2f0780baa16026e609846b6efce48c4a001979af0450d7eb2
-MISC ChangeLog 27123 RMD160 157daa89e2bda69ab54edcb7d0726542a7c84839 SHA1 76cf6ae6f99b3ee585ddaafa1013ca983dbff9f7 SHA256 ba5fa9e2619e40f1d1679aebb4c24a39c9c6a5cb2a070c2d7f7d042e9802c3bf
+EBUILD digikam-1.2.0-r3.ebuild 3223 RMD160 99891d1ff5b1272b34553899d766d4cf6145503d SHA1 0fb3e86e38a5f3febd1d0b356ad5a192a744f58e SHA256 75c346a218e999ea85aef90280551d979ddeef786c90c92bcf10b559cf581ecc
+EBUILD digikam-1.5.0.ebuild 3231 RMD160 6fc03312ffab710578f21a506e6591004b52c94d SHA1 f50f31c15b376121f537a7debd633fe1354cbb95 SHA256 2f0334b6721215a046e851426ad524255a041807a5019679895697bad530cb79
+MISC ChangeLog 27387 RMD160 6bbae339b5a7da256033cc8f60d20acf00f9ef11 SHA1 ccdfbf3da66d0cb1d7444e0a552b518afe9f2de2 SHA256 d8e84c7da4da3f3109954b77f6fdf12469fdd931ad9184c328cb57f2b24a4bd3
 MISC metadata.xml 691 RMD160 2e1c382d4682a65909cd2820a3b997a8e27f405f SHA1 42cfc8076bba5c72e6df4650694b9ddf1b5b5bb2 SHA256 ccc5ec872df963f90005d9f2330315b4c0fc3336890464cb1f3835908a381e61
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBAgAGBQJMxyi1AAoJENwGBM22xffeHc8QAKjb0wmFSBaVctyUdm+nGwg1
-9f9dzowbgTfT15UWhqf9z3o4t76uKiAXMK6+2uz7GQv9YwtdoHg88gmr26XSuR/Z
-s3Jm81DDAdAIj2vHIo2j38GIs1iXFcyPC6B7V/AHglCM+0eB6qrfZeRvICTCtl6A
-EEIWWw9HlsOj4sdDTxnjLd92p7nX+NorKm2Ra9Fz4QwwGRHbWYuPC9Jtm6WCxeUS
-jsiaWxOhElgNXQ4yuv8Eo7ic+fynHmEgK2QUvS++xRKOEYCRMb110b2fF0xQSAnL
-Uy2oqxaffXWSC6teTFKqefWebD9I5GPHvNQ5xvTdFCoftNjaVa3znT7k602VFBGP
-5F/KYpj9JNbA+JpV7n0jWTMU/2FiuRLmbvaI/yQ+KDW4z4TB3/Lb7Igkr2LBTt5i
-LHOXJW2TwtFvHGTMWGmCFAaaXjT8HcpAflvF+NODMILOcaT5D+KoaSXip6CMycl8
-4YW7g+X3t0R6N/pqQzH98TCZfADcOE+GPFFNtci6bjhXVQlwa0eYqyUuW9gJZNJh
-MEDSbsQyMUFXrcltyTatzMMQ9YCfMM0hhhoZvYXxsGivk1EfnHLyh+R7eUf97pOg
-gei/eEi20Kf7ExEHtHc5ObfnQ+kE2zYisy3dt45dRc9kOak1ecyHgOwUto+NKqqf
-1GVZKHTs3g8dGTNCtcXK
-=AfEc
+iQIcBAEBAgAGBQJMycxzAAoJENwGBM22xffexOMP/jUe7EgKTuM0xDzrdAmRsglQ
+Ioezq0zR1frecOhMsRbsG5aGKbZ85L6UJq2xfjXwtYNy3vaTyuPuT/dE6KE3M09y
+empv65vdU7uItTICNXab0SviyJkqjDmM6IsfSHPOhcENecF/cKI4NITuLPBbc7sb
+U6Ez+NOIQkaXz5aBI5OCwi3v25uRyvHd6MYkLq2ssnmOKrjigJj/kfu/m5QJTQq9
+rISO5UA1dv5KhneeQFvpKs8cSbDe+dl9PWJKLsfH0WwI8hVhvtJx7iBAalw/9oXK
+T8di3G5coTNK7LEEiY79ubMUiT59bIFUr5ImKFsSDPaKvS2uzWDQBvtvhP1XV/ED
+j/5zAjrNTOnbQwohLnKJFH2biD6Fo49u4IaHZSoDnvtC0VQvs0R+cx+TN9ntuQq5
+XtDZ2BFhzraQ16cascYoENkw8J+NBMygDC+x6rBxt9XQbrd8V/+xnyUViLCqncIG
+GmVtFFteQGw9qGJLQqoSY33QsplLwcp4/z3h6182XXBJbPE/4JXY2sxl9PqEJqow
+9mVf6C+NxlejAXuNjC5PlZYgZQk/rAtVFRc39xjTf6eTDNJ+M4Al/syYMVq379iV
+G9GBs82nnP26xbQa31AMbkFO2OyjlL5LfCABDOMBYsdRnx7brhtqR8grb2sixmqg
+hkoky7R43mXnCS442SDY
+=iq1J
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-1.2.0-r3.ebuild b/media-gfx/digikam/digikam-1.2.0-r3.ebuild
index 23bfd9d80c33..cbd2f79f4c76 100644
--- a/media-gfx/digikam/digikam-1.2.0-r3.ebuild
+++ b/media-gfx/digikam/digikam-1.2.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.2.0-r3.ebuild,v 1.2 2010/10/22 00:07:34 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.2.0-r3.ebuild,v 1.3 2010/10/28 19:18:16 dilfridge Exp $
 
 EAPI="2"
 
@@ -58,7 +58,10 @@ RDEPEND="${CDEPEND}
 DEPEND="${CDEPEND}
 	sys-devel/gcc[fortran]
 	sys-devel/gettext
-	doc? ( virtual/latex-base )
+	doc? (
+		app-doc/doxygen
+		virtual/latex-base
+		)
 "
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-gfx/digikam/digikam-1.4.0-r1.ebuild b/media-gfx/digikam/digikam-1.4.0-r1.ebuild
deleted file mode 100644
index cf6d4c7d8f12..000000000000
--- a/media-gfx/digikam/digikam-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.4.0-r1.ebuild,v 1.1 2010/09/25 14:52:35 dilfridge Exp $
-
-EAPI="2"
-
-KDE_LINGUAS="ar be bg ca 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 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"
-
-CMAKE_MIN_VERSION=2.8
-
-# 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-${PV}.tar.bz2 )"
-
-LICENSE="GPL-2
-	handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="addressbook debug doc geolocation gphoto2 handbook lensfun semantic-desktop themedesigner +thumbnails video"
-
-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
-	>=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
-	>=sci-libs/clapack-3.2.1-r3
-	virtual/mysql
-	x11-libs/qt-gui[qt3support]
-	x11-libs/qt-sql[mysql,sqlite]
-	addressbook? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
-	geolocation? ( >=kde-base/marble-${KDE_MINIMAL} )
-	gphoto2? ( media-libs/libgphoto2 )
-	lensfun? ( media-libs/lensfun )
-"
-RDEPEND="${CDEPEND}
-	>=kde-base/kreadconfig-${KDE_MINIMAL}
-	video? (
-		|| (
-			>=kde-base/mplayerthumbs-${KDE_MINIMAL}
-			>=kde-base/ffmpegthumbs-${KDE_MINIMAL}
-		)
-	)
-"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${P}"-docs.patch "${FILESDIR}/${PN}"-1.3.0-pgf.patch "${FILESDIR}/${P}"-clapack.patch)
-
-src_prepare() {
-	mkdir -p doc
-	[ -f doc/CMakeLists.txt ] || ( echo > doc/CMakeLists.txt )
-
-	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
-		-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 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
-}
-
-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/digikam-1.5.0.ebuild b/media-gfx/digikam/digikam-1.5.0.ebuild
index 23ce1a26fb60..7451a1f9adad 100644
--- a/media-gfx/digikam/digikam-1.5.0.ebuild
+++ b/media-gfx/digikam/digikam-1.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.5.0.ebuild,v 1.2 2010/10/26 19:14:54 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.5.0.ebuild,v 1.3 2010/10/28 19:18:16 dilfridge Exp $
 
 EAPI="2"
 
@@ -61,6 +61,7 @@ RDEPEND="${CDEPEND}
 "
 DEPEND="${CDEPEND}
 	sys-devel/gettext
+	doc? ( app-doc/doxygen )
 "
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-gfx/digikam/files/digikam-1.3.0-pgf.patch b/media-gfx/digikam/files/digikam-1.3.0-pgf.patch
deleted file mode 100644
index c965a8449d73..000000000000
--- a/media-gfx/digikam/files/digikam-1.3.0-pgf.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-diff -u -r -N digikam-1.3.0-1-docs/CMakeLists.txt digikam-1.3.0/CMakeLists.txt
---- digikam-1.3.0-1-docs/CMakeLists.txt	2010-08-26 23:24:35.000000000 +0200
-+++ digikam-1.3.0/CMakeLists.txt	2010-08-26 23:44:46.000000000 +0200
-@@ -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
-@@ -133,6 +136,7 @@
- FIND_PACKAGE(JPEG)
- FIND_PACKAGE(PNG)
- FIND_PACKAGE(TIFF)
-+FIND_PACKAGE(PGF)
- FIND_PACKAGE(Jasper)
- FIND_PACKAGE(Kdcraw)
- FIND_PACKAGE(Kexiv2)
-@@ -267,6 +271,13 @@
- PRINT_LIBRARY_STATUS("libkexiv2" "http://www.digikam.org/sharedlibs" " (version >= 1.1.0)" KEXIV2_FOR_DIGIKAM)
- PRINT_LIBRARY_STATUS("libkdcraw" "http://www.digikam.org/sharedlibs" " (version >= 1.1.0)" KDCRAW_FOR_DIGIKAM)
- 
-+IF(PGF_FOUND)
-+    MESSAGE(STATUS " libpgf library found..................... YES (optional)")
-+ELSE(PGF_FOUND)
-+    MESSAGE(STATUS " libpgf library found..................... NO  (optional - internal version used instead)")
-+ENDIF(GPHOTO2_FOUND)
-+
-+
- # ================================================================
- 
- IF(GPHOTO2_FOUND)
-@@ -1018,14 +1029,18 @@
-         ${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
-+    IF(PGF_FOUND)
-+       INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS})
-+    ELSE(PGF_FOUND)
-+       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
-        )
-+    ENDIF(PGF_FOUND)
- 
-     SET(libsqlite2_SRCS
-         ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/attach.c
-diff -u -r -N digikam-1.3.0-1-docs/cmake/modules/FindPGF.cmake digikam-1.3.0/cmake/modules/FindPGF.cmake
---- digikam-1.3.0-1-docs/cmake/modules/FindPGF.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ digikam-1.3.0/cmake/modules/FindPGF.cmake	2010-08-26 23:25:18.000000000 +0200
-@@ -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 -u -r -N digikam-1.3.0-1-docs/digikam/CMakeLists.txt digikam-1.3.0/digikam/CMakeLists.txt
---- digikam-1.3.0-1-docs/digikam/CMakeLists.txt	2010-06-07 23:16:45.000000000 +0200
-+++ digikam-1.3.0/digikam/CMakeLists.txt	2010-08-26 23:39:47.000000000 +0200
-@@ -53,7 +53,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
-@@ -94,6 +93,12 @@
-                      ${TIFF_INCLUDE_DIR}
-                    )
- 
-+IF(PGF_FOUND)
-+   INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS})
-+ELSE(PGF_FOUND)
-+   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/libpgf)
-+ENDIF(PGF_FOUND)
-+
- IF(LENSFUN_LIBRARY)
-    INCLUDE_DIRECTORIES(${LENSFUN_INCLUDE_DIR})
- ENDIF(LENSFUN_LIBRARY)
-@@ -103,8 +108,10 @@
- # 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")
-+IF(NOT PGF_FOUND)
-+   # Disable libpgf warnings.
-+   SET_SOURCE_FILES_PROPERTIES(${libpgf_SRCS} PROPERTIES COMPILE_FLAGS "-w")
-+ENDIF(NOT PGF_FOUND)
- 
- # Disable liblqr C code warnings.
- SET_SOURCE_FILES_PROPERTIES(${liblqr_SRCS} PROPERTIES COMPILE_FLAGS "-w")
-@@ -188,6 +195,10 @@
-                       ${KIPI_LIBRARIES}
-               )
- 
-+IF(PGF_FOUND)
-+   TARGET_LINK_LIBRARIES(digikamcore ${PGF_LIBRARIES})
-+ENDIF(PGF_FOUND)
-+
- IF(MARBLEWIDGET_FOUND)
-     TARGET_LINK_LIBRARIES(digikamcore ${LIBMARBLEWIDGET_LIBRARY})
- ENDIF(MARBLEWIDGET_FOUND)
-@@ -246,6 +257,10 @@
-                       ${QT_QTSQL_LIBRARY}
-                      )
- 
-+IF(PGF_FOUND)
-+   TARGET_LINK_LIBRARIES(digikamdatabase ${PGF_LIBRARIES})
-+ENDIF(PGF_FOUND)
-+
- SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSION 1 )
- INSTALL(TARGETS digikamdatabase ${INSTALL_TARGETS_DEFAULT_ARGS} )
- 
-diff -u -r -N digikam-1.3.0-1-docs/libs/CMakeLists.txt digikam-1.3.0/libs/CMakeLists.txt
---- digikam-1.3.0-1-docs/libs/CMakeLists.txt	2010-06-07 23:16:40.000000000 +0200
-+++ digikam-1.3.0/libs/CMakeLists.txt	2010-08-26 23:43:35.000000000 +0200
-@@ -21,6 +21,10 @@
-                      ${JASPER_INCLUDE_DIR}
-                    )
- 
-+IF(PGF_FOUND)
-+   INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS})
-+ENDIF(PGF_FOUND)
-+
- ADD_SUBDIRECTORY( histogram )
- ADD_SUBDIRECTORY( dmetadata )
- ADD_SUBDIRECTORY( dimg )
diff --git a/media-gfx/digikam/files/digikam-1.4.0-clapack.patch b/media-gfx/digikam/files/digikam-1.4.0-clapack.patch
deleted file mode 100644
index 2fb1f5eae2a3..000000000000
--- a/media-gfx/digikam/files/digikam-1.4.0-clapack.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-diff -r -u -N digikam-1.4.0.1pgf/CMakeLists.txt digikam-1.4.0/CMakeLists.txt
---- digikam-1.4.0.1pgf/CMakeLists.txt	2010-08-31 23:39:20.000000000 +0200
-+++ digikam-1.4.0/CMakeLists.txt	2010-08-31 23:39:47.000000000 +0200
-@@ -141,6 +141,7 @@
- FIND_PACKAGE(Kdcraw)
- FIND_PACKAGE(Kexiv2)
- FIND_PACKAGE(Kipi)
-+FIND_PACKAGE(CLAPACK)
- 
- # Extract version of libjpeg so that we can use the appropriate dir
- # See bug #227313, #228483
-@@ -278,7 +279,13 @@
-     MESSAGE(STATUS " libpgf library found..................... YES (optional)")
- ELSE(PGF_FOUND)
-     MESSAGE(STATUS " libpgf library found..................... NO  (optional - internal version used instead)")
--ENDIF(GPHOTO2_FOUND)
-+ENDIF(PGF_FOUND)
-+
-+IF(CLAPACK_FOUND)
-+    MESSAGE(STATUS " libclapack library found................. YES (optional)")
-+ELSE(CLAPACK_FOUND)
-+    MESSAGE(STATUS " libclapack library found................. NO  (optional - internal version used instead)")
-+ENDIF(CLAPACK_FOUND)
- 
- 
- # ================================================================
-@@ -377,13 +384,19 @@
- ENDIF(DOXYGEN_FOUND)
- 
- IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND)
--    MESSAGE(STATUS " digiKam will be compiled................. YES")
-+    MESSAGE(STATUS " digiKam can 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_FOR_DIGIKAM 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_FOR_DIGIKAM AND KIPI_FOUND)
- 
-+IF(DIGIKAM_CAN_BE_COMPILED AND FORCED_UNBUNDLE AND ((NOT PGF_FOUND) OR (NOT CLAPACK_FOUND)))
-+    MESSAGE(STATUS "")
-+    MESSAGE(FATAL_ERROR " BUNDLED LIBRARIES HAVE BEEN FORCE-DISABLED IN THIS BUILD. Aborting.")
-+    SET(DIGIKAM_CAN_BE_COMPILED false)
-+ENDIF(DIGIKAM_CAN_BE_COMPILED AND FORCED_UNBUNDLE AND ((NOT PGF_FOUND) OR (NOT CLAPACK_FOUND)))
-+
- MESSAGE(STATUS "----------------------------------------------------------------------------------")
- MESSAGE(STATUS "")
- 
-@@ -541,7 +554,8 @@
-         ${CMAKE_CURRENT_SOURCE_DIR}/libs/dimg/loaders/pgfsettings.cpp
-        )
- 
--    SET(libclapack_SRCS
-+    if(NOT CLAPACK_FOUND)
-+      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
-@@ -574,6 +588,7 @@
-         ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/util.c
-         ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/xerbla.c
-        )
-+    endif(NOT CLAPACK_FOUND)
- 
-     SET(libdimgfilters_SRCS
-         ${libclapack_SRCS}
-diff -r -u -N digikam-1.4.0.1pgf/cmake/modules/FindCLAPACK.cmake digikam-1.4.0/cmake/modules/FindCLAPACK.cmake
---- digikam-1.4.0.1pgf/cmake/modules/FindCLAPACK.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ digikam-1.4.0/cmake/modules/FindCLAPACK.cmake	2010-08-31 23:43:20.000000000 +0200
-@@ -0,0 +1,44 @@
-+# - Try to find clapack library
-+# Once done this will define
-+#
-+#  CLAPACK_FOUND - system has CLAPACK library
-+#  CLAPACK_INCLUDE_DIR - the CLAPACK include directory
-+#  CLAPACK_LIBRARY - the marblewidget library
-+#
-+#  copyright 2008 by Patrick Spendrin <ps_ml@gmx.de>
-+#  copyright 2010 by Andreas K. Huettel <mail@akhuettel.de>
-+#  use this file as you like
-+#
-+
-+if(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY)
-+
-+  # Already in cache
-+  set(CLAPACK_FOUND TRUE)
-+
-+else(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY)
-+
-+  find_path(CLAPACK_INCLUDE_DIR clapack.h PATHS /usr/include/clapack NO_DEFAULT_PATH)
-+  if(CLAPACK_INCLUDE_DIR)
-+     message(STATUS "Found clapack includes: ${CLAPACK_INCLUDE_DIR}")
-+  else(CLAPACK_INCLUDE_DIR)
-+     find_path(CLAPACK_INCLUDE_DIR clapack.h PATHS /usr/include/clapack)
-+     if(CLAPACK_INCLUDE_DIR)
-+        message(STATUS "Found clapack includes: ${CLAPACK_INCLUDE_DIR}")
-+     endif(CLAPACK_INCLUDE_DIR)
-+  endif(CLAPACK_INCLUDE_DIR)
-+
-+  find_library(CLAPACK_LIBRARY clapack)
-+  if(CLAPACK_LIBRARY)
-+      message(STATUS "Found clapack library: ${CLAPACK_LIBRARY}")
-+  endif(CLAPACK_LIBRARY)
-+
-+  if(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY)
-+    set(CLAPACK_FOUND TRUE)
-+  endif(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY)
-+
-+  if(NOT CLAPACK_FOUND)
-+      message(STATUS "Could NOT find any working clapack installation")
-+  endif(NOT CLAPACK_FOUND)
-+
-+  mark_as_advanced(CLAPACK_INCLUDE_DIR CLAPACK_LIBRARY)
-+endif(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY)
-diff -r -u -N digikam-1.4.0.1pgf/digikam/CMakeLists.txt digikam-1.4.0/digikam/CMakeLists.txt
---- digikam-1.4.0.1pgf/digikam/CMakeLists.txt	2010-08-31 23:39:20.000000000 +0200
-+++ digikam-1.4.0/digikam/CMakeLists.txt	2010-08-31 23:39:47.000000000 +0200
-@@ -53,7 +53,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/clapack
-                      ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/cimg
-                      ${CMAKE_CURRENT_SOURCE_DIR}/../libs/themeengine
-                      ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/kipiiface
-@@ -103,10 +102,18 @@
-    INCLUDE_DIRECTORIES(${LENSFUN_INCLUDE_DIR})
- ENDIF(LENSFUN_LIBRARY)
- 
-+IF(CLAPACK_FOUND)
-+   INCLUDE_DIRECTORIES(${CLAPACK_INCLUDE_DIR})
-+ELSE(CLAPACK_FOUND)
-+   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/clapack)
-+ENDIF(CLAPACK_FOUND)
-+
- # Shared libdigikamcore ################################################################
- 
--# Disable Clapack C code warnings.
--SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS "-w")
-+IF(NOT CLAPACK_FOUND)
-+   # Disable Clapack C code warnings.
-+   SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS "-w")
-+ENDIF(NOT CLAPACK_FOUND)
- 
- IF(NOT PGF_FOUND)
-    # Disable libpgf warnings.
-@@ -203,6 +210,10 @@
-     TARGET_LINK_LIBRARIES(digikamcore ${LIBMARBLEWIDGET_LIBRARY})
- ENDIF(MARBLEWIDGET_FOUND)
- 
-+IF(CLAPACK_FOUND)
-+   TARGET_LINK_LIBRARIES(digikamcore ${CLAPACK_LIBRARY})
-+ENDIF(CLAPACK_FOUND)
-+
- IF(Q_WS_X11)
-     TARGET_LINK_LIBRARIES(digikamcore ${X11_LIBRARIES})
- ENDIF(Q_WS_X11)
-@@ -359,6 +370,10 @@
-   TARGET_LINK_LIBRARIES(digikam ${LIBMARBLEWIDGET_LIBRARY})
- ENDIF(MARBLEWIDGET_FOUND)
- 
-+IF(CLAPACK_FOUND)
-+   TARGET_LINK_LIBRARIES(digikam ${CLAPACK_LIBRARY})
-+ENDIF(CLAPACK_FOUND)
-+
- INSTALL(TARGETS digikam ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
- # Others Files to install #######################################################
-diff -r -u -N digikam-1.4.0.1pgf/showfoto/CMakeLists.txt digikam-1.4.0/showfoto/CMakeLists.txt
---- digikam-1.4.0.1pgf/showfoto/CMakeLists.txt	2010-08-22 10:53:39.000000000 +0200
-+++ digikam-1.4.0/showfoto/CMakeLists.txt	2010-08-31 23:39:47.000000000 +0200
-@@ -65,6 +65,10 @@
- 
- KDE4_ADD_EXECUTABLE(showfoto ${showfoto_SRCS})
- 
-+IF(CLAPACK_FOUND)
-+   TARGET_LINK_LIBRARIES(showfoto ${CLAPACK_LIBRARY})
-+ENDIF(CLAPACK_FOUND)
-+
- TARGET_LINK_LIBRARIES(showfoto
-                       digikamcore
-                       ${KEXIV2_LIBRARIES}