* [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
@ 2011-07-04 13:04 Andreas Hüttel
0 siblings, 0 replies; 13+ messages in thread
From: Andreas Hüttel @ 2011-07-04 13:04 UTC (permalink / raw
To: gentoo-commits
commit: 61ac1bbe587909f97a51d270d318d0e5cbdd367d
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 4 13:04:08 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Jul 4 13:04:08 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=61ac1bbe
Add build fix for offical new libpgf
(Portage version: 2.1.10.3/git/Linux x86_64, unsigned Manifest commit)
---
media-gfx/digikam/ChangeLog | 4 +
media-gfx/digikam/Manifest | 5 +-
media-gfx/digikam/digikam-2.0.0_rc.ebuild | 5 +-
.../digikam/files/digikam-2.0.0_officialpgf.patch | 71 ++++++++++++++++++++
4 files changed, 82 insertions(+), 3 deletions(-)
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 982e979..e8f4e7a 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 04 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ digikam-2.0.0_rc.ebuild, +files/digikam-2.0.0_officialpgf.patch:
+ Add build fix for offical new libpgf
+
03 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
digikam-2.0.0_rc.ebuild, +files/digikam-2.0.0_rc-oldpgf.patch:
Add build fix for older libpgf
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 80be244..460cf2a 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -20,6 +20,7 @@ AUX digikam-1.9.0-turbo.patch 2265 RMD160 ecff0e0fa2ba6d51cdb6ec5bb90b41c3ed7310
AUX digikam-2.0.0_beta1-docs.patch 1361 RMD160 3b98a59e9790a7bc12dc5ec4723860d2cc968c4b SHA1 63d6d8c23126a198b91a56528cdfd97559f1f398 SHA256 dc8bf8aa8c6f956a5afd60bc0bc526872ed7b7604a3e1b8acb1613c947a5c97c
AUX digikam-2.0.0_beta4-docs.patch 1361 RMD160 0a68569608e99781708b5c242c90e0df6808a655 SHA1 d33c4ca548bd3f605d992ea32f287212ef68bd77 SHA256 9902322da1310bcf728d8172d5bbd53f7080555bfdd629dbe0eba069d9eec8ac
AUX digikam-2.0.0_beta5-docs.patch 1364 RMD160 e7e618d7ae5939328d43e1b41e11f6b4eb2f4821 SHA1 ff5519b3ee8cf19e091c1ac1b38817485921b7d2 SHA256 4113cc07a61d22a727f73fed917eb4ae82493f700673daf58acfcce455914964
+AUX digikam-2.0.0_officialpgf.patch 2538 RMD160 5939068015c2923dd0bbbe033ed1eda96d7972ee SHA1 4bcf25368d63bdf06bfa3a8d140832404e874755 SHA256 40f01b857e1bb68545f554ea01e0685fab390bbb3912cb3d233fd70ddef3c60e
AUX digikam-2.0.0_rc-oldpgf.patch 866 RMD160 36d94d476bdd02647fe4071b6ca2d9d09c851282 SHA1 3c49b420987df7db854a6a426daa848c42a36f3c SHA256 11389b36e669ae65522f439672d0409963f86eba0d2f439402311e67650dc89c
DIST digikam-1.8.0.tar.bz2 23376636 RMD160 aa86cae8048a8f7122285c5e27aaa59e5dbcc47c SHA1 65430990896b56b7ec76b9a6bc5f8472145f44fd SHA256 210de9d949265e910c65c9ab8b19efab13839f6a2ef761a5915d267ddfe494aa
DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5
@@ -32,6 +33,6 @@ EBUILD digikam-1.9.0-r1.ebuild 3299 RMD160 c4f0ffdc7d1bb89581c721a4a85310e7ca4b7
EBUILD digikam-1.9.0.ebuild 3242 RMD160 04df3e2432a19d01a07851d8a8a3821279aa4af0 SHA1 c80b1939a52ab7aa7c0032373022f3cb931fee81 SHA256 e5bc2256f812d90206d99b3ec6f6ffbad75e5dd0bbcccaa8e349e894eef73d53
EBUILD digikam-2.0.0_beta5.ebuild 3245 RMD160 cc3e08c7da4a3bd909edb43f6b33ad3aff64b762 SHA1 a8501a880d6cc3c9e22153fc8288908de09c1d2a SHA256 8b5dfd0865866bb01fcfe6d5055b798194ea6e3dfefa29821dac73dd997643bf
EBUILD digikam-2.0.0_beta6.ebuild 3226 RMD160 939ed0020e35608d4140e73b40f9266093c0e2a8 SHA1 6baad3fab16f5f406295f7e7e084e67e9c233e48 SHA256 b6ee9123131a9b97c984d7bfc05a9b69ce644083499702c0c18d394c5854ba75
-EBUILD digikam-2.0.0_rc.ebuild 3262 RMD160 3322eaaab51467d8040ea0defb30054272813f0f SHA1 58ffd139cb2bdfbd8e9ee93b56b68647690148a7 SHA256 e0c4ce7b8b1b6cfb95d9dd87524dd0cf8b5d2a0f702a19809f552ba30c1fe48f
-MISC ChangeLog 11160 RMD160 b2233957c17b7751ffbaf55559e446565faec4af SHA1 83d381318f2a160e7aa2bdb56cd4ef6e08f07358 SHA256 a8e97992395a60bdc35dc875134e08e867bd66840bed70f68a590cd0aba3859e
+EBUILD digikam-2.0.0_rc.ebuild 3311 RMD160 970164e604eb863f38851cfbf815c429a74b11ea SHA1 b36d9e465f17b5f30f5826fc6f4614ad3a22e188 SHA256 9194485f3a2c0b984d89b8580d8f3c45f372be0f300f898bf0d95517b5bcaaf5
+MISC ChangeLog 11324 RMD160 c854d1088c5dfa2af0484ec190d3b5149b40dcf2 SHA1 1174b45878aa769762599d9c56f2a8c1a282236a SHA256 23e512e42afa379426421c3c88ff7004e13b98c61722017ba06add358dba50fe
MISC metadata.xml 553 RMD160 7de4b2dc583e17cfab08965015c5bb6291b968d8 SHA1 c7eecc86fd6539448bc2a8296f77c2bc4796e3a1 SHA256 f3280886ea9f988ca1315148380f1c89c6c042d0bc511105f3b2c3a926e17b80
diff --git a/media-gfx/digikam/digikam-2.0.0_rc.ebuild b/media-gfx/digikam/digikam-2.0.0_rc.ebuild
index 2eaba0e..378d391 100644
--- a/media-gfx/digikam/digikam-2.0.0_rc.ebuild
+++ b/media-gfx/digikam/digikam-2.0.0_rc.ebuild
@@ -68,7 +68,10 @@ DEPEND="${CDEPEND}
doc? ( app-doc/doxygen )
"
-PATCHES=( "${FILESDIR}/${PN}-2.0.0_rc-oldpgf.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-2.0.0_rc-oldpgf.patch"
+ "${FILESDIR}/${PN}-2.0.0_rc-officialpgf.patch"
+)
S="${WORKDIR}/${MY_P}/core"
diff --git a/media-gfx/digikam/files/digikam-2.0.0_officialpgf.patch b/media-gfx/digikam/files/digikam-2.0.0_officialpgf.patch
new file mode 100644
index 0000000..80d46b7
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-2.0.0_officialpgf.patch
@@ -0,0 +1,71 @@
+commit abd03787b7b1e3a392803edc5b40dfb25a69423c
+Author: Gilles Caulier <caulier.gilles@gmail.com>
+Date: Mon Jul 4 13:54:40 2011 +0200
+
+ compile with last offcial libpgf
+ CCBUGS: 276969
+
+diff --git a/cmake/modules/FindPGF.cmake b/cmake/modules/FindPGF.cmake
+index b6622c4..0c82a4e 100644
+--- a/cmake/modules/FindPGF.cmake
++++ b/cmake/modules/FindPGF.cmake
+@@ -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)
+@@ -14,11 +15,14 @@ IF(PKG_CONFIG_FOUND)
+
+ 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}")
++ 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 --git a/digikam/utils/config-digikam.h.cmake b/digikam/utils/config-digikam.h.cmake
+index 4ba293b..f881036 100644
+--- a/digikam/utils/config-digikam.h.cmake
++++ b/digikam/utils/config-digikam.h.cmake
+@@ -60,6 +60,8 @@
+ /* Define to 1 if we know how to start mysqld */
+ #cmakedefine HAVE_INTERNALMYSQL 1
+
++#define PGFCodecVersionID 0x${PGF_CODEC_VERSION_ID}
++
+ #define LIBEXEC_INSTALL_DIR "${LIBEXEC_INSTALL_DIR}"
+
+ /*
+diff --git a/libs/threadimageio/pgfutils.cpp b/libs/threadimageio/pgfutils.cpp
+index 758f12c..426a531 100644
+--- a/libs/threadimageio/pgfutils.cpp
++++ b/libs/threadimageio/pgfutils.cpp
+@@ -46,6 +46,7 @@ extern "C"
+ // LibPGF includes
+
+ #include "PGFimage.h"
++#include "config-digikam.h"
+
+ namespace Digikam
+ {
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
@ 2012-08-11 17:58 Andreas Hüttel
0 siblings, 0 replies; 13+ messages in thread
From: Andreas Hüttel @ 2012-08-11 17:58 UTC (permalink / raw
To: gentoo-commits
commit: e3df7b401b7097f820d05d7df7c023e16f9a9fb8
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sat Aug 11 18:00:05 2012 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Aug 11 18:00:05 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=e3df7b40
[media-gfx/digikam] Not needed anymore
---
media-gfx/digikam/Manifest | 2 -
media-gfx/digikam/digikam-2.5.0.ebuild | 156 --------------------
media-gfx/digikam/digikam-2.6.0_beta3.ebuild | 151 -------------------
.../digikam/files/digikam-2.5.0-boost148.patch | 74 ---------
.../digikam/files/digikam-2.5.0-libkipi.patch | 75 ----------
media-gfx/digikam/metadata.xml | 15 --
6 files changed, 0 insertions(+), 473 deletions(-)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
deleted file mode 100644
index b9d49f5..0000000
--- a/media-gfx/digikam/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST digikam-2.5.0.tar.bz2 54976375 SHA256 55292c79b41fd2c20ce0a821f388645436acb18b3b06b486747e17129114851a SHA512 e3d500e7719c059a425d77a09005906361fee8ea584002b172393e6156e0d79d5c59a2498e84329b5e42e92dda2850a76c636524392a113a489207b57d0b7ee7 WHIRLPOOL 8dfa904ab5cf2a7b082cd73ad8f02ffed2c72e2d3542b9994c29417a77ddd7a749d075475200ec1a5a3fa21262deac6a7f35503ab269e689eea37011a319b064
-DIST digikam-2.6.0-beta3.tar.bz2 55694232 SHA256 697ab7fdc0aff0a2a842df21608158f2abd1f7a4619cae9818749012267e6fec SHA512 ab820f20e0a405b524270825580d01d1658decd3387f23368b17f871984515a9a97b8b65414a707785de2c90b1db2e1fea1b00809a0c045f52df978a7b85a8fa WHIRLPOOL 3602a0307c02daddee6c7af198da3e2c9236a13aed2d3f7a2b477786991b4a011462ef97cd5e64fdf8ef76463425cb5a376b52da0a8a547a33b95081bda60141
diff --git a/media-gfx/digikam/digikam-2.5.0.ebuild b/media-gfx/digikam/digikam-2.5.0.ebuild
deleted file mode 100644
index 4ed93cc..0000000
--- a/media-gfx/digikam/digikam-2.5.0.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.5.0.ebuild,v 1.5 2012/04/04 19:30:58 ago Exp $
-
-EAPI=4
-
-KDE_LINGUAS="af 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 sr@Latn ss sv ta te tg th tr tt uk uz uz@cyrillic ven vi wa xh zh_CN zh_HK zh_TW zu"
-
-KDE_HANDBOOK="optional"
-CMAKE_MIN_VERSION="2.8"
-KDE_MINIMAL="4.7"
-
-KDE_DOC_DIRS="doc-digikam doc-showfoto"
-
-inherit kde4-base
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="Digital photo management application for KDE"
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2
- handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 ~x86"
-SLOT="4"
-IUSE="addressbook debug doc 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 marble plasma)
- $(add_kdebase_dep solid)
- media-libs/jasper
- media-libs/lcms:0
- >=media-libs/lensfun-0.2.5
- >=media-libs/libkface-${PV}
- >=media-libs/libkgeomap-${PV}
- media-libs/liblqr
- >=media-libs/libpgf-6.11.28
- media-libs/libpng
- media-libs/tiff
- virtual/jpeg
- x11-libs/qt-gui[qt3support]
- >=sci-libs/clapack-3.2.1-r6
- || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
- addressbook? ( $(add_kdebase_dep kdepimlibs) )
- gphoto2? ( media-libs/libgphoto2 )
- mysql? ( virtual/mysql )
-"
-RDEPEND="${CDEPEND}
- $(add_kdebase_dep kreadconfig)
- media-plugins/kipi-plugins
- video? (
- || (
- $(add_kdebase_dep mplayerthumbs)
- $(add_kdebase_dep ffmpegthumbs)
- )
- )
-"
-DEPEND="${CDEPEND}
- dev-libs/boost
- sys-devel/gettext
- doc? ( app-doc/doxygen )
-"
-
-S="${WORKDIR}/${MY_P}/core"
-
-RESTRICT=test
-# bug 366505
-
-PATCHES=(
- "${FILESDIR}/${P}-libkipi.patch"
- "${FILESDIR}/${P}-boost148.patch"
-)
-
-src_prepare() {
- # just to make absolutely sure
- rm -rf "${WORKDIR}/${MY_P}/extra" || die
-
- # prepare the handbook
- mkdir doc-digikam doc-showfoto || die
- echo "add_subdirectory( en )" > doc-digikam/CMakeLists.txt || die
- mv "${WORKDIR}/${MY_P}/doc/${PN}/digikam" doc-digikam/en || die
- echo "add_subdirectory( en )" > doc-showfoto/CMakeLists.txt || die
- mv "${WORKDIR}/${MY_P}/doc/${PN}/showfoto" doc-showfoto/en || die
- sed -i -e 's:../digikam/:../../doc-digikam/en/:g' doc-showfoto/en/index.docbook || die
-
- # prepare the translations
- mv "${WORKDIR}/${MY_P}/po" po || die
- find po -name "*.po" -and -not -name "digikam.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 || die
-
- kde4-base_src_prepare
-
- if use handbook; then
- echo "add_subdirectory( doc-digikam )" >> CMakeLists.txt
- echo "add_subdirectory( doc-showfoto )" >> CMakeLists.txt
- fi
-}
-
-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)
- -DWITH_MarbleWidget=ON
- $(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 INTERNALMYSQL)
- $(cmake-utils_use_enable debug DEBUG_MESSAGES)
- )
-
- kde4-base_src_configure
-}
-
-src_compile() {
- local mytargets="all"
- use doc && mytargets+=" doc"
-
- kde4-base_src_compile ${mytargets}
-}
-
-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/*
- 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-2.6.0_beta3.ebuild b/media-gfx/digikam/digikam-2.6.0_beta3.ebuild
deleted file mode 100644
index 9c75483..0000000
--- a/media-gfx/digikam/digikam-2.6.0_beta3.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.5.0.ebuild,v 1.5 2012/04/04 19:30:58 ago Exp $
-
-EAPI=4
-
-KDE_LINGUAS="af 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 sr@Latn ss sv ta te tg th tr tt uk uz uz@cyrillic ven vi wa xh zh_CN zh_HK zh_TW zu"
-
-KDE_HANDBOOK="optional"
-CMAKE_MIN_VERSION="2.8"
-KDE_MINIMAL="4.8"
-
-KDE_DOC_DIRS="doc-digikam doc-showfoto"
-
-inherit kde4-base
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="Digital photo management application for KDE"
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2
- handbook? ( FDL-1.2 )"
-KEYWORDS=""
-SLOT="4"
-IUSE="addressbook debug doc 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 marble plasma)
- $(add_kdebase_dep solid)
- media-libs/jasper
- media-libs/lcms:0
- >=media-libs/lensfun-0.2.5
- media-libs/libkface
- media-libs/libkgeomap
- media-libs/liblqr
- >=media-libs/libpgf-6.11.28
- media-libs/libpng
- media-libs/tiff
- virtual/jpeg
- x11-libs/qt-gui[qt3support]
- >=sci-libs/clapack-3.2.1-r6
- || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
- addressbook? ( $(add_kdebase_dep kdepimlibs) )
- gphoto2? ( media-libs/libgphoto2 )
- mysql? ( virtual/mysql )
-"
-RDEPEND="${CDEPEND}
- $(add_kdebase_dep kreadconfig)
- media-plugins/kipi-plugins
- video? (
- || (
- $(add_kdebase_dep mplayerthumbs)
- $(add_kdebase_dep ffmpegthumbs)
- )
- )
-"
-DEPEND="${CDEPEND}
- dev-libs/boost
- sys-devel/gettext
- doc? ( app-doc/doxygen )
-"
-
-S="${WORKDIR}/${MY_P}/core"
-
-RESTRICT=test
-# bug 366505
-
-src_prepare() {
- # just to make absolutely sure
- rm -rf "${WORKDIR}/${MY_P}/extra" || die
-
- # prepare the handbook
- mkdir doc-digikam doc-showfoto || die
- echo "add_subdirectory( en )" > doc-digikam/CMakeLists.txt || die
- mv "${WORKDIR}/${MY_P}/doc/${PN}/digikam" doc-digikam/en || die
- echo "add_subdirectory( en )" > doc-showfoto/CMakeLists.txt || die
- mv "${WORKDIR}/${MY_P}/doc/${PN}/showfoto" doc-showfoto/en || die
- sed -i -e 's:../digikam/:../../doc-digikam/en/:g' doc-showfoto/en/index.docbook || die
-
- # prepare the translations
- mv "${WORKDIR}/${MY_P}/po" po || die
- find po -name "*.po" -and -not -name "digikam.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 || die
-
- kde4-base_src_prepare
-
- if use handbook; then
- echo "add_subdirectory( doc-digikam )" >> CMakeLists.txt
- echo "add_subdirectory( doc-showfoto )" >> CMakeLists.txt
- fi
-}
-
-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)
- -DWITH_MarbleWidget=ON
- $(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 INTERNALMYSQL)
- $(cmake-utils_use_enable debug DEBUG_MESSAGES)
- )
-
- kde4-base_src_configure
-}
-
-src_compile() {
- local mytargets="all"
- use doc && mytargets+=" doc"
-
- kde4-base_src_compile ${mytargets}
-}
-
-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/*
- 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-2.5.0-boost148.patch b/media-gfx/digikam/files/digikam-2.5.0-boost148.patch
deleted file mode 100644
index 8119839..0000000
--- a/media-gfx/digikam/files/digikam-2.5.0-boost148.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-commit d18ea6da2d3e2359f4113e83c3fd40c18a29ddab
-Author: Gilles Caulier <caulier.gilles@gmail.com>
-Date: Fri Jan 6 11:23:48 2012 +0100
-
- Apply patch #67483 from Jeremiah Willcock to compile fine digiKam boost graph interface with libboost 1.48
- BUGS: 287772
- CCBUGS: 267777
-
-diff --git a/libs/database/imagehistory/imagehistorygraph_boost.h b/libs/database/imagehistory/imagehistorygraph_boost.h
-index 4017c4f..76c764a 100644
---- a/libs/database/imagehistory/imagehistorygraph_boost.h
-+++ b/libs/database/imagehistory/imagehistorygraph_boost.h
-@@ -1198,7 +1198,7 @@ protected:
- {
- boost::dag_shortest_paths(graph, v,
- // we provide a constant weight of 1
-- weight_map(boost::ref_property_map<edge_t,int>(weight)).
-+ weight_map(boost::ref_property_map<typename boost::graph_traits<GraphType>::edge_descriptor,int>(weight)).
- // Store distance and predecessors in QMaps, wrapped to serve as property maps
- distance_map(VertexIntMapAdaptor(distances)).
- predecessor_map(VertexVertexMapAdaptor(predecessors))
-@@ -1218,7 +1218,7 @@ protected:
- {
- boost::dag_shortest_paths(graph, v,
- // we provide a constant weight of 1
-- weight_map(boost::ref_property_map<edge_t,int>(weight)).
-+ weight_map(boost::ref_property_map<typename boost::graph_traits<GraphType>::edge_descriptor,int>(weight)).
- // Invert the default compare method: With greater, we get the longest path
- distance_compare(std::greater<int>()).
- // will be returned if a node is unreachable
-@@ -1384,14 +1384,15 @@ protected:
- template <class GraphType, typename VertexLessThan>
- class lessThanMapEdgeToTarget
- {
-+ typedef typename boost::graph_traits<GraphType>::edge_descriptor edge_descriptor;
- public:
- lessThanMapEdgeToTarget(const GraphType& g, VertexLessThan vertexLessThan)
- : g(g), vertexLessThan(vertexLessThan) {}
- const GraphType& g;
- VertexLessThan vertexLessThan;
-- bool operator()(const Edge& a, const Edge& b)
-+ bool operator()(const edge_descriptor& a, const edge_descriptor& b)
- {
-- return vertexLessThan(boost::target(a.toEdge(), g), boost::target(b.toEdge(), g));
-+ return vertexLessThan(boost::target(a, g), boost::target(b, g));
- }
- };
-
-@@ -1402,20 +1403,21 @@ protected:
- {
- typedef std::pair<Vertex, QList<Edge> > VertexInfo;
-
-- QList<Edge> outEdges;
-+ typedef typename boost::graph_traits<IncidenceGraph>::edge_descriptor edge_descriptor;
-+ QList<edge_descriptor> outEdges;
- std::vector<VertexInfo> stack;
-
- boost::put(color, u, boost::gray_color);
- vis.discover_vertex(u, g);
-
-- outEdges = toEdgeList(boost::out_edges(u, g));
-+ outEdges = toList<edge_descriptor>(boost::out_edges(u, g));
- // Sort edges. The lessThan we have takes vertices, so we use a lessThan which
- // maps the given edges to their targets, and calls our vertex lessThan.
- qSort(outEdges.begin(), outEdges.end(), lessThanMapEdgeToTarget<IncidenceGraph, LessThan>(g, lessThan));
-
-- foreach(const Edge& e, outEdges)
-+ foreach(const edge_descriptor& e, outEdges)
- {
-- Vertex v = boost::target(e.toEdge(), g);
-+ Vertex v = boost::target(e, g);
- vis.examine_edge(e, g);
- boost::default_color_type v_color = boost::get(color, v);
- if (v_color == boost::white_color)
diff --git a/media-gfx/digikam/files/digikam-2.5.0-libkipi.patch b/media-gfx/digikam/files/digikam-2.5.0-libkipi.patch
deleted file mode 100644
index fbbac97..0000000
--- a/media-gfx/digikam/files/digikam-2.5.0-libkipi.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 25cc9c9876a5233bd630105d0110319892d4e18c Mon Sep 17 00:00:00 2001
-From: Gilles Caulier <caulier.gilles@gmail.com>
-Date: Tue, 3 Jan 2012 15:16:37 +0100
-Subject: [PATCH] enable checkall and clearall buttons only with libkipi version 1.4.0
- BUGS: 290496
-
----
- utilities/setup/setupplugins.cpp | 13 +++++++++++--
- utilities/setup/setupplugins.h | 4 ++--
- 2 files changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/utilities/setup/setupplugins.cpp b/utilities/setup/setupplugins.cpp
-index 0f4030a..b8efb35 100644
---- a/utilities/setup/setupplugins.cpp
-+++ b/utilities/setup/setupplugins.cpp
-@@ -6,8 +6,8 @@
- * Date : 2004-01-02
- * Description : setup Kipi plugins tab.
- *
-- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
-- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
-+ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
-+ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
- *
- * This program is free software; you can redistribute it
- * and/or modify it under the terms of the GNU General
-@@ -100,6 +100,11 @@ SetupPlugins::SetupPlugins(QWidget* parent)
-
- panel->setLayout(mainLayout);
-
-+#if KIPI_VERSION < 0x010400
-+ d->checkAllBtn->setVisible(false);
-+ d->clearBtn->setVisible(false);
-+#endif
-+
- initPlugins();
-
- // --------------------------------------------------------
-@@ -158,14 +163,18 @@ void SetupPlugins::applyPlugins()
- void SetupPlugins::slotCheckAll()
- {
- QApplication::setOverrideCursor(Qt::WaitCursor);
-+#if KIPI_VERSION >= 0x010400
- d->kipiConfig->slotCheckAll();
-+#endif
- QApplication::restoreOverrideCursor();
- }
-
- void SetupPlugins::slotClear()
- {
- QApplication::setOverrideCursor(Qt::WaitCursor);
-+#if KIPI_VERSION >= 0x010400
- d->kipiConfig->slotClear();
-+#endif
- QApplication::restoreOverrideCursor();
- }
-
-diff --git a/utilities/setup/setupplugins.h b/utilities/setup/setupplugins.h
-index 271a569..114e0fa 100644
---- a/utilities/setup/setupplugins.h
-+++ b/utilities/setup/setupplugins.h
-@@ -6,8 +6,8 @@
- * Date : 2004-01-02
- * Description : setup Kipi plugins tab.
- *
-- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
-- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
-+ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
-+ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
- *
- * This program is free software; you can redistribute it
- * and/or modify it under the terms of the GNU General
---
-1.7.3.4
-
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
deleted file mode 100644
index 6764ab6..0000000
--- a/media-gfx/digikam/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd>
-<maintainer><email>dilfridge@gentoo.org</email></maintainer>
-<use>
- <flag name="addressbook">Add support for kdepim</flag>
- <flag name="themedesigner">Build the digikam theme designer</flag>
- <flag name="thumbnails">Enable thumbnails database support</flag>
- <flag name="video">Pull in mplayerthumbs to enable video thumbnails</flag>
- <flag name="linguas_ha">Hausa translation</flag>
- <flag name="linguas_mi">Maori translation</flag>
- <flag name="linguas_ven">Venda translation</flag>
-</use>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
@ 2012-04-08 15:40 Andreas Hüttel
0 siblings, 0 replies; 13+ messages in thread
From: Andreas Hüttel @ 2012-04-08 15:40 UTC (permalink / raw
To: gentoo-commits
commit: 5b8006052da2690448bb8286476d8a3a095b49cd
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sun Apr 8 14:57:57 2012 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Apr 8 14:57:57 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=5b800605
[media-gfx/digikam] Copied from main tree
(Portage version: 2.1.10.56/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key B6C5F7DE)
---
media-gfx/digikam/Manifest | 29 ++++
media-gfx/digikam/digikam-2.3.0.ebuild | 152 +++++++++++++++++++
media-gfx/digikam/digikam-2.4.1.ebuild | 145 ++++++++++++++++++
media-gfx/digikam/digikam-2.5.0.ebuild | 156 ++++++++++++++++++++
.../digikam/files/digikam-2.5.0-boost148.patch | 74 +++++++++
.../digikam/files/digikam-2.5.0-libkipi.patch | 75 ++++++++++
media-gfx/digikam/metadata.xml | 15 ++
7 files changed, 646 insertions(+), 0 deletions(-)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
new file mode 100644
index 0000000..fc17d91
--- /dev/null
+++ b/media-gfx/digikam/Manifest
@@ -0,0 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX digikam-2.5.0-boost148.patch 4133 RMD160 033b19386db95818d8f1aa7ac8b1384be8ec7169 SHA1 095ea8de1e353120f47ed41c0cd15a36d468efcb SHA256 e9adb199ca4955f64275481231c6761c32b84cdcc8bfab9ddebab6864f0f4a9f
+AUX digikam-2.5.0-libkipi.patch 2670 RMD160 a82bf1c2797279ac5f195a3f296ece677a838583 SHA1 23268e63dcc39f9e4452aff6639489f16d2c462c SHA256 7652e7854998b03a6047779361801dc63aa42c1f0221ef2b5c0f0a25abf1e651
+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-2.5.0.tar.bz2 54976375 RMD160 4ff1b5fbc2cc4a8cb9994f7c7796086418dd43fb SHA1 6cadb838669d1bdcbd6abb677889f7d68d696383 SHA256 55292c79b41fd2c20ce0a821f388645436acb18b3b06b486747e17129114851a
+EBUILD digikam-2.3.0.ebuild 4045 RMD160 69f49da4f45b4338dab884fa09a1d03c728863cc SHA1 d8673baceb9692057a6811e23fc9d872eb50d332 SHA256 6f14cd55caba84399ab6ca0f5b5539f7d8a553477e28644e42160b3ea6a49e17
+EBUILD digikam-2.4.1.ebuild 3779 RMD160 ae3417da8b3dd7720e8099458b1ab5cf2835b1a2 SHA1 c29f3d4c178699a85a045ce7fdf485b8afe9ca60 SHA256 67177511b82432bb24096be539428a8a7b0160aa513c69039ed6388fde790dae
+EBUILD digikam-2.5.0.ebuild 4197 RMD160 cd406b2bab0a40c52ed6a03aa36764b226406aa6 SHA1 cee756c8a06606acfd79379c085fc32e1c41789a SHA256 844f1cd90ed191aa990c483a76e8951d8968b0d3cab4c1f244ac114f861f21ac
+MISC metadata.xml 648 RMD160 7694bc7a07e2b35c60e2ed22981007ba0680dd1f SHA1 15b78b8dee48c87b702a5705009b3eee46aa7ebd SHA256 fed8bb77a841bcbc558e06fbe5f729a616152051924fa17fed0e527237f09f8c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJPgad1AAoJENwGBM22xffejx8P/1RHtEG5Wsz4Aru6gYpoVR/p
+/bbHJAM4HKFxQiWVXTmI//fj4q5n0MzrZT/O8PD31bvIok4FOHh6QTAzbSKLVr1K
+aBA0RhB9O9JAfWOiCZ5CWJj6lHDuRFYdcHSDewnVjTb2b5HnVhbUs74j4LgYm+AM
+0xE+NLRn3s6vcKUGXeYlHnQ9/ZX9/yU3SH9PnrCHCDXcjbK5EelYMqtS3DbzQlG1
+biruu8csqaoErN/irLo/2jN/ohDYypExn3s7eWUveQsJmoAAEnX38rvraj9yDZo1
+oO0TQT5R1TlqnrSOXKWjQF7b5gYfYnhuli5JpAGRuGDV0UKL9mZs2D3HAg93/Y0U
+Diop+4yN5P6dKrVhud7WdN6sbfNV/ZIAuWbWdF27y+D/tgoeYn9EUz6zzHU0tehP
+Dyor2/xObKV6cQ6ZEs+3quPWewi0HBfiyrbXY78y7WPYSw+p0Oe4LySxOCxVYKPx
+mqfw49zVjpgDkn3r30nlwCNT6kU0dYgHWBOeb67np5jNG8wJkR0UMMd3rQ8jZV8v
+XtZ8a9e4R+j595nZ9sAIlGpcELz1PLGn5e8R0SEoBdJqYdFHeLpG3YWz4IwArq4V
+PGCQinlavTHDxVPNGgAhvkNqn0mKufsZYBWkYgc8IvKAGfguhYK7fgngEUFuw1aM
+BL8t9QRHdobwlNrZtH5A
+=mj0p
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-2.3.0.ebuild b/media-gfx/digikam/digikam-2.3.0.ebuild
new file mode 100644
index 0000000..4b2a706
--- /dev/null
+++ b/media-gfx/digikam/digikam-2.3.0.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.3.0.ebuild,v 1.5 2012/02/12 16:01:42 dilfridge Exp $
+
+EAPI=4
+
+KDE_LINGUAS="af 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 sr@Latn ss sv ta te tg
+th tr tt uk uz uz@cyrillic ven vi wa xh zh_CN zh_HK zh_TW zu"
+
+KDE_HANDBOOK="optional"
+CMAKE_MIN_VERSION="2.8"
+KDE_MINIMAL="4.7"
+
+inherit kde4-base
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Digital photo management application for KDE"
+HOMEPAGE="http://www.digikam.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2
+ handbook? ( FDL-1.2 )"
+KEYWORDS="amd64 x86"
+SLOT="4"
+IUSE="addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video"
+
+CDEPEND="
+ !!=media-gfx/digikam-2.1.0-r1
+ $(add_kdebase_dep kdelibs 'semantic-desktop=')
+ $(add_kdebase_dep libkdcraw)
+ $(add_kdebase_dep libkexiv2)
+ $(add_kdebase_dep libkipi)
+ $(add_kdebase_dep marble plasma)
+ $(add_kdebase_dep solid)
+ media-libs/jasper
+ media-libs/lcms:0
+ >=media-libs/lensfun-0.2.5
+ >=media-libs/libkface-${PV}
+ >=media-libs/libkgeomap-${PV}
+ media-libs/liblqr
+ >=media-libs/libpgf-6.11.28
+ media-libs/libpng
+ media-libs/tiff
+ virtual/jpeg
+ x11-libs/qt-gui[qt3support]
+ >=sci-libs/clapack-3.2.1-r6
+ || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
+ addressbook? ( $(add_kdebase_dep kdepimlibs) )
+ gphoto2? ( media-libs/libgphoto2 )
+ mysql? ( virtual/mysql )
+"
+RDEPEND="${CDEPEND}
+ $(add_kdebase_dep kreadconfig)
+ media-plugins/kipi-plugins
+ video? (
+ || (
+ $(add_kdebase_dep mplayerthumbs)
+ $(add_kdebase_dep ffmpegthumbs)
+ )
+ )
+"
+DEPEND="${CDEPEND}
+ dev-libs/boost
+ sys-devel/gettext
+ doc? ( app-doc/doxygen )
+"
+
+S="${WORKDIR}/${MY_P}/core"
+
+RESTRICT=test
+# bug 366505
+
+src_prepare() {
+ # just to make absolutely sure
+ rm -rf "${WORKDIR}/${MY_P}/extra" || die
+
+ # prepare the handbook
+ mv "${WORKDIR}/${MY_P}/doc/${PN}" doc || die
+ echo "add_subdirectory( digikam )" > doc/CMakeLists.txt
+ echo "add_subdirectory( showfoto )" >> doc/CMakeLists.txt
+
+ # prepare the translations
+ mv "${WORKDIR}/${MY_P}/po" po || die
+ find po -name "*.po" -and -not -name "digikam.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 || die
+
+ kde4-base_src_prepare
+
+ if use handbook; then
+ echo "add_subdirectory( doc )" >> CMakeLists.txt
+ fi
+}
+
+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)
+ -DWITH_MarbleWidget=ON
+ $(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 INTERNALMYSQL)
+ $(cmake-utils_use_enable debug DEBUG_MESSAGES)
+ )
+
+ kde4-base_src_configure
+}
+
+src_compile() {
+ local mytargets="all"
+ use doc && mytargets+=" doc"
+
+ kde4-base_src_compile ${mytargets}
+}
+
+src_install() {
+ kde4-base_src_install
+
+ # someone had the great idea to install duplicate icons
+ einfo Removing duplicate icons
+ find "${ED}/usr/share/icons/oxygen" -name digikam.png -exec rm -v {} +
+ find "${ED}/usr/share/icons/oxygen" -name showfoto.png -exec rm -v {} +
+
+ if use doc; then
+ # install the api documentation
+ insinto /usr/share/doc/${PF}/html
+ doins -r ${CMAKE_BUILD_DIR}/api/html/*
+ 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-2.4.1.ebuild b/media-gfx/digikam/digikam-2.4.1.ebuild
new file mode 100644
index 0000000..f4baa95
--- /dev/null
+++ b/media-gfx/digikam/digikam-2.4.1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.4.1.ebuild,v 1.4 2012/02/12 16:01:42 dilfridge Exp $
+
+EAPI=4
+
+KDE_LINGUAS="af 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 sr@Latn ss sv ta te tg th tr tt uk uz uz@cyrillic ven vi wa xh zh_CN zh_HK zh_TW zu"
+
+KDE_HANDBOOK="optional"
+CMAKE_MIN_VERSION="2.8"
+KDE_MINIMAL="4.7"
+
+inherit kde4-base
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Digital photo management application for KDE"
+HOMEPAGE="http://www.digikam.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2
+ handbook? ( FDL-1.2 )"
+KEYWORDS="amd64 x86"
+SLOT="4"
+IUSE="addressbook debug doc 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 marble plasma)
+ $(add_kdebase_dep solid)
+ media-libs/jasper
+ media-libs/lcms:0
+ >=media-libs/lensfun-0.2.5
+ >=media-libs/libkface-${PV}
+ >=media-libs/libkgeomap-${PV}
+ media-libs/liblqr
+ >=media-libs/libpgf-6.11.28
+ media-libs/libpng
+ media-libs/tiff
+ virtual/jpeg
+ x11-libs/qt-gui[qt3support]
+ >=sci-libs/clapack-3.2.1-r6
+ || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
+ addressbook? ( $(add_kdebase_dep kdepimlibs) )
+ gphoto2? ( media-libs/libgphoto2 )
+ mysql? ( virtual/mysql )
+"
+RDEPEND="${CDEPEND}
+ $(add_kdebase_dep kreadconfig)
+ media-plugins/kipi-plugins
+ video? (
+ || (
+ $(add_kdebase_dep mplayerthumbs)
+ $(add_kdebase_dep ffmpegthumbs)
+ )
+ )
+"
+DEPEND="${CDEPEND}
+ dev-libs/boost
+ sys-devel/gettext
+ doc? ( app-doc/doxygen )
+"
+
+S="${WORKDIR}/${MY_P}/core"
+
+RESTRICT=test
+# bug 366505
+
+src_prepare() {
+ # just to make absolutely sure
+ rm -rf "${WORKDIR}/${MY_P}/extra" || die
+
+ # prepare the handbook
+ mv "${WORKDIR}/${MY_P}/doc/${PN}" doc || die
+ echo "add_subdirectory( digikam )" > doc/CMakeLists.txt
+ echo "add_subdirectory( showfoto )" >> doc/CMakeLists.txt
+
+ # prepare the translations
+ mv "${WORKDIR}/${MY_P}/po" po || die
+ find po -name "*.po" -and -not -name "digikam.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 || die
+
+ kde4-base_src_prepare
+
+ if use handbook; then
+ echo "add_subdirectory( doc )" >> CMakeLists.txt
+ fi
+}
+
+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)
+ -DWITH_MarbleWidget=ON
+ $(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 INTERNALMYSQL)
+ $(cmake-utils_use_enable debug DEBUG_MESSAGES)
+ )
+
+ kde4-base_src_configure
+}
+
+src_compile() {
+ local mytargets="all"
+ use doc && mytargets+=" doc"
+
+ kde4-base_src_compile ${mytargets}
+}
+
+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/*
+ 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-2.5.0.ebuild b/media-gfx/digikam/digikam-2.5.0.ebuild
new file mode 100644
index 0000000..4ed93cc
--- /dev/null
+++ b/media-gfx/digikam/digikam-2.5.0.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.5.0.ebuild,v 1.5 2012/04/04 19:30:58 ago Exp $
+
+EAPI=4
+
+KDE_LINGUAS="af 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 sr@Latn ss sv ta te tg th tr tt uk uz uz@cyrillic ven vi wa xh zh_CN zh_HK zh_TW zu"
+
+KDE_HANDBOOK="optional"
+CMAKE_MIN_VERSION="2.8"
+KDE_MINIMAL="4.7"
+
+KDE_DOC_DIRS="doc-digikam doc-showfoto"
+
+inherit kde4-base
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Digital photo management application for KDE"
+HOMEPAGE="http://www.digikam.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2
+ handbook? ( FDL-1.2 )"
+KEYWORDS="amd64 ~x86"
+SLOT="4"
+IUSE="addressbook debug doc 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 marble plasma)
+ $(add_kdebase_dep solid)
+ media-libs/jasper
+ media-libs/lcms:0
+ >=media-libs/lensfun-0.2.5
+ >=media-libs/libkface-${PV}
+ >=media-libs/libkgeomap-${PV}
+ media-libs/liblqr
+ >=media-libs/libpgf-6.11.28
+ media-libs/libpng
+ media-libs/tiff
+ virtual/jpeg
+ x11-libs/qt-gui[qt3support]
+ >=sci-libs/clapack-3.2.1-r6
+ || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
+ addressbook? ( $(add_kdebase_dep kdepimlibs) )
+ gphoto2? ( media-libs/libgphoto2 )
+ mysql? ( virtual/mysql )
+"
+RDEPEND="${CDEPEND}
+ $(add_kdebase_dep kreadconfig)
+ media-plugins/kipi-plugins
+ video? (
+ || (
+ $(add_kdebase_dep mplayerthumbs)
+ $(add_kdebase_dep ffmpegthumbs)
+ )
+ )
+"
+DEPEND="${CDEPEND}
+ dev-libs/boost
+ sys-devel/gettext
+ doc? ( app-doc/doxygen )
+"
+
+S="${WORKDIR}/${MY_P}/core"
+
+RESTRICT=test
+# bug 366505
+
+PATCHES=(
+ "${FILESDIR}/${P}-libkipi.patch"
+ "${FILESDIR}/${P}-boost148.patch"
+)
+
+src_prepare() {
+ # just to make absolutely sure
+ rm -rf "${WORKDIR}/${MY_P}/extra" || die
+
+ # prepare the handbook
+ mkdir doc-digikam doc-showfoto || die
+ echo "add_subdirectory( en )" > doc-digikam/CMakeLists.txt || die
+ mv "${WORKDIR}/${MY_P}/doc/${PN}/digikam" doc-digikam/en || die
+ echo "add_subdirectory( en )" > doc-showfoto/CMakeLists.txt || die
+ mv "${WORKDIR}/${MY_P}/doc/${PN}/showfoto" doc-showfoto/en || die
+ sed -i -e 's:../digikam/:../../doc-digikam/en/:g' doc-showfoto/en/index.docbook || die
+
+ # prepare the translations
+ mv "${WORKDIR}/${MY_P}/po" po || die
+ find po -name "*.po" -and -not -name "digikam.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 || die
+
+ kde4-base_src_prepare
+
+ if use handbook; then
+ echo "add_subdirectory( doc-digikam )" >> CMakeLists.txt
+ echo "add_subdirectory( doc-showfoto )" >> CMakeLists.txt
+ fi
+}
+
+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)
+ -DWITH_MarbleWidget=ON
+ $(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 INTERNALMYSQL)
+ $(cmake-utils_use_enable debug DEBUG_MESSAGES)
+ )
+
+ kde4-base_src_configure
+}
+
+src_compile() {
+ local mytargets="all"
+ use doc && mytargets+=" doc"
+
+ kde4-base_src_compile ${mytargets}
+}
+
+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/*
+ 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-2.5.0-boost148.patch b/media-gfx/digikam/files/digikam-2.5.0-boost148.patch
new file mode 100644
index 0000000..8119839
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-2.5.0-boost148.patch
@@ -0,0 +1,74 @@
+commit d18ea6da2d3e2359f4113e83c3fd40c18a29ddab
+Author: Gilles Caulier <caulier.gilles@gmail.com>
+Date: Fri Jan 6 11:23:48 2012 +0100
+
+ Apply patch #67483 from Jeremiah Willcock to compile fine digiKam boost graph interface with libboost 1.48
+ BUGS: 287772
+ CCBUGS: 267777
+
+diff --git a/libs/database/imagehistory/imagehistorygraph_boost.h b/libs/database/imagehistory/imagehistorygraph_boost.h
+index 4017c4f..76c764a 100644
+--- a/libs/database/imagehistory/imagehistorygraph_boost.h
++++ b/libs/database/imagehistory/imagehistorygraph_boost.h
+@@ -1198,7 +1198,7 @@ protected:
+ {
+ boost::dag_shortest_paths(graph, v,
+ // we provide a constant weight of 1
+- weight_map(boost::ref_property_map<edge_t,int>(weight)).
++ weight_map(boost::ref_property_map<typename boost::graph_traits<GraphType>::edge_descriptor,int>(weight)).
+ // Store distance and predecessors in QMaps, wrapped to serve as property maps
+ distance_map(VertexIntMapAdaptor(distances)).
+ predecessor_map(VertexVertexMapAdaptor(predecessors))
+@@ -1218,7 +1218,7 @@ protected:
+ {
+ boost::dag_shortest_paths(graph, v,
+ // we provide a constant weight of 1
+- weight_map(boost::ref_property_map<edge_t,int>(weight)).
++ weight_map(boost::ref_property_map<typename boost::graph_traits<GraphType>::edge_descriptor,int>(weight)).
+ // Invert the default compare method: With greater, we get the longest path
+ distance_compare(std::greater<int>()).
+ // will be returned if a node is unreachable
+@@ -1384,14 +1384,15 @@ protected:
+ template <class GraphType, typename VertexLessThan>
+ class lessThanMapEdgeToTarget
+ {
++ typedef typename boost::graph_traits<GraphType>::edge_descriptor edge_descriptor;
+ public:
+ lessThanMapEdgeToTarget(const GraphType& g, VertexLessThan vertexLessThan)
+ : g(g), vertexLessThan(vertexLessThan) {}
+ const GraphType& g;
+ VertexLessThan vertexLessThan;
+- bool operator()(const Edge& a, const Edge& b)
++ bool operator()(const edge_descriptor& a, const edge_descriptor& b)
+ {
+- return vertexLessThan(boost::target(a.toEdge(), g), boost::target(b.toEdge(), g));
++ return vertexLessThan(boost::target(a, g), boost::target(b, g));
+ }
+ };
+
+@@ -1402,20 +1403,21 @@ protected:
+ {
+ typedef std::pair<Vertex, QList<Edge> > VertexInfo;
+
+- QList<Edge> outEdges;
++ typedef typename boost::graph_traits<IncidenceGraph>::edge_descriptor edge_descriptor;
++ QList<edge_descriptor> outEdges;
+ std::vector<VertexInfo> stack;
+
+ boost::put(color, u, boost::gray_color);
+ vis.discover_vertex(u, g);
+
+- outEdges = toEdgeList(boost::out_edges(u, g));
++ outEdges = toList<edge_descriptor>(boost::out_edges(u, g));
+ // Sort edges. The lessThan we have takes vertices, so we use a lessThan which
+ // maps the given edges to their targets, and calls our vertex lessThan.
+ qSort(outEdges.begin(), outEdges.end(), lessThanMapEdgeToTarget<IncidenceGraph, LessThan>(g, lessThan));
+
+- foreach(const Edge& e, outEdges)
++ foreach(const edge_descriptor& e, outEdges)
+ {
+- Vertex v = boost::target(e.toEdge(), g);
++ Vertex v = boost::target(e, g);
+ vis.examine_edge(e, g);
+ boost::default_color_type v_color = boost::get(color, v);
+ if (v_color == boost::white_color)
diff --git a/media-gfx/digikam/files/digikam-2.5.0-libkipi.patch b/media-gfx/digikam/files/digikam-2.5.0-libkipi.patch
new file mode 100644
index 0000000..fbbac97
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-2.5.0-libkipi.patch
@@ -0,0 +1,75 @@
+From 25cc9c9876a5233bd630105d0110319892d4e18c Mon Sep 17 00:00:00 2001
+From: Gilles Caulier <caulier.gilles@gmail.com>
+Date: Tue, 3 Jan 2012 15:16:37 +0100
+Subject: [PATCH] enable checkall and clearall buttons only with libkipi version 1.4.0
+ BUGS: 290496
+
+---
+ utilities/setup/setupplugins.cpp | 13 +++++++++++--
+ utilities/setup/setupplugins.h | 4 ++--
+ 2 files changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/utilities/setup/setupplugins.cpp b/utilities/setup/setupplugins.cpp
+index 0f4030a..b8efb35 100644
+--- a/utilities/setup/setupplugins.cpp
++++ b/utilities/setup/setupplugins.cpp
+@@ -6,8 +6,8 @@
+ * Date : 2004-01-02
+ * Description : setup Kipi plugins tab.
+ *
+- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
+- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
++ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
++ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+@@ -100,6 +100,11 @@ SetupPlugins::SetupPlugins(QWidget* parent)
+
+ panel->setLayout(mainLayout);
+
++#if KIPI_VERSION < 0x010400
++ d->checkAllBtn->setVisible(false);
++ d->clearBtn->setVisible(false);
++#endif
++
+ initPlugins();
+
+ // --------------------------------------------------------
+@@ -158,14 +163,18 @@ void SetupPlugins::applyPlugins()
+ void SetupPlugins::slotCheckAll()
+ {
+ QApplication::setOverrideCursor(Qt::WaitCursor);
++#if KIPI_VERSION >= 0x010400
+ d->kipiConfig->slotCheckAll();
++#endif
+ QApplication::restoreOverrideCursor();
+ }
+
+ void SetupPlugins::slotClear()
+ {
+ QApplication::setOverrideCursor(Qt::WaitCursor);
++#if KIPI_VERSION >= 0x010400
+ d->kipiConfig->slotClear();
++#endif
+ QApplication::restoreOverrideCursor();
+ }
+
+diff --git a/utilities/setup/setupplugins.h b/utilities/setup/setupplugins.h
+index 271a569..114e0fa 100644
+--- a/utilities/setup/setupplugins.h
++++ b/utilities/setup/setupplugins.h
+@@ -6,8 +6,8 @@
+ * Date : 2004-01-02
+ * Description : setup Kipi plugins tab.
+ *
+- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
+- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
++ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
++ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+--
+1.7.3.4
+
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
new file mode 100644
index 0000000..6764ab6
--- /dev/null
+++ b/media-gfx/digikam/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>kde</herd>
+<maintainer><email>dilfridge@gentoo.org</email></maintainer>
+<use>
+ <flag name="addressbook">Add support for kdepim</flag>
+ <flag name="themedesigner">Build the digikam theme designer</flag>
+ <flag name="thumbnails">Enable thumbnails database support</flag>
+ <flag name="video">Pull in mplayerthumbs to enable video thumbnails</flag>
+ <flag name="linguas_ha">Hausa translation</flag>
+ <flag name="linguas_mi">Maori translation</flag>
+ <flag name="linguas_ven">Venda translation</flag>
+</use>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
@ 2011-12-31 14:43 Andreas Hüttel
0 siblings, 0 replies; 13+ messages in thread
From: Andreas Hüttel @ 2011-12-31 14:43 UTC (permalink / raw
To: gentoo-commits
commit: b3e335668294bc4b0a8f9f870d0e529dbf058780
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 31 14:39:25 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Dec 31 14:39:25 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=b3e33566
[media-gfx/digikam] Not needed here anymore
---
media-gfx/digikam/ChangeLog | 369 --------------------
media-gfx/digikam/Manifest | 58 ---
media-gfx/digikam/digikam-1.8.0.ebuild | 125 -------
media-gfx/digikam/digikam-1.9.0-r1.ebuild | 130 -------
media-gfx/digikam/digikam-1.9.0.ebuild | 125 -------
media-gfx/digikam/digikam-2.0.0.ebuild | 140 --------
media-gfx/digikam/digikam-2.0.0_rc.ebuild | 139 --------
media-gfx/digikam/files/digikam-1.1.0-libpgf.patch | 232 ------------
.../digikam/files/digikam-1.1.0-libpng14.patch | 42 ---
.../digikam/files/digikam-1.2.0-docs-r3.patch | 56 ---
media-gfx/digikam/files/digikam-1.2.0-lapack.patch | 126 -------
.../digikam/files/digikam-1.2.0-libpgf-r3.patch | 157 ---------
media-gfx/digikam/files/digikam-1.2.0-libpgf.patch | 208 -----------
.../digikam/files/digikam-1.2.0-ratingwidget.patch | 11 -
media-gfx/digikam/files/digikam-1.3.0-docs.patch | 54 ---
media-gfx/digikam/files/digikam-1.3.0-pgf.patch | 153 --------
.../digikam/files/digikam-1.4.0-clapack.patch | 181 ----------
media-gfx/digikam/files/digikam-1.4.0-docs.patch | 58 ---
.../digikam/files/digikam-1.5.0-unbundle.patch | 294 ----------------
media-gfx/digikam/files/digikam-1.6.0-docs.patch | 49 ---
media-gfx/digikam/files/digikam-1.7.0-docs.patch | 49 ---
media-gfx/digikam/files/digikam-1.8.0-gcc46.patch | 15 -
media-gfx/digikam/files/digikam-1.8.0-tests.patch | 15 -
media-gfx/digikam/files/digikam-1.9.0-docs.patch | 50 ---
media-gfx/digikam/files/digikam-1.9.0-newpgf.patch | 92 -----
.../digikam/files/digikam-1.9.0-nomysql.patch | 60 ----
media-gfx/digikam/files/digikam-1.9.0-turbo.patch | 56 ---
.../digikam/files/digikam-2.0.0_beta1-docs.patch | 41 ---
.../digikam/files/digikam-2.0.0_beta4-docs.patch | 41 ---
.../digikam/files/digikam-2.0.0_beta5-docs.patch | 42 ---
.../files/digikam-2.0.0_rc-officialpgf.patch | 56 ---
.../files/digikam-2.0.0_rc-officialpgf2.patch | 23 --
.../digikam/files/digikam-2.0.0_rc-oldpgf.patch | 26 --
media-gfx/digikam/metadata.xml | 17 -
34 files changed, 0 insertions(+), 3290 deletions(-)
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
deleted file mode 100644
index b6a2ada..0000000
--- a/media-gfx/digikam/ChangeLog
+++ /dev/null
@@ -1,369 +0,0 @@
-# ChangeLog for media-gfx/digikam
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
- 29 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org> digikam-2.0.0.ebuild,
- metadata.xml:
- Finished for testing
-
-*digikam-2.0.0 (28 Jul 2011)
-
- 28 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- -digikam-2.0.0_beta5.ebuild, -digikam-2.0.0_beta6.ebuild,
- +digikam-2.0.0.ebuild:
- Added work in progess, does not build yet
-
- 27 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org> digikam-1.9.0.ebuild,
- digikam-1.9.0-r1.ebuild, +files/digikam-1.9.0-newpgf.patch,
- digikam-2.0.0_rc.ebuild:
- Resync with main tree
-
- 27 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- digikam-2.0.0_rc.ebuild:
- Cleanup, re-add accidentally dropped useflag mysql, depend on kde-4.7
-
- 06 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- digikam-2.0.0_rc.ebuild:
- Although not strictly required, it is probably safer to use libpgf-6.11.24
-
- 05 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- digikam-2.0.0_rc.ebuild, +files/digikam-2.0.0_rc-officialpgf2.patch:
- Additional compile fix for libpgf-6.11.24
-
- 05 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- -files/digikam-2.0.0_officialpgf.patch,
- +files/digikam-2.0.0_rc-officialpgf.patch:
- Include build fix for new but unbundled libpgf
-
- 04 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- digikam-2.0.0_rc.ebuild, +files/digikam-2.0.0_officialpgf.patch:
- Add build fix for offical new libpgf
-
- 03 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- digikam-2.0.0_rc.ebuild, +files/digikam-2.0.0_rc-oldpgf.patch:
- Add build fix for older libpgf
-
-*digikam-2.0.0_rc (02 Jul 2011)
-
- 02 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- +digikam-2.0.0_rc.ebuild, metadata.xml:
- Version bump, does not build yet (kde bug 276969)
-
- 02 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- -digikam-1.2.0-r4.ebuild:
- Drop old
-
-*digikam-2.0.0_beta6 (02 Jul 2011)
-
- 02 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- +digikam-2.0.0_beta6.ebuild:
- Resync with kde overlay
-
- 20 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- digikam-2.0.0_beta5.ebuild:
- Backport build fix for libjpeg-turbo
-
- 20 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- digikam-1.9.0-r1.ebuild:
- Add upstream fix for libjpeg-turbo
-
- 11 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- digikam-2.0.0_beta5.ebuild:
- QA cleanups
-
- 11 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- -digikam-2.0.0_beta2.ebuild, -digikam-2.0.0_beta3.ebuild,
- -digikam-2.0.0_beta4.ebuild, digikam-2.0.0_beta5.ebuild:
- Remove old; drop ppc keyword
-
-*digikam-1.9.0-r1 (11 May 2011)
-
- 11 May 2011; Andreas K. Huettel <dilfridge@gentoo.org> digikam-1.9.0.ebuild,
- +digikam-1.9.0-r1.ebuild, +files/digikam-1.9.0-nomysql.patch:
- Resync with tree
-
-*digikam-2.0.0_beta5 (11 May 2011)
-
- 11 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- +digikam-2.0.0_beta5.ebuild, +files/digikam-2.0.0_beta5-docs.patch:
- Version bump
-
- 11 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- digikam-2.0.0_beta4.ebuild:
- Allow sci-libs/lapack-atlas as alternative to clapack
-
-*digikam-2.0.0_beta4 (01 Apr 2011)
-
- 01 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- +digikam-2.0.0_beta4.ebuild, +files/digikam-2.0.0_beta4-docs.patch:
- Version bump
-
- 01 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- digikam-2.0.0_beta2.ebuild, digikam-2.0.0_beta3.ebuild:
- Readd ~ppc in line with digikam-1.9.0
-
- 01 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- digikam-1.2.0-r4.ebuild, digikam-1.8.0.ebuild,
- +files/digikam-1.8.0-gcc46.patch, digikam-1.9.0.ebuild:
- Resync with main tree
-
-*digikam-2.0.0_beta3 (28 Feb 2011)
-
- 28 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- +digikam-2.0.0_beta3.ebuild:
- Version bump
-
-*digikam-1.9.0 (28 Feb 2011)
-
- 28 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- +digikam-1.9.0.ebuild, +files/digikam-1.9.0-docs.patch:
- Version bump
-
- 03 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- digikam-2.0.0_beta2.ebuild:
- New package locations
-
- 03 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- digikam-2.0.0_beta2.ebuild:
- More precise dependencies
-
- 02 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- digikam-2.0.0_beta2.ebuild, metadata.xml:
- Useflag geolocation makes no sense anymore (forced on)
-
- 02 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- -digikam-2.0.0_beta1.ebuild:
- Cleanup
-
- 01 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- digikam-2.0.0_beta2.ebuild:
- Fix typo
-
-*digikam-2.0.0_beta2 (01 Feb 2011)
-
- 01 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- -digikam-1.1.0-r1.ebuild, -digikam-1.2.0-r2.ebuild,
- -digikam-1.2.0-r3.ebuild, digikam-1.2.0-r4.ebuild, -digikam-1.4.0.ebuild,
- -digikam-1.4.0-r1.ebuild, -digikam-1.5.0.ebuild, -digikam-1.6.0.ebuild,
- -digikam-1.7.0.ebuild, +digikam-2.0.0_beta2.ebuild, -digikam-9999.ebuild:
- Version bump; cleanup of EAPI=2 ebuilds
-
- 30 Jan 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- digikam-2.0.0_beta1.ebuild, files/digikam-2.0.0_beta1-docs.patch:
- Got it to configure
-
- 28 Jan 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- digikam-1.8.0.ebuild, +files/digikam-1.8.0-tests.patch:
- Fix building of the tests
-
-*digikam-1.8.0 (28 Jan 2011)
-
- 28 Jan 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- +digikam-1.8.0.ebuild:
- Version bump
-
- 28 Jan 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- digikam-1.6.0.ebuild, digikam-1.7.0.ebuild:
- Resync with tree
-
- 24 Jan 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- digikam-2.0.0_beta1.ebuild, +files/digikam-2.0.0_beta1-docs.patch:
- Updated docs patch
-
- 09 Jan 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- digikam-2.0.0_beta1.ebuild, digikam-9999.ebuild:
- Cleanups and unify with live ebuild
-
-*digikam-2.0.0_beta1 (09 Jan 2011)
-
- 09 Jan 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- +digikam-2.0.0_beta1.ebuild:
- Blind version bump
-
- 28 Dec 2010; Andreas K. Huettel <dilfridge@gentoo.org>
- digikam-1.7.0.ebuild, +files/digikam-1.7.0-docs.patch:
- Updated docs patch
-
-*digikam-1.7.0 (25 Dec 2010)
-
- 25 Dec 2010; Andreas K. Huettel <dilfridge@gentoo.org>
- +digikam-1.7.0.ebuild:
- Blind version bump
-
-*digikam-1.2.0-r4 (25 Nov 2010)
-
- 25 Nov 2010; Andreas K. Huettel <dilfridge@gentoo.org>
- digikam-1.2.0-r3.ebuild, +digikam-1.2.0-r4.ebuild, digikam-1.5.0.ebuild,
- digikam-1.6.0.ebuild:
- Resync with tree
-
-*digikam-1.6.0 (24 Nov 2010)
-
- 24 Nov 2010; Andreas K. Huettel <dilfridge@gentoo.org>
- +digikam-1.6.0.ebuild, +files/digikam-1.6.0-docs.patch:
- Version bump
-
- 16 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org> Manifest:
- Remanifested after updating doc-showfoto distfile
-
-*digikam-1.5.0-r1 (16 Oct 2010)
-
- 16 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
- +digikam-1.5.0-r1.ebuild:
- Added the showfoto handbook
-
- 15 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
- digikam-1.5.0.ebuild:
- Resync with main tree; updated linguas
-
- 15 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
- digikam-1.5.0.ebuild:
- Correct qt-sql dependency
-
- 15 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
- digikam-1.5.0.ebuild:
- Force-enabled lensfun.
-
- 15 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
- digikam-1.5.0.ebuild, -files/digikam-1.5.0-pgf.patch,
- +files/digikam-1.5.0-unbundle.patch:
- Apply unbundle logic also to lensfun. Problem is, lensfun is not yet
- found!
-
-*digikam-1.5.0 (12 Oct 2010)
-
- 12 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
- +digikam-1.5.0.ebuild, +files/digikam-1.5.0-pgf.patch:
- Version bump. Builds and installs fine. The database dependencies and the
- liblensfun detection still need some checking.
-
- 25 Sep 2010; Andreas K. Huettel <dilfridge@gentoo.org>
- -digikam-1.4.0-r51.ebuild:
- Cleanup
-
- 25 Sep 2010; Andreas K. Huettel <dilfridge@gentoo.org>
- digikam-1.2.0-r3.ebuild:
- Seems like api doc building needs latex.
-
- 25 Sep 2010; Andreas K. Huettel <dilfridge@gentoo.org>
- files/digikam-1.2.0-docs-r3.patch:
- Fixed the docs patch.
-
- 25 Sep 2010; Andreas K. Huettel <dilfridge@gentoo.org>
- digikam-1.2.0-r3.ebuild:
- Really move all doc files.
-
- 25 Sep 2010; Andreas K. Huettel <dilfridge@gentoo.org>
- digikam-1.2.0-r3.ebuild:
- Fixed path of unpacked handbook files
-
-*digikam-1.2.0-r3 (25 Sep 2010)
-
- 25 Sep 2010; Andreas K. Huettel <dilfridge@gentoo.org>
- +digikam-1.2.0-r3.ebuild, +files/digikam-1.2.0-docs-r3.patch,
- +files/digikam-1.2.0-libpgf-r3.patch:
- Backported documentation additions to 1.2.0
-
- 25 Sep 2010; Andreas K. Huettel <dilfridge@gentoo.org>
- digikam-1.4.0-r1.ebuild:
- Added elog about api docs and installed readme-handbook.txt
-
- 24 Sep 2010; Andreas K. Huettel <dilfridge@gentoo.org>
- digikam-1.4.0-r1.ebuild, files/digikam-1.4.0-docs.patch:
- Finished - now doc controls the building of the api documentation and
- handbook controls the installation of a current handbook snapshot.
-
- 22 Sep 2010; Andreas K. Huettel <dilfridge@gentoo.org>
- digikam-1.4.0-r1.ebuild, +files/digikam-1.4.0-docs.patch:
- Builds the docs now on request, but does not install them yet...
-
-*digikam-1.4.0-r51 (22 Sep 2010)
-
- 22 Sep 2010; Andreas K. Huettel <dilfridge@gentoo.org>
- digikam-1.4.0-r1.ebuild, +digikam-1.4.0-r51.ebuild:
- Renamed -r1 to -r51 and copied -r0 to -r1
-
- 18 Sep 2010; Andreas K. Huettel <dilfridge@gentoo.org>
- digikam-1.4.0.ebuild:
- Even worse. We need both backends sqlite and mysql.
-
- 18 Sep 2010; Andreas K. Huettel <dilfridge@gentoo.org>
- digikam-1.4.0.ebuild:
- It seems that we need not sqlite but mysql in qt-sql...
-
-*digikam-1.2.0-r2 (18 Sep 2010)
-*digikam-1.1.0-r1 (18 Sep 2010)
-
- 18 Sep 2010; Andreas K. Huettel <dilfridge@gentoo.org>
- +digikam-1.1.0-r1.ebuild, +files/digikam-1.1.0-libpgf.patch,
- +files/digikam-1.1.0-libpng14.patch, +digikam-1.2.0-r2.ebuild,
- +files/digikam-1.2.0-lapack.patch, +files/digikam-1.2.0-libpgf.patch,
- +files/digikam-1.2.0-ratingwidget.patch, +digikam-1.4.0.ebuild,
- +files/digikam-1.4.0-clapack.patch, metadata.xml:
- Synced files with main tree.
-
- 29 Aug 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
- digikam-1.4.0.ebuild:
- Change clapack and f2c headers from local to global in ebuild.
-
-*digikam-1.4.0 (28 Aug 2010)
-
- 28 Aug 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
- +digikam-1.4.0.ebuild, digikam-9999.ebuild:
- Version bump and update of live ebuild.
-
- 28 Aug 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
- digikam-1.3.0-r2.ebuild:
- Actually remove the unneeded Fortran dependency...
-
- 28 Aug 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
- digikam-1.3.0-r2.ebuild, files/digikam-1.3.0-clapack.patch:
- Introduce switch to completely disable the bundled libraries.
-
- 28 Aug 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
- files/digikam-1.3.0-clapack.patch:
- Removed explicit linking to f2c.
-
- 28 Aug 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
- files/digikam-1.3.0-clapack.patch:
- Removed explicit linking to blas.
-
- 28 Aug 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
- files/digikam-1.3.0-clapack.patch:
- Cleanup of experiments in the CMakeLists...
-
- 28 Aug 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
- digikam-1.3.0-r2.ebuild, files/digikam-1.3.0-clapack.patch:
- Works now with the new clapack ebuild. The f2c_ symbol prefix was the
- problem.
-
- 28 Aug 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
- files/digikam-1.3.0-clapack.patch:
- Still linking problems.
-
- 27 Aug 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
- digikam-1.3.0-r2.ebuild, files/digikam-1.3.0-clapack.patch:
- Next try. Still missing a -lf2c somewhere.
-
-*digikam-1.3.0-r2 (27 Aug 2010)
-
- 27 Aug 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
- -digikam-1.3.0-r1.ebuild, +digikam-1.3.0-r2.ebuild,
- +files/digikam-1.3.0-clapack.patch, +files/digikam-1.3.0-docs.patch,
- -files/digikam-1.3.0-lapack-r1.patch, +files/digikam-1.3.0-pgf.patch:
- First refactoring that might be complete.
-
-*digikam-1.3.0-r1 (25 Aug 2010)
-
- 25 Aug 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
- +digikam-1.3.0-r1.ebuild, +files/digikam-1.3.0-lapack-r1.patch:
- First test of conditional lapack patch.
-
-*digikam-9999 (25 Aug 2010)
-*digikam-1.3.0 (25 Aug 2010)
-
- 25 Aug 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
- +digikam-1.3.0.ebuild, +files/digikam-1.3.0-lapack.patch,
- +files/digikam-1.3.0-libpgf.patch, +digikam-9999.ebuild, +metadata.xml:
- Copied from kde overlay.
-
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
deleted file mode 100644
index 313f8ea..0000000
--- a/media-gfx/digikam/Manifest
+++ /dev/null
@@ -1,58 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-AUX digikam-1.1.0-libpgf.patch 8996 RMD160 4f1a7ad7b28c43b3fe2e454eb3351f27a14bde6f SHA1 fd2b98e23c31d880a2a32f28161f279abef82c22 SHA256 f2001099ee5538a31a9660c223e59a25a19eb7c36a191831b849e1b81c58856d
-AUX digikam-1.1.0-libpng14.patch 1580 RMD160 769e9bf4030d795349cb260854e26c189471ccbc SHA1 9b3123dad7bd7530db6833296dc1de7ec240fd54 SHA256 0ae5e279aedc80857cb27ace7d1609b6cf632853513445896b88a7365b763fb9
-AUX digikam-1.2.0-docs-r3.patch 1926 RMD160 963f134c1bdb2e6b1a59b82efb7009733294ce6a SHA1 7cf403d5fd8f20142b7c1c6f6de225b5e66c28b9 SHA256 0687cd39780c1e40fec424f6ae5cce851e460681d02088eec763902c170ecb28
-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-libpgf.patch 8505 RMD160 524cfb182518f45e6d2a683642486eb84a3471d3 SHA1 d86fec9b63442f472d0ce7dd0d20939fe389eadc SHA256 8c603858103f056d17d4e8d9a3cb1d6464de6d174d82ff50882611e27564f465
-AUX digikam-1.2.0-ratingwidget.patch 413 RMD160 b7e86997019fa16590a565b8e18fb43c287c7e88 SHA1 aa90381903000f28c105677e12f4b6813363659a SHA256 48cf828b847cd4346b9f5512fa1a010565680d31996bf2492c7bf256caf04231
-AUX digikam-1.3.0-docs.patch 1910 RMD160 c4d644e91a0b492c8c9a8e53ed0ae19fa743dabc SHA1 6d3c6519e4d7351198f6275639afe448e09d92b7 SHA256 d8048791e9623fe99796d71bc835ac568786b4c5a643b3d02c6d80472e725b99
-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
-AUX digikam-1.6.0-docs.patch 1438 RMD160 d4507c7aabe6eceb700ae8e3b76ac90c500c3326 SHA1 b6f477d6e6ceaef8947071a12cf07e188789fc81 SHA256 21286862bb1dc5893cec0b16cf563b75edb6fe952f6aad7add6f4f59a575d2b8
-AUX digikam-1.7.0-docs.patch 1457 RMD160 e41322e23bb47234047fbe78aaf9202996907055 SHA1 281f7ad8644aa3f6c284cef7db40f330c8cec5d7 SHA256 7c32e5193a2ce168d10cdb3ea0bfa3a06774220013e51f61e8ba02fe65958ac6
-AUX digikam-1.8.0-gcc46.patch 512 RMD160 950c4744a8d4bfe88f0f19233bfd5aefb87ccbba SHA1 e3682e8af28233609c12817ec13a120c95a169be SHA256 088709ad10f71266957d237fabba9ee6f1de0f43ba2c5f63badbeb974d140241
-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
-AUX digikam-2.0.0_beta1-docs.patch 1361 RMD160 3b98a59e9790a7bc12dc5ec4723860d2cc968c4b SHA1 63d6d8c23126a198b91a56528cdfd97559f1f398 SHA256 dc8bf8aa8c6f956a5afd60bc0bc526872ed7b7604a3e1b8acb1613c947a5c97c
-AUX digikam-2.0.0_beta4-docs.patch 1361 RMD160 0a68569608e99781708b5c242c90e0df6808a655 SHA1 d33c4ca548bd3f605d992ea32f287212ef68bd77 SHA256 9902322da1310bcf728d8172d5bbd53f7080555bfdd629dbe0eba069d9eec8ac
-AUX digikam-2.0.0_beta5-docs.patch 1364 RMD160 e7e618d7ae5939328d43e1b41e11f6b4eb2f4821 SHA1 ff5519b3ee8cf19e091c1ac1b38817485921b7d2 SHA256 4113cc07a61d22a727f73fed917eb4ae82493f700673daf58acfcce455914964
-AUX digikam-2.0.0_rc-officialpgf.patch 2351 RMD160 a3be56a7377b013bfa2a3539a8bbe7cfc9d3a75d SHA1 883b79dca41f7c624de3a8dc85b02f2dcae363a9 SHA256 bf40b21501bb944993017fcc0f05411e100b88708b1560ddd00e7ca203db3bda
-AUX digikam-2.0.0_rc-officialpgf2.patch 824 RMD160 54715604f3ca772253fee111f311028bc6dc9643 SHA1 8d170abfebddbf1d4f146d6c0b568f2a6262466a SHA256 0f3f010da6f7230ef865169db58f8595796354726b5599e975fde42af4fecbd5
-AUX digikam-2.0.0_rc-oldpgf.patch 866 RMD160 36d94d476bdd02647fe4071b6ca2d9d09c851282 SHA1 3c49b420987df7db854a6a426daa848c42a36f3c SHA256 11389b36e669ae65522f439672d0409963f86eba0d2f439402311e67650dc89c
-DIST digikam-1.8.0.tar.bz2 23376636 RMD160 aa86cae8048a8f7122285c5e27aaa59e5dbcc47c SHA1 65430990896b56b7ec76b9a6bc5f8472145f44fd SHA256 210de9d949265e910c65c9ab8b19efab13839f6a2ef761a5915d267ddfe494aa
-DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5
-DIST digikam-2.0.0-rc.tar.bz2 45397480 RMD160 20fa3790c8ca950960020cdf3a32410689005db3 SHA1 b0067f99de1244723c45650d9a684b1e8f743954 SHA256 564354c34b41287e951005707b84b8a1f82c691189083c5943abed5e0aebe691
-DIST digikam-2.0.0.tar.bz2 53906557 RMD160 010f6b37920828003fa56159f1a7cf8452226fc6 SHA1 5941681163d90a13d316bd606589354099fd4f8a SHA256 c7d19f0562a06f02479cf84a257fe30aa523f82e668a16b21ce9ae5443034234
-DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
-EBUILD digikam-1.8.0.ebuild 3247 RMD160 86c84f6dea0b55764dad9cf4c6427b1b2fbc7742 SHA1 4ea44c2e1e30d7dfdb28bbeb8defbd740199fad9 SHA256 b93cb62a5f973e48ec99716183ee339dcd0c90791594a982b6d70bd216a425c4
-EBUILD digikam-1.9.0-r1.ebuild 3347 RMD160 3cdaf055dc0b801a3cd05ce5ebd91a7db10ff819 SHA1 29390bef0da866f1f914ba05e046f15f78297d4e SHA256 2b83becdcae58d502d977afe0551abf24b80365bb42be54144444b969d7342e2
-EBUILD digikam-1.9.0.ebuild 3178 RMD160 1f56c6f8cc4d7595dd751866f7a342974c0b67ea SHA1 e4193070e15b3851ff8fa2b6bb18ec48d3bfb0ac SHA256 b75d893953c1f37396f4f4b6a0c59005b4bf09307cb85aef958bc3910f3e9c75
-EBUILD digikam-2.0.0.ebuild 3616 RMD160 10830e6642d54e9438a172f662b83cd6f3e1dd97 SHA1 97d2aead3d64120088b86657c260806ac7c7e5da SHA256 574945446a4426360c4fe5e6598e03fe61feea0eea2ea76a4c7f8f20742e1f49
-EBUILD digikam-2.0.0_rc.ebuild 3500 RMD160 34a75d9a7b3aea4e5065cfc94d1674672a9a5ce3 SHA1 17abcd6e5996cc57a83fee9f9b0088aeaf1f4054 SHA256 2254955af12fb79aebdaec5dbaa6c3fe8e747ce47c42c22f2067ddddbf37f89a
-MISC ChangeLog 12539 RMD160 4e62c096a9cfca3dba63c5b50bc7b3b7fc467994 SHA1 48e665e87f787aace2ba417c8e1e6290503a2064 SHA256 db71a82aa54bd1e9370fee3da6f48e9fdc980117539d1ffbbefaac5017071e40
-MISC metadata.xml 751 RMD160 b65e7816a03a284f440d296c1853aa913105129a SHA1 c6bf2cf0d471e4d4ffdbb5185889a0e9cd65af39 SHA256 4b8eced4b0649dc935acffac97119bb70862bebd51a686b32778745b407eb0cb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJOMot4AAoJEEb+UGWnxTyHRoYP/1eAmo0/jXC8YVFVZos1bpU4
-8eM0oUArsHkR/v26T1mJB+a9D+CgkP9fLO0OvQsg2LUgc0JjCXxG+9t9LZb1wKA3
-C9OF9vt7XSYccVtyT63p1R9uslhvLWiKiJLLmZt19AxqtMLDiaZy6xF7czBO1Hi4
-yXCYzTfn74hW3qHsaj/26Fh29J/3eD7qq5f4Zli1tE6bcaTGAAAs5eJZ+t63ChxU
-ieK/IWM6Nw7wA01U+kvqLIxVl7SdZVFu5IMVAKj/aIVTybIUHexCR+7NZKsV/8Kl
-FuyvRKe7zqg4Txwprb1ay9xxzr04oj5h13S6yjKQZYuzQ7X8jCMLx/KRdrvhpomv
-FihdYFmmDFpBlCscGoAvMjdLP2G9HyeXIe1ixzNxEV69b5xoXUOqg0cXkNjQUOdT
-EAFb1Z0934Xe804lqBZy1enn+crz02/0IGvnbCSfGvr+PSjz8Y8X20BpfbtUqkQb
-1CLnncbZNGy7IJAnVsocE4D4Gk8tBISSo3NmSYQsjAF+D2MqphC52U7SXmlkP1SQ
-LP3HnJH62vHvsb13WyZnAlYmYf1jkyr3m0v5F1LkXbHwDI31z0xC/HPeBxqNWTnF
-vm0TNAdDaHNhSthVugP8Mk6tGD5J09txMGI/NIROSjjJ6Cu+ysIKIvaROMfZcCgh
-52aEbnSUVNe16zwIgArv
-=g+MZ
------END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-1.8.0.ebuild b/media-gfx/digikam/digikam-1.8.0.ebuild
deleted file mode 100644
index 0f4eca1..0000000
--- a/media-gfx/digikam/digikam-1.8.0.ebuild
+++ /dev/null
@@ -1,125 +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.8.0.ebuild,v 1.4 2011/02/11 20:33:40 xarthisius 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="
- >=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
- 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? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
- geolocation? ( >=kde-base/marble-${KDE_MINIMAL}[plasma] )
- gphoto2? ( media-libs/libgphoto2 )
-"
-RDEPEND="${CDEPEND}
- >=kde-base/kreadconfig-${KDE_MINIMAL}
- video? (
- || (
- >=kde-base/mplayerthumbs-${KDE_MINIMAL}
- >=kde-base/ffmpegthumbs-${KDE_MINIMAL}
- )
- )
-"
-DEPEND="${CDEPEND}
- sys-devel/gettext
- doc? ( app-doc/doxygen )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${PN}"-1.7.0-docs.patch
- "${FILESDIR}/${P}"-{tests,gcc46}.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/digikam-1.9.0-r1.ebuild b/media-gfx/digikam/digikam-1.9.0-r1.ebuild
deleted file mode 100644
index 5ef1230..0000000
--- a/media-gfx/digikam/digikam-1.9.0-r1.ebuild
+++ /dev/null
@@ -1,130 +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.5 2011/07/05 11:39:35 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}"
-
-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 5d28d34..0000000
--- a/media-gfx/digikam/digikam-1.9.0.ebuild
+++ /dev/null
@@ -1,125 +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.5 2011/06/07 02:51:21 abcd 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}"
-
-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/digikam-2.0.0.ebuild b/media-gfx/digikam/digikam-2.0.0.ebuild
deleted file mode 100644
index 321f140..0000000
--- a/media-gfx/digikam/digikam-2.0.0.ebuild
+++ /dev/null
@@ -1,140 +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-2.0.0_rc.ebuild,v 1.1 2011/07/27 20:51:56 dilfridge Exp $
-
-EAPI=4
-
-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"
-
-KDE_HANDBOOK="optional"
-CMAKE_MIN_VERSION="2.8"
-KDE_MINIMAL="4.7"
-
-inherit kde4-base
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="Digital photo management application for KDE"
-HOMEPAGE="http://www.digikam.org/"
-[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2
- handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="addressbook debug doc 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 marble plasma)
- $(add_kdebase_dep solid)
- media-libs/jasper
- media-libs/lcms:0
- >=media-libs/lensfun-0.2.5
- >=media-libs/libkface-${PV}
- >=media-libs/libkgeomap-${PV}
- media-libs/liblqr
- >=media-libs/libpgf-6.11.28
- media-libs/libpng
- media-libs/tiff
- virtual/jpeg
- x11-libs/qt-gui[qt3support]
- || ( >=sci-libs/clapack-3.2.1-r6 sci-libs/lapack-atlas )
- || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
- addressbook? ( $(add_kdebase_dep kdepimlibs) )
- gphoto2? ( media-libs/libgphoto2 )
- mysql? ( virtual/mysql )
-"
-RDEPEND="${CDEPEND}
- $(add_kdebase_dep kreadconfig)
- media-plugins/kipi-plugins
- video? (
- || (
- $(add_kdebase_dep mplayerthumbs)
- $(add_kdebase_dep ffmpegthumbs)
- )
- )
-"
-DEPEND="${CDEPEND}
- sys-devel/gettext
- doc? ( app-doc/doxygen )
-"
-
-S="${WORKDIR}/${MY_P}/core"
-
-src_prepare() {
- # just to make absolutely sure
- rm -rf "${WORKDIR}/${MY_P}/extra" || die
-
- # prepare the handbook
- mv "${WORKDIR}/${MY_P}/doc/${PN}" doc || die
- echo "add_subdirectory( digikam )" > doc/CMakeLists.txt
- echo "add_subdirectory( showfoto )" >> doc/CMakeLists.txt
-
- # prepare the translations
- mv "${WORKDIR}/${MY_P}/po" po || die
- find po -name "kipiplugin_*.po" -exec rm {} +
-
- echo "add_subdirectory( po )" >> CMakeLists.txt
-
- kde4-base_src_prepare
-
- if use handbook; then
- echo "add_subdirectory( doc )" >> CMakeLists.txt
- fi
-}
-
-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)
- -DWITH_MarbleWidget=ON
- $(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 INTERNALMYSQL)
- $(cmake-utils_use_enable debug DEBUG_MESSAGES)
- )
-
- kde4-base_src_configure
-}
-
-src_compile() {
- local mytargets="all"
- use doc && mytargets+=" doc"
-
- kde4-base_src_compile ${mytargets}
-}
-
-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/*
- 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-2.0.0_rc.ebuild b/media-gfx/digikam/digikam-2.0.0_rc.ebuild
deleted file mode 100644
index 706304c..0000000
--- a/media-gfx/digikam/digikam-2.0.0_rc.ebuild
+++ /dev/null
@@ -1,139 +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-2.0.0_rc.ebuild,v 1.1 2011/07/27 20:51:56 dilfridge Exp $
-
-EAPI=4
-
-KDE_LINGUAS=""
-#KDE_LINGUAS="be ca ca@valencia de el en_GB eo es et eu fi fr he hi hne hu is it km
-# ko lt lv nds nn pa pl pt pt_BR ro se sl sv th tr vi zh_CN zh_TW"
-#the release candidate has no internationalization
-
-KDE_HANDBOOK="optional"
-CMAKE_MIN_VERSION="2.8"
-KDE_MINIMAL="4.7"
-
-inherit kde4-base
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="Digital photo management application for KDE"
-HOMEPAGE="http://www.digikam.org/"
-[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2
- handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="addressbook debug doc 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 marble plasma)
- $(add_kdebase_dep solid)
- media-libs/jasper
- media-libs/lcms:0
- >=media-libs/lensfun-0.2.5
- >=media-libs/libkface-${PV}
- >=media-libs/libkmap-${PV}
- media-libs/liblqr
- >=media-libs/libpgf-6.11.24
- media-libs/libpng
- media-libs/tiff
- media-plugins/kipi-plugins
- virtual/jpeg
- x11-libs/qt-gui[qt3support]
- || ( >=sci-libs/clapack-3.2.1-r6 sci-libs/lapack-atlas )
- || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
- addressbook? ( $(add_kdebase_dep kdepimlibs) )
- gphoto2? ( media-libs/libgphoto2 )
- mysql? ( virtual/mysql )
-"
-RDEPEND="${CDEPEND}
- $(add_kdebase_dep kreadconfig)
- video? (
- || (
- $(add_kdebase_dep mplayerthumbs)
- $(add_kdebase_dep ffmpegthumbs)
- )
- )
-"
-DEPEND="${CDEPEND}
- sys-devel/gettext
- doc? ( app-doc/doxygen )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.0.0_rc-oldpgf.patch"
- "${FILESDIR}/${PN}-2.0.0_rc-officialpgf.patch"
- "${FILESDIR}/${PN}-2.0.0_rc-officialpgf2.patch"
-)
-
-S="${WORKDIR}/${MY_P}/core"
-
-src_prepare() {
- # just to make absolutely sure
- rm -rf "${WORKDIR}/${MY_P}/extra" || die
-
- mv "${WORKDIR}/${MY_P}/doc/${PN}" doc || die
- echo "add_subdirectory( digikam )" > doc/CMakeLists.txt
- echo "add_subdirectory( showfoto )" >> doc/CMakeLists.txt
-
- kde4-base_src_prepare
-
- if use handbook; then
- echo "add_subdirectory( doc )" >> CMakeLists.txt
- fi
-}
-
-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)
- -DWITH_MarbleWidget=ON
- $(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 INTERNALMYSQL)
- $(cmake-utils_use_enable debug DEBUG_MESSAGES)
- )
-
- kde4-base_src_configure
-}
-
-src_compile() {
- local mytargets="all"
- use doc && mytargets+=" doc"
-
- kde4-base_src_compile ${mytargets}
-}
-
-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/*
- 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.1.0-libpgf.patch b/media-gfx/digikam/files/digikam-1.1.0-libpgf.patch
deleted file mode 100644
index 47b2c72..0000000
--- a/media-gfx/digikam/files/digikam-1.1.0-libpgf.patch
+++ /dev/null
@@ -1,232 +0,0 @@
-From 0e5ebb56e3b0ca85b8ca74ae3577b06a4795cad6 Mon Sep 17 00:00:00 2001
-From: Ronan Arraes Jardim Chagas <ronisbr@gmail.com>
-Date: Thu, 4 Feb 2010 11:09:22 -0200
-Subject: [PATCH] Initial approach to unbundled libpgf from Digikam 1.1.0
-
-Changes to be committed:
-
- modified: CMakeLists.txt
- new file: cmake/modules/FindPGF.cmake
- modified: digikam/CMakeLists.txt
- modified: libs/CMakeLists.txt
----
- CMakeLists.txt | 70 ++++++++++++++++++++++++++++++------------
- cmake/modules/FindPGF.cmake | 15 +++++++++
- digikam/CMakeLists.txt | 8 ++---
- libs/CMakeLists.txt | 1 +
- 4 files changed, 69 insertions(+), 25 deletions(-)
- create mode 100644 cmake/modules/FindPGF.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3cf296a..329e410 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -34,6 +34,13 @@ SET(DIGIKAM_VERSION_STRING
- "${DIGIKAM_VERSION_SHORT}${DIGIKAM_SUFFIX_VERSION}"
- )
-
-+# Path to find FindPGF.cmake script.
-+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules")
-+
-+# =================================================================================================
-+# Project options
-+OPTION(BUILD_DOC "Set ON to install documentation files" OFF)
-+
- # ==================================================================================================
- # Debug area codes
- # These codes will be set for every project specific path automatically, so
-@@ -115,6 +122,11 @@ FIND_PACKAGE(LCMS)
- 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)
-@@ -197,6 +209,7 @@ MESSAGE(STATUS "")
-
- 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)
-@@ -298,13 +311,13 @@ ELSE(DOXYGEN_FOUND)
- 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 "")
-@@ -889,14 +902,7 @@ IF(DIGIKAM_CAN_BE_COMPILED)
- ${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
-@@ -1176,18 +1182,42 @@ ENDIF(DIGIKAM_CAN_BE_COMPILED)
- # ==================================================================================================
- # API documentation generation
-
--IF(DOXYGEN_FOUND)
-
-- 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)
-+# Checks if user ask to build documentation.
-+IF(BUILD_DOC)
-+ IF(DOXYGEN_FOUND)
-
-- CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE})
-+ MESSAGE(STATUS "")
-+ MESSAGE(STATUS "Documentation will be installed")
-+ MESSAGE(STATUS "")
-
-- ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE}
-- WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-+ 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})
-+
-+ 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 --git a/cmake/modules/FindPGF.cmake b/cmake/modules/FindPGF.cmake
-new file mode 100644
-index 0000000..60aeacc
---- /dev/null
-+++ b/cmake/modules/FindPGF.cmake
-@@ -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 --git a/digikam/CMakeLists.txt b/digikam/CMakeLists.txt
-index 445e24f..e6839f7 100644
---- a/digikam/CMakeLists.txt
-+++ b/digikam/CMakeLists.txt
-@@ -73,6 +73,7 @@ INCLUDE_DIRECTORIES(
- ${JPEG_INCLUDE_DIR}
- ${PNG_PNG_INCLUDE_DIR}
- ${TIFF_INCLUDE_DIR}
-+ ${PGF_INCLUDE_DIRS}
- )
-
-
-@@ -81,9 +82,6 @@ INCLUDE_DIRECTORIES(
- # 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")
--
- SET(digikamcore_LIB_SRCS
- # basic libs
- ${libdimg_SRCS}
-@@ -100,7 +98,6 @@ SET(digikamcore_LIB_SRCS
- ${libgreycstoration_SRCS}
- ${libthreadimageio_SRCS}
- ${libthemeengine_SRCS}
-- ${libpgf_SRCS}
- ${pgfutils_SRCS}
- ${libdigikamhelpers_SRCS}
-
-@@ -150,6 +147,7 @@ TARGET_LINK_LIBRARIES(digikamcore
- ${JPEG_LIBRARIES}
- ${TIFF_LIBRARIES}
- ${PNG_LIBRARIES}
-+ ${PGF_LIBRARIES}
- ${LCMS_LIBRARIES}
- ${JASPER_LIBRARIES}
-
-@@ -193,7 +191,6 @@ SET(digikamdatabase_LIB_SRCS ${libdatabase_SRCS}
- ${libhaar_SRCS}
- ${libdatabasemodels_SRCS}
- ${libsqlite2_SRCS}
-- ${libpgf_SRCS}
- ${pgfutils_SRCS}
- )
-
-@@ -208,6 +205,7 @@ TARGET_LINK_LIBRARIES(digikamdatabase
- ${QT_QTCORE_LIBRARY}
- ${QT_QTGUI_LIBRARY}
- ${QT_QTSQL_LIBRARY}
-+ ${PGF_LIBRARIES}
- )
-
- SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSION 1 )
-diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
-index b66da1c..f0a6aab 100644
---- a/libs/CMakeLists.txt
-+++ b/libs/CMakeLists.txt
-@@ -21,6 +21,7 @@ INCLUDE_DIRECTORIES( dimg
- ${JPEG_INCLUDE_DIR}
- ${TIFF_INCLUDE_DIR}
- ${PNG_INCLUDE_DIR}
-+ ${PGF_INCLUDE_DIRS}
- ${JASPER_INCLUDE_DIR}
- )
- ADD_SUBDIRECTORY( curves )
---
-1.6.4.4
-
diff --git a/media-gfx/digikam/files/digikam-1.1.0-libpng14.patch b/media-gfx/digikam/files/digikam-1.1.0-libpng14.patch
deleted file mode 100644
index e7a161d..0000000
--- a/media-gfx/digikam/files/digikam-1.1.0-libpng14.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-http://repos.archlinux.org/wsvn/packages/digikam/trunk/libpng14.patch
-
---- libs/dimg/loaders/pngloader.cpp
-+++ libs/dimg/loaders/pngloader.cpp
-@@ -105,7 +105,7 @@
- unsigned char buf[PNG_BYTES_TO_CHECK];
-
- size_t membersRead = fread(buf, 1, PNG_BYTES_TO_CHECK, f);
-- if ((membersRead != PNG_BYTES_TO_CHECK) || !png_check_sig(buf, PNG_BYTES_TO_CHECK))
-+ if ((membersRead != PNG_BYTES_TO_CHECK) || png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK))
- {
- kDebug() << "Not a PNG image file.";
- fclose(f);
-@@ -322,7 +322,7 @@
- #ifdef ENABLE_DEBUG_MESSAGES
- kDebug() << "PNG in PNG_COLOR_TYPE_GRAY";
- #endif
-- png_set_gray_1_2_4_to_8(png_ptr);
-+ png_set_expand_gray_1_2_4_to_8(png_ptr);
- png_set_gray_to_rgb(png_ptr);
-
- if (QSysInfo::ByteOrder == QSysInfo::LittleEndian) // Intel
---- libs/threadimageio/thumbnailbasic.cpp
-+++ libs/threadimageio/thumbnailbasic.cpp
-@@ -137,7 +137,7 @@
- unsigned char buf[PNG_BYTES_TO_CHECK];
-
- size_t itemsRead = fread(buf, 1, PNG_BYTES_TO_CHECK, f);
-- if (itemsRead != 1 || !png_check_sig(buf, PNG_BYTES_TO_CHECK))
-+ if (itemsRead != 1 || png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK))
- {
- fclose(f);
- return qimage;
-@@ -232,7 +232,7 @@
- {
- png_set_gray_to_rgb(png_ptr);
- if (png_get_bit_depth(png_ptr, info_ptr) < 8)
-- png_set_gray_1_2_4_to_8(png_ptr);
-+ png_set_expand_gray_1_2_4_to_8(png_ptr);
- }
-
- int sizeOfUint = sizeof(unsigned int);
diff --git a/media-gfx/digikam/files/digikam-1.2.0-docs-r3.patch b/media-gfx/digikam/files/digikam-1.2.0-docs-r3.patch
deleted file mode 100644
index ff9f1a3..0000000
--- a/media-gfx/digikam/files/digikam-1.2.0-docs-r3.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -u -r -N digikam-1.2.0-2/CMakeLists.txt digikam-1.2.0/CMakeLists.txt
---- digikam-1.2.0-2/CMakeLists.txt 2010-09-25 18:01:53.000000000 +0200
-+++ digikam-1.2.0/CMakeLists.txt 2010-09-25 18:05:16.000000000 +0200
-@@ -1260,18 +1260,43 @@
- # ==================================================================================================
- # API documentation generation
-
--IF(DOXYGEN_FOUND)
-+# Checks if user ask to build documentation.
-+IF(BUILD_DOC)
-+ IF(DOXYGEN_FOUND)
-
-- 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)
-+ MESSAGE(STATUS "")
-+ MESSAGE(STATUS "Documentation will be installed")
-+ MESSAGE(STATUS "")
-
-- CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE})
-+ 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)
-
-- ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE}
-- WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-+ CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE})
-+
-+ ADD_CUSTOM_TARGET(doc ALL ${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 )
-+
-+add_subdirectory( doc )
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 f731078..0000000
--- 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/digikam-1.2.0-libpgf-r3.patch b/media-gfx/digikam/files/digikam-1.2.0-libpgf-r3.patch
deleted file mode 100644
index ebfb85d..0000000
--- a/media-gfx/digikam/files/digikam-1.2.0-libpgf-r3.patch
+++ /dev/null
@@ -1,157 +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
-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 )
diff --git a/media-gfx/digikam/files/digikam-1.2.0-libpgf.patch b/media-gfx/digikam/files/digikam-1.2.0-libpgf.patch
deleted file mode 100644
index e788cf0..0000000
--- a/media-gfx/digikam/files/digikam-1.2.0-libpgf.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 )
diff --git a/media-gfx/digikam/files/digikam-1.2.0-ratingwidget.patch b/media-gfx/digikam/files/digikam-1.2.0-ratingwidget.patch
deleted file mode 100644
index 02d4cce..0000000
--- a/media-gfx/digikam/files/digikam-1.2.0-ratingwidget.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.3.0-docs.patch b/media-gfx/digikam/files/digikam-1.3.0-docs.patch
deleted file mode 100644
index 63af639..0000000
--- a/media-gfx/digikam/files/digikam-1.3.0-docs.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -r -u -N digikam-1.3.0.orig/CMakeLists.txt digikam-1.3.0/CMakeLists.txt
---- digikam-1.3.0.orig/CMakeLists.txt 2010-06-07 23:23:08.000000000 +0200
-+++ digikam-1.3.0/CMakeLists.txt 2010-07-06 21:26:53.163356449 +0200
-@@ -1334,18 +1336,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 --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 c965a84..0000000
--- 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 2fb1f5e..0000000
--- 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}
diff --git a/media-gfx/digikam/files/digikam-1.4.0-docs.patch b/media-gfx/digikam/files/digikam-1.4.0-docs.patch
deleted file mode 100644
index 2cc2791..0000000
--- a/media-gfx/digikam/files/digikam-1.4.0-docs.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -r -u digikam-1.4.0.orig/CMakeLists.txt digikam-1.4.0/CMakeLists.txt
---- digikam-1.4.0.orig/CMakeLists.txt 2010-08-22 10:59:50.000000000 +0200
-+++ digikam-1.4.0/CMakeLists.txt 2010-09-24 23:48:11.557561663 +0200
-@@ -1340,18 +1340,45 @@
- # ==================================================================================================
- # API documentation generation
-
--IF(DOXYGEN_FOUND)
-+# Checks if user ask to build documentation.
-+IF(BUILD_DOC)
-+ IF(DOXYGEN_FOUND)
-
-- 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)
-+ MESSAGE(STATUS "")
-+ MESSAGE(STATUS "Documentation will be installed")
-+ MESSAGE(STATUS "")
-
-- CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE})
-+ 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)
-
-- ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE}
-- WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-+ CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE})
-+
-+ ADD_CUSTOM_TARGET(doc ALL ${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 )
-+
-+# Build the handbook
-+add_subdirectory( doc )
-+
diff --git a/media-gfx/digikam/files/digikam-1.5.0-unbundle.patch b/media-gfx/digikam/files/digikam-1.5.0-unbundle.patch
deleted file mode 100644
index 6d1470b..0000000
--- a/media-gfx/digikam/files/digikam-1.5.0-unbundle.patch
+++ /dev/null
@@ -1,294 +0,0 @@
-diff -r -u -N digikam-1.5.0-1-docs/CMakeLists.txt digikam-1.5.0/CMakeLists.txt
---- digikam-1.5.0-1-docs/CMakeLists.txt 2010-10-12 21:14:36.000000000 +0200
-+++ digikam-1.5.0/CMakeLists.txt 2010-10-15 23:07:49.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,10 +136,12 @@
- FIND_PACKAGE(JPEG)
- FIND_PACKAGE(PNG)
- FIND_PACKAGE(TIFF)
-+FIND_PACKAGE(PGF)
- FIND_PACKAGE(Jasper)
- 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
-@@ -273,6 +278,19 @@
- 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(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)
-+
-+
- # ================================================================
-
- IF(GPHOTO2_FOUND)
-@@ -367,13 +385,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) OR (NOT LENSFUN_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) OR (NOT LENSFUN_FOUND)))
-+
- MESSAGE(STATUS "----------------------------------------------------------------------------------")
- MESSAGE(STATUS "")
-
-@@ -585,7 +609,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
-@@ -618,6 +643,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}
-@@ -1076,14 +1102,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 -r -u -N digikam-1.5.0-1-docs/cmake/modules/FindCLAPACK.cmake digikam-1.5.0/cmake/modules/FindCLAPACK.cmake
---- digikam-1.5.0-1-docs/cmake/modules/FindCLAPACK.cmake 1970-01-01 01:00:00.000000000 +0100
-+++ digikam-1.5.0/cmake/modules/FindCLAPACK.cmake 2010-10-15 23:06:08.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.5.0-1-docs/cmake/modules/FindPGF.cmake digikam-1.5.0/cmake/modules/FindPGF.cmake
---- digikam-1.5.0-1-docs/cmake/modules/FindPGF.cmake 1970-01-01 01:00:00.000000000 +0100
-+++ digikam-1.5.0/cmake/modules/FindPGF.cmake 2010-10-15 23:05:52.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 -r -u -N digikam-1.5.0-1-docs/digikam/CMakeLists.txt digikam-1.5.0/digikam/CMakeLists.txt
---- digikam-1.5.0-1-docs/digikam/CMakeLists.txt 2010-10-10 21:37:09.000000000 +0200
-+++ digikam-1.5.0/digikam/CMakeLists.txt 2010-10-15 23:06:08.000000000 +0200
-@@ -53,8 +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
- ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/kipiiface
-@@ -94,13 +92,29 @@
- ${TIFF_INCLUDE_DIR}
- )
-
--# Shared libdigikamcore ################################################################
-+IF(PGF_FOUND)
-+ INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS})
-+ELSE(PGF_FOUND)
-+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/libpgf)
-+ENDIF(PGF_FOUND)
-+
-+IF(CLAPACK_FOUND)
-+ INCLUDE_DIRECTORIES(${CLAPACK_INCLUDE_DIR})
-+ELSE(CLAPACK_FOUND)
-+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/clapack)
-+ENDIF(CLAPACK_FOUND)
-
--# Disable Clapack C code warnings.
--SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS "-w")
-+# Shared libdigikamcore ################################################################
-
--# Disable libpgf warnings.
--SET_SOURCE_FILES_PROPERTIES(${libpgf_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.
-+ 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")
-@@ -187,10 +201,18 @@
- ${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)
-
-+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)
-@@ -241,6 +263,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} )
-
-@@ -339,6 +365,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.5.0-1-docs/libs/CMakeLists.txt digikam-1.5.0/libs/CMakeLists.txt
---- digikam-1.5.0-1-docs/libs/CMakeLists.txt 2010-10-10 21:36:54.000000000 +0200
-+++ digikam-1.5.0/libs/CMakeLists.txt 2010-10-15 23:05:52.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 -r -u -N digikam-1.5.0-1-docs/showfoto/CMakeLists.txt digikam-1.5.0/showfoto/CMakeLists.txt
---- digikam-1.5.0-1-docs/showfoto/CMakeLists.txt 2010-10-10 21:37:10.000000000 +0200
-+++ digikam-1.5.0/showfoto/CMakeLists.txt 2010-10-15 23:06:09.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}
diff --git a/media-gfx/digikam/files/digikam-1.6.0-docs.patch b/media-gfx/digikam/files/digikam-1.6.0-docs.patch
deleted file mode 100644
index 66376b0..0000000
--- a/media-gfx/digikam/files/digikam-1.6.0-docs.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -ru digikam-1.6.0.orig/CMakeLists.txt digikam-1.6.0/CMakeLists.txt
---- digikam-1.6.0.orig/CMakeLists.txt 2010-11-22 18:50:48.000000000 +0100
-+++ digikam-1.6.0/CMakeLists.txt 2010-11-25 00:16:54.000000000 +0100
-@@ -1423,7 +1423,14 @@
- # ==================================================================================================
- # API documentation generation
-
--IF(DOXYGEN_FOUND)
-+# 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})
-@@ -1432,8 +1439,27 @@
-
- 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})
--ENDIF(DOXYGEN_FOUND)
-+
-+ 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)
-+
-+
- include(MacroOptionalAddSubdirectory)
- macro_optional_add_subdirectory( po )
-+
-+# Build the handbook
-+add_subdirectory( doc )
diff --git a/media-gfx/digikam/files/digikam-1.7.0-docs.patch b/media-gfx/digikam/files/digikam-1.7.0-docs.patch
deleted file mode 100644
index 4d4edea..0000000
--- a/media-gfx/digikam/files/digikam-1.7.0-docs.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -ruN digikam-1.7.0.orig/CMakeLists.txt digikam-1.7.0/CMakeLists.txt
---- digikam-1.7.0.orig/CMakeLists.txt 2010-12-19 11:31:26.000000000 +0100
-+++ digikam-1.7.0/CMakeLists.txt 2010-12-26 18:57:13.000000000 +0100
-@@ -1423,8 +1423,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)
-@@ -1432,9 +1439,28 @@
-
- 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.8.0-gcc46.patch b/media-gfx/digikam/files/digikam-1.8.0-gcc46.patch
deleted file mode 100644
index d958102..0000000
--- a/media-gfx/digikam/files/digikam-1.8.0-gcc46.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- trunk/extragear/graphics/digikam/libs/threads/dynamicthread.cpp 2011/02/06 10:48:24 1219102
-+++ trunk/extragear/graphics/digikam/libs/threads/dynamicthread.cpp 2011/02/06 11:02:50 1219103
-@@ -257,6 +257,12 @@
- kDebug() << "Transition to Running: Invalid Inactive state" << q;
- return false;
- }
-+ default:
-+ {
-+ kDebug() << "libs/threads/dynanamicthread.cpp : Should never reach here: assert?" << q;
-+ return false;
-+ }
-+
- }
- }
-
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 ce03d2e..0000000
--- 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 588cfb9..0000000
--- 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 ed5c1bd..0000000
--- 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 50dec54..0000000
--- 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 bd10552..0000000
--- 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
-
diff --git a/media-gfx/digikam/files/digikam-2.0.0_beta1-docs.patch b/media-gfx/digikam/files/digikam-2.0.0_beta1-docs.patch
deleted file mode 100644
index 991f35f..0000000
--- a/media-gfx/digikam/files/digikam-2.0.0_beta1-docs.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -ruN digikam-2.0.0-beta1.orig/core/CMakeLists.txt digikam-2.0.0-beta1/core/CMakeLists.txt
---- digikam-2.0.0-beta1.orig/core/CMakeLists.txt 2011-01-03 15:05:12.000000000 +0100
-+++ digikam-2.0.0-beta1/core/CMakeLists.txt 2011-01-30 17:39:44.000000000 +0100
-@@ -1488,8 +1488,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)
-@@ -1497,6 +1504,20 @@
-
- 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)
diff --git a/media-gfx/digikam/files/digikam-2.0.0_beta4-docs.patch b/media-gfx/digikam/files/digikam-2.0.0_beta4-docs.patch
deleted file mode 100644
index 4abadd6..0000000
--- a/media-gfx/digikam/files/digikam-2.0.0_beta4-docs.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -ruN digikam-2.0.0-beta4.orig/core/CMakeLists.txt digikam-2.0.0-beta4/core/CMakeLists.txt
---- digikam-2.0.0-beta4.orig/core/CMakeLists.txt 2011-03-28 10:54:32.000000000 +0200
-+++ digikam-2.0.0-beta4/core/CMakeLists.txt 2011-04-02 00:51:08.000000000 +0200
-@@ -1558,8 +1558,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)
-@@ -1567,6 +1574,20 @@
-
- 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)
diff --git a/media-gfx/digikam/files/digikam-2.0.0_beta5-docs.patch b/media-gfx/digikam/files/digikam-2.0.0_beta5-docs.patch
deleted file mode 100644
index a5bc184..0000000
--- a/media-gfx/digikam/files/digikam-2.0.0_beta5-docs.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ruN digikam-2.0.0-beta5.orig/core/CMakeLists.txt digikam-2.0.0-beta5/core/CMakeLists.txt
---- digikam-2.0.0-beta5.orig/core/CMakeLists.txt 2011-05-04 10:52:35.000000000 +0200
-+++ digikam-2.0.0-beta5/core/CMakeLists.txt 2011-05-11 22:40:30.000000000 +0200
-@@ -1560,8 +1560,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)
-@@ -1569,7 +1576,21 @@
-
- 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, because")
-+ MESSAGE(STATUS "the option -DBUILD_DOC=ON wasn't passed to cmake")
-+ MESSAGE(STATUS "")
-+
-+ENDIF(BUILD_DOC)
diff --git a/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf.patch b/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf.patch
deleted file mode 100644
index 78f7770..0000000
--- a/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -ruN digikam-2.0.0-rc.orig/core/cmake/modules/FindPGF.cmake digikam-2.0.0-rc/core/cmake/modules/FindPGF.cmake
---- digikam-2.0.0-rc.orig/core/cmake/modules/FindPGF.cmake 2011-06-28 16:38:50.000000000 +0200
-+++ digikam-2.0.0-rc/core/cmake/modules/FindPGF.cmake 2011-07-04 15:32:50.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-2.0.0-rc.orig/core/digikam/utils/config-digikam.h.cmake digikam-2.0.0-rc/core/digikam/utils/config-digikam.h.cmake
---- digikam-2.0.0-rc.orig/core/digikam/utils/config-digikam.h.cmake 2011-06-28 16:38:50.000000000 +0200
-+++ digikam-2.0.0-rc/core/digikam/utils/config-digikam.h.cmake 2011-07-04 15:29:24.000000000 +0200
-@@ -57,6 +57,8 @@
- /* Define to 1 if we know how to start mysqld */
- #cmakedefine HAVE_INTERNALMYSQL 1
-
-+#define PGFCodecVersionID 0x${PGF_CODEC_VERSION_ID}
-+
- #define LIBEXEC_INSTALL_DIR "${LIBEXEC_INSTALL_DIR}"
-
- /*
-diff -ruN digikam-2.0.0-rc.orig/core/libs/threadimageio/pgfutils.cpp digikam-2.0.0-rc/core/libs/threadimageio/pgfutils.cpp
---- digikam-2.0.0-rc.orig/core/libs/threadimageio/pgfutils.cpp 2011-06-28 16:38:44.000000000 +0200
-+++ digikam-2.0.0-rc/core/libs/threadimageio/pgfutils.cpp 2011-07-04 15:29:24.000000000 +0200
-@@ -46,6 +46,7 @@
- // LibPGF includes
-
- #include "PGFimage.h"
-+#include "config-digikam.h"
-
- namespace Digikam
- {
diff --git a/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf2.patch b/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf2.patch
deleted file mode 100644
index 184360d..0000000
--- a/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ruN digikam-2.0.0-rc.orig/core/libs/dimg/loaders/pgfloader.cpp digikam-2.0.0-rc/core/libs/dimg/loaders/pgfloader.cpp
---- digikam-2.0.0-rc.orig/core/libs/dimg/loaders/pgfloader.cpp 2011-06-28 16:38:45.000000000 +0200
-+++ digikam-2.0.0-rc/core/libs/dimg/loaders/pgfloader.cpp 2011-07-05 13:50:20.036746353 +0200
-@@ -29,6 +29,7 @@
- //#define ENABLE_DEBUG_MESSAGES
-
- #include "pgfloader.h"
-+#include "config-digikam.h"
-
- // C Ansi includes
-
-@@ -435,10 +436,8 @@
- CallbackForLibPGF, this);
-
- UINT32 nWrittenBytes = 0;
--#ifdef PGFCodecVersionID
--# if PGFCodecVersionID >= 0x061124
-+#if PGFCodecVersionID >= 0x061124
- pgf.Write(&stream, &nWrittenBytes, CallbackForLibPGF, this);
--# endif
- #else
- pgf.Write(&stream, 0, CallbackForLibPGF, &nWrittenBytes, this);
- #endif
diff --git a/media-gfx/digikam/files/digikam-2.0.0_rc-oldpgf.patch b/media-gfx/digikam/files/digikam-2.0.0_rc-oldpgf.patch
deleted file mode 100644
index c60a7e3..0000000
--- a/media-gfx/digikam/files/digikam-2.0.0_rc-oldpgf.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 1f80f35b68702136ebd3d315fe4baf7d75b3c142
-Author: Gilles Caulier <caulier.gilles@gmail.com>
-Date: Sun Jul 3 10:57:21 2011 +0200
-
- compile with libpgf 6.09.44
- BUGS: 276969
-
-diff --git a/libs/threadimageio/pgfutils.cpp b/libs/threadimageio/pgfutils.cpp
-index 2b5829f..758f12c 100644
---- a/libs/threadimageio/pgfutils.cpp
-+++ b/libs/threadimageio/pgfutils.cpp
-@@ -151,7 +151,14 @@ bool writePGFImageData(const QImage& img, QByteArray& data, int quality)
- // TODO : optimize memory allocation...
- CPGFMemoryStream stream(256000);
- UINT32 nWrittenBytes = 0;
-+
-+#ifdef PGFCodecVersionID
-+# if PGFCodecVersionID >= 0x061124
- pgfImg.Write(&stream, &nWrittenBytes);
-+# endif
-+#else
-+ pgfImg.Write(&stream, 0, 0, &nWrittenBytes);
-+#endif
-
- data = QByteArray((const char*)stream.GetBuffer(), nWrittenBytes);
-
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
deleted file mode 100644
index 032404f..0000000
--- a/media-gfx/digikam/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd>
-<maintainer><email>dilfridge@gentoo.org</email></maintainer>
-<use>
- <flag name="addressbook">Add support for kdepim</flag>
- <flag name="geolocation">Add support for marble</flag>
- <flag name="themedesigner">Build the digikam theme designer</flag>
- <flag name="thumbnails">Enable thumbnails database support</flag>
- <flag name="video">Pull in mplayerthumbs to enable video thumbnails</flag>
- <flag name="linguas_ha">Hausa translation</flag>
- <flag name="linguas_mi">Maori translation</flag>
- <flag name="linguas_tt">?? translation</flag>
- <flag name="linguas_ven">Venda translation</flag>
-</use>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
@ 2011-07-27 21:57 Andreas Hüttel
0 siblings, 0 replies; 13+ messages in thread
From: Andreas Hüttel @ 2011-07-27 21:57 UTC (permalink / raw
To: gentoo-commits
commit: de5d6e5bf27c1cf34d4f1ce4dbb4a3e3ef34a0d6
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Wed Jul 27 21:57:29 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Jul 27 21:57:29 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=de5d6e5b
Resync with main tree
(Portage version: 2.1.10.7/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
---
media-gfx/digikam/ChangeLog | 5 +
media-gfx/digikam/Manifest | 35 ++++----
media-gfx/digikam/digikam-1.9.0-r1.ebuild | 7 +-
media-gfx/digikam/digikam-1.9.0.ebuild | 24 +++---
media-gfx/digikam/digikam-2.0.0_rc.ebuild | 5 +-
media-gfx/digikam/files/digikam-1.9.0-newpgf.patch | 92 ++++++++++++++++++++
6 files changed, 134 insertions(+), 34 deletions(-)
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index a4bf127..51e1807 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 27 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org> digikam-1.9.0.ebuild,
+ digikam-1.9.0-r1.ebuild, +files/digikam-1.9.0-newpgf.patch,
+ digikam-2.0.0_rc.ebuild:
+ Resync with main tree
+
27 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
digikam-2.0.0_rc.ebuild:
Cleanup, re-add accidentally dropped useflag mysql, depend on kde-4.7
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 1deea89..6b434ee 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -18,6 +18,7 @@ AUX digikam-1.7.0-docs.patch 1457 RMD160 e41322e23bb47234047fbe78aaf920299690705
AUX digikam-1.8.0-gcc46.patch 512 RMD160 950c4744a8d4bfe88f0f19233bfd5aefb87ccbba SHA1 e3682e8af28233609c12817ec13a120c95a169be SHA256 088709ad10f71266957d237fabba9ee6f1de0f43ba2c5f63badbeb974d140241
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
AUX digikam-2.0.0_beta1-docs.patch 1361 RMD160 3b98a59e9790a7bc12dc5ec4723860d2cc968c4b SHA1 63d6d8c23126a198b91a56528cdfd97559f1f398 SHA256 dc8bf8aa8c6f956a5afd60bc0bc526872ed7b7604a3e1b8acb1613c947a5c97c
@@ -33,27 +34,27 @@ DIST digikam-2.0.0-beta6.tar.bz2 43533320 RMD160 eb50febc2ade359f8d92e6673e4f73a
DIST digikam-2.0.0-rc.tar.bz2 45397480 RMD160 20fa3790c8ca950960020cdf3a32410689005db3 SHA1 b0067f99de1244723c45650d9a684b1e8f743954 SHA256 564354c34b41287e951005707b84b8a1f82c691189083c5943abed5e0aebe691
DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
EBUILD digikam-1.8.0.ebuild 3247 RMD160 86c84f6dea0b55764dad9cf4c6427b1b2fbc7742 SHA1 4ea44c2e1e30d7dfdb28bbeb8defbd740199fad9 SHA256 b93cb62a5f973e48ec99716183ee339dcd0c90791594a982b6d70bd216a425c4
-EBUILD digikam-1.9.0-r1.ebuild 3299 RMD160 c4f0ffdc7d1bb89581c721a4a85310e7ca4b704f SHA1 1346318824da28a94445ebac446c737e46906dae SHA256 b73c19ab5cf8ecddec3802687b00e664e3fbc7b054a504173b540151e0c324f6
-EBUILD digikam-1.9.0.ebuild 3242 RMD160 04df3e2432a19d01a07851d8a8a3821279aa4af0 SHA1 c80b1939a52ab7aa7c0032373022f3cb931fee81 SHA256 e5bc2256f812d90206d99b3ec6f6ffbad75e5dd0bbcccaa8e349e894eef73d53
+EBUILD digikam-1.9.0-r1.ebuild 3347 RMD160 3cdaf055dc0b801a3cd05ce5ebd91a7db10ff819 SHA1 29390bef0da866f1f914ba05e046f15f78297d4e SHA256 2b83becdcae58d502d977afe0551abf24b80365bb42be54144444b969d7342e2
+EBUILD digikam-1.9.0.ebuild 3178 RMD160 1f56c6f8cc4d7595dd751866f7a342974c0b67ea SHA1 e4193070e15b3851ff8fa2b6bb18ec48d3bfb0ac SHA256 b75d893953c1f37396f4f4b6a0c59005b4bf09307cb85aef958bc3910f3e9c75
EBUILD digikam-2.0.0_beta5.ebuild 3245 RMD160 cc3e08c7da4a3bd909edb43f6b33ad3aff64b762 SHA1 a8501a880d6cc3c9e22153fc8288908de09c1d2a SHA256 8b5dfd0865866bb01fcfe6d5055b798194ea6e3dfefa29821dac73dd997643bf
EBUILD digikam-2.0.0_beta6.ebuild 3226 RMD160 939ed0020e35608d4140e73b40f9266093c0e2a8 SHA1 6baad3fab16f5f406295f7e7e084e67e9c233e48 SHA256 b6ee9123131a9b97c984d7bfc05a9b69ce644083499702c0c18d394c5854ba75
-EBUILD digikam-2.0.0_rc.ebuild 3346 RMD160 be0115573261b514fa58148436c2c49c015c5826 SHA1 00b5733fbb44c4b345113749945cdc8c1d92cb96 SHA256 c49e09577600adad9478a9702a79f2003c99a132a22fee68ecc33b928e698111
-MISC ChangeLog 12010 RMD160 9ae712c69a3ad32799d2cc72d130bda5ee4fcc3c SHA1 363ad373e7411f9978cfba67cd1765ff1c596f8b SHA256 8376c41406c84a03ce41474a6d0db69d7512c59cd37bc9a0a04edb7ca9c93c43
+EBUILD digikam-2.0.0_rc.ebuild 3500 RMD160 34a75d9a7b3aea4e5065cfc94d1674672a9a5ce3 SHA1 17abcd6e5996cc57a83fee9f9b0088aeaf1f4054 SHA256 2254955af12fb79aebdaec5dbaa6c3fe8e747ce47c42c22f2067ddddbf37f89a
+MISC ChangeLog 12203 RMD160 dad8c089a58312af04a5df63bae02cf38af3209d SHA1 9558c98e432bc61204e9782d1fb9c4c050fccfe3 SHA256 4a85e9b0a2cbc911a6ee392c357d7d603bd2cb9b4095b125c14d1cb6921f9044
MISC metadata.xml 553 RMD160 7de4b2dc583e17cfab08965015c5bb6291b968d8 SHA1 c7eecc86fd6539448bc2a8296f77c2bc4796e3a1 SHA256 f3280886ea9f988ca1315148380f1c89c6c042d0bc511105f3b2c3a926e17b80
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCgAGBQJOMHWOAAoJENwGBM22xffeO84QAIp63v4ceC7fhc7ulFETs7fh
-+hTa0NmQW3//A6idGCSXTinnpZcaFOVRf8ny0uKXuzSPJ1enN3FeQHRrdhttR2UM
-EsfhGN1Z7IMug1rzyk3d24xwf1mxAA2YCvFnZ4kVo813i/fGYIv52/isCDRrB0mC
-eL36N1+xdOgNIXCtsqHTfSnNLXjxPvuFH0fea2YTN25qCDZTEIEdwrDp4EIzMQQa
-XkcrwiaIAEdEqYRBOGsR1ncKm/T1Q4iK6SSUTq8Szmay+fxgZZuMLfVndrABgp4g
-7nWQkjj8CoU34ZC3LTBzQQJcnmSSWbug9UceU3tGJ6556T3jjwRCtdzk6yvN4e9r
-eWqpW7jaSs44J9GczO4jxhAUFkXLb/GrmO1NhL1EIrBqN/gWfeVlArQzb5BD4sQK
-xOw8PJLYaa6GwTzxvT68xzJxQ6TdMYTvypuqBM/1V/gXQeadS9miqdc53TC3sdMS
-ps9pp8pWr+P4+pSfWbUQGNZLOmG/Ml+c6bAy3ILpWd86rb/WM5E/HI3BBi56PQA5
-knUxDzCS9L47yIfOZhFWprYG8sFxmIJQ0VvxGL/UUkh40TOE7U4S9a1tlq/nuA5Q
-x4+oZ09npmNp7qHIUwmtTVyrb3r7FtqEMvnWA9eghUkxx0BYbB4I9Ta2XO+eJajU
-XqIAlP6OfYvXanby8cGl
-=P5KI
+iQIcBAEBCgAGBQJOMInJAAoJENwGBM22xffeoecQAJ5dNaTo+foLdjZAnYQOqzAO
+ZemA7GnO/84v0P2YFJJfDaKMmhvy1YFl1fXZBHNk1Ivk10LJhMXKcSHpkwP8BDwp
+BOUVJqWIRVmBXNjsoNbwWG08P3zs4nkjWRPFBwYjuW2SOld3Kt0zZ2/2YqvkMaT9
+Pxgw9HAVmOFrBo+jiDU3lCGM+zaplUIBXuXf4Uz/RH8nCgBAtpQ4rsFDbBNgrPJh
+4NjgK/3qGJ9EUsLNQaPuynlrM0JqUajylrOEPMrI4ZqGG+o/KIDMTQTipkgVQAHq
+jVQMDptS0u3cGmArOOGTdv23PIPWVI9iqLoAE2jhS6M2t+JG54OqaNhh+zd9fEkb
+MlDAA0ISxdQeEj5tgpA/U2zv9W9WtH9TpN087OCc5ZXXlmN+36oWfGSw3eOdXdrZ
+e3Xfhgpbia/35/nmbxh/tpEfRBuMBGdsI/oZVToeQXqVRyfzX5hIhpvSIiUuKGz6
+NillqL7oSAUnNEAhi95ZTXtSMTyChkrVXV2kuDrN4SdRE3Wjwphdf2XR2pYwHrrB
+KFGwXwClNn6hmHVFh2Jvr2jrQUronIWlaXdun+w1F50Gv0CbDCl6KcLFM3zrjL60
+dFSr3s2ynmxaRH2Qgv73aL/BvPcz2pOaBaPuLIoAjwSjsvTRtA6w8Cmx2uPiJGK8
+yCtbfrJpTKyukhs4vo/f
+=feu8
-----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
index 1eff898..5ef1230 100644
--- a/media-gfx/digikam/digikam-1.9.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-1.9.0-r1.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-gfx/digikam/digikam-1.9.0-r1.ebuild,v 1.2 2011/05/11 10:45:31 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.9.0-r1.ebuild,v 1.5 2011/07/05 11:39:35 dilfridge Exp $
EAPI=4
@@ -52,8 +52,8 @@ RDEPEND="${CDEPEND}
$(add_kdebase_dep kreadconfig)
video? (
|| (
- $(add_kdebase_dep ffmpegthumbs)
- $(add_kdebase_dep mplayerthumbs)
+ ( $(add_kdebase_dep ffmpegthumbs) )
+ ( $(add_kdebase_dep mplayerthumbs) )
)
)
"
@@ -69,6 +69,7 @@ PATCHES=(
"${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() {
diff --git a/media-gfx/digikam/digikam-1.9.0.ebuild b/media-gfx/digikam/digikam-1.9.0.ebuild
index ee18dc5..5d28d34 100644
--- a/media-gfx/digikam/digikam-1.9.0.ebuild
+++ b/media-gfx/digikam/digikam-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-gfx/digikam/digikam-1.9.0.ebuild,v 1.4 2011/05/09 23:10:48 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.9.0.ebuild,v 1.5 2011/06/07 02:51:21 abcd Exp $
EAPI=3
@@ -26,11 +26,11 @@ SLOT="4"
IUSE="addressbook debug doc geolocation gphoto2 handbook 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}
+ $(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
@@ -44,16 +44,16 @@ CDEPEND="
virtual/mysql
x11-libs/qt-gui[qt3support]
|| ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
- addressbook? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
- geolocation? ( >=kde-base/marble-${KDE_MINIMAL}[plasma] )
+ addressbook? ( $(add_kdebase_dep kdepimlibs) )
+ geolocation? ( $(add_kdebase_dep marble plasma) )
gphoto2? ( media-libs/libgphoto2 )
"
RDEPEND="${CDEPEND}
- >=kde-base/kreadconfig-${KDE_MINIMAL}
+ $(add_kdebase_dep kreadconfig)
video? (
|| (
- >=kde-base/mplayerthumbs-${KDE_MINIMAL}
- >=kde-base/ffmpegthumbs-${KDE_MINIMAL}
+ ( $(add_kdebase_dep mplayerthumbs) )
+ ( $(add_kdebase_dep ffmpegthumbs) )
)
)
"
@@ -120,6 +120,6 @@ pkg_postinst() {
kde4-base_pkg_postinst
if use doc; then
- elog The digikam api documentation has been installed at /usr/share/doc/${PF}/html
+ elog "The digikam api documentation has been installed at /usr/share/doc/${PF}/html"
fi
}
diff --git a/media-gfx/digikam/digikam-2.0.0_rc.ebuild b/media-gfx/digikam/digikam-2.0.0_rc.ebuild
index d3834ff..706304c 100644
--- a/media-gfx/digikam/digikam-2.0.0_rc.ebuild
+++ b/media-gfx/digikam/digikam-2.0.0_rc.ebuild
@@ -1,12 +1,13 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.0.0_rc.ebuild,v 1.1 2011/07/27 20:51:56 dilfridge Exp $
EAPI=4
KDE_LINGUAS=""
#KDE_LINGUAS="be ca ca@valencia de el en_GB eo es et eu fi fr he hi hne hu is it km
# ko lt lv nds nn pa pl pt pt_BR ro se sl sv th tr vi zh_CN zh_TW"
+#the release candidate has no internationalization
KDE_HANDBOOK="optional"
CMAKE_MIN_VERSION="2.8"
@@ -16,7 +17,7 @@ inherit kde4-base
MY_P="${PN}-${PV/_/-}"
-DESCRIPTION="A digital photo management application for KDE."
+DESCRIPTION="Digital photo management application for KDE"
HOMEPAGE="http://www.digikam.org/"
[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
diff --git a/media-gfx/digikam/files/digikam-1.9.0-newpgf.patch b/media-gfx/digikam/files/digikam-1.9.0-newpgf.patch
new file mode 100644
index 0000000..ed5c1bd
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-1.9.0-newpgf.patch
@@ -0,0 +1,92 @@
+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);
+ }
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
@ 2011-07-05 12:04 Andreas Hüttel
0 siblings, 0 replies; 13+ messages in thread
From: Andreas Hüttel @ 2011-07-05 12:04 UTC (permalink / raw
To: gentoo-commits
commit: 75979529b7886433da99b6b2451853f25d8c7665
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 5 12:05:07 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jul 5 12:05:07 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=75979529
Additional compile fix for libpgf-6.11.24
(Portage version: 2.1.10.3/git/Linux x86_64, unsigned Manifest commit)
---
media-gfx/digikam/ChangeLog | 4 +++
media-gfx/digikam/Manifest | 5 ++-
media-gfx/digikam/digikam-2.0.0_rc.ebuild | 1 +
.../files/digikam-2.0.0_rc-officialpgf2.patch | 23 ++++++++++++++++++++
4 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 0d509d7..2e5d407 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -3,6 +3,10 @@
# $Header: $
05 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ digikam-2.0.0_rc.ebuild, +files/digikam-2.0.0_rc-officialpgf2.patch:
+ Additional compile fix for libpgf-6.11.24
+
+ 05 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
-files/digikam-2.0.0_officialpgf.patch,
+files/digikam-2.0.0_rc-officialpgf.patch:
Include build fix for new but unbundled libpgf
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 207a69c..4a34b5b 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -21,6 +21,7 @@ AUX digikam-2.0.0_beta1-docs.patch 1361 RMD160 3b98a59e9790a7bc12dc5ec4723860d2c
AUX digikam-2.0.0_beta4-docs.patch 1361 RMD160 0a68569608e99781708b5c242c90e0df6808a655 SHA1 d33c4ca548bd3f605d992ea32f287212ef68bd77 SHA256 9902322da1310bcf728d8172d5bbd53f7080555bfdd629dbe0eba069d9eec8ac
AUX digikam-2.0.0_beta5-docs.patch 1364 RMD160 e7e618d7ae5939328d43e1b41e11f6b4eb2f4821 SHA1 ff5519b3ee8cf19e091c1ac1b38817485921b7d2 SHA256 4113cc07a61d22a727f73fed917eb4ae82493f700673daf58acfcce455914964
AUX digikam-2.0.0_rc-officialpgf.patch 2351 RMD160 a3be56a7377b013bfa2a3539a8bbe7cfc9d3a75d SHA1 883b79dca41f7c624de3a8dc85b02f2dcae363a9 SHA256 bf40b21501bb944993017fcc0f05411e100b88708b1560ddd00e7ca203db3bda
+AUX digikam-2.0.0_rc-officialpgf2.patch 824 RMD160 54715604f3ca772253fee111f311028bc6dc9643 SHA1 8d170abfebddbf1d4f146d6c0b568f2a6262466a SHA256 0f3f010da6f7230ef865169db58f8595796354726b5599e975fde42af4fecbd5
AUX digikam-2.0.0_rc-oldpgf.patch 866 RMD160 36d94d476bdd02647fe4071b6ca2d9d09c851282 SHA1 3c49b420987df7db854a6a426daa848c42a36f3c SHA256 11389b36e669ae65522f439672d0409963f86eba0d2f439402311e67650dc89c
DIST digikam-1.8.0.tar.bz2 23376636 RMD160 aa86cae8048a8f7122285c5e27aaa59e5dbcc47c SHA1 65430990896b56b7ec76b9a6bc5f8472145f44fd SHA256 210de9d949265e910c65c9ab8b19efab13839f6a2ef761a5915d267ddfe494aa
DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5
@@ -33,6 +34,6 @@ EBUILD digikam-1.9.0-r1.ebuild 3299 RMD160 c4f0ffdc7d1bb89581c721a4a85310e7ca4b7
EBUILD digikam-1.9.0.ebuild 3242 RMD160 04df3e2432a19d01a07851d8a8a3821279aa4af0 SHA1 c80b1939a52ab7aa7c0032373022f3cb931fee81 SHA256 e5bc2256f812d90206d99b3ec6f6ffbad75e5dd0bbcccaa8e349e894eef73d53
EBUILD digikam-2.0.0_beta5.ebuild 3245 RMD160 cc3e08c7da4a3bd909edb43f6b33ad3aff64b762 SHA1 a8501a880d6cc3c9e22153fc8288908de09c1d2a SHA256 8b5dfd0865866bb01fcfe6d5055b798194ea6e3dfefa29821dac73dd997643bf
EBUILD digikam-2.0.0_beta6.ebuild 3226 RMD160 939ed0020e35608d4140e73b40f9266093c0e2a8 SHA1 6baad3fab16f5f406295f7e7e084e67e9c233e48 SHA256 b6ee9123131a9b97c984d7bfc05a9b69ce644083499702c0c18d394c5854ba75
-EBUILD digikam-2.0.0_rc.ebuild 3311 RMD160 970164e604eb863f38851cfbf815c429a74b11ea SHA1 b36d9e465f17b5f30f5826fc6f4614ad3a22e188 SHA256 9194485f3a2c0b984d89b8580d8f3c45f372be0f300f898bf0d95517b5bcaaf5
-MISC ChangeLog 11518 RMD160 a1d900415947305f12f6d271fade081333b3209e SHA1 98fee384b20327b609851aed47182d47da654373 SHA256 b40c02f0b2e954aaecaca0aff57853ec2429d9d8fbeda3634258aa6067bc67ed
+EBUILD digikam-2.0.0_rc.ebuild 3360 RMD160 7148a6acb05d956ee209d77143511914c3703d09 SHA1 2a8d842f8315ef9b4247ae0522508ba183ceb22f SHA256 fc480aec87937847c41edd6902273bc085f912425dd5c72297ed6c7ed928896f
+MISC ChangeLog 11691 RMD160 e88fcaf22a616cd874070f46b7fff6a9c6efe19b SHA1 30f7d54168ee21281012d1c39d182b09aabed649 SHA256 f5e5e66b9c6f2ff2f3e9a743a3acc14826e169f3e15bd61deb8ee1a184a265c6
MISC metadata.xml 553 RMD160 7de4b2dc583e17cfab08965015c5bb6291b968d8 SHA1 c7eecc86fd6539448bc2a8296f77c2bc4796e3a1 SHA256 f3280886ea9f988ca1315148380f1c89c6c042d0bc511105f3b2c3a926e17b80
diff --git a/media-gfx/digikam/digikam-2.0.0_rc.ebuild b/media-gfx/digikam/digikam-2.0.0_rc.ebuild
index 378d391..61faba4 100644
--- a/media-gfx/digikam/digikam-2.0.0_rc.ebuild
+++ b/media-gfx/digikam/digikam-2.0.0_rc.ebuild
@@ -71,6 +71,7 @@ DEPEND="${CDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-2.0.0_rc-oldpgf.patch"
"${FILESDIR}/${PN}-2.0.0_rc-officialpgf.patch"
+ "${FILESDIR}/${PN}-2.0.0_rc-officialpgf2.patch"
)
S="${WORKDIR}/${MY_P}/core"
diff --git a/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf2.patch b/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf2.patch
new file mode 100644
index 0000000..184360d
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf2.patch
@@ -0,0 +1,23 @@
+diff -ruN digikam-2.0.0-rc.orig/core/libs/dimg/loaders/pgfloader.cpp digikam-2.0.0-rc/core/libs/dimg/loaders/pgfloader.cpp
+--- digikam-2.0.0-rc.orig/core/libs/dimg/loaders/pgfloader.cpp 2011-06-28 16:38:45.000000000 +0200
++++ digikam-2.0.0-rc/core/libs/dimg/loaders/pgfloader.cpp 2011-07-05 13:50:20.036746353 +0200
+@@ -29,6 +29,7 @@
+ //#define ENABLE_DEBUG_MESSAGES
+
+ #include "pgfloader.h"
++#include "config-digikam.h"
+
+ // C Ansi includes
+
+@@ -435,10 +436,8 @@
+ CallbackForLibPGF, this);
+
+ UINT32 nWrittenBytes = 0;
+-#ifdef PGFCodecVersionID
+-# if PGFCodecVersionID >= 0x061124
++#if PGFCodecVersionID >= 0x061124
+ pgf.Write(&stream, &nWrittenBytes, CallbackForLibPGF, this);
+-# endif
+ #else
+ pgf.Write(&stream, 0, CallbackForLibPGF, &nWrittenBytes, this);
+ #endif
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
@ 2011-07-05 7:09 Andreas Hüttel
0 siblings, 0 replies; 13+ messages in thread
From: Andreas Hüttel @ 2011-07-05 7:09 UTC (permalink / raw
To: gentoo-commits
commit: ab242d177e0dabeb3c6bed45f40eafd9956f0c7e
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 5 07:09:36 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jul 5 07:09:36 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=ab242d17
Include build fix for new but unbundled libpgf
(Portage version: 2.1.10.3/git/Linux x86_64, unsigned Manifest commit)
---
media-gfx/digikam/ChangeLog | 5 ++
media-gfx/digikam/Manifest | 4 +-
.../digikam/files/digikam-2.0.0_officialpgf.patch | 71 --------------------
.../files/digikam-2.0.0_rc-officialpgf.patch | 56 +++++++++++++++
4 files changed, 63 insertions(+), 73 deletions(-)
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index e8f4e7a..0d509d7 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 05 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ -files/digikam-2.0.0_officialpgf.patch,
+ +files/digikam-2.0.0_rc-officialpgf.patch:
+ Include build fix for new but unbundled libpgf
+
04 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
digikam-2.0.0_rc.ebuild, +files/digikam-2.0.0_officialpgf.patch:
Add build fix for offical new libpgf
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 460cf2a..207a69c 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -20,7 +20,7 @@ AUX digikam-1.9.0-turbo.patch 2265 RMD160 ecff0e0fa2ba6d51cdb6ec5bb90b41c3ed7310
AUX digikam-2.0.0_beta1-docs.patch 1361 RMD160 3b98a59e9790a7bc12dc5ec4723860d2cc968c4b SHA1 63d6d8c23126a198b91a56528cdfd97559f1f398 SHA256 dc8bf8aa8c6f956a5afd60bc0bc526872ed7b7604a3e1b8acb1613c947a5c97c
AUX digikam-2.0.0_beta4-docs.patch 1361 RMD160 0a68569608e99781708b5c242c90e0df6808a655 SHA1 d33c4ca548bd3f605d992ea32f287212ef68bd77 SHA256 9902322da1310bcf728d8172d5bbd53f7080555bfdd629dbe0eba069d9eec8ac
AUX digikam-2.0.0_beta5-docs.patch 1364 RMD160 e7e618d7ae5939328d43e1b41e11f6b4eb2f4821 SHA1 ff5519b3ee8cf19e091c1ac1b38817485921b7d2 SHA256 4113cc07a61d22a727f73fed917eb4ae82493f700673daf58acfcce455914964
-AUX digikam-2.0.0_officialpgf.patch 2538 RMD160 5939068015c2923dd0bbbe033ed1eda96d7972ee SHA1 4bcf25368d63bdf06bfa3a8d140832404e874755 SHA256 40f01b857e1bb68545f554ea01e0685fab390bbb3912cb3d233fd70ddef3c60e
+AUX digikam-2.0.0_rc-officialpgf.patch 2351 RMD160 a3be56a7377b013bfa2a3539a8bbe7cfc9d3a75d SHA1 883b79dca41f7c624de3a8dc85b02f2dcae363a9 SHA256 bf40b21501bb944993017fcc0f05411e100b88708b1560ddd00e7ca203db3bda
AUX digikam-2.0.0_rc-oldpgf.patch 866 RMD160 36d94d476bdd02647fe4071b6ca2d9d09c851282 SHA1 3c49b420987df7db854a6a426daa848c42a36f3c SHA256 11389b36e669ae65522f439672d0409963f86eba0d2f439402311e67650dc89c
DIST digikam-1.8.0.tar.bz2 23376636 RMD160 aa86cae8048a8f7122285c5e27aaa59e5dbcc47c SHA1 65430990896b56b7ec76b9a6bc5f8472145f44fd SHA256 210de9d949265e910c65c9ab8b19efab13839f6a2ef761a5915d267ddfe494aa
DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5
@@ -34,5 +34,5 @@ EBUILD digikam-1.9.0.ebuild 3242 RMD160 04df3e2432a19d01a07851d8a8a3821279aa4af0
EBUILD digikam-2.0.0_beta5.ebuild 3245 RMD160 cc3e08c7da4a3bd909edb43f6b33ad3aff64b762 SHA1 a8501a880d6cc3c9e22153fc8288908de09c1d2a SHA256 8b5dfd0865866bb01fcfe6d5055b798194ea6e3dfefa29821dac73dd997643bf
EBUILD digikam-2.0.0_beta6.ebuild 3226 RMD160 939ed0020e35608d4140e73b40f9266093c0e2a8 SHA1 6baad3fab16f5f406295f7e7e084e67e9c233e48 SHA256 b6ee9123131a9b97c984d7bfc05a9b69ce644083499702c0c18d394c5854ba75
EBUILD digikam-2.0.0_rc.ebuild 3311 RMD160 970164e604eb863f38851cfbf815c429a74b11ea SHA1 b36d9e465f17b5f30f5826fc6f4614ad3a22e188 SHA256 9194485f3a2c0b984d89b8580d8f3c45f372be0f300f898bf0d95517b5bcaaf5
-MISC ChangeLog 11324 RMD160 c854d1088c5dfa2af0484ec190d3b5149b40dcf2 SHA1 1174b45878aa769762599d9c56f2a8c1a282236a SHA256 23e512e42afa379426421c3c88ff7004e13b98c61722017ba06add358dba50fe
+MISC ChangeLog 11518 RMD160 a1d900415947305f12f6d271fade081333b3209e SHA1 98fee384b20327b609851aed47182d47da654373 SHA256 b40c02f0b2e954aaecaca0aff57853ec2429d9d8fbeda3634258aa6067bc67ed
MISC metadata.xml 553 RMD160 7de4b2dc583e17cfab08965015c5bb6291b968d8 SHA1 c7eecc86fd6539448bc2a8296f77c2bc4796e3a1 SHA256 f3280886ea9f988ca1315148380f1c89c6c042d0bc511105f3b2c3a926e17b80
diff --git a/media-gfx/digikam/files/digikam-2.0.0_officialpgf.patch b/media-gfx/digikam/files/digikam-2.0.0_officialpgf.patch
deleted file mode 100644
index 80d46b7..0000000
--- a/media-gfx/digikam/files/digikam-2.0.0_officialpgf.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-commit abd03787b7b1e3a392803edc5b40dfb25a69423c
-Author: Gilles Caulier <caulier.gilles@gmail.com>
-Date: Mon Jul 4 13:54:40 2011 +0200
-
- compile with last offcial libpgf
- CCBUGS: 276969
-
-diff --git a/cmake/modules/FindPGF.cmake b/cmake/modules/FindPGF.cmake
-index b6622c4..0c82a4e 100644
---- a/cmake/modules/FindPGF.cmake
-+++ b/cmake/modules/FindPGF.cmake
-@@ -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)
-@@ -14,11 +15,14 @@ IF(PKG_CONFIG_FOUND)
-
- 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}")
-+ 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 --git a/digikam/utils/config-digikam.h.cmake b/digikam/utils/config-digikam.h.cmake
-index 4ba293b..f881036 100644
---- a/digikam/utils/config-digikam.h.cmake
-+++ b/digikam/utils/config-digikam.h.cmake
-@@ -60,6 +60,8 @@
- /* Define to 1 if we know how to start mysqld */
- #cmakedefine HAVE_INTERNALMYSQL 1
-
-+#define PGFCodecVersionID 0x${PGF_CODEC_VERSION_ID}
-+
- #define LIBEXEC_INSTALL_DIR "${LIBEXEC_INSTALL_DIR}"
-
- /*
-diff --git a/libs/threadimageio/pgfutils.cpp b/libs/threadimageio/pgfutils.cpp
-index 758f12c..426a531 100644
---- a/libs/threadimageio/pgfutils.cpp
-+++ b/libs/threadimageio/pgfutils.cpp
-@@ -46,6 +46,7 @@ extern "C"
- // LibPGF includes
-
- #include "PGFimage.h"
-+#include "config-digikam.h"
-
- namespace Digikam
- {
diff --git a/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf.patch b/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf.patch
new file mode 100644
index 0000000..78f7770
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf.patch
@@ -0,0 +1,56 @@
+diff -ruN digikam-2.0.0-rc.orig/core/cmake/modules/FindPGF.cmake digikam-2.0.0-rc/core/cmake/modules/FindPGF.cmake
+--- digikam-2.0.0-rc.orig/core/cmake/modules/FindPGF.cmake 2011-06-28 16:38:50.000000000 +0200
++++ digikam-2.0.0-rc/core/cmake/modules/FindPGF.cmake 2011-07-04 15:32:50.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-2.0.0-rc.orig/core/digikam/utils/config-digikam.h.cmake digikam-2.0.0-rc/core/digikam/utils/config-digikam.h.cmake
+--- digikam-2.0.0-rc.orig/core/digikam/utils/config-digikam.h.cmake 2011-06-28 16:38:50.000000000 +0200
++++ digikam-2.0.0-rc/core/digikam/utils/config-digikam.h.cmake 2011-07-04 15:29:24.000000000 +0200
+@@ -57,6 +57,8 @@
+ /* Define to 1 if we know how to start mysqld */
+ #cmakedefine HAVE_INTERNALMYSQL 1
+
++#define PGFCodecVersionID 0x${PGF_CODEC_VERSION_ID}
++
+ #define LIBEXEC_INSTALL_DIR "${LIBEXEC_INSTALL_DIR}"
+
+ /*
+diff -ruN digikam-2.0.0-rc.orig/core/libs/threadimageio/pgfutils.cpp digikam-2.0.0-rc/core/libs/threadimageio/pgfutils.cpp
+--- digikam-2.0.0-rc.orig/core/libs/threadimageio/pgfutils.cpp 2011-06-28 16:38:44.000000000 +0200
++++ digikam-2.0.0-rc/core/libs/threadimageio/pgfutils.cpp 2011-07-04 15:29:24.000000000 +0200
+@@ -46,6 +46,7 @@
+ // LibPGF includes
+
+ #include "PGFimage.h"
++#include "config-digikam.h"
+
+ namespace Digikam
+ {
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
@ 2011-07-03 9:25 Andreas Hüttel
0 siblings, 0 replies; 13+ messages in thread
From: Andreas Hüttel @ 2011-07-03 9:25 UTC (permalink / raw
To: gentoo-commits
commit: 170142f01d9d4b71478dab69c2777f53069d5950
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 3 09:25:13 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Jul 3 09:25:13 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=170142f0
Add build fix for older libpgf
(Portage version: 2.1.10.3/git/Linux x86_64, unsigned Manifest commit)
---
media-gfx/digikam/ChangeLog | 4 +++
media-gfx/digikam/Manifest | 5 ++-
media-gfx/digikam/digikam-2.0.0_rc.ebuild | 2 +
.../digikam/files/digikam-2.0.0_rc-oldpgf.patch | 26 ++++++++++++++++++++
4 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index a6ca443..982e979 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 03 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ digikam-2.0.0_rc.ebuild, +files/digikam-2.0.0_rc-oldpgf.patch:
+ Add build fix for older libpgf
+
*digikam-2.0.0_rc (02 Jul 2011)
02 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 88551a0..80be244 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -20,6 +20,7 @@ AUX digikam-1.9.0-turbo.patch 2265 RMD160 ecff0e0fa2ba6d51cdb6ec5bb90b41c3ed7310
AUX digikam-2.0.0_beta1-docs.patch 1361 RMD160 3b98a59e9790a7bc12dc5ec4723860d2cc968c4b SHA1 63d6d8c23126a198b91a56528cdfd97559f1f398 SHA256 dc8bf8aa8c6f956a5afd60bc0bc526872ed7b7604a3e1b8acb1613c947a5c97c
AUX digikam-2.0.0_beta4-docs.patch 1361 RMD160 0a68569608e99781708b5c242c90e0df6808a655 SHA1 d33c4ca548bd3f605d992ea32f287212ef68bd77 SHA256 9902322da1310bcf728d8172d5bbd53f7080555bfdd629dbe0eba069d9eec8ac
AUX digikam-2.0.0_beta5-docs.patch 1364 RMD160 e7e618d7ae5939328d43e1b41e11f6b4eb2f4821 SHA1 ff5519b3ee8cf19e091c1ac1b38817485921b7d2 SHA256 4113cc07a61d22a727f73fed917eb4ae82493f700673daf58acfcce455914964
+AUX digikam-2.0.0_rc-oldpgf.patch 866 RMD160 36d94d476bdd02647fe4071b6ca2d9d09c851282 SHA1 3c49b420987df7db854a6a426daa848c42a36f3c SHA256 11389b36e669ae65522f439672d0409963f86eba0d2f439402311e67650dc89c
DIST digikam-1.8.0.tar.bz2 23376636 RMD160 aa86cae8048a8f7122285c5e27aaa59e5dbcc47c SHA1 65430990896b56b7ec76b9a6bc5f8472145f44fd SHA256 210de9d949265e910c65c9ab8b19efab13839f6a2ef761a5915d267ddfe494aa
DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5
DIST digikam-2.0.0-beta5.tar.bz2 43494127 RMD160 715f9f3f1695bad8e74dbeb9313da7a5303f0473 SHA1 97432e5997f00028c1acff38e2e0a791294c2aaf SHA256 118ea42cebaec6795b89cbb6018bdfa1d0e664eeda9b09ac0fd4083e3969f394
@@ -31,6 +32,6 @@ EBUILD digikam-1.9.0-r1.ebuild 3299 RMD160 c4f0ffdc7d1bb89581c721a4a85310e7ca4b7
EBUILD digikam-1.9.0.ebuild 3242 RMD160 04df3e2432a19d01a07851d8a8a3821279aa4af0 SHA1 c80b1939a52ab7aa7c0032373022f3cb931fee81 SHA256 e5bc2256f812d90206d99b3ec6f6ffbad75e5dd0bbcccaa8e349e894eef73d53
EBUILD digikam-2.0.0_beta5.ebuild 3245 RMD160 cc3e08c7da4a3bd909edb43f6b33ad3aff64b762 SHA1 a8501a880d6cc3c9e22153fc8288908de09c1d2a SHA256 8b5dfd0865866bb01fcfe6d5055b798194ea6e3dfefa29821dac73dd997643bf
EBUILD digikam-2.0.0_beta6.ebuild 3226 RMD160 939ed0020e35608d4140e73b40f9266093c0e2a8 SHA1 6baad3fab16f5f406295f7e7e084e67e9c233e48 SHA256 b6ee9123131a9b97c984d7bfc05a9b69ce644083499702c0c18d394c5854ba75
-EBUILD digikam-2.0.0_rc.ebuild 3207 RMD160 1aeaf47f7a6c4980322bd699030b6ec8bd6360bd SHA1 a5cac00b9d468418cf340ed250416dad5d20fee1 SHA256 f529b966f33261732c072060dcbc3767d53de7665e1663440a9b3933bcd64a8f
-MISC ChangeLog 11004 RMD160 5e9edd169e242504366ee2f45bbe2f0f02d3657f SHA1 eb603e9e4ee3eb507a9520005dd889800809beeb SHA256 3ebb5b184f05fa323b682cac3d35b77a251762d1dc505341555c20b465f04483
+EBUILD digikam-2.0.0_rc.ebuild 3262 RMD160 3322eaaab51467d8040ea0defb30054272813f0f SHA1 58ffd139cb2bdfbd8e9ee93b56b68647690148a7 SHA256 e0c4ce7b8b1b6cfb95d9dd87524dd0cf8b5d2a0f702a19809f552ba30c1fe48f
+MISC ChangeLog 11160 RMD160 b2233957c17b7751ffbaf55559e446565faec4af SHA1 83d381318f2a160e7aa2bdb56cd4ef6e08f07358 SHA256 a8e97992395a60bdc35dc875134e08e867bd66840bed70f68a590cd0aba3859e
MISC metadata.xml 553 RMD160 7de4b2dc583e17cfab08965015c5bb6291b968d8 SHA1 c7eecc86fd6539448bc2a8296f77c2bc4796e3a1 SHA256 f3280886ea9f988ca1315148380f1c89c6c042d0bc511105f3b2c3a926e17b80
diff --git a/media-gfx/digikam/digikam-2.0.0_rc.ebuild b/media-gfx/digikam/digikam-2.0.0_rc.ebuild
index 8f062fe..2eaba0e 100644
--- a/media-gfx/digikam/digikam-2.0.0_rc.ebuild
+++ b/media-gfx/digikam/digikam-2.0.0_rc.ebuild
@@ -68,6 +68,8 @@ DEPEND="${CDEPEND}
doc? ( app-doc/doxygen )
"
+PATCHES=( "${FILESDIR}/${PN}-2.0.0_rc-oldpgf.patch" )
+
S="${WORKDIR}/${MY_P}/core"
src_prepare() {
diff --git a/media-gfx/digikam/files/digikam-2.0.0_rc-oldpgf.patch b/media-gfx/digikam/files/digikam-2.0.0_rc-oldpgf.patch
new file mode 100644
index 0000000..c60a7e3
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-2.0.0_rc-oldpgf.patch
@@ -0,0 +1,26 @@
+commit 1f80f35b68702136ebd3d315fe4baf7d75b3c142
+Author: Gilles Caulier <caulier.gilles@gmail.com>
+Date: Sun Jul 3 10:57:21 2011 +0200
+
+ compile with libpgf 6.09.44
+ BUGS: 276969
+
+diff --git a/libs/threadimageio/pgfutils.cpp b/libs/threadimageio/pgfutils.cpp
+index 2b5829f..758f12c 100644
+--- a/libs/threadimageio/pgfutils.cpp
++++ b/libs/threadimageio/pgfutils.cpp
+@@ -151,7 +151,14 @@ bool writePGFImageData(const QImage& img, QByteArray& data, int quality)
+ // TODO : optimize memory allocation...
+ CPGFMemoryStream stream(256000);
+ UINT32 nWrittenBytes = 0;
++
++#ifdef PGFCodecVersionID
++# if PGFCodecVersionID >= 0x061124
+ pgfImg.Write(&stream, &nWrittenBytes);
++# endif
++#else
++ pgfImg.Write(&stream, 0, 0, &nWrittenBytes);
++#endif
+
+ data = QByteArray((const char*)stream.GetBuffer(), nWrittenBytes);
+
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
@ 2011-05-11 20:46 Andreas K. Huettel
0 siblings, 0 replies; 13+ messages in thread
From: Andreas K. Huettel @ 2011-05-11 20:46 UTC (permalink / raw
To: gentoo-commits
commit: be6d237357a77f3b112e60d647cf006e18893850
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Wed May 11 20:58:59 2011 +0000
Commit: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed May 11 20:58:59 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=be6d2373
[media-gfx/digikam] Resync with tree
(Portage version: 2.1.9.48/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key B6C5F7DE)
---
media-gfx/digikam/ChangeLog | 6 ++
media-gfx/digikam/Manifest | 32 ++++++-----
...igikam-1.9.0.ebuild => digikam-1.9.0-r1.ebuild} | 43 ++++++++-------
media-gfx/digikam/digikam-1.9.0.ebuild | 4 +-
.../digikam/files/digikam-1.9.0-nomysql.patch | 60 ++++++++++++++++++++
5 files changed, 108 insertions(+), 37 deletions(-)
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index aeba729..0b2b979 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*digikam-1.9.0-r1 (11 May 2011)
+
+ 11 May 2011; Andreas K. Huettel <dilfridge@gentoo.org> digikam-1.9.0.ebuild,
+ +digikam-1.9.0-r1.ebuild, +files/digikam-1.9.0-nomysql.patch:
+ Resync with tree
+
*digikam-2.0.0_beta5 (11 May 2011)
11 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index e556ebf..dde7355 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -18,6 +18,7 @@ AUX digikam-1.7.0-docs.patch 1457 RMD160 e41322e23bb47234047fbe78aaf920299690705
AUX digikam-1.8.0-gcc46.patch 512 RMD160 950c4744a8d4bfe88f0f19233bfd5aefb87ccbba SHA1 e3682e8af28233609c12817ec13a120c95a169be SHA256 088709ad10f71266957d237fabba9ee6f1de0f43ba2c5f63badbeb974d140241
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-nomysql.patch 3323 RMD160 9b03cc09f81188a9373212af0bfc079eeced3c37 SHA1 7fe8a51f5d8c5eddfc22f37f6741f0c96ca64f16 SHA256 c3e09ee35172c9e38d13fe20b5e65ae1d53e954e3c50be1fbddd0223990cac5c
AUX digikam-2.0.0_beta1-docs.patch 1361 RMD160 3b98a59e9790a7bc12dc5ec4723860d2cc968c4b SHA1 63d6d8c23126a198b91a56528cdfd97559f1f398 SHA256 dc8bf8aa8c6f956a5afd60bc0bc526872ed7b7604a3e1b8acb1613c947a5c97c
AUX digikam-2.0.0_beta4-docs.patch 1361 RMD160 0a68569608e99781708b5c242c90e0df6808a655 SHA1 d33c4ca548bd3f605d992ea32f287212ef68bd77 SHA256 9902322da1310bcf728d8172d5bbd53f7080555bfdd629dbe0eba069d9eec8ac
AUX digikam-2.0.0_beta5-docs.patch 1364 RMD160 e7e618d7ae5939328d43e1b41e11f6b4eb2f4821 SHA1 ff5519b3ee8cf19e091c1ac1b38817485921b7d2 SHA256 4113cc07a61d22a727f73fed917eb4ae82493f700673daf58acfcce455914964
@@ -31,27 +32,28 @@ DIST digikam-2.0.0-beta5.tar.bz2 43494127 RMD160 715f9f3f1695bad8e74dbeb9313da7a
DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
EBUILD digikam-1.2.0-r4.ebuild 3241 RMD160 97240d9bf66f91276583380abb44abcca32aef53 SHA1 541cb89174e630ede2a012f75576b1e66a7e5834 SHA256 7b99de04c49c27afc4047b49eb88558d34ab83cdddf272d3a282313f79e88c48
EBUILD digikam-1.8.0.ebuild 3247 RMD160 86c84f6dea0b55764dad9cf4c6427b1b2fbc7742 SHA1 4ea44c2e1e30d7dfdb28bbeb8defbd740199fad9 SHA256 b93cb62a5f973e48ec99716183ee339dcd0c90791594a982b6d70bd216a425c4
-EBUILD digikam-1.9.0.ebuild 3245 RMD160 7595b6ce1967bafa99dd8ecf19257838aef23753 SHA1 6c144376c2ed7058111505fc265fcee15f6f5462 SHA256 a410fe8542a23f6f1a47b6fac8e4ec0980f84518da06c90f2c9532292818fd06
+EBUILD digikam-1.9.0-r1.ebuild 3260 RMD160 9a81da4a6a320bc4f86b05665654c4b7e0cbacdf SHA1 5bfc5984b6f9bdc9b724b9a6196123ec812bc703 SHA256 a4b15d1c633ad4f793471d09563a1c4ee14d3889de3cc09afed8df85e83d5a28
+EBUILD digikam-1.9.0.ebuild 3242 RMD160 04df3e2432a19d01a07851d8a8a3821279aa4af0 SHA1 c80b1939a52ab7aa7c0032373022f3cb931fee81 SHA256 e5bc2256f812d90206d99b3ec6f6ffbad75e5dd0bbcccaa8e349e894eef73d53
EBUILD digikam-2.0.0_beta2.ebuild 3339 RMD160 b930008d6fe94d757ecd23eb80949114e62b835b SHA1 10351caff0808bee413c99160b227cffd1b84473 SHA256 23872b2b307c1021af88bf994bcc0553eb01e330585d706067dfe2b8dea56d3e
EBUILD digikam-2.0.0_beta3.ebuild 3339 RMD160 e931dff9b3dc632d586c27323c1b6ae96cfa74d8 SHA1 78481f6fb42060e4d240c568069e4fb48afc3bdb SHA256 311d6f8f1b22c8b40da470c07e1813db3c6cbeab64ded51c3a37a46dda747e60
EBUILD digikam-2.0.0_beta4.ebuild 3333 RMD160 f233ebb7788ec8caa3a2bca7d341f635d685b1da SHA1 806b4fc1347782c1f59c3d57f68eb83396389460 SHA256 1968e6f68542a68c796307a67a0804349f9b46123b6b7369c59a8e5496189ebd
EBUILD digikam-2.0.0_beta5.ebuild 3333 RMD160 295b6cec8ae5af7b42b2b4e5ed801fc9806d627b SHA1 cbaeae4a388b4c6955b6e5faabbfcb79117379a7 SHA256 c602bab5a10e4f451e1c3194310f1c36cc1b0f81d788bc1929d70f1d0732d595
-MISC ChangeLog 9816 RMD160 d5a9a8e84120f9e7598b598ae52c3a0487686f29 SHA1 38c70134dfae867ec97c26dec702eff22d3c7919 SHA256 60d80cbb465d6440e023bf88989034bcad0bd1baa31d9766059c3ff222d887d7
+MISC ChangeLog 10012 RMD160 4dea1e365ef683be3673f06adffbb3a1604a8bd0 SHA1 34ad5f35a0f37858523074fddefa68647e65cc2e SHA256 a255618ef94147f3b2090cf3b1019ae2a5705f49cedceff99e30494bcf52e430
MISC metadata.xml 626 RMD160 c40d623ad086f0d2f47a8f1092b486b4ae92faef SHA1 fb1c2209b4eac3dc43fa09a7946d47c0156cee67 SHA256 a5d01bcd7e500161aed9a6a4fe9b65422091a375d1ee9cc0490e7776f8f925a6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCgAGBQJNyvglAAoJENwGBM22xffeOSoP/iWHJf63IoPTdAzOfFZd73AQ
-wySiJXvlrWtDCqZwfqmCICyKkzEpZaEWwBC2xMheNWuk0GhyeNaHl6H7o9w6+ig/
-on9t4dGtLhk3dGI2XG8KTxPQ4pgtsf/5ammYMkHdsTBgOIMrAH9mew80BF5DFFDX
-XEwZ02k/uizvyj4+dy6jyUXR+EhXAOCkXfNGYo38AuB5swX3ZMg1JXrQl5Jwaa4x
-AU1NuLnQpJwpzzPGFk3mtgZT1aggoG4V6SQFzl7I9aS1tWsaKMkp6YIy7F7R4Xhf
-mDrChPRwotM77zxG4+4zWM8tUfLSe8CNAHGaLtUwpiL8iOL2H/585MTGhJF1q3fm
-ZabYiQsqURkDdEentJr3Lu27IaK//ECihbjGxpJoB4kZrtkAzS91uCZsfhQb/wXk
-V7hRGlKfz4wnp17V23+EPoKYBpKkrqBm91uaYdp/fo5pIjaVp8OdggZ5EoBA0ep1
-WSVJMMWemGd7e+7svZKWc8D1E2WpE6CCcX4gkYu3Xt33M7fF8B2xoKerKOmuye8H
-rzbADIKA2O+GCmxSrIBpfG9WYsbCWN9hfqbB+HL26nkWOyuJ+rmWsyzXRmkVijaK
-kzFVll+PrV8PD4aVru5glmbctqQQePWny59p8XuWBqYnpsBYZhG80I6Oog+r+Yvl
-fuJxkCXejsr/QtGfjYnr
-=8+Jj
+iQIcBAEBCgAGBQJNyviTAAoJENwGBM22xffemR8P/RW2rFuybtK7A2igiHW3VGG9
+pWFSwg/nRr5a2Dgwmn2PWvDlhXxgrT/nBNKzj0/jr1pFa8PVa73deuY5UZLpjfMG
+/OI942UpjjlsJUV3WJF1HVFO4dYg4euqdn4o4f8/B6kw8kIUT1h8diQiANaxwqvG
+Q9Tl0P0CumD/1yKBrvWfhbC1Uj/+ge1UHQ5FEcvdCH9wQkBjA7XxhEdTUpp1fFsW
+BB7Rv5gueDVNn4vrj4kuUQTbGP5yMs8HbzoZv2wXIBK+LlUHnzop18lEG3nftoev
+ijQyg71R2OgJTLwPtNpSCVW5UW7EBxj4maH7HexErr9oiFVyKhcn1NOGQ8Cc636g
+v8AvEBKdsHdU6cAurbecY9t+9k2hRHXtOjlxhOZ3wlFhA2SrW46uaMqMPSEGmwMr
+c4+2quVTr9GsBGvebwoTBx1Nexw3hXPEdbGFLIF/JGC3oOQDkWFIv+vR3EnJrwvA
+8M9aRwD/vqaNtdiPVvY+WRiiL/xn7+/IpswYQxzxzMsH1NVBBw/u1pYgWijP1Mm5
+a4FXXYeAqd82LeVBKSIY3p8AXlqA+H3K4QhOi2aGXQmMGW1d4V1TfO6SOh7wUCc6
+7JfToxqj8I1mvSLudVxBN4LsCR9bk2KzbodQ2iatFNkFy9ez5Ea9yrBbqvrEoaF0
+1016CC4q2o7KCs7XHHBQ
+=LCA8
-----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-1.9.0.ebuild b/media-gfx/digikam/digikam-1.9.0-r1.ebuild
similarity index 73%
copy from media-gfx/digikam/digikam-1.9.0.ebuild
copy to media-gfx/digikam/digikam-1.9.0-r1.ebuild
index 61764c8..6e439a4 100644
--- a/media-gfx/digikam/digikam-1.9.0.ebuild
+++ b/media-gfx/digikam/digikam-1.9.0-r1.ebuild
@@ -1,13 +1,13 @@
# 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.2 2011/03/01 07:19:59 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.9.0-r1.ebuild,v 1.2 2011/05/11 10:45:31 scarabeus Exp $
-EAPI=3
+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
@@ -23,14 +23,14 @@ 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"
+IUSE="addressbook debug doc geolocation gphoto2 mysql 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}
+ $(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
@@ -41,19 +41,19 @@ CDEPEND="
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? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
- geolocation? ( >=kde-base/marble-${KDE_MINIMAL}[plasma] )
+ addressbook? ( $(add_kdebase_dep kdepimlibs) )
+ geolocation? ( $(add_kdebase_dep marble 'plasma') )
gphoto2? ( media-libs/libgphoto2 )
+ mysql? ( virtual/mysql )
"
RDEPEND="${CDEPEND}
- >=kde-base/kreadconfig-${KDE_MINIMAL}
+ $(add_kdebase_dep kreadconfig)
video? (
|| (
- >=kde-base/mplayerthumbs-${KDE_MINIMAL}
- >=kde-base/ffmpegthumbs-${KDE_MINIMAL}
+ $(add_kdebase_dep ffmpegthumbs)
+ $(add_kdebase_dep mplayerthumbs)
)
)
"
@@ -64,8 +64,11 @@ DEPEND="${CDEPEND}
S="${WORKDIR}/${MY_P}"
-PATCHES=( "${FILESDIR}/${PN}"-1.9.0-docs.patch
- "${FILESDIR}/${PN}"-1.8.0-tests.patch )
+PATCHES=(
+ "${FILESDIR}/${PN}"-1.9.0-docs.patch
+ "${FILESDIR}/${PN}"-1.8.0-tests.patch
+ "${FILESDIR}/${PN}"-1.9.0-nomysql.patch
+)
src_prepare() {
if use handbook; then
@@ -83,7 +86,7 @@ src_configure() {
use semantic-desktop && backend="Nepomuk" || backend="None"
# LQR = only allows to choose between bundled/external
- mycmakeargs=(
+ local mycmakeargs=(
-DFORCED_UNBUNDLE=ON
-DWITH_LQR=ON
-DWITH_LENSFUN=ON
@@ -96,6 +99,7 @@ src_configure() {
$(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
@@ -106,7 +110,6 @@ 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
@@ -120,6 +123,6 @@ pkg_postinst() {
kde4-base_pkg_postinst
if use doc; then
- elog The digikam api documentation has been installed at /usr/share/doc/${PF}/html
+ 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
index 61764c8..ee18dc5 100644
--- a/media-gfx/digikam/digikam-1.9.0.ebuild
+++ b/media-gfx/digikam/digikam-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-gfx/digikam/digikam-1.9.0.ebuild,v 1.2 2011/03/01 07:19:59 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.9.0.ebuild,v 1.4 2011/05/09 23:10:48 hwoarang Exp $
EAPI=3
@@ -21,7 +21,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
LICENSE="GPL-2
handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
SLOT="4"
IUSE="addressbook debug doc geolocation gphoto2 handbook semantic-desktop themedesigner +thumbnails video"
diff --git a/media-gfx/digikam/files/digikam-1.9.0-nomysql.patch b/media-gfx/digikam/files/digikam-1.9.0-nomysql.patch
new file mode 100644
index 0000000..50dec54
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-1.9.0-nomysql.patch
@@ -0,0 +1,60 @@
+--- 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)
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
@ 2011-05-11 20:46 Andreas K. Huettel
0 siblings, 0 replies; 13+ messages in thread
From: Andreas K. Huettel @ 2011-05-11 20:46 UTC (permalink / raw
To: gentoo-commits
commit: 5046adc4c31cc539b6563f2a7c90eaa79be3f5f4
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Wed May 11 20:57:10 2011 +0000
Commit: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed May 11 20:57:10 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=5046adc4
[media-gfx/digikam] Version bump
(Portage version: 2.1.9.48/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key B6C5F7DE)
---
media-gfx/digikam/ChangeLog | 6 +
media-gfx/digikam/Manifest | 31 +++--
media-gfx/digikam/digikam-2.0.0_beta5.ebuild | 132 ++++++++++++++++++++
.../digikam/files/digikam-2.0.0_beta5-docs.patch | 42 ++++++
4 files changed, 197 insertions(+), 14 deletions(-)
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index cb7f9bb..aeba729 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*digikam-2.0.0_beta5 (11 May 2011)
+
+ 11 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ +digikam-2.0.0_beta5.ebuild, +files/digikam-2.0.0_beta5-docs.patch:
+ Version bump
+
11 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
digikam-2.0.0_beta4.ebuild:
Allow sci-libs/lapack-atlas as alternative to clapack
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index c2e0d31..e556ebf 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -20,12 +20,14 @@ AUX digikam-1.8.0-tests.patch 914 RMD160 520675d0fb1080549a0c3f5c67fc51d36bb19b1
AUX digikam-1.9.0-docs.patch 1466 RMD160 d12a4bd9e825d88863da954763641157a87f11bd SHA1 7496668276f5a54d6ffde0a71ff7dfc6252ff3e3 SHA256 f348ab1a931af78e1aa752676a9515a50183dc07c32a99cdfd59a32dd2ece2af
AUX digikam-2.0.0_beta1-docs.patch 1361 RMD160 3b98a59e9790a7bc12dc5ec4723860d2cc968c4b SHA1 63d6d8c23126a198b91a56528cdfd97559f1f398 SHA256 dc8bf8aa8c6f956a5afd60bc0bc526872ed7b7604a3e1b8acb1613c947a5c97c
AUX digikam-2.0.0_beta4-docs.patch 1361 RMD160 0a68569608e99781708b5c242c90e0df6808a655 SHA1 d33c4ca548bd3f605d992ea32f287212ef68bd77 SHA256 9902322da1310bcf728d8172d5bbd53f7080555bfdd629dbe0eba069d9eec8ac
+AUX digikam-2.0.0_beta5-docs.patch 1364 RMD160 e7e618d7ae5939328d43e1b41e11f6b4eb2f4821 SHA1 ff5519b3ee8cf19e091c1ac1b38817485921b7d2 SHA256 4113cc07a61d22a727f73fed917eb4ae82493f700673daf58acfcce455914964
DIST digikam-1.2.0.tar.bz2 13970098 RMD160 f8177241536b2f099499977d9c3cbd2dc9880853 SHA1 7f12caf737a05043c7a9a5291a448684e5a4e2e6 SHA256 930539b5bb53af345f4bef3d06c7121c22af3dbd7ae7b338fa3d173a6a631206
DIST digikam-1.8.0.tar.bz2 23376636 RMD160 aa86cae8048a8f7122285c5e27aaa59e5dbcc47c SHA1 65430990896b56b7ec76b9a6bc5f8472145f44fd SHA256 210de9d949265e910c65c9ab8b19efab13839f6a2ef761a5915d267ddfe494aa
DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5
DIST digikam-2.0.0-beta2.tar.bz2 23685947 RMD160 0370c304af9dfcc380d97747f698ab449e0d0beb SHA1 dbc62eed97c54dbdfff97690d4eb218d361e0d25 SHA256 15f49e18fefdf7bcce8b31bb77b4fe31368f16d88c039842c58e7cbafa58fd49
DIST digikam-2.0.0-beta3.tar.bz2 24063835 RMD160 61871d8f1f28acd7f3b83f261a94715d97bf71ea SHA1 7688ef4eec77b55e36ecd8f55d92635c36f38349 SHA256 60c9f050b07a787e1512173b7b871dbf9babc730804f98829dae53229e16b97e
DIST digikam-2.0.0-beta4.tar.bz2 43322316 RMD160 6af7f9ad6b757e97081391c5972abd744d45cfa6 SHA1 a5aef57a8be66b033e88d78f838c318ffe8df235 SHA256 aa85678e2a83cdb41ef70584e2a691c457759f50aadc0cc7019a33513ee16b63
+DIST digikam-2.0.0-beta5.tar.bz2 43494127 RMD160 715f9f3f1695bad8e74dbeb9313da7a5303f0473 SHA1 97432e5997f00028c1acff38e2e0a791294c2aaf SHA256 118ea42cebaec6795b89cbb6018bdfa1d0e664eeda9b09ac0fd4083e3969f394
DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
EBUILD digikam-1.2.0-r4.ebuild 3241 RMD160 97240d9bf66f91276583380abb44abcca32aef53 SHA1 541cb89174e630ede2a012f75576b1e66a7e5834 SHA256 7b99de04c49c27afc4047b49eb88558d34ab83cdddf272d3a282313f79e88c48
EBUILD digikam-1.8.0.ebuild 3247 RMD160 86c84f6dea0b55764dad9cf4c6427b1b2fbc7742 SHA1 4ea44c2e1e30d7dfdb28bbeb8defbd740199fad9 SHA256 b93cb62a5f973e48ec99716183ee339dcd0c90791594a982b6d70bd216a425c4
@@ -33,22 +35,23 @@ EBUILD digikam-1.9.0.ebuild 3245 RMD160 7595b6ce1967bafa99dd8ecf19257838aef23753
EBUILD digikam-2.0.0_beta2.ebuild 3339 RMD160 b930008d6fe94d757ecd23eb80949114e62b835b SHA1 10351caff0808bee413c99160b227cffd1b84473 SHA256 23872b2b307c1021af88bf994bcc0553eb01e330585d706067dfe2b8dea56d3e
EBUILD digikam-2.0.0_beta3.ebuild 3339 RMD160 e931dff9b3dc632d586c27323c1b6ae96cfa74d8 SHA1 78481f6fb42060e4d240c568069e4fb48afc3bdb SHA256 311d6f8f1b22c8b40da470c07e1813db3c6cbeab64ded51c3a37a46dda747e60
EBUILD digikam-2.0.0_beta4.ebuild 3333 RMD160 f233ebb7788ec8caa3a2bca7d341f635d685b1da SHA1 806b4fc1347782c1f59c3d57f68eb83396389460 SHA256 1968e6f68542a68c796307a67a0804349f9b46123b6b7369c59a8e5496189ebd
-MISC ChangeLog 9637 RMD160 740296efcdc4b3c64822bc5d2ddd6d858f3f7368 SHA1 f640f0ef752043bf61c7a0b09bc5f639e2873f41 SHA256 c2ce99b71d15e1f9588d4225d66577d3dd406dfbfc346dc2eb3d4d7ea58b612c
+EBUILD digikam-2.0.0_beta5.ebuild 3333 RMD160 295b6cec8ae5af7b42b2b4e5ed801fc9806d627b SHA1 cbaeae4a388b4c6955b6e5faabbfcb79117379a7 SHA256 c602bab5a10e4f451e1c3194310f1c36cc1b0f81d788bc1929d70f1d0732d595
+MISC ChangeLog 9816 RMD160 d5a9a8e84120f9e7598b598ae52c3a0487686f29 SHA1 38c70134dfae867ec97c26dec702eff22d3c7919 SHA256 60d80cbb465d6440e023bf88989034bcad0bd1baa31d9766059c3ff222d887d7
MISC metadata.xml 626 RMD160 c40d623ad086f0d2f47a8f1092b486b4ae92faef SHA1 fb1c2209b4eac3dc43fa09a7946d47c0156cee67 SHA256 a5d01bcd7e500161aed9a6a4fe9b65422091a375d1ee9cc0490e7776f8f925a6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCgAGBQJNo30+AAoJENwGBM22xffeiSUP/0eDP6t/FNO0g2LvbzVRtjqQ
-ASQnWcyQZC40pZfJzRv7dZ5OLMpYdmmZ6ndIAh7kKi35+XPtU5yj9Lco6Q/8UlNg
-4/xHdchQA7leHsIpskvDLfp2EDyqyNZ2phG1gTk6sdGQCTHr8HJ+VMc5Q815ozau
-QVJcSr7YQTHrFehiEZ3H9aCtiNZzVF1lzVh8KTnrw6jwrOxPnvOkqcFODavcCO9Y
-r+ygj9Vr4V4b8rwRPw79wiU5caPwXhQe9xthls6sO8b1IMB3YKx6ODdhN4M2TmdD
-0J8qylUiO+gYGOQ70+QGeqqFFgtYXNE9sYUKURp1FTYdA+tGwNYg1IwKLsHME+c6
-LEnxcvfIrfZ+oBf8DgeXUWeAUCc74Hc6JymYCnkpFsk4z/lnZAwy0YzrYb4dS9E5
-mfTF45J538O7KvJklOGK66ZQqP16zBEqz3RHBojXsqarTCS55fDOmHsnPH2hFXov
-NOBQOmSorOnnw9OMwmSvCa1T0d0w6LlK+IbxvzuDwNW7kOfFkuMY514hMQSZQJo+
-YEJQaUptL5/ex+eDQoHcVb4iIrDFulxFKR8eeUCHFLQzO11lxVmSwmnovp+m9pMN
-WuCQqh2V0bFRj9+LLEiIQQvJn/Ubbi6QF0eeeB43Mb8Y02jCbz0GxSKf5vxTIaXT
-HXbgOv6BPXzbu7zLkLeF
-=Gm9n
+iQIcBAEBCgAGBQJNyvglAAoJENwGBM22xffeOSoP/iWHJf63IoPTdAzOfFZd73AQ
+wySiJXvlrWtDCqZwfqmCICyKkzEpZaEWwBC2xMheNWuk0GhyeNaHl6H7o9w6+ig/
+on9t4dGtLhk3dGI2XG8KTxPQ4pgtsf/5ammYMkHdsTBgOIMrAH9mew80BF5DFFDX
+XEwZ02k/uizvyj4+dy6jyUXR+EhXAOCkXfNGYo38AuB5swX3ZMg1JXrQl5Jwaa4x
+AU1NuLnQpJwpzzPGFk3mtgZT1aggoG4V6SQFzl7I9aS1tWsaKMkp6YIy7F7R4Xhf
+mDrChPRwotM77zxG4+4zWM8tUfLSe8CNAHGaLtUwpiL8iOL2H/585MTGhJF1q3fm
+ZabYiQsqURkDdEentJr3Lu27IaK//ECihbjGxpJoB4kZrtkAzS91uCZsfhQb/wXk
+V7hRGlKfz4wnp17V23+EPoKYBpKkrqBm91uaYdp/fo5pIjaVp8OdggZ5EoBA0ep1
+WSVJMMWemGd7e+7svZKWc8D1E2WpE6CCcX4gkYu3Xt33M7fF8B2xoKerKOmuye8H
+rzbADIKA2O+GCmxSrIBpfG9WYsbCWN9hfqbB+HL26nkWOyuJ+rmWsyzXRmkVijaK
+kzFVll+PrV8PD4aVru5glmbctqQQePWny59p8XuWBqYnpsBYZhG80I6Oog+r+Yvl
+fuJxkCXejsr/QtGfjYnr
+=8+Jj
-----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-2.0.0_beta5.ebuild b/media-gfx/digikam/digikam-2.0.0_beta5.ebuild
new file mode 100644
index 0000000..398ba15
--- /dev/null
+++ b/media-gfx/digikam/digikam-2.0.0_beta5.ebuild
@@ -0,0 +1,132 @@
+# 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.6.0.ebuild,v 1.1 2010/11/25 20:30:29 dilfridge Exp $
+
+EAPI=4
+
+if [ "${PV}" != "9999" ]; then
+ KDE_LINGUAS=""
+# KDE_LINGUAS="be ca ca@valencia de el en_GB eo es et eu fi fr he hi hne hu is it km
+# ko lt lv nds nn pa pl pt pt_BR ro se sl sv th tr vi zh_CN zh_TW"
+else
+ KMNAME="extragear/graphics"
+fi
+
+CMAKE_MIN_VERSION=2.8
+
+KDE_MINIMAL="4.6"
+KDEGRAPHICS_MINIMAL="4.6.29"
+
+inherit kde4-base
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="A digital photo management application for KDE."
+HOMEPAGE="http://www.digikam.org/"
+[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2
+ handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="4"
+IUSE="addressbook debug doc gphoto2 handbook semantic-desktop themedesigner +thumbnails video"
+
+CDEPEND="
+ $(add_kdebase_dep kdelibs semantic-desktop)
+ $(add_kdebase_dep marble plasma)
+ $(add_kdebase_dep libkipi)
+ $(add_kdebase_dep libkexiv2)
+ >=kde-base/libkdcraw-${KDEGRAPHICS_MINIMAL}
+ >=media-libs/libkface-${PV}
+ >=media-libs/libkmap-${PV}
+ $(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 sci-libs/lapack-atlas )
+ virtual/mysql
+ x11-libs/qt-gui[qt3support]
+ || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
+ addressbook? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
+ gphoto2? ( media-libs/libgphoto2 )
+"
+RDEPEND="${CDEPEND}
+ >=kde-base/kreadconfig-${KDE_MINIMAL}
+ video? (
+ || (
+ >=kde-base/mplayerthumbs-${KDE_MINIMAL}
+ >=kde-base/ffmpegthumbs-${KDE_MINIMAL}
+ )
+ )
+"
+DEPEND="${CDEPEND}
+ sys-devel/gettext
+ doc? ( app-doc/doxygen )
+"
+
+PATCHES=( "${FILESDIR}/${PN}"-2.0.0_beta5-docs.patch )
+
+S="${WORKDIR}/${MY_P}/core"
+
+src_prepare() {
+ # just to make absolutely sure
+ rm -rf "${WORKDIR}/${MY_P}/extra" || die
+
+ mv "${WORKDIR}/${MY_P}/doc/${PN}" doc || die
+ echo "add_subdirectory( digikam )" > doc/CMakeLists.txt
+ echo "add_subdirectory( showfoto )" >> doc/CMakeLists.txt
+
+ kde4-base_src_prepare
+
+ if use handbook; then
+ echo "add_subdirectory( doc )" >> CMakeLists.txt
+ fi
+}
+
+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)
+ -DWITH_MarbleWidget=ON
+ $(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
+}
+
+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-2.0.0_beta5-docs.patch b/media-gfx/digikam/files/digikam-2.0.0_beta5-docs.patch
new file mode 100644
index 0000000..a5bc184
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-2.0.0_beta5-docs.patch
@@ -0,0 +1,42 @@
+diff -ruN digikam-2.0.0-beta5.orig/core/CMakeLists.txt digikam-2.0.0-beta5/core/CMakeLists.txt
+--- digikam-2.0.0-beta5.orig/core/CMakeLists.txt 2011-05-04 10:52:35.000000000 +0200
++++ digikam-2.0.0-beta5/core/CMakeLists.txt 2011-05-11 22:40:30.000000000 +0200
+@@ -1560,8 +1560,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)
+@@ -1569,7 +1576,21 @@
+
+ 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, because")
++ MESSAGE(STATUS "the option -DBUILD_DOC=ON wasn't passed to cmake")
++ MESSAGE(STATUS "")
++
++ENDIF(BUILD_DOC)
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
@ 2011-04-01 23:55 Andreas K. Huettel
0 siblings, 0 replies; 13+ messages in thread
From: Andreas K. Huettel @ 2011-04-01 23:55 UTC (permalink / raw
To: gentoo-commits
commit: e6248da19ed750e4450250ca68c69c2bde8cc48c
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Fri Apr 1 23:55:06 2011 +0000
Commit: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Apr 1 23:55:06 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=e6248da1
[media-gfx/digikam] Version bump
(Portage version: 2.1.9.45/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key B6C5F7DE)
---
media-gfx/digikam/ChangeLog | 6 +
media-gfx/digikam/Manifest | 33 +++---
media-gfx/digikam/digikam-2.0.0_beta4.ebuild | 132 ++++++++++++++++++++
.../digikam/files/digikam-2.0.0_beta4-docs.patch | 41 ++++++
4 files changed, 197 insertions(+), 15 deletions(-)
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index b13c129..1152e15 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*digikam-2.0.0_beta4 (01 Apr 2011)
+
+ 01 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ +digikam-2.0.0_beta4.ebuild, +files/digikam-2.0.0_beta4-docs.patch:
+ Version bump
+
01 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
digikam-2.0.0_beta2.ebuild, digikam-2.0.0_beta3.ebuild:
Readd ~ppc in line with digikam-1.9.0
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index da3d180..d89bb83 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,5 +1,5 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
AUX digikam-1.1.0-libpgf.patch 8996 RMD160 4f1a7ad7b28c43b3fe2e454eb3351f27a14bde6f SHA1 fd2b98e23c31d880a2a32f28161f279abef82c22 SHA256 f2001099ee5538a31a9660c223e59a25a19eb7c36a191831b849e1b81c58856d
AUX digikam-1.1.0-libpng14.patch 1580 RMD160 769e9bf4030d795349cb260854e26c189471ccbc SHA1 9b3123dad7bd7530db6833296dc1de7ec240fd54 SHA256 0ae5e279aedc80857cb27ace7d1609b6cf632853513445896b88a7365b763fb9
@@ -19,33 +19,36 @@ AUX digikam-1.8.0-gcc46.patch 512 RMD160 950c4744a8d4bfe88f0f19233bfd5aefb87ccbb
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-2.0.0_beta1-docs.patch 1361 RMD160 3b98a59e9790a7bc12dc5ec4723860d2cc968c4b SHA1 63d6d8c23126a198b91a56528cdfd97559f1f398 SHA256 dc8bf8aa8c6f956a5afd60bc0bc526872ed7b7604a3e1b8acb1613c947a5c97c
+AUX digikam-2.0.0_beta4-docs.patch 1361 RMD160 0a68569608e99781708b5c242c90e0df6808a655 SHA1 d33c4ca548bd3f605d992ea32f287212ef68bd77 SHA256 9902322da1310bcf728d8172d5bbd53f7080555bfdd629dbe0eba069d9eec8ac
DIST digikam-1.2.0.tar.bz2 13970098 RMD160 f8177241536b2f099499977d9c3cbd2dc9880853 SHA1 7f12caf737a05043c7a9a5291a448684e5a4e2e6 SHA256 930539b5bb53af345f4bef3d06c7121c22af3dbd7ae7b338fa3d173a6a631206
DIST digikam-1.8.0.tar.bz2 23376636 RMD160 aa86cae8048a8f7122285c5e27aaa59e5dbcc47c SHA1 65430990896b56b7ec76b9a6bc5f8472145f44fd SHA256 210de9d949265e910c65c9ab8b19efab13839f6a2ef761a5915d267ddfe494aa
DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5
DIST digikam-2.0.0-beta2.tar.bz2 23685947 RMD160 0370c304af9dfcc380d97747f698ab449e0d0beb SHA1 dbc62eed97c54dbdfff97690d4eb218d361e0d25 SHA256 15f49e18fefdf7bcce8b31bb77b4fe31368f16d88c039842c58e7cbafa58fd49
DIST digikam-2.0.0-beta3.tar.bz2 24063835 RMD160 61871d8f1f28acd7f3b83f261a94715d97bf71ea SHA1 7688ef4eec77b55e36ecd8f55d92635c36f38349 SHA256 60c9f050b07a787e1512173b7b871dbf9babc730804f98829dae53229e16b97e
+DIST digikam-2.0.0-beta4.tar.bz2 43322316 RMD160 6af7f9ad6b757e97081391c5972abd744d45cfa6 SHA1 a5aef57a8be66b033e88d78f838c318ffe8df235 SHA256 aa85678e2a83cdb41ef70584e2a691c457759f50aadc0cc7019a33513ee16b63
DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
EBUILD digikam-1.2.0-r4.ebuild 3241 RMD160 97240d9bf66f91276583380abb44abcca32aef53 SHA1 541cb89174e630ede2a012f75576b1e66a7e5834 SHA256 7b99de04c49c27afc4047b49eb88558d34ab83cdddf272d3a282313f79e88c48
EBUILD digikam-1.8.0.ebuild 3247 RMD160 86c84f6dea0b55764dad9cf4c6427b1b2fbc7742 SHA1 4ea44c2e1e30d7dfdb28bbeb8defbd740199fad9 SHA256 b93cb62a5f973e48ec99716183ee339dcd0c90791594a982b6d70bd216a425c4
EBUILD digikam-1.9.0.ebuild 3245 RMD160 7595b6ce1967bafa99dd8ecf19257838aef23753 SHA1 6c144376c2ed7058111505fc265fcee15f6f5462 SHA256 a410fe8542a23f6f1a47b6fac8e4ec0980f84518da06c90f2c9532292818fd06
EBUILD digikam-2.0.0_beta2.ebuild 3339 RMD160 b930008d6fe94d757ecd23eb80949114e62b835b SHA1 10351caff0808bee413c99160b227cffd1b84473 SHA256 23872b2b307c1021af88bf994bcc0553eb01e330585d706067dfe2b8dea56d3e
EBUILD digikam-2.0.0_beta3.ebuild 3339 RMD160 e931dff9b3dc632d586c27323c1b6ae96cfa74d8 SHA1 78481f6fb42060e4d240c568069e4fb48afc3bdb SHA256 311d6f8f1b22c8b40da470c07e1813db3c6cbeab64ded51c3a37a46dda747e60
-MISC ChangeLog 9314 RMD160 fb78bdac49ed92cffa01506c6171562b9de66579 SHA1 1805d0e98574783a730c1182921c45f7da6957d0 SHA256 71fe0c16d64514519048b5821742d86b985360809f8969e9176cfc45cd1551a8
+EBUILD digikam-2.0.0_beta4.ebuild 3304 RMD160 95cbc46cf0a56f31491130160b9908f08f34387a SHA1 90f3a2a7760e4d7bfc1d6dbd3853960179032f22 SHA256 1f5f2aa311fcb9d7243a54cdf7fe01ad5548a33d7c1bcb98f057c4de1a082143
+MISC ChangeLog 9493 RMD160 259ef9439a426cd9d3228c25ecc83128ffe3ef74 SHA1 cb6db46747ec5cd4b3a770993c408eeb187f43f5 SHA256 5a4166ace25d0c40f401f03cd831b6b315e550c23d39df245a6abadd3544e0d9
MISC metadata.xml 626 RMD160 c40d623ad086f0d2f47a8f1092b486b4ae92faef SHA1 fb1c2209b4eac3dc43fa09a7946d47c0156cee67 SHA256 a5d01bcd7e500161aed9a6a4fe9b65422091a375d1ee9cc0490e7776f8f925a6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIbBAEBAgAGBQJNbJ93AAoJENwGBM22xffeUrYP+O1aWG877uDUf55l7Xc4/rq/
-lEk+E6NNdmo4aeg0Wf+d+vfRijqSVVJX3p1ur6uKcdvJm3QrlsEu1zsdn09Zm2e1
-sr7NWhRHqfVg7Z2aXQzkIyaXG2Xgm16XYxHe5miGT9Gv4l+oBckd6G3VV+In3eCL
-yFLWVkx563ECm4XbVR/Taawr2ofhaUsudDt7P/S83yFc/t3OAJoQJ+Dqq6WgKr4e
-iGP12xaxSgHBDVgONObrfPs30bpfS2FomnEHsF929HvGJRTI1QW3+FgP0D4ft2HC
-/jkjig3S+NoHGw3tuF0hQXm5vSKeXhNw8b27cwFxOTu44s5nAXp9YGHtHTTkecQT
-8WxrrD1pEJv8Jf1obS1zeo2VUMinJuUidz8VvKfMTgB202d7Wnznb0PO4c1mHdi6
-9omiaCVjNfTvCAwTVc0U4XxXO3v4ds3TRg82jcDY0+hk9LeVkKH3myhc2kZRD7VZ
-Yo+i8eeg4TLcVNxkF054u53nc5vpgyG5VIhN95KcP2Xv4dRG+/kBQUJko2the2FZ
-Q+/4Jd3KoELHNc5vnExnKkMEAVjSvIZGfLXgTd0Pjk+h800L0OivTTPUVdhpsGKO
-jmU0jHssV815bBd8P3fWaGgpFTgr6KC3CSBTnzZhUDD04YY+As3G8lZu6w4m+3JX
-4EHm73ti9zMvxaSkMag=
-=Q3tZ
+iQIcBAEBCgAGBQJNlmXaAAoJENwGBM22xffePCAQAIjJXWHnZ9DF/UPtPhmUmy0R
+KrQ1SkttTQfB+4MUICdewu/z6p41gKkP4tP5mCGqQaDEYbHT6OmOKP0o894wDNL6
+JA5AODmvBU4bfto87kzWRYx4rC1PKm3JKWg9LqVox5hA59KF/C2iQg/Oi95+sBA5
++lAbmVMaJGTq+++nbITRB8tzQsRpKR9dTLk5hZIvjPEd1zNpBWviKm+zP0nrh+Tn
+PIwm112/Z9I298k9LFLDCbyiIVaMu69Wg9Ba8Fudy/1l0vXHixOR6OSr9+AE6K8n
+aD+vwGyrh4S22uVXIZP6t2OzhLI9rxf0ul4CFBr3pdNVu16FBIha4Cay4mIcOLcy
+nQe9Keod73yAQOpRda4/Kr+eME0aUZPNWS9uD3EeZwUcmodtzHLWgwscoOBnC3X3
+xyIt9jKyDuOmxBljLafJpRbzsIKRcYsa2rFaSZCRQ7fZLU7rzhhtWivB6E16E5Yh
+AIsrMDcgZhU2lxhowN6ysccIVUZz2FhfVHyJnIjj/W60vnbM2wE2Y8Z49TGTrAfa
+033EXaNPauslRIJkFrzz4zeNwRhpoG27RiYZQlg7btZBJ/MtvJcGiv4NcjSboEYk
+3yL2MfEUBcT62SHcc+1D0+cZH4xY5IGw1kpLxTo5ivhCLFfv5Byn/ooLWr4tMX6i
+EBTc+Rk2LiyeEiHxpdV2
+=CJ+Y
-----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-2.0.0_beta4.ebuild b/media-gfx/digikam/digikam-2.0.0_beta4.ebuild
new file mode 100644
index 0000000..0c53724
--- /dev/null
+++ b/media-gfx/digikam/digikam-2.0.0_beta4.ebuild
@@ -0,0 +1,132 @@
+# 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.6.0.ebuild,v 1.1 2010/11/25 20:30:29 dilfridge Exp $
+
+EAPI=3
+
+if [ "${PV}" != "9999" ]; then
+ KDE_LINGUAS=""
+# KDE_LINGUAS="be ca ca@valencia de el en_GB eo es et eu fi fr he hi hne hu is it km
+# ko lt lv nds nn pa pl pt pt_BR ro se sl sv th tr vi zh_CN zh_TW"
+else
+ KMNAME="extragear/graphics"
+fi
+
+CMAKE_MIN_VERSION=2.8
+
+KDE_MINIMAL="4.6"
+KDEGRAPHICS_MINIMAL="4.6.28"
+
+inherit kde4-base
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="A digital photo management application for KDE."
+HOMEPAGE="http://www.digikam.org/"
+[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2
+ handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="4"
+IUSE="addressbook debug doc gphoto2 handbook semantic-desktop themedesigner +thumbnails video"
+
+CDEPEND="
+ $(add_kdebase_dep kdelibs semantic-desktop)
+ $(add_kdebase_dep marble plasma)
+ $(add_kdebase_dep libkipi)
+ $(add_kdebase_dep libkexiv2)
+ >=kde-base/libkdcraw-${KDEGRAPHICS_MINIMAL}
+ >=media-libs/libkface-${PV}
+ >=media-libs/libkmap-${PV}
+ $(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? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
+ gphoto2? ( media-libs/libgphoto2 )
+"
+RDEPEND="${CDEPEND}
+ >=kde-base/kreadconfig-${KDE_MINIMAL}
+ video? (
+ || (
+ >=kde-base/mplayerthumbs-${KDE_MINIMAL}
+ >=kde-base/ffmpegthumbs-${KDE_MINIMAL}
+ )
+ )
+"
+DEPEND="${CDEPEND}
+ sys-devel/gettext
+ doc? ( app-doc/doxygen )
+"
+
+PATCHES=( "${FILESDIR}/${PN}"-2.0.0_beta4-docs.patch )
+
+S="${WORKDIR}/${MY_P}/core"
+
+src_prepare() {
+ # just to make absolutely sure
+ rm -rf "${WORKDIR}/${MY_P}/extra" || die
+
+ mv "${WORKDIR}/${MY_P}/doc/${PN}" doc || die
+ echo "add_subdirectory( digikam )" > doc/CMakeLists.txt
+ echo "add_subdirectory( showfoto )" >> doc/CMakeLists.txt
+
+ kde4-base_src_prepare
+
+ if use handbook; then
+ echo "add_subdirectory( doc )" >> CMakeLists.txt
+ fi
+}
+
+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)
+ -DWITH_MarbleWidget=ON
+ $(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
+}
+
+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-2.0.0_beta4-docs.patch b/media-gfx/digikam/files/digikam-2.0.0_beta4-docs.patch
new file mode 100644
index 0000000..4abadd6
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-2.0.0_beta4-docs.patch
@@ -0,0 +1,41 @@
+diff -ruN digikam-2.0.0-beta4.orig/core/CMakeLists.txt digikam-2.0.0-beta4/core/CMakeLists.txt
+--- digikam-2.0.0-beta4.orig/core/CMakeLists.txt 2011-03-28 10:54:32.000000000 +0200
++++ digikam-2.0.0-beta4/core/CMakeLists.txt 2011-04-02 00:51:08.000000000 +0200
+@@ -1558,8 +1558,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)
+@@ -1567,6 +1574,20 @@
+
+ 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)
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
@ 2011-03-01 20:22 Andreas K. Huettel
0 siblings, 0 replies; 13+ messages in thread
From: Andreas K. Huettel @ 2011-03-01 20:22 UTC (permalink / raw
To: gentoo-commits
commit: 22d7c660a8ee760c4fce856ae55c0a2fcf9e71a9
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Tue Mar 1 07:24:16 2011 +0000
Commit: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Mar 1 07:24:16 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=22d7c660
[media-gfx/digikam] Resync with main tree
(Portage version: 2.1.9.41/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key B6C5F7DE)
---
media-gfx/digikam/ChangeLog | 5 +++
media-gfx/digikam/Manifest | 35 +++++++++++----------
media-gfx/digikam/digikam-1.2.0-r4.ebuild | 5 ++-
media-gfx/digikam/digikam-1.8.0.ebuild | 6 ++--
media-gfx/digikam/digikam-1.9.0.ebuild | 4 +-
media-gfx/digikam/files/digikam-1.8.0-gcc46.patch | 15 +++++++++
6 files changed, 46 insertions(+), 24 deletions(-)
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 5dfd6a9..2d9a7df 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 01 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ digikam-1.2.0-r4.ebuild, digikam-1.8.0.ebuild,
+ +files/digikam-1.8.0-gcc46.patch, digikam-1.9.0.ebuild:
+ Resync with main tree
+
*digikam-2.0.0_beta3 (28 Feb 2011)
28 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 502bcaf..8a88a23 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -15,6 +15,7 @@ AUX digikam-1.4.0-docs.patch 1953 RMD160 c90ab96aea6e08bca963a22bee5f7868de22a70
AUX digikam-1.5.0-unbundle.patch 11772 RMD160 a593a67bd5d1ea02f695dc51f6240917e4f7ccdc SHA1 b989dc93f5949b1d313234d28b24b4e024d82861 SHA256 28320a7d1beb3ad8caf7fd011a93ab3f6835191183477c673c2f27662417d8ad
AUX digikam-1.6.0-docs.patch 1438 RMD160 d4507c7aabe6eceb700ae8e3b76ac90c500c3326 SHA1 b6f477d6e6ceaef8947071a12cf07e188789fc81 SHA256 21286862bb1dc5893cec0b16cf563b75edb6fe952f6aad7add6f4f59a575d2b8
AUX digikam-1.7.0-docs.patch 1457 RMD160 e41322e23bb47234047fbe78aaf9202996907055 SHA1 281f7ad8644aa3f6c284cef7db40f330c8cec5d7 SHA256 7c32e5193a2ce168d10cdb3ea0bfa3a06774220013e51f61e8ba02fe65958ac6
+AUX digikam-1.8.0-gcc46.patch 512 RMD160 950c4744a8d4bfe88f0f19233bfd5aefb87ccbba SHA1 e3682e8af28233609c12817ec13a120c95a169be SHA256 088709ad10f71266957d237fabba9ee6f1de0f43ba2c5f63badbeb974d140241
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-2.0.0_beta1-docs.patch 1361 RMD160 3b98a59e9790a7bc12dc5ec4723860d2cc968c4b SHA1 63d6d8c23126a198b91a56528cdfd97559f1f398 SHA256 dc8bf8aa8c6f956a5afd60bc0bc526872ed7b7604a3e1b8acb1613c947a5c97c
@@ -24,27 +25,27 @@ DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d9
DIST digikam-2.0.0-beta2.tar.bz2 23685947 RMD160 0370c304af9dfcc380d97747f698ab449e0d0beb SHA1 dbc62eed97c54dbdfff97690d4eb218d361e0d25 SHA256 15f49e18fefdf7bcce8b31bb77b4fe31368f16d88c039842c58e7cbafa58fd49
DIST digikam-2.0.0-beta3.tar.bz2 24063835 RMD160 61871d8f1f28acd7f3b83f261a94715d97bf71ea SHA1 7688ef4eec77b55e36ecd8f55d92635c36f38349 SHA256 60c9f050b07a787e1512173b7b871dbf9babc730804f98829dae53229e16b97e
DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
-EBUILD digikam-1.2.0-r4.ebuild 3215 RMD160 8b65234982a07cbca031e762cca9ad9fca0af112 SHA1 ed204cc640716af1998afe46f6cb2c3395da31ba SHA256 bba559b09bdb15fa23ffc390e70c26cb111143cca6bfc280e5c5240f1052aac1
-EBUILD digikam-1.8.0.ebuild 3233 RMD160 9d246c104d4705c7be47a7496da68f663ca5012c SHA1 d5033cb9d1f909a3b0516e92bff9c5e596fad486 SHA256 cd3a989f75296645049899f45d9f6a5dc96695c44615561088b8e9d077b9e87d
-EBUILD digikam-1.9.0.ebuild 3240 RMD160 7070312f1310e0c79702c08f404c97192a826130 SHA1 b79572a1dc6a95f6735091fdd74a8cd204a4a430 SHA256 a39706489d6a16212de05a90563f5681e6634e5070f62bf6c740f167d8919aa7
+EBUILD digikam-1.2.0-r4.ebuild 3241 RMD160 97240d9bf66f91276583380abb44abcca32aef53 SHA1 541cb89174e630ede2a012f75576b1e66a7e5834 SHA256 7b99de04c49c27afc4047b49eb88558d34ab83cdddf272d3a282313f79e88c48
+EBUILD digikam-1.8.0.ebuild 3247 RMD160 86c84f6dea0b55764dad9cf4c6427b1b2fbc7742 SHA1 4ea44c2e1e30d7dfdb28bbeb8defbd740199fad9 SHA256 b93cb62a5f973e48ec99716183ee339dcd0c90791594a982b6d70bd216a425c4
+EBUILD digikam-1.9.0.ebuild 3245 RMD160 7595b6ce1967bafa99dd8ecf19257838aef23753 SHA1 6c144376c2ed7058111505fc265fcee15f6f5462 SHA256 a410fe8542a23f6f1a47b6fac8e4ec0980f84518da06c90f2c9532292818fd06
EBUILD digikam-2.0.0_beta2.ebuild 3334 RMD160 a0297ac43f4aff1d038d88236c2cfc0389fcdde4 SHA1 9c155bafa5736bfff2e150450771e26501ec82d0 SHA256 e2e1103efd5454be2ec03af814460e8578cc6a9bdd033612a15c79a9e68e665f
EBUILD digikam-2.0.0_beta3.ebuild 3334 RMD160 8611636f62192c2eaa4ce7a338e66bd50985315d SHA1 787a9098b3682828267ffef72a421c858b266c1f SHA256 9a29623a16ef1071a33473e9b951b391182ed95e032046ec43de51384514d9f5
-MISC ChangeLog 8969 RMD160 16a5788bc1e9bd154abb686410240a6b7dad687e SHA1 12f21833715fe8a1d259411f948e66c5c8f70900 SHA256 b9e162a75fae2ad09638307a4fe15c3927651b9bd94c718cefe44744ea4064b8
+MISC ChangeLog 9158 RMD160 d241792c1fdfcb85afbd04053c8cce8600acaa92 SHA1 8c8136a08fdb7c49ced677a164a8c135342ecf6c SHA256 9a117017b2d87825f2b8cb2d0a257f25ba1a58fddd6987b34f3c3ec3cc02ccc8
MISC metadata.xml 626 RMD160 c40d623ad086f0d2f47a8f1092b486b4ae92faef SHA1 fb1c2209b4eac3dc43fa09a7946d47c0156cee67 SHA256 a5d01bcd7e500161aed9a6a4fe9b65422091a375d1ee9cc0490e7776f8f925a6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBAgAGBQJNbCutAAoJENwGBM22xffeKhAP/AlKiIxuEDAKBAGz3kLZ7ydp
-M5JXvUU+4auGfNdLl5vq7eFUPopapweS6ltCOlU6H2e41gCaOUiEpHAzTBRGDWxd
-1bMdF0bxaHfPiUXQ2FfX72HgTj05shWqr/S+rBmFjs/o9x3no7G9K9QdFg+lFvrq
-F6Cf4kxWLLBbefziS6vW64EIJ/VzAmQISrlsLK8nyFe5/Z15WNKvCXQpNd4zm+xW
-h9kpJXkGwh1asRqQTjdTphQewWsKmBBBRbul1pCJf0gCjceejtWHa28bbBPMBKc4
-zv+fkgY900r14hjHNNSkiy8S9FZinIA89hhnM71G7qelljUhF0I9ELmeJ0n93M1i
-3w99208fpXoCqoCn3Amv7Mw9dIFjOizz6htFZ7jipAwXn3syfgI3qPYDfrPNkebE
-hrb1PKJT3nnpK8cTKFS3fgGiVTdtFeV4+kwifw2EGVHoBTFdu5CSt4qlnXUnOFcX
-WzUZTiAukfE2ezQ++pKFYPLbkkuxdy9Ov3GVtI6VVKwMGQWqprtM4ib4AR1NQmNm
-J+4Of6H741Ai1714CwQgOHQEOufs04ix2GvpHqNtgO+TDSRj0YJsxyBKOVG8euok
-O0mNuxDPLxF9DTkZFR9dWGx3H6brj7G1DIak0HLG1fmP3YYNvkpKOxOA7qGI3I9h
-M2Uv4U95E1mUhjNZG3mE
-=QiqD
+iQIcBAEBAgAGBQJNbJ8gAAoJENwGBM22xffeQUsP/jt+LOgxXqBzOcT5CGYOu43B
+lXdIGIEEwD5P8e0q2iQZ94v19HDGb4dVybc4DZ3pGQD3bn9JAeon/7NNKRBmepap
+1mZFcty+r75cuCbrR7bVmykQYDk0UKz+1r/npkJ4dzt8+LOxBBG8SfKRH16Wjx+w
+DW464d3No3iWsEunYxrIu9bODlLvgQhd7/oeEWZYgGTd3Py2Cc3GzYUZiAgpgZOr
+sMn+G061YKiOydpSWvIz4HeNLXVE+QD6K9kzdC1PpU1/JQWzNsH9HH2z9rnWfo7B
+TyvFxq6ngyBYGJr4lu+dpgPz6tr/5SK7DUVIoK2cI4VWynfLMg3D27WkEyotJQJ1
+A8ZQ1/oLTq7BBoJQpxNGla1cr4EmC9MyY5MCValBAsiLB85S8saxz2mDu+DAJ/yg
+TR2s7DpeDVJzWB6op+EbDhurJW/zn1XeNXyNQDLcIAeHDc1TePNhGOgr/F2DnY+J
+kAsZS+Z8Tq2M7tgjksptscc0UfHpLx2Yijqs7mJOVVMSOHjYFiqqSz7SZEllhsl4
+lShlYEaNtF1c9eeNunCzO5wA2eD5eyY6IEkGLlto/UjA7or4g8OAZ56CB/sEh/kd
+GwTl7KlWxvwJAUAzt8tMU31v1ph7NzoFR4MtS6SqOB0AJteX7ZSsA5lLl+pptWV9
+zGcP8XMME2vdW7Zvx2YJ
+=0rel
-----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-1.2.0-r4.ebuild b/media-gfx/digikam/digikam-1.2.0-r4.ebuild
index f38aa63..29b34e7 100644
--- a/media-gfx/digikam/digikam-1.2.0-r4.ebuild
+++ b/media-gfx/digikam/digikam-1.2.0-r4.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-gfx/digikam/digikam-1.2.0-r4.ebuild,v 1.2 2011/01/28 19:15:45 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.2.0-r4.ebuild,v 1.6 2011/02/27 11:55:04 dilfridge Exp $
EAPI=3
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
LICENSE="GPL-2
handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~ppc x86"
SLOT="4"
IUSE="addressbook debug doc geolocation gphoto2 handbook lensfun semantic-desktop +thumbnails video"
@@ -43,6 +43,7 @@ CDEPEND="
geolocation? ( >=kde-base/marble-${KDE_MINIMAL} )
gphoto2? ( media-libs/libgphoto2 )
lensfun? ( media-libs/lensfun )
+ <kde-base/kdelibs-4.6
"
RDEPEND="${CDEPEND}
>=kde-base/kreadconfig-${KDE_MINIMAL}
diff --git a/media-gfx/digikam/digikam-1.8.0.ebuild b/media-gfx/digikam/digikam-1.8.0.ebuild
index 84cb1d8..0f4eca1 100644
--- a/media-gfx/digikam/digikam-1.8.0.ebuild
+++ b/media-gfx/digikam/digikam-1.8.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-gfx/digikam/digikam-1.7.0.ebuild,v 1.2 2011/01/19 12:59:18 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.8.0.ebuild,v 1.4 2011/02/11 20:33:40 xarthisius Exp $
EAPI=3
@@ -21,7 +21,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
LICENSE="GPL-2
handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
SLOT="4"
IUSE="addressbook debug doc geolocation gphoto2 handbook semantic-desktop themedesigner +thumbnails video"
@@ -65,7 +65,7 @@ DEPEND="${CDEPEND}
S="${WORKDIR}/${MY_P}"
PATCHES=( "${FILESDIR}/${PN}"-1.7.0-docs.patch
- "${FILESDIR}/${P}"-tests.patch )
+ "${FILESDIR}/${P}"-{tests,gcc46}.patch )
src_prepare() {
if use handbook; then
diff --git a/media-gfx/digikam/digikam-1.9.0.ebuild b/media-gfx/digikam/digikam-1.9.0.ebuild
index 11e045c..61764c8 100644
--- a/media-gfx/digikam/digikam-1.9.0.ebuild
+++ b/media-gfx/digikam/digikam-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-gfx/digikam/digikam-1.7.0.ebuild,v 1.2 2011/01/19 12:59:18 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.9.0.ebuild,v 1.2 2011/03/01 07:19:59 dilfridge Exp $
EAPI=3
@@ -21,7 +21,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
LICENSE="GPL-2
handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
SLOT="4"
IUSE="addressbook debug doc geolocation gphoto2 handbook semantic-desktop themedesigner +thumbnails video"
diff --git a/media-gfx/digikam/files/digikam-1.8.0-gcc46.patch b/media-gfx/digikam/files/digikam-1.8.0-gcc46.patch
new file mode 100644
index 0000000..d958102
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-1.8.0-gcc46.patch
@@ -0,0 +1,15 @@
+--- trunk/extragear/graphics/digikam/libs/threads/dynamicthread.cpp 2011/02/06 10:48:24 1219102
++++ trunk/extragear/graphics/digikam/libs/threads/dynamicthread.cpp 2011/02/06 11:02:50 1219103
+@@ -257,6 +257,12 @@
+ kDebug() << "Transition to Running: Invalid Inactive state" << q;
+ return false;
+ }
++ default:
++ {
++ kDebug() << "libs/threads/dynanamicthread.cpp : Should never reach here: assert?" << q;
++ return false;
++ }
++
+ }
+ }
+
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
@ 2011-02-28 18:36 Andreas K. Huettel
0 siblings, 0 replies; 13+ messages in thread
From: Andreas K. Huettel @ 2011-02-28 18:36 UTC (permalink / raw
To: gentoo-commits
commit: 41cce7e3c77b8885bb2f9baa17f01fdaebdf7f65
Author: Andreas K. Huettel <andreas.huettel <AT> physik <DOT> uni-r <DOT> de>
AuthorDate: Mon Feb 28 18:36:43 2011 +0000
Commit: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Feb 28 18:36:43 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=41cce7e3
[media-gfx/digikam] Version bump
(Portage version: 2.1.9.39/git/Linux x86_64, signed Manifest commit with key 7887F787)
---
media-gfx/digikam/ChangeLog | 6 +
media-gfx/digikam/Manifest | 33 +++---
media-gfx/digikam/digikam-1.9.0.ebuild | 125 ++++++++++++++++++++++
media-gfx/digikam/files/digikam-1.9.0-docs.patch | 50 +++++++++
4 files changed, 199 insertions(+), 15 deletions(-)
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index c8b8ebd..ee34c1d 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*digikam-1.9.0 (28 Feb 2011)
+
+ 28 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ +digikam-1.9.0.ebuild, +files/digikam-1.9.0-docs.patch:
+ Version bump
+
03 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
digikam-2.0.0_beta2.ebuild:
New package locations
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 843ae2c..0662891 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,5 +1,5 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
AUX digikam-1.1.0-libpgf.patch 8996 RMD160 4f1a7ad7b28c43b3fe2e454eb3351f27a14bde6f SHA1 fd2b98e23c31d880a2a32f28161f279abef82c22 SHA256 f2001099ee5538a31a9660c223e59a25a19eb7c36a191831b849e1b81c58856d
AUX digikam-1.1.0-libpng14.patch 1580 RMD160 769e9bf4030d795349cb260854e26c189471ccbc SHA1 9b3123dad7bd7530db6833296dc1de7ec240fd54 SHA256 0ae5e279aedc80857cb27ace7d1609b6cf632853513445896b88a7365b763fb9
@@ -16,30 +16,33 @@ AUX digikam-1.5.0-unbundle.patch 11772 RMD160 a593a67bd5d1ea02f695dc51f6240917e4
AUX digikam-1.6.0-docs.patch 1438 RMD160 d4507c7aabe6eceb700ae8e3b76ac90c500c3326 SHA1 b6f477d6e6ceaef8947071a12cf07e188789fc81 SHA256 21286862bb1dc5893cec0b16cf563b75edb6fe952f6aad7add6f4f59a575d2b8
AUX digikam-1.7.0-docs.patch 1457 RMD160 e41322e23bb47234047fbe78aaf9202996907055 SHA1 281f7ad8644aa3f6c284cef7db40f330c8cec5d7 SHA256 7c32e5193a2ce168d10cdb3ea0bfa3a06774220013e51f61e8ba02fe65958ac6
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-2.0.0_beta1-docs.patch 1361 RMD160 3b98a59e9790a7bc12dc5ec4723860d2cc968c4b SHA1 63d6d8c23126a198b91a56528cdfd97559f1f398 SHA256 dc8bf8aa8c6f956a5afd60bc0bc526872ed7b7604a3e1b8acb1613c947a5c97c
DIST digikam-1.2.0.tar.bz2 13970098 RMD160 f8177241536b2f099499977d9c3cbd2dc9880853 SHA1 7f12caf737a05043c7a9a5291a448684e5a4e2e6 SHA256 930539b5bb53af345f4bef3d06c7121c22af3dbd7ae7b338fa3d173a6a631206
DIST digikam-1.8.0.tar.bz2 23376636 RMD160 aa86cae8048a8f7122285c5e27aaa59e5dbcc47c SHA1 65430990896b56b7ec76b9a6bc5f8472145f44fd SHA256 210de9d949265e910c65c9ab8b19efab13839f6a2ef761a5915d267ddfe494aa
+DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5
DIST digikam-2.0.0-beta2.tar.bz2 23685947 RMD160 0370c304af9dfcc380d97747f698ab449e0d0beb SHA1 dbc62eed97c54dbdfff97690d4eb218d361e0d25 SHA256 15f49e18fefdf7bcce8b31bb77b4fe31368f16d88c039842c58e7cbafa58fd49
DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
EBUILD digikam-1.2.0-r4.ebuild 3215 RMD160 8b65234982a07cbca031e762cca9ad9fca0af112 SHA1 ed204cc640716af1998afe46f6cb2c3395da31ba SHA256 bba559b09bdb15fa23ffc390e70c26cb111143cca6bfc280e5c5240f1052aac1
EBUILD digikam-1.8.0.ebuild 3233 RMD160 9d246c104d4705c7be47a7496da68f663ca5012c SHA1 d5033cb9d1f909a3b0516e92bff9c5e596fad486 SHA256 cd3a989f75296645049899f45d9f6a5dc96695c44615561088b8e9d077b9e87d
+EBUILD digikam-1.9.0.ebuild 3240 RMD160 7070312f1310e0c79702c08f404c97192a826130 SHA1 b79572a1dc6a95f6735091fdd74a8cd204a4a430 SHA256 a39706489d6a16212de05a90563f5681e6634e5070f62bf6c740f167d8919aa7
EBUILD digikam-2.0.0_beta2.ebuild 3334 RMD160 a0297ac43f4aff1d038d88236c2cfc0389fcdde4 SHA1 9c155bafa5736bfff2e150450771e26501ec82d0 SHA256 e2e1103efd5454be2ec03af814460e8578cc6a9bdd033612a15c79a9e68e665f
-MISC ChangeLog 8668 RMD160 81105865387fe93c5e47a7d007977d7b30ce5a94 SHA1 015f4d2d58afb17e5d81d0d0eaf6e74a397bae3c SHA256 de98af1a7e48d8d298f85d8b596812d0591a47f4bcf19f56b2a2e9769133ecdd
+MISC ChangeLog 8829 RMD160 5261883e23ec76c6901d23db96938426e9acacca SHA1 492849aa9478d11ed836f8bd2f41504e20913436 SHA256 ef80980c265cc13c5baab85336afa2c11514589f1926f6502942aafe68a657ed
MISC metadata.xml 626 RMD160 c40d623ad086f0d2f47a8f1092b486b4ae92faef SHA1 fb1c2209b4eac3dc43fa09a7946d47c0156cee67 SHA256 a5d01bcd7e500161aed9a6a4fe9b65422091a375d1ee9cc0490e7776f8f925a6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (GNU/Linux)
-iQIcBAEBAgAGBQJNSwJDAAoJENwGBM22xffefnoP+wUMWIFrcY7q/cOXKTIosMVD
-XpHBOK04ZPz6v4dNJeElA2h5EAGvfxdqikPwIXaorJLkYe9GShi8XGvSrp0DAqfw
-WSbrj8APBP2qHzd9IVQxLiHK8Qksj4DixixmLN+nb1K/DDFItbyCEV79af3yOSTr
-MK7FssW+cX294/d9C4cFeIESRk86cCUakNMCqo7Kxr6ZXitShpxTusT9jxku8A8E
-wkgPepfK2DwP6rL1fFDruQdKNOnhLKleMzdPTryJyDFDMHDZ66C/NgVf5X9//FJo
-vEw/Mb/9+F/KH/AP22XWbxNUSYdUM9TBi0ECr7pLTtjy1jikfDvTStXz3hBiIlmo
-6YGJYw70YX0v99G1zkqT9SDz6xBYd5csiVCw5paVw2JpA5iDHXWbpUnXiM11trhX
-l1o+YrKPGl6BciQgoDcxrE4yU2XTF/w8OAJLLX6SS3yanWEZG49sWXlJYUqPvg04
-/c+40MVFQnoiyJFwZXJHgQRoJwr5BwH9/E7FDRwrnZ06V40io5EqxifJfpeexCq6
-qRPxdlnqvtnllR9nx8xPXEYKN/oJ9zP9o7Fqq3SwC18bZtaT2Fd7nEs5TzxrtJIt
-mDh2js0cLT6To3ZeVUwNyB9EbTBuMk5J8onooya3qjdNmG5BfaD9Gszkopmw+hCb
-pkwFuzMkMLAAVyFLjFhe
-=ZMVi
+iQIcBAEBCgAGBQJNa+s7AAoJEEb+UGWnxTyHSbQP/3o9M5BxueUI3RisYbQMQ7Pe
+pTpZdfmzVcvPL24H/ymMZorzTtjt1Jceeo6l0cfIkCP1cl4MVd2hh7j7KceCzv5z
+uuWKPMnWUe6BRzDF4bMFL2TynbpwWQjGf/gg6uiyZkHvPVVCq4rztBDzS9nMKehy
+db581z6utmDNSH/xXABt91AmL1sB9cE5nwI74nr9WDiG7Jc/KYT6e6RGpswHeYWg
+6K3BENup9G0IA5TBFOv7ky6haN3leKjd599cX3iraMUQpyMSx7YPRIBP6erfh8+G
+zh9BNBsbiASvHNaw6Oq6DppJqaYSWC3hVZArZyiDE1JdxipETu0VBJ8vAQg5n5Sl
+DsHUTCPZ1kBiXURJQnaxUuXEvDzhFy3IEX6OluFOdEhFbIlhCmJpmNVtpAkek/GG
+2v4vUWHJmR1qVA3GHSkhzGqUBWgjlJjjqeEhmdzvK/OocWk+m0cc52PwTVjguVcR
+zyt8b+ZjEjSkS9Qop/+abPX/Etyw5p3yYAUoSDcRW8HANXCsWYUUY0zAen7QlWyC
+C43qMIQyYINT8ZlKZ7RQKUvO091qRYXf28oAC5jE/7nnEzCd4956vtKSt95Q6t/C
+M1BhWJO/JlXKVUZjO/suxscTyLadHL/MxYcMy/MpmAsAY1M9D8+tIZgOBPbOcQdG
+jasfRZbXPVlSwfXWDTLy
+=I/9u
-----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-1.9.0.ebuild b/media-gfx/digikam/digikam-1.9.0.ebuild
new file mode 100644
index 0000000..11e045c
--- /dev/null
+++ b/media-gfx/digikam/digikam-1.9.0.ebuild
@@ -0,0 +1,125 @@
+# 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.7.0.ebuild,v 1.2 2011/01/19 12:59:18 scarabeus 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 ~x86"
+SLOT="4"
+IUSE="addressbook debug doc geolocation gphoto2 handbook 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
+ 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? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
+ geolocation? ( >=kde-base/marble-${KDE_MINIMAL}[plasma] )
+ gphoto2? ( media-libs/libgphoto2 )
+"
+RDEPEND="${CDEPEND}
+ >=kde-base/kreadconfig-${KDE_MINIMAL}
+ video? (
+ || (
+ >=kde-base/mplayerthumbs-${KDE_MINIMAL}
+ >=kde-base/ffmpegthumbs-${KDE_MINIMAL}
+ )
+ )
+"
+DEPEND="${CDEPEND}
+ sys-devel/gettext
+ doc? ( app-doc/doxygen )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+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.9.0-docs.patch b/media-gfx/digikam/files/digikam-1.9.0-docs.patch
new file mode 100644
index 0000000..588cfb9
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-1.9.0-docs.patch
@@ -0,0 +1,50 @@
+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 )
++
++
^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2012-08-11 17:58 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-04 13:04 [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/, media-gfx/digikam/files/ Andreas Hüttel
-- strict thread matches above, loose matches on Subject: below --
2012-08-11 17:58 Andreas Hüttel
2012-04-08 15:40 Andreas Hüttel
2011-12-31 14:43 Andreas Hüttel
2011-07-27 21:57 Andreas Hüttel
2011-07-05 12:04 Andreas Hüttel
2011-07-05 7:09 Andreas Hüttel
2011-07-03 9:25 Andreas Hüttel
2011-05-11 20:46 Andreas K. Huettel
2011-05-11 20:46 Andreas K. Huettel
2011-04-01 23:55 Andreas K. Huettel
2011-03-01 20:22 Andreas K. Huettel
2011-02-28 18:36 Andreas K. Huettel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox