Added an upstream patch to allow for compatibility with all lcms versions in the tree. cf. bug 189004. Thanks to Ingmar van Hassel for his good work on this!

Removed the obsolete version 0.9.0.
(Portage version: 2.1.3.6)

6 files changed, 37 insertions, 140 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index bccf05a204cd..6c6f3702b464 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.95 2007/08/21 00:22:52 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.96 2007/08/22 10:22:10 philantrop Exp $
+
+  22 Aug 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/digikam-lcms-1.17.patch, -digikam-0.9.0.ebuild,
+  digikam-0.9.1.ebuild, digikam-0.9.2.ebuild:
+  Added an upstream patch to allow for compatibility with all lcms versions in
+  the tree. cf. bug 189004. Thanks to Ingmar van Hassel for his good work on
+  this! 
+  Removed the obsolete version 0.9.0.
 
   21 Aug 2007; Wulf C. Krueger <philantrop@gentoo.org> digikam-0.9.0.ebuild,
   digikam-0.9.1.ebuild, digikam-0.9.2.ebuild:
diff --git a/media-gfx/digikam/digikam-0.9.0.ebuild b/media-gfx/digikam/digikam-0.9.0.ebuild
deleted file mode 100644
index 03a33a6608c0..000000000000
--- a/media-gfx/digikam/digikam-0.9.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.9.0.ebuild,v 1.5 2007/08/21 00:22:52 philantrop Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit kde
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-P_DOC="${PN}-doc-0.8.2"
-S_DOC="${WORKDIR}/${P_DOC}"
-
-DESCRIPTION="A digital photo management application for KDE."
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI=""
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc sparc ~x86"
-IUSE="nfs doc kdehiddenvisibility kdeenablefinal"
-
-#Since version 0.9.0_rc1, required exiv2 version is 0.12 (currently in svn only)
-DEPEND=">=media-libs/libgphoto2-2.2
-	>=dev-db/sqlite-3
-	>=media-libs/libkipi-0.1
-	>=media-libs/tiff-3.8.2
-	sys-libs/gdbm
-	media-gfx/dcraw
-	>=media-gfx/exiv2-0.12
-	<media-libs/lcms-1.17
-	>=media-libs/libpng-1.2"
-
-RDEPEND="${DEPEND}
-	|| ( ( kde-base/kgamma kde-base/kamera ) kde-base/kdegraphics )"
-
-need-kde 3.5
-
-LANGS="ar bg br ca cs cy da de el en_GB es et fi fr ga gl he hu is it ja ka lt
-mk ms mt nb nl nn pa pl pt pt_BR ro ru rw sk sl sr sr@Latn sv ta tr uk vi zh_CN
-zh_TW"
-
-LANGS_DOC="da de es et fr it nl pl pt pt_BR sv"
-
-for lang in ${LANGS}; do
-	IUSE="${IUSE} linguas_${lang}"
-done
-
-for lang in ${LANGS_DOC}; do
-	SRC_URI="${SRC_URI}
-	linguas_${lang}? ( http://gentoo-sunrise.org/svndump/peper/distfiles/${P_DOC}-${lang}.tar.bz2 )"
-done
-
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
-	doc? ( http://gentoo-sunrise.org/svndump/peper/distfiles/${P_DOC}-main.tar.bz2
-		${SRC_URI} )"
-
-pkg_setup(){
-	slot_rebuild "media-libs/libkipi" && die
-	kde_pkg_setup
-}
-
-src_unpack(){
-	kde_src_unpack
-	rm -f "${S}/configure" "${S_DOC}/configure"
-
-	local MAKE_PO=$(echo "${LINGUAS} ${LANGS}" | fmt -w 1 | sort | uniq -d | tr '\n' ' ')
-	elog "Enabling translations for: en ${MAKE_PO}"
-	sed -i -e "s:^SUBDIRS =.*:SUBDIRS = . ${MAKE_PO}:" "${S}/po/Makefile.am" || die "sed for locale failed"
-
-	if use doc; then
-		local MAKE_DOC=$(echo "${LINGUAS} ${LANGS_DOC}" | fmt -w 1 | sort | uniq -d | tr '\n' ' ')
-		elog "Enabling documentation for: en ${MAKE_DOC}"
-	fi
-}
-
-src_compile(){
-	local myconf
-
-	myconf="$(use_enable nfs nfs-hack)"
-	kde_src_compile
-	myconf=""
-	[[ -d "${S_DOC}" ]] && KDE_S="${S_DOC}" kde_src_compile
-}
-
-src_install(){
-	kde_src_install
-	[[ -d "${S_DOC}" ]] && KDE_S="${S_DOC}" kde_src_install
-
-	# Install the .desktop in FDO's suggested directory
-	dodir /usr/share/applications/kde
-	mv "${D}/usr/share/applnk/Graphics/digikam.desktop" \
-		"${D}/usr/share/applications/kde"
-}
diff --git a/media-gfx/digikam/digikam-0.9.1.ebuild b/media-gfx/digikam/digikam-0.9.1.ebuild
index 5202c2acfda6..90571fc7dca7 100644
--- a/media-gfx/digikam/digikam-0.9.1.ebuild
+++ b/media-gfx/digikam/digikam-0.9.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.9.1.ebuild,v 1.11 2007/08/21 00:22:52 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.9.1.ebuild,v 1.12 2007/08/22 10:22:10 philantrop Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
 
-inherit kde
+inherit kde eutils
 
 MY_P="${P/_/-}"
 S="${WORKDIR}/${MY_P}"
@@ -25,7 +25,7 @@ DEPEND=">=media-libs/libgphoto2-2.2
 	>=media-libs/libkipi-0.1
 	>=media-libs/tiff-3.8.2
 	>=media-gfx/exiv2-0.12
-	<media-libs/lcms-1.17
+	>=media-libs/lcms-1.14
 	>=media-libs/libpng-1.2
 	>=media-libs/jasper-1.7
 	media-libs/libkexiv2"
@@ -61,6 +61,9 @@ pkg_setup(){
 
 src_unpack(){
 	kde_src_unpack
+
+	epatch "${FILESDIR}/${PN}-lcms-1.17.patch"
+
 	rm -f "${S}/configure" "${S_DOC}/configure"
 
 	if has_version ">=media-gfx/exiv2-0.14"; then
diff --git a/media-gfx/digikam/digikam-0.9.2.ebuild b/media-gfx/digikam/digikam-0.9.2.ebuild
index 0e8a139fc9ed..f2394edcdf87 100644
--- a/media-gfx/digikam/digikam-0.9.2.ebuild
+++ b/media-gfx/digikam/digikam-0.9.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.9.2.ebuild,v 1.4 2007/08/21 00:22:52 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.9.2.ebuild,v 1.5 2007/08/22 10:22:10 philantrop Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
 
-inherit kde
+inherit kde eutils
 
 MY_P="${P/_/-}"
 S="${WORKDIR}/${MY_P}"
@@ -25,7 +25,7 @@ DEPEND=">=media-libs/libgphoto2-2.2
 	>=dev-db/sqlite-3
 	>=media-libs/libkipi-0.1.5
 	>=media-libs/tiff-3.8.2
-	<media-libs/lcms-1.17
+	>=media-libs/lcms-1.14
 	>=media-libs/libpng-1.2
 	>=media-libs/jasper-1.7
 	>=media-libs/libkexiv2-0.1.3
@@ -54,6 +54,9 @@ pkg_setup(){
 
 src_unpack(){
 	kde_src_unpack
+
+	epatch "${FILESDIR}/${PN}-lcms-1.17.patch"
+
 	rm -f "${S}/configure" "${S_DOC}/configure"
 
 	local MAKE_PO=$(echo "${LINGUAS} ${LANGS}" | fmt -w 1 | sort | uniq -d | tr '\n' ' ')
diff --git a/media-gfx/digikam/files/digest-digikam-0.9.0 b/media-gfx/digikam/files/digest-digikam-0.9.0
deleted file mode 100644
index 14107125c489..000000000000
--- a/media-gfx/digikam/files/digest-digikam-0.9.0
+++ /dev/null
@@ -1,39 +0,0 @@
-MD5 5334d608218fe077a476722e2ce55323 digikam-0.9.0.tar.bz2 5692707
-RMD160 f99e95ac99b5c21d248391ebe2dca1018bd51bd0 digikam-0.9.0.tar.bz2 5692707
-SHA256 8fff9b2277c58ca027100fa4af05dea8b955c8a98b79b6befa90b47ac34c77d2 digikam-0.9.0.tar.bz2 5692707
-MD5 9576d0d2d9898d4d63964e572b35d8c9 digikam-doc-0.8.2-da.tar.bz2 50158
-RMD160 c78a62d17045e5a47d562acbc4a5cb3f1b62e558 digikam-doc-0.8.2-da.tar.bz2 50158
-SHA256 5b3301301dbbfae999d7398d7ee2651c6c4b94f4baa8566d5d1c9914b2bfe142 digikam-doc-0.8.2-da.tar.bz2 50158
-MD5 019088773c49c35dce874e136bbc0142 digikam-doc-0.8.2-de.tar.bz2 52448
-RMD160 2f48efc9a470da0f18e5b8028b40f15f5d133b19 digikam-doc-0.8.2-de.tar.bz2 52448
-SHA256 5968243bff59ef2a81482479a8b6c2b7570394c702fe6c41fb179411c12a58f1 digikam-doc-0.8.2-de.tar.bz2 52448
-MD5 a1f780e7193278232b7b7505bef3d487 digikam-doc-0.8.2-es.tar.bz2 18932790
-RMD160 33fe060abd338af7f2f06ab9a4a4a48d73f9f0cb digikam-doc-0.8.2-es.tar.bz2 18932790
-SHA256 45ec5d2995535a8ce721895fe140a0a284bdd6f0af879a497ea0317ca4d83f29 digikam-doc-0.8.2-es.tar.bz2 18932790
-MD5 7d59456f5f5323695614497e8c0ece3b digikam-doc-0.8.2-et.tar.bz2 49932
-RMD160 bcecae36e125d5cdf31025e31ecb8b6c80c17929 digikam-doc-0.8.2-et.tar.bz2 49932
-SHA256 7c94a068d45e6c93ea54ab1ccdc053a0eb77b36050925b8beaec00f77efd2790 digikam-doc-0.8.2-et.tar.bz2 49932
-MD5 c48e2dd1f20f534a2821f5e3487c8fd1 digikam-doc-0.8.2-fr.tar.bz2 28805
-RMD160 a1910268db988269461822535accf375c533afcc digikam-doc-0.8.2-fr.tar.bz2 28805
-SHA256 054e9ec711251576d20d20323a1a1a2ce15026ebe7611b7934e7c163326fbf4c digikam-doc-0.8.2-fr.tar.bz2 28805
-MD5 ddd19f8e24bff10966e671edef9b0045 digikam-doc-0.8.2-it.tar.bz2 702534
-RMD160 44e5a1d0834cdba90bb7da3eb627945c8c79605e digikam-doc-0.8.2-it.tar.bz2 702534
-SHA256 881ca55f51c23ac12ab8487349b394a4931d9ee167a0454fcb01a344fb27d025 digikam-doc-0.8.2-it.tar.bz2 702534
-MD5 7c05ebee138e4ae8f7764e4f9cf42af6 digikam-doc-0.8.2-main.tar.bz2 8763651
-RMD160 e1668f5fe596d57e4da55aaa455429b70cd4ce55 digikam-doc-0.8.2-main.tar.bz2 8763651
-SHA256 87499ec384b825f57f651af033178802e5ec2e472712e3be4c03bcb93db01596 digikam-doc-0.8.2-main.tar.bz2 8763651
-MD5 71153e96278449704b392517af18931a digikam-doc-0.8.2-nl.tar.bz2 9763453
-RMD160 c71580f8e4cac77ffe424aad6a2cf97e2f2bb89b digikam-doc-0.8.2-nl.tar.bz2 9763453
-SHA256 11ec5f6fee836c5e8950f5774f3fc9797088109bb16fd53bf569a0dc89b470c5 digikam-doc-0.8.2-nl.tar.bz2 9763453
-MD5 5770704f6880d2bd1c81dfcab695c166 digikam-doc-0.8.2-pl.tar.bz2 53888
-RMD160 3c8511908647821edf37a7b5ef52f5967cd75895 digikam-doc-0.8.2-pl.tar.bz2 53888
-SHA256 eb0dc2d87f7427f7f930bd0c3b2e942fe2650c9165ecc6084df51da752fdee3f digikam-doc-0.8.2-pl.tar.bz2 53888
-MD5 2e96e470365d9ccf3a5991e67ab7f5ff digikam-doc-0.8.2-pt.tar.bz2 52447
-RMD160 2beb73e84520e8508ef67c9c72944f406f2acbff digikam-doc-0.8.2-pt.tar.bz2 52447
-SHA256 bdd974b2c903e999ace96a5fa771f4228b05173a963f9ce8859f16ae9aa558c9 digikam-doc-0.8.2-pt.tar.bz2 52447
-MD5 cf7b245c4f246edbe28c91f24ec4d3f3 digikam-doc-0.8.2-pt_BR.tar.bz2 1987997
-RMD160 521b7b1a2bcdfcd1282cbafaf8dad844838a08a4 digikam-doc-0.8.2-pt_BR.tar.bz2 1987997
-SHA256 1f557ef8cd8ca013027ccb6f4025f9a83280c8b0742c412a3f170fae580f38b8 digikam-doc-0.8.2-pt_BR.tar.bz2 1987997
-MD5 22ca04cb7c0f83879caebf8677e74474 digikam-doc-0.8.2-sv.tar.bz2 261002
-RMD160 9a1c2e3b7a6957a2597e08492a967634bc0744a9 digikam-doc-0.8.2-sv.tar.bz2 261002
-SHA256 c40087176d04f7dbd89458aa2e4ce21ef825633924347e7c0b62c9ad5fd72f67 digikam-doc-0.8.2-sv.tar.bz2 261002
diff --git a/media-gfx/digikam/files/digikam-lcms-1.17.patch b/media-gfx/digikam/files/digikam-lcms-1.17.patch
new file mode 100644
index 000000000000..489e51ea8009
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-lcms-1.17.patch
@@ -0,0 +1,16 @@
+Index: libs/lprof/lcmsprf.h
+===================================================================
+--- digikam-orig/digikam/libs/lprof/lcmsprf.h	(revisione 702957)
++++ digikam/digikam/libs/lprof/lcmsprf.h	(copia locale)
+@@ -70,6 +70,11 @@
+     } MATN,FAR* LPMATN;
+
+
++
++#if (LCMS_VERSION > 116)
++typedef LCMSBOOL BOOL;
++#endif
++
+ LPMATN      cdecl MATNalloc(int Rows, int Cols);
+ void        cdecl MATNfree (LPMATN mat);
+ LPMATN      cdecl MATNmult(LPMATN a1, LPMATN a2);