[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/, media-gfx/digikam/files/

[Andreas Hüttel]

commit:     f5ac6b5ba8a7efe14b390b0c0827d56d289c0dea
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Wed Jul 27 20:52:30 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Jul 27 20:52:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f5ac6b5b

[media-gfx/digikam] Moved to main tree

---
 media-gfx/digikam/digikam-2.0.0_beta6.ebuild       |  136 -------------------
 media-gfx/digikam/digikam-2.0.0_rc.ebuild          |  140 --------------------
 .../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                     |   12 --
 6 files changed, 0 insertions(+), 393 deletions(-)

diff --git a/media-gfx/digikam/digikam-2.0.0_beta6.ebuild b/media-gfx/digikam/digikam-2.0.0_beta6.ebuild
deleted file mode 100644
index be5c2a8..0000000
--- a/media-gfx/digikam/digikam-2.0.0_beta6.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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"
-
-KDE_HANDBOOK="optional"
-
-CMAKE_MIN_VERSION=2.8
-
-KDE_MINIMAL="4.6"
-
-KDEGRAPHICS_MINIMAL="4.6.30"
-# please leave the weird number here for the moment
-
-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 ~x86"
-SLOT="4"
-IUSE="addressbook debug doc gphoto2 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-r6 sci-libs/lapack-atlas )
-	virtual/mysql
-	x11-libs/qt-gui[qt3support]
-	|| ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
-	addressbook? ( $(add_kdebase_dep kdepimlibs) )
-	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}/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 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 12bade4..0000000
--- a/media-gfx/digikam/digikam-2.0.0_rc.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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"
-
-KDE_HANDBOOK="optional"
-
-CMAKE_MIN_VERSION=2.8
-
-KDEGRAPHICS_MINIMAL="4.6.31"
-# please leave the weird number here for the moment
-
-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 ~x86"
-SLOT="4"
-IUSE="addressbook debug doc gphoto2 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-6.11.24
-	>=media-plugins/kipi-plugins-1.2.0-r1
-	|| ( >=sci-libs/clapack-3.2.1-r6 sci-libs/lapack-atlas )
-	virtual/mysql
-	x11-libs/qt-gui[qt3support]
-	|| ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
-	addressbook? ( $(add_kdebase_dep kdepimlibs) )
-	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 )
-"
-
-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 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.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@×××××.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 23f6f4d..0000000
--- a/media-gfx/digikam/metadata.xml
+++ /dev/null
@@ -1,12 +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@g.o</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>
-</use>
-</pkgmetadata>