gentoo resync : 20.03.2022

2 files changed, 88 insertions, 0 deletions

diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest
index cfce3cb7d67b..79239348e7f5 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -2,7 +2,9 @@ AUX merkaartor-0.18.3-sharedir-pluginsdir.patch 722 BLAKE2B 294f5ff4d2da45d44194
 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
+DIST merkaartor-0.19.0.tar.gz 5665947 BLAKE2B 1ade571b8e429b9da89206d50b0f33f69cb0973d4ada30dc0d84d4c6c47394170ddb8503490eeda8666656eeb07159498d02bbc36e61f2dffedef167f221be01 SHA512 2e832ba14fd89861a4ae2940d281c801d039e09aaf30ada996ac508e084a29d033f8ac3d3e4711c78d1f36df84ab133bd0a901e0e8fa72efa098001724940a6d
 EBUILD merkaartor-0.18.4.ebuild 2436 BLAKE2B cd51c4584f61f333712cae5aefc9f5310b13ccd9521f7cb27a6bb29334351a66a245d9563f255e18306d2e5f7a4585681a734ce43a7808a947cc7c9b256e80e3 SHA512 82050b12456cd16f35124accdd92a11c22bc869e5421f47d710767fd8b74c190cb73a78def9b8b6d3fe8da27b081161de513e1355399531971bb2c50619ee94d
 EBUILD merkaartor-0.18.4_p20210410-r1.ebuild 2905 BLAKE2B 94a7903cb648d364467d4be451e805e56086eac5af1e173a41aab4148b5e3d074814c5d1f5d4cf5c20c6c4230a2d104e1d45a890f6e206f620e8ad2195b60f4a SHA512 67fd51899ec110a138c2cee7dbe426f49b475358a41e9bf210b5d48321d907ed6b49302c895d3f8eeb888a051ff33929796ab1d679d54066b26a050c51077b2a
+EBUILD merkaartor-0.19.0.ebuild 2244 BLAKE2B cb54202ac0590ffddf3289d797e52e3bc028c3401cfabe96b28c6b8d34231238434d0446912a18e1cd6c744568bc2eac57631fb5eb2c4f3fa9cfd646c4a5944e SHA512 12fae9016bf0fe390b2dbdab83060e3d36c285956dc9f4d357af9aab36ac4aa2df815995697c7e78ac48aa89b3574e74ba6177056e185d7592f9965a6b2a962c
 EBUILD merkaartor-9999.ebuild 2675 BLAKE2B 72ab4f08e9562ec9af5eea9f8a7bfddd8a1bfe8bf6e33a8a52f838ef1b7b19ae531a3fa6c5c53091ef1e062d0f6552dfaff05719d62a094efbb8c1ff9c343e6c SHA512 6d1cf6429206315d7c56bcbe1dff81d20e9710100becac0b3c75bab53f29c457388a1a53d184ac4aefaf77f65e23e306029fad8f4aadbc04eb2b164e1098c4d1
 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.ebuild
new file mode 100644
index 000000000000..e9c4e0b933f1
--- /dev/null
+++ b/sci-geosciences/merkaartor/merkaartor-0.19.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 plocale qmake-utils xdg
+
+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
+	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-8:=
+	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 "$(plocale_get_locales)" ]]; then
+		plocale_for_each_disabled_locale my_rm_loc
+		$(qt5_get_bindir)/lrelease src/src.pro || die
+	fi
+
+	# build system expects to be building from git
+	sed -i src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die
+}
+
+src_configure() {
+	append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+
+	# 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
+}