gentoo resync : 20.03.2022

4 files changed, 94 insertions, 0 deletions

diff --git a/sci-geosciences/gpscorrelate/Manifest b/sci-geosciences/gpscorrelate/Manifest
index bc2facc17e72..b2901e61a0cf 100644
--- a/sci-geosciences/gpscorrelate/Manifest
+++ b/sci-geosciences/gpscorrelate/Manifest
@@ -1,5 +1,9 @@
 AUX gpscorrelate-1.6.1-exiv2-0.27.1.patch 630 BLAKE2B db4ecda22bfe9b666c67b1d079aeb06a3e7db3be5fd47f5b84e38d42a9ef6ff3f5b63913e66ed1b39af7bc821c6d6c13cf33ac4015fca141dd9b66c682005afd SHA512 d7af75d0f513d9104c3a39e191447dc1269cf3fc59c3289703e298f8e671a96849247e2b979153fee9f70469416e249e5dcd6f6ebbacae4eb2d52e1897a326ed
 AUX gpscorrelate-1.6.1-makefile.patch 1447 BLAKE2B b48b6de5b627db142ebbadaafe2b4ce22769dae4427212395b99cfc8232c34ce4c058c4c9c588fbc5bb1f75bc81b69123b92c293322085a630557de3618c4153 SHA512 a2fed7e019b5188df59898f194e56d1740e6a46f034595ba40a9280202181615039a2732c51700b1150e152e82c6d644aee0669feb56fd19bed568553a667044
+AUX gpscorrelate-2.0-desktop-pass-validation.patch 242 BLAKE2B 65ca39f03eb9701473615485e9a5c6a475cfd2a247491dabb85638600c327a959e93925cad1a8e1bc160ed651fe3f346615d11ff65c2102c5a2bdd259bec973c SHA512 ce5628d6c92380f327af032848d8151e6b2b340ba23fa91e148dc5ebddbb6508af5b044daacac0921741687a3669f0d2b7195bea365e6c89870e2d96fc07c71c
+AUX gpscorrelate-2.0-respect-users-flags.patch 715 BLAKE2B 474c926867462219586634d382470b9096d674ee4e9dcbcd9fcb9edbd498b454bb9709b3f51435ad165199a75dec047494a8ca33da3c600716698ad206466b13 SHA512 05ecfddae24a884852cb6ffed2d5d0abf0249ef11c4b4f8cc5fe299604b0b635c1eb94115f8a976fc23306df944a860ef7b3fdf696894c285088159877ccf4f6
 DIST gpscorrelate-1.6.1.tar.gz 154531 BLAKE2B 664a87e7be4e9cbdabd71653df4b968b0de33abe61d666b8b101d74ed9288bbceee9884bfa6e1c117a52bd13b69d11983342eb16cf07ee2c166d60f8ea5ca965 SHA512 c7e50980adc7173e6addb15b0a6451f44d8bbac5511643445b9bed85226abb4153b67032a5e9f95f6fe2f192d5b3d1965fecd3c00a21709a0d6e5dc59720132f
+DIST gpscorrelate-2.0.tar.gz 283797 BLAKE2B 8cee5b3c37fa758cbf665b9e7cfcc61d7ee73c4aebc0a660718812c598e9b362e76c746a8d6007080783a5d2c0b91eaf5d5c90f48072e6808d2409c6d2b5fbf4 SHA512 c4267b14b219118f2d56c064403a3a7bd74ef1d3af1e83bec6fe5b391bee80b3d69a0e52a834da9f615d9c54720ade28ea22ab8b6fac75c31c71fc5eb348f709
 EBUILD gpscorrelate-1.6.1-r2.ebuild 1082 BLAKE2B a43a77ee072918bda8379376cb49f9594d49a8f1311d903b779e798398f9c4da6500d73b1eba8f581b3a4692f984fc5ac35a96e91e035c8d107bab14a88a1085 SHA512 42dd15a8e4e1ba0956fe61d2f4f7fab0ca67a4a2e9b5cb8422c8e6f64b8a0aa468fa85d80d1e3f9324a30e23a467605ac5bc01d8861222550fcdc89219296c71
+EBUILD gpscorrelate-2.0.ebuild 975 BLAKE2B fdb4ced014aec070ded38c4074fe384ecffc737f6a2cd94e0a804cc9f687c5f3a4507c6906ee26b995689ba8d94f8bb2700b82df36cecc811b0c30972baf7f56 SHA512 cf052c3259a8ff6d265dad65e62c24ceb9f0a78aea7cbf9b74816e373be08767639a22b644c05153ff93a0e159fc4ad1bc1b5a922f5bf4d96844c88a1e2cdae9
 MISC metadata.xml 357 BLAKE2B 394ec89ad70a468ef62c4354375a5c232ae755990ef84fbf78cdaa477172be4d01ca7ea3123f8030503d7f347e0033538c1fa3376b67938b2ef4f3be2628083c SHA512 bf05fb14f3ff6ae55facb4c43fba38c635a5ede64c238d471194eca9e1d74d388a0fd56b8a56ee9dca84100ce24786f1e957cad9af28d4e88240a557712a3183
diff --git a/sci-geosciences/gpscorrelate/files/gpscorrelate-2.0-desktop-pass-validation.patch b/sci-geosciences/gpscorrelate/files/gpscorrelate-2.0-desktop-pass-validation.patch
new file mode 100644
index 000000000000..131e21041898
--- /dev/null
+++ b/sci-geosciences/gpscorrelate/files/gpscorrelate-2.0-desktop-pass-validation.patch
@@ -0,0 +1,10 @@
+diff --git a/gpscorrelate.desktop b/gpscorrelate.desktop
+index b4db0d6..0885ca4 100644
+--- a/gpscorrelate.desktop
++++ b/gpscorrelate.desktop
+@@ -1,4 +1,4 @@
+-[Desktop Entry] 
++[Desktop Entry]
+ Type=Application
+ Version=1.0
+ Name=GPSCorrelate
diff --git a/sci-geosciences/gpscorrelate/files/gpscorrelate-2.0-respect-users-flags.patch b/sci-geosciences/gpscorrelate/files/gpscorrelate-2.0-respect-users-flags.patch
new file mode 100644
index 000000000000..31519848a7a2
--- /dev/null
+++ b/sci-geosciences/gpscorrelate/files/gpscorrelate-2.0-respect-users-flags.patch
@@ -0,0 +1,30 @@
+diff --git a/Makefile b/Makefile
+index 7634553..9bfd025 100644
+--- a/Makefile
++++ b/Makefile
+@@ -2,12 +2,12 @@
+ 
+ PACKAGE_VERSION = 2.0
+ 
+-CC = gcc
+-CXX = g++
++CC ?= gcc
++CXX ?= g++
+ EXEEXT =
+-PKG_CONFIG=pkg-config
+-CFLAGS   = -Wall -O2
+-LDFLAGS  = -Wall -O2 -lm
++PKG_CONFIG?=pkg-config
++CFLAGS   ?= -Wall -O2
++LDFLAGS  ?= -Wall -O2
+ GTK      = 3
+ 
+ COBJS    = main-command.o unixtime.o gpx-read.o correlate.o exif-gps.o latlong.o
+@@ -20,6 +20,7 @@ CFLAGSINC = `$(PKG_CONFIG) --cflags libxml-2.0 exiv2`
+ GTKFLAGS  = `$(PKG_CONFIG) --cflags gtk+-$(GTK).0`
+ LIBS      = `$(PKG_CONFIG) --libs libxml-2.0 exiv2`
+ LIBSGUI   = `$(PKG_CONFIG) --libs gtk+-$(GTK).0`
++LIBS      += -lm -lstdc++
+ 
+ CFLAGSINC += $(GTKFLAGS)
+ 
diff --git a/sci-geosciences/gpscorrelate/gpscorrelate-2.0.ebuild b/sci-geosciences/gpscorrelate/gpscorrelate-2.0.ebuild
new file mode 100644
index 000000000000..982684d854bb
--- /dev/null
+++ b/sci-geosciences/gpscorrelate/gpscorrelate-2.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop
+
+DESCRIPTION="Tool for adjusting EXIF tags of your photos with a recorded GPS trace"
+HOMEPAGE="https://dfandrich.github.io/gpscorrelate/"
+SRC_URI="https://github.com/dfandrich/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="gtk"
+
+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+:3 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-desktop-pass-validation.patch"
+	"${FILESDIR}/${P}-respect-users-flags.patch"
+)
+
+src_compile() {
+	emake gpscorrelate
+	use gtk && emake gpscorrelate-gui
+
+}
+
+src_install() {
+	dobin ${PN}
+	if use gtk; then
+		dobin ${PN}-gui
+		doicon -s scalable ${PN}-gui.svg
+		domenu ${PN}.desktop
+	fi
+	dodoc doc/*.html doc/*.png doc/*.xml
+	einstalldocs
+	doman doc/${PN}.1
+}