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.

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

6 files changed, 149 insertions, 4 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/Manifest b/media-libs/libraw/Manifest
index 26450f2d0f52..9f88e929a653 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -1,10 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libraw-0.10.0-autoconf.patch 10131 RMD160 b506f89f611ce2ad9b7b78df0661341040366467 SHA1 84cff704b41db32f0fea63bad67f55906d63d944 SHA256 919d4328320c0867b9a51dce19633ebbb09b647080d608440ca1ccd404d8669c
 AUX libraw-0.10.0-pkg-config.patch 1504 RMD160 6a9cb1ef404d64e01bfb1de007783cd95ed52990 SHA1 0c3290dde5148c6c023a0a7272090d337998c54a SHA256 e42a293d9f050a0e69c35190190635275b0fda73229855584dbfef7c03a3eb50
+AUX libraw-0.13.4-docs.patch 440 RMD160 56e30a1e988f2deff0b22cfbc5dc488c46d886b4 SHA1 9aaee880b982e667b0955906475e7d6d9bb75517 SHA256 d9807623a7d8d43deba5c89da2c320dd2badf5f6180b53b7b97ae60b55bfd84f
+AUX libraw-0.13.4-examples.patch 1577 RMD160 bf06eebc299c494c7864e0c341d90573f472e1ee SHA1 dd7c650ed0e84ec5c4a4990f38646e4c78fa46f3 SHA256 145ff2b09c8912670518a3450494ddaf2f922fd934f0e72efbf4942dfe72eefd
 AUX libraw-0.9.1-pkg-config.patch 1502 RMD160 cfa6962fe473e869e5eb7a816985da820c279cdf SHA1 a8c15c28c2a6d742d0d1cf3282000ae2504cceb3 SHA256 ef93af77f11d8bde5b726f6028a36dc28c46d3306e93e1aca611c1b2e44bf5ef
 DIST LibRaw-0.10.0.tar.gz 554095 RMD160 71e98bb7234f61eb0b05538cf1debb4de9400259 SHA1 862c0928127973e792b0e0f243076d103b36a55f SHA256 e0d373a774723381bf5e27050d462513039f0bf0101b732fcbea00ce12600104
+DIST LibRaw-0.13.4.tar.gz 1314295 RMD160 cf8297f660571d0f086786bd1a20496f1dc7548b SHA1 af9bc8dd31aa1773929e46e79f80138cf7793b40 SHA256 588caf5324c76240d6370852691e05ac8ef89428ee8d45168f15ce47422bc36b
 DIST LibRaw-0.9.1.tar.gz 547554 RMD160 53cf7747c91b47c35014379c1cc6490e2b1468d1 SHA1 c314ac3949605ea3419f0ef1851af3af1772e6d9 SHA256 f9737af7988579945994c1eb3b9e74ff201584e7dc8a92dac0b1e83457be125c
+DIST LibRaw-demosaic-pack-GPL2-0.13.4.tar.gz 30264 RMD160 43248761ddb9da1563b42df25233303fe3fa557e SHA1 316d3d11f3940b0d3f9e3e52b6990e5b13c0b352 SHA256 060fe3c90fcec167d8402bb815e450dae1c6cf243550d529767108bb0522cce7
+DIST LibRaw-demosaic-pack-GPL3-0.13.4.tar.gz 38819 RMD160 92dcd3fc1f84b69892b0f07354e9dcb1dee4cc8e SHA1 25759b85b3c0acf16a49f61e431364422df58aa4 SHA256 5211eb0d3b3b99e9f50ac15ccc5163ba3ec27528d1a86442611f710bee6c56d5
 EBUILD libraw-0.10.0-r1.ebuild 1063 RMD160 c81af77d1b35c2e0dc3cab7611ea04bdd57bc870 SHA1 46493e83909a2df47e134bce5b27c8440f9839d8 SHA256 458f49a60abf0160aa63e84db149a2b2bd1bfd270248664cacad5943e0ccaf88
 EBUILD libraw-0.10.0.ebuild 1510 RMD160 e9307c5d81de143e8d8b8a48e67fc1512b1e87b3 SHA1 eeb87c93fa2a6002e4c6852597edbc609a2ca440 SHA256 f3e8817896e5220ab2fbe34a94e836f5bdf525edff274d811fae378d4a5665b7
+EBUILD libraw-0.13.4.ebuild 1533 RMD160 5bb1e2db2f47730933944d456300c172480b9926 SHA1 14dc8180f4ef9106f88f3c2099ccee6bc57995f7 SHA256 5f985db1a80f7ab85295a3f66fe180a05d2a9d252dca197fbccdf817e1d77d18
 EBUILD libraw-0.9.1.ebuild 1705 RMD160 3f393099fe8176f19a9a5b365d220a5f1acb2fc5 SHA1 853ffc02288e9918641a92d8910a8fba65c3db60 SHA256 56d3f53e51451655fe78e7004203723280f84f820b4dd1057d673e94f7c7e638
-MISC ChangeLog 805 RMD160 d6e448bc801da1cb7d5e7974c067a9ec6731996f SHA1 ba86356afb2926cd1c4fb787a0b40094ff586b70 SHA256 4509552d7ee8a0736f0dc8d26ef7869471457bb6dccb34e9c1aad060f272c255
-MISC metadata.xml 415 RMD160 134c649d154b0998e41cf6a0e6acfe7184e117d4 SHA1 c56b971fc9b210e1bc89d69c44de620b608a6b73 SHA256 3e0c5750bb61eeae9a23c4ab9509978adef9817a34727ddd831082b0052d34c1
+MISC ChangeLog 1193 RMD160 76b8245c85fa6176e82cca1f7ef7a3ff1a1b80a1 SHA1 e07890543d2e9c4a1b8135c356b33439b16c5005 SHA256 ad4b2e3e6c3b46a1b425488f28d4d98d3552274a33c139ad95fcef502b04f7e3
+MISC metadata.xml 515 RMD160 ba90ac56bc6824b362d6d168bf2880a9d6cef952 SHA1 2c54b673c20bbad11c37638acb9196ff6c25091e SHA256 690dbe70799121fc2073e88a34265726c32cbde77f9c0fac4851a35b34bc33df
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJNxzsdAAoJEEqz6FtPBkyjiSYIAJQ9vGEZDxTj7jQufIf3YzUa
+6PCBRF3ZoSrOBeRbEh6r1egYoLYVYg8bWdfc69eJbLqiToqUuZLumEcgkEjmr4g8
+/Vq0nswimtlPIQ2r6VaQMyQQSCcOCJvfYXXmOq1p2LOMOOjk8G0fxNdxLdMFEXNN
+UCy2Nh4XVO2NIpf5FdODv9iRLjd+mBDQDKwJ+grx1efrMKSHhF1fwf1q5BYixrEG
+0EzsWiJ43JO9EbvH3JHpHAtREaDbdp5KaKmPgbPz7AkY+0oZCfI/+0VRwSskb8u4
+ixInh8vj8YV7Q7FKFkS5grUJT/yaYO/2sHwXMqh5dCiolK8ViXRfMKt1nH/2fcM=
+=m63y
+-----END PGP SIGNATURE-----
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>