gentoo resync : 30.06.2019

3 files changed, 47 insertions, 12 deletions

diff --git a/sci-geosciences/gpscorrelate/Manifest b/sci-geosciences/gpscorrelate/Manifest
index 05453feb0246..1bf5359ee5f7 100644
--- a/sci-geosciences/gpscorrelate/Manifest
+++ b/sci-geosciences/gpscorrelate/Manifest
@@ -1,4 +1,5 @@
+AUX gpscorrelate-1.6.1-exiv2-0.27.1.patch 630 BLAKE2B db4ecda22bfe9b666c67b1d079aeb06a3e7db3be5fd47f5b84e38d42a9ef6ff3f5b63913e66ed1b39af7bc821c6d6c13cf33ac4015fca141dd9b66c682005afd SHA512 d7af75d0f513d9104c3a39e191447dc1269cf3fc59c3289703e298f8e671a96849247e2b979153fee9f70469416e249e5dcd6f6ebbacae4eb2d52e1897a326ed
 AUX gpscorrelate-1.6.1-makefile.patch 1609 BLAKE2B 717dce73444a68d09658b5c3c446e27ff1b7666584eadaeeb862d87dd8ad44983e30b1b24fa4387f50032bf2dee671ce84af3bf168d3743768d270c412b36be5 SHA512 274a3db1a2a752338966beae989e2075f81b6d51b1d7f51d9810d7b6e01ea581468e2add05e631f6f8626ee234a6c7e700cf90ce7dc08a7d5c5cad282a6f7f59
 DIST gpscorrelate-1.6.1.tar.gz 154531 BLAKE2B 664a87e7be4e9cbdabd71653df4b968b0de33abe61d666b8b101d74ed9288bbceee9884bfa6e1c117a52bd13b69d11983342eb16cf07ee2c166d60f8ea5ca965 SHA512 c7e50980adc7173e6addb15b0a6451f44d8bbac5511643445b9bed85226abb4153b67032a5e9f95f6fe2f192d5b3d1965fecd3c00a21709a0d6e5dc59720132f
-EBUILD gpscorrelate-1.6.1.ebuild 944 BLAKE2B 20d7c5cd2fbbac3661021b46bf510503e9b7f7ab7676ebc9bf466873d211f5270e740113c2e93facd9def3cece34102de08658425f20f45b33bae91c2d5e201b SHA512 198d0e6428d6ce9d0609620067c8440065ec0b92855e63b059a43361f4102e451c6afa6ab4ce7b6fb27e0844eb8109e714538ca8829537aeb882005638612ffc
+EBUILD gpscorrelate-1.6.1-r1.ebuild 1070 BLAKE2B aef2a9c146422b57c45492b4fe9253ef8eaf98b6e6d08343c13bd7d546db6d1e04f35ea91890306d17357b1194a2336376ff61505d27baa28eb605538be4b160 SHA512 0b8fce0cd10a47f93945903661c1a7db0a82cc12d3f52a22f8357fbabf95367b5f77824f98bf21d91d7e7a6b0fcd3433a7d236204e0676cd7b5cba172ff1b34a
 MISC metadata.xml 356 BLAKE2B a17eee6261dcce3b6111da9da119544f46a0e0b6742f2a9280933f1d6f5a36cc96a422270698649c2dd77c228580b7f8df1fe8c66546c568fe1659893ae2aefb SHA512 e9c7c6dc654cb5276c1b211c8e4817fd09cb0ed3689b53d423733e651ec4a912b4f54dbbd08299bd80c6ae637ee41e91ca1ebb323ff2cc29e3b36dbe40566fb2
diff --git a/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-exiv2-0.27.1.patch b/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-exiv2-0.27.1.patch
new file mode 100644
index 000000000000..16921b72a1f6
--- /dev/null
+++ b/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-exiv2-0.27.1.patch
@@ -0,0 +1,27 @@
+From c82aa1e76e3faeaec605df618c87223513efb3b9 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 29 Jun 2019 10:27:24 +0200
+Subject: [PATCH] Fix build with exiv2-0.27.1
+
+Use catchall header as recommended by exiv2 upstream.
+---
+ exif-gps.cpp | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/exif-gps.cpp b/exif-gps.cpp
+index fb9f2cb..61b4736 100644
+--- a/exif-gps.cpp
++++ b/exif-gps.cpp
+@@ -41,8 +41,7 @@
+ #include <unistd.h>
+ 
+ 
+-#include "exiv2/image.hpp"
+-#include "exiv2/exif.hpp"
++#include "exiv2/exiv2.hpp"
+ 
+ #include "gpsstructure.h"
+ #include "exif-gps.h"
+-- 
+2.22.0
+
diff --git a/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1.ebuild b/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1-r1.ebuild
index 07204797db36..859bf5a9d68f 100644
--- a/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1.ebuild
+++ b/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit desktop toolchain-funcs
 
 DESCRIPTION="Tool for adjusting EXIF tags of your photos with a recorded GPS trace"
 HOMEPAGE="https://github.com/freefoote/gpscorrelate"
@@ -14,18 +14,22 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="doc gtk"
 
-RDEPEND="
-	dev-libs/libxml2:2
-	media-gfx/exiv2:=
-	gtk? ( x11-libs/gtk+:2 )
-"
-DEPEND="${RDEPEND}
+BDEPEND="
 	app-text/docbook-xml-dtd:4.2
 	dev-libs/libxslt
 	virtual/pkgconfig
 "
+DEPEND="
+	dev-libs/libxml2:2
+	media-gfx/exiv2:=
+	gtk? ( x11-libs/gtk+:2 )
+"
+DEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-1.6.1-makefile.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-makefile.patch"
+	"${FILESDIR}/${P}-exiv2-0.27.1.patch"
+)
 
 src_compile() {
 	tc-export CC CXX
@@ -42,7 +46,10 @@ src_install() {
 		domenu ${PN}.desktop
 	fi
 	if use doc; then
-		dohtml doc/*
+		rm doc/gpscorrelate-manpage.xml* || die
+		local DOCS=()
+		local HTML_DOCS=( doc/. )
+		einstalldocs
 	fi
 	doman ${PN}.1
 }