gentoo resync : 25.08.2020

3 files changed, 25 insertions, 28 deletions

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index df84b755cc4a..e4ccf404fd72 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,10 +1,10 @@
 AUX qgis-3.10.0-cmake-lib-suffix.patch 507 BLAKE2B f9a383f380a8e5375e062350cc81bef294b79705589f537a9a7a2054806df06550a54525e307cc1eec2ecb81340faaf595a706d3d504190d720efe638ef3e2fb SHA512 a21ff313e4d1768dc15ac7dae8901d7245efb30f3caf7f9c0dbd667647e96b282f3451e7f52c8168df23ba2e953832995d975805a8f8bc176d20bd0862d9a51d
 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.10.2.tar.bz2 101916273 BLAKE2B 4b5d424348609e8fd1822ea9594fb11d30ae060aff15d8d962a1b15a602c1bdf5d8a17976c5a487ded5e5764e7367b8024aa52f9620ba0ec57fb075426a3c9f2 SHA512 d2ba31a8b50e0fec901d89dba6ca8467a9e26033197e78c56caaf7cce6b9bb7a1617a75f8e6275356f921ba9e986611384ab77890a4d7f5911d632e42466bb9f
 DIST qgis-3.10.7.tar.bz2 102154692 BLAKE2B 9b54d542770f149eb3c413ef867a012e28e4121ff38114ef954131f55dea54cc8c0d4e65a5e8eac9098fb596af7b8d2f77ddfb2f8d0170d2e1a5b59569952151 SHA512 b10d81d24c7cfb8b285b6d9884dfe19ba33b032cd843d29b879159d203454fd359a669047b677baf515d92ce331ba66f59dc2466beae2048920b2c0da0c3d666
+DIST qgis-3.10.9.tar.bz2 102418680 BLAKE2B 53599dab784fc42b7a4505e13b1fd97cdb7c696bf1a004425ea0e7b88659b9af40f74b7107ef6103a138f4bc8886eda0a99a07a1c1466fb73c94d55ea39d8ea8 SHA512 91bba01db04094a194d1437a00276f076cd88d9ebcfe4792f20da8fb4339c984262e2bf79f666cf23af13081da358bbfb69bdff086e4988701c4431f53732275
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
-EBUILD qgis-3.10.2-r1.ebuild 5605 BLAKE2B 6a843e029a5428a3908d8029056b0dcf50b59417d3f0f3b0f0de269b049bae110d69d80c11d588c769b54539457bbdae425820d2c1438684db2a13e8875a2fd6 SHA512 a2ade40ebb1b8ed733af9b36c265cd9254a3b13d4f46a6ae0640f0786d760878d4bc6667c3c413f3f24b5880692c72b9254c564edbe01799a4864fa16bf757a8
-EBUILD qgis-3.10.7.ebuild 5447 BLAKE2B 63ac17c1c6e2ef62207d2674c38bde5ef0f89cecdd9acd745d5c3efe46291d38925e5d92141c051fab3080cd479b4cd13bcee052895c6b0f6bc58501b987d375 SHA512 479a56d2904d296df36f0b9b171a9127b89d677e6f87b761bd85b0872eb7ae585b4277be58d6e841c6d9b0ed4841b5d1da7f7a528924a027419380e588a83180
+EBUILD qgis-3.10.7.ebuild 5445 BLAKE2B f706ee24d324b05712d761b4bf2cf363bb0678d900b114f6b879908386eeda6da458df6c86d668f13bfb4208432b40b14e952fdae4d61df0a1de00e63fa8f3e4 SHA512 98d6a84452b8dcb44d35e2c87f0b9a00b29cae9630437b8320ecee06de8e14e0ad59008dfeb3f6b65c86bae0a461c157070a7a439cb8e44d0f0938a3e36de7e1
+EBUILD qgis-3.10.9.ebuild 5447 BLAKE2B 63ac17c1c6e2ef62207d2674c38bde5ef0f89cecdd9acd745d5c3efe46291d38925e5d92141c051fab3080cd479b4cd13bcee052895c6b0f6bc58501b987d375 SHA512 479a56d2904d296df36f0b9b171a9127b89d677e6f87b761bd85b0872eb7ae585b4277be58d6e841c6d9b0ed4841b5d1da7f7a528924a027419380e588a83180
 EBUILD qgis-9999.ebuild 5447 BLAKE2B 63ac17c1c6e2ef62207d2674c38bde5ef0f89cecdd9acd745d5c3efe46291d38925e5d92141c051fab3080cd479b4cd13bcee052895c6b0f6bc58501b987d375 SHA512 479a56d2904d296df36f0b9b171a9127b89d677e6f87b761bd85b0872eb7ae585b4277be58d6e841c6d9b0ed4841b5d1da7f7a528924a027419380e588a83180
 MISC metadata.xml 1413 BLAKE2B 63f664d32aa9df18e147346271d3fb1f49148848c7177cb22001962ecf1c32f69cc9758ddfabcbd3b8996f31a018dc1fb71a10d6d2e40ba79cad3e63c6ea6e75 SHA512 c1956fc3bb77b78d24547467fea5d71d2b22cd0f09be4b029f603952a7080c2f40ff00a7e45fc844774977978ad96e936de45296fae3d44aa93fda8f17598a99
diff --git a/sci-geosciences/qgis/qgis-3.10.7.ebuild b/sci-geosciences/qgis/qgis-3.10.7.ebuild
index 5009332eb58e..65bdc947394e 100644
--- a/sci-geosciences/qgis/qgis-3.10.7.ebuild
+++ b/sci-geosciences/qgis/qgis-3.10.7.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999 ]]; then
 else
 	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
 		examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 inherit cmake desktop python-single-r1 qmake-utils xdg
 
diff --git a/sci-geosciences/qgis/qgis-3.10.2-r1.ebuild b/sci-geosciences/qgis/qgis-3.10.9.ebuild
index cc6d86b4b702..5009332eb58e 100644
--- a/sci-geosciences/qgis/qgis-3.10.2-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.10.9.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="sqlite"
-QT_MIN_VER="5.9.4"
+QTMIN="5.9.4"
 
 if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999 ]]; then
 else
 	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
 		examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 inherit cmake desktop python-single-r1 qmake-utils xdg
 
@@ -26,9 +26,8 @@ IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
+BDEPEND="${PYTHON_DEPS}
+	>=dev-qt/linguist-tools-${QTMIN}:5
 	sys-devel/bison
 	sys-devel/flex
 "
@@ -39,26 +38,26 @@ COMMON_DEPEND="
 	dev-libs/expat
 	dev-libs/libzip:=
 	dev-libs/qtkeychain[qt5(+)]
-	>=dev-qt/designer-${QT_MIN_VER}:5
-	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
-	>=dev-qt/qtcore-${QT_MIN_VER}:5
-	>=dev-qt/qtgui-${QT_MIN_VER}:5
-	>=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
-	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
-	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
-	>=dev-qt/qtserialport-${QT_MIN_VER}:5
-	>=dev-qt/qtsvg-${QT_MIN_VER}:5
-	>=dev-qt/qtsql-${QT_MIN_VER}:5
-	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
-	>=dev-qt/qtxml-${QT_MIN_VER}:5
+	>=dev-qt/designer-${QTMIN}:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtcore-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+	>=dev-qt/qtpositioning-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtserialport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
 	media-gfx/exiv2:=
-	>=sci-libs/gdal-2.2.3:=[geos]
+	>=sci-libs/gdal-3.0.4:=[geos]
 	sci-libs/geos
 	sci-libs/libspatialindex:=
-	>=sci-libs/proj-4.9.3:=
+	>=sci-libs/proj-6.3.1:=
 	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
 	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
+	3d? ( >=dev-qt/qt3d-${QTMIN}:5 )
 	georeferencer? ( sci-libs/gsl:= )
 	grass? ( =sci-geosciences/grass-7*:= )
 	hdf5? ( sci-libs/hdf5:= )
@@ -74,7 +73,6 @@ COMMON_DEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/future[${PYTHON_MULTI_USEDEP}]
 			dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
 			dev-python/jinja[${PYTHON_MULTI_USEDEP}]
 			dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
@@ -92,12 +90,11 @@ COMMON_DEPEND="
 			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
 		')
 	)
-	qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
+	qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
 	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
 "
 DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qttest-${QT_MIN_VER}:5
-	python? ( ${PYTHON_DEPS} )
+	>=dev-qt/qttest-${QTMIN}:5
 "
 RDEPEND="${COMMON_DEPEND}
 	sci-geosciences/gpsbabel