Version bump. Add static-libs USE flag.

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

4 files changed, 139 insertions, 9 deletions

diff --git a/media-libs/libraw/ChangeLog b/media-libs/libraw/ChangeLog
index e2943159e5da..2414a2a216e0 100644
--- a/media-libs/libraw/ChangeLog
+++ b/media-libs/libraw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libraw
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libraw/ChangeLog,v 1.5 2011/05/23 21:55:55 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libraw/ChangeLog,v 1.6 2011/07/04 08:29:22 radhermit Exp $
+
+*libraw-0.13.6 (04 Jul 2011)
+
+  04 Jul 2011; Tim Harder <radhermit@gentoo.org> +libraw-0.13.6.ebuild,
+  +files/libraw-0.13.6-makefile.patch:
+  Version bump. Add static-libs USE flag.
 
 *libraw-0.13.5 (23 May 2011)
 
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index 26d31db6a2ac..7f8acf087153 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -5,30 +5,35 @@ AUX libraw-0.10.0-autoconf.patch 10131 RMD160 b506f89f611ce2ad9b7b78df0661341040
 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.13.6-makefile.patch 2104 RMD160 109eb2bb700bef96913e2a59b3d2379b907173ef SHA1 d6f08a62bcae7484be622f9106ad2a86e21c46f4 SHA256 ece2157dca0f46a53977044d17beb4ee680172651c32d0f3f6c82cb76298b86d
 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.13.5.tar.gz 1314431 RMD160 35f4bb8744f841aa6d38fb9747d768fd56588f3f SHA1 e437ab53a42fc503c9b65ff0e4475613583a35b2 SHA256 7e554d5fd6ca6f430d74e4c7084086cf57bd0c478268412920c0ce2940b86fe8
+DIST LibRaw-0.13.6.tar.gz 1349527 RMD160 906ca6c23b63154f3cca7ef641e89b153bda7665 SHA1 d6432706fc1a9fcf549af14e69fb057beb03e7c3 SHA256 ab45522b25ed518c6ebab3ac8279ff2eb54b742883babe5dedd1bee5b888ede9
 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-GPL2-0.13.5.tar.gz 30263 RMD160 7f496f2128ebeb321d0e54b87392a53d8dabf620 SHA1 476112c3530fc949de4157397cc5133fd87e7512 SHA256 4446685fcf3e768116995fd213f0289495ff89532c50f7305ab3764a05b729e9
+DIST LibRaw-demosaic-pack-GPL2-0.13.6.tar.gz 30264 RMD160 d886d9dce15b70917c0feb578e1f8e4ec546631d SHA1 a371d1fd3dfc10378cd47ad1d9c83286e0d9089f SHA256 e3850c4c9a34015d36659775979a6cc56bd8d3b630f84e43ab06815ea1a05f0d
 DIST LibRaw-demosaic-pack-GPL3-0.13.4.tar.gz 38819 RMD160 92dcd3fc1f84b69892b0f07354e9dcb1dee4cc8e SHA1 25759b85b3c0acf16a49f61e431364422df58aa4 SHA256 5211eb0d3b3b99e9f50ac15ccc5163ba3ec27528d1a86442611f710bee6c56d5
 DIST LibRaw-demosaic-pack-GPL3-0.13.5.tar.gz 38819 RMD160 9bd92da1814c0d125514466ac4b914d1cdbbb135 SHA1 5b67aa4308a68e722a367dbda4920c16798366b0 SHA256 7c074bb47077bd83fbd296b1a25e2a8277cce3b129001dbab5164f24fc5f122c
+DIST LibRaw-demosaic-pack-GPL3-0.13.6.tar.gz 38823 RMD160 39503d1518529dcdf1e42e43264c6742f9e5a5b8 SHA1 978ba1efb077ac60b86b93b8ef8f597316615d24 SHA256 203429be69e4102001e53e0fbc0749a10ee50b484c78c037d29ace2364a58b36
 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.13.5.ebuild 1549 RMD160 99e8ee9a5d825f482bc6d4b84d1c9250d47e1ef2 SHA1 c13636a4ab37e598c5d84817d37f8275206a0272 SHA256 f37c6b96dd79840e922782bc92e9110b69a17a36de07de4ba25107e9eaa09866
+EBUILD libraw-0.13.6.ebuild 1686 RMD160 9894820b501a5b4f863ec51b8c750d590f5bc009 SHA1 4ad6e910315992c7e6ea07befac3e981eb4b8fdc SHA256 26f6f18a8fbf9c61eb0076355067aad0af18ee63807e032af8dd311953b7d5b0
 EBUILD libraw-0.9.1.ebuild 1705 RMD160 3f393099fe8176f19a9a5b365d220a5f1acb2fc5 SHA1 853ffc02288e9918641a92d8910a8fba65c3db60 SHA256 56d3f53e51451655fe78e7004203723280f84f820b4dd1057d673e94f7c7e638
-MISC ChangeLog 1311 RMD160 015ddf4ac2ef2cac5e4b7c69b4197bf1255251bd SHA1 6be2cb78637ce25ab5e93dd3c5368612411b4a43 SHA256 0e418a20e58f2287bd4a06f386e611aea8ca612e194cc4848371d9589a65175e
+MISC ChangeLog 1495 RMD160 1b4a73f1d23cc4cf0e851191cfb86ec21f60e429 SHA1 f03cf0cf33ce3a4260b98d0b0cf65561500507ae SHA256 dc3f821232b39fe7106a120bf773e3e20c1746f6852d490097ad5db5ef6acfd7
 MISC metadata.xml 515 RMD160 ba90ac56bc6824b362d6d168bf2880a9d6cef952 SHA1 2c54b673c20bbad11c37638acb9196ff6c25091e SHA256 690dbe70799121fc2073e88a34265726c32cbde77f9c0fac4851a35b34bc33df
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJN2tf1AAoJEEqz6FtPBkyjrbYH/RD2APwMPpvunabvimBQsA97
-q2QAPMf04alnU+L7HVA6U4uguISi558LFvvpbueIcmrpTHAqrXmKxZe05GvNWFlV
-A6f9q9/EGuNaiXZA5imCHRqbGsPXEKsiRN98dkDP1kNjYhKNfX3OZgHWiwyV2aYy
-xHR6gq092MXbkLBsjz8nHLJ3zF+ZySkzE67BtKV0y94PgAuRtrP2tgF43pXm29a3
-noR5HCikY6k+Kddqc5HfuJQcQ/dSSSQukh7CSCwrJiyx6K0ZqG+4ZBOni/HMSWHd
-BNc32dz61uEyJtjixUH8CMgm/dJ/VjORkvFZVX7FZ6XABfqVwnm4ZPXTvU+WKDE=
-=JCr4
+iQEcBAEBAgAGBQJOEXnsAAoJEEqz6FtPBkyjl+kIAIJLrGX/TWRRANy0KdHGQjR/
+PNmgE8t5Id2ULhb6DZNDWTAz6tHa2qGITPesQPRr87l84YJkPyt3dhjqAPtkafn/
+pOrcM+qou7zU5vH9Q2NJ7ifhPOl5m8fPjmhzM0MDWf1T85NbJc4gMApY3ExXDw/X
+GZ3ng3TRHqdaFJpebuW1KDaN1oIrz92+L8tFmHs94bs+65/+YHO038xylfDLTmoU
+cTUD3/lWF+DyMQ7A0KmaQzVh96K9C1GpWSAkErsvU9qNSVdlJ4+sZOGBi9n/JEe+
++wsq94BIzdQqjnJsDzprenYnOHtVbzsRacoTnoTA5cCLfRJ37r5fmtuu9GftdGM=
+=opKu
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libraw/files/libraw-0.13.6-makefile.patch b/media-libs/libraw/files/libraw-0.13.6-makefile.patch
new file mode 100644
index 000000000000..2ae4e9af8887
--- /dev/null
+++ b/media-libs/libraw/files/libraw-0.13.6-makefile.patch
@@ -0,0 +1,59 @@
+--- LibRaw-0.13.6/Makefile.am.orig
++++ LibRaw-0.13.6/Makefile.am
+@@ -26,7 +26,6 @@
+ pkgconfig_DATA = libraw.pc libraw_r.pc
+ 
+ # Libraries
+-lib_LIBRARIES = lib/libraw.a lib/libraw_r.a
+ lib_LTLIBRARIES = lib/libraw.la lib/libraw_r.la
+ 
+ lib_libraw_a_CPPFLAGS = -DLIBRAW_NOTHREADS -w
+@@ -60,40 +59,32 @@
+ 
+ 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_raw_identify_LDADD = lib/libraw.la
+ 
+ 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_unprocessed_raw_LDADD = lib/libraw.la
+ 
+ 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_4channels_LDADD = lib/libraw.la
+ 
+ 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_simple_dcraw_LDADD = lib/libraw.la
+ 
+ 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_mem_image_LDADD = lib/libraw.la
+ 
+ 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_dcraw_half_LDADD = lib/libraw.la
+ 
+ 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_half_mt_LDADD = lib/libraw_r.la
+ 
+ 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
++bin_dcraw_emu_LDADD = lib/libraw.la
diff --git a/media-libs/libraw/libraw-0.13.6.ebuild b/media-libs/libraw/libraw-0.13.6.ebuild
new file mode 100644
index 000000000000..0eff4373d01c
--- /dev/null
+++ b/media-libs/libraw/libraw-0.13.6.ebuild
@@ -0,0 +1,60 @@
+# 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.6.ebuild,v 1.1 2011/07/04 08:29:22 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 static-libs"
+
+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}"/${PN}-0.13.4-docs.patch \
+		"${FILESDIR}"/${P}-makefile.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) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	# Remove useless .la files
+	find "${D}" -name '*.la' -exec rm -f {} +
+}