gentoo auto-resync : 18:12:2024 - 06:30:11

9 files changed, 84 insertions, 196 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 5406f82d696f..5a9c7d4f334d 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/folium/Manifest b/sci-geosciences/folium/Manifest
index 8793beb27bc3..960381edf33b 100644
--- a/sci-geosciences/folium/Manifest
+++ b/sci-geosciences/folium/Manifest
@@ -1,6 +1,6 @@
 AUX folium-0.15.1-gentoo.patch 281 BLAKE2B 1a2642e75865fbd0d03bbab2da133c1e205bec1f43fc7ac39c54ddfab330c4acc10da0d81be68a81d3da9937fd3e613f6c0f776b9fdb231c20fc7f66129cece2 SHA512 174145f6db6136c400f1ad0012f928bc042e683d5d564a67f1e2e0adfdb985fa0fb5cd05f04a355af3578dac727f0c06db5a815741ce58e684c46dc9891b1920
-DIST folium-0.17.0.tar.gz 8212314 BLAKE2B aac66b49fee5633e6c5d097094cc4ff21d835f87c5017384f2e39236aece1f4820c0dad80b87abcbce30ddb2a3c48332656b0ad07cecdd5b2dbf81c9329eb852 SHA512 2f45237064ea0bd07f95c53ab482bb33bd1786cd431237df23f1d2b9f5f063c43a0f590236b408d257e2567c16444651e9fe1a4ec9c13e6f4934a0330c7d86cc
 DIST folium-0.18.0.tar.gz 8193343 BLAKE2B d36bedfc8038bd71bc0f22ab0c998bab8b32f8e521c32a6a9b0f6f0cc8d1804310346d7531d83e96efc3f804de1eeef5e2ec851b67b9a5e79ab64d42d5410e60 SHA512 a37dfa47b5bd256298df151ad48d71dfeaf5170c6b4e02d28a3f73aa749cfaf931e4ee91110dd3d027f047d46f309111beeca52dfcfafebe5f38597421ecb3c2
-EBUILD folium-0.17.0.ebuild 1294 BLAKE2B 9e75a6abd14fb679d88c86bd2d4fe0f348d51725e2741978ce0e330b672065c403dc6b7cd86c9ddc469a952be971f70d3e81162517e8af029a84c5f78ac583db SHA512 5370b45b2bc43031a559e079be394d8f427958231965de6f7d5941af39b528bebb6386eb59c1dd1f89486f401d821d85fd825f4c950434e2039326101a887b50
+DIST folium-0.19.2.tar.gz 8193746 BLAKE2B 65a3a45748b9f42e6a76057b554e3759806912bbb4336848c25e5ddb7cf6f5d04f8a4e786ca400a99f28c2f8a02607d9dc9e5edb15770c158eecd4a0843806a8 SHA512 df932f599308105b0e2bb8db2bad35e25ed823c3ed34abc36d494a80e671f683c0d6debdf8d20fc22e5582e2072ccd8307707b5fdab0d62bc128898d6c795073
 EBUILD folium-0.18.0.ebuild 1294 BLAKE2B 9e75a6abd14fb679d88c86bd2d4fe0f348d51725e2741978ce0e330b672065c403dc6b7cd86c9ddc469a952be971f70d3e81162517e8af029a84c5f78ac583db SHA512 5370b45b2bc43031a559e079be394d8f427958231965de6f7d5941af39b528bebb6386eb59c1dd1f89486f401d821d85fd825f4c950434e2039326101a887b50
+EBUILD folium-0.19.2.ebuild 1203 BLAKE2B fa8627dd492d4bf09841a4ba4b9c9dbedc734ca2799a95d6a91364d6090b1e3e5395c42d5f1e480aba63ecb91971086b0085b1490cdd4c6448c8e347bac19296 SHA512 a2b2df3dd57ceb06080e6c55703a46fc2095656d938a45acfb515b3bd0b2104511254c5b84e32965135837b893ebebcfbeae1d9a1528189ac254b5c1ed72bdfb
 MISC metadata.xml 630 BLAKE2B a22785187ee548da6b47df938a5db21a6778d5bcb22988de11ba54d080dcc03e3702b7f0529dfc4de9fad12973e526af118bbd1b04dddd6f3ad3d7f0163f96e5 SHA512 7ad7009474c3a357a0e4c0b526aa66c96c8b91e39fe3fa3da1dbaf27564d4f15988f0898a13f77d8d93be6567c0533ddf6402279882ca4ea62da96051afe7209
diff --git a/sci-geosciences/folium/folium-0.17.0.ebuild b/sci-geosciences/folium/folium-0.19.2.ebuild
index 4aa2aa656206..fa0fbce0df38 100644
--- a/sci-geosciences/folium/folium-0.17.0.ebuild
+++ b/sci-geosciences/folium/folium-0.19.2.ebuild
@@ -35,14 +35,12 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
-src_prepare() {
-	rm -r tests/selenium || die # require chromedriver
-	rm tests/test_folium.py || die # require geopandas
-	rm tests/test_raster_layers.py || die # require xyzservices
-	rm tests/plugins/test_time_slider_choropleth.py || die # require geopandas
-	rm tests/test_repr.py || die # require geckodriver
-	default
-}
+EPYTEST_IGNORE=(
+	tests/selenium									# require chromedriver
+	tests/test_folium.py							# require geopandas
+	tests/plugins/test_time_slider_choropleth.py	# require geopandas
+	tests/test_repr.py								# require geckodriver
+)
 
 python_test() {
 	epytest -m 'not web'
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index 86692b7673db..935418800775 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -1,6 +1,8 @@
 AUX gpxsee-7.33.patch 332 BLAKE2B c0ccd7e75c0d99533fcc3a1ce582b59c739e36c203434ab5c491c5c70953adadec7beae0340aaecb76f0b92c10052f8398ff2597a226426c8b9f7222c2d812f3 SHA512 ff3e78d30793784ffc147f89c7558bc9b470935293416e961db744d6edd42bf096499e3aa199908614d547e48ef893b28c886cc61e4e5ee182abddabffd660fc
 DIST gpxsee-13.27.tar.gz 5639124 BLAKE2B f3e10b1580e6e96f106d789abf9273530a36f528e4971b430c4b83d0a056f065a08faca28d850a7983df7fc7cc5fcab1d564a88d4337ad7ea4c33b4e2b22579c SHA512 88ed97d6a6813385ce9194d7b18935f410fc69f25072f0a5de20ac19464a1be9ec7c28ac9de2533b3153bb6d43ab2f84428faef0c687d2dffbb39bad4df1c96b
 DIST gpxsee-13.32.tar.gz 5551655 BLAKE2B c04aca4c79202b32ca49e2e609e497cac4a92bff08a5b075fea0a8b3d1bbbed9dd5e6a1b5725ffe9a79cdce28b989333c49b0372ef518a1a467aa4ee287eda21 SHA512 2b607742bb0ee2f173721544e205fa98e25c2bf23349811a039a5fd24524edf7e9cba5b64733c7edaa0415bb4b22bf3c4362f9fff342aadf14afc9e1ecd35864
+DIST gpxsee-13.33.tar.gz 5557400 BLAKE2B b1aaf16567ab4f35120cf5dd43f9c29136f8dfe04ba85d4876ed135a5f84ebf3626aac9cb1c63cd7b732245a6fbb76bcedb3255d6157796a7a68c938f1da8d1e SHA512 9ae1c59ca9e3b1ceb36fb1923da7f599c6c3f11be05d789629a0a425c11a634cf5a98f78390fb5b0838f7da4e96cce807fe146d0125671d3567b17cbbf1ae9cb
 EBUILD gpxsee-13.27.ebuild 1516 BLAKE2B 179a4b5e2e643532a67ef8f1811fbc8b11c9211ddac19f86369aa77254642b6219405376f1d0df55964798b5b1ae1bf565d1a5f15074718aed694d22fed8a40b SHA512 b620e184a274283b9a77aed181ba2330172b201226924289d400a2e8af4366c9fa2c81659ef06111cb457415e0c034bf74758fc79449692fce8e87820558bfe5
 EBUILD gpxsee-13.32.ebuild 1519 BLAKE2B 6e5b819c750c803230a521b185ab02409a6b86a4838430414368c4713e67a56afa296e22850695fe62e4535a492d5ce8c766da6a9dbe11ef4dcf00e4690fbd43 SHA512 0e2e06ee44d67c61bf1177b17864b0813cacfc81bd4b9bcdc5372e71f346cb7f2e12a6bbf8825ac152cc320b032f0cec9ca130fcde94d4592a224b6b163d5f12
+EBUILD gpxsee-13.33.ebuild 1519 BLAKE2B 6e5b819c750c803230a521b185ab02409a6b86a4838430414368c4713e67a56afa296e22850695fe62e4535a492d5ce8c766da6a9dbe11ef4dcf00e4690fbd43 SHA512 0e2e06ee44d67c61bf1177b17864b0813cacfc81bd4b9bcdc5372e71f346cb7f2e12a6bbf8825ac152cc320b032f0cec9ca130fcde94d4592a224b6b163d5f12
 MISC metadata.xml 508 BLAKE2B da581bc3330fcebff61893ddcc75762fa4987f959cf6eaddb49a2f67a3071caf5e1aa5e1f9722fc493c13091146a70bbf5f7051d2961e4456c1aaf025182a77a SHA512 e895fdb3e558a75c1506206c5b0cf797f4ee14aa83c4e0853bec71c48298301cd7cc052853df64fc62c253543882cf878e03be864a93643456f5f117816faaa3
diff --git a/sci-geosciences/gpxsee/gpxsee-13.33.ebuild b/sci-geosciences/gpxsee/gpxsee-13.33.ebuild
new file mode 100644
index 000000000000..b754057f64d5
--- /dev/null
+++ b/sci-geosciences/gpxsee/gpxsee-13.33.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PLOCALES="ca cs da de en eo es fi fr hu it ko nb pl pt_BR ru sv tr uk zh_CN"
+inherit plocale qmake-utils xdg
+
+MY_PN="GPXSee"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files"
+HOMEPAGE="https://www.gpxsee.org/ https://github.com/tumic0/GPXSee"
+SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="qt6"
+
+RDEPEND="
+	qt6? (
+		dev-qt/qtbase:6
+		dev-qt/qtpositioning:6
+		dev-qt/qtserialport:6
+	)
+	!qt6? (
+		dev-qt/qtconcurrent:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtpositioning:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtserialport:5
+		dev-qt/qtsql:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	qt6? ( dev-qt/qttools:6 )
+	!qt6? ( dev-qt/linguist-tools:5 )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-7.33.patch )
+
+src_prepare() {
+	default
+
+	plocale_find_changes lang "${PN}_" '.ts'
+
+	rm_ts() {
+		sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro
+	}
+
+	plocale_for_each_disabled_locale rm_ts
+}
+
+src_compile() {
+	if use qt6; then
+		$(qt6_get_bindir)/lrelease gpxsee.pro || die "lrelease failed"
+		eqmake6 gpxsee.pro
+	else
+		$(qt5_get_bindir)/lrelease gpxsee.pro || die "lrelease failed"
+		eqmake5 gpxsee.pro
+	fi
+	emake
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	dodoc README.md
+}
diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest
index af178a97e239..c6a08cb3c643 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -1,10 +1,6 @@
-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-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.18.3-sharedir-pluginsdir.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-sharedir-pluginsdir.patch
deleted file mode 100644
index 46f5964e17cb..000000000000
--- a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-sharedir-pluginsdir.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/src/src.pro	2018-08-05 13:25:02.761849538 +0100
-+++ b/src/src.pro	2018-08-05 13:25:55.935846789 +0100
-@@ -155,8 +155,10 @@
-     isEmpty( LIBDIR ) {
-         LIBDIR = $${PREFIX}/lib${LIB_SUFFIX}
-     }
--
--    DEFINES += PLUGINS_DIR=$${LIBDIR}/merkaartor/plugins
-+    isEmpty( PLUGINS_DIR ){
-+	PLUGINS_DIR=$${LIBDIR}/merkaartor/plugins
-+    }
-+    DEFINES += PLUGINS_DIR=$${PLUGINS_DIR}
- 
-     target.path = $${PREFIX}/bin
-     SHARE_DIR = $${PREFIX}/share/merkaartor
-
---- a/src/src.pro	2018-08-05 16:20:33.759305219 +0100
-+++ b/src/src.pro	2018-08-05 16:20:53.094304220 +0100
-@@ -181,7 +181,7 @@
- 
- 
- 
--DEFINES += SHARE_DIR=$${SHARE_DIR}
-+DEFINES += SHARE_DIR=$${SHARE_DIR_PATH}
- INSTALLS += target
- 
- win32-msvc* {
-
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.19.0-exiv2-0.28.patch b/sci-geosciences/merkaartor/files/merkaartor-0.19.0-exiv2-0.28.patch
deleted file mode 100644
index 4f98b9a4fa36..000000000000
--- a/sci-geosciences/merkaartor/files/merkaartor-0.19.0-exiv2-0.28.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 1e20d2ccd743ea5f8c2358e4ae36fead8b9390fd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@krakonos.org>
-Date: Sat, 16 Jul 2022 12:41:33 +0200
-Subject: [PATCH] Replaced use of AutoPtr with std::unique_ptr in
- GeoImageDock.cpp.
-
----
- src/Docks/GeoImageDock.cpp | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/Docks/GeoImageDock.cpp b/src/Docks/GeoImageDock.cpp
-index 02b5cdc0..e2fa1601 100644
---- a/src/Docks/GeoImageDock.cpp
-+++ b/src/Docks/GeoImageDock.cpp
-@@ -457,7 +457,7 @@ void GeoImageDock::loadImages(QStringList fileNames)
-     Document *theDocument = Main->document();
-     MapView *theView = Main->view();
- 
--    Exiv2::Image::AutoPtr image;
-+    std::unique_ptr<Exiv2::Image> image;
-     Exiv2::ExifData exifData;
-     bool positionValid = false;
- 
-@@ -869,7 +869,7 @@ void GeoImageDock::saveImage()
- //    fn = QFileDialog::getSaveFileName(0, "Specify output filename", fn, tr("JPEG Images (*.jpg)"));
-     qDebug() << fn;
-     if (!fn.isEmpty()) {
--        Exiv2::Image::AutoPtr imageIn, imageOut;
-+        std::unique_ptr<Exiv2::Image> imageIn, imageOut;
-         Exiv2::ExifData exifData;
-         try {
-             imageIn = Exiv2::ImageFactory::open(usedTrackPoints.at(index).filename.toStdString());
-@@ -893,7 +893,7 @@ Coord GeoImageDock::getGeoDataFromImage(const QString & file)
- {
-     Coord pos;
-     double lat = 0.0, lon = 0.0;
--    Exiv2::Image::AutoPtr image;
-+    std::unique_ptr<Exiv2::Image> image;
-     Exiv2::ExifData exifData;
-     bool positionValid = false;
- 
-@@ -933,7 +933,7 @@ Coord GeoImageDock::getGeoDataFromImage(const QString & file)
- 
- void GeoImageDock::addGeoDataToImage(Coord position, const QString & file)
- {
--    Exiv2::Image::AutoPtr image;
-+    std::unique_ptr<Exiv2::Image> image;
- 
-     try {
-         image = Exiv2::ImageFactory::open(file.toStdString());
diff --git a/sci-geosciences/merkaartor/merkaartor-0.19.0-r1.ebuild b/sci-geosciences/merkaartor/merkaartor-0.19.0-r1.ebuild
deleted file mode 100644
index c959fecd8c1c..000000000000
--- a/sci-geosciences/merkaartor/merkaartor-0.19.0-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2023 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
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug exif gps libproxy webengine"
-
-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}"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.18.3-sharedir-pluginsdir.patch # downstream, bug 621826
-	"${FILESDIR}"/${P}-exiv2-0.28.patch # upstream git master, bug 906501
-)
-
-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
-	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="${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}"
-}