gentoo christmass resync : 25.12.2020

16 files changed, 154 insertions, 325 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 4ffac79d38ab..e20de9f9dfb5 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/osm2pgsql/Manifest b/sci-geosciences/osm2pgsql/Manifest
index 9812efbdef23..79b8f6ba1a32 100644
--- a/sci-geosciences/osm2pgsql/Manifest
+++ b/sci-geosciences/osm2pgsql/Manifest
@@ -1,6 +1,10 @@
+AUX osm2pgsql-1.4.0-cmake_lua_version.patch 344 BLAKE2B 4edd5c655166104086c18cce8a33e8ef46adb94ce381a210f6d0d241af17acbe7cd27b2a4d5c28985faeae472f828f95fe11854c18db787f89f0624b4bf7c36b SHA512 47184a4cd60cd63dc4f2f72263cdc9c84a5f2e2d4b4f9e567fe3249113590f78894ec11ccab52d762611750e8cd331b56cb7ceeec5bd4dcde5c72ea53e20335c
 DIST osm2pgsql-0.96.0.tar.gz 1219163 BLAKE2B a89e40e74ea52bf46593e48dd1f9047b958b645ce38aeb554c930e2d9efdf4f0bb9b6fd7a9b209342d59ca8a0d3ada3023f14324bf8b02b060d8dfd987763528 SHA512 6c6bb00c17995b9a99975076ad3af35a99678a7780db144f7fdd1f5c856b777883f1b1dac7e1c3ca9a2a490d3774f62c8aa9f8742c955c377c28d5b827657372
 DIST osm2pgsql-1.3.0.tar.gz 2460451 BLAKE2B ac52523bf6d35a06528ad22a51465388e70baf9f94bb3664c39c301b429ff453370d9cd44549781e4ee50d698094ddfe83f0e39a7c3d6c01556ea95e10feaf75 SHA512 e643f3a1987ead36763c96d34b5dd7e170273b77a521106c21311dc7b01d2b34470b2e00e3214050f2cbdd3d89703a1827ee6c35928ed77cc7f35fc4e20331f3
+DIST osm2pgsql-1.4.0.tar.gz 2429430 BLAKE2B 5d93a159a87c9cb12d85be8b89377f720e0d94564574f70d6f3686b215a99250967655d0eeee3dcda2742fcab356ecf62de2b4bab384d69a641a06829c401388 SHA512 f0eaceb7f78087a58bba3bbfafbb9d6d70aecd4c3ba1cfb0ce784116b52a57c69855c1a7459cce8b963c87955de269ca320cf4a3934b6ff5ad29b7554e07dd9e
 EBUILD osm2pgsql-0.96.0.ebuild 930 BLAKE2B 7a5b8e4557fc0aaa76bbb34abc4dc431e4bf7a8d115fa457a538b0ab124f81cb246d0f340abe7d5366ad63cad42fe875aac570bf3c0cc89357863b0edef3d1de SHA512 3741889922dd3cbebadf15083b56a8a6611c9cec3402f36367f2fc1c510538e05856d8b610e1da06c69f077e67533a909a7a6136cbd5a06c472362c2135b6585
-EBUILD osm2pgsql-1.3.0.ebuild 864 BLAKE2B 333b7649760e69a2fc371faf51c6c7440732ddf882fb08ef10f6b163574de63a402fe36c5a94f1587e7d5e8f4ac3a70cdbeb31fe3ed501f7ea1e05feb9d61e11 SHA512 f4ecde80b4f06ef8594a32410db8848e79e431bbb229f6331aa7d191d71a50d3be6f3c9bba7c747f87b187c2c8d365ea8ced95140e7b66b2c81601901f13b966
-EBUILD osm2pgsql-99999999.ebuild 846 BLAKE2B 83328ed6e17271591e806e74c6f5053903b61c8606258fa2b0687ef3bb91392a1c885b290a2fc1dc36cb115f455f8b987f942bd200491e275afc4e3fb9296883 SHA512 c1953aeb701043590b204f830a190a3a482173bef58c8796156d6ce2f6f62e44bc11078a5cecf67f2dc744c486f5419411aa5e83888a45a3192cbad5aee8d95e
+EBUILD osm2pgsql-1.3.0.ebuild 863 BLAKE2B d1f900a329faf5043d5a52f578ee582503698dccb7bb0233524f8f2e449c27295ed7b26dfb67bec7660955baebc4b79c69eb761aad90cac6804ad8f4a914e6d2 SHA512 3cf9f89c17e050457445d4cc2972d6de38eb20bdb7aee2ae2e98ed9c335551b8ddbb7d8baa311fd87371ad8997e1416765bb02abc9eb7ae1190ff9162aedb236
+EBUILD osm2pgsql-1.4.0-r100.ebuild 1276 BLAKE2B 4988850b6d4b1814b491cc20e709e217ab7b9d5ec6401da434079fe527c39547b7a1f38c8f936bbc21c489d5413e750ea34c4b51158221f9b5ca1555c3f428ca SHA512 b702dc3c08bb55e20940ed7d276f0a20e7cb1ba69b057274f39cc6f00cf91ba2b4717bee0002aa8d7e7c2d0ae584ffd9777b6b1fd43b0bb221a7440d5461e5b7
+EBUILD osm2pgsql-1.4.0.ebuild 864 BLAKE2B 333b7649760e69a2fc371faf51c6c7440732ddf882fb08ef10f6b163574de63a402fe36c5a94f1587e7d5e8f4ac3a70cdbeb31fe3ed501f7ea1e05feb9d61e11 SHA512 f4ecde80b4f06ef8594a32410db8848e79e431bbb229f6331aa7d191d71a50d3be6f3c9bba7c747f87b187c2c8d365ea8ced95140e7b66b2c81601901f13b966
+EBUILD osm2pgsql-99999999.ebuild 1258 BLAKE2B 5986238e26804a4320bb6e291d68bd112926cb84e64b0046b66f5d7b5f6c2928769214119cb2bb9eccd36a97463b67a110e8b41774c2d4178d481b7616e18073 SHA512 b556c71c67187a100b960968c4d6c7c9ab3a0f46f56dc1949e753c92a8e93fdd41eaece622d135156e290ec9eb5280593d7398acd0b072daa9b42ce65e0f0b89
 MISC metadata.xml 793 BLAKE2B d74e55e2b2cd946a65cba5bd3f0ba953edf8528d6d30037fbd69640d7379ced6e07a0e81e57f02f2e49afde4a55b07c21cb5430de1d42a682e10bfd964ab7939 SHA512 2f76c2c5946179da213b0bf193e89f110c46818ab77a4dea41df1fc78d1527ace8ff81a3887ebb47e6ee0a799e0ee037364e22bfdd5ce72feb765209b6a3fcd6
diff --git a/sci-geosciences/osm2pgsql/files/osm2pgsql-1.4.0-cmake_lua_version.patch b/sci-geosciences/osm2pgsql/files/osm2pgsql-1.4.0-cmake_lua_version.patch
new file mode 100644
index 000000000000..d7f35345ef52
--- /dev/null
+++ b/sci-geosciences/osm2pgsql/files/osm2pgsql-1.4.0-cmake_lua_version.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -185,7 +185,7 @@
+         include_directories(SYSTEM ${LUAJIT_INCLUDE_DIR})
+         set(HAVE_LUAJIT 1)
+     else()
+-        find_package(Lua REQUIRED)
++        find_package(Lua ${LUA_VERSION} EXACT REQUIRED)
+         include_directories(SYSTEM ${LUA_INCLUDE_DIR})
+     endif()
+     set(HAVE_LUA 1)
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild
index 736fa938d656..0e3affca363d 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+lua luajit"
 
 COMMON_DEPEND="
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild
new file mode 100644
index 000000000000..ac4caa5df5a2
--- /dev/null
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit cmake lua-single
+
+DESCRIPTION="Converts OSM planet.osm data to a PostgreSQL/PostGIS database"
+HOMEPAGE="https://osm2pgsql.org/"
+SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+lua"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	app-arch/bzip2
+	dev-db/postgresql:=
+	dev-libs/expat
+	sci-libs/proj:=
+	sys-libs/zlib
+	lua? ( ${LUA_DEPS} )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-db/postgis
+"
+
+# Tries to connect to local postgres server and other shenanigans
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.0-cmake_lua_version.patch
+)
+
+src_configure() {
+	# Setting WITH_LUAJIT without "if use lua" guard is safe, upstream
+	# CMakeLists.txt only evaluates it if WITH_LUA is true.
+	local mycmakeargs=(
+		-DWITH_LUA=$(usex lua)
+		-DWITH_LUAJIT=$(usex lua_single_target_luajit)
+		-DBUILD_TESTS=OFF
+	)
+	# To prevent the "unused variable" QA warning
+	if use lua && ! use lua_single_target_luajit; then
+		mycmakeargs+=( -DLUA_VERSION="$(lua_get_version)" )
+	fi
+	cmake_src_configure
+}
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0.ebuild
new file mode 100644
index 000000000000..736fa938d656
--- /dev/null
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Converts OSM planet.osm data to a PostgreSQL/PostGIS database"
+HOMEPAGE="https://osm2pgsql.org/"
+SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+lua luajit"
+
+COMMON_DEPEND="
+	app-arch/bzip2
+	dev-db/postgresql:=
+	dev-libs/expat
+	sci-libs/proj:=
+	sys-libs/zlib
+	lua? ( dev-lang/lua:0= )
+	luajit? ( dev-lang/luajit:= )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-db/postgis
+"
+
+# Tries to connect to local postgres server and other shenanigans
+RESTRICT="test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_LUA=$(usex lua)
+		-DWITH_LUAJIT=$(usex luajit)
+		-DBUILD_TESTS=OFF
+	)
+	cmake_src_configure
+}
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
index 1d3ae4858241..96c27e44b3cd 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=7
 
-inherit cmake git-r3
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit cmake git-r3 lua-single
 
 EGIT_REPO_URI="https://github.com/openstreetmap/${PN}.git"
 
@@ -14,7 +16,8 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="+lua luajit"
+IUSE="+lua"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 
 COMMON_DEPEND="
 	app-arch/bzip2
@@ -22,8 +25,7 @@ COMMON_DEPEND="
 	dev-libs/expat
 	sci-libs/proj:=
 	sys-libs/zlib
-	lua? ( dev-lang/lua:0= )
-	luajit? ( dev-lang/luajit:= )
+	lua? ( ${LUA_DEPS} )
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
@@ -35,11 +37,21 @@ RDEPEND="${COMMON_DEPEND}
 # Tries to connect to local postgres server and other shenanigans
 RESTRICT="test"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.0-cmake_lua_version.patch
+)
+
 src_configure() {
+	# Setting WITH_LUAJIT without "if use lua" guard is safe, upstream
+	# CMakeLists.txt only evaluates it if WITH_LUA is true.
 	local mycmakeargs=(
 		-DWITH_LUA=$(usex lua)
-		-DWITH_LUAJIT=$(usex luajit)
+		-DWITH_LUAJIT=$(usex lua_single_target_luajit)
 		-DBUILD_TESTS=OFF
 	)
+	# To prevent the "unused variable" QA warning
+	if use lua && ! use lua_single_target_luajit; then
+		mycmakeargs+=( -DLUA_VERSION="$(lua_get_version)" )
+	fi
 	cmake_src_configure
 }
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 5a3e569f77f6..0c69a59171d4 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,13 +1,12 @@
 AUX qgis-3.16.0-cmake-lib-suffix.patch 507 BLAKE2B 0a8943fe06f4065d5c0b1cf7797ecedb9fed40616121cbfd9f0c97568dd7da0b7c3e6a526b9408b6268b20988fe7a216d94cc394c01a693fcac6b321f7c7ca01 SHA512 5014fb01e7caa56f5fcb8a7f6b81e1f99acac50e7edff524071808f2b145f87dd440ce8c4897b7c781cb8e30c5ee3a873a6d977c6ecd65a54dc3157de8b0bfd1
 AUX qgis-3.16.1-default-qmldir.patch 899 BLAKE2B b5f573445c80cf991864320d80644aacdfc28095f3657839dec0c084544d44405857a2cf1f644c8a47ac271cf51953f861cde285f37e30c490623fbbf96f7470 SHA512 4d794cdc730c55d59163bce7d1c23cab7ab3c384e09dccfe3b541d12ef365a180035fd51d998128c59c493b6039fff13dafe392c5935bbdedb39c22c05748a5c
 AUX qgis-3.16.1-featuresummary.patch 905 BLAKE2B 318239edfc14562cccf0a0c79e330fc24c03f8468d4df3a3ece0286f2448df275d117afc0ed63f8d7c682cebef84a62fda3a992a9e4746f37fe1e8b52e82ecf7 SHA512 c3b563fcfac199756f4f8212cf1f0ceb301c7d4cc751d2b9b1b6f3f8d69d88ae1d6cab33c952a2ff15bdbe33a4151f93eaf9308a486ca330fd45c533f9fa3b36
-AUX qgis-3.16.1-find-qt5linguisttools.patch 923 BLAKE2B 2753e58338432736be05e6ac64a46638d417db2145f084a97b8c3371752ecb8d639df6ec0dd519533ec39444f098cf43716a8f1b4c516681fe2be34f73affef3 SHA512 b42de8f7c23fb0010e77ae873fb88304b3f70506317203d0aee170a7340ef9244ea0c4e39cd850ef57f2324e0c125a7c6c77f84e3835e5f59f2bdcb3f6a78612
 AUX qgis-3.4.7-default-qmldir.patch 862 BLAKE2B 6b56317dc738004451c827b577125716eda662437a4d8469c055483b0e8c0014d0bc35e071b50a6e1a23138e8b6822df226d4d80b18f789976ff922a35311200 SHA512 59fee5497129856a15bf573d2682a4c837df044ccb44bc914fb64ad6e27d321251723131ae3ab5ffffdce876be954f2fd4db52931cd3fb6fbeb2f38a41419133
 AUX qgis-3.4.7-featuresummary.patch 865 BLAKE2B 6a875895f355c17232458e1d2e33613dd40637aeb3dd3bf3c47f30497b9c15a1e4f7c377d57ed4fefbd20b02245bb701f20ebc2a5c604df5dee600050a35edba SHA512 718dd5aca408ca34da3b5478b5d6788a1c4737304c64b8b4ac212a28fbcf1c55373fcc31a2901802461d7298935c507229c1208d0fa242a5dc5d474f3d0a292f
 DIST qgis-3.16.0.tar.bz2 113238659 BLAKE2B 42bdf8d0d69b28c20aa0decd79883c3b83d2ff9aa9d7633866b6c7d624ad20cb602beeca0e22585077c3d0ceba791e51b81ba221bc305c9bd2ebff71a4ea4bd4 SHA512 c87959a6412f85b6e4d30d4677e0e0914fd9a1009348c8bfe6063d7e1a9416f0a33ae63ded15273d8edde26ae0e6c32ba4d62d83c33c2c6251c444360dc47d10
-DIST qgis-3.16.1.tar.bz2 113943328 BLAKE2B 0c0f9c0a038e87d7f16e66a00cd6844db27b9238ef4f42cf2504a5e498843d4f93bde42542cf7bedcc7f58303daa4fdc7d9cb9e1954958a0de29e294e502a461 SHA512 2df53731468b734c95ad32cd8ecc930dd113b1084c4d3971aba2aaf58b473dc8e0dd204d979b74ee79d443cd95e4f91c51d071eb645254142a76d7a4d0bc3dc8
+DIST qgis-3.16.2.tar.bz2 114086615 BLAKE2B 85196072b792b5731dcbc85cfaaae1768e91d16bfdaa2190cfb6063753953b6ab0e8b17b0d3f5334259dffd5b8fb5be6b54a28ca9856dc4fc4079dee483888f6 SHA512 93582e54ff403ea05672a81be9e866b8f1fa9335e467723a087615511b8403c4a1d8447d5a433d0799c382b6cc99fb2f18cc9c6685ed6dc83cabb4d13a00f033
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
 EBUILD qgis-3.16.0-r1.ebuild 5355 BLAKE2B b6a9239578ab1f6363dfdd78ac5141a0890a70902bd4ac76f58311a8f57fed841bee5f85368ec620902e17e88cd46dc734d49b722db9522c81de46329c81ccf0 SHA512 c11682d7c7555ba9078344aa3d9cf0624f173dcc151395ae2ae9c765d4baebedbe90d15bcecde01bd48a80d74a4e3609f33dd28bf572b097e5f317ad220cc2de
-EBUILD qgis-3.16.1.ebuild 5399 BLAKE2B 1a5e4ce95087ac6642dce7a90820485aa3c70339a63b3630c7bb6c9d90afff7f2d2637cfb5e5af32c99d95c7fc7c193b9d6c5cd672f91f7349c1ecca0fc7c5f0 SHA512 1da717908534b7cf47c04f4fbbdd848731b35ee1320d7a5419f3597bd0169b4f7d03155917bb77d5c69868cb1d0024b45baa0b0657fcfff269ee33de90f2315c
+EBUILD qgis-3.16.2.ebuild 5367 BLAKE2B 0deb1db585db8c6fbd7077449f5e93588433622b4f6ea01eefa609abf7eb88af77de371e446003301bd665f231a456f6a60d6d2c1bc0a211dc43df1219007dd7 SHA512 7418323687ea5230a18eeffc8426caaa35123531e36ff0110f1bc6d2db13aea82873e18614a02b722ce221e46b8ad7bbc5bf78fb21ceb438f120f75083f2ca58
 EBUILD qgis-9999.ebuild 5291 BLAKE2B 8efe5c7bef0d5136907571d17737b8a721fc12c7cbcd6328fe44d9232b0f25c3cc89670f0fd55e9b620803bb82692466d9e2b230bdcdf0a0dd1d6cce6c1638c1 SHA512 c721f235aeabb56cb4b5c03d5a35f269cd949665443ac0633f59fac7c29f44acb744cbc37855a700c857c7e1dcc62876283d2c2c23bb1f19cb4f959cbec9f675
 MISC metadata.xml 1386 BLAKE2B f5e9142fe248a2482ca29fe1b03aa585fb5b2eb4f0e1a1f0bf8d4a643034fffb9d37c3595170c9fea7b3b2dc0dcbec0e94dcc0bef2af6ea2da29a48d6880a7c3 SHA512 0ef09ee19b881d9ecc04884bc568e17013cb6794c666e75993031f798dca5f80b60b3c9ecded1183e0ac004a65ab0cf4f5af973132991e0b5a51674a6daab0ce
diff --git a/sci-geosciences/qgis/files/qgis-3.16.1-find-qt5linguisttools.patch b/sci-geosciences/qgis/files/qgis-3.16.1-find-qt5linguisttools.patch
deleted file mode 100644
index 01f602694395..000000000000
--- a/sci-geosciences/qgis/files/qgis-3.16.1-find-qt5linguisttools.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From db2fee6c199a34507e5742b2360d594a5bf67b18 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 23 Nov 2020 22:04:50 +0100
-Subject: [PATCH] Fix Qt5LinguistTools detection/lrelease binary location
-
-Correctly find the Qt5 module that provides the path to Qt5-based lrelease.
-Available since >= Qt-5.3.1 which is well below the current minimum for QGIS.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- i18n/CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/i18n/CMakeLists.txt b/i18n/CMakeLists.txt
-index a836e5cae5..7d7f79da89 100644
---- a/i18n/CMakeLists.txt
-+++ b/i18n/CMakeLists.txt
-@@ -1,4 +1,5 @@
--find_program(QT_LRELEASE_EXECUTABLE NAMES lrelease-qt5 lrelease)
-+find_package(Qt5LinguistTools REQUIRED)
-+set(QT_LRELEASE_EXECUTABLE Qt5::lrelease)
- 
- macro(ADD_TRANSLATION_FILES _sources )
-     foreach (_current_FILE ${ARGN})
--- 
-2.29.2
-
diff --git a/sci-geosciences/qgis/qgis-3.16.1.ebuild b/sci-geosciences/qgis/qgis-3.16.2.ebuild
index 2bc3ef993a96..c27cdfcd10c6 100644
--- a/sci-geosciences/qgis/qgis-3.16.1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.2.ebuild
@@ -107,9 +107,8 @@ PATCHES=(
 	# git master
 	"${FILESDIR}/${PN}-3.16.0-cmake-lib-suffix.patch"
 	# TODO upstream
-	"${FILESDIR}/${P}-featuresummary.patch"
-	"${FILESDIR}/${P}-default-qmldir.patch"
-	"${FILESDIR}/${P}-find-qt5linguisttools.patch"
+	"${FILESDIR}/${PN}-3.16.1-featuresummary.patch"
+	"${FILESDIR}/${PN}-3.16.1-default-qmldir.patch"
 )
 
 pkg_setup() {
diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
index c6cc953b7f6d..6624ca8ea8b1 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -1,8 +1,3 @@
-AUX FindPROJ4.cmake 5695 BLAKE2B 916e3cb12a6dfb8428bfa97d74dc34b4b357935cc6be1e07444cbed86ace926348c0b94a0061cde1edd1ab0dfd330b57dabd7cc9be5317c761c307f61fce3c9a SHA512 d110ae4081ba75cdcee0feac9967a8f59218f12cd497a48434e6289a2fa1b04116a84582191ff45b8eda4af2dd4b6611b5035422af392653e3548e1829f2acd6
-AUX qmapshack-positioning.patch 482 BLAKE2B cb7d7b8f74a23828503c76e0cf3c7120af1aa412512461ae0e3e4a051ed7d8b89f9254a2397767b6ff56f1cbeefb1a6347f546222e991946dae3235da194d774 SHA512 245524903ec5db0da9d1874f0b5c0e2a318f6b955970da2645cff6dc1b21adb0565728021feca2cd236af9d2e60325e0bce1bb8084390d073200c5bad65d7175
-AUX qmapshack-qt-5.15.patch 3026 BLAKE2B f5f15429c198235658ba726b9122f72000c6f947d4dd4de1fd871e04148640152ca5caccd662d64da787cf4eef5841431b7e1d6d1e5e0dd310c099b14dac61d7 SHA512 7475aa269e2e502e8df2c2aa7d4f993f720284a8a190f09388581560755d9e18f1082b4e99106e934b5e02ef60fb7b8c620b02e650243b770dbe520367c2ebbb
-DIST qmapshack-1.14.0.tar.gz 12541988 BLAKE2B 146df8ab42bd5a5249207b88bf1a17b4ba20706c8114cc059b847d0b32c9d53919f931d778402a10dd62f0d86948bff8eefd29684c433c1d4bfd7e2ce019ce55 SHA512 675a72a79839ad0b96fc0717ad7eca43c4ce331645ba3ad1325f9bf114abcf2ecd164eeab0c41775fe84aa626fc67272cd9c869047f57b225ff493f66881ff99
 DIST qmapshack-1.15.1.tar.gz 46265787 BLAKE2B b690d1e0ac698cee6969ef3cf35dd3b6102dd292993695fed81416a2bfe396e88bd8004b03a7eeb5df30c817331b83c55452f96200bd6c45145e86eb163ca988 SHA512 c01fc75fd6466a97e82b8f9822dfada87ededcec53e62a3dc42e36463c195ad4ba16c19a4748d48b26a0e957303f2724ec88eecb5d64676c74dbdaeebfadf17a
-EBUILD qmapshack-1.14.0.ebuild 908 BLAKE2B f9c544be44c80f5aa9186e3d0671419968e8db35dea918730de52a1e086d487a5326f1fc5ac3b133b684bf0bba9a6e9e6c87de093b2afe5aff192cff3adcd0be SHA512 5c10b51323cb326cc35e73774ce287866cef7794c324dbe3730590db1563c6fe4e7ed7cd5601bc907b012e92dcba864d05907b681bc4f83c73b9252c3fa02d9a
-EBUILD qmapshack-1.15.1.ebuild 1008 BLAKE2B a323d85a6f25f40c7fff1edd752ec70fd4c0befd8b8f209d4558867a9cd54308a7a19e0abc47c4b8fe40748bcb2bca13819d47a5930d2430550711429e391ae1 SHA512 abeddc1526a64a1a683f6acbcd4c891e96f6cfcf452fc1566027b8f0d690e70261e882066234e7fc1e77af009f2d279227accb479aa796d656ebcc510cc7f09a
+EBUILD qmapshack-1.15.1.ebuild 1013 BLAKE2B ed4db907b36a3478ce2c8031c4031ccf034b74307bfd479cb99c7e7ac6a88b27b3fe8c0198e111d1bfc175c04ca214f5d0f79b6a39f0ea21c808179cd0ef60ca SHA512 a41a4ae9a4462a5f69b3d68b1ebc7f538d94d9baea0bfa12d78db0359d2ec41f34b03b94d23ac70b2dbb0e351e5cd2e2f47211bc510709c6fc160343641f488e
 MISC metadata.xml 772 BLAKE2B b1bd146b3ae624d365dd366cef81f3eaf37c8220ddd4eeb1f64916275f6520f3bd2d458a339bdea85d0f13cde14b3038d98c32f6265204e3aa1e22424f9dbfd2 SHA512 03cd1cf6d4e0b5a420b4301ffb1077f2dda9e023572dedd1c56ba4574ab4460c125d63bb5c7475b66b023ff15dc0b9c4cfc8479218366c935108e89850ed5d4d
diff --git a/sci-geosciences/qmapshack/files/FindPROJ4.cmake b/sci-geosciences/qmapshack/files/FindPROJ4.cmake
deleted file mode 100644
index 093deaa79aed..000000000000
--- a/sci-geosciences/qmapshack/files/FindPROJ4.cmake
+++ /dev/null
@@ -1,152 +0,0 @@
-#.rst:
-# FindPROJ4
-# --------
-#
-# Find the proj includes and library.
-#
-# IMPORTED Targets
-# ^^^^^^^^^^^^^^^^
-#
-# This module defines :prop_tgt:`IMPORTED` target ``PROJ4::proj``,
-# if Proj.4 has been found.
-#
-# Result Variables
-# ^^^^^^^^^^^^^^^^
-#
-# This module defines the following variables:
-#
-# ::
-#
-#   PROJ4_INCLUDE_DIRS   - where to find proj_api.h, etc.
-#   PROJ4_LIBRARIES      - List of libraries when using libproj.
-#   PROJ4_FOUND          - True if libproj found.
-#
-# ::
-#
-#   PROJ4_VERSION        - The version of libproj found (x.y.z)
-#   PROJ4_VERSION_MAJOR  - The major version of libproj
-#   PROJ4_VERSION_MINOR  - The minor version of libproj
-#   PROJ4_VERSION_PATCH  - The patch version of libproj
-#   PROJ4_VERSION_TWEAK  - always 0
-#   PROJ4_VERSION_COUNT  - The number of version components, always 3
-#
-# Hints
-# ^^^^^
-#
-# A user may set ``PROJ4_ROOT`` to a libproj installation root to tell this
-# module where to look exclusively.
-
-#=============================================================================
-# Copyright 2016 Kai Pastor
-#
-#
-# This file was derived from CMake 3.5's module FindZLIB.cmake
-# which has the following terms:
-#
-# Copyright 2001-2011 Kitware, Inc.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright notice,
-#   this list of conditions and the following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-#
-# * The names of Kitware, Inc., the Insight Consortium, or the names of
-#   any consortium members, or of any contributors, may not be used to
-#   endorse or promote products derived from this software without
-#   specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS''
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#=============================================================================
-
-# Search PROJ4_ROOT exclusively if it is set.
-if(PROJ4_ROOT)
-  set(_PROJ4_SEARCH PATHS ${PROJ4_ROOT} NO_DEFAULT_PATH)
-else()
-  set(_PROJ4_SEARCH)
-endif()
-
-find_path(PROJ4_INCLUDE_DIR NAMES proj_api.h ${_PROJ4_SEARCH} PATH_SUFFIXES include)
-mark_as_advanced(PROJ4_INCLUDE_DIR)
-
-if(PROJ4_INCLUDE_DIR AND EXISTS "${PROJ4_INCLUDE_DIR}/proj_api.h")
-    file(STRINGS "${PROJ4_INCLUDE_DIR}/proj_api.h" PROJ4_H REGEX "^#define PJ_VERSION [0-9]+$")
-
-    string(REGEX REPLACE "^.*PJ_VERSION ([0-9]).*$" "\\1" PROJ4_VERSION_MAJOR "${PROJ4_H}")
-    string(REGEX REPLACE "^.*PJ_VERSION [0-9]([0-9]).*$" "\\1" PROJ4_VERSION_MINOR  "${PROJ4_H}")
-    string(REGEX REPLACE "^.*PJ_VERSION [0-9][0-9]([0-9]).*$" "\\1" PROJ4_VERSION_PATCH "${PROJ4_H}")
-    set(PROJ4_VERSION "${PROJ4_VERSION_MAJOR}.${PROJ4_VERSION_MINOR}.${PROJ4_VERSION_PATCH}")
-    set(PROJ4_VERSION_COUNT 3)
-endif()
-
-# Allow PROJ4_LIBRARY to be set manually, as the location of the proj library
-if(NOT PROJ4_LIBRARY)
-  set(PROJ4_NAMES proj)
-  set(PROJ4_NAMES_DEBUG projd)
-  if(WIN32 AND DEFINED PROJ4_VERSION_MAJOR AND DEFINED PROJ4_VERSION_MINOR)
-	  list(APPEND PROJ4_NAMES proj_${PROJ4_VERSION_MAJOR}_${PROJ4_VERSION_MINOR})
-	  list(APPEND PROJ4_NAMES projd_${PROJ4_VERSION_MAJOR}_${PROJ4_VERSION_MINOR})
-  endif()
-  find_library(PROJ4_LIBRARY_RELEASE NAMES ${PROJ4_NAMES} ${_PROJ4_SEARCH} PATH_SUFFIXES lib)
-  find_library(PROJ4_LIBRARY_DEBUG NAMES ${PROJ4_NAMES_DEBUG} ${_PROJ4_SEARCH} PATH_SUFFIXES lib)
-  include(SelectLibraryConfigurations)
-  select_library_configurations(PROJ4)
-endif()
-
-# handle the QUIETLY and REQUIRED arguments and set PROJ4_FOUND to TRUE if
-# all listed variables are TRUE
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(PROJ4
-  REQUIRED_VARS
-    PROJ4_LIBRARY
-    PROJ4_INCLUDE_DIR
-  VERSION_VAR
-    PROJ4_VERSION
-)
-
-if(PROJ4_FOUND)
-    set(PROJ4_INCLUDE_DIRS ${PROJ4_INCLUDE_DIR})
-
-    if(NOT PROJ4_LIBRARIES)
-      set(PROJ4_LIBRARIES ${PROJ4_LIBRARY})
-    endif()
-
-    if(NOT TARGET PROJ4::proj)
-      add_library(PROJ4::proj UNKNOWN IMPORTED)
-      set_target_properties(PROJ4::proj PROPERTIES
-        INTERFACE_INCLUDE_DIRECTORIES "${PROJ4_INCLUDE_DIRS}")
-
-      if(PROJ4_LIBRARY_RELEASE)
-        set_property(TARGET PROJ4::proj APPEND PROPERTY
-          IMPORTED_CONFIGURATIONS RELEASE)
-        set_target_properties(PROJ4::proj PROPERTIES
-          IMPORTED_LOCATION_RELEASE "${PROJ4_LIBRARY_RELEASE}")
-      endif()
-
-      if(PROJ4_LIBRARY_DEBUG)
-        set_property(TARGET PROJ4::proj APPEND PROPERTY
-          IMPORTED_CONFIGURATIONS DEBUG)
-        set_target_properties(PROJ4::proj PROPERTIES
-          IMPORTED_LOCATION_DEBUG "${PROJ4_LIBRARY_DEBUG}")
-      endif()
-
-      if(NOT PROJ4_LIBRARY_RELEASE AND NOT PROJ4_LIBRARY_DEBUG)
-        set_property(TARGET PROJ4::proj APPEND PROPERTY
-          IMPORTED_LOCATION "${PROJ4_LIBRARY}")
-      endif()
-    endif()
-endif()
diff --git a/sci-geosciences/qmapshack/files/qmapshack-positioning.patch b/sci-geosciences/qmapshack/files/qmapshack-positioning.patch
deleted file mode 100644
index c0f13fc884e5..000000000000
--- a/sci-geosciences/qmapshack/files/qmapshack-positioning.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -U2 qmapshack-1.13.0.orig/CMakeLists.txt qmapshack-1.13.0/CMakeLists.txt
---- qmapshack-1.13.0.orig/CMakeLists.txt	2019-04-08 18:08:10.000000000 +0200
-+++ qmapshack-1.13.0/CMakeLists.txt	2019-05-06 23:19:15.330580322 +0200
-@@ -131,4 +131,5 @@
- find_package(Qt5LinguistTools       REQUIRED)
- find_package(Qt5PrintSupport        REQUIRED)
-+find_package(Qt5Positioning         REQUIRED)
- find_package(Qt5UiTools             REQUIRED)
- find_package(Qt5Network             REQUIRED)
diff --git a/sci-geosciences/qmapshack/files/qmapshack-qt-5.15.patch b/sci-geosciences/qmapshack/files/qmapshack-qt-5.15.patch
deleted file mode 100644
index 08d8946f69d4..000000000000
--- a/sci-geosciences/qmapshack/files/qmapshack-qt-5.15.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -U3 -r qmapshack-V_1.15.0.orig/src/qmapshack/gis/wpt/CGisItemWpt.cpp qmapshack-V_1.15.0/src/qmapshack/gis/wpt/CGisItemWpt.cpp
---- qmapshack-V_1.15.0.orig/src/qmapshack/gis/wpt/CGisItemWpt.cpp	2020-06-14 17:22:49.000000000 +0700
-+++ qmapshack-V_1.15.0/src/qmapshack/gis/wpt/CGisItemWpt.cpp	2020-06-22 17:41:58.776553045 +0700
-@@ -38,6 +38,7 @@
- 
- #include <QtWidgets>
- #include <QtXml>
-+#include <QPainterPath>
- 
- IGisItem::key_t CGisItemWpt::keyUserFocus;
- QMap<searchProperty_e, CGisItemWpt::fSearch> CGisItemWpt::keywordLambdaMap;
-diff -U3 -r qmapshack-V_1.15.0.orig/src/qmapshack/helpers/CDraw.cpp qmapshack-V_1.15.0/src/qmapshack/helpers/CDraw.cpp
---- qmapshack-V_1.15.0.orig/src/qmapshack/helpers/CDraw.cpp	2020-06-14 17:22:49.000000000 +0700
-+++ qmapshack-V_1.15.0/src/qmapshack/helpers/CDraw.cpp	2020-06-22 17:45:43.431558615 +0700
-@@ -24,6 +24,7 @@
- #include <QImage>
- #include <QPointF>
- #include <QtMath>
-+#include <QPainterPath>
- 
- QPen CDraw::penBorderBlue(QColor(10, 10, 150, 220), 2);
- QPen CDraw::penBorderGray(Qt::lightGray, 2);
-diff -U3 -r qmapshack-V_1.15.0.orig/src/qmapshack/map/CMapIMG.cpp qmapshack-V_1.15.0/src/qmapshack/map/CMapIMG.cpp
---- qmapshack-V_1.15.0.orig/src/qmapshack/map/CMapIMG.cpp	2020-06-14 17:22:49.000000000 +0700
-+++ qmapshack-V_1.15.0/src/qmapshack/map/CMapIMG.cpp	2020-06-22 17:47:21.413561045 +0700
-@@ -33,6 +33,7 @@
- #include "units/IUnit.h"
- 
- #include <QtWidgets>
-+#include <QPainterPath>
- 
- #undef DEBUG_SHOW_SECT_DESC
- #undef DEBUG_SHOW_TRE_DATA
-diff -U3 -r qmapshack-V_1.15.0.orig/src/qmapshack/mouse/IMouseSelect.cpp qmapshack-V_1.15.0/src/qmapshack/mouse/IMouseSelect.cpp
---- qmapshack-V_1.15.0.orig/src/qmapshack/mouse/IMouseSelect.cpp	2020-06-14 17:22:49.000000000 +0700
-+++ qmapshack-V_1.15.0/src/qmapshack/mouse/IMouseSelect.cpp	2020-06-22 17:43:31.338555340 +0700
-@@ -23,6 +23,7 @@
- #include "mouse/IScrOpt.h"
- 
- #include <QtWidgets>
-+#include <QPainterPath>
- 
- IMouseSelect::IMouseSelect(CGisDraw *gis, CCanvas *canvas, CMouseAdapter *mouse)
-     : IMouse(gis, canvas, mouse)
-diff -U3 -r qmapshack-V_1.15.0.orig/src/qmaptool/helpers/CDraw.cpp qmapshack-V_1.15.0/src/qmaptool/helpers/CDraw.cpp
---- qmapshack-V_1.15.0.orig/src/qmaptool/helpers/CDraw.cpp	2020-06-14 17:22:49.000000000 +0700
-+++ qmapshack-V_1.15.0/src/qmaptool/helpers/CDraw.cpp	2020-06-22 17:49:14.789563856 +0700
-@@ -24,6 +24,7 @@
- #include <QImage>
- #include <QPointF>
- #include <QtMath>
-+#include <QPainterPath>
- 
- QPen CDraw::penBorderBlue(QColor(10,10,150,220),2);
- QPen CDraw::penBorderGray(Qt::lightGray,2);
-diff -U3 -r qmapshack-V_1.15.0.orig/src/qmaptool/overlay/COverlayCutMap.cpp qmapshack-V_1.15.0/src/qmaptool/overlay/COverlayCutMap.cpp
---- qmapshack-V_1.15.0.orig/src/qmaptool/overlay/COverlayCutMap.cpp	2020-06-14 17:22:49.000000000 +0700
-+++ qmapshack-V_1.15.0/src/qmaptool/overlay/COverlayCutMap.cpp	2020-06-22 17:50:08.109565178 +0700
-@@ -24,6 +24,8 @@
- 
- #include <functional>
- #include <QtWidgets>
-+#include <QPainterPath>
-+
- using std::bind;
- 
- static inline qreal sqr(qreal a)
diff --git a/sci-geosciences/qmapshack/qmapshack-1.14.0.ebuild b/sci-geosciences/qmapshack/qmapshack-1.14.0.ebuild
deleted file mode 100644
index acb33f65883f..000000000000
--- a/sci-geosciences/qmapshack/qmapshack-1.14.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils xdg
-
-DESCRIPTION="GPS mapping utility"
-HOMEPAGE="https://github.com/Maproom/qmapshack/wiki"
-SRC_URI="https://github.com/Maproom/${PN}/archive/V_1.14.0.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RDEPEND="dev-qt/qtwebengine:5[widgets]
-	dev-qt/qtdeclarative:5[widgets]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtpositioning:5
-	dev-qt/qtdbus:5
-	dev-qt/qttest:5
-	dev-qt/designer:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5
-	dev-libs/quazip
-	>=sci-geosciences/routino-3.1.1
-	sci-libs/gdal
-	>=sci-libs/proj-5.0.0
-	sci-libs/alglib"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
-
-PATCHES=( "${FILESDIR}"/${PN}-positioning.patch )
-S="${WORKDIR}"/${PN}-V_${PV}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	cp "${FILESDIR}"/FindPROJ4.cmake cmake/Modules/ || die
-}
diff --git a/sci-geosciences/qmapshack/qmapshack-1.15.1.ebuild b/sci-geosciences/qmapshack/qmapshack-1.15.1.ebuild
index 2f083ca83c76..da07127922af 100644
--- a/sci-geosciences/qmapshack/qmapshack-1.15.1.ebuild
+++ b/sci-geosciences/qmapshack/qmapshack-1.15.1.ebuild
@@ -8,31 +8,35 @@ inherit cmake xdg
 DESCRIPTION="GPS mapping utility"
 HOMEPAGE="https://github.com/Maproom/qmapshack/wiki"
 SRC_URI="https://github.com/Maproom/${PN}/archive/V_${PV}.tar.gz -> ${P}.tar.gz"
+
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
-RDEPEND="dev-qt/qtwebengine:5[widgets]
-	dev-qt/qtdeclarative:5[widgets]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtdbus:5
-	dev-qt/qttest:5
+
+RDEPEND="
+	dev-libs/quazip
 	dev-qt/designer:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5[widgets]
+	dev-qt/qthelp:5
 	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtprintsupport:5
 	dev-qt/qtsql:5
-	dev-qt/qthelp:5
-	dev-libs/quazip
+	dev-qt/qttest:5
+	dev-qt/qtwebengine:5[widgets]
 	>=sci-geosciences/routino-3.1.1
+	sci-libs/alglib
 	sci-libs/gdal
 	>=sci-libs/proj-6.0.0:=
-	sci-libs/alglib"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
 
 S="${WORKDIR}"/${PN}-V_${PV}
 
 src_prepare() {
-	eapply "${S}"/FindPROJ4.patch
+	eapply FindPROJ4.patch
 	cmake_src_prepare
 	xdg_environment_reset
 }