gentoo resync : 10.11.2017

3 files changed, 2 insertions, 95 deletions

diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 006be24a4c4e..c8a9e2a4379b 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,8 +1,7 @@
-AUX libgphoto2-2.5.10-jpeg.patch 3229 SHA256 5bb661c0f4956932c8c0205e5f106a0aac4b47ad0462ca54bd352bedcf8cd95c SHA512 d99f56b013123649dfcec9a7b9f5119f9c15e300448c9231624ef340e8a61dba0e014db7129e55e3dd0fde1730284d85065c210b219a69dd6f5240fc139c628d WHIRLPOOL b87315573060ad53aec8e605d67246ca414bb2793cf5b02e0a898729da1104d8d51becc772a315c14dedb328ffe64868e33b1ada4cd6d785d5eb63df1d274eaa
 DIST libgphoto2-2.5.12.tar.bz2 6974928 SHA256 b9bb28990fde45ac385e4851a07dbad2e1250404b535b0a3a3b898bb431e4e2e SHA512 aa47e9be64579e0691f58b775ca4d80f3ed65763e6d832cba9fd28603ba2dce4c9b5b3291f38dad399b69393d325896f67f2bde622062ca38b9b138f48f12336 WHIRLPOOL b690d5b55a7dc11cdd04e694e4ec4a44c0b3801c3e778610c32b414fd7e6e89f1ef49ac1c9b5f36a57d35afbb94c08e4e4f8cb9663c4106658eaaeaea1ddf5bd
 DIST libgphoto2-2.5.14.tar.bz2 6992238 SHA256 d3ce70686fb87d6791b9adcbb6e5693bfbe1cfef9661c23c75eb8a699ec4e274 SHA512 6dd75700e2b2afdf87f7eab4c62fbbe2c42f9154d644edfae25e3d5fbe5ed0894be832cc1367933fc6c113a1cc379d1956fecf108d6ee240935b9d7e2f614688 WHIRLPOOL 45a8cb9380f96da0fb680be95db3c028c07d7cc5f66126609f7a6539a5b5fd7e4edb45d00c43cb9c491e026311cd6161666280eb93ea784538c90297fbc1cc9c
 EBUILD libgphoto2-2.5.12.ebuild 6180 SHA256 ae6be57b1a0f742de8fcb796c22c8c021e56e659d07f87efd13b6e6b48edbd18 SHA512 f93d213bfbc4e4a61fe7aea4a63e5c3d3d5e59a0c5c262463bf6b4f36687f47ec3082ab7554a2e56f286ff7b4393a52dafeb29feecf8d6e6a9c12430e4c2f583 WHIRLPOOL 75a5a5fe19a7972287398ea7cce92e4c0c1a538cb5000f8f44151c1c7d2274506d8b2d23e43435f58502a8da5dc0377041c9f75e6bd49b89af5f0658b7b325e7
-EBUILD libgphoto2-2.5.14.ebuild 6279 SHA256 dbacf1c06ecc50b38cbd848415f69b3932f937a83559aa3da756e1b37cfa2b8c SHA512 3d47d59b5772b72c1e4231cf7522491c16883cd4c6ff5ee789a2be09756e31174155e4b05d044fe706036bc547d03eaa59a53f61173f36cd4b80d62702ac119c WHIRLPOOL eaf622d93840aebf9bdeebbdd90bc5ffdd2fd4724cf190e010632aa32ab1ef828a33acdeece03347136955dc8a243b702353304a20c6cdceeb9e3ec04788581b
+EBUILD libgphoto2-2.5.14.ebuild 6278 SHA256 d9a3f695c89bbc9173fabac194d452a0d51861e4ea208cfd27cd95099ae61573 SHA512 73e27273cf52cf9851fae730216739c6662d29ffa81a15859a1339f524ac9681868f0b361d1011d9e2a938531292e4e841d04bb8ee2973e89d4fcee72d4cdb4d WHIRLPOOL dbd6010d4e90aa6031e7e3cd92d1210da89b93647050c5668efc8b7677f3f571255c3c8c787323ed029c31ee309b95e77970cffb63945405abf1d778ec60967d
 MISC ChangeLog 6886 SHA256 45a3751db9b40a23e36945565ece8e9cd60be8f0b581681cb9fda43f1304a376 SHA512 027cef9bab94be877fbb38d11a2ce700232d8e7bf22ec0c958cbd91b339db6f1745bcc2987b92604562b9dc19cba4d694e1e5c7e250902ce78433d44f79c6c64 WHIRLPOOL 10649a261dd4b65393f5b032adc9a6140335550876c717cf12ee5b482030a93388e71edce4c0cefb1332a62b1cc854860651342e9976bf91c1ec179883c49d6d
 MISC ChangeLog-2015 45252 SHA256 d6ac5af90c263c4380722889f201ef21c12dd7e4ee18d6f7429fa623afd37421 SHA512 ff4d88756d8113d2e251810a2c8630116ba5b474837a8c2bb23c1f9a9424982b660508b6c74b3a9034e5916b3ebe54fd7b94ba38eb3ddcc0e777e0f8bb5e5ad1 WHIRLPOOL 5d5bacd539ceebf412e1db13d85d56ce38e2f2307b8211baa54db4745c685b2b904087d3d9ebf8c7b3f8fbb5a619fe919990686e3545d2289c8c7df73908788e
 MISC metadata.xml 520 SHA256 604907467a908596bcbffd2eb1daff70570b1ba6667d8c4c9b6d4d5e262dd07a SHA512 905b25e683f85a23323e1205c0492e3b955e11f9d93a9c9c360108ecdd3608fa2f9f4c2572444c0a4be0df3f5e350dd13ca4ebb5ca523c0fd70fed3f40e39ed0 WHIRLPOOL 68d8ac8eb045b9f4e384dc3fb6629de2b9e651395038a500e71062cc0aceb31377df92bb78ba29a1fa425884d3ded0ce4c6cc7c0ea59825e98663a81f1f390c6
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.5.10-jpeg.patch b/media-libs/libgphoto2/files/libgphoto2-2.5.10-jpeg.patch
deleted file mode 100644
index 34baeadd695f..000000000000
--- a/media-libs/libgphoto2/files/libgphoto2-2.5.10-jpeg.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 0df14db3eda1b780a27b1c54bc8f251d15afebbc Mon Sep 17 00:00:00 2001
-From: Patrick Ohly <patrick.ohly@intel.com>
-Date: Wed, 15 Jun 2016 10:33:24 +0200
-Subject: [PATCH] jpeg_memsrcdest: extend feature check
-
-libjpeg.h in OpenEmbedded master (from libjpeg-turbo 1.5.0) provides
-these methods if "JPEG_LIB_VERSION >= 80 ||
-defined(MEM_SRCDST_SUPPORTED)".
-
-The support for the jpeg_mem functions was added even when not
-emulating the libjpeg8 API, controlled via the MEM_SRCDST_SUPPORTED
-define, so checking for the version alone is not enough anymore.
-
-See https://github.com/libjpeg-turbo/libjpeg-turbo/commit/ab70623eb29e09e67222be5b9e1ea320fe5aa0e9
-
-This fixes errors about conflicting declarations (signed vs. unsigned
-char).
-
-Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
----
- camlibs/ax203/jpeg_memsrcdest.c   | 4 ++--
- camlibs/ax203/jpeg_memsrcdest.h   | 4 ++++
- camlibs/jl2005c/jpeg_memsrcdest.c | 4 ++--
- camlibs/jl2005c/jpeg_memsrcdest.h | 4 ++++
- 4 files changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/camlibs/ax203/jpeg_memsrcdest.c b/camlibs/ax203/jpeg_memsrcdest.c
-index 0ed83b1..5614573 100644
---- a/camlibs/ax203/jpeg_memsrcdest.c
-+++ b/camlibs/ax203/jpeg_memsrcdest.c
-@@ -25,8 +25,8 @@
- #include "jpeg_memsrcdest.h"
- 
- /* libjpeg8 and later come with their own (API compatible) memory source
--   and dest */
--#if JPEG_LIB_VERSION < 80
-+   and dest, and older versions may have it backported */
-+#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED)
- 
- /* Expanded data source object for memory input */
- 
-diff --git a/camlibs/ax203/jpeg_memsrcdest.h b/camlibs/ax203/jpeg_memsrcdest.h
-index e971182..b13bf3f 100644
---- a/camlibs/ax203/jpeg_memsrcdest.h
-+++ b/camlibs/ax203/jpeg_memsrcdest.h
-@@ -1,5 +1,7 @@
- #include <jpeglib.h>
- 
-+#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED)
-+
- void
- jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer,
- 	unsigned long bufsize);
-@@ -7,3 +9,5 @@ jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer,
- void
- jpeg_mem_dest (j_compress_ptr cinfo, unsigned char ** outbuffer,
- 	unsigned long * outsize);
-+
-+#endif
-diff --git a/camlibs/jl2005c/jpeg_memsrcdest.c b/camlibs/jl2005c/jpeg_memsrcdest.c
-index 321f926..b65310e 100644
---- a/camlibs/jl2005c/jpeg_memsrcdest.c
-+++ b/camlibs/jl2005c/jpeg_memsrcdest.c
-@@ -25,8 +25,8 @@
- #include "jpeg_memsrcdest.h"
- 
- /* libjpeg8 and later come with their own (API compatible) memory source
--   and dest */
--#if JPEG_LIB_VERSION < 80
-+   and dest, and older versions may have it backported */
-+#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED)
- 
- /* Expanded data source object for memory input */
- 
-diff --git a/camlibs/jl2005c/jpeg_memsrcdest.h b/camlibs/jl2005c/jpeg_memsrcdest.h
-index e971182..b13bf3f 100644
---- a/camlibs/jl2005c/jpeg_memsrcdest.h
-+++ b/camlibs/jl2005c/jpeg_memsrcdest.h
-@@ -1,5 +1,7 @@
- #include <jpeglib.h>
- 
-+#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED)
-+
- void
- jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer,
- 	unsigned long bufsize);
-@@ -7,3 +9,5 @@ jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer,
- void
- jpeg_mem_dest (j_compress_ptr cinfo, unsigned char ** outbuffer,
- 	unsigned long * outsize);
-+
-+#endif
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.14.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.14.ebuild
index 97304944e869..9da299419ccf 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.14.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.14.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # FIXME: should we also bump for libgphoto2_port.so soname version?
 SLOT="0/6" # libgphoto2.so soname version
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc examples exif gd jpeg nls serial"
 
 # By default, drivers for all supported cameras will be compiled.