[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/files/, media-libs/libextractor/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     00c65df99751d235e08fe2f54613dac2eeb2f80b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 20:36:09 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 17 20:49:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00c65df9

media-libs/libextractor: Fix build with media-gfx/exiv2-0.26

Gentoo-bug: 621242

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 .../files/libextractor-1.3-exiv2-0.26.patch        | 27 ++++++++++++++++++++++
 media-libs/libextractor/libextractor-1.3-r1.ebuild | 26 ++++++++++++---------
 2 files changed, 42 insertions(+), 11 deletions(-)

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
new file mode 100644
index 00000000000..b6e0b41773b
--- /dev/null
+++ b/media-libs/libextractor/files/libextractor-1.3-exiv2-0.26.patch
@@ -0,0 +1,27 @@
+--- 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/libextractor-1.3-r1.ebuild b/media-libs/libextractor/libextractor-1.3-r1.ebuild
index 20c537dc551..dc06475abc4 100644
--- a/media-libs/libextractor/libextractor-1.3-r1.ebuild
+++ b/media-libs/libextractor/libextractor-1.3-r1.ebuild
@@ -1,20 +1,21 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-DESCRIPTION="A library used to extract metadata from files of arbitrary type"
+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 mp4 +magic midi mpeg tidy tiff vorbis +zlib" # test
+IUSE="+archive +bzip2 ffmpeg flac gif gsf gtk jpeg +magic midi mp4 mpeg tidy tiff vorbis +zlib" # test
 
 RESTRICT="test"
 
-RDEPEND="app-text/iso-codes
+COMMON_DEPEND="
+	app-text/iso-codes
 	>=dev-libs/glib-2
 	media-gfx/exiv2:=
 	sys-devel/libtool
@@ -26,33 +27,36 @@ RDEPEND="app-text/iso-codes
 	flac? (
 		media-libs/flac
 		media-libs/libogg
-		)
+	)
 	gif? ( media-libs/giflib:= )
 	gsf? ( gnome-extra/libgsf:= )
 	gtk? ( x11-libs/gtk+:3 )
 	jpeg? ( virtual/jpeg:0 )
-	mp4? ( media-libs/libmp4v2: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 )
-	!<app-crypt/pkcrack-1.2.2-r1
-	!sci-biology/glimmer
-	!sci-chemistry/pdb-extract"
-DEPEND="${RDEPEND}
+"
+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() {