gentoo resync : 13.03.2018

6 files changed, 2 insertions, 240 deletions

diff --git a/media-libs/libextractor/Manifest b/media-libs/libextractor/Manifest
index 549819270a06..91ce99b74563 100644
--- a/media-libs/libextractor/Manifest
+++ b/media-libs/libextractor/Manifest
@@ -1,9 +1,4 @@
-AUX libextractor-1.3-exiv2-0.26.patch 607 BLAKE2B cebd0507df203a20231d5bb243af9d66dcce20a69e5bac323baae5bbb337f15eea43f1a43d60f7e7e72a4b96396ebbb8267104a1fde069f3e42bc3a54b815b0d SHA512 4f782dc427ad5c54b2bf362acdba84741c07e8e4a3691be80939e008d2727c54c4509b853c070ad9581afbe94ddd0bf65bbb685d74ea4956c5bbbf03820aa431
-AUX libextractor-1.3-ffmpeg-2.9.patch 1884 BLAKE2B 35b19375cd40be4da8ee8c3c9aff44d74713f84755a6a320b8b80e0763ad93ab3becf8fb4d5100b8f2e231bc935b43fa0d5955bbf9b5fef628457485d70f649f SHA512 219d155bae9e4d8ab868373309e5642a3ae3dad2d0f5afce689a9ec46d6d2fe57966319e454e86af96b473add7f01b3e55115121dae7a703f10df18f6d85f00b
-AUX libextractor-1.3-giflib-5.patch 1139 BLAKE2B 2db6e06c73f4d94170756aeb9854febf9947d7962035c64fc48b3980eae39fd5258fd098462254ac34ace4244f1f7d2d1425a448ff08bce870bcc456fa2c7606 SHA512 4aaed95a427ebcff58433673e5469061a87a1eb11665896660150d863ef52c0c5c657e5ab8a07d4475861f3b53f8772d3b72ecd7401d8f2eb11174b6255e12d7
 AUX libextractor-1.6-CVE-2017-17440.patch 3584 BLAKE2B a50d293c88c95c59d3399a2ca4fee6f6e935bee84d4f7c7a5a85e27f0f1e34edb0713f0e0010491015e0c792de5bbde64c2dc392a01ec3470ecec46ed8691a04 SHA512 defa28c0303028cdb8c2d08d15ff62a56a7548ed57d6b577bc61842e74b69b4da6d82ba48082e89341643db433b7f256423556ab482fd6a61936ecd18637796b
-DIST libextractor-1.3.tar.gz 7942021 BLAKE2B 76856cd70b1981b95db55b7070d5e82574e8842f49dc3ee7cfc6f35f71b66f7b8e642b82cbbaa8446488ab29ca39c9792e4153f3cd9624dde731b3daefe2e86f SHA512 38ed47e5e5f50ddf216408f698a104900baa3b03cc8a81a14e63afd30b3e3922acda17363d88d9ba1356ebf70287c8a5152ff6933a36ec1042ca0d832218d45d
 DIST libextractor-1.6.tar.gz 8053454 BLAKE2B cf5e9d5fd1bc09e20495810e5a85280916632eb1c5e5c6c68aaf1cbccb8a5970465d3fd6b313e0cfc7e5c262a815996d7bec563c04b04faf7467ddbe987dfb4c SHA512 1e477450d89cc83030100fc9dc11734f39b1ccd1765f8cf4a4938f32253e2e19a48b5337328605451589865142b2d6bf6d7102198115985a1e0da22fca4bc2a8
-EBUILD libextractor-1.3-r1.ebuild 2891 BLAKE2B 3a81d0ea12b6ef517466bd8606e3b79a797ff3c6e74196b46bdc250a186b300e42c41986d660c401fb1dde29eebb671be7223cfc3cc4b431ab4875fdf0c19f4c SHA512 be168b3a46046e3a3186f29523ab82de17e350a77ab4cfb01c70ba4cb89c1fcc13495ad6afbe1e6d6ed43d8c94d4ee9f61f575a2298650f983f76673430e0183
-EBUILD libextractor-1.6.ebuild 2868 BLAKE2B c0ba1757cb382703755772b881013963848643a54e2a656a5779a3782664c237cf5d82232fdbc9cbcefc3565e66240fa00a37bada0d5e89307dd29aff3ad1e36 SHA512 61e1d7bbbffdb1b7a7bde9489246e2c139d71c267fe25a85e0135e14c4a7a5ffb89d710dbac9dd81495a58577ea7064515ad99781626ec52973328247d0c1b5c
+EBUILD libextractor-1.6.ebuild 2867 BLAKE2B 2c259b19317e034df96147d1f956f0d0d48b316b7c943b357c1153c711748f73a6ab83a6147e5a5c85a140ab5dcb57d35d0b26e8bc7211af2faf1cca241fece4 SHA512 251240960d8d6d886a90e866d699af211651645947edcb7d88d3023a932d2bc437003bac399d427ac931d0e0cb0bdce242a02b2ff7c07352f6e488757aa3e723
 MISC metadata.xml 615 BLAKE2B eac56c7364e331eb2a0f0955318cfb0cf7c6fe4a95493899b489f755d18b4c4b1ced0e7f7ea0a7716c996ac7640d04a326cbd2230313e123c4b2de4fefbaccba SHA512 b4a4403dfccc02e61fa15f60a19ed23ce43374cc41d616ebbe385865618ae9392bd663fbdbdf01013f4203de2ee51dcbe1caf0974d720dac1be1f4ea029b4fc0
diff --git a/media-libs/libextractor/files/libextractor-1.3-exiv2-0.26.patch b/media-libs/libextractor/files/libextractor-1.3-exiv2-0.26.patch
deleted file mode 100644
index b6e0b41773b3..000000000000
--- a/media-libs/libextractor/files/libextractor-1.3-exiv2-0.26.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/src/plugins/exiv2_extractor.cc	2013-06-25 13:02:05.000000000 +0200
-+++ b/src/plugins/exiv2_extractor.cc	2017-06-10 14:22:57.000000000 +0200
-@@ -180,7 +180,11 @@
-    *
-    * @return -1 on error
-    */
-+#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0)
-+  virtual size_t size (void) const;
-+#else
-   virtual long int size (void) const;
-+#endif
- 
-   /**
-    * Check if file is open.
-@@ -445,7 +449,11 @@
-  *
-  * @return -1 on error
-  */
--long int 
-+#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0)
-+size_t
-+#else
-+long int
-+#endif
- ExtractorIO::size (void) const
- {
-   return (long) ec->get_size (ec->cls);
diff --git a/media-libs/libextractor/files/libextractor-1.3-ffmpeg-2.9.patch b/media-libs/libextractor/files/libextractor-1.3-ffmpeg-2.9.patch
deleted file mode 100644
index d9e50b698ac8..000000000000
--- a/media-libs/libextractor/files/libextractor-1.3-ffmpeg-2.9.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Description: Replace deprecated FFmpeg API
-Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
-Last-Update: <2015-11-28>
-
---- libextractor-1.3.orig/src/plugins/thumbnailffmpeg_extractor.c
-+++ libextractor-1.3/src/plugins/thumbnailffmpeg_extractor.c
-@@ -153,7 +153,7 @@ seek_cb (void *opaque,
- static size_t 
- create_thumbnail (int src_width, int src_height, 
- 		  int src_stride[],
--		  enum PixelFormat src_pixfmt, 
-+		  enum AVPixelFormat src_pixfmt,
- 		  const uint8_t * const src_data[],
- 		  int dst_width, int dst_height,
- 		  uint8_t **output_data, 
-@@ -189,7 +189,7 @@ create_thumbnail (int src_width, int src
-   if (NULL == 
-       (scaler_ctx =
-        sws_getContext (src_width, src_height, src_pixfmt,
--		       dst_width, dst_height, PIX_FMT_RGB24, 
-+		       dst_width, dst_height, AV_PIX_FMT_RGB24,
- 		       SWS_BILINEAR, NULL, NULL, NULL)))
-     {
- #if DEBUG
-@@ -214,7 +214,7 @@ create_thumbnail (int src_width, int src
-       return 0;
-     }
-   if (NULL == (dst_buffer =
--	       av_malloc (avpicture_get_size (PIX_FMT_RGB24, dst_width, dst_height))))
-+	       av_malloc (avpicture_get_size (AV_PIX_FMT_RGB24, dst_width, dst_height))))
-     {
- #if DEBUG
-       fprintf (stderr,
-@@ -229,7 +229,7 @@ create_thumbnail (int src_width, int src
-       return 0;
-     }
-   avpicture_fill ((AVPicture *) dst_frame, dst_buffer,
--                  PIX_FMT_RGB24, dst_width, dst_height);
-+                  AV_PIX_FMT_RGB24, dst_width, dst_height);
-   sws_scale (scaler_ctx,
-              src_data, 
-              src_stride,
-@@ -272,7 +272,7 @@ create_thumbnail (int src_width, int src
-     }
-   encoder_codec_ctx->width = dst_width;
-   encoder_codec_ctx->height = dst_height;
--  encoder_codec_ctx->pix_fmt = PIX_FMT_RGB24;
-+  encoder_codec_ctx->pix_fmt = AV_PIX_FMT_RGB24;
-   opts = NULL;
-   if (avcodec_open2 (encoder_codec_ctx, encoder_codec, &opts) < 0)
-     {
-
diff --git a/media-libs/libextractor/files/libextractor-1.3-giflib-5.patch b/media-libs/libextractor/files/libextractor-1.3-giflib-5.patch
deleted file mode 100644
index 4893f9784a58..000000000000
--- a/media-libs/libextractor/files/libextractor-1.3-giflib-5.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://bugs.gentoo.org/571902
-
-------------------------------------------------------------------------
-r34095 | LRN | 2014-07-31 10:58:51 -0400 (Thu, 31 Jul 2014) | 1 line
-
-Add giflib-5.1.0 compatibility
-
-Index: src/plugins/gif_extractor.c
-===================================================================
---- a/src/plugins/gif_extractor.c	(revision 34094)
-+++ b/src/plugins/gif_extractor.c	(revision 34095)
-@@ -78,7 +78,11 @@ EXTRACTOR_gif_extract_method (struct EXT
-   if (gif_file == NULL || gif_error != 0)
-   {
-     if (gif_file != NULL)
-+#if GIFLIB_MAJOR < 5 || GIFLIB_MINOR < 1
-       EGifCloseFile (gif_file);
-+#else
-+      EGifCloseFile (gif_file, NULL);
-+#endif
-     return; /* not a GIF */
-   }
- #endif
-@@ -133,7 +137,11 @@ EXTRACTOR_gif_extract_method (struct EXT
- 	       DGifGetExtensionNext(gif_file, &ext)) &&
- 	      (NULL != ext) ) ; /* keep going */
-     }
-+#if defined (GIF_LIB_VERSION) || GIFLIB_MAJOR < 5 || GIFLIB_MINOR < 1
-   DGifCloseFile (gif_file);
-+#else
-+  DGifCloseFile (gif_file, NULL);
-+#endif
- }
- 
- /* end of gif_extractor.c */
-
-------------------------------------------------------------------------
diff --git a/media-libs/libextractor/libextractor-1.3-r1.ebuild b/media-libs/libextractor/libextractor-1.3-r1.ebuild
deleted file mode 100644
index dc06475abc4f..000000000000
--- a/media-libs/libextractor/libextractor-1.3-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Library to extract metadata from files of arbitrary type"
-HOMEPAGE="https://www.gnu.org/software/libextractor/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE="+archive +bzip2 ffmpeg flac gif gsf gtk jpeg +magic midi mp4 mpeg tidy tiff vorbis +zlib" # test
-
-RESTRICT="test"
-
-COMMON_DEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2
-	media-gfx/exiv2:=
-	sys-devel/libtool
-	virtual/libiconv
-	virtual/libintl
-	archive? ( app-arch/libarchive:= )
-	bzip2? ( app-arch/bzip2 )
-	ffmpeg? ( virtual/ffmpeg )
-	flac? (
-		media-libs/flac
-		media-libs/libogg
-	)
-	gif? ( media-libs/giflib:= )
-	gsf? ( gnome-extra/libgsf:= )
-	gtk? ( x11-libs/gtk+:3 )
-	jpeg? ( virtual/jpeg:0 )
-	magic? ( sys-apps/file )
-	midi? ( media-libs/libsmf )
-	mp4? ( media-libs/libmp4v2:0 )
-	mpeg? ( media-libs/libmpeg2 )
-	tidy? ( app-text/htmltidy )
-	tiff? ( media-libs/tiff:0 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-# test? ( app-forensics/zzuf )
-RDEPEND="${COMMON_DEPEND}
-	!sci-biology/glimmer
-	!sci-chemistry/pdb-extract
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-giflib-5.patch #571902
-	"${FILESDIR}"/${P}-ffmpeg-2.9.patch
-	"${FILESDIR}"/${P}-exiv2-0.26.patch #621242
-)
-
-src_prepare() {
-	default
-
-	# m4/ax_create_pkgconfig_info.m4 is passing environment LDFLAGS to Libs:
-	sed -i \
-		-e '/^ax_create_pkgconfig_ldflags=/s:$LDFLAGS ::' \
-		-e 's:tidy/tidy.h:tidy.h:' \
-		-e 's:tidy/buffio.h:buffio.h:' \
-		configure src/plugins/html_extractor.c || die
-
-	if ! use tidy; then
-		sed -i -e 's:tidy.h:dIsAbLe&:' configure || die
-	fi
-}
-
-src_configure() {
-	e_ac_cv() {
-		export ac_cv_"$@"
-	}
-
-	e_ac_cv {lib_rpm_rpmReadPackageFile,prog_HAVE_ZZUF}=no
-
-	e_ac_cv header_FLAC_all_h=$(usex flac)
-	e_ac_cv lib_FLAC_FLAC__stream_decoder_init_stream=$(usex flac)
-	e_ac_cv lib_FLAC_FLAC__stream_decoder_init_ogg_stream=$(usex flac)
-
-	e_ac_cv header_archive_h=$(usex archive)
-	e_ac_cv header_bzlib_h=$(usex bzip2)
-	e_ac_cv header_gif_lib_h=$(usex gif)
-	e_ac_cv header_jpeglib_h=$(usex jpeg)
-	e_ac_cv header_magic_h=$(usex magic)
-	e_ac_cv header_mpeg2dec_mpeg2_h=$(usex mpeg)
-	e_ac_cv header_tiffio_h=$(usex tiff)
-	e_ac_cv header_vorbis_vorbisfile_h=$(usex vorbis)
-	e_ac_cv header_zlib_h=$(usex zlib)
-	e_ac_cv lib_mp4v2_MP4ReadProvider=$(usex mp4)
-	e_ac_cv lib_smf_smf_load_from_memory=$(usex midi)
-
-	# gstreamer support is for 1.0, no 0.10 support
-	econf \
-		--disable-static \
-		--enable-experimental \
-		--enable-glib \
-		--with-gtk_version=$(usex gtk 3.0.0 false) \
-		--without-gstreamer \
-		--disable-gsf-gnome \
-		$(use_enable gsf) \
-		$(use_enable ffmpeg)
-}
-
-src_install() {
-	default
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libextractor/libextractor-1.6.ebuild b/media-libs/libextractor/libextractor-1.6.ebuild
index d52277c895c2..cf862f1f85c0 100644
--- a/media-libs/libextractor/libextractor-1.6.ebuild
+++ b/media-libs/libextractor/libextractor-1.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE="apparmor +archive +bzip2 ffmpeg flac gif gsf gstreamer gtk jpeg +magic midi mp4 mpeg tidy tiff vorbis +zlib" # test
 
 RESTRICT="test"