version bump wrt #336393; also fixes openmp support (#336218)

Package-Manager: portage-2.2_rc83/cvs/Linux x86_64

4 files changed, 112 insertions, 2 deletions

diff --git a/media-libs/libraw/ChangeLog b/media-libs/libraw/ChangeLog
index cad5128afebb..804ccc7581a2 100644
--- a/media-libs/libraw/ChangeLog
+++ b/media-libs/libraw/ChangeLog
@@ -1,6 +1,12 @@
 # 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.1 2010/08/22 07:24:56 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libraw/ChangeLog,v 1.2 2010/09/19 08:16:02 hollow Exp $
+
+*libraw-0.10.0 (19 Sep 2010)
+
+  19 Sep 2010; Benedikt Böhm <hollow@gentoo.org> +libraw-0.10.0.ebuild,
+  +files/libraw-0.10.0-pkg-config.patch:
+  version bump wrt #336393; also fixes openmp support (#336218)
 
 *libraw-0.9.1 (22 Aug 2010)
 
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index 6157f72ec1dd..b29b764bc257 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -1,5 +1,8 @@
+AUX libraw-0.10.0-pkg-config.patch 1504 RMD160 6a9cb1ef404d64e01bfb1de007783cd95ed52990 SHA1 0c3290dde5148c6c023a0a7272090d337998c54a SHA256 e42a293d9f050a0e69c35190190635275b0fda73229855584dbfef7c03a3eb50
 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.9.1.tar.gz 547554 RMD160 53cf7747c91b47c35014379c1cc6490e2b1468d1 SHA1 c314ac3949605ea3419f0ef1851af3af1772e6d9 SHA256 f9737af7988579945994c1eb3b9e74ff201584e7dc8a92dac0b1e83457be125c
+EBUILD libraw-0.10.0.ebuild 1510 RMD160 e9307c5d81de143e8d8b8a48e67fc1512b1e87b3 SHA1 eeb87c93fa2a6002e4c6852597edbc609a2ca440 SHA256 f3e8817896e5220ab2fbe34a94e836f5bdf525edff274d811fae378d4a5665b7
 EBUILD libraw-0.9.1.ebuild 1705 RMD160 3f393099fe8176f19a9a5b365d220a5f1acb2fc5 SHA1 853ffc02288e9918641a92d8910a8fba65c3db60 SHA256 56d3f53e51451655fe78e7004203723280f84f820b4dd1057d673e94f7c7e638
-MISC ChangeLog 394 RMD160 499d06567455ec89d4ddf5f0dd4979023742c5ae SHA1 7cdb68dacc78854d358c9a57a2b3f5d883558f10 SHA256 c0c61896d514a672be78bb703ec04f4265e1a18adbce679724ff45450b099bfc
+MISC ChangeLog 603 RMD160 88a688dbd38ea6423185e19c568f733ee4c463ee SHA1 e53e6e13f8214a4660141b316fdfc3722d5be243 SHA256 a504b15fb0f4d1efb5ee65faf7a2f87c9b5ba6223c04e943e17459d5ef4c5686
 MISC metadata.xml 415 RMD160 134c649d154b0998e41cf6a0e6acfe7184e117d4 SHA1 c56b971fc9b210e1bc89d69c44de620b608a6b73 SHA256 3e0c5750bb61eeae9a23c4ab9509978adef9817a34727ddd831082b0052d34c1
diff --git a/media-libs/libraw/files/libraw-0.10.0-pkg-config.patch b/media-libs/libraw/files/libraw-0.10.0-pkg-config.patch
new file mode 100644
index 000000000000..ca1233b18bdf
--- /dev/null
+++ b/media-libs/libraw/files/libraw-0.10.0-pkg-config.patch
@@ -0,0 +1,48 @@
+'diff --git a/Makefile b/Makefile
+index 51ba805..8e9dac2 100644
+--- a/Makefile
++++ b/Makefile
+@@ -20,6 +20,7 @@ all_samples: bin/raw-identify bin/simple_dcraw  bin/dcraw_emu bin/dcraw_half bin
+ install: library
+ 	@if [ -d /usr/local/include ] ; then cp -R libraw /usr/local/include/ ; else echo 'no /usr/local/include' ; fi
+ 	@if [ -d /usr/local/lib ] ; then cp lib/libraw.a lib/libraw_r.a /usr/local/lib/ ; else echo 'no /usr/local/lib' ; fi
++	@if [ -d /usr/local/lib/pkgconfig ] ; then cp libraw.pc libraw_r.pc /usr/local/lib/pkgconfig ; else echo 'no /usr/local/lib/pkgconfig' ; fi
+ 
+ install-binaries: all_samples
+ 	@if [ -d /usr/local/bin ] ; then cp bin/[a-z]* /usr/local/bin/ ; else echo 'no /usr/local/bin' ; fi
+diff --git a/libraw.pc b/libraw.pc
+new file mode 100644
+index 0000000..15ec862
+--- /dev/null
++++ b/libraw.pc
+@@ -0,0 +1,12 @@
++prefix=/usr
++exec_prefix=${prefix}
++libdir=${exec_prefix}/lib
++includedir=${prefix}/include
++
++Name: libraw
++Description: Raw image decoder library (non-thread-safe)
++Requires: 
++Version: 0.10.0
++Libs: -L${libdir} -lraw -lstdc++
++Cflags: -I${includedir}/libraw
++
+diff --git a/libraw_r.pc b/libraw_r.pc
+new file mode 100644
+index 0000000..b54242b
+--- /dev/null
++++ b/libraw_r.pc
+@@ -0,0 +1,12 @@
++prefix=/usr
++exec_prefix=${prefix}
++libdir=${exec_prefix}/lib
++includedir=${prefix}/include
++
++Name: libraw
++Description: Raw image decoder library (thread-safe)
++Requires: 
++Version: 0.10.0
++Libs: -L${libdir} -lraw_r -lstdc++
++Cflags: -I${includedir}/libraw
++
diff --git a/media-libs/libraw/libraw-0.10.0.ebuild b/media-libs/libraw/libraw-0.10.0.ebuild
new file mode 100644
index 000000000000..8c5251c9baf1
--- /dev/null
+++ b/media-libs/libraw/libraw-0.10.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libraw/libraw-0.10.0.ebuild,v 1.1 2010/09/19 08:16:02 hollow Exp $
+
+EAPI="2"
+
+inherit eutils
+
+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/LibRaw-${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"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="lcms openmp examples"
+
+RDEPEND="lcms? ( =media-libs/lcms-1* )"
+
+S="${WORKDIR}/LibRaw-${PV}"
+
+src_prepare() {
+	# Add pkg-config support
+	epatch "${FILESDIR}/libraw-0.10.0-pkg-config.patch"
+
+	sed -i -e "s:/usr/local/:${D}usr/:g" \
+		-e "/^CFLAGS/ s:-O4:${CFLAGS}:" \
+		Makefile
+
+	if use lcms; then
+		sed -i -r '/^#LCMS/ s!^#!!' Makefile
+		sed -i -r -e '/^Libs/ s!$! -llcms!' \
+			-e '/^Requires/ s!$! lcms2!' *.pc
+	fi
+
+	if use openmp; then
+		sed -i -r '/^CFLAGS/ s!^(.*)$!\1 -fopenmp!' Makefile
+		sed -i -r -e '/^Cflags/ s!$! -fopenmp!' \
+			-e '/^Libs/ s!$! -lgomp!' *.pc
+	fi
+}
+
+src_install() {
+	# This makefile doesn't even make the directories..
+	mkdir -p "${D}usr/include" "${D}usr/lib" "${D}usr/lib/pkgconfig" \
+		$(use examples && echo "${D}/usr/bin") || die "Directory making failed."
+
+	emake install \
+		$(use examples && echo "install-binaries") || die "Install failed."
+}