gentoo auto-resync : 16:05:2023 - 04:05:52

8 files changed, 58 insertions, 181 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 3e4b225539c1..2524128746a7 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gpscorrelate/Manifest b/sci-geosciences/gpscorrelate/Manifest
index b2901e61a0cf..e4373cdc3d6d 100644
--- a/sci-geosciences/gpscorrelate/Manifest
+++ b/sci-geosciences/gpscorrelate/Manifest
@@ -1,9 +1,5 @@
-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-1.6.1-exiv2-0.27.1.patch b/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-exiv2-0.27.1.patch
deleted file mode 100644
index 16921b72a1f6..000000000000
--- a/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-exiv2-0.27.1.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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/files/gpscorrelate-1.6.1-makefile.patch b/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-makefile.patch
deleted file mode 100644
index 82bd63545dfc..000000000000
--- a/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-makefile.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -4,11 +4,15 @@
- 
- COBJS    = main-command.o unixtime.o gpx-read.o correlate.o exif-gps.o
- GOBJS    = main-gui.o gui.o unixtime.o gpx-read.o correlate.o exif-gps.o
--CFLAGS   = -Wall
--override CFLAGS += $(shell pkg-config --cflags libxml-2.0 gtk+-2.0) -I/usr/include/exiv2
--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++
-+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)
-+endif
-+prefix   ?= /usr/local
- bindir   = $(prefix)/bin
- datadir  = $(prefix)/share
- mandir   = $(datadir)/man
-@@ -18,16 +22,16 @@
- all:	gpscorrelate gpscorrelate-gui gpscorrelate.1
- 
- gpscorrelate: $(COBJS)
--	g++ $(OFLAGS) -o $@ $(COBJS)
-+	$(CXX) $(LDFLAGS) $(COBJS) $(CLIBS) -o $@
- 
- gpscorrelate-gui: $(GOBJS)
--	g++ $(OFLAGS) -o $@ $(GOBJS)
-+	$(CXX) $(LDFLAGS) $(GOBJS) $(CLIBS) -o $@
- 
--.c.o:
--	gcc $(CFLAGS) -c -o $*.o $<
-+%.o: %.c
-+	$(CC) -c -o $@ $< $(CFLAGS)
- 
--.cpp.o:
--	g++ $(CFLAGS) -c -o $*.o $<
-+%.o: %.cpp $(DEPS)
-+	$(CXX) -c -o $@ $< $(CXXFLAGS)
- 
- clean:
- 	rm -f *.o gpscorrelate{,.exe} gpscorrelate-gui{,.exe}
diff --git a/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1-r2.ebuild b/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1-r2.ebuild
deleted file mode 100644
index 7f1c8c38fc5e..000000000000
--- a/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop toolchain-funcs
-
-DESCRIPTION="Tool for adjusting EXIF tags of your photos with a recorded GPS trace"
-HOMEPAGE="https://github.com/freefoote/gpscorrelate"
-SRC_URI="http://freefoote.dview.net/linux/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="doc 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+:2 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-makefile.patch"
-	"${FILESDIR}/${P}-exiv2-0.27.1.patch"
-)
-
-src_compile() {
-	tc-export CC CXX PKG_CONFIG
-	local opts="gpscorrelate gpscorrelate.1"
-	use gtk && opts+=" gpscorrelate-gui BUILD_GUI=1"
-	emake ${opts}
-}
-
-src_install() {
-	dobin ${PN}
-	if use gtk; then
-		dobin ${PN}-gui
-		doicon ${PN}-gui.svg
-		domenu ${PN}.desktop
-	fi
-	if use doc; then
-		rm doc/gpscorrelate-manpage.xml* || die
-		local DOCS=()
-		local HTML_DOCS=( doc/. )
-		einstalldocs
-	fi
-	doman ${PN}.1
-}
diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest
index 6208534f015b..d14075bd23d1 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -1,5 +1,5 @@
 AUX merkaartor-0.18.3-sharedir-pluginsdir.patch 722 BLAKE2B 294f5ff4d2da45d441948fdcf2b642971bdb3ea5fa2649bbe9827fdc50ab72ca77ea6f2c80d690794a9ea539bda91eea1ec34fc98ec073d49cf933002df68747 SHA512 5e2b1d4a8d4294785b59ea3631e7f086c2d52ab8752574872088ae4cb26c5b11851ab1c597a53012797b6ec7c5d9c1012037baf9cfc4135b06542365c5eb60c9
 DIST merkaartor-0.19.0.tar.gz 5665947 BLAKE2B 1ade571b8e429b9da89206d50b0f33f69cb0973d4ada30dc0d84d4c6c47394170ddb8503490eeda8666656eeb07159498d02bbc36e61f2dffedef167f221be01 SHA512 2e832ba14fd89861a4ae2940d281c801d039e09aaf30ada996ac508e084a29d033f8ac3d3e4711c78d1f36df84ab133bd0a901e0e8fa72efa098001724940a6d
-EBUILD merkaartor-0.19.0.ebuild 2226 BLAKE2B 3adc8c0d7cc379bbef1eb72b1170e4467df4832eb2b8e5dd91e3eaf1173f0c5235e5608b6c4088b3df68bd8e0473ec666846e9697fc67096546cf2ce0628cc49 SHA512 c0cad11913d5a96587ad624549ffc321aa4aef47401b818b2bd0fe1464fa84b9ffbf87346ececffa47164e3333d3f117c288d43c75214f9db1103cc7cc21853e
-EBUILD merkaartor-9999.ebuild 2657 BLAKE2B 02c5f40887650c1af92a0a7f71fdfd42a7019a0c43ad6eee46c157c9e5c9716bbf3433a1237b87a83545f5cb493aa53fb15264ff2e63761d140c215759b22b1f SHA512 25bf6aa0c9949ce77da3132b72ee2d5b830e4eab99f10befc1cb745c493fdf2a09d5a809b9c8e0e5265e23c77e4e7906cd1a70865f9c27a54736f2939bbda015
+EBUILD merkaartor-0.19.0-r1.ebuild 2578 BLAKE2B c75be6e26cd264bafc3455af31c0e6ee0d6bfc32fc1c0d1af6ebcf0d60d7f39b908e137ff9365c3b527e908e17cab9f2ecb90f718afd25f81c2200c2935f3b95 SHA512 bc905a13cc28388f7cb7b9030ca8dc1a87bcc5ed3500449ad5bfb64e5038375bf61ce4c0148c54a56eaf1d3c30a48a04a839c49b1f5c39e36dafed40bd2159e9
+EBUILD merkaartor-9999.ebuild 2578 BLAKE2B c75be6e26cd264bafc3455af31c0e6ee0d6bfc32fc1c0d1af6ebcf0d60d7f39b908e137ff9365c3b527e908e17cab9f2ecb90f718afd25f81c2200c2935f3b95 SHA512 bc905a13cc28388f7cb7b9030ca8dc1a87bcc5ed3500449ad5bfb64e5038375bf61ce4c0148c54a56eaf1d3c30a48a04a839c49b1f5c39e36dafed40bd2159e9
 MISC metadata.xml 576 BLAKE2B a768f64dba4052d56e3ae00ccb0ddb95e1d4712ec5bb99216ebfad87012a2d9aece4acfa3eee2715625f9726d70a620209f4b4a83ed323188a92205953cc1406 SHA512 e099e0546c907c76f864ff5cdc4cb91fe1b8d72289022e6f621d827bc7140c4b1b47f6ba97783a4d703d46245013695e2d8a213272b665298e89f5ed332f7ff9
diff --git a/sci-geosciences/merkaartor/merkaartor-0.19.0.ebuild b/sci-geosciences/merkaartor/merkaartor-0.19.0-r1.ebuild
index 8a4daa01f386..f0f4b1dbd195 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.19.0.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.19.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,19 +6,21 @@ EAPI=8
 PLOCALES="cs de en es fi fr hr hu id_ID it ja nl pl pt_BR ru sv uk zh_TW"
 inherit flag-o-matic plocale qmake-utils xdg
 
+if [[ ${PV} != *9999 ]] ; then
+	SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+else
+	EGIT_REPO_URI="https://github.com/openstreetmap/merkaartor.git"
+	inherit git-r3
+fi
+
 DESCRIPTION="Qt based map editor for the openstreetmap.org project"
 HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
-SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE="debug exif gps libproxy webengine"
 
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
 DEPEND="
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
@@ -30,18 +32,20 @@ DEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	sci-libs/gdal:=
-	<sci-libs/proj-8:=
+	sci-libs/proj:=
 	sys-libs/zlib
 	exif? ( media-gfx/exiv2:= )
-	gps? ( >=sci-geosciences/gpsd-3.17-r2 )
+	gps? ( >=sci-geosciences/gpsd-3.17-r2:= )
 	libproxy? ( net-libs/libproxy )
 	webengine? ( dev-qt/qtwebengine:5[widgets] )
 "
 RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.18.3-sharedir-pluginsdir.patch # bug 621826
-)
+PATCHES=( "${FILESDIR}"/${PN}-0.18.3-sharedir-pluginsdir.patch ) # bug 621826
 
 DOCS=( AUTHORS CHANGELOG )
 
@@ -61,26 +65,37 @@ src_prepare() {
 	fi
 
 	# build system expects to be building from git
-	sed -i src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die
+	if [[ ${PV} != *9999 ]] ; then
+		sed -i src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die
+	fi
 }
 
 src_configure() {
-	append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+	if has_version "<sci-libs/proj-8.0.0" ; then
+		# bug #685234
+		append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+	fi
 
 	# TRANSDIR_SYSTEM is for bug #385671
-	eqmake5 \
-		PREFIX="${ED}/usr" \
-		LIBDIR="${ED}/usr/$(get_libdir)" \
-		PLUGINS_DIR="/usr/$(get_libdir)/${PN}/plugins" \
-		SHARE_DIR_PATH="/usr/share/${PN}" \
-		TRANSDIR_MERKAARTOR="${ED}/usr/share/${PN}/translations" \
-		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" \
-		SYSTEM_QTSA=1 \
-		RELEASE=1 \
-		NODEBUG=$(usex debug 0 1) \
-		GEOIMAGE=$(usex exif 1 0) \
-		GPSDLIB=$(usex gps 1 0) \
-		LIBPROXY=$(usex libproxy 1 0) \
-		USEWEBENGINE=$(usex webengine 1 0) \
-		Merkaartor.pro
+	local myeqmakeargs=(
+		PREFIX="${EPREFIX}/usr"
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		PLUGINS_DIR="/usr/$(get_libdir)/${PN}/plugins"
+		SHARE_DIR_PATH="/usr/share/${PN}"
+		TRANSDIR_MERKAARTOR="${EPREFIX}/usr/share/${PN}/translations"
+		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations"
+		SYSTEM_QTSA=1
+		NODEBUG=$(usex debug 0 1)
+		GEOIMAGE=$(usex exif 1 0)
+		GPSDLIB=$(usex gps 1 0)
+		LIBPROXY=$(usex libproxy 1 0)
+		USEWEBENGINE=$(usex webengine 1 0)
+	)
+	[[ ${PV} != *9999 ]] && myeqmakeargs+=( RELEASE=1 )
+
+	eqmake5 "${myeqmakeargs[@]}" Merkaartor.pro
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
 }
diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
index 27f04eaf049e..f0f4b1dbd195 100644
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PLOCALES="cs de en es fi fr hr hu id_ID it ja nl pl pt_BR ru sv uk zh_TW"
-inherit flag-o-matic plocale qmake-utils xdg-utils
+inherit flag-o-matic plocale qmake-utils xdg
 
 if [[ ${PV} != *9999 ]] ; then
 	SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -21,10 +21,6 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug exif gps libproxy webengine"
 
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
 DEPEND="
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
@@ -44,6 +40,10 @@ DEPEND="
 	webengine? ( dev-qt/qtwebengine:5[widgets] )
 "
 RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
 
 PATCHES=( "${FILESDIR}"/${PN}-0.18.3-sharedir-pluginsdir.patch ) # bug 621826
 
@@ -78,11 +78,11 @@ src_configure() {
 
 	# TRANSDIR_SYSTEM is for bug #385671
 	local myeqmakeargs=(
-		PREFIX="${ED}/usr"
-		LIBDIR="${ED}/usr/$(get_libdir)"
+		PREFIX="${EPREFIX}/usr"
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
 		PLUGINS_DIR="/usr/$(get_libdir)/${PN}/plugins"
 		SHARE_DIR_PATH="/usr/share/${PN}"
-		TRANSDIR_MERKAARTOR="${ED}/usr/share/${PN}/translations"
+		TRANSDIR_MERKAARTOR="${EPREFIX}/usr/share/${PN}/translations"
 		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations"
 		SYSTEM_QTSA=1
 		NODEBUG=$(usex debug 0 1)
@@ -96,12 +96,6 @@ src_configure() {
 	eqmake5 "${myeqmakeargs[@]}" Merkaartor.pro
 }
 
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
+src_install() {
+	emake install INSTALL_ROOT="${D}"
 }