gentoo resync : 28.04.2021

3 files changed, 13 insertions, 14 deletions

diff --git a/sci-geosciences/gpscorrelate/Manifest b/sci-geosciences/gpscorrelate/Manifest
index ab1aa15445e8..ee8d54f66ac4 100644
--- a/sci-geosciences/gpscorrelate/Manifest
+++ b/sci-geosciences/gpscorrelate/Manifest
@@ -1,5 +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
+AUX gpscorrelate-1.6.1-makefile.patch 1447 BLAKE2B b48b6de5b627db142ebbadaafe2b4ce22769dae4427212395b99cfc8232c34ce4c058c4c9c588fbc5bb1f75bc81b69123b92c293322085a630557de3618c4153 SHA512 a2fed7e019b5188df59898f194e56d1740e6a46f034595ba40a9280202181615039a2732c51700b1150e152e82c6d644aee0669feb56fd19bed568553a667044
 DIST gpscorrelate-1.6.1.tar.gz 154531 BLAKE2B 664a87e7be4e9cbdabd71653df4b968b0de33abe61d666b8b101d74ed9288bbceee9884bfa6e1c117a52bd13b69d11983342eb16cf07ee2c166d60f8ea5ca965 SHA512 c7e50980adc7173e6addb15b0a6451f44d8bbac5511643445b9bed85226abb4153b67032a5e9f95f6fe2f192d5b3d1965fecd3c00a21709a0d6e5dc59720132f
-EBUILD gpscorrelate-1.6.1-r1.ebuild 1070 BLAKE2B aef2a9c146422b57c45492b4fe9253ef8eaf98b6e6d08343c13bd7d546db6d1e04f35ea91890306d17357b1194a2336376ff61505d27baa28eb605538be4b160 SHA512 0b8fce0cd10a47f93945903661c1a7db0a82cc12d3f52a22f8357fbabf95367b5f77824f98bf21d91d7e7a6b0fcd3433a7d236204e0676cd7b5cba172ff1b34a
+EBUILD gpscorrelate-1.6.1-r2.ebuild 1082 BLAKE2B a43a77ee072918bda8379376cb49f9594d49a8f1311d903b779e798398f9c4da6500d73b1eba8f581b3a4692f984fc5ac35a96e91e035c8d107bab14a88a1085 SHA512 42dd15a8e4e1ba0956fe61d2f4f7fab0ca67a4a2e9b5cb8422c8e6f64b8a0aa468fa85d80d1e3f9324a30e23a467605ac5bc01d8861222550fcdc89219296c71
 MISC metadata.xml 356 BLAKE2B 5940b7180c605a14dde832a8a7aaf35a6251f8f169d6cfa5a7399dccbc2fb09c8b1c5c9b8b23eb00f7e5ee286ce805b63faa929fb5c7b2066c3d48615e79e5ed SHA512 61e0dacc7a9a3a6b8ae5e485e5174df1b0c8e061419dbc7abadb3c56b5613c2cf8655eab59244cffdff4d0e56b61ca087eaaf9922a45e99014063201f832a631
diff --git a/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-makefile.patch b/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-makefile.patch
index f48dba1882f2..82bd63545dfc 100644
--- a/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-makefile.patch
+++ b/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-makefile.patch
@@ -1,6 +1,5 @@
-diff -urN gpscorrelate-1.6.1.old/Makefile gpscorrelate-1.6.1/Makefile
---- gpscorrelate-1.6.1.old/Makefile	2011-06-08 13:51:06.000000000 +0200
-+++ gpscorrelate-1.6.1/Makefile	2011-06-08 14:13:18.000000000 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -4,11 +4,15 @@
  
  COBJS    = main-command.o unixtime.o gpx-read.o correlate.o exif-gps.o
@@ -10,13 +9,13 @@ diff -urN gpscorrelate-1.6.1.old/Makefile gpscorrelate-1.6.1/Makefile
 -OFLAGS   = -Wall
 -override OFLAGS += $(shell pkg-config --libs libxml-2.0 gtk+-2.0) -lm -lexiv2
 -prefix   = /usr/local
-+CFLAGS += $(shell pkg-config --cflags libxml-2.0) -I/usr/include/exiv2
-+CXXFLAGS += $(shell pkg-config --cflags libxml-2.0) -I/usr/include/exiv2
-+CLIBS = $(shell pkg-config --libs libxml-2.0) -lm -lexiv2 -lstdc++
++CFLAGS += $(shell ${PKG_CONFIG} --cflags libxml-2.0) -I/usr/include/exiv2
++CXXFLAGS += $(shell ${PKG_CONFIG} --cflags libxml-2.0) -I/usr/include/exiv2
++CLIBS = $(shell ${PKG_CONFIG} --libs libxml-2.0) -lm -lexiv2 -lstdc++
 +ifdef BUILD_GUI
-+CXXFLAGS += $(shell pkg-config --cflags gtk+-2.0)
-+CFLAGS += $(shell pkg-config --cflags gtk+-2.0)
-+CLIBS += $(shell pkg-config --libs gtk+-2.0)
++CXXFLAGS += $(shell ${PKG_CONFIG} --cflags gtk+-2.0)
++CFLAGS += $(shell ${PKG_CONFIG} --cflags gtk+-2.0)
++CLIBS += $(shell ${PKG_CONFIG} --libs gtk+-2.0)
 +endif
 +prefix   ?= /usr/local
  bindir   = $(prefix)/bin
diff --git a/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1-r1.ebuild b/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1-r2.ebuild
index 859bf5a9d68f..7f1c8c38fc5e 100644
--- a/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1-r1.ebuild
+++ b/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,7 +24,7 @@ DEPEND="
 	media-gfx/exiv2:=
 	gtk? ( x11-libs/gtk+:2 )
 "
-DEPEND="${DEPEND}"
+RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-makefile.patch"
@@ -32,7 +32,7 @@ PATCHES=(
 )
 
 src_compile() {
-	tc-export CC CXX
+	tc-export CC CXX PKG_CONFIG
 	local opts="gpscorrelate gpscorrelate.1"
 	use gtk && opts+=" gpscorrelate-gui BUILD_GUI=1"
 	emake ${opts}