gentoo auto-resync : 22:10:2024 - 04:04:46

7 files changed, 167 insertions, 64 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 81d757f66b69..b8cfdeedef9b 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest
index fba057d581e4..af178a97e239 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -1,6 +1,10 @@
 AUX merkaartor-0.18.3-sharedir-pluginsdir.patch 722 BLAKE2B 294f5ff4d2da45d441948fdcf2b642971bdb3ea5fa2649bbe9827fdc50ab72ca77ea6f2c80d690794a9ea539bda91eea1ec34fc98ec073d49cf933002df68747 SHA512 5e2b1d4a8d4294785b59ea3631e7f086c2d52ab8752574872088ae4cb26c5b11851ab1c597a53012797b6ec7c5d9c1012037baf9cfc4135b06542365c5eb60c9
 AUX merkaartor-0.19.0-exiv2-0.28.patch 1874 BLAKE2B 6ba8bae160ef8693ae92396051348cd48e857d3cace7c57aab45aea0c6c7756cadf6b73894391dcd7ff8de3e39eb29694e459070aebe3f2cc776adbe80c51e51 SHA512 a2c8c053cdda1cb94b3e7f6b315cfb6a061f956a86f74db96f0a0f174af6aa4f3b46829a6f447e3f067edbc9c7ba923c7619c8ceb7480e145c1b31e2129cf92e
+AUX merkaartor-0.20.0-GNUInstallDirs.patch 1784 BLAKE2B 7454e5ddb11df7ad84191c7bafd499a219f88f8d6b7b2986fe2d6029c57d30dea87c945a5c433d41411571408d73f2eb6335965500c09d76ee5517d58b79ce91 SHA512 fdc85f6dc490f03f64eb07d03afa11b4a090b7d5295afb4e72137c75d8dcd242f0930ee4bbf4f88fc3718c66df24d30d333a155d080f1a385121f754f1db30a4
+AUX merkaartor-0.20.0-disable-git.patch 457 BLAKE2B 779176dc2f16297926bafc37a2d127bbed3d4a34bb70552430f4ff2620acaa55d5178828ac43c289b4b983d31ce3d27318355f7a0261543604d51fe4c0815f7e SHA512 5831fab7647704b7d1b747a20a35b589ea6c257cb15716a7afe521f6e677b85c9ecfdb4304862788f20259f83b4e4e3e7fc271aa908b36db87e9be5deee01b2c
 DIST merkaartor-0.19.0.tar.gz 5665947 BLAKE2B 1ade571b8e429b9da89206d50b0f33f69cb0973d4ada30dc0d84d4c6c47394170ddb8503490eeda8666656eeb07159498d02bbc36e61f2dffedef167f221be01 SHA512 2e832ba14fd89861a4ae2940d281c801d039e09aaf30ada996ac508e084a29d033f8ac3d3e4711c78d1f36df84ab133bd0a901e0e8fa72efa098001724940a6d
+DIST merkaartor-0.20.0.tar.gz 5592116 BLAKE2B 9a78f66cea55bab3262d80d594da93f80bb834c7121960da1ade02624f8435545168b911a944d005995a0c60e4974fd58494867a6ec2eca47b1430968677a9d3 SHA512 db64c3053618a0bed7984223c9aa8e4175fdf7db2dd70bf3c6ec021b46fae1d095c513c3e151086baf07446c7cf81c49923a2e43e79963d956d29643d7f93910
 EBUILD merkaartor-0.19.0-r1.ebuild 2662 BLAKE2B 0f0297f2f8eef5d1cf27bbdfe1e237fedd67c7b6ca2adf7c2b589febcbeb3a8ec815a1076164e80f1c917b39207cb55eb2c7bfcdd3bd496f7519d4c72fcfaab1 SHA512 d3f595dbf560b21d1bb7f2b3a269836ee52005a5f2a737e754e5ce21a9419095c944c841584b44e64a6b46627390365cc4a1050da04711bfd159b5d87511446d
-EBUILD merkaartor-9999.ebuild 2578 BLAKE2B c75be6e26cd264bafc3455af31c0e6ee0d6bfc32fc1c0d1af6ebcf0d60d7f39b908e137ff9365c3b527e908e17cab9f2ecb90f718afd25f81c2200c2935f3b95 SHA512 bc905a13cc28388f7cb7b9030ca8dc1a87bcc5ed3500449ad5bfb64e5038375bf61ce4c0148c54a56eaf1d3c30a48a04a839c49b1f5c39e36dafed40bd2159e9
-MISC metadata.xml 576 BLAKE2B a768f64dba4052d56e3ae00ccb0ddb95e1d4712ec5bb99216ebfad87012a2d9aece4acfa3eee2715625f9726d70a620209f4b4a83ed323188a92205953cc1406 SHA512 e099e0546c907c76f864ff5cdc4cb91fe1b8d72289022e6f621d827bc7140c4b1b47f6ba97783a4d703d46245013695e2d8a213272b665298e89f5ed332f7ff9
+EBUILD merkaartor-0.20.0.ebuild 1675 BLAKE2B c87858f1be765089afa484c9b5540cd9931ec2e45b0f338e405183c6d864eb7e9b016b2ddf4d27e5a3bc2f173fc8b430388381aaa8ee70d40dcd73aeaa44f459 SHA512 4995ac14437eeac84a366fe0ce76a9e822e534b763762a4f089a647fe464ef77c2b0e2f1f0820e13c656c374b430f7cc2ac28f66db5401998af9452f553d3f33
+EBUILD merkaartor-9999.ebuild 1675 BLAKE2B c87858f1be765089afa484c9b5540cd9931ec2e45b0f338e405183c6d864eb7e9b016b2ddf4d27e5a3bc2f173fc8b430388381aaa8ee70d40dcd73aeaa44f459 SHA512 4995ac14437eeac84a366fe0ce76a9e822e534b763762a4f089a647fe464ef77c2b0e2f1f0820e13c656c374b430f7cc2ac28f66db5401998af9452f553d3f33
+MISC metadata.xml 693 BLAKE2B 10727d421e3bfaf49615e4c76da72b5136f35864d445497b5bf9018104f068fbabb40bfec63994fa8135887137c25af5afd13f7208db88bcfd47651c47c5bfae SHA512 cfeeceae993be43e690b5046e550679d8935107a94f5d1b384c457dde629755add6b74cfb148776f66e9b545ef4e075bbfba544c23c8574e708a25a9ca4e6bab
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.20.0-GNUInstallDirs.patch b/sci-geosciences/merkaartor/files/merkaartor-0.20.0-GNUInstallDirs.patch
new file mode 100644
index 000000000000..202f4e0ed6e2
--- /dev/null
+++ b/sci-geosciences/merkaartor/files/merkaartor-0.20.0-GNUInstallDirs.patch
@@ -0,0 +1,44 @@
+From 97fab944083c7a3a5716f1aaf40b9c62a3f84cf2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
+Date: Sun, 26 May 2024 18:43:12 +0200
+Subject: [PATCH] Use CMAKE_INSTALL_LIBDIR for library installation path
+
+---
+ CMakeLists.txt        | 10 ++++++++--
+ plugins/plugins.cmake |  2 ++
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e107439d..50d82e1d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,8 +21,14 @@ project(merkaartor VERSION ${VCS_VERSION})
+ # compatibility.
+ # Using configure_file() allows us to store the metadata in a .cpp file, thus
+ # only rebuilding that one and linking.
+-set(SHARE_DIR ${CMAKE_INSTALL_PREFIX}/share/merkaartor)
+-set(LIB_DIR   ${CMAKE_INSTALL_PREFIX}/lib/merkaartor)
++if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
++    include(GNUInstallDirs)
++    set(SHARE_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/merkaartor)
++    set(LIB_DIR   ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/merkaartor)
++else()
++    set(SHARE_DIR ${CMAKE_INSTALL_PREFIX}/share/merkaartor)
++    set(LIB_DIR   ${CMAKE_INSTALL_PREFIX}/lib/merkaartor)
++endif()
+ configure_file("${PROJECT_SOURCE_DIR}/cmake/build-metadata.cpp.in" "${PROJECT_BINARY_DIR}/build-metadata.cpp" @ONLY)
+ 
+ set(CMAKE_CXX_STANDARD 17)
+diff --git a/plugins/plugins.cmake b/plugins/plugins.cmake
+index 955be124..4c9fa499 100644
+--- a/plugins/plugins.cmake
++++ b/plugins/plugins.cmake
+@@ -1,6 +1,8 @@
+ 
+ if (APPLE)
+ set(PLUGINS_INSTALL_POSTFIX "merkaartor.app/Contents/plugins")
++elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
++set(PLUGINS_INSTALL_POSTFIX "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/merkaartor/plugins")
+ else()
+ set(PLUGINS_INSTALL_POSTFIX "lib/merkaartor/plugins")
+ endif()
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.20.0-disable-git.patch b/sci-geosciences/merkaartor/files/merkaartor-0.20.0-disable-git.patch
new file mode 100644
index 000000000000..1f0188c86174
--- /dev/null
+++ b/sci-geosciences/merkaartor/files/merkaartor-0.20.0-disable-git.patch
@@ -0,0 +1,13 @@
+Description: Don't use git for version information.
+Author: Bas Couwenberg <sebastic@debian.org>
+Forwarded: not-needed
+
+--- a/cmake/vcs.cmake
++++ b/cmake/vcs.cmake
+@@ -1,5 +1,5 @@
+ 
+-if (EXISTS "${CMAKE_SOURCE_DIR}/.git")
++if (EXISTS "${CMAKE_SOURCE_DIR}/.git" AND NOT EXISTS "${CMAKE_SOURCE_DIR}/debian")
+     # If git directory is present, we require git executable and gather our info from git commands.
+     find_package(Git)
+     if (NOT ${GIT_FOUND})
diff --git a/sci-geosciences/merkaartor/merkaartor-0.20.0.ebuild b/sci-geosciences/merkaartor/merkaartor-0.20.0.ebuild
new file mode 100644
index 000000000000..892191a4c37c
--- /dev/null
+++ b/sci-geosciences/merkaartor/merkaartor-0.20.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake 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="https://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="exif gps libproxy webengine zbar"
+
+# bundles qtsingleapplication again, unfortunately
+DEPEND="
+	dev-libs/protobuf:=
+	dev-qt/qt5compat:6
+	dev-qt/qtbase:6[concurrent,gui,network,widgets,xml]
+	dev-qt/qtnetworkauth:6
+	dev-qt/qtsvg:6
+	sci-libs/gdal:=
+	sci-libs/proj:=
+	sys-libs/zlib
+	exif? ( media-gfx/exiv2:= )
+	gps? ( >=sci-geosciences/gpsd-3.17-r2:= )
+	libproxy? ( >=net-libs/libproxy-0.5 )
+	webengine? ( dev-qt/qtwebengine:6[widgets] )
+	zbar? ( media-gfx/zbar )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-qt/qttools:6[linguist]
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS CHANGELOG )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.20.0-disable-git.patch # downstream patch
+	# pending upstream PR: https://github.com/openstreetmap/merkaartor/pull/291
+	"${FILESDIR}"/${PN}-0.20.0-GNUInstallDirs.patch
+)
+
+src_prepare() {
+	# no Qt5 automagic, please
+	sed -e "/^ *find_package.*QT NAMES/s/Qt5 //" -i CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGEOIMAGE=$(usex exif)
+		-DGPSD=$(usex gps)
+		-DLIBPROXY=$(usex libproxy)
+		-DWEBENGINE=$(usex webengine)
+		-DZBAR=$(usex zbar)
+		-DEXTRA_TESTS=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
index f0f4b1dbd195..892191a4c37c 100644
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 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
+inherit cmake xdg
 
-if [[ ${PV} != *9999 ]] ; then
+if [[ ${PV} != *9999* ]] ; then
 	SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 else
@@ -15,87 +14,58 @@ else
 fi
 
 DESCRIPTION="Qt based map editor for the openstreetmap.org project"
-HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
+HOMEPAGE="https://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="debug exif gps libproxy webengine"
+IUSE="exif gps libproxy webengine zbar"
 
+# bundles qtsingleapplication again, unfortunately
 DEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsingleapplication[X,qt5(+)]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
+	dev-libs/protobuf:=
+	dev-qt/qt5compat:6
+	dev-qt/qtbase:6[concurrent,gui,network,widgets,xml]
+	dev-qt/qtnetworkauth:6
+	dev-qt/qtsvg:6
 	sci-libs/gdal:=
 	sci-libs/proj:=
 	sys-libs/zlib
 	exif? ( media-gfx/exiv2:= )
 	gps? ( >=sci-geosciences/gpsd-3.17-r2:= )
-	libproxy? ( net-libs/libproxy )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )
+	libproxy? ( >=net-libs/libproxy-0.5 )
+	webengine? ( dev-qt/qtwebengine:6[widgets] )
+	zbar? ( media-gfx/zbar )
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
-	dev-qt/linguist-tools:5
+	dev-qt/qttools:6[linguist]
 	virtual/pkgconfig
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-0.18.3-sharedir-pluginsdir.patch ) # bug 621826
-
 DOCS=( AUTHORS CHANGELOG )
 
-src_prepare() {
-	default
-
-	rm -r 3rdparty || die "Failed to remove bundled libs"
-
-	my_rm_loc() {
-		sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die
-		rm "translations/${PN}_${1}.ts" || die
-	}
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.20.0-disable-git.patch # downstream patch
+	# pending upstream PR: https://github.com/openstreetmap/merkaartor/pull/291
+	"${FILESDIR}"/${PN}-0.20.0-GNUInstallDirs.patch
+)
 
-	if [[ -n "$(plocale_get_locales)" ]]; then
-		plocale_for_each_disabled_locale my_rm_loc
-		$(qt5_get_bindir)/lrelease src/src.pro || die
-	fi
+src_prepare() {
+	# no Qt5 automagic, please
+	sed -e "/^ *find_package.*QT NAMES/s/Qt5 //" -i CMakeLists.txt || die
 
-	# build system expects to be building from git
-	if [[ ${PV} != *9999 ]] ; then
-		sed -i src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die
-	fi
+	cmake_src_prepare
 }
 
 src_configure() {
-	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
-	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)
+	local mycmakeargs=(
+		-DGEOIMAGE=$(usex exif)
+		-DGPSD=$(usex gps)
+		-DLIBPROXY=$(usex libproxy)
+		-DWEBENGINE=$(usex webengine)
+		-DZBAR=$(usex zbar)
+		-DEXTRA_TESTS=OFF
 	)
-	[[ ${PV} != *9999 ]] && myeqmakeargs+=( RELEASE=1 )
-
-	eqmake5 "${myeqmakeargs[@]}" Merkaartor.pro
-}
 
-src_install() {
-	emake install INSTALL_ROOT="${D}"
+	cmake_src_configure
 }
diff --git a/sci-geosciences/merkaartor/metadata.xml b/sci-geosciences/merkaartor/metadata.xml
index 45f8b6b3867e..d312634d92a6 100644
--- a/sci-geosciences/merkaartor/metadata.xml
+++ b/sci-geosciences/merkaartor/metadata.xml
@@ -8,6 +8,7 @@
 	<use>
 		<flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for getting the HTTP/HTTPS/SOCKS proxy configuration</flag>
 		<flag name="webengine">Enable <pkg>dev-qt/qtwebengine</pkg> in some plugins</flag>
+		<flag name="zbar">Enable barcode support in MWalkingPapersBackground/GeoImage via <pkg>media-gfx/zbar</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="github">openstreetmap/merkaartor</remote-id>