Updates integrating external dcraw patch and improved deps. Thanks to Guillaume Castagnino <casta@xwing.info> for his work, closes bug 164070.

(Portage version: 2.1.2.2)

4 files changed, 57 insertions, 9 deletions

diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog
index 2884e7b6e1c1..bdb656b1be89 100644
--- a/media-plugins/kipi-plugins/ChangeLog
+++ b/media-plugins/kipi-plugins/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/kipi-plugins
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.20 2007/03/17 19:46:52 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.21 2007/03/17 20:17:47 cryos Exp $
+
+*kipi-plugins-0.1.3-r1 (17 Mar 2007)
+
+  17 Mar 2007; Marcus D. Hanwell <cryos@gentoo.org>
+  +files/kipi-plugins-0.1.3-external-dcraw.patch,
+  -kipi-plugins-0.1.3.ebuild, +kipi-plugins-0.1.3-r1.ebuild:
+  Updates integrating external dcraw patch and improved deps. Thanks to
+  Guillaume Castagnino <casta@xwing.info> for his work, closes bug 164070.
 
 *kipi-plugins-0.1.3 (17 Mar 2007)
 
diff --git a/media-plugins/kipi-plugins/files/digest-kipi-plugins-0.1.3 b/media-plugins/kipi-plugins/files/digest-kipi-plugins-0.1.3-r1
index 1d7b37eb658a..1d7b37eb658a 100644
--- a/media-plugins/kipi-plugins/files/digest-kipi-plugins-0.1.3
+++ b/media-plugins/kipi-plugins/files/digest-kipi-plugins-0.1.3-r1
diff --git a/media-plugins/kipi-plugins/files/kipi-plugins-0.1.3-external-dcraw.patch b/media-plugins/kipi-plugins/files/kipi-plugins-0.1.3-external-dcraw.patch
new file mode 100644
index 000000000000..2eb1b00d94b5
--- /dev/null
+++ b/media-plugins/kipi-plugins/files/kipi-plugins-0.1.3-external-dcraw.patch
@@ -0,0 +1,40 @@
+diff -r -U3 kipi-plugins-0.1.3/kipi-plugins/rawconverter/dcrawbinary.cpp kipi-plugins-0.1.3.new/kipi-plugins/rawconverter/dcrawbinary.cpp
+--- kipi-plugins-0.1.3/kipi-plugins/rawconverter/dcrawbinary.cpp	2007-01-24 22:04:18.000000000 +0100
++++ kipi-plugins-0.1.3.new/kipi-plugins/rawconverter/dcrawbinary.cpp	2007-02-04 11:58:33.000000000 +0100
+@@ -93,7 +93,7 @@
+ 
+ const char *DcrawBinary::path()
+ {
+-    return "kipidcraw";
++    return "dcraw";
+ }
+ 
+ bool DcrawBinary::isAvailable() const
+diff -r -U3 kipi-plugins-0.1.3/kipi-plugins/rawconverter/Makefile.am kipi-plugins-0.1.3.new/kipi-plugins/rawconverter/Makefile.am
+--- kipi-plugins-0.1.3/kipi-plugins/rawconverter/Makefile.am	2007-01-24 22:04:18.000000000 +0100
++++ kipi-plugins-0.1.3.new/kipi-plugins/rawconverter/Makefile.am	2007-02-04 12:01:30.000000000 +0100
+@@ -35,24 +35,3 @@
+ messages: rc.cpp
+ 	$(XGETTEXT) *.cpp *.h -o $(podir)/kipiplugin_rawconverter.pot
+ 
+-#-- dcraw binary -------------------------------------------------
+-
+-# RawConverter plugin use a dedicaced dcraw binary program to run. This is mandatory 
+-# since dcraw author have broken the command line options 
+-# compatibility with the 8.x serie.
+-# Also, dcraw is not available like a library.
+-# The dcraw.c source code is just a copy of official implementation, but 
+-# this one have been completly tested with this plugin. 
+-# Note: dcraw project page is http://cybercom.net/~dcoffin
+-
+-bin_PROGRAMS = kipidcraw
+-
+-# This line is require to disable color management support (using LCMS library) witch 
+-# is not yet supported by plugin.
+-kipidcraw_CFLAGS = -DNO_LCMS -w 
+-
+-kipidcraw_SOURCES = dcraw.c
+-
+-kipidcraw_LDFLAGS = $(all_libraries) $(LIBJPEG) -lm
+-
+-
diff --git a/media-plugins/kipi-plugins/kipi-plugins-0.1.3.ebuild b/media-plugins/kipi-plugins/kipi-plugins-0.1.3-r1.ebuild
index 997d45d90754..3498e169b7f4 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-0.1.3.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-0.1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-0.1.3.ebuild,v 1.1 2007/03/17 19:46:52 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-0.1.3-r1.ebuild,v 1.1 2007/03/17 20:17:47 cryos Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -19,22 +19,22 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="opengl gphoto2"
 
-DEPEND=">=media-libs/libkexif-0.1
-	>=media-libs/libkipi-0.1
+DEPEND=">=media-gfx/exiv2-0.12
+	>=media-libs/libkipi-0.1.5
 	gphoto2? ( >=media-libs/libgphoto2-2.3.1 )
 	>=media-libs/imlib2-1.1.0
 	>=media-gfx/imagemagick-6.2.4
 	>=media-video/mjpegtools-1.6.0
 	opengl? ( virtual/opengl )
 	>=media-libs/tiff-3.5
-	>=media-libs/libexif-0.1
-	>=dev-libs/libxslt-1.1
-	>=media-gfx/exiv2-0.9.1"
+	>=dev-libs/libxslt-1.1"
 
 RDEPEND="${DEPEND}
-	>=media-gfx/dcraw-5.02"
+	>=media-gfx/dcraw-8.45"
 
-need-kde 3.1
+need-kde 3.5
+
+PATCHES="${FILESDIR}/${P}-external-dcraw.patch"
 
 pkg_setup(){
 	slot_rebuild "media-libs/libkipi media-libs/libkexif" && die