gentoo resync : 28.04.2021

3 files changed, 123 insertions, 3 deletions

diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest
index b751eab6ab70..f46aba6770a4 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -1,6 +1,8 @@
 AUX merkaartor-0.18.3-sharedir-pluginsdir.patch 722 BLAKE2B 294f5ff4d2da45d441948fdcf2b642971bdb3ea5fa2649bbe9827fdc50ab72ca77ea6f2c80d690794a9ea539bda91eea1ec34fc98ec073d49cf933002df68747 SHA512 5e2b1d4a8d4294785b59ea3631e7f086c2d52ab8752574872088ae4cb26c5b11851ab1c597a53012797b6ec7c5d9c1012037baf9cfc4135b06542365c5eb60c9
 AUX merkaartor-0.18.4-qt-5.15.patch 831 BLAKE2B c56bfa01bbfdc22aabc6d8686708c21e5c6530647dcca915af41db164db1af47975ad414b060715e5ff6cb29b9b636e68fca6cb9c0d0d2accdc23a1c2d239988 SHA512 ef27cdb17f3c96dbba8e572edfa0e15991950a4bf57ed17f9088b5e0593c1287c68bd907d6683cc2043ef25c4f0c71e084a01c9b7e3e1158fb1934060841a179
 DIST merkaartor-0.18.4.tar.gz 6562065 BLAKE2B 2dbd85c81f337138b249807dcb404b9167cc63bec51cc19afa95b088733375bec234df75fef2652864c811ff6d9927c93f16df42044be3706b68332fcd817706 SHA512 16001688584fd13eb7573159092a21ed0189ae0ce900474bacd5b1e47b8cebb0c4b2bd5b904e13a0029ec01167b68a32a9936914b3f5a1360b389aa31858cf9c
+DIST merkaartor-0.18.4_p20210410.tar.gz 6566072 BLAKE2B d2788552794e2778d6b68cc39ad04ec081ef88d0e3748af380774ee3ac98871bdaf1f26a04065bfb591b9245d740acec4fcfb4b781311409b49932014dfa86bb SHA512 3051280fd1ab6fa5b9e40e4c1aa1df137b60f3f4062daaa9301dce3697c51d7f4514bd01d7954f5c332849e268f6fcf6f23a2bc58b13645c5e29f9a12c9a3a34
 EBUILD merkaartor-0.18.4.ebuild 2430 BLAKE2B 12d16caabf19e1eb53eea8d95713f74fce41e50bcc2ec5c75f3a7544a96928504a033a9d1292093a4d0070da0a1eb9f6342f633515e465441433097f4713e4ea SHA512 15c98ac9b2173afbafabb255a5516634c77dbaf127d5233f94551165b69a8216c0cfd8a8abd64376d4a4a1375c4ea8c0bf20377046aadada96fe80c5edf90024
-EBUILD merkaartor-9999.ebuild 2533 BLAKE2B 8962729b3afc4066cfcab4fe076845b919cc17ac725d7c24af1a9b0da7fa5dd23784e27d34fa4c6579a098ef60346e62b4042764a74cf51dd8d5746be5a7a1e1 SHA512 cf5fa7525b1de10b457c1ea28b8f21d3596773302308b2194674242eeabc50190c38111edf3acd54ab9852f4998b8c4c46e979f7ce7a2392fa2c3f8dd0826766
+EBUILD merkaartor-0.18.4_p20210410-r1.ebuild 2899 BLAKE2B b4017262b9ab547dd962aa1dc58e483344e9a1e8fd881a7ccc68c8364dca403f0b8e305a97eea036c7b75d93df6ae34a7ea4a30f4ffa4af99cd53d622f045b15 SHA512 f08fd7cb99dd937f7c9f3dc0a9acc5673cda9744cebfffeedebbc742713bca66e5dd2528076e93e7b0b421014ab3f7595f713dc7d2cd5179444be6cb4ea93726
+EBUILD merkaartor-9999.ebuild 2669 BLAKE2B 9c122ae6d8a68cebd7b87074a7ed72617efcddb56cfba92cd82080a9191e3f3208701d6763c6ee822dcc01ce8481d8930887c57727028c90e260d6726f91dd29 SHA512 3bca50d3694f1289d47c97af46e75194f23b5b3dfc37ff78311c83ec45d1206c1342d1f58f170cdafed11e2216d48edf236e5d4c047623e7869ad5132593e490
 MISC metadata.xml 575 BLAKE2B d9a30a01f5b6c55e9a4865f6f1aa92ea610ad2f1aa9ab1bcb129dfbf03f9579fe7f3d8bdf604da0564b4d53b65d54b8c32f3628f1e8e389f6368d14cfca9997b SHA512 d9e5293c9bf7a3bfc7fd691d5a61c7de6c284941da73883590e4956bb4a7b26215e003a9096b9fdaa1f7590765aad583bec04ad6ec8778bc4a26a422a3e2da38
diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410-r1.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410-r1.ebuild
new file mode 100644
index 000000000000..49fce917fa1c
--- /dev/null
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
+inherit flag-o-matic l10n qmake-utils xdg-utils
+
+if [[ ${PV} != *9999 ]] ; then
+	# Needed for new Proj API support
+	# bug #685234
+	COMMIT="7ae76834bcba9934f38d85058f7372fc016c1d1c"
+	SRC_URI="https://github.com/openstreetmap/merkaartor/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	#SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+
+	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"
+
+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
+	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
+	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] )
+"
+RDEPEND="${DEPEND}"
+
+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
+	}
+
+	if [[ -n "$(l10n_get_locales)" ]]; then
+		l10n_for_each_disabled_locale_do my_rm_loc
+		$(qt5_get_bindir)/lrelease src/src.pro || die
+	fi
+
+	# 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
+}
+
+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="${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
+		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
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
index 8ff9caf11e1f..4cdd436ca64a 100644
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
-inherit l10n qmake-utils xdg-utils
+inherit flag-o-matic l10n qmake-utils xdg-utils
 
 if [[ ${PV} != *9999 ]] ; then
 	SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -71,6 +71,11 @@ 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="${ED}/usr"