Version bump (bug #358463). Update to EAPI 4, add support for using external demosaic packs via the related USE flag, bump lcms dependency, don't install unneeded license/copyright files.

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

5 files changed, 127 insertions, 2 deletions

diff --git a/media-libs/libraw/ChangeLog b/media-libs/libraw/ChangeLog
index 92be4ffe75ed..83f1f8ffb9f8 100644
--- a/media-libs/libraw/ChangeLog
+++ b/media-libs/libraw/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/libraw
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libraw/ChangeLog,v 1.3 2010/09/19 20:13:44 hollow Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libraw/ChangeLog,v 1.4 2011/05/09 00:53:40 radhermit Exp $
+
+*libraw-0.13.4 (09 May 2011)
+
+  09 May 2011; Tim Harder <radhermit@gentoo.org> +libraw-0.13.4.ebuild,
+  +files/libraw-0.13.4-docs.patch, +files/libraw-0.13.4-examples.patch,
+  metadata.xml:
+  Version bump (bug #358463). Update to EAPI 4, add support for using external
+  demosaic packs via the related USE flag, bump lcms dependency, don't install
+  unneeded license/copyright files.
 
 *libraw-0.10.0-r1 (19 Sep 2010)
 
diff --git a/media-libs/libraw/files/libraw-0.13.4-docs.patch b/media-libs/libraw/files/libraw-0.13.4-docs.patch
new file mode 100644
index 000000000000..e860ef6ef95f
--- /dev/null
+++ b/media-libs/libraw/files/libraw-0.13.4-docs.patch
@@ -0,0 +1,19 @@
+--- LibRaw-0.13.4/Makefile.am.orig
++++ LibRaw-0.13.4/Makefile.am
+@@ -15,11 +15,11 @@
+ 							libraw/libraw_version.h
+ 
+ # Docs
+-doc_DATA =	COPYRIGHT \
+-			LICENSE.CDDL \
+-			LICENSE.LGPL \
+-			LICENSE.LibRaw.pdf \
+-			Changelog.txt
++#doc_DATA =	COPYRIGHT \
++#            LICENSE.CDDL \
++#            LICENSE.LGPL \
++#            LICENSE.LibRaw.pdf \
++#            Changelog.txt
+ 
+ # pkg-config .pc files
+ pkgconfigdir = $(libdir)/pkgconfig
diff --git a/media-libs/libraw/files/libraw-0.13.4-examples.patch b/media-libs/libraw/files/libraw-0.13.4-examples.patch
new file mode 100644
index 000000000000..0bb4642abe1a
--- /dev/null
+++ b/media-libs/libraw/files/libraw-0.13.4-examples.patch
@@ -0,0 +1,42 @@
+--- LibRaw-0.13.4/Makefile.am.orig
++++ LibRaw-0.13.4/Makefile.am
+@@ -61,31 +61,39 @@
+ bin_raw_identify_SOURCES = samples/raw-identify.cpp
+ bin_raw_identify_CPPFLAGS = $(lib_libraw_a_CPPFLAGS)
+ bin_raw_identify_LDADD = -Llib/  -lraw 
++bin_raw_identify_DEPENDENCIES = lib/libraw.a
+ 
+ bin_unprocessed_raw_SOURCES = samples/unprocessed_raw.cpp
+ bin_unprocessed_raw_CPPFLAGS = $(lib_libraw_a_CPPFLAGS)
+ bin_unprocessed_raw_LDADD = -Llib/ -lraw
++bin_unprocessed_raw_DEPENDENCIES = lib/libraw.a
+ 
+ bin_4channels_SOURCES = samples/4channels.cpp
+ bin_4channels_CPPFLAGS = $(lib_libraw_a_CPPFLAGS)
+ bin_4channels_LDADD = -Llib/ -lraw 
++bin_4channels_DEPENDENCIES = lib/libraw.a
+ 
+ bin_simple_dcraw_SOURCES = samples/simple_dcraw.cpp
+ bin_simple_dcraw_CPPFLAGS = $(lib_libraw_a_CPPFLAGS)
+ bin_simple_dcraw_LDADD = -Llib/ -lraw
++bin_simple_dcraw_DEPENDENCIES = lib/libraw.a
+ 
+ bin_mem_image_SOURCES = samples/mem_image.cpp
+ bin_mem_image_CPPFLAGS = $(lib_libraw_a_CPPFLAGS)
+ bin_mem_image_LDADD = -Llib/ -lraw 
++bin_mem_image_DEPENDENCIES = lib/libraw.a
+ 
+ bin_dcraw_half_SOURCES = samples/dcraw_half.c
+ bin_dcraw_half_CPPFLAGS = $(lib_libraw_a_CPPFLAGS)
+ bin_dcraw_half_LDADD = -Llib/ -lraw 
++bin_dcraw_half_DEPENDENCIES = lib/libraw.a
+ 
+ bin_half_mt_SOURCES = samples/half_mt.c
+ bin_half_mt_CFLAGS = $(lib_libraw_r_a_CXXFLAGS)
+ bin_half_mt_LDADD = -Llib/ -lraw_r 
++bin_half_mt_DEPENDENCIES = lib/libraw_r.a
+ 
+ bin_dcraw_emu_SOURCES = samples/dcraw_emu.cpp
+ bin_dcraw_emu_CPPFLAGS = $(lib_libraw_a_CPPFLAGS)
+ bin_dcraw_emu_LDADD = -Llib/ -lraw 
++bin_dcraw_emu_DEPENDENCIES = lib/libraw.a
diff --git a/media-libs/libraw/libraw-0.13.4.ebuild b/media-libs/libraw/libraw-0.13.4.ebuild
new file mode 100644
index 000000000000..482dafda53f3
--- /dev/null
+++ b/media-libs/libraw/libraw-0.13.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libraw/libraw-0.13.4.ebuild,v 1.1 2011/05/09 00:53:40 radhermit Exp $
+
+EAPI="4"
+
+inherit eutils autotools
+
+MY_P="LibRaw-${PV}"
+DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras"
+HOMEPAGE="http://www.libraw.org/"
+SRC_URI="http://www.libraw.org/data/${MY_P}.tar.gz
+	demosaic? ( https://github.com/LibRaw/LibRaw-demosaic-pack-GPL2/tarball/${PV} -> LibRaw-demosaic-pack-GPL2-${PV}.tar.gz
+		https://github.com/LibRaw/LibRaw-demosaic-pack-GPL3/tarball/${PV} -> LibRaw-demosaic-pack-GPL3-${PV}.tar.gz )"
+
+# Libraw also has it's own license, which is a pdf file and
+# can be obtained from here:
+# http://www.libraw.org/data/LICENSE.LibRaw.pdf
+LICENSE="LGPL-2.1 CDDL GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="demosaic examples +lcms +openmp"
+
+DEPEND="lcms? ( media-libs/lcms:2 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( Changelog.txt README )
+
+src_unpack() {
+	unpack ${A}
+	if use demosaic ; then
+		mv *LibRaw-demosaic*GPL2* LibRaw-demosaic-pack-GPL2-${PV}
+		mv *LibRaw-demosaic*GPL3* LibRaw-demosaic-pack-GPL3-${PV}
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-docs.patch
+	epatch "${FILESDIR}"/${P}-examples.patch
+	eautomake
+}
+
+src_configure() {
+	econf \
+		$(use_enable demosaic demosaic-pack-gpl2) \
+		$(use_enable demosaic demosaic-pack-gpl3) \
+		$(use_enable examples) \
+		$(use_enable lcms) \
+		$(use_enable openmp)
+}
diff --git a/media-libs/libraw/metadata.xml b/media-libs/libraw/metadata.xml
index b4ca876b2270..d4bb4d1a4d89 100644
--- a/media-libs/libraw/metadata.xml
+++ b/media-libs/libraw/metadata.xml
@@ -11,4 +11,7 @@
 		<name>Andreas Nüßlein</name>
 		<description>Proxy maintainer. Please CC on bugs.</description>
 	</maintainer>
+	<use>
+		<flag name="demosaic">Enable support for external interpolation algorithms</flag> 
+	</use>
 </pkgmetadata>