From 393a7a1c2e65e2ef4001de6e290fde88aa1f63a5 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 5 May 2015 02:40:07 +0000
Subject: [PATCH] =?utf8?q?Restore=20patch=20still=20used=20by=20the=202.0.?=
 =?utf8?q?0=20ebuild=20#548586=20by=20Toralf=20F=C3=B6rster.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200
---
 media-libs/openjpeg/ChangeLog                 |  6 +++-
 media-libs/openjpeg/Manifest                  | 33 +++++++++----------
 .../openjpeg/files/openjpeg-2.0.0-build.patch | 14 ++++++++
 3 files changed, 35 insertions(+), 18 deletions(-)
 create mode 100644 media-libs/openjpeg/files/openjpeg-2.0.0-build.patch

diff --git a/media-libs/openjpeg/ChangeLog b/media-libs/openjpeg/ChangeLog
index 231d94784376..b53c8ce6e5cf 100644
--- a/media-libs/openjpeg/ChangeLog
+++ b/media-libs/openjpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/openjpeg
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.118 2015/05/01 21:45:13 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.119 2015/05/05 02:40:05 vapier Exp $
+
+  05 May 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/openjpeg-2.0.0-build.patch:
+  Restore patch still used by the 2.0.0 ebuild #548586 by Toralf Förster.
 
 *openjpeg-2.0.0-r1 (01 May 2015)
 *openjpeg-2.1.0-r1 (01 May 2015)
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 6d57766bedf5..20d90fa0fe20 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX openjpeg-2.0.0-build.patch 473 SHA256 21f5d1f465c99c41e05d461c1d184aad4bf0c359b08262e8da7625f3e59d1161 SHA512 1ff2ada7fb502f25e8154e0e1dd82073db8a009fe309dcbe209dee98f2787bb2df03643754ae2627fbb78bb60d9cc0110e8f821a8bd70db1bc9790514150e32a WHIRLPOOL 7189cf91e412946e9ebe9a79f27c0eb4061697530b837bea937d8f25a1e50183e288176e2e9661adfff11f1d1e821969c5a109a7db5533114044c0f46a6f3788
 AUX openjpeg-2.0.0-pkgconfig-static.patch 365 SHA256 a0cabdbc353014bc4b2162cefe0949c576259e429046a7256861b6333d4a0e32 SHA512 b170668247ce37ace02d6303b747f817e5ef0a00cda08c903f65927050fa9370450c61ee56a8ae72843b864171072036a5f2998c5e6084ea4ad8e8ab39e5e481 WHIRLPOOL cf391f3ba071d784e0d11f6bd09735dd1683d8b9d5bac8d852b91dd2332e12b16d0f8670b0f7b510facd2da6b1e034e1d46fef4bfe706ab5ee040d14e8647f1a
 AUX openjpeg-2.0.0-pkgconfig.patch 1341 SHA256 8f1f8ce432bac29fe50c21b530bc2bcc2d409e990621d5cefbef3b3e7da41aa7 SHA512 426a3bfe0e34c5496047d42b6d7316b3e71eea99aef2fd25b525738c278ace70c35ea2c690f57b3d0b48e2aa2395950c69db4569342c68a05933387cb0908650 WHIRLPOOL 7f0065d6787badca188ef56fc406a84358b7d0012750176b6fee5eec5f07c16a2f3b50b0a4fb65d61d99c098aff5b09963d6ece697aee2a2a455c8a05b96f377
 DIST openjpeg-1.5.2.tar.gz 1385702 SHA256 15df7b194a5d8dba0052cd21c17a4dc761149a770a907d73fffb972078c28a87 SHA512 b945cf4f8b5e3227a0c07120c94b0ed5bf30c901de73059ee1d47975f46744fb62bbe84cdb2917c6431128f400020874eb07160af870b5448ced897998b08862 WHIRLPOOL 4ca974b411baa1fad7821b3ea88ad5c6a39643098af32bd8e92f66ccaa534d36ef15f55711eba489e91254f667d5f917febdb09539ac9698709c00bf680d45fe
@@ -12,24 +13,22 @@ EBUILD openjpeg-2.0.0-r1.ebuild 2030 SHA256 580e08e42a79b91c64ac93fbede2f0406475
 EBUILD openjpeg-2.0.0.ebuild 1825 SHA256 bddbe215e0c22f58261710e357425ce4b3f0efcfb6b4df57c428137535de1580 SHA512 38f560e0998408f0b3720864efc2f4afe287932a20c683a48dd9c42c690f2707c309cd4f9505de46e1f7d049f9eb4e3ae805b15d1210f3b8c75bf7108f1d3bf5 WHIRLPOOL e39402e4d3a4613b4823790a25ed8d614a6a8147c91449a5400d57b8e6cd8846fbf58f18986faf313161710d87ec34114f4e76ec24a6358788b222018cbc94b8
 EBUILD openjpeg-2.1.0-r1.ebuild 2072 SHA256 3e50c3544e57143fcc4dc820ea8c323a091403bd2a5ba91f8dbc58f612e7676b SHA512 c2336548248625339a45d4cb0cbe8d40424a3aabbabd15a22bfd9acc10045918b64e446247999b074e7f9dc7e07c779e09a7921fa63a76b9d6177e3556f3c459 WHIRLPOOL 2fb3eaf0c2505aca9c0b7b3b64552c9a315c4f5e592cb4046ddd32e519d296cf1cae2fc41cfc77c46c44258a7abe9a93c6c26a4e2af160e56be6b804659424ae
 EBUILD openjpeg-2.1.0.ebuild 1902 SHA256 5a2f481af1ca5e9bd2aa162cfa4c3fa054e401218b0483392ac696c3f429a8e2 SHA512 0fd1b1905200cb21c85bc838c8545c3267054d373e7e7216073cef6fc6ab11aa6ba955922345c667f92c5b773f203253537ff016aeb9d88fe312b38aef6058d3 WHIRLPOOL b01a3bff0c15b79fa12be4592f939acae0efbc4fe2da212707647b9b15ed65ea11323ba83c7197240200c9b81512382c5a2cbcddb725728a0bae710dcca4bf3f
-MISC ChangeLog 16468 SHA256 66030e25f2147c3049bfdd7e09c5c93e1ebcac210008b4c20e3b7af9023b7809 SHA512 c7b3eda4ea6e9947e7c29c425fffdea7650437092c5690dc7487925e4c2fd56da3bcdf4decbf4fb71af54bbf9327124eac03206915fd334caf537316f11f19ad WHIRLPOOL 89449b574001b27bf3661f5bab23533c53402591448985b2942ed37736716127e4af0e9c0c69fb83f521cb01ced7b01e0adf8cf30f1b571837a5d910f16fb38d
+MISC ChangeLog 16632 SHA256 16e64b73b25390f6136c6685474f98e28e09511117c2cfd3e80199cadb59e362 SHA512 73cc1e6014a2a2bb5941d794d5b8b8f295ce8a207ecf532d67504ef219eb28ecb722d2fc913de8543abbd94dbeca89193bbb68d9dfb9a1dd774c1018efa0c37d WHIRLPOOL 4297848b013d0c4d5e65238759d36e610010e7e3ea7c4467d5e495fd3c88ce989d78170ff17b2ff69cb991fdb2d1a5772cdb32af952e694691e2a079e0da39a7
 MISC metadata.xml 240 SHA256 798e4e23637a9ded9dae0967f92aa498b39ad088a555aa94b4f716ba040db68c SHA512 c12ab1993f8b10c50a87bf215eb22613dc54cf8f3c049877959228694afcb1e848d9e13247c376c249b39af35945775f736bcf956c7f50e3d49f456e621ef979 WHIRLPOOL b8b0ff194273de5396bfb4d13c2f169eb481dab034aee85f1ebca948babded8851a1cc6c6047e51b6a20bb40654be025677a9872da63526c78eaa64854436f8b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVQ/PyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
-MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kWcgP/iIsu/2vOXj2DypZIm26RhGv
-CfV/iadPOyUUsadqa6OKYe5d6hLcHVFiZGxWz/Gee80XF3M0bEPJ/aMmnSx2AUg4
-CgeuqqxyHJ8iSilw94Hj6k2/w5nbITlH2mQi2S39YNJewdlt1vpRvNn0zMAEWTtp
-j/FqyTEPFIPm3Pq8CYbZ12++CvfPDx14QmRcCFAsA4flmikNKVoLPNqS0yWgsdXl
-cFssVBbHz73YbLKjERzQcG9lYW2qlROMd1YOMYeuhQFVjvku2H4nxIH/MdQOw40j
-wd3Qsd8xU/sSAO+l6jv4NvDAKj/m1NzKllSIq86dyTG45Kysbac+Tky/cOYShj9n
-R/pj6a6u9pZuvzrjpXC6r9O//X+IePlaLd2t6Iw3kW767XzKFsEY+BlTlCHfoIoL
-fZa95pCIy1ZImadgw6iaAJ2h/nOPR3nqObW1+LTl7M3TgFtBC8lttuB/4alG/1J6
-yMI6clvH3RxfeO7JxkTzJhv0UgM1ksW4lVuugJ19JPF2jHm67ByuVH8JsCBaGaU8
-b5iUciMuPqCnc2C8EW23meA/V9wKQLKKDZrvg7j7rmw28iXLH7iPAOmypvNnCxj1
-HTgwJ9QJOICYEYxbkztVd41Tliahv0GVtq61GWFSl2c6DFyMGLIjEUfFE4U3hfeb
-7ODrKkNGcmHBb3Hx4QPE
-=OVNe
+iQIcBAEBCAAGBQJVSC2GAAoJEPGu1DbS6WIAzJIP/2lC6z5AG9RxY9wgMZjmzwGr
+gR8F+yuPs/upft24EZqmZpl58NCqlLgf9DYsU50mP+xzxsPMXS/nhTvBK50xkpqU
+Ebu39kNVO5cBjo4fJHGwPyGpFHD3CEkby2smvT2QWY4BY+ih5QLkQuCWfJkxY/6p
+0naa09EXaIxhUgel3zioUrNKv1V7UBLmUe3JtgG0GeKe2NQbck3zJ+JrkpH8vLLJ
+lqlHX2z55BTS5lYlMWbKH72Z81Pm8SaUvhh1EExcFHUc+R+x2coNzhzUHUgNOImT
+6Jc6U309q3wIs8ExVvrhz0yN3bpIoeVmViDBk4q2aAQHknQRhWARgk4UqjpaTgxq
+QBRUAwFLQYDvvzeA6uzvCSA4olHQn70L7Is7qG2OB9E6FKccy+KQObcFMOEsyOqx
+icp5GyT/8OgEHAllaIAexvcraay1icC/wRCGKf5yRRcZCVcZ2QhITz5HtHl3oxGF
+YAt+/z3m0YHsiNvjhUcNAxazHXTl+fVZXKAmpCX8imIPVQzZsGADAI2R9l4BxYXZ
+gxyQSSpvm4RdVww6dTWReKVvXpAMTJ/E6JP2N64l3ixAhoibI/5ZMWxkUlOEA1fl
+0bpgO3RazWpPejUBQMiwht1Hqqb1M2oi2r6PAedZ/mxSvK2ASTGrciLt7DeOBpqY
+NAF1XiUc8dLdZWNu3D93
+=0BRU
 -----END PGP SIGNATURE-----
diff --git a/media-libs/openjpeg/files/openjpeg-2.0.0-build.patch b/media-libs/openjpeg/files/openjpeg-2.0.0-build.patch
new file mode 100644
index 000000000000..31ae12f213cb
--- /dev/null
+++ b/media-libs/openjpeg/files/openjpeg-2.0.0-build.patch
@@ -0,0 +1,14 @@
+--- openjpeg-2.0.0/CMakeLists.txt
++++ openjpeg-2.0.0/CMakeLists.txt
+@@ -279,11 +279,4 @@
+   DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}
+ )
+ 
+-#-----------------------------------------------------------------------------
+-# install CHANGES and LICENSE
+-if(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES)
+-  install(FILES CHANGES DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
+-endif()
+-install(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
+-
+ include (cmake/OpenJPEGCPack.cmake)
-- 
2.26.2