Fix building with media-libs/jpeg >= 9a wrt #520888 using a patch loaned from Fink. Upstream has changed the code in git so this is required only for 0.0.9 release.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 49 insertions, 12 deletions

diff --git a/media-libs/libopenraw/ChangeLog b/media-libs/libopenraw/ChangeLog
index c2fe110d49f3..f6ebd37f82a3 100644
--- a/media-libs/libopenraw/ChangeLog
+++ b/media-libs/libopenraw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libopenraw
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libopenraw/ChangeLog,v 1.66 2014/03/04 20:01:04 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libopenraw/ChangeLog,v 1.67 2014/08/28 16:23:28 ssuominen Exp $
+
+  28 Aug 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/libopenraw-0.0.9-jpeg-9a.patch, libopenraw-0.0.9.ebuild:
+  Fix building with media-libs/jpeg >= 9a wrt #520888 using a patch loaned from
+  Fink. Upstream has changed the code in git so this is required only for 0.0.9
+  release.
 
   04 Mar 2014; Vicente Olivert Riera <vincent@gentoo.org>
   libopenraw-0.0.9.ebuild:
diff --git a/media-libs/libopenraw/Manifest b/media-libs/libopenraw/Manifest
index 06e545570b7d..18e984b330c4 100644
--- a/media-libs/libopenraw/Manifest
+++ b/media-libs/libopenraw/Manifest
@@ -1,16 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX libopenraw-0.0.9-jpeg-9a.patch 589 SHA256 6cd4b7abe8752890b57a4cf2987435c0262fb0b5a24ea2184c205126f0a1ac96 SHA512 b5a5be08644522676a487d294662777e1f919d0f7ff96d0996ad51804c7bb919723965f6cf25999c1a34e1d8eb5cf045a6427b590e20a96f174863516a299e09 WHIRLPOOL 262ed8e790bc88f496d59d8cab97f4fdd6c7c04e3d031ca5796fd79d8e5dd549a8239517ee0f686fc772aafac34200acfd834e211694f2a1ce00b4f34765b933
 DIST libopenraw-0.0.9.tar.bz2 478687 SHA256 49fd1adf0a0228c7a17a79bf98d8d03664195feae1e50f4ddd1b20162626e18f SHA512 88d475d27719212686a0a5a08da04d6879fd456ec8f7531f401217df97f4f3d4c52dc8c4fb1c6ca88c12d6a67ecd516b151c5e9dceba9cbfcd13150fe81d6db5 WHIRLPOOL 52d407b1d443fe7c38c59274b3267feb4dffeca9114a39cad925c346ae21d1378cbceba4ce1973657073f8890bf50a18c476ba3451d806fe7f50824bb935c559
 DIST libopenraw-0.1.0_pre20130826.tar.bz2 540696 SHA256 3cee52226b94e84e21ca0a0353f71d3fe273a2deb04295a1a1a5fb1de2cd5bcc SHA512 a3067632d634b11877a21a43542cf2ce5e9ee4346d82b815a7864719fb8cd215872ee74fb5fae881599a1da3144a8dc9ebf0327f963f621bdf93aa268729ec92 WHIRLPOOL 23670cc906731634ac4db92b72d745b590889a9fa1c9806635ed2dccc63a31acf36f2ceefab8dfa6a11d90ca35b5a0096409de1c35b46e45ad99ed01489471fe
-EBUILD libopenraw-0.0.9.ebuild 1203 SHA256 adc91494136d96a725a6c5be9c44461bd46e794cbaaa586078571892454e5eb1 SHA512 b639feec5ba5b84b11c56735e2b33f5fd1641671a2400959b652f203418085c245b92bf68abc55bf0bbcc41524faef0d25742fba826a7332bb7e3b84e9323cf8 WHIRLPOOL 65026079c9c3acb06c7602ec1faec5971657da38029131f4a36739f72a328310a0711586bcfc433f3158e8ef65564d23d6c6d927066ca700f4330693938cab88
+EBUILD libopenraw-0.0.9.ebuild 1251 SHA256 690deefa12d485021faf337d9aa69964374830639f7706dc07ad89d97b7a6b45 SHA512 c6bdefe9f8b26ef17c08c0c89fb31bde7f132561be2d4e526ad5f7bcd36601cc4943ff7d9164e8471544558e718e3765b309fa45921e50b7161240dd7d821b17 WHIRLPOOL db102e1905ddcb175c562ba484badbf8c66473ce430ebca83cf21da7f36c4fa35245aca2b2c96a596c7d2a0aa89fd27224ed3add9459024f67c8435f6e0bc76f
 EBUILD libopenraw-0.1.0_pre20130826.ebuild 1299 SHA256 4eb17c0767f2472200449c42a50a0a37cf9b587164faa0936d3029d0b3f1056d SHA512 175dcc23c6531f0c9faa2cbc41a3f124a0d2920adf2c617e9a95d85fa3418b1b05857738e250ec36547bf694a5dcb34dc77ee2b19b27c88b4f0a4fadf1e626a9 WHIRLPOOL e566222f8a8ce6dc41e902cd479c794b5c9e26dbae1b04e0dc199807be753986ae3da2daeaab11b7c40e7c9df129063956aabb4ff11c8c7d18d08ccc90c22b91
-MISC ChangeLog 8380 SHA256 54ae87d13e6523a13d026ae5f27a247fcf097315d1d69f34769cff51ce377b6c SHA512 fd1d332ba4db372982d0e881c4594e54fe94e1f6414dda8afbac6cca6b13f1a0fa1f06be223d7e1d6f4f6bda68d4f7dcb82c57ca23d98cc33aa202840a9cdc0b WHIRLPOOL 61572c44dd07e0491850314fb0d626f49ba8c2779523f52a0b1320cdfbf72c4c3f3f4c15eeca3863dc8b93fcddcbd441911e6bbf812ebe40e0d70e7e7e93067f
+MISC ChangeLog 8674 SHA256 c0480a1e2d563dade69b9f91091bc0bf20f90f405d7acc9f2ea5ad05b9ed0e2f SHA512 43095332cde3f80d6bf276f1b697c59187186f95b28960a9f7862453cc11622a3edff9dc53d6bfcdf8a3a4a806cdc920b046bce7d602c6f2ca9321f0056495c3 WHIRLPOOL 971dd09878fe1c8550e9529cb1d175369753b21b609bcd3cd0a360c93f749aea50e4a652b094e7b300a9089fefca82a7a323902c875566cac5160b779f208221
 MISC metadata.xml 234 SHA256 3018e3b31ed690a57bfc14e35699dd20ea3b352fc28b918f699e6955b57a2d97 SHA512 eed880663c66280f6688f896bd6b82d600cac0063eb79da7b1be0fe3bf866e7289edb389a505dfbf45bd9c7e5282748dadd7bf3477759788c1024300796545c3 WHIRLPOOL 79028c7efb93b6255351aebe7f35d1587d07ec1405e8fbee4fd874e42e57e6d10368b0f4ab60c89e115493a094f36af8be1bc2fe79fc2d34daae83dc0f8d7b16
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlMWMQgACgkQWunnsum7y6g/LACeOI4Rl8kZAkTbEsSW6AcrOQ75
-UegAoJ500bCHBc6ipZtVH0XKptYC6JCL
-=eLw0
+iQEcBAEBCAAGBQJT/1bvAAoJEEdUh39IaPFN+lMH/RbFiKlzb0hfQTOPcTpaiKyI
+vGSVbEfp6aolKc0JyaFZxTsLBEqEYVHqOpX2xfPFswKa6BmnhKOU9ygcT/KUHbOW
+uihJqtcRfxTrCHqe+IPwPKOjt6krJqd2XrqJduud7arPpv8DaceN5AOhRcOlze0b
+HrPu0/oaU0LU3aQKUbQ3TVN0b7GFhvs7iqbkhO0ZOFkZa6zgykwK2a11edvxk1wn
+9KMx9Ch2Sh8wS0ytLRp9v2pKSFkKulIquxY+7NS2UDVloZSX1Ktypdgi81zK6nEH
+T+Xa8hKh+Y+9bphNDMlrPx/1aS1pr4d6Wp+Ijlmh+tWIhdBLBi5QXBpHN0nSHFg=
+=khPc
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libopenraw/files/libopenraw-0.0.9-jpeg-9a.patch b/media-libs/libopenraw/files/libopenraw-0.0.9-jpeg-9a.patch
new file mode 100644
index 000000000000..bfb99fab9744
--- /dev/null
+++ b/media-libs/libopenraw/files/libopenraw-0.0.9-jpeg-9a.patch
@@ -0,0 +1,23 @@
+http://bugs.gentoo.org/520888
+http://sourceforge.net/p/fink/package-submissions/4336/
+
+--- lib/jfifcontainer.cpp
++++ lib/jfifcontainer.cpp
+@@ -145,7 +145,7 @@
+ 		{
+ 			int ret = 0;
+ 			if (::setjmp(m_jpegjmp) == 0) {
+-				ret = JPEG::jpeg_read_header(&m_cinfo, TRUE);
++				ret = JPEG::jpeg_read_header(&m_cinfo, JPEG::TRUE);
+ 				//Trace(DEBUG1) << "jpeg_read_header " << ret << "\n";
+ 				
+ 				JPEG::jpeg_calc_output_dimensions(&m_cinfo);
+@@ -181,7 +181,7 @@
+ 				src->pub.next_input_byte = NULL;
+ 				src->pub.bytes_in_buffer = 0;
+ 			}
+-			return TRUE;
++			return JPEG::TRUE;
+ 		}
+ 
+ 
diff --git a/media-libs/libopenraw/libopenraw-0.0.9.ebuild b/media-libs/libopenraw/libopenraw-0.0.9.ebuild
index a6074094d20d..ff8535cbdd63 100644
--- a/media-libs/libopenraw/libopenraw-0.0.9.ebuild
+++ b/media-libs/libopenraw/libopenraw-0.0.9.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libopenraw/libopenraw-0.0.9.ebuild,v 1.16 2014/03/04 20:01:04 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libopenraw/libopenraw-0.0.9.ebuild,v 1.17 2014/08/28 16:23:28 ssuominen Exp $
 
-EAPI=4
-
-inherit gnome2-utils
+EAPI=5
+inherit eutils gnome2-utils
 
 DESCRIPTION="A decoding library for RAW image formats"
 HOMEPAGE="http://libopenraw.freedesktop.org/wiki/"
@@ -28,6 +27,10 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog NEWS README TODO )
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-jpeg-9a.patch
+}
+
 src_configure() {
 	econf \
 		--with-boost="${EPREFIX}"/usr \
@@ -37,7 +40,7 @@ src_configure() {
 
 src_install() {
 	default
-	find "${ED}"usr -name '*.la' -exec rm -f {} +
+	prune_libtool_files --all
 }
 
 pkg_preinst() {