[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andrew Ammerlaan]

commit: 1184e58af796c9ae0e95211df49290ff47b3f1d8
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Thu Apr 11 13:57:50 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Apr 11 13:57:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1184e58a

sci-geosciences/qgis: add missing usedep

Closes: https://bugs.gentoo.org/929134
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-geosciences/qgis/qgis-3.36.1.ebuild | 2 +-
 sci-geosciences/qgis/qgis-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.36.1.ebuild 
b/sci-geosciences/qgis/qgis-3.36.1.ebuild
index 76add61ac820..f0cc12843e19 100644
--- a/sci-geosciences/qgis/qgis-3.36.1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.36.1.ebuild
@@ -50,7 +50,7 @@ COMMON_DEPEND="
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtgui:5
-   dev-qt/qtmultimedia:5
+   dev-qt/qtmultimedia:5[widgets]
dev-qt/qtnetwork:5[ssl]
dev-qt/qtpositioning:5
dev-qt/qtprintsupport:5

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-.ebuild
index 1318c361a34f..1c5971b726cc 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ b/sci-geosciences/qgis/qgis-.ebuild
@@ -50,7 +50,7 @@ COMMON_DEPEND="
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtgui:5
-   dev-qt/qtmultimedia:5
+   dev-qt/qtmultimedia:5[widgets]
dev-qt/qtnetwork:5[ssl]
dev-qt/qtpositioning:5
dev-qt/qtprintsupport:5

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andrew Ammerlaan]

commit: 21035cc535fb3513a8d9126daf0c3f49a0e7d715
Author: Marco Genasci  gmail  com>
AuthorDate: Wed Feb 21 06:56:59 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Apr 11 12:42:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21035cc5

sci-geosciences/qgis: add missing rdep sci-libs/gdal[spatialite,sqlite], add 
3.36.1

Co-authored-by: Andrew Ammerlaan  gentoo.org>
Signed-off-by: Marco Genasci  gmail.com>
Closes: https://bugs.gentoo.org/893950
Closes: https://bugs.gentoo.org/918437
Closes: https://bugs.gentoo.org/925126
Closes: https://github.com/gentoo/gentoo/pull/35458
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-geosciences/qgis/Manifest  |  1 +
 .../qgis/{qgis-.ebuild => qgis-3.36.1.ebuild}  | 18 +++---
 sci-geosciences/qgis/qgis-.ebuild  | 16 +---
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 67d8a7fa6983..e2761b3b0e7a 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,2 +1,3 @@
 DIST qgis-3.28.10.tar.bz2 159289420 BLAKE2B 
9ae7d2b8e8c55b69f8bf93c5ace3ff86dbbed838b3b2d3bbd09e4229402cc4268e710f9f6be20b98a60d75c39199c851d00293e2e67b410b3aa3b909717839f0
 SHA512 
00032ae91927c0a293133cffa44eb7b963eea43814d762c13b3281169bc26eb2122eda06b9edc2110424ea29d0f73456e092f2d801392eec1d453ab15576ec56
+DIST qgis-3.36.1.tar.bz2 171472398 BLAKE2B 
1bcd657d1bb715566975ec5aa5bff5a6f282b025c578370d1112a53d00865e18828343ec644f7bb9cff24922e50070c361cae93246f067df4566a4cbd629349b
 SHA512 
e6c6cd458bf9ead5ff42dd51a7c80c6fff66fe04e1618265fccff706a5e60189d8819dc61479a2f2b23f00664c91304d9891ddbaedc4cadf2b9cfd0a6af4e273
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-3.36.1.ebuild
similarity index 95%
copy from sci-geosciences/qgis/qgis-.ebuild
copy to sci-geosciences/qgis/qgis-3.36.1.ebuild
index c1a65d6983fa..76add61ac820 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ b/sci-geosciences/qgis/qgis-3.36.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="sqlite"
 
 # We only package the LTS releases right now
@@ -25,7 +25,7 @@ HOMEPAGE="https://www.qgis.org/;
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal 
polar postgres python qml serial test"
+IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle 
pdal polar postgres python qml test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
mapserver? ( python )
@@ -50,15 +50,17 @@ COMMON_DEPEND="
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtgui:5
+   dev-qt/qtmultimedia:5
dev-qt/qtnetwork:5[ssl]
dev-qt/qtpositioning:5
dev-qt/qtprintsupport:5
+   dev-qt/qtserialport:5
dev-qt/qtsql:5
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
media-gfx/exiv2:=
-   >=sci-libs/gdal-3.0.4:=[geos]
+   >=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite]
sci-libs/geos
sci-libs/libspatialindex:=
>=sci-libs/proj-4.9.3:=
@@ -89,7 +91,7 @@ COMMON_DEPEND="
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/owslib[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
-   
dev-python/PyQt5[designer,gui,network,positioning,printsupport,sql,svg,widgets,${PYTHON_USEDEP}]
+   
dev-python/PyQt5[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]
dev-python/pytz[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
@@ -100,7 +102,6 @@ COMMON_DEPEND="
')
)
qml? ( dev-qt/qtdeclarative:5 )
-   serial? ( dev-qt/qtserialport:5 )
 "
 DEPEND="${COMMON_DEPEND}
dev-qt/qttest:5
@@ -112,6 +113,7 @@ BDEPEND="${PYTHON_DEPS}
dev-qt/linguist-tools:5
app-alternatives/yacc
app-alternatives/lex
+   doc? ( app-text/doxygen )
test? (
$(python_gen_cond_dep '
dev-python/PyQt5[${PYTHON_USEDEP},testlib]
@@ -154,7 +156,7 @@ src_configure() {
-DPEDANTIC=OFF
-DUSE_CCACHE=OFF
-DWITH_ANALYSIS=ON
-   -DWITH_APIDOC=OFF
+   -DWITH_APIDOC=$(usex doc)
-DWITH_GUI=ON
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: ddad82e4be5662f13ba7d2a58e638128cd4dc8da
Author: Eli Schwartz  gmail  com>
AuthorDate: Thu Mar 14 21:13:21 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 14 21:43:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddad82e4

sci-geosciences/qgis: mark as LTO-unsafe, strict-aliasing unsafe

Closes: https://bugs.gentoo.org/862660
Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/qgis-3.28.10.ebuild | 10 +-
 sci-geosciences/qgis/qgis-.ebuild| 10 +-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.28.10.ebuild 
b/sci-geosciences/qgis/qgis-3.28.10.ebuild
index 6659f9219aed..6b2233260c1e 100644
--- a/sci-geosciences/qgis/qgis-3.28.10.ebuild
+++ b/sci-geosciences/qgis/qgis-3.28.10.ebuild
@@ -18,7 +18,7 @@ else
examples? ( 
https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> 
qgis_sample_data-2.8.14.tar.gz )"
KEYWORDS="amd64 ~x86"
 fi
-inherit cmake python-single-r1 virtualx xdg
+inherit cmake flag-o-matic python-single-r1 virtualx xdg
 
 DESCRIPTION="User friendly Geographic Information System"
 HOMEPAGE="https://www.qgis.org/;
@@ -137,6 +137,14 @@ src_prepare() {
 }
 
 src_configure() {
+   # -Werror=strict-aliasing
+   # https://bugs.gentoo.org/862660
+   # https://github.com/qgis/QGIS/issues/56859
+   #
+   # Do not trust with LTO either
+   append-flags -fno-strict-aliasing
+   filter-lto
+
local mycmakeargs=(
-DQGIS_MANUAL_SUBDIR=share/man/
-DQGIS_LIB_SUBDIR=$(get_libdir)

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-.ebuild
index debd8230b8bd..c1a65d6983fa 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ b/sci-geosciences/qgis/qgis-.ebuild
@@ -18,7 +18,7 @@ else
examples? ( 
https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> 
qgis_sample_data-2.8.14.tar.gz )"
KEYWORDS="~amd64 ~x86"
 fi
-inherit cmake python-single-r1 virtualx xdg
+inherit cmake flag-o-matic python-single-r1 virtualx xdg
 
 DESCRIPTION="User friendly Geographic Information System"
 HOMEPAGE="https://www.qgis.org/;
@@ -136,6 +136,14 @@ src_prepare() {
 }
 
 src_configure() {
+   # -Werror=strict-aliasing
+   # https://bugs.gentoo.org/862660
+   # https://github.com/qgis/QGIS/issues/56859
+   #
+   # Do not trust with LTO either
+   append-flags -fno-strict-aliasing
+   filter-lto
+
local mycmakeargs=(
-DQGIS_MANUAL_SUBDIR=share/man/
-DQGIS_LIB_SUBDIR=$(get_libdir)

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit: 52ceac17970365e89d461501d5215625cf02ee5a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Sep 26 19:29:51 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Sep 26 19:53:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52ceac17

sci-geosciences/qgis: drop 3.28.6, 3.28.9

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-geosciences/qgis/Manifest   |   2 -
 sci-geosciences/qgis/qgis-3.28.6.ebuild | 272 ---
 sci-geosciences/qgis/qgis-3.28.9.ebuild | 273 
 3 files changed, 547 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index c9da5c5aba8f..67d8a7fa6983 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,2 @@
 DIST qgis-3.28.10.tar.bz2 159289420 BLAKE2B 
9ae7d2b8e8c55b69f8bf93c5ace3ff86dbbed838b3b2d3bbd09e4229402cc4268e710f9f6be20b98a60d75c39199c851d00293e2e67b410b3aa3b909717839f0
 SHA512 
00032ae91927c0a293133cffa44eb7b963eea43814d762c13b3281169bc26eb2122eda06b9edc2110424ea29d0f73456e092f2d801392eec1d453ab15576ec56
-DIST qgis-3.28.6.tar.bz2 158638644 BLAKE2B 
2613022c0cf2f9da86c195ba83d110d5825c6347fc45b4e953b44dee1ad8fde1541e51670e3a15a0f6c3f5158d7a7f84544bf5ab4e956d78e68523c04af1204f
 SHA512 
4b1f39bb690173e8f8bb394e293e074ed748f18a6d108110bebbcb11305d230c1706013d05bb04d027dc2e06405228323904a33601586f79c22b402ec3987336
-DIST qgis-3.28.9.tar.bz2 159516017 BLAKE2B 
2f1e19ff407ad430bef5a6696eb46dd25013634f8e3760312ec3e706aaea322427a4ae2be13b9b7888ba95d5d4c7f8de75d71a195a2078577e09e5d5f415542b
 SHA512 
d3c30ab375c0e92573c4e6d1f193cbea932d8aa5f19aea2f177335c00ba63481dd67fd0a8bbc3586a882ae8ebcba698d0c222e7a3d0aaf75e99649ea404fe784
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.28.6.ebuild 
b/sci-geosciences/qgis/qgis-3.28.6.ebuild
deleted file mode 100644
index 1a561cc37a44..
--- a/sci-geosciences/qgis/qgis-3.28.6.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite"
-
-# We only package the LTS releases right now
-# We could package more but would ideally only stabilise the LTS ones
-# at least.
-
-if [[ ${PV} == ** ]]; then
-   EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
-   inherit git-r3
-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"
-fi
-inherit cmake python-single-r1 virtualx xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/;
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle 
pdal polar postgres python qml serial test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-   mapserver? ( python )
-   test? ( postgres )
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="!test? ( test )"
-
-# At some point the dependency on qwtpolar should be
-# replaced with a dependency on qwt[polar]. Currently
-# it does not build with qwt-6.2[polar] though.
-COMMON_DEPEND="
-   app-crypt/qca:2[qt5(+),ssl]
-   >=dev-db/spatialite-4.2.0
-   dev-db/sqlite:3
-   dev-libs/expat
-   dev-libs/libzip:=
-   dev-libs/protobuf:=
-   dev-libs/qtkeychain[qt5(+)]
-   dev-qt/designer:5
-   dev-qt/qtconcurrent:5
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5[ssl]
-   dev-qt/qtpositioning:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtsql:5
-   dev-qt/qtsvg:5
-   dev-qt/qtwidgets:5
-   dev-qt/qtxml:5
-   media-gfx/exiv2:=
-   >=sci-libs/gdal-3.0.4:=[geos]
-   sci-libs/geos
-   sci-libs/libspatialindex:=
-   >=sci-libs/proj-4.9.3:=
-   sys-libs/zlib
-   >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
-   >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-   3d? ( dev-qt/qt3d:5 )
-   georeferencer? ( sci-libs/gsl:= )
-   grass? ( sci-geosciences/grass:= )
-   hdf5? ( sci-libs/hdf5:= )
-   mapserver? ( dev-libs/fcgi )
-   netcdf? ( sci-libs/netcdf:= )
-   opencl? ( virtual/opencl )
-   oracle? (
-   dev-db/oracle-instantclient:=
-   sci-libs/gdal:=[oracle]
-   )
-   pdal? ( sci-libs/pdal:= )
-   polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
-   postgres? ( dev-db/postgresql:= )
-   python? (
-   ${PYTHON_DEPS}
-

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Arthur Zamarin]

commit: 9a55cc05444fab69cc5127b8adc926b7e44d07bc
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Sep 18 19:53:36 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Sep 18 19:53:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a55cc05

sci-geosciences/qgis: Stabilize 3.28.10 amd64, #911210

Signed-off-by: Arthur Zamarin  gentoo.org>

 sci-geosciences/qgis/qgis-3.28.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.28.10.ebuild 
b/sci-geosciences/qgis/qgis-3.28.10.ebuild
index ab7e8a81f77d..0b05c62dcfab 100644
--- a/sci-geosciences/qgis/qgis-3.28.10.ebuild
+++ b/sci-geosciences/qgis/qgis-3.28.10.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == ** ]]; 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 python-single-r1 virtualx xdg
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/, sci-geosciences/qgis/files/

[Andreas Sturmlechner]

commit: 9782ee2b120840acc4bc75d9cd6a9231d2a17c0e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Aug 22 19:09:49 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Aug 23 07:55:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9782ee2b

sci-geosciences/qgis: add 3.28.10

Closes: https://bugs.gentoo.org/912846
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-geosciences/qgis/Manifest  |   1 +
 .../qgis/files/qgis-3.28.10-protobuf-23.patch  |  27 ++
 sci-geosciences/qgis/qgis-3.28.10.ebuild   | 276 +
 3 files changed, 304 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 2a47cdc347cd..c9da5c5aba8f 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,4 @@
+DIST qgis-3.28.10.tar.bz2 159289420 BLAKE2B 
9ae7d2b8e8c55b69f8bf93c5ace3ff86dbbed838b3b2d3bbd09e4229402cc4268e710f9f6be20b98a60d75c39199c851d00293e2e67b410b3aa3b909717839f0
 SHA512 
00032ae91927c0a293133cffa44eb7b963eea43814d762c13b3281169bc26eb2122eda06b9edc2110424ea29d0f73456e092f2d801392eec1d453ab15576ec56
 DIST qgis-3.28.6.tar.bz2 158638644 BLAKE2B 
2613022c0cf2f9da86c195ba83d110d5825c6347fc45b4e953b44dee1ad8fde1541e51670e3a15a0f6c3f5158d7a7f84544bf5ab4e956d78e68523c04af1204f
 SHA512 
4b1f39bb690173e8f8bb394e293e074ed748f18a6d108110bebbcb11305d230c1706013d05bb04d027dc2e06405228323904a33601586f79c22b402ec3987336
 DIST qgis-3.28.9.tar.bz2 159516017 BLAKE2B 
2f1e19ff407ad430bef5a6696eb46dd25013634f8e3760312ec3e706aaea322427a4ae2be13b9b7888ba95d5d4c7f8de75d71a195a2078577e09e5d5f415542b
 SHA512 
d3c30ab375c0e92573c4e6d1f193cbea932d8aa5f19aea2f177335c00ba63481dd67fd0a8bbc3586a882ae8ebcba698d0c222e7a3d0aaf75e99649ea404fe784
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/files/qgis-3.28.10-protobuf-23.patch 
b/sci-geosciences/qgis/files/qgis-3.28.10-protobuf-23.patch
new file mode 100644
index ..db76ec041d1f
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-3.28.10-protobuf-23.patch
@@ -0,0 +1,27 @@
+From 3754e386b38e84e50fffde5bab00af0512eb62ba Mon Sep 17 00:00:00 2001
+From: Blottiere Paul 
+Date: Thu, 27 Jul 2023 06:20:26 +0200
+Subject: [PATCH] Fix build on Arch with recent version of protobuf
+
+---
+ CMakeLists.txt | 7 ++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e43125b6a39b..7008b2bde246 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -370,7 +370,12 @@ if(WITH_CORE)
+ message (SEND_ERROR "sqlite3 dependency was not found!")
+   endif()
+ 
+-  find_package(Protobuf REQUIRED)   # for decoding of vector tiles in MVT 
format
++  find_package(Protobuf CONFIG)
++  find_package(Protobuf REQUIRED)
++  if((${Protobuf_VERSION} GREATER 4.23) OR (${Protobuf_VERSION} EQUAL 4.23))
++set(Protobuf_LITE_LIBRARY protobuf::libprotobuf-lite)
++  endif()
++
+   message(STATUS "Found Protobuf: ${Protobuf_LIBRARIES}")
+   if (NOT Protobuf_PROTOC_EXECUTABLE)
+ message (SEND_ERROR "Protobuf library's 'protoc' tool was not found!")

diff --git a/sci-geosciences/qgis/qgis-3.28.10.ebuild 
b/sci-geosciences/qgis/qgis-3.28.10.ebuild
new file mode 100644
index ..ab7e8a81f77d
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.28.10.ebuild
@@ -0,0 +1,276 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="sqlite"
+
+# We only package the LTS releases right now
+# We could package more but would ideally only stabilise the LTS ones
+# at least.
+
+if [[ ${PV} == ** ]]; then
+   EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
+   inherit git-r3
+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"
+fi
+inherit cmake python-single-r1 virtualx xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/;
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle 
pdal polar postgres python qml serial test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   mapserver? ( python )
+   test? ( postgres )
+"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="!test? ( test )"
+
+# At some point the dependency on qwtpolar should be
+# replaced with a dependency on qwt[polar]. Currently
+# it does not build with qwt-6.2[polar] though.
+COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/files/, sci-geosciences/qgis/

[Andreas Sturmlechner]

commit: 5b60343d2fd6009b5d91251c91a91414c7cdf6bf
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jul 25 10:14:01 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jul 25 10:25:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b60343d

sci-geosciences/qgis: add 3.28.9, fix build with >=exiv2-0.28

Minor  syncing.

Closes: https://bugs.gentoo.org/906470
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-geosciences/qgis/Manifest  |  1 +
 .../qgis/files/qgis-3.28.9-exiv2-0.28.patch| 41 ++
 .../qgis/{qgis-.ebuild => qgis-3.28.9.ebuild}  | 22 ++--
 sci-geosciences/qgis/qgis-.ebuild  |  8 ++---
 4 files changed, 55 insertions(+), 17 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 5bd5fba6dce6..2a47cdc347cd 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,2 +1,3 @@
 DIST qgis-3.28.6.tar.bz2 158638644 BLAKE2B 
2613022c0cf2f9da86c195ba83d110d5825c6347fc45b4e953b44dee1ad8fde1541e51670e3a15a0f6c3f5158d7a7f84544bf5ab4e956d78e68523c04af1204f
 SHA512 
4b1f39bb690173e8f8bb394e293e074ed748f18a6d108110bebbcb11305d230c1706013d05bb04d027dc2e06405228323904a33601586f79c22b402ec3987336
+DIST qgis-3.28.9.tar.bz2 159516017 BLAKE2B 
2f1e19ff407ad430bef5a6696eb46dd25013634f8e3760312ec3e706aaea322427a4ae2be13b9b7888ba95d5d4c7f8de75d71a195a2078577e09e5d5f415542b
 SHA512 
d3c30ab375c0e92573c4e6d1f193cbea932d8aa5f19aea2f177335c00ba63481dd67fd0a8bbc3586a882ae8ebcba698d0c222e7a3d0aaf75e99649ea404fe784
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/files/qgis-3.28.9-exiv2-0.28.patch 
b/sci-geosciences/qgis/files/qgis-3.28.9-exiv2-0.28.patch
new file mode 100644
index ..b41ba70003c1
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-3.28.9-exiv2-0.28.patch
@@ -0,0 +1,41 @@
+From 4de207e0ca26067146ac58133e64c17fdf755c6a Mon Sep 17 00:00:00 2001
+From: Antonio Rojas 
+Date: Sun, 9 Jul 2023 10:01:49 +0200
+Subject: [PATCH] Fix build with exiv2 0.28
+
+(cherry picked from commit 32f5418fc4f7bb2ee986dee1824ff2989c113a94)
+---
+ src/core/raster/qgsexiftools.cpp | 8 
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/core/raster/qgsexiftools.cpp 
b/src/core/raster/qgsexiftools.cpp
+index 1fbd6a84a8c..f64e07e9165 100644
+--- a/src/core/raster/qgsexiftools.cpp
 b/src/core/raster/qgsexiftools.cpp
+@@ -94,7 +94,11 @@ QVariant decodeExifData( const QString , 
Exiv2::ExifData::const_iterator 
+   case Exiv2::signedLong:
+   case Exiv2::unsignedLongLong:
+   case Exiv2::signedLongLong:
++#if EXIV2_TEST_VERSION (0, 28, 0)
++val = QVariant::fromValue( it->toUint32() );
++#else
+ val = QVariant::fromValue( it->toLong() );
++#endif
+ break;
+ 
+   case Exiv2::tiffDouble:
+@@ -108,7 +112,11 @@ QVariant decodeExifData( const QString , 
Exiv2::ExifData::const_iterator 
+   case Exiv2::signedByte:
+   case Exiv2::tiffIfd:
+   case Exiv2::tiffIfd8:
++#if EXIV2_TEST_VERSION (0, 28, 0)
++val = QVariant::fromValue( static_cast< int >( it->toUint32() ) );
++#else
+ val = QVariant::fromValue( static_cast< int >( it->toLong() ) );
++#endif
+ break;
+ 
+   case Exiv2::date:
+-- 
+2.41.0
+

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-3.28.9.ebuild
similarity index 96%
copy from sci-geosciences/qgis/qgis-.ebuild
copy to sci-geosciences/qgis/qgis-3.28.9.ebuild
index ff95ee431f21..9150ce1f55e8 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ b/sci-geosciences/qgis/qgis-3.28.9.ebuild
@@ -25,7 +25,7 @@ HOMEPAGE="https://www.qgis.org/;
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal 
polar postgres python qml serial test"
+IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle 
pdal polar postgres python qml serial test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
mapserver? ( python )
@@ -53,16 +53,16 @@ COMMON_DEPEND="
dev-qt/qtnetwork:5[ssl]
dev-qt/qtpositioning:5
dev-qt/qtprintsupport:5
-   dev-qt/qtsvg:5
dev-qt/qtsql:5
+   dev-qt/qtsvg:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
media-gfx/exiv2:=
>=sci-libs/gdal-3.0.4:=[geos]
sci-libs/geos
sci-libs/libspatialindex:=
-   sys-libs/zlib
>=sci-libs/proj-4.9.3:=
+   sys-libs/zlib
>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
3d? ( dev-qt/qt3d:5 )
@@ -83,18 +83,13 @@ COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit: d88d9e717f119b799033ce00622996d84dd8d877
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jul  9 11:57:21 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jul  9 12:04:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d88d9e71

sci-geosciences/qgis: drop 3.28.2

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-geosciences/qgis/Manifest   |   1 -
 sci-geosciences/qgis/qgis-3.28.2.ebuild | 272 
 2 files changed, 273 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 22593c224ed0..5bd5fba6dce6 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,2 @@
-DIST qgis-3.28.2.tar.bz2 158641485 BLAKE2B 
fbf121e9761135bcf511f55e84153e98b3fe7142887ac45a314bdc18f37ddd695ff3a117a087b842678a76f40927c591bf235a14fd4a8057ce70509f342b5bcf
 SHA512 
287de9041fe1ad55059904ecd99e3ac3a172c566faafd3d113b21e07f63b01afc2536391365dd372baa328fa5976aea6cfbcbc1030e8c61dee8f3a3f409724ad
 DIST qgis-3.28.6.tar.bz2 158638644 BLAKE2B 
2613022c0cf2f9da86c195ba83d110d5825c6347fc45b4e953b44dee1ad8fde1541e51670e3a15a0f6c3f5158d7a7f84544bf5ab4e956d78e68523c04af1204f
 SHA512 
4b1f39bb690173e8f8bb394e293e074ed748f18a6d108110bebbcb11305d230c1706013d05bb04d027dc2e06405228323904a33601586f79c22b402ec3987336
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.28.2.ebuild 
b/sci-geosciences/qgis/qgis-3.28.2.ebuild
deleted file mode 100644
index 1a561cc37a44..
--- a/sci-geosciences/qgis/qgis-3.28.2.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite"
-
-# We only package the LTS releases right now
-# We could package more but would ideally only stabilise the LTS ones
-# at least.
-
-if [[ ${PV} == ** ]]; then
-   EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
-   inherit git-r3
-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"
-fi
-inherit cmake python-single-r1 virtualx xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/;
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle 
pdal polar postgres python qml serial test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-   mapserver? ( python )
-   test? ( postgres )
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="!test? ( test )"
-
-# At some point the dependency on qwtpolar should be
-# replaced with a dependency on qwt[polar]. Currently
-# it does not build with qwt-6.2[polar] though.
-COMMON_DEPEND="
-   app-crypt/qca:2[qt5(+),ssl]
-   >=dev-db/spatialite-4.2.0
-   dev-db/sqlite:3
-   dev-libs/expat
-   dev-libs/libzip:=
-   dev-libs/protobuf:=
-   dev-libs/qtkeychain[qt5(+)]
-   dev-qt/designer:5
-   dev-qt/qtconcurrent:5
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5[ssl]
-   dev-qt/qtpositioning:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtsql:5
-   dev-qt/qtsvg:5
-   dev-qt/qtwidgets:5
-   dev-qt/qtxml:5
-   media-gfx/exiv2:=
-   >=sci-libs/gdal-3.0.4:=[geos]
-   sci-libs/geos
-   sci-libs/libspatialindex:=
-   >=sci-libs/proj-4.9.3:=
-   sys-libs/zlib
-   >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
-   >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-   3d? ( dev-qt/qt3d:5 )
-   georeferencer? ( sci-libs/gsl:= )
-   grass? ( sci-geosciences/grass:= )
-   hdf5? ( sci-libs/hdf5:= )
-   mapserver? ( dev-libs/fcgi )
-   netcdf? ( sci-libs/netcdf:= )
-   opencl? ( virtual/opencl )
-   oracle? (
-   dev-db/oracle-instantclient:=
-   sci-libs/gdal:=[oracle]
-   )
-   pdal? ( sci-libs/pdal:= )
-   polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
-   postgres? ( dev-db/postgresql:= )
-   python? (
-   ${PYTHON_DEPS}
-   >=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}]
-   $(python_gen_cond_dep '
-   dev-python/jinja[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/owslib[${PYTHON_USEDEP}]
-   dev-python/pygments[${PYTHON_USEDEP}]
-   

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Arthur Zamarin]

commit: 30260a92d43e43cf5e3c09deb619c64c0839481b
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jul  8 17:27:49 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jul  8 17:27:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30260a92

sci-geosciences/qgis: Stabilize 3.28.6 amd64, #906648

Signed-off-by: Arthur Zamarin  gentoo.org>

 sci-geosciences/qgis/qgis-3.28.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.28.6.ebuild 
b/sci-geosciences/qgis/qgis-3.28.6.ebuild
index 5d1ba6c270f3..1a561cc37a44 100644
--- a/sci-geosciences/qgis/qgis-3.28.6.ebuild
+++ b/sci-geosciences/qgis/qgis-3.28.6.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == ** ]]; 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 python-single-r1 virtualx xdg
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit: 81c359059ce9293bda6dd2f11c3c6cffb55f277e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed May 17 19:01:37 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed May 17 20:25:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81c35905

sci-geosciences/qgis: drop 3.22.9, 3.22.13, 3.28.1

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-geosciences/qgis/Manifest|   3 -
 sci-geosciences/qgis/qgis-3.22.13.ebuild | 256 
 sci-geosciences/qgis/qgis-3.22.9.ebuild  | 263 -
 sci-geosciences/qgis/qgis-3.28.1.ebuild  | 275 ---
 4 files changed, 797 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 7a50d52e1ed4..9c414d6f3696 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,5 +1,2 @@
-DIST qgis-3.22.13.tar.bz2 143469989 BLAKE2B 
1007b26745fd2e8c8b636024a3202e5b1160244952135ae45827708feba8c4b3390a6d5116e0dadc901a3cb482bd372cbdb378677ebb01a302d896606a0fc637
 SHA512 
1b145488d62fda4e1599bbaeb253d34a3f6cb47c2288ba004610d15e76a8837ca824a922cc260f09b04c32af9575ff647e55494cc221f760f919260b414c4a7e
-DIST qgis-3.22.9.tar.bz2 138141096 BLAKE2B 
d59d6fd97471397150e594acda1c6072948cc010b4bf4d34c33a642fabdc78a580bd76418785892114aa4997e88cf700f178a9243079ff800c76cb3c25cf
 SHA512 
c33cfe18c542a3be42fa6a08b62f71511a71a7e72ae704177846b66444d90a28df2f1c42d98c53c2c0e43f13bce24224499c52db5d2cbcac5d8a53782f7c124c
-DIST qgis-3.28.1.tar.bz2 158612624 BLAKE2B 
d8e0091de14b599391b2178d6c540006fdcdee937e98853d738704ad0a225dcb900645c797fc03f5a5e8bfc54a054e6324a8c8548347e3560c081416312fe735
 SHA512 
f10e67b24abe9881ad447495d144a92ad7aa8f5b826606ce6407f65261ef4521e8b7d2e257079cb11247cdd991afbdf6e49e772649e2d1f5827ceff190caa514
 DIST qgis-3.28.2.tar.bz2 158641485 BLAKE2B 
fbf121e9761135bcf511f55e84153e98b3fe7142887ac45a314bdc18f37ddd695ff3a117a087b842678a76f40927c591bf235a14fd4a8057ce70509f342b5bcf
 SHA512 
287de9041fe1ad55059904ecd99e3ac3a172c566faafd3d113b21e07f63b01afc2536391365dd372baa328fa5976aea6cfbcbc1030e8c61dee8f3a3f409724ad
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.22.13.ebuild 
b/sci-geosciences/qgis/qgis-3.22.13.ebuild
deleted file mode 100644
index 0a8abfefa40c..
--- a/sci-geosciences/qgis/qgis-3.22.13.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-PYTHON_REQ_USE="sqlite"
-
-# We only package the LTS releases right now
-# We could package more but would ideally only stabilise the LTS ones
-# at least.
-
-if [[ ${PV} == ** ]]; then
-   EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
-   inherit git-r3
-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"
-fi
-inherit cmake python-single-r1 virtualx xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/;
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal 
polar postgres python qml serial test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-RESTRICT="!test? ( test )"
-
-# See bug #850787 re sip-6.6.
-COMMON_DEPEND="
-   app-crypt/qca:2[qt5(+),ssl]
-   >=dev-db/spatialite-4.2.0
-   dev-db/sqlite:3
-   dev-libs/expat
-   dev-libs/libzip:=
-   dev-libs/protobuf:=
-   dev-libs/qtkeychain[qt5(+)]
-   dev-qt/designer:5
-   dev-qt/qtconcurrent:5
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5[ssl]
-   dev-qt/qtpositioning:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtsvg:5
-   dev-qt/qtsql:5
-   dev-qt/qtwidgets:5
-   dev-qt/qtxml:5
-   media-gfx/exiv2:=
-   >=sci-libs/gdal-3.0.4:=[geos]
-   sci-libs/geos
-   sci-libs/libspatialindex:=
-   sys-libs/zlib
-   >=sci-libs/proj-4.9.3:=
-   >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
-   >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-   3d? ( dev-qt/qt3d:5 )
-   georeferencer? ( sci-libs/gsl:= )
-   grass? ( sci-geosciences/grass:= )
-   hdf5? ( sci-libs/hdf5:= )
-   mapserver? ( dev-libs/fcgi )
-   netcdf? ( sci-libs/netcdf:= )
-   opencl? ( virtual/opencl )
-   oracle? (
-   dev-db/oracle-instantclient:=
-   sci-libs/gdal:=[oracle]
-   )
-   pdal? ( 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit: 78862e3217a917f385b74dd00240ea9ef0d4ddf6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed May 17 19:05:21 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed May 17 20:25:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78862e32

sci-geosciences/qgis: add 3.28.6, fixes build with GCC-13

Closes: https://bugs.gentoo.org/906646
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-geosciences/qgis/Manifest   |   1 +
 sci-geosciences/qgis/qgis-3.28.6.ebuild | 272 
 2 files changed, 273 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 9c414d6f3696..22593c224ed0 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,2 +1,3 @@
 DIST qgis-3.28.2.tar.bz2 158641485 BLAKE2B 
fbf121e9761135bcf511f55e84153e98b3fe7142887ac45a314bdc18f37ddd695ff3a117a087b842678a76f40927c591bf235a14fd4a8057ce70509f342b5bcf
 SHA512 
287de9041fe1ad55059904ecd99e3ac3a172c566faafd3d113b21e07f63b01afc2536391365dd372baa328fa5976aea6cfbcbc1030e8c61dee8f3a3f409724ad
+DIST qgis-3.28.6.tar.bz2 158638644 BLAKE2B 
2613022c0cf2f9da86c195ba83d110d5825c6347fc45b4e953b44dee1ad8fde1541e51670e3a15a0f6c3f5158d7a7f84544bf5ab4e956d78e68523c04af1204f
 SHA512 
4b1f39bb690173e8f8bb394e293e074ed748f18a6d108110bebbcb11305d230c1706013d05bb04d027dc2e06405228323904a33601586f79c22b402ec3987336
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.28.6.ebuild 
b/sci-geosciences/qgis/qgis-3.28.6.ebuild
new file mode 100644
index ..5d1ba6c270f3
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.28.6.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="sqlite"
+
+# We only package the LTS releases right now
+# We could package more but would ideally only stabilise the LTS ones
+# at least.
+
+if [[ ${PV} == ** ]]; then
+   EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
+   inherit git-r3
+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"
+fi
+inherit cmake python-single-r1 virtualx xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/;
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle 
pdal polar postgres python qml serial test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   mapserver? ( python )
+   test? ( postgres )
+"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="!test? ( test )"
+
+# At some point the dependency on qwtpolar should be
+# replaced with a dependency on qwt[polar]. Currently
+# it does not build with qwt-6.2[polar] though.
+COMMON_DEPEND="
+   app-crypt/qca:2[qt5(+),ssl]
+   >=dev-db/spatialite-4.2.0
+   dev-db/sqlite:3
+   dev-libs/expat
+   dev-libs/libzip:=
+   dev-libs/protobuf:=
+   dev-libs/qtkeychain[qt5(+)]
+   dev-qt/designer:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5[ssl]
+   dev-qt/qtpositioning:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtsql:5
+   dev-qt/qtsvg:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   media-gfx/exiv2:=
+   >=sci-libs/gdal-3.0.4:=[geos]
+   sci-libs/geos
+   sci-libs/libspatialindex:=
+   >=sci-libs/proj-4.9.3:=
+   sys-libs/zlib
+   >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+   >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+   3d? ( dev-qt/qt3d:5 )
+   georeferencer? ( sci-libs/gsl:= )
+   grass? ( sci-geosciences/grass:= )
+   hdf5? ( sci-libs/hdf5:= )
+   mapserver? ( dev-libs/fcgi )
+   netcdf? ( sci-libs/netcdf:= )
+   opencl? ( virtual/opencl )
+   oracle? (
+   dev-db/oracle-instantclient:=
+   sci-libs/gdal:=[oracle]
+   )
+   pdal? ( sci-libs/pdal:= )
+   polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+   postgres? ( dev-db/postgresql:= )
+   python? (
+   ${PYTHON_DEPS}
+   >=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}]
+   $(python_gen_cond_dep '
+   dev-python/jinja[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/owslib[${PYTHON_USEDEP}]
+   

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: 68d6c12464253740c1a379ac39184d9e64ca0b1b
Author: Sam James  gentoo  org>
AuthorDate: Mon May  1 01:50:48 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May  1 01:50:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68d6c124

sci-geosciences/qgis: Stabilize 3.28.2 amd64, #904594

Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/qgis-3.28.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.28.2.ebuild 
b/sci-geosciences/qgis/qgis-3.28.2.ebuild
index 5d1ba6c270f3..1a561cc37a44 100644
--- a/sci-geosciences/qgis/qgis-3.28.2.ebuild
+++ b/sci-geosciences/qgis/qgis-3.28.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == ** ]]; 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 python-single-r1 virtualx xdg
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: aba4173eddb0994d2f7789c13a5b93f52faa77d7
Author: Chris Mayo  gmail  com>
AuthorDate: Sat Jan  7 17:28:09 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan  8 03:45:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aba4173e

sci-geosciences/qgis: add 3.28.2

Closes: https://bugs.gentoo.org/889982
Signed-off-by: Chris Mayo  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/29005
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/Manifest   |   1 +
 sci-geosciences/qgis/qgis-3.28.2.ebuild | 272 
 2 files changed, 273 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index f8098e4b9509..7a50d52e1ed4 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,5 @@
 DIST qgis-3.22.13.tar.bz2 143469989 BLAKE2B 
1007b26745fd2e8c8b636024a3202e5b1160244952135ae45827708feba8c4b3390a6d5116e0dadc901a3cb482bd372cbdb378677ebb01a302d896606a0fc637
 SHA512 
1b145488d62fda4e1599bbaeb253d34a3f6cb47c2288ba004610d15e76a8837ca824a922cc260f09b04c32af9575ff647e55494cc221f760f919260b414c4a7e
 DIST qgis-3.22.9.tar.bz2 138141096 BLAKE2B 
d59d6fd97471397150e594acda1c6072948cc010b4bf4d34c33a642fabdc78a580bd76418785892114aa4997e88cf700f178a9243079ff800c76cb3c25cf
 SHA512 
c33cfe18c542a3be42fa6a08b62f71511a71a7e72ae704177846b66444d90a28df2f1c42d98c53c2c0e43f13bce24224499c52db5d2cbcac5d8a53782f7c124c
 DIST qgis-3.28.1.tar.bz2 158612624 BLAKE2B 
d8e0091de14b599391b2178d6c540006fdcdee937e98853d738704ad0a225dcb900645c797fc03f5a5e8bfc54a054e6324a8c8548347e3560c081416312fe735
 SHA512 
f10e67b24abe9881ad447495d144a92ad7aa8f5b826606ce6407f65261ef4521e8b7d2e257079cb11247cdd991afbdf6e49e772649e2d1f5827ceff190caa514
+DIST qgis-3.28.2.tar.bz2 158641485 BLAKE2B 
fbf121e9761135bcf511f55e84153e98b3fe7142887ac45a314bdc18f37ddd695ff3a117a087b842678a76f40927c591bf235a14fd4a8057ce70509f342b5bcf
 SHA512 
287de9041fe1ad55059904ecd99e3ac3a172c566faafd3d113b21e07f63b01afc2536391365dd372baa328fa5976aea6cfbcbc1030e8c61dee8f3a3f409724ad
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.28.2.ebuild 
b/sci-geosciences/qgis/qgis-3.28.2.ebuild
new file mode 100644
index ..5a27022fd0e9
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.28.2.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="sqlite"
+
+# We only package the LTS releases right now
+# We could package more but would ideally only stabilise the LTS ones
+# at least.
+
+if [[ ${PV} == ** ]]; then
+   EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
+   inherit git-r3
+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"
+fi
+inherit cmake python-single-r1 virtualx xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/;
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle 
pdal polar postgres python qml serial test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   mapserver? ( python )
+   test? ( postgres )
+"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="!test? ( test )"
+
+# At some point the dependency on qwtpolar should be
+# replaced with a dependency on qwt[polar]. Currently
+# it does not build with qwt-6.2[polar] though.
+COMMON_DEPEND="
+   app-crypt/qca:2[qt5(+),ssl]
+   >=dev-db/spatialite-4.2.0
+   dev-db/sqlite:3
+   dev-libs/expat
+   dev-libs/libzip:=
+   dev-libs/protobuf:=
+   dev-libs/qtkeychain[qt5(+)]
+   dev-qt/designer:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5[ssl]
+   dev-qt/qtpositioning:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtsql:5
+   dev-qt/qtsvg:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   media-gfx/exiv2:=
+   >=sci-libs/gdal-3.0.4:=[geos]
+   sci-libs/geos
+   sci-libs/libspatialindex:=
+   >=sci-libs/proj-4.9.3:=
+   sys-libs/zlib
+   >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+   >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+   3d? ( dev-qt/qt3d:5 )
+   georeferencer? ( sci-libs/gsl:= )
+   grass? ( sci-geosciences/grass:= )
+   hdf5? ( sci-libs/hdf5:= )
+   mapserver? ( dev-libs/fcgi )
+   netcdf? ( sci-libs/netcdf:= )
+   opencl? 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: 097a352d616974c36acce4ff99b80f0918822f8f
Author: Marco Genasci  gmail  com>
AuthorDate: Mon Dec  5 10:36:51 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan  5 09:01:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=097a352d

sci-geosciences/qgis: removed old

Signed-off-by: Marco Genasci  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28546
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/Manifest|   2 -
 sci-geosciences/qgis/qgis-3.22.11.ebuild | 258 
 sci-geosciences/qgis/qgis-3.26.3.ebuild  | 277 ---
 3 files changed, 537 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index e98021b1b3e0..f8098e4b9509 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,6 +1,4 @@
-DIST qgis-3.22.11.tar.bz2 142155708 BLAKE2B 
71b3e0a772fbea1e26d01dff6f65c35981a5ff091b5ea6bee76608f9812c569226f99789333fe39fdd772ee72af02746458c93117d21fb0352851871217a82f6
 SHA512 
0c41fa8e74b3cf54926aedc7a221ac440eabf9d27071bb79a17c5d7826624a8e6010521000f6b55afbc71f079ff18235d8fa5d407fe6b31b1bb705b6eb431424
 DIST qgis-3.22.13.tar.bz2 143469989 BLAKE2B 
1007b26745fd2e8c8b636024a3202e5b1160244952135ae45827708feba8c4b3390a6d5116e0dadc901a3cb482bd372cbdb378677ebb01a302d896606a0fc637
 SHA512 
1b145488d62fda4e1599bbaeb253d34a3f6cb47c2288ba004610d15e76a8837ca824a922cc260f09b04c32af9575ff647e55494cc221f760f919260b414c4a7e
 DIST qgis-3.22.9.tar.bz2 138141096 BLAKE2B 
d59d6fd97471397150e594acda1c6072948cc010b4bf4d34c33a642fabdc78a580bd76418785892114aa4997e88cf700f178a9243079ff800c76cb3c25cf
 SHA512 
c33cfe18c542a3be42fa6a08b62f71511a71a7e72ae704177846b66444d90a28df2f1c42d98c53c2c0e43f13bce24224499c52db5d2cbcac5d8a53782f7c124c
-DIST qgis-3.26.3.tar.bz2 151276080 BLAKE2B 
c15c0767edc1680d40bda62187368c4a3b56992ee117633b2299d26d3cae3b42cdad77b8e7b1b49a3706c16f0c3ea6048b8c4cdcf20a889b49c493b81fbece39
 SHA512 
4e239143dc63c773f8c0fd0445a5b18c59832ef978fbc2b132ef13da2f78c7f8aa439956dd88d4eaf1d980f602fd85f842d5e670707cc6e46779e7e5a3c14d76
 DIST qgis-3.28.1.tar.bz2 158612624 BLAKE2B 
d8e0091de14b599391b2178d6c540006fdcdee937e98853d738704ad0a225dcb900645c797fc03f5a5e8bfc54a054e6324a8c8548347e3560c081416312fe735
 SHA512 
f10e67b24abe9881ad447495d144a92ad7aa8f5b826606ce6407f65261ef4521e8b7d2e257079cb11247cdd991afbdf6e49e772649e2d1f5827ceff190caa514
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.22.11.ebuild 
b/sci-geosciences/qgis/qgis-3.22.11.ebuild
deleted file mode 100644
index 8fc4aabac569..
--- a/sci-geosciences/qgis/qgis-3.22.11.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"
-
-# We only package the LTS releases right now
-# We could package more but would ideally only stabilise the LTS ones
-# at least.
-
-if [[ ${PV} == ** ]]; then
-   EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
-   inherit git-r3
-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"
-fi
-inherit cmake python-single-r1 virtualx xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/;
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal 
polar postgres python qml serial test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-RESTRICT="!test? ( test )"
-
-# See bug #850787 re sip-6.6.
-COMMON_DEPEND="
-   app-crypt/qca:2[qt5(+),ssl]
-   >=dev-db/spatialite-4.2.0
-   dev-db/sqlite:3
-   dev-libs/expat
-   dev-libs/libzip:=
-   dev-libs/protobuf:=
-   dev-libs/qtkeychain[qt5(+)]
-   dev-qt/designer:5
-   dev-qt/qtconcurrent:5
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5[ssl]
-   dev-qt/qtpositioning:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtsvg:5
-   dev-qt/qtsql:5
-   dev-qt/qtwidgets:5
-   dev-qt/qtxml:5
-   media-gfx/exiv2:=
-   >=sci-libs/gdal-3.0.4:=[geos]
-   sci-libs/geos
-   sci-libs/libspatialindex:=
-   sys-libs/zlib
-   >=sci-libs/proj-4.9.3:=
-   >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
-   >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-   3d? ( dev-qt/qt3d:5 )
-   georeferencer? ( sci-libs/gsl:= )
-   grass? ( sci-geosciences/grass:= )
- 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: bc8f24cb375cfd4a812207ef24cba60b2be3d9dc
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan  5 08:56:44 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan  5 09:01:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc8f24cb

sci-geosciences/qgis: drop obsolete dev-python/six dep

Closes: https://bugs.gentoo.org/879487
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/qgis-3.22.13.ebuild | 3 +--
 sci-geosciences/qgis/qgis-3.28.1.ebuild  | 3 +--
 sci-geosciences/qgis/qgis-.ebuild| 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.22.13.ebuild 
b/sci-geosciences/qgis/qgis-3.22.13.ebuild
index 8fc4aabac569..7d63b5b6005e 100644
--- a/sci-geosciences/qgis/qgis-3.22.13.ebuild
+++ b/sci-geosciences/qgis/qgis-3.22.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -91,7 +91,6 @@ COMMON_DEPEND="

>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
dev-python/sip:=[${PYTHON_USEDEP}]
-   dev-python/six[${PYTHON_USEDEP}]
postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
')
)

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: 721bc141e57699e2942e51e7d9bd2e3dfa483a63
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan  5 08:57:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan  5 09:01:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=721bc141

sci-geosciences/qgis: drop obsolete dev-python/future dep

Closes: https://bugs.gentoo.org/888301
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/qgis-3.22.13.ebuild | 1 -
 sci-geosciences/qgis/qgis-3.28.1.ebuild  | 1 -
 sci-geosciences/qgis/qgis-.ebuild| 1 -
 3 files changed, 3 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.22.13.ebuild 
b/sci-geosciences/qgis/qgis-3.22.13.ebuild
index 7d63b5b6005e..ba4275cb7938 100644
--- a/sci-geosciences/qgis/qgis-3.22.13.ebuild
+++ b/sci-geosciences/qgis/qgis-3.22.13.ebuild
@@ -77,7 +77,6 @@ COMMON_DEPEND="
${PYTHON_DEPS}
>=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}]
$(python_gen_cond_dep '
-   dev-python/future[${PYTHON_USEDEP}]
dev-python/httplib2[${PYTHON_USEDEP}]
dev-python/jinja[${PYTHON_USEDEP}]
dev-python/markupsafe[${PYTHON_USEDEP}]

diff --git a/sci-geosciences/qgis/qgis-3.28.1.ebuild 
b/sci-geosciences/qgis/qgis-3.28.1.ebuild
index d0d6458d68c1..c44d1a7c4f97 100644
--- a/sci-geosciences/qgis/qgis-3.28.1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.28.1.ebuild
@@ -83,7 +83,6 @@ COMMON_DEPEND="
${PYTHON_DEPS}
>=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}]
$(python_gen_cond_dep '
-   dev-python/future[${PYTHON_USEDEP}]
dev-python/httplib2[${PYTHON_USEDEP}]
dev-python/jinja[${PYTHON_USEDEP}]
dev-python/markupsafe[${PYTHON_USEDEP}]

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-.ebuild
index bd6e2fddd082..9b1074f2ccae 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ b/sci-geosciences/qgis/qgis-.ebuild
@@ -83,7 +83,6 @@ COMMON_DEPEND="
${PYTHON_DEPS}
>=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}]
$(python_gen_cond_dep '
-   dev-python/future[${PYTHON_USEDEP}]
dev-python/httplib2[${PYTHON_USEDEP}]
dev-python/jinja[${PYTHON_USEDEP}]
dev-python/markupsafe[${PYTHON_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: 0ae6f84b9a6b630c6faf09be3b929907f635903a
Author: Marco Genasci  gmail  com>
AuthorDate: Mon Dec  5 10:36:19 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan  5 09:01:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ae6f84b

sci-geosciences/qgis: LTR version bump to 3.22.13

Signed-off-by: Marco Genasci  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/Manifest|   1 +
 sci-geosciences/qgis/qgis-3.22.13.ebuild | 258 +++
 2 files changed, 259 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 099a3f555f16..e98021b1b3e0 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,5 @@
 DIST qgis-3.22.11.tar.bz2 142155708 BLAKE2B 
71b3e0a772fbea1e26d01dff6f65c35981a5ff091b5ea6bee76608f9812c569226f99789333fe39fdd772ee72af02746458c93117d21fb0352851871217a82f6
 SHA512 
0c41fa8e74b3cf54926aedc7a221ac440eabf9d27071bb79a17c5d7826624a8e6010521000f6b55afbc71f079ff18235d8fa5d407fe6b31b1bb705b6eb431424
+DIST qgis-3.22.13.tar.bz2 143469989 BLAKE2B 
1007b26745fd2e8c8b636024a3202e5b1160244952135ae45827708feba8c4b3390a6d5116e0dadc901a3cb482bd372cbdb378677ebb01a302d896606a0fc637
 SHA512 
1b145488d62fda4e1599bbaeb253d34a3f6cb47c2288ba004610d15e76a8837ca824a922cc260f09b04c32af9575ff647e55494cc221f760f919260b414c4a7e
 DIST qgis-3.22.9.tar.bz2 138141096 BLAKE2B 
d59d6fd97471397150e594acda1c6072948cc010b4bf4d34c33a642fabdc78a580bd76418785892114aa4997e88cf700f178a9243079ff800c76cb3c25cf
 SHA512 
c33cfe18c542a3be42fa6a08b62f71511a71a7e72ae704177846b66444d90a28df2f1c42d98c53c2c0e43f13bce24224499c52db5d2cbcac5d8a53782f7c124c
 DIST qgis-3.26.3.tar.bz2 151276080 BLAKE2B 
c15c0767edc1680d40bda62187368c4a3b56992ee117633b2299d26d3cae3b42cdad77b8e7b1b49a3706c16f0c3ea6048b8c4cdcf20a889b49c493b81fbece39
 SHA512 
4e239143dc63c773f8c0fd0445a5b18c59832ef978fbc2b132ef13da2f78c7f8aa439956dd88d4eaf1d980f602fd85f842d5e670707cc6e46779e7e5a3c14d76
 DIST qgis-3.28.1.tar.bz2 158612624 BLAKE2B 
d8e0091de14b599391b2178d6c540006fdcdee937e98853d738704ad0a225dcb900645c797fc03f5a5e8bfc54a054e6324a8c8548347e3560c081416312fe735
 SHA512 
f10e67b24abe9881ad447495d144a92ad7aa8f5b826606ce6407f65261ef4521e8b7d2e257079cb11247cdd991afbdf6e49e772649e2d1f5827ceff190caa514

diff --git a/sci-geosciences/qgis/qgis-3.22.13.ebuild 
b/sci-geosciences/qgis/qgis-3.22.13.ebuild
new file mode 100644
index ..8fc4aabac569
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.22.13.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite"
+
+# We only package the LTS releases right now
+# We could package more but would ideally only stabilise the LTS ones
+# at least.
+
+if [[ ${PV} == ** ]]; then
+   EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
+   inherit git-r3
+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"
+fi
+inherit cmake python-single-r1 virtualx xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/;
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal 
polar postgres python qml serial test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+RESTRICT="!test? ( test )"
+
+# See bug #850787 re sip-6.6.
+COMMON_DEPEND="
+   app-crypt/qca:2[qt5(+),ssl]
+   >=dev-db/spatialite-4.2.0
+   dev-db/sqlite:3
+   dev-libs/expat
+   dev-libs/libzip:=
+   dev-libs/protobuf:=
+   dev-libs/qtkeychain[qt5(+)]
+   dev-qt/designer:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5[ssl]
+   dev-qt/qtpositioning:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtsvg:5
+   dev-qt/qtsql:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   media-gfx/exiv2:=
+   >=sci-libs/gdal-3.0.4:=[geos]
+   sci-libs/geos
+   sci-libs/libspatialindex:=
+   sys-libs/zlib
+   >=sci-libs/proj-4.9.3:=
+   >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+   >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+   3d? ( dev-qt/qt3d:5 )
+   georeferencer? ( sci-libs/gsl:= )
+   grass? ( sci-geosciences/grass:= )
+   hdf5? ( sci-libs/hdf5:= )
+   mapserver? ( dev-libs/fcgi )
+   netcdf? ( sci-libs/netcdf:= )
+   opencl? ( virtual/opencl )
+   oracle? (
+   dev-db/oracle-instantclient:=
+   sci-libs/gdal:=[oracle]
+   )
+   pdal? ( sci-libs/pdal:= )
+   polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+   postgres? ( dev-db/postgresql:= )
+   python? (
+   ${PYTHON_DEPS}
+

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: 6fc571aca6ad492deb7d07d0d7d464161db99c76
Author: Marco Genasci  gmail  com>
AuthorDate: Mon Dec  5 10:35:27 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan  5 09:01:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fc571ac

sci-geosciences/qgis: version bump to 3.28.1

Closes: https://bugs.gentoo.org/648946
Signed-off-by: Marco Genasci  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/Manifest   |   1 +
 sci-geosciences/qgis/qgis-3.28.1.ebuild | 277 
 2 files changed, 278 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 5a04f79ee961..099a3f555f16 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,5 @@
 DIST qgis-3.22.11.tar.bz2 142155708 BLAKE2B 
71b3e0a772fbea1e26d01dff6f65c35981a5ff091b5ea6bee76608f9812c569226f99789333fe39fdd772ee72af02746458c93117d21fb0352851871217a82f6
 SHA512 
0c41fa8e74b3cf54926aedc7a221ac440eabf9d27071bb79a17c5d7826624a8e6010521000f6b55afbc71f079ff18235d8fa5d407fe6b31b1bb705b6eb431424
 DIST qgis-3.22.9.tar.bz2 138141096 BLAKE2B 
d59d6fd97471397150e594acda1c6072948cc010b4bf4d34c33a642fabdc78a580bd76418785892114aa4997e88cf700f178a9243079ff800c76cb3c25cf
 SHA512 
c33cfe18c542a3be42fa6a08b62f71511a71a7e72ae704177846b66444d90a28df2f1c42d98c53c2c0e43f13bce24224499c52db5d2cbcac5d8a53782f7c124c
 DIST qgis-3.26.3.tar.bz2 151276080 BLAKE2B 
c15c0767edc1680d40bda62187368c4a3b56992ee117633b2299d26d3cae3b42cdad77b8e7b1b49a3706c16f0c3ea6048b8c4cdcf20a889b49c493b81fbece39
 SHA512 
4e239143dc63c773f8c0fd0445a5b18c59832ef978fbc2b132ef13da2f78c7f8aa439956dd88d4eaf1d980f602fd85f842d5e670707cc6e46779e7e5a3c14d76
+DIST qgis-3.28.1.tar.bz2 158612624 BLAKE2B 
d8e0091de14b599391b2178d6c540006fdcdee937e98853d738704ad0a225dcb900645c797fc03f5a5e8bfc54a054e6324a8c8548347e3560c081416312fe735
 SHA512 
f10e67b24abe9881ad447495d144a92ad7aa8f5b826606ce6407f65261ef4521e8b7d2e257079cb11247cdd991afbdf6e49e772649e2d1f5827ceff190caa514
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.28.1.ebuild 
b/sci-geosciences/qgis/qgis-3.28.1.ebuild
new file mode 100644
index ..d5f9a8600ee7
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.28.1.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="sqlite"
+
+# We only package the LTS releases right now
+# We could package more but would ideally only stabilise the LTS ones
+# at least.
+
+if [[ ${PV} = ** ]]; then
+   EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
+   inherit git-r3
+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"
+fi
+inherit cmake python-single-r1 virtualx xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/;
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples +georeferencer grass hdf5 mapserver netcdf opencl oracle 
pdal polar postgres python qml serial test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   mapserver? ( python )
+   test? ( postgres )
+"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="!test? ( test )"
+
+# At some point the dependency on qwtpolar should be
+# replaced with a dependency on qwt[polar]. Currently
+# it does not build with qwt-6.2[polar] though.
+COMMON_DEPEND="
+   app-crypt/qca:2[qt5(+),ssl]
+   >=dev-db/spatialite-4.2.0
+   dev-db/sqlite:3
+   dev-libs/expat
+   dev-libs/libzip:=
+   dev-libs/protobuf:=
+   dev-libs/qtkeychain[qt5(+)]
+   dev-qt/designer:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5[ssl]
+   dev-qt/qtpositioning:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtsvg:5
+   dev-qt/qtsql:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   media-gfx/exiv2:=
+   >=sci-libs/gdal-3.0.4:=[geos]
+   sci-libs/geos
+   sci-libs/libspatialindex:=
+   sys-libs/zlib
+   >=sci-libs/proj-4.9.3:=
+   >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+   >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+   3d? ( dev-qt/qt3d:5 )
+   georeferencer? ( sci-libs/gsl:= )
+   grass? ( sci-geosciences/grass:= )
+   hdf5? ( sci-libs/hdf5:= )
+   mapserver? ( dev-libs/fcgi )
+   netcdf? ( sci-libs/netcdf:= )
+   opencl? ( virtual/opencl )
+   oracle? (
+  

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: 5c3ec3f9cab0b894341dd475c257f67d13ab526f
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan  5 08:58:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan  5 09:01:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c3ec3f9

sci-geosciences/qgis: style tweak

Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/qgis-3.28.1.ebuild | 2 +-
 sci-geosciences/qgis/qgis-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.28.1.ebuild 
b/sci-geosciences/qgis/qgis-3.28.1.ebuild
index c44d1a7c4f97..1e37e3fdad44 100644
--- a/sci-geosciences/qgis/qgis-3.28.1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.28.1.ebuild
@@ -10,7 +10,7 @@ PYTHON_REQ_USE="sqlite"
 # We could package more but would ideally only stabilise the LTS ones
 # at least.
 
-if [[ ${PV} = ** ]]; then
+if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
inherit git-r3
 else

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-.ebuild
index 9b1074f2ccae..528ffbb45d2e 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ b/sci-geosciences/qgis/qgis-.ebuild
@@ -10,7 +10,7 @@ PYTHON_REQ_USE="sqlite"
 # We could package more but would ideally only stabilise the LTS ones
 # at least.
 
-if [[ ${PV} = ** ]]; then
+if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
inherit git-r3
 else

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andrew Ammerlaan]

commit: 342f19d05dbea37cfde0fb0da2bcc257664b3a49
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Oct 21 15:03:47 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Oct 21 15:04:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=342f19d0

sci-geosciences/qgis: add 3.26.3, sync live

Closes: https://bugs.gentoo.org/844754
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-geosciences/qgis/Manifest  |  1 +
 .../qgis/{qgis-.ebuild => qgis-3.26.3.ebuild}  | 25 +-
 sci-geosciences/qgis/qgis-.ebuild  | 23 
 3 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 2b7cdae32bd0..5a04f79ee961 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,4 @@
 DIST qgis-3.22.11.tar.bz2 142155708 BLAKE2B 
71b3e0a772fbea1e26d01dff6f65c35981a5ff091b5ea6bee76608f9812c569226f99789333fe39fdd772ee72af02746458c93117d21fb0352851871217a82f6
 SHA512 
0c41fa8e74b3cf54926aedc7a221ac440eabf9d27071bb79a17c5d7826624a8e6010521000f6b55afbc71f079ff18235d8fa5d407fe6b31b1bb705b6eb431424
 DIST qgis-3.22.9.tar.bz2 138141096 BLAKE2B 
d59d6fd97471397150e594acda1c6072948cc010b4bf4d34c33a642fabdc78a580bd76418785892114aa4997e88cf700f178a9243079ff800c76cb3c25cf
 SHA512 
c33cfe18c542a3be42fa6a08b62f71511a71a7e72ae704177846b66444d90a28df2f1c42d98c53c2c0e43f13bce24224499c52db5d2cbcac5d8a53782f7c124c
+DIST qgis-3.26.3.tar.bz2 151276080 BLAKE2B 
c15c0767edc1680d40bda62187368c4a3b56992ee117633b2299d26d3cae3b42cdad77b8e7b1b49a3706c16f0c3ea6048b8c4cdcf20a889b49c493b81fbece39
 SHA512 
4e239143dc63c773f8c0fd0445a5b18c59832ef978fbc2b132ef13da2f78c7f8aa439956dd88d4eaf1d980f602fd85f842d5e670707cc6e46779e7e5a3c14d76
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-3.26.3.ebuild
similarity index 93%
copy from sci-geosciences/qgis/qgis-.ebuild
copy to sci-geosciences/qgis/qgis-3.26.3.ebuild
index 0003264601b5..d5f9a8600ee7 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ b/sci-geosciences/qgis/qgis-3.26.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="sqlite"
 
 # We only package the LTS releases right now
@@ -25,14 +25,19 @@ HOMEPAGE="https://www.qgis.org/;
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal 
polar postgres python qml serial test"
+IUSE="3d examples +georeferencer grass hdf5 mapserver netcdf opencl oracle 
pdal polar postgres python qml serial test"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   mapserver? ( python )
+   test? ( postgres )
+"
 
 # Disabling test suite because upstream disallow running from install path
 RESTRICT="!test? ( test )"
 
-# See bug #850787 re sip-6.6.
+# At some point the dependency on qwtpolar should be
+# replaced with a dependency on qwt[polar]. Currently
+# it does not build with qwt-6.2[polar] though.
 COMMON_DEPEND="
app-crypt/qca:2[qt5(+),ssl]
>=dev-db/spatialite-4.2.0
@@ -91,7 +96,7 @@ COMMON_DEPEND="
dev-python/pyyaml[${PYTHON_USEDEP}]

>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
-   =dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
-   

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/files/, sci-geosciences/qgis/

[Andreas Sturmlechner]

commit: 5efebdac3d58d269f9c84d4c54d588b00cbc5c8a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Oct  7 13:29:46 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Oct  9 18:29:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5efebdac

sci-geosciences/qgis: drop old versions

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-geosciences/qgis/Manifest  |   5 -
 .../files/qgis-3.22.5-install-grass8-scripts.patch |  17 --
 sci-geosciences/qgis/qgis-3.22.0-r4.ebuild | 205 
 sci-geosciences/qgis/qgis-3.22.5.ebuild| 254 
 sci-geosciences/qgis/qgis-3.22.6.ebuild| 264 -
 sci-geosciences/qgis/qgis-3.22.7-r1.ebuild | 264 -
 sci-geosciences/qgis/qgis-3.22.7-r2.ebuild | 259 
 sci-geosciences/qgis/qgis-3.22.7.ebuild| 264 -
 sci-geosciences/qgis/qgis-3.22.8.ebuild| 259 
 9 files changed, 1791 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 0d5861607665..2b7cdae32bd0 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,8 +1,3 @@
-DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 
54fdd8517e37931dcdc81ef1006859d58d9e60a994a60588109a8337ade68e48710f0f50fe41e6e73c0e095187f00f15209258eb940ea3c80bba4f249d081cd5
 SHA512 
dc214d90c465cc7b8a82196d666b94971d60e64a28e38742aba5cdd86058e27fdf7cc3564bca3b330cf1820c7594d9226576145461db399c458a26ee569e299b
 DIST qgis-3.22.11.tar.bz2 142155708 BLAKE2B 
71b3e0a772fbea1e26d01dff6f65c35981a5ff091b5ea6bee76608f9812c569226f99789333fe39fdd772ee72af02746458c93117d21fb0352851871217a82f6
 SHA512 
0c41fa8e74b3cf54926aedc7a221ac440eabf9d27071bb79a17c5d7826624a8e6010521000f6b55afbc71f079ff18235d8fa5d407fe6b31b1bb705b6eb431424
-DIST qgis-3.22.5.tar.bz2 137731586 BLAKE2B 
d5cad96ca7fadab58e2f680493469496d8c5e06141ac646a09cc1f5fa607b860a0e15e5b6257debb9e787d294d2183bd0b007e96e839aca7e9fb87d81001edd7
 SHA512 
d47bcd743a0c621b3a5a90923d98844056260f396e683b0874625e341cdf84d075505e909130cfc473fc550de37bc078fc5ebb54b437e582572d930e12411dcb
-DIST qgis-3.22.6.tar.bz2 138056354 BLAKE2B 
a1f7681ae71b4f06c8e4542fe1351fbd0fd0c5a07934b1eb5e535d17a5c0432a9df1489db34dfdcbb776c55c233f3f53c8c1aaf957ba0b8445c4738c9a504cf2
 SHA512 
5ef36d6d93e5f7562f4ef2dc2a738057376153e7b34fdef7dd4cf278334d61af0b3380712b22961c3693088036d18167f9b2c2f623f405c668e8b48ef2f93d20
-DIST qgis-3.22.7.tar.bz2 138076419 BLAKE2B 
25e164e9da681dc78546b2492ec85dc97976f8f6e33e41244b8d72ef109edf9c482f00807183338da1e23a0dc9fbf0526953f053f67aff5723dc30ed280daae2
 SHA512 
d85b88a7a9aee17e7f8179c7d715bc60e64de5bdb41498177886ecdf5da2d707e3880715b6eaba4af86398666da4e322b0fac6b03f6aa907c9e39bfe4d93db91
-DIST qgis-3.22.8.tar.bz2 138285002 BLAKE2B 
d9c94c9e9836f342242000279217fcd7ceee63693829306b7927378b61b5cf9a2d6c78d41722e44b515653d73ea89d104ecb0a7f1688e294d75cad52bcf065e0
 SHA512 
80fec733fde090b3be0ba4cad1c8709023dac2fc254d2ed10540d8a929ced3218d7ae69c11b396f9424280b1746a84871d457380aaad8e65ffc62b150c731bd2
 DIST qgis-3.22.9.tar.bz2 138141096 BLAKE2B 
d59d6fd97471397150e594acda1c6072948cc010b4bf4d34c33a642fabdc78a580bd76418785892114aa4997e88cf700f178a9243079ff800c76cb3c25cf
 SHA512 
c33cfe18c542a3be42fa6a08b62f71511a71a7e72ae704177846b66444d90a28df2f1c42d98c53c2c0e43f13bce24224499c52db5d2cbcac5d8a53782f7c124c
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git 
a/sci-geosciences/qgis/files/qgis-3.22.5-install-grass8-scripts.patch 
b/sci-geosciences/qgis/files/qgis-3.22.5-install-grass8-scripts.patch
deleted file mode 100644
index 5c801f23fe8c..
--- a/sci-geosciences/qgis/files/qgis-3.22.5-install-grass8-scripts.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://github.com/qgis/QGIS/pull/47881
-https://github.com/qgis/QGIS/pull/47456
-https://github.com/qgis/QGIS/pull/47456/commits/84e574dcc043e03bb1682d1dfc5bd3b9fbf87b3d
-
-From 84e574dcc043e03bb1682d1dfc5bd3b9fbf87b3d Mon Sep 17 00:00:00 2001
-From: Bas Couwenberg 
-Date: Fri, 18 Mar 2022 18:04:01 +0100
-Subject: [PATCH] Also install scripts for GRASS 8.
-
 a/src/plugins/grass/scripts/CMakeLists.txt
-+++ b/src/plugins/grass/scripts/CMakeLists.txt
-@@ -1,4 +1,4 @@
--if (GRASS_NUM_VERSION6 GREATER 60300 OR GRASS_NUM_VERSION7 GREATER 60300)
-+if (GRASS_NUM_VERSION6 GREATER 60300 OR GRASS_NUM_VERSION7 GREATER 60300 OR 
GRASS_NUM_VERSION8 GREATER 60300)
- file (GLOB MODULE_FILES *.py )
- install (FILES ${MODULE_FILES}
-  DESTINATION ${QGIS_DATA_DIR}/grass/scripts

diff --git a/sci-geosciences/qgis/qgis-3.22.0-r4.ebuild 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: 86bd7873a238ba34faff349332737b03fc66e9f1
Author: Sam James  gentoo  org>
AuthorDate: Mon Sep 12 18:27:01 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Sep 12 18:27:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86bd7873

sci-geosciences/qgis: add 3.22.11

Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/Manifest|   1 +
 sci-geosciences/qgis/qgis-3.22.11.ebuild | 258 +++
 2 files changed, 259 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 896fb51b57b0..0d5861607665 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,5 @@
 DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 
54fdd8517e37931dcdc81ef1006859d58d9e60a994a60588109a8337ade68e48710f0f50fe41e6e73c0e095187f00f15209258eb940ea3c80bba4f249d081cd5
 SHA512 
dc214d90c465cc7b8a82196d666b94971d60e64a28e38742aba5cdd86058e27fdf7cc3564bca3b330cf1820c7594d9226576145461db399c458a26ee569e299b
+DIST qgis-3.22.11.tar.bz2 142155708 BLAKE2B 
71b3e0a772fbea1e26d01dff6f65c35981a5ff091b5ea6bee76608f9812c569226f99789333fe39fdd772ee72af02746458c93117d21fb0352851871217a82f6
 SHA512 
0c41fa8e74b3cf54926aedc7a221ac440eabf9d27071bb79a17c5d7826624a8e6010521000f6b55afbc71f079ff18235d8fa5d407fe6b31b1bb705b6eb431424
 DIST qgis-3.22.5.tar.bz2 137731586 BLAKE2B 
d5cad96ca7fadab58e2f680493469496d8c5e06141ac646a09cc1f5fa607b860a0e15e5b6257debb9e787d294d2183bd0b007e96e839aca7e9fb87d81001edd7
 SHA512 
d47bcd743a0c621b3a5a90923d98844056260f396e683b0874625e341cdf84d075505e909130cfc473fc550de37bc078fc5ebb54b437e582572d930e12411dcb
 DIST qgis-3.22.6.tar.bz2 138056354 BLAKE2B 
a1f7681ae71b4f06c8e4542fe1351fbd0fd0c5a07934b1eb5e535d17a5c0432a9df1489db34dfdcbb776c55c233f3f53c8c1aaf957ba0b8445c4738c9a504cf2
 SHA512 
5ef36d6d93e5f7562f4ef2dc2a738057376153e7b34fdef7dd4cf278334d61af0b3380712b22961c3693088036d18167f9b2c2f623f405c668e8b48ef2f93d20
 DIST qgis-3.22.7.tar.bz2 138076419 BLAKE2B 
25e164e9da681dc78546b2492ec85dc97976f8f6e33e41244b8d72ef109edf9c482f00807183338da1e23a0dc9fbf0526953f053f67aff5723dc30ed280daae2
 SHA512 
d85b88a7a9aee17e7f8179c7d715bc60e64de5bdb41498177886ecdf5da2d707e3880715b6eaba4af86398666da4e322b0fac6b03f6aa907c9e39bfe4d93db91

diff --git a/sci-geosciences/qgis/qgis-3.22.11.ebuild 
b/sci-geosciences/qgis/qgis-3.22.11.ebuild
new file mode 100644
index ..8fc4aabac569
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.22.11.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite"
+
+# We only package the LTS releases right now
+# We could package more but would ideally only stabilise the LTS ones
+# at least.
+
+if [[ ${PV} == ** ]]; then
+   EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
+   inherit git-r3
+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"
+fi
+inherit cmake python-single-r1 virtualx xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/;
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal 
polar postgres python qml serial test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+RESTRICT="!test? ( test )"
+
+# See bug #850787 re sip-6.6.
+COMMON_DEPEND="
+   app-crypt/qca:2[qt5(+),ssl]
+   >=dev-db/spatialite-4.2.0
+   dev-db/sqlite:3
+   dev-libs/expat
+   dev-libs/libzip:=
+   dev-libs/protobuf:=
+   dev-libs/qtkeychain[qt5(+)]
+   dev-qt/designer:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5[ssl]
+   dev-qt/qtpositioning:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtsvg:5
+   dev-qt/qtsql:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   media-gfx/exiv2:=
+   >=sci-libs/gdal-3.0.4:=[geos]
+   sci-libs/geos
+   sci-libs/libspatialindex:=
+   sys-libs/zlib
+   >=sci-libs/proj-4.9.3:=
+   >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+   >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+   3d? ( dev-qt/qt3d:5 )
+   georeferencer? ( sci-libs/gsl:= )
+   grass? ( sci-geosciences/grass:= )
+   hdf5? ( sci-libs/hdf5:= )
+   mapserver? ( dev-libs/fcgi )
+   netcdf? ( sci-libs/netcdf:= )
+   opencl? ( virtual/opencl )
+   oracle? (
+   dev-db/oracle-instantclient:=
+   sci-libs/gdal:=[oracle]
+   )
+   pdal? ( sci-libs/pdal:= )
+   polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+   postgres? ( dev-db/postgresql:= )
+   python? (
+   ${PYTHON_DEPS}
+   

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Agostino Sarubbo]

commit: 174c7a9d429e2d703e08c70e54289a2177d8fd52
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Sep  7 13:15:25 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Sep  7 13:15:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=174c7a9d

sci-geosciences/qgis: amd64 stable wrt bug #868939

Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-geosciences/qgis/qgis-3.22.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.22.9.ebuild 
b/sci-geosciences/qgis/qgis-3.22.9.ebuild
index 59c0806b22a8..38250e1276b1 100644
--- a/sci-geosciences/qgis/qgis-3.22.9.ebuild
+++ b/sci-geosciences/qgis/qgis-3.22.9.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == ** ]]; 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 python-single-r1 virtualx xdg
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: e09bf99503f0faf1275d90e20c4edb705a0cedcb
Author: Sam James  gentoo  org>
AuthorDate: Fri Jul 29 02:31:47 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul 29 02:32:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e09bf995

sci-geosciences/qgis: add github upstream metadata

Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sci-geosciences/qgis/metadata.xml 
b/sci-geosciences/qgis/metadata.xml
index 8d7ea9e307f6..b4793f185721 100644
--- a/sci-geosciences/qgis/metadata.xml
+++ b/sci-geosciences/qgis/metadata.xml
@@ -26,4 +26,7 @@
Enable support Qml-based plugins using 
dev-qt/qtdeclarative
Enable support for serial GPS using 
dev-qt/qtserialport

+   
+   qgis/QGIS
+   
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: 945213e0cbd59c85890fd46e1ac613b22e5a3ca1
Author: Sam James  gentoo  org>
AuthorDate: Fri Jul 15 14:25:12 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul 15 14:50:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=945213e0

sci-geosciences/qgis: add 3.22.9

Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/Manifest | 1 +
 sci-geosciences/qgis/{qgis-.ebuild => qgis-3.22.9.ebuild} | 9 +++--
 sci-geosciences/qgis/qgis-.ebuild | 4 
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 4af32a9f42cd..896fb51b57b0 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -3,4 +3,5 @@ DIST qgis-3.22.5.tar.bz2 137731586 BLAKE2B 
d5cad96ca7fadab58e2f680493469496d8c5e
 DIST qgis-3.22.6.tar.bz2 138056354 BLAKE2B 
a1f7681ae71b4f06c8e4542fe1351fbd0fd0c5a07934b1eb5e535d17a5c0432a9df1489db34dfdcbb776c55c233f3f53c8c1aaf957ba0b8445c4738c9a504cf2
 SHA512 
5ef36d6d93e5f7562f4ef2dc2a738057376153e7b34fdef7dd4cf278334d61af0b3380712b22961c3693088036d18167f9b2c2f623f405c668e8b48ef2f93d20
 DIST qgis-3.22.7.tar.bz2 138076419 BLAKE2B 
25e164e9da681dc78546b2492ec85dc97976f8f6e33e41244b8d72ef109edf9c482f00807183338da1e23a0dc9fbf0526953f053f67aff5723dc30ed280daae2
 SHA512 
d85b88a7a9aee17e7f8179c7d715bc60e64de5bdb41498177886ecdf5da2d707e3880715b6eaba4af86398666da4e322b0fac6b03f6aa907c9e39bfe4d93db91
 DIST qgis-3.22.8.tar.bz2 138285002 BLAKE2B 
d9c94c9e9836f342242000279217fcd7ceee63693829306b7927378b61b5cf9a2d6c78d41722e44b515653d73ea89d104ecb0a7f1688e294d75cad52bcf065e0
 SHA512 
80fec733fde090b3be0ba4cad1c8709023dac2fc254d2ed10540d8a929ced3218d7ae69c11b396f9424280b1746a84871d457380aaad8e65ffc62b150c731bd2
+DIST qgis-3.22.9.tar.bz2 138141096 BLAKE2B 
d59d6fd97471397150e594acda1c6072948cc010b4bf4d34c33a642fabdc78a580bd76418785892114aa4997e88cf700f178a9243079ff800c76cb3c25cf
 SHA512 
c33cfe18c542a3be42fa6a08b62f71511a71a7e72ae704177846b66444d90a28df2f1c42d98c53c2c0e43f13bce24224499c52db5d2cbcac5d8a53782f7c124c
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-3.22.9.ebuild
similarity index 65%
copy from sci-geosciences/qgis/qgis-.ebuild
copy to sci-geosciences/qgis/qgis-3.22.9.ebuild
index 2d3c9b473c26..59c0806b22a8 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ b/sci-geosciences/qgis/qgis-3.22.9.ebuild
@@ -6,7 +6,11 @@ EAPI=8
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"
 
-if [[ ${PV} = ** ]]; then
+# We only package the LTS releases right now
+# We could package more but would ideally only stabilise the LTS ones
+# at least.
+
+if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
inherit git-r3
 else
@@ -212,7 +216,8 @@ src_configure() {
 src_test() {
local myctestargs=(
# test_core_gdalprovider - see 
https://github.com/qgis/QGIS/pull/47887
-   -E 
'(ProcessingGuiTest$|ProcessingQgisAlgorithmsTestPt1$|ProcessingQgisAlgorithmsTestPt2$|ProcessingQgisAlgorithmsTestPt3$|ProcessingQgisAlgorithmsTestPt4$|ProcessingGdalAlgorithmsRasterTest$|ProcessingGdalAlgorithmsVectorTest$|ProcessingGrass7AlgorithmsImageryTest$|ProcessingGrass7AlgorithmsRasterTestPt1$|ProcessingGrass7AlgorithmsRasterTestPt2$|ProcessingGrass7AlgorithmsVectorTest$|ProcessingOtbAlgorithmsTest$|test_core_callout$|test_core_compositionconverter$|test_core_expression$|test_core_gdalprovider$|test_core_gdalutils$|test_core_geonodeconnection$|test_core_imagecache$|test_core_labelingengine$|test_core_layout$|test_core_layoutcontext$|test_core_layouthtml$|test_core_layoutlabel$|test_core_layoutmanualtable$|test_core_layoutmap$|test_core_layoutmapgrid$|test_core_layoutmapoverview$|test_core_layoutmultiframe$|test_core_layoutpicture$|test_core_linefillsymbol$|test_core_mapdevicepixelratio$|test_core_maprendererjob$|test_core_meshlayer$|test_core_meshlayerrenderer$|test_c
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: 441d620b130bdbd97b4a43e1e0e422e5a1842b36
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 17 23:26:30 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 17 23:28:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=441d620b

sci-geosciences/qgis: add 3.22.8

Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/Manifest   |   1 +
 sci-geosciences/qgis/qgis-3.22.8.ebuild | 259 
 2 files changed, 260 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index ac3abe949829..4af32a9f42cd 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -2,4 +2,5 @@ DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 
54fdd8517e37931dcdc81ef1006859d58d9e6
 DIST qgis-3.22.5.tar.bz2 137731586 BLAKE2B 
d5cad96ca7fadab58e2f680493469496d8c5e06141ac646a09cc1f5fa607b860a0e15e5b6257debb9e787d294d2183bd0b007e96e839aca7e9fb87d81001edd7
 SHA512 
d47bcd743a0c621b3a5a90923d98844056260f396e683b0874625e341cdf84d075505e909130cfc473fc550de37bc078fc5ebb54b437e582572d930e12411dcb
 DIST qgis-3.22.6.tar.bz2 138056354 BLAKE2B 
a1f7681ae71b4f06c8e4542fe1351fbd0fd0c5a07934b1eb5e535d17a5c0432a9df1489db34dfdcbb776c55c233f3f53c8c1aaf957ba0b8445c4738c9a504cf2
 SHA512 
5ef36d6d93e5f7562f4ef2dc2a738057376153e7b34fdef7dd4cf278334d61af0b3380712b22961c3693088036d18167f9b2c2f623f405c668e8b48ef2f93d20
 DIST qgis-3.22.7.tar.bz2 138076419 BLAKE2B 
25e164e9da681dc78546b2492ec85dc97976f8f6e33e41244b8d72ef109edf9c482f00807183338da1e23a0dc9fbf0526953f053f67aff5723dc30ed280daae2
 SHA512 
d85b88a7a9aee17e7f8179c7d715bc60e64de5bdb41498177886ecdf5da2d707e3880715b6eaba4af86398666da4e322b0fac6b03f6aa907c9e39bfe4d93db91
+DIST qgis-3.22.8.tar.bz2 138285002 BLAKE2B 
d9c94c9e9836f342242000279217fcd7ceee63693829306b7927378b61b5cf9a2d6c78d41722e44b515653d73ea89d104ecb0a7f1688e294d75cad52bcf065e0
 SHA512 
80fec733fde090b3be0ba4cad1c8709023dac2fc254d2ed10540d8a929ced3218d7ae69c11b396f9424280b1746a84871d457380aaad8e65ffc62b150c731bd2
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.22.8.ebuild 
b/sci-geosciences/qgis/qgis-3.22.8.ebuild
new file mode 100644
index ..1124e0d0de93
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.22.8.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite"
+
+if [[ ${PV} == ** ]]; then
+   EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
+   inherit git-r3
+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"
+fi
+inherit cmake python-single-r1 virtualx xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/;
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal 
polar postgres python qml serial test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="!test? ( test )"
+
+# See bug #850787 re sip-6.6.
+COMMON_DEPEND="
+   app-crypt/qca:2[qt5(+),ssl]
+   >=dev-db/spatialite-4.2.0
+   dev-db/sqlite:3
+   dev-libs/expat
+   dev-libs/libzip:=
+   dev-libs/protobuf:=
+   dev-libs/qtkeychain[qt5(+)]
+   dev-qt/designer:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5[ssl]
+   dev-qt/qtpositioning:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtsvg:5
+   dev-qt/qtsql:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   media-gfx/exiv2:=
+   >=sci-libs/gdal-3.0.4:=[geos]
+   sci-libs/geos
+   sci-libs/libspatialindex:=
+   sys-libs/zlib
+   >=sci-libs/proj-4.9.3:=
+   >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+   >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+   3d? ( dev-qt/qt3d:5 )
+   georeferencer? ( sci-libs/gsl:= )
+   grass? ( sci-geosciences/grass:= )
+   hdf5? ( sci-libs/hdf5:= )
+   mapserver? ( dev-libs/fcgi )
+   netcdf? ( sci-libs/netcdf:= )
+   opencl? ( virtual/opencl )
+   oracle? (
+   dev-db/oracle-instantclient:=
+   sci-libs/gdal:=[oracle]
+   )
+   pdal? ( sci-libs/pdal:= )
+   polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+   postgres? ( dev-db/postgresql:= )
+   python? (
+   ${PYTHON_DEPS}
+   

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: 9356b0721f4cae0864ce34a5dfd519fd7a3d7d20
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 10 02:24:55 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 10 02:27:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9356b072

sci-geosciences/qgis: allow newer sip; sync live

Closes: https://bugs.gentoo.org/850787
Thanks-to: José de Paula Rodrigues  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/{qgis-.ebuild => qgis-3.22.7-r2.ebuild} | 8 +---
 sci-geosciences/qgis/qgis-.ebuild| 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-3.22.7-r2.ebuild
similarity index 64%
copy from sci-geosciences/qgis/qgis-.ebuild
copy to sci-geosciences/qgis/qgis-3.22.7-r2.ebuild
index 4bfe90fabac7..1124e0d0de93 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ b/sci-geosciences/qgis/qgis-3.22.7-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"
 
-if [[ ${PV} = ** ]]; then
+if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
inherit git-r3
 else
@@ -28,6 +28,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 # Disabling test suite because upstream disallow running from install path
 RESTRICT="!test? ( test )"
 
+# See bug #850787 re sip-6.6.
 COMMON_DEPEND="
app-crypt/qca:2[qt5(+),ssl]
>=dev-db/spatialite-4.2.0
@@ -86,7 +87,7 @@ COMMON_DEPEND="
dev-python/pyyaml[${PYTHON_USEDEP}]

>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
-   https://github.com/qgis/QGIS/pull/47887
-   -E 
'(ProcessingGuiTest$|ProcessingQgisAlgorithmsTestPt1$|ProcessingQgisAlgorithmsTestPt2$|ProcessingQgisAlgorithmsTestPt3$|ProcessingQgisAlgorithmsTestPt4$|ProcessingGdalAlgorithmsRasterTest$|ProcessingGdalAlgorithmsVectorTest$|ProcessingGrass7AlgorithmsImageryTest$|ProcessingGrass7AlgorithmsRasterTestPt1$|ProcessingGrass7AlgorithmsRasterTestPt2$|ProcessingGrass7AlgorithmsVectorTest$|ProcessingOtbAlgorithmsTest$|test_core_callout$|test_core_compositionconverter$|test_core_expression$|test_core_gdalprovider$|test_core_gdalutils$|test_core_geonodeconnection$|test_core_imagecache$|test_core_labelingengine$|test_core_layout$|test_core_layoutcontext$|test_core_layouthtml$|test_core_layoutlabel$|test_core_layoutmanualtable$|test_core_layoutmap$|test_core_layoutmapgrid$|test_core_layoutmapoverview$|test_core_layoutmultiframe$|test_core_layoutpicture$|test_core_linefillsymbol$|test_core_mapdevicepixelratio$|test_core_maprendererjob$|test_core_meshlayer$|test_core_meshlayerrenderer$|test_c
 
ore_networkaccessmanager$|test_core_pointpatternfillsymbol$|test_core_rastercontourrenderer$|test_core_rasterlayer$|test_core_simplemarker$|test_core_style$|test_core_svgmarker$|test_core_tiledownloadmanager$|test_core_ziplayer$|test_core_coordinatereferencesystem$|test_core_geometry$|test_gui_dualview$|test_gui_htmlwidgetwrapper$|test_gui_processinggui$|test_gui_filedownloader$|test_gui_ogrprovidergui$|test_gui_queryresultwidget$|test_gui_listwidget$|test_3d_3drendering$|test_3d_tessellator$|test_analysis_processingalgspt1$|test_analysis_processingalgspt2$|test_analysis_meshcontours$|test_analysis_triangulation$|test_analysis_processing$|test_provider_wcsprovider$|test_provider_postgresconn$|test_provider_virtualrasterprovider$|test_app_qgisappclipboard$|test_app_fieldcalculator$|test_app_maptoolcircularstring$|test_app_vertextool$|PyQgsLocalServer$|PyQgsAFSProvider$|PyQgsPythonProvider$|PyQgsAnnotation$|PyQgsAuthenticationSystem$|PyQgsAuthBasicMethod$|PyQgsDataItem$|PyQgsDelimited
 
TextProvider$|PyQgsEmbeddedSymbolRenderer$|PyQgsExpressionBuilderWidget$|PyQgsExternalStorageWebDAV$|PyQgsGeometryTest$|PyQgsGoogleMapsGeocoder$|PyQgsImageCache$|PyQgsLayout$|PyQgsLayoutHtml$|PyQgsLayoutLegend$|PyQgsLayoutMap$|PyQgsLayoutMapGrid$|PyQgsLayoutMapOverview$|PyQgsMapClippingUtils$|PyQgsMapLayerComboBox$|PyQgsMapLayerProxyModel$|PyQgsMemoryProvider$|PyQgsOGRProviderGpkg$|PyQgsPalLabelingCanvas$|PyQgsPalLabelingLayout$|PyQgsPalLabelingPlacement$|PyQgsPointCloudAttributeByRampRenderer$|PyQgsPointCloudClassifiedRenderer$|PyQgsPointCloudExtentRenderer$|PyQgsPointCloudRgbRenderer$|PyQgsProcessExecutable$|PyQgsProcessingInPlace$|TestQgsRandomMarkerSymbolLayer$|PyQgsRasterLayer$|PyQgsRasterLayerRenderer$|PyQgsRasterResampler$|PyQgsRulebasedRenderer$|PyQgsShapefileProvider$|PyQgsSvgCache$|PyQgsOGRProvider$|PyQgsSpatialiteProvider$|PyQgsTaskManager$|PyQgsVectorFileWriter$|PyQgsVectorLayer$|PyQgsVectorLayerCache$|PyQgsVectorLayerEditBuffer$|PyQgsVectorLayerEditBufferGroup$|PyQgsVec
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: 3722f754633302fb67148de678233460fe231896
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun  7 02:02:06 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun  7 02:02:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3722f754

sci-geosciences/qgis: adapt to gdal python-single-r1

Signed-off-by: Sam James  gentoo.org>

 .../qgis/{qgis-.ebuild => qgis-3.22.7-r1.ebuild}  | 15 +++
 sci-geosciences/qgis/qgis-.ebuild |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-3.22.7-r1.ebuild
similarity index 62%
copy from sci-geosciences/qgis/qgis-.ebuild
copy to sci-geosciences/qgis/qgis-3.22.7-r1.ebuild
index b37b4735abda..20f78cf866b8 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ b/sci-geosciences/qgis/qgis-3.22.7-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"
 
-if [[ ${PV} = ** ]]; then
+if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
inherit git-r3
 else
@@ -28,6 +28,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 # Disabling test suite because upstream disallow running from install path
 RESTRICT="!test? ( test )"
 
+# 3.22.5+ *does* support GRASS 8 but we can't enable it yet because of
+# https://github.com/OSGeo/grass/pull/2269 (=> unresolved SONAME dependencies)
+# Keep an eye on that bug / a fixed GRASS release and readd support
+# by unrestricting the dep in ${COMMON_DEPEND} once it's fixed!
+# (No need to change the supported GRASS versions in src_configure b/c
+# it won't find GRASS 8 with this dependency set.)
 COMMON_DEPEND="
app-crypt/qca:2[qt5(+),ssl]
>=dev-db/spatialite-4.2.0
@@ -57,7 +63,7 @@ COMMON_DEPEND="
>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
3d? ( dev-qt/qt3d:5 )
georeferencer? ( sci-libs/gsl:= )
-   grass? ( sci-geosciences/grass:= )
+   grass? ( =sci-geosciences/grass-7*:= )
hdf5? ( sci-libs/hdf5:= )
mapserver? ( dev-libs/fcgi )
netcdf? ( sci-libs/netcdf:= )
@@ -71,6 +77,7 @@ COMMON_DEPEND="
postgres? ( dev-db/postgresql:= )
python? (
${PYTHON_DEPS}
+   >=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}]
$(python_gen_cond_dep '
dev-python/future[${PYTHON_USEDEP}]
dev-python/httplib2[${PYTHON_USEDEP}]
@@ -87,7 +94,6 @@ COMMON_DEPEND="
dev-python/requests[${PYTHON_USEDEP}]
=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
')
)
@@ -211,7 +217,8 @@ src_configure() {
 src_test() {
local myctestargs=(
# test_core_gdalprovider - see 
https://github.com/qgis/QGIS/pull/47887
-   -E 
'(ProcessingGuiTest$|ProcessingQgisAlgorithmsTestPt1$|ProcessingQgisAlgorithmsTestPt2$|ProcessingQgisAlgorithmsTestPt3$|ProcessingQgisAlgorithmsTestPt4$|ProcessingGdalAlgorithmsRasterTest$|ProcessingGdalAlgorithmsVectorTest$|ProcessingGrass7AlgorithmsImageryTest$|ProcessingGrass7AlgorithmsRasterTestPt1$|ProcessingGrass7AlgorithmsRasterTestPt2$|ProcessingGrass7AlgorithmsVectorTest$|ProcessingOtbAlgorithmsTest$|test_core_callout$|test_core_compositionconverter$|test_core_expression$|test_core_gdalprovider$|test_core_gdalutils$|test_core_geonodeconnection$|test_core_imagecache$|test_core_labelingengine$|test_core_layout$|test_core_layoutcontext$|test_core_layouthtml$|test_core_layoutlabel$|test_core_layoutmanualtable$|test_core_layoutmap$|test_core_layoutmapgrid$|test_core_layoutmapoverview$|test_core_layoutmultiframe$|test_core_layoutpicture$|test_core_linefillsymbol$|test_core_mapdevicepixelratio$|test_core_maprendererjob$|test_core_meshlayer$|test_core_meshlayerrenderer$|test_c
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: 5cb1afafe6e0b9d9adc129e78e4738b0afea4a72
Author: Thomas Bettler  gmail  com>
AuthorDate: Sun Apr 17 17:12:42 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun  3 03:14:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cb1afaf

sci-geosciences/qgis: add support for grass 8

Signed-off-by: Thomas Bettler  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25732
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/qgis-.ebuild | 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-.ebuild
index cf05d8a1fd83..b37b4735abda 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ b/sci-geosciences/qgis/qgis-.ebuild
@@ -28,12 +28,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 # Disabling test suite because upstream disallow running from install path
 RESTRICT="!test? ( test )"
 
-# 3.22.5+ *does* support GRASS 8 but we can't enable it yet because of
-# https://github.com/OSGeo/grass/pull/2269 (=> unresolved SONAME dependencies)
-# Keep an eye on that bug / a fixed GRASS release and readd support
-# by unrestricting the dep in ${COMMON_DEPEND} once it's fixed!
-# (No need to change the supported GRASS versions in src_configure b/c
-# it won't find GRASS 8 with this dependency set.)
 COMMON_DEPEND="
app-crypt/qca:2[qt5(+),ssl]
>=dev-db/spatialite-4.2.0
@@ -63,7 +57,7 @@ COMMON_DEPEND="
>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
3d? ( dev-qt/qt3d:5 )
georeferencer? ( sci-libs/gsl:= )
-   grass? ( =sci-geosciences/grass-7*:= )
+   grass? ( sci-geosciences/grass:= )
hdf5? ( sci-libs/hdf5:= )
mapserver? ( dev-libs/fcgi )
netcdf? ( sci-libs/netcdf:= )

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: 762f6ff7f6cf467aca82e85948d9c43f933d74a3
Author: Thomas Bettler  gmail  com>
AuthorDate: Tue Apr  5 22:10:05 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun  3 03:14:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=762f6ff7

sci-geosciences/qgis: improve tests on live

Signed-off-by: Thomas Bettler  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/qgis-.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-.ebuild
index b952ea37d5d7..cf05d8a1fd83 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ b/sci-geosciences/qgis/qgis-.ebuild
@@ -217,8 +217,7 @@ src_configure() {
 src_test() {
local myctestargs=(
# test_core_gdalprovider - see 
https://github.com/qgis/QGIS/pull/47887
-   # test_core_offlineediting - see 
https://github.com/qgis/QGIS/pull/48059
-   -E 
'(ProcessingGuiTest|ProcessingQgisAlgorithmsTestPt1|ProcessingQgisAlgorithmsTestPt2|ProcessingQgisAlgorithmsTestPt3|ProcessingQgisAlgorithmsTestPt4|ProcessingGdalAlgorithmsRasterTest|ProcessingGdalAlgorithmsVectorTest|ProcessingGrass7AlgorithmsImageryTest|ProcessingGrass7AlgorithmsRasterTestPt1|ProcessingGrass7AlgorithmsRasterTestPt2|ProcessingGrass7AlgorithmsVectorTest|ProcessingOtbAlgorithmsTest|test_core_callout|test_core_compositionconverter|test_core_expression|test_core_gdalprovider|test_core_gdalutils|test_core_geonodeconnection|test_core_imagecache|test_core_labelingengine|test_core_layout|test_core_layoutcontext|test_core_layouthtml|test_core_layoutlabel|test_core_layoutmanualtable|test_core_layoutmap|test_core_layoutmapgrid|test_core_layoutmapoverview|test_core_layoutmultiframe|test_core_layoutpicture|test_core_linefillsymbol|test_core_mapdevicepixelratio|test_core_maprendererjob|test_core_meshlayer|test_core_meshlayerrenderer|test_core_networkaccessmanager|test_core_
 
offlineediting|test_core_pointpatternfillsymbol|test_core_rastercontourrenderer|test_core_rasterlayer|test_core_simplemarker|test_core_style|test_core_svgmarker|test_core_tiledownloadmanager|test_core_ziplayer|test_core_coordinatereferencesystem|test_core_geometry|test_gui_dualview|test_gui_htmlwidgetwrapper|test_gui_processinggui|test_gui_filedownloader|test_gui_ogrprovidergui|test_gui_meshlayerpropertiesdialog|test_gui_queryresultwidget|test_gui_listwidget|test_3d_3drendering|test_3d_tessellator|test_analysis_processingalgspt1|test_analysis_processingalgspt2|test_analysis_meshcontours|test_analysis_triangulation|test_analysis_processing|test_provider_wcsprovider|test_provider_postgresconn|test_provider_virtualrasterprovider|qgis_grassprovidertest8|test_app_qgisappclipboard|test_app_fieldcalculator|test_app_maptoolcircularstring|test_app_vertextool|PyQgsLocalServer|PyQgsAFSProvider|PyQgsPythonProvider|PyQgsAnnotation|PyQgsAuthenticationSystem|PyQgsAuthBasicMethod|PyQgsDataItem|PyQg
 
sDelimitedTextProvider|PyQgsEmbeddedSymbolRenderer|PyQgsExpressionBuilderWidget|PyQgsExternalStorageWebDAV|PyQgsGeometryTest|PyQgsGoogleMapsGeocoder|PyQgsImageCache|PyQgsLayout|PyQgsLayoutHtml|PyQgsLayoutLegend|PyQgsLayoutMap|PyQgsLayoutMapGrid|PyQgsLayoutMapOverview|PyQgsMapClippingUtils|PyQgsMapLayerComboBox|PyQgsMapLayerProxyModel|PyQgsMemoryProvider|PyQgsOGRProviderGpkg|PyQgsPalLabelingCanvas|PyQgsPalLabelingLayout|PyQgsPalLabelingPlacement|PyQgsPointCloudAttributeByRampRenderer|PyQgsPointCloudClassifiedRenderer|PyQgsPointCloudExtentRenderer|PyQgsPointCloudRgbRenderer|PyQgsProcessExecutable|PyQgsProcessingInPlace|TestQgsRandomMarkerSymbolLayer|PyQgsRasterLayer|PyQgsRasterLayerRenderer|PyQgsRasterResampler|PyQgsRulebasedRenderer|PyQgsShapefileProvider|PyQgsSvgCache|PyQgsOGRProvider|PyQgsSpatialiteProvider|PyQgsTaskManager|PyQgsVectorFileWriter|PyQgsVectorLayer|PyQgsVectorLayerCache|PyQgsVectorLayerEditBuffer|PyQgsVectorLayerSelectedFeatureSource|PyQgsVectorLayerShapefile|PyQgsVir
 
tualLayerProvider|PyQgsWFSProvider|PyQgsOapifProvider|PyQgsDBManagerGpkg|PyQgsAuxiliaryStorage|PyQgsFieldValidator|PyQgsSelectiveMasking|PyQgsPalLabelingServer|PyQgsServerWMSGetMap|PyQgsServerWMSGetLegendGraphic|PyQgsServerWMSGetPrint|PyQgsServerWMSGetPrintExtra|PyQgsServerWMSGetPrintOutputs|PyQgsServerWMSGetPrintAtlas|PyQgsServerWMSDimension|PyQgsServerAccessControlWMS|PyQgsServerAccessControlWFSTransactional|PyQgsServerCacheManager|PyQgsServerWMTS|PyQgsServerWFS|qgis_sipify|qgis_sip_include|qgis_sip_uptodate)'
+   -E 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: a351fe59dce9742e624a33607a89827f8d452d02
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun  1 01:55:44 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun  1 01:55:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a351fe59

sci-geosciences/qgis: Stabilize 3.22.5 amd64, #825670

Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/qgis-3.22.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.22.5.ebuild 
b/sci-geosciences/qgis/qgis-3.22.5.ebuild
index 7aca973d344b..3489bad447fe 100644
--- a/sci-geosciences/qgis/qgis-3.22.5.ebuild
+++ b/sci-geosciences/qgis/qgis-3.22.5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = ** ]]; 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 python-single-r1 xdg
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: 020717b8fb1c5cd72eb8af5e630a0c305d9b3f83
Author: Sam James  gentoo  org>
AuthorDate: Sat May 14 06:32:01 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 14 21:22:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=020717b8

sci-geosciences/qgis: add 3.22.7

Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/Manifest | 1 +
 sci-geosciences/qgis/{qgis-.ebuild => qgis-3.22.7.ebuild} | 8 ++--
 sci-geosciences/qgis/qgis-.ebuild | 6 +-
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 5e841dfec8e1..ac3abe949829 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,5 @@
 DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 
54fdd8517e37931dcdc81ef1006859d58d9e60a994a60588109a8337ade68e48710f0f50fe41e6e73c0e095187f00f15209258eb940ea3c80bba4f249d081cd5
 SHA512 
dc214d90c465cc7b8a82196d666b94971d60e64a28e38742aba5cdd86058e27fdf7cc3564bca3b330cf1820c7594d9226576145461db399c458a26ee569e299b
 DIST qgis-3.22.5.tar.bz2 137731586 BLAKE2B 
d5cad96ca7fadab58e2f680493469496d8c5e06141ac646a09cc1f5fa607b860a0e15e5b6257debb9e787d294d2183bd0b007e96e839aca7e9fb87d81001edd7
 SHA512 
d47bcd743a0c621b3a5a90923d98844056260f396e683b0874625e341cdf84d075505e909130cfc473fc550de37bc078fc5ebb54b437e582572d930e12411dcb
 DIST qgis-3.22.6.tar.bz2 138056354 BLAKE2B 
a1f7681ae71b4f06c8e4542fe1351fbd0fd0c5a07934b1eb5e535d17a5c0432a9df1489db34dfdcbb776c55c233f3f53c8c1aaf957ba0b8445c4738c9a504cf2
 SHA512 
5ef36d6d93e5f7562f4ef2dc2a738057376153e7b34fdef7dd4cf278334d61af0b3380712b22961c3693088036d18167f9b2c2f623f405c668e8b48ef2f93d20
+DIST qgis-3.22.7.tar.bz2 138076419 BLAKE2B 
25e164e9da681dc78546b2492ec85dc97976f8f6e33e41244b8d72ef109edf9c482f00807183338da1e23a0dc9fbf0526953f053f67aff5723dc30ed280daae2
 SHA512 
d85b88a7a9aee17e7f8179c7d715bc60e64de5bdb41498177886ecdf5da2d707e3880715b6eaba4af86398666da4e322b0fac6b03f6aa907c9e39bfe4d93db91
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-3.22.7.ebuild
similarity index 99%
copy from sci-geosciences/qgis/qgis-.ebuild
copy to sci-geosciences/qgis/qgis-3.22.7.ebuild
index 52cef87319b2..30e49896a601 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ b/sci-geosciences/qgis/qgis-3.22.7.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"
 
-if [[ ${PV} = ** ]]; then
+if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
inherit git-r3
 else
@@ -121,10 +121,6 @@ BDEPEND="
)
 "
 
-pkg_setup() {
-   python-single-r1_pkg_setup
-}
-
 src_prepare() {
cmake_src_prepare
 }

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-.ebuild
index 52cef87319b2..b952ea37d5d7 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ b/sci-geosciences/qgis/qgis-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"
 
 if [[ ${PV} = ** ]]; then
@@ -121,10 +121,6 @@ BDEPEND="
)
 "
 
-pkg_setup() {
-   python-single-r1_pkg_setup
-}
-
 src_prepare() {
cmake_src_prepare
 }

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: 111d3bf44081bfaee86e16289171e654487a59a8
Author: Sam James  gentoo  org>
AuthorDate: Wed May  4 05:46:22 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May  4 23:28:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=111d3bf4

sci-geosciences/qgis: drop 3.20.3-r1

Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/Manifest  |   1 -
 sci-geosciences/qgis/qgis-3.20.3-r1.ebuild | 205 -
 2 files changed, 206 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 309af158fefe..5e841dfec8e1 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,3 @@
-DIST qgis-3.20.3.tar.bz2 133775542 BLAKE2B 
f92273d208d7948bcd1642c994d7dac6b3a1115aaee5738e1974ff0ac38e42432abb18a64e982d46be10dd2dcb9da809b9065bb66c3f353e587a5b7f5544ec91
 SHA512 
abad3eb9774bbe2eaa86d554256a46eb179016f2df849d0c27c96db1bad6b73116c4456b81b176107a459bbf52714ccaf11a79bb9b39641192cd46f188420df0
 DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 
54fdd8517e37931dcdc81ef1006859d58d9e60a994a60588109a8337ade68e48710f0f50fe41e6e73c0e095187f00f15209258eb940ea3c80bba4f249d081cd5
 SHA512 
dc214d90c465cc7b8a82196d666b94971d60e64a28e38742aba5cdd86058e27fdf7cc3564bca3b330cf1820c7594d9226576145461db399c458a26ee569e299b
 DIST qgis-3.22.5.tar.bz2 137731586 BLAKE2B 
d5cad96ca7fadab58e2f680493469496d8c5e06141ac646a09cc1f5fa607b860a0e15e5b6257debb9e787d294d2183bd0b007e96e839aca7e9fb87d81001edd7
 SHA512 
d47bcd743a0c621b3a5a90923d98844056260f396e683b0874625e341cdf84d075505e909130cfc473fc550de37bc078fc5ebb54b437e582572d930e12411dcb
 DIST qgis-3.22.6.tar.bz2 138056354 BLAKE2B 
a1f7681ae71b4f06c8e4542fe1351fbd0fd0c5a07934b1eb5e535d17a5c0432a9df1489db34dfdcbb776c55c233f3f53c8c1aaf957ba0b8445c4738c9a504cf2
 SHA512 
5ef36d6d93e5f7562f4ef2dc2a738057376153e7b34fdef7dd4cf278334d61af0b3380712b22961c3693088036d18167f9b2c2f623f405c668e8b48ef2f93d20

diff --git a/sci-geosciences/qgis/qgis-3.20.3-r1.ebuild 
b/sci-geosciences/qgis/qgis-3.20.3-r1.ebuild
deleted file mode 100644
index 29d2851b45d4..
--- a/sci-geosciences/qgis/qgis-3.20.3-r1.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="sqlite"
-
-if [[ ${PV} = ** ]]; then
-   EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
-   inherit git-r3
-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"
-fi
-inherit cmake desktop python-single-r1 qmake-utils xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/;
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle 
polar postgres python qml serial"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-COMMON_DEPEND="
-   app-crypt/qca:2[qt5(+),ssl]
-   >=dev-db/spatialite-4.2.0
-   dev-db/sqlite:3
-   dev-libs/expat
-   dev-libs/libzip:=
-   dev-libs/protobuf:=
-   dev-libs/qtkeychain[qt5(+)]
-   dev-qt/designer:5
-   dev-qt/qtconcurrent:5
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5[ssl]
-   dev-qt/qtpositioning:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtsvg:5
-   dev-qt/qtsql:5
-   dev-qt/qtwidgets:5
-   dev-qt/qtxml:5
-   media-gfx/exiv2:=
-   >=sci-libs/gdal-3.0.4:=[geos]
-   sci-libs/geos
-   sci-libs/libspatialindex:=
-   sys-libs/zlib
-   >=sci-libs/proj-4.9.3:=
-   >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
-   >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-   3d? ( dev-qt/qt3d:5 )
-   georeferencer? ( sci-libs/gsl:= )
-   grass? ( =sci-geosciences/grass-7*:= )
-   hdf5? ( sci-libs/hdf5:= )
-   mapserver? ( dev-libs/fcgi )
-   netcdf? ( sci-libs/netcdf:= )
-   opencl? ( virtual/opencl )
-   oracle? (
-   dev-db/oracle-instantclient:=
-   sci-libs/gdal:=[oracle]
-   )
-   polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
-   postgres? ( dev-db/postgresql:= )
-   python? (
-   ${PYTHON_DEPS}
-   $(python_gen_cond_dep '
-   dev-python/future[${PYTHON_USEDEP}]
-   dev-python/httplib2[${PYTHON_USEDEP}]
-   dev-python/jinja[${PYTHON_USEDEP}]
-   dev-python/markupsafe[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/owslib[${PYTHON_USEDEP}]
-   dev-python/pygments[${PYTHON_USEDEP}]
-   

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: 0b5fa408b79db256f5900c2fdca729320f17df2e
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr 16 19:21:13 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr 16 19:21:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b5fa408

sci-geosciences/qgis: add 3.22.6

Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/Manifest   |   1 +
 sci-geosciences/qgis/qgis-3.22.6.ebuild | 264 
 2 files changed, 265 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index f459dfa92367..309af158fefe 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,5 @@
 DIST qgis-3.20.3.tar.bz2 133775542 BLAKE2B 
f92273d208d7948bcd1642c994d7dac6b3a1115aaee5738e1974ff0ac38e42432abb18a64e982d46be10dd2dcb9da809b9065bb66c3f353e587a5b7f5544ec91
 SHA512 
abad3eb9774bbe2eaa86d554256a46eb179016f2df849d0c27c96db1bad6b73116c4456b81b176107a459bbf52714ccaf11a79bb9b39641192cd46f188420df0
 DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 
54fdd8517e37931dcdc81ef1006859d58d9e60a994a60588109a8337ade68e48710f0f50fe41e6e73c0e095187f00f15209258eb940ea3c80bba4f249d081cd5
 SHA512 
dc214d90c465cc7b8a82196d666b94971d60e64a28e38742aba5cdd86058e27fdf7cc3564bca3b330cf1820c7594d9226576145461db399c458a26ee569e299b
 DIST qgis-3.22.5.tar.bz2 137731586 BLAKE2B 
d5cad96ca7fadab58e2f680493469496d8c5e06141ac646a09cc1f5fa607b860a0e15e5b6257debb9e787d294d2183bd0b007e96e839aca7e9fb87d81001edd7
 SHA512 
d47bcd743a0c621b3a5a90923d98844056260f396e683b0874625e341cdf84d075505e909130cfc473fc550de37bc078fc5ebb54b437e582572d930e12411dcb
+DIST qgis-3.22.6.tar.bz2 138056354 BLAKE2B 
a1f7681ae71b4f06c8e4542fe1351fbd0fd0c5a07934b1eb5e535d17a5c0432a9df1489db34dfdcbb776c55c233f3f53c8c1aaf957ba0b8445c4738c9a504cf2
 SHA512 
5ef36d6d93e5f7562f4ef2dc2a738057376153e7b34fdef7dd4cf278334d61af0b3380712b22961c3693088036d18167f9b2c2f623f405c668e8b48ef2f93d20
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.22.6.ebuild 
b/sci-geosciences/qgis/qgis-3.22.6.ebuild
new file mode 100644
index ..b6874427c4be
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.22.6.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_REQ_USE="sqlite"
+
+if [[ ${PV} = ** ]]; then
+   EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
+   inherit git-r3
+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"
+fi
+inherit cmake python-single-r1 virtualx xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/;
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal 
polar postgres python qml serial test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="!test? ( test )"
+
+# 3.22.5+ *does* support GRASS 8 but we can't enable it yet because of
+# https://github.com/OSGeo/grass/pull/2269 (=> unresolved SONAME dependencies)
+# Keep an eye on that bug / a fixed GRASS release and readd support
+# by unrestricting the dep in ${COMMON_DEPEND} once it's fixed!
+# (No need to change the supported GRASS versions in src_configure b/c
+# it won't find GRASS 8 with this dependency set.)
+COMMON_DEPEND="
+   app-crypt/qca:2[qt5(+),ssl]
+   >=dev-db/spatialite-4.2.0
+   dev-db/sqlite:3
+   dev-libs/expat
+   dev-libs/libzip:=
+   dev-libs/protobuf:=
+   dev-libs/qtkeychain[qt5(+)]
+   dev-qt/designer:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5[ssl]
+   dev-qt/qtpositioning:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtsvg:5
+   dev-qt/qtsql:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   media-gfx/exiv2:=
+   >=sci-libs/gdal-3.0.4:=[geos]
+   sci-libs/geos
+   sci-libs/libspatialindex:=
+   sys-libs/zlib
+   >=sci-libs/proj-4.9.3:=
+   >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+   >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+   3d? ( dev-qt/qt3d:5 )
+   georeferencer? ( sci-libs/gsl:= )
+   grass? ( =sci-geosciences/grass-7*:= )
+   hdf5? ( sci-libs/hdf5:= )
+   mapserver? ( dev-libs/fcgi )
+   netcdf? ( sci-libs/netcdf:= )
+   opencl? ( virtual/opencl )
+   oracle? (
+   

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit: 5e3a20709c45d84207b84381a908582b19513764
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Apr 15 20:08:34 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr 15 20:14:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e3a2070

sci-geosciences/qgis: Drop 3.22.4

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-geosciences/qgis/Manifest   |   1 -
 sci-geosciences/qgis/qgis-3.22.4.ebuild | 207 
 2 files changed, 208 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index ca7d54d59dc4..f459dfa92367 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,5 +1,4 @@
 DIST qgis-3.20.3.tar.bz2 133775542 BLAKE2B 
f92273d208d7948bcd1642c994d7dac6b3a1115aaee5738e1974ff0ac38e42432abb18a64e982d46be10dd2dcb9da809b9065bb66c3f353e587a5b7f5544ec91
 SHA512 
abad3eb9774bbe2eaa86d554256a46eb179016f2df849d0c27c96db1bad6b73116c4456b81b176107a459bbf52714ccaf11a79bb9b39641192cd46f188420df0
 DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 
54fdd8517e37931dcdc81ef1006859d58d9e60a994a60588109a8337ade68e48710f0f50fe41e6e73c0e095187f00f15209258eb940ea3c80bba4f249d081cd5
 SHA512 
dc214d90c465cc7b8a82196d666b94971d60e64a28e38742aba5cdd86058e27fdf7cc3564bca3b330cf1820c7594d9226576145461db399c458a26ee569e299b
-DIST qgis-3.22.4.tar.bz2 137701974 BLAKE2B 
f1e7c35ace59b427a29c96eb6304c2e03ef6ad5304832d679f4a51fcca2c4868bd68058aa224be82e0cdef7b4f44fa310daa51e8c207c16de90b4e6536935f54
 SHA512 
423ba679618876fd4e3d308ad47903b47bfe758e78c01160e9d490121a863b83f5a60f6210fbfea090fb6dac9e42749d2b92777fa2756938bb6ab41fe75377e5
 DIST qgis-3.22.5.tar.bz2 137731586 BLAKE2B 
d5cad96ca7fadab58e2f680493469496d8c5e06141ac646a09cc1f5fa607b860a0e15e5b6257debb9e787d294d2183bd0b007e96e839aca7e9fb87d81001edd7
 SHA512 
d47bcd743a0c621b3a5a90923d98844056260f396e683b0874625e341cdf84d075505e909130cfc473fc550de37bc078fc5ebb54b437e582572d930e12411dcb
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.22.4.ebuild 
b/sci-geosciences/qgis/qgis-3.22.4.ebuild
deleted file mode 100644
index 12e8cd68f1e8..
--- a/sci-geosciences/qgis/qgis-3.22.4.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-PYTHON_REQ_USE="sqlite"
-
-if [[ ${PV} = ** ]]; then
-   EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
-   inherit git-r3
-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"
-fi
-inherit cmake python-single-r1 xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/;
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal 
polar postgres python qml serial"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-COMMON_DEPEND="
-   app-crypt/qca:2[qt5(+),ssl]
-   >=dev-db/spatialite-4.2.0
-   dev-db/sqlite:3
-   dev-libs/expat
-   dev-libs/libzip:=
-   dev-libs/protobuf:=
-   dev-libs/qtkeychain[qt5(+)]
-   dev-qt/designer:5
-   dev-qt/qtconcurrent:5
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5[ssl]
-   dev-qt/qtpositioning:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtsvg:5
-   dev-qt/qtsql:5
-   dev-qt/qtwidgets:5
-   dev-qt/qtxml:5
-   media-gfx/exiv2:=
-   >=sci-libs/gdal-3.0.4:=[geos]
-   sci-libs/geos
-   sci-libs/libspatialindex:=
-   sys-libs/zlib
-   >=sci-libs/proj-4.9.3:=
-   >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
-   >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-   3d? ( dev-qt/qt3d:5 )
-   georeferencer? ( sci-libs/gsl:= )
-   grass? ( =sci-geosciences/grass-7*:= )
-   hdf5? ( sci-libs/hdf5:= )
-   mapserver? ( dev-libs/fcgi )
-   netcdf? ( sci-libs/netcdf:= )
-   opencl? ( virtual/opencl )
-   oracle? (
-   dev-db/oracle-instantclient:=
-   sci-libs/gdal:=[oracle]
-   )
-   pdal? ( sci-libs/pdal:= )
-   polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
-   postgres? ( dev-db/postgresql:= )
-   python? (
-   ${PYTHON_DEPS}
-   $(python_gen_cond_dep '
-   

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: 16201d020579e6eb6638bae75650b6090f2b2714
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr  4 01:29:21 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr  4 01:29:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16201d02

sci-geosciences/qgis: style tweaks for src_test

Mainly to put src_test before src_install to match
phase execution order.

Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/qgis-.ebuild | 23 ---
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-.ebuild
index 2ef1f49d303e..52cef87319b2 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ b/sci-geosciences/qgis/qgis-.ebuild
@@ -218,6 +218,18 @@ src_configure() {
cmake_src_configure
 }
 
+src_test() {
+   local myctestargs=(
+   # test_core_gdalprovider - see 
https://github.com/qgis/QGIS/pull/47887
+   # test_core_offlineediting - see 
https://github.com/qgis/QGIS/pull/48059
+   -E 
'(ProcessingGuiTest|ProcessingQgisAlgorithmsTestPt1|ProcessingQgisAlgorithmsTestPt2|ProcessingQgisAlgorithmsTestPt3|ProcessingQgisAlgorithmsTestPt4|ProcessingGdalAlgorithmsRasterTest|ProcessingGdalAlgorithmsVectorTest|ProcessingGrass7AlgorithmsImageryTest|ProcessingGrass7AlgorithmsRasterTestPt1|ProcessingGrass7AlgorithmsRasterTestPt2|ProcessingGrass7AlgorithmsVectorTest|ProcessingOtbAlgorithmsTest|test_core_callout|test_core_compositionconverter|test_core_expression|test_core_gdalprovider|test_core_gdalutils|test_core_geonodeconnection|test_core_imagecache|test_core_labelingengine|test_core_layout|test_core_layoutcontext|test_core_layouthtml|test_core_layoutlabel|test_core_layoutmanualtable|test_core_layoutmap|test_core_layoutmapgrid|test_core_layoutmapoverview|test_core_layoutmultiframe|test_core_layoutpicture|test_core_linefillsymbol|test_core_mapdevicepixelratio|test_core_maprendererjob|test_core_meshlayer|test_core_meshlayerrenderer|test_core_networkaccessmanager|test_core_
 
offlineediting|test_core_pointpatternfillsymbol|test_core_rastercontourrenderer|test_core_rasterlayer|test_core_simplemarker|test_core_style|test_core_svgmarker|test_core_tiledownloadmanager|test_core_ziplayer|test_core_coordinatereferencesystem|test_core_geometry|test_gui_dualview|test_gui_htmlwidgetwrapper|test_gui_processinggui|test_gui_filedownloader|test_gui_ogrprovidergui|test_gui_meshlayerpropertiesdialog|test_gui_queryresultwidget|test_gui_listwidget|test_3d_3drendering|test_3d_tessellator|test_analysis_processingalgspt1|test_analysis_processingalgspt2|test_analysis_meshcontours|test_analysis_triangulation|test_analysis_processing|test_provider_wcsprovider|test_provider_postgresconn|test_provider_virtualrasterprovider|qgis_grassprovidertest8|test_app_qgisappclipboard|test_app_fieldcalculator|test_app_maptoolcircularstring|test_app_vertextool|PyQgsLocalServer|PyQgsAFSProvider|PyQgsPythonProvider|PyQgsAnnotation|PyQgsAuthenticationSystem|PyQgsAuthBasicMethod|PyQgsDataItem|PyQg
 
sDelimitedTextProvider|PyQgsEmbeddedSymbolRenderer|PyQgsExpressionBuilderWidget|PyQgsExternalStorageWebDAV|PyQgsGeometryTest|PyQgsGoogleMapsGeocoder|PyQgsImageCache|PyQgsLayout|PyQgsLayoutHtml|PyQgsLayoutLegend|PyQgsLayoutMap|PyQgsLayoutMapGrid|PyQgsLayoutMapOverview|PyQgsMapClippingUtils|PyQgsMapLayerComboBox|PyQgsMapLayerProxyModel|PyQgsMemoryProvider|PyQgsOGRProviderGpkg|PyQgsPalLabelingCanvas|PyQgsPalLabelingLayout|PyQgsPalLabelingPlacement|PyQgsPointCloudAttributeByRampRenderer|PyQgsPointCloudClassifiedRenderer|PyQgsPointCloudExtentRenderer|PyQgsPointCloudRgbRenderer|PyQgsProcessExecutable|PyQgsProcessingInPlace|TestQgsRandomMarkerSymbolLayer|PyQgsRasterLayer|PyQgsRasterLayerRenderer|PyQgsRasterResampler|PyQgsRulebasedRenderer|PyQgsShapefileProvider|PyQgsSvgCache|PyQgsOGRProvider|PyQgsSpatialiteProvider|PyQgsTaskManager|PyQgsVectorFileWriter|PyQgsVectorLayer|PyQgsVectorLayerCache|PyQgsVectorLayerEditBuffer|PyQgsVectorLayerSelectedFeatureSource|PyQgsVectorLayerShapefile|PyQgsVir
 
tualLayerProvider|PyQgsWFSProvider|PyQgsOapifProvider|PyQgsDBManagerGpkg|PyQgsAuxiliaryStorage|PyQgsFieldValidator|PyQgsSelectiveMasking|PyQgsPalLabelingServer|PyQgsServerWMSGetMap|PyQgsServerWMSGetLegendGraphic|PyQgsServerWMSGetPrint|PyQgsServerWMSGetPrintExtra|PyQgsServerWMSGetPrintOutputs|PyQgsServerWMSGetPrintAtlas|PyQgsServerWMSDimension|PyQgsServerAccessControlWMS|PyQgsServerAccessControlWFSTransactional|PyQgsServerCacheManager|PyQgsServerWMTS|PyQgsServerWFS|qgis_sipify|qgis_sip_include|qgis_sip_uptodate)'
+
+   --output-on-failure
+   )
+
+   virtx cmake_src_test -j1
+}
+
 src_install() {
cmake_src_install
 
@@ -240,17 +252,6 @@ src_install() {
fi
 }
 
-src_test() {
-   myctestargs+=( -j1 )
-   myctestargs+=( -E 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: 2f275a47a864b0c18984da0b02d968ff1361920e
Author: Thomas Bettler  gmail  com>
AuthorDate: Sun Apr  3 20:14:56 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr  4 01:28:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f275a47

sci-geosciences/qgis: add test

Signed-off-by: Thomas Bettler  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24885
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/qgis-.ebuild | 29 +++--
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-.ebuild
index 157d86c11aaf..2ef1f49d303e 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ b/sci-geosciences/qgis/qgis-.ebuild
@@ -14,19 +14,19 @@ else
examples? ( 
https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> 
qgis_sample_data-2.8.14.tar.gz )"
KEYWORDS="~amd64 ~x86"
 fi
-inherit cmake python-single-r1 xdg
+inherit cmake python-single-r1 virtualx xdg
 
 DESCRIPTION="User friendly Geographic Information System"
 HOMEPAGE="https://www.qgis.org/;
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal 
polar postgres python qml serial"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal 
polar postgres python qml serial test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 
 # Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
+RESTRICT="!test? ( test )"
 
 # 3.22.5+ *does* support GRASS 8 but we can't enable it yet because of
 # https://github.com/OSGeo/grass/pull/2269 (=> unresolved SONAME dependencies)
@@ -112,6 +112,13 @@ BDEPEND="
dev-qt/linguist-tools:5
sys-devel/bison
sys-devel/flex
+   test? (
+   $(python_gen_cond_dep '
+   dev-python/PyQt5[${PYTHON_USEDEP},testlib]
+   dev-python/nose2[${PYTHON_USEDEP}]
+   dev-python/mock[${PYTHON_USEDEP}]
+   ')
+   )
 "
 
 pkg_setup() {
@@ -137,7 +144,7 @@ src_configure() {
-DWITH_GUI=ON
-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
-DWITH_QSPATIALITE=ON
-   -DENABLE_TESTS=OFF
+   -DENABLE_TESTS=$(usex test)
-DWITH_3D=$(usex 3d)
-DWITH_GSL=$(usex georeferencer)
$(cmake_use_find_package hdf5 HDF5)
@@ -202,8 +209,7 @@ src_configure() {
done
fi
 
-   use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
-   mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue 
#39973
+   use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
 
# bugs 612956, 648726
addpredict /dev/dri/renderD128
@@ -234,6 +240,17 @@ src_install() {
fi
 }
 
+src_test() {
+   myctestargs+=( -j1 )
+   myctestargs+=( -E 
'(ProcessingGuiTest|ProcessingQgisAlgorithmsTestPt1|ProcessingQgisAlgorithmsTestPt2|ProcessingQgisAlgorithmsTestPt3|ProcessingQgisAlgorithmsTestPt4|ProcessingGdalAlgorithmsRasterTest|ProcessingGdalAlgorithmsVectorTest|ProcessingGrass7AlgorithmsImageryTest|ProcessingGrass7AlgorithmsRasterTestPt1|ProcessingGrass7AlgorithmsRasterTestPt2|ProcessingGrass7AlgorithmsVectorTest|ProcessingOtbAlgorithmsTest|test_core_callout|test_core_compositionconverter|test_core_expression|test_core_gdalprovider|test_core_gdalutils|test_core_geonodeconnection|test_core_imagecache|test_core_labelingengine|test_core_layout|test_core_layoutcontext|test_core_layouthtml|test_core_layoutlabel|test_core_layoutmanualtable|test_core_layoutmap|test_core_layoutmapgrid|test_core_layoutmapoverview|test_core_layoutmultiframe|test_core_layoutpicture|test_core_linefillsymbol|test_core_mapdevicepixelratio|test_core_maprendererjob|test_core_meshlayer|test_core_meshlayerrenderer|test_core_networkaccessmana
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit: 02c1e76e5314bfa9597c017a0de3b57f96fe9fba
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Mar 26 16:23:45 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Mar 26 16:39:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02c1e76e

sci-geosciences/qgis: Drop 3.22.1, 3.22.2, 3.22.3

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-geosciences/qgis/Manifest   |   3 -
 sci-geosciences/qgis/qgis-3.22.1.ebuild | 205 
 sci-geosciences/qgis/qgis-3.22.2.ebuild | 205 
 sci-geosciences/qgis/qgis-3.22.3.ebuild | 205 
 4 files changed, 618 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 11bc127abd83..ca7d54d59dc4 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,8 +1,5 @@
 DIST qgis-3.20.3.tar.bz2 133775542 BLAKE2B 
f92273d208d7948bcd1642c994d7dac6b3a1115aaee5738e1974ff0ac38e42432abb18a64e982d46be10dd2dcb9da809b9065bb66c3f353e587a5b7f5544ec91
 SHA512 
abad3eb9774bbe2eaa86d554256a46eb179016f2df849d0c27c96db1bad6b73116c4456b81b176107a459bbf52714ccaf11a79bb9b39641192cd46f188420df0
 DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 
54fdd8517e37931dcdc81ef1006859d58d9e60a994a60588109a8337ade68e48710f0f50fe41e6e73c0e095187f00f15209258eb940ea3c80bba4f249d081cd5
 SHA512 
dc214d90c465cc7b8a82196d666b94971d60e64a28e38742aba5cdd86058e27fdf7cc3564bca3b330cf1820c7594d9226576145461db399c458a26ee569e299b
-DIST qgis-3.22.1.tar.bz2 136772144 BLAKE2B 
ba3a5d9db2a487ff10800da0ab12de4b6d3c1dab72e286d0cafef1804429f59e6c80fd05d662e8abadb7216811f3cbe36bb50d54b077a5c4db7cabcb1002a826
 SHA512 
b49fdab97c707a3bd29c2ad288733373d406fe024e07873e6ba28653a9a8882f58115ae346523b2f07011be312e18bf2643c8f0b7979d4ba8ed07dce4579cba9
-DIST qgis-3.22.2.tar.bz2 136903329 BLAKE2B 
b1991944c05a9035dc91ea3fcc252a43da435199cb37c8a03647666f15dfd2367f2990bdddb2a124559993405ff61b4a110e6fa31da10d33411e24b756b9eb30
 SHA512 
6d893217d54483018ab5de06cc11da5da3faf24fb863da57a608429a75f3e1c4647dd809ae1bc0a7034e28296a116c8ebcb528b4886b2714e75654415b2f4c74
-DIST qgis-3.22.3.tar.bz2 136876983 BLAKE2B 
3b57af74829ca35802a09a8d83f4638ccd4d56674151d45e81f0d2af5544a6d59f20c3a68e5508f5bb5e32f5e98bf7f64f2c9f2d72e09a5137be63e4cbcaa1c0
 SHA512 
8918ee725f4f8d12c4cab009c446e137513b931583bf843356238122e22267211fffee9fd20382fbcb9b613be6d7af22bc0250d9e166ba53dd621e827aafda28
 DIST qgis-3.22.4.tar.bz2 137701974 BLAKE2B 
f1e7c35ace59b427a29c96eb6304c2e03ef6ad5304832d679f4a51fcca2c4868bd68058aa224be82e0cdef7b4f44fa310daa51e8c207c16de90b4e6536935f54
 SHA512 
423ba679618876fd4e3d308ad47903b47bfe758e78c01160e9d490121a863b83f5a60f6210fbfea090fb6dac9e42749d2b92777fa2756938bb6ab41fe75377e5
 DIST qgis-3.22.5.tar.bz2 137731586 BLAKE2B 
d5cad96ca7fadab58e2f680493469496d8c5e06141ac646a09cc1f5fa607b860a0e15e5b6257debb9e787d294d2183bd0b007e96e839aca7e9fb87d81001edd7
 SHA512 
d47bcd743a0c621b3a5a90923d98844056260f396e683b0874625e341cdf84d075505e909130cfc473fc550de37bc078fc5ebb54b437e582572d930e12411dcb
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.22.1.ebuild 
b/sci-geosciences/qgis/qgis-3.22.1.ebuild
deleted file mode 100644
index af65e82db8df..
--- a/sci-geosciences/qgis/qgis-3.22.1.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-PYTHON_REQ_USE="sqlite"
-
-if [[ ${PV} = ** ]]; then
-   EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
-   inherit git-r3
-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"
-fi
-inherit cmake python-single-r1 xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/;
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle 
polar postgres python qml serial"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-COMMON_DEPEND="
-   app-crypt/qca:2[qt5(+),ssl]
-   >=dev-db/spatialite-4.2.0
-   dev-db/sqlite:3
-   dev-libs/expat
-   dev-libs/libzip:=
-   dev-libs/protobuf:=
-   dev-libs/qtkeychain[qt5(+)]
-   dev-qt/designer:5
-   dev-qt/qtconcurrent:5
-   dev-qt/qtcore:5
-   

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/files/, sci-geosciences/qgis/

[Sam James]

commit: 6dfc79c76daecabfe0c69870c86e57aa361d1743
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 20 02:43:08 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 20 03:23:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dfc79c7

sci-geosciences/qgis: add 3.22.5

Almost supports GRASS 8, but not yet, due to a bug in GRASS.

3.22.5+ *does* support GRASS 8 but we can't enable it yet because of
https://github.com/OSGeo/grass/pull/2269 (=> unresolved SONAME dependencies)

Keep an eye on that bug / a fixed GRASS release and readd support
by unrestricting the dep in ${COMMON_DEPEND} once it's fixed!
(No need to change the supported GRASS versions in src_configure b/c
it won't find GRASS 8 with this dependency set.)

Bug: https://github.com/OSGeo/grass/pull/2269
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/Manifest  |  1 +
 .../files/qgis-3.22.5-install-grass8-scripts.patch | 17 +++
 .../qgis/{qgis-.ebuild => qgis-3.22.5.ebuild}  | 53 --
 sci-geosciences/qgis/qgis-.ebuild  | 49 ++--
 4 files changed, 114 insertions(+), 6 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 9e380ed22b73..11bc127abd83 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -4,4 +4,5 @@ DIST qgis-3.22.1.tar.bz2 136772144 BLAKE2B 
ba3a5d9db2a487ff10800da0ab12de4b6d3c1
 DIST qgis-3.22.2.tar.bz2 136903329 BLAKE2B 
b1991944c05a9035dc91ea3fcc252a43da435199cb37c8a03647666f15dfd2367f2990bdddb2a124559993405ff61b4a110e6fa31da10d33411e24b756b9eb30
 SHA512 
6d893217d54483018ab5de06cc11da5da3faf24fb863da57a608429a75f3e1c4647dd809ae1bc0a7034e28296a116c8ebcb528b4886b2714e75654415b2f4c74
 DIST qgis-3.22.3.tar.bz2 136876983 BLAKE2B 
3b57af74829ca35802a09a8d83f4638ccd4d56674151d45e81f0d2af5544a6d59f20c3a68e5508f5bb5e32f5e98bf7f64f2c9f2d72e09a5137be63e4cbcaa1c0
 SHA512 
8918ee725f4f8d12c4cab009c446e137513b931583bf843356238122e22267211fffee9fd20382fbcb9b613be6d7af22bc0250d9e166ba53dd621e827aafda28
 DIST qgis-3.22.4.tar.bz2 137701974 BLAKE2B 
f1e7c35ace59b427a29c96eb6304c2e03ef6ad5304832d679f4a51fcca2c4868bd68058aa224be82e0cdef7b4f44fa310daa51e8c207c16de90b4e6536935f54
 SHA512 
423ba679618876fd4e3d308ad47903b47bfe758e78c01160e9d490121a863b83f5a60f6210fbfea090fb6dac9e42749d2b92777fa2756938bb6ab41fe75377e5
+DIST qgis-3.22.5.tar.bz2 137731586 BLAKE2B 
d5cad96ca7fadab58e2f680493469496d8c5e06141ac646a09cc1f5fa607b860a0e15e5b6257debb9e787d294d2183bd0b007e96e839aca7e9fb87d81001edd7
 SHA512 
d47bcd743a0c621b3a5a90923d98844056260f396e683b0874625e341cdf84d075505e909130cfc473fc550de37bc078fc5ebb54b437e582572d930e12411dcb
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git 
a/sci-geosciences/qgis/files/qgis-3.22.5-install-grass8-scripts.patch 
b/sci-geosciences/qgis/files/qgis-3.22.5-install-grass8-scripts.patch
new file mode 100644
index ..5c801f23fe8c
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-3.22.5-install-grass8-scripts.patch
@@ -0,0 +1,17 @@
+https://github.com/qgis/QGIS/pull/47881
+https://github.com/qgis/QGIS/pull/47456
+https://github.com/qgis/QGIS/pull/47456/commits/84e574dcc043e03bb1682d1dfc5bd3b9fbf87b3d
+
+From 84e574dcc043e03bb1682d1dfc5bd3b9fbf87b3d Mon Sep 17 00:00:00 2001
+From: Bas Couwenberg 
+Date: Fri, 18 Mar 2022 18:04:01 +0100
+Subject: [PATCH] Also install scripts for GRASS 8.
+
+--- a/src/plugins/grass/scripts/CMakeLists.txt
 b/src/plugins/grass/scripts/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-if (GRASS_NUM_VERSION6 GREATER 60300 OR GRASS_NUM_VERSION7 GREATER 60300)
++if (GRASS_NUM_VERSION6 GREATER 60300 OR GRASS_NUM_VERSION7 GREATER 60300 OR 
GRASS_NUM_VERSION8 GREATER 60300)
+ file (GLOB MODULE_FILES *.py )
+ install (FILES ${MODULE_FILES}
+  DESTINATION ${QGIS_DATA_DIR}/grass/scripts

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-3.22.5.ebuild
similarity index 73%
copy from sci-geosciences/qgis/qgis-.ebuild
copy to sci-geosciences/qgis/qgis-3.22.5.ebuild
index 12e8cd68f1e8..7aca973d344b 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ b/sci-geosciences/qgis/qgis-3.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8,9,10} )
 PYTHON_REQ_USE="sqlite"
@@ -28,6 +28,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 # Disabling test suite because upstream disallow running from install path
 RESTRICT="test"
 
+# 3.22.5+ *does* support GRASS 8 but we can't enable it yet because of
+# https://github.com/OSGeo/grass/pull/2269 (=> unresolved 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: 4436dfcd4b7449fb3880f72cc0f94db509ff7457
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 18 19:42:42 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 18 22:47:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4436dfcd

sci-geosciences/qgis: add 3.22.4

Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/Manifest   |   1 +
 sci-geosciences/qgis/qgis-3.22.4.ebuild | 205 
 2 files changed, 206 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 940303f8523d..9e380ed22b73 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -3,4 +3,5 @@ DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 
54fdd8517e37931dcdc81ef1006859d58d9e6
 DIST qgis-3.22.1.tar.bz2 136772144 BLAKE2B 
ba3a5d9db2a487ff10800da0ab12de4b6d3c1dab72e286d0cafef1804429f59e6c80fd05d662e8abadb7216811f3cbe36bb50d54b077a5c4db7cabcb1002a826
 SHA512 
b49fdab97c707a3bd29c2ad288733373d406fe024e07873e6ba28653a9a8882f58115ae346523b2f07011be312e18bf2643c8f0b7979d4ba8ed07dce4579cba9
 DIST qgis-3.22.2.tar.bz2 136903329 BLAKE2B 
b1991944c05a9035dc91ea3fcc252a43da435199cb37c8a03647666f15dfd2367f2990bdddb2a124559993405ff61b4a110e6fa31da10d33411e24b756b9eb30
 SHA512 
6d893217d54483018ab5de06cc11da5da3faf24fb863da57a608429a75f3e1c4647dd809ae1bc0a7034e28296a116c8ebcb528b4886b2714e75654415b2f4c74
 DIST qgis-3.22.3.tar.bz2 136876983 BLAKE2B 
3b57af74829ca35802a09a8d83f4638ccd4d56674151d45e81f0d2af5544a6d59f20c3a68e5508f5bb5e32f5e98bf7f64f2c9f2d72e09a5137be63e4cbcaa1c0
 SHA512 
8918ee725f4f8d12c4cab009c446e137513b931583bf843356238122e22267211fffee9fd20382fbcb9b613be6d7af22bc0250d9e166ba53dd621e827aafda28
+DIST qgis-3.22.4.tar.bz2 137701974 BLAKE2B 
f1e7c35ace59b427a29c96eb6304c2e03ef6ad5304832d679f4a51fcca2c4868bd68058aa224be82e0cdef7b4f44fa310daa51e8c207c16de90b4e6536935f54
 SHA512 
423ba679618876fd4e3d308ad47903b47bfe758e78c01160e9d490121a863b83f5a60f6210fbfea090fb6dac9e42749d2b92777fa2756938bb6ab41fe75377e5
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.22.4.ebuild 
b/sci-geosciences/qgis/qgis-3.22.4.ebuild
new file mode 100644
index ..424d7ec8847e
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.22.4.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_REQ_USE="sqlite"
+
+if [[ ${PV} = ** ]]; then
+   EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
+   inherit git-r3
+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"
+fi
+inherit cmake python-single-r1 xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/;
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle 
polar postgres python qml serial"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+COMMON_DEPEND="
+   app-crypt/qca:2[qt5(+),ssl]
+   >=dev-db/spatialite-4.2.0
+   dev-db/sqlite:3
+   dev-libs/expat
+   dev-libs/libzip:=
+   dev-libs/protobuf:=
+   dev-libs/qtkeychain[qt5(+)]
+   dev-qt/designer:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5[ssl]
+   dev-qt/qtpositioning:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtsvg:5
+   dev-qt/qtsql:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   media-gfx/exiv2:=
+   >=sci-libs/gdal-3.0.4:=[geos]
+   sci-libs/geos
+   sci-libs/libspatialindex:=
+   sys-libs/zlib
+   >=sci-libs/proj-4.9.3:=
+   >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+   >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+   3d? ( dev-qt/qt3d:5 )
+   georeferencer? ( sci-libs/gsl:= )
+   grass? ( =sci-geosciences/grass-7*:= )
+   hdf5? ( sci-libs/hdf5:= )
+   mapserver? ( dev-libs/fcgi )
+   netcdf? ( sci-libs/netcdf:= )
+   opencl? ( virtual/opencl )
+   oracle? (
+   dev-db/oracle-instantclient:=
+   sci-libs/gdal:=[oracle]
+   )
+   polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+   postgres? ( dev-db/postgresql:= )
+   python? (
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   dev-python/future[${PYTHON_USEDEP}]
+   

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: 4852dd64d179a60eca9ee5c3d0e3f1642106a52e
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 14 15:41:08 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 14 15:41:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4852dd64

sci-geosciences/qgis: add 3.22.3

Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/Manifest   |   1 +
 sci-geosciences/qgis/qgis-3.22.3.ebuild | 205 
 2 files changed, 206 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 8853bd11ead4..940303f8523d 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -2,4 +2,5 @@ DIST qgis-3.20.3.tar.bz2 133775542 BLAKE2B 
f92273d208d7948bcd1642c994d7dac6b3a11
 DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 
54fdd8517e37931dcdc81ef1006859d58d9e60a994a60588109a8337ade68e48710f0f50fe41e6e73c0e095187f00f15209258eb940ea3c80bba4f249d081cd5
 SHA512 
dc214d90c465cc7b8a82196d666b94971d60e64a28e38742aba5cdd86058e27fdf7cc3564bca3b330cf1820c7594d9226576145461db399c458a26ee569e299b
 DIST qgis-3.22.1.tar.bz2 136772144 BLAKE2B 
ba3a5d9db2a487ff10800da0ab12de4b6d3c1dab72e286d0cafef1804429f59e6c80fd05d662e8abadb7216811f3cbe36bb50d54b077a5c4db7cabcb1002a826
 SHA512 
b49fdab97c707a3bd29c2ad288733373d406fe024e07873e6ba28653a9a8882f58115ae346523b2f07011be312e18bf2643c8f0b7979d4ba8ed07dce4579cba9
 DIST qgis-3.22.2.tar.bz2 136903329 BLAKE2B 
b1991944c05a9035dc91ea3fcc252a43da435199cb37c8a03647666f15dfd2367f2990bdddb2a124559993405ff61b4a110e6fa31da10d33411e24b756b9eb30
 SHA512 
6d893217d54483018ab5de06cc11da5da3faf24fb863da57a608429a75f3e1c4647dd809ae1bc0a7034e28296a116c8ebcb528b4886b2714e75654415b2f4c74
+DIST qgis-3.22.3.tar.bz2 136876983 BLAKE2B 
3b57af74829ca35802a09a8d83f4638ccd4d56674151d45e81f0d2af5544a6d59f20c3a68e5508f5bb5e32f5e98bf7f64f2c9f2d72e09a5137be63e4cbcaa1c0
 SHA512 
8918ee725f4f8d12c4cab009c446e137513b931583bf843356238122e22267211fffee9fd20382fbcb9b613be6d7af22bc0250d9e166ba53dd621e827aafda28
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.22.3.ebuild 
b/sci-geosciences/qgis/qgis-3.22.3.ebuild
new file mode 100644
index ..424d7ec8847e
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.22.3.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_REQ_USE="sqlite"
+
+if [[ ${PV} = ** ]]; then
+   EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
+   inherit git-r3
+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"
+fi
+inherit cmake python-single-r1 xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/;
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle 
polar postgres python qml serial"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+COMMON_DEPEND="
+   app-crypt/qca:2[qt5(+),ssl]
+   >=dev-db/spatialite-4.2.0
+   dev-db/sqlite:3
+   dev-libs/expat
+   dev-libs/libzip:=
+   dev-libs/protobuf:=
+   dev-libs/qtkeychain[qt5(+)]
+   dev-qt/designer:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5[ssl]
+   dev-qt/qtpositioning:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtsvg:5
+   dev-qt/qtsql:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   media-gfx/exiv2:=
+   >=sci-libs/gdal-3.0.4:=[geos]
+   sci-libs/geos
+   sci-libs/libspatialindex:=
+   sys-libs/zlib
+   >=sci-libs/proj-4.9.3:=
+   >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+   >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+   3d? ( dev-qt/qt3d:5 )
+   georeferencer? ( sci-libs/gsl:= )
+   grass? ( =sci-geosciences/grass-7*:= )
+   hdf5? ( sci-libs/hdf5:= )
+   mapserver? ( dev-libs/fcgi )
+   netcdf? ( sci-libs/netcdf:= )
+   opencl? ( virtual/opencl )
+   oracle? (
+   dev-db/oracle-instantclient:=
+   sci-libs/gdal:=[oracle]
+   )
+   polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+   postgres? ( dev-db/postgresql:= )
+   python? (
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   dev-python/future[${PYTHON_USEDEP}]
+   

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: 43161b5fcf0be912493a63bb49b33048ae828f7e
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec 22 03:56:27 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 22 03:56:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43161b5f

sci-geosciences/qgis: add 3.22.2

Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/Manifest   |   1 +
 sci-geosciences/qgis/qgis-3.22.2.ebuild | 205 
 2 files changed, 206 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 1f703bc557ef..8853bd11ead4 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,5 @@
 DIST qgis-3.20.3.tar.bz2 133775542 BLAKE2B 
f92273d208d7948bcd1642c994d7dac6b3a1115aaee5738e1974ff0ac38e42432abb18a64e982d46be10dd2dcb9da809b9065bb66c3f353e587a5b7f5544ec91
 SHA512 
abad3eb9774bbe2eaa86d554256a46eb179016f2df849d0c27c96db1bad6b73116c4456b81b176107a459bbf52714ccaf11a79bb9b39641192cd46f188420df0
 DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 
54fdd8517e37931dcdc81ef1006859d58d9e60a994a60588109a8337ade68e48710f0f50fe41e6e73c0e095187f00f15209258eb940ea3c80bba4f249d081cd5
 SHA512 
dc214d90c465cc7b8a82196d666b94971d60e64a28e38742aba5cdd86058e27fdf7cc3564bca3b330cf1820c7594d9226576145461db399c458a26ee569e299b
 DIST qgis-3.22.1.tar.bz2 136772144 BLAKE2B 
ba3a5d9db2a487ff10800da0ab12de4b6d3c1dab72e286d0cafef1804429f59e6c80fd05d662e8abadb7216811f3cbe36bb50d54b077a5c4db7cabcb1002a826
 SHA512 
b49fdab97c707a3bd29c2ad288733373d406fe024e07873e6ba28653a9a8882f58115ae346523b2f07011be312e18bf2643c8f0b7979d4ba8ed07dce4579cba9
+DIST qgis-3.22.2.tar.bz2 136903329 BLAKE2B 
b1991944c05a9035dc91ea3fcc252a43da435199cb37c8a03647666f15dfd2367f2990bdddb2a124559993405ff61b4a110e6fa31da10d33411e24b756b9eb30
 SHA512 
6d893217d54483018ab5de06cc11da5da3faf24fb863da57a608429a75f3e1c4647dd809ae1bc0a7034e28296a116c8ebcb528b4886b2714e75654415b2f4c74
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.22.2.ebuild 
b/sci-geosciences/qgis/qgis-3.22.2.ebuild
new file mode 100644
index ..af65e82db8df
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.22.2.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_REQ_USE="sqlite"
+
+if [[ ${PV} = ** ]]; then
+   EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
+   inherit git-r3
+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"
+fi
+inherit cmake python-single-r1 xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/;
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle 
polar postgres python qml serial"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+COMMON_DEPEND="
+   app-crypt/qca:2[qt5(+),ssl]
+   >=dev-db/spatialite-4.2.0
+   dev-db/sqlite:3
+   dev-libs/expat
+   dev-libs/libzip:=
+   dev-libs/protobuf:=
+   dev-libs/qtkeychain[qt5(+)]
+   dev-qt/designer:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5[ssl]
+   dev-qt/qtpositioning:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtsvg:5
+   dev-qt/qtsql:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   media-gfx/exiv2:=
+   >=sci-libs/gdal-3.0.4:=[geos]
+   sci-libs/geos
+   sci-libs/libspatialindex:=
+   sys-libs/zlib
+   >=sci-libs/proj-4.9.3:=
+   >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+   >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+   3d? ( dev-qt/qt3d:5 )
+   georeferencer? ( sci-libs/gsl:= )
+   grass? ( =sci-geosciences/grass-7*:= )
+   hdf5? ( sci-libs/hdf5:= )
+   mapserver? ( dev-libs/fcgi )
+   netcdf? ( sci-libs/netcdf:= )
+   opencl? ( virtual/opencl )
+   oracle? (
+   dev-db/oracle-instantclient:=
+   sci-libs/gdal:=[oracle]
+   )
+   polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+   postgres? ( dev-db/postgresql:= )
+   python? (
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   dev-python/future[${PYTHON_USEDEP}]
+   dev-python/httplib2[${PYTHON_USEDEP}]
+   

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/files/, sci-geosciences/qgis/

[Andreas Sturmlechner]

commit: 1507e46e6af69496a92caf3c6690035d1d90e13c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec  8 13:18:20 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Dec  8 15:07:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1507e46e

sci-geosciences/qgis: Drop 3.18.3

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-geosciences/qgis/Manifest  |   1 -
 .../qgis/files/qgis-3.16.0-cmake-lib-suffix.patch  |  12 --
 .../qgis/files/qgis-3.16.1-default-qmldir.patch|  26 ---
 .../qgis/files/qgis-3.16.1-featuresummary.patch|  32 
 sci-geosciences/qgis/qgis-3.18.3.ebuild| 207 -
 5 files changed, 278 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index d4a7736de149..1f703bc557ef 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,3 @@
-DIST qgis-3.18.3.tar.bz2 121178524 BLAKE2B 
9f4c5bb4b4bf980c81b91a38716b280f48bf28d894550563607e202a7764f72c78b9520f060319c219e484254eaa31315fc232b459bec8cc6a1bc07b587babc6
 SHA512 
d2c08f1f0bdb2ba56a108dc9626122dfe90caae4f300ceb7be2d40112ee9bcc7f286f092f7f207812428aca926c7fe0dabe49039bba0f32f2f371d290536f0ef
 DIST qgis-3.20.3.tar.bz2 133775542 BLAKE2B 
f92273d208d7948bcd1642c994d7dac6b3a1115aaee5738e1974ff0ac38e42432abb18a64e982d46be10dd2dcb9da809b9065bb66c3f353e587a5b7f5544ec91
 SHA512 
abad3eb9774bbe2eaa86d554256a46eb179016f2df849d0c27c96db1bad6b73116c4456b81b176107a459bbf52714ccaf11a79bb9b39641192cd46f188420df0
 DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 
54fdd8517e37931dcdc81ef1006859d58d9e60a994a60588109a8337ade68e48710f0f50fe41e6e73c0e095187f00f15209258eb940ea3c80bba4f249d081cd5
 SHA512 
dc214d90c465cc7b8a82196d666b94971d60e64a28e38742aba5cdd86058e27fdf7cc3564bca3b330cf1820c7594d9226576145461db399c458a26ee569e299b
 DIST qgis-3.22.1.tar.bz2 136772144 BLAKE2B 
ba3a5d9db2a487ff10800da0ab12de4b6d3c1dab72e286d0cafef1804429f59e6c80fd05d662e8abadb7216811f3cbe36bb50d54b077a5c4db7cabcb1002a826
 SHA512 
b49fdab97c707a3bd29c2ad288733373d406fe024e07873e6ba28653a9a8882f58115ae346523b2f07011be312e18bf2643c8f0b7979d4ba8ed07dce4579cba9

diff --git a/sci-geosciences/qgis/files/qgis-3.16.0-cmake-lib-suffix.patch 
b/sci-geosciences/qgis/files/qgis-3.16.0-cmake-lib-suffix.patch
deleted file mode 100644
index 1edba1f0e747..
--- a/sci-geosciences/qgis/files/qgis-3.16.0-cmake-lib-suffix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naru a/cmake/PyQtMacros.cmake b/cmake/PyQtMacros.cmake
 a/cmake/PyQtMacros.cmake   2019-10-28 08:23:18.776024266 +0100
-+++ b/cmake/PyQtMacros.cmake   2019-10-28 08:24:17.316024213 +0100
-@@ -36,7 +36,7 @@
-   ELSE(CMAKE_HOST_WIN32)
- # TODO osx
- SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic_wrapper.sh")
--SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib")
-+SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib${LIB_SUFFIX}")
-   ENDIF(CMAKE_HOST_WIN32)
- 
-   FOREACH(it ${ARGN})

diff --git a/sci-geosciences/qgis/files/qgis-3.16.1-default-qmldir.patch 
b/sci-geosciences/qgis/files/qgis-3.16.1-default-qmldir.patch
deleted file mode 100644
index 9a57d45984e2..
--- a/sci-geosciences/qgis/files/qgis-3.16.1-default-qmldir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ad432e066fcc3d985fb5a451ad128cdf35c1dad9 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Fri, 20 Nov 2020 20:41:36 +0100
-Subject: [PATCH] cmake: Fix DEFAULT_QML_DIR path to comply with LFS layout
-
-Signed-off-by: Andreas Sturmlechner 

- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 61b4c863d0..e7d0bdc8d3 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -750,7 +750,7 @@ if (WITH_CORE)
-   set (DEFAULT_LIBEXEC_SUBDIR lib${LIB_SUFFIX}/qgis)
-   set (DEFAULT_PLUGIN_SUBDIR  lib${LIB_SUFFIX}/qgis/plugins)
-   set (DEFAULT_INCLUDE_SUBDIR include/qgis)
--  set (DEFAULT_QML_SUBDIR qml)
-+  set (DEFAULT_QML_SUBDIR ${DEFAULT_DATA_SUBDIR}/qml)
- 
-   set (DEFAULT_SERVER_MODULE_SUBDIR ${DEFAULT_LIBEXEC_SUBDIR}/server)
- endif()
--- 
-2.29.2
-

diff --git a/sci-geosciences/qgis/files/qgis-3.16.1-featuresummary.patch 
b/sci-geosciences/qgis/files/qgis-3.16.1-featuresummary.patch
deleted file mode 100644
index b1098175647c..
--- a/sci-geosciences/qgis/files/qgis-3.16.1-featuresummary.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From f0fd6e80ad034cf7c49f4ba3708819424b6857b2 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Fri, 20 Nov 2020 20:41:06 +0100
-Subject: [PATCH] cmake: Use FeatureSummary
-
-Signed-off-by: Andreas Sturmlechner 

- CMakeLists.txt | 4 
- 1 file changed, 4 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f581b2c889..61b4c863d0 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -111,6 +111,8 @@ if 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: f31a945e9510fa8003687808dd9f27688780e78a
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec  5 18:27:50 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec  5 18:27:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f31a945e

sci-geosciences/qgis: Stabilize 3.22.0-r4 amd64, #828399

Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/qgis-3.22.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.22.0-r4.ebuild 
b/sci-geosciences/qgis/qgis-3.22.0-r4.ebuild
index c8150cce4fe3..19fa8cd32b85 100644
--- a/sci-geosciences/qgis/qgis-3.22.0-r4.ebuild
+++ b/sci-geosciences/qgis/qgis-3.22.0-r4.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = ** ]]; 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
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: edfccc36b88cde6d517bb8528ae9c37ef0041c24
Author: Sam James  gentoo  org>
AuthorDate: Mon Nov 22 10:56:03 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov 22 11:12:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edfccc36

sci-geosciences/qgis: fix UnusedInherits, add Python 3.10

Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/qgis-3.22.1.ebuild | 4 ++--
 sci-geosciences/qgis/qgis-.ebuild   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.22.1.ebuild 
b/sci-geosciences/qgis/qgis-3.22.1.ebuild
index c8150cce4fe3..af65e82db8df 100644
--- a/sci-geosciences/qgis/qgis-3.22.1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.22.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 PYTHON_REQ_USE="sqlite"
 
 if [[ ${PV} = ** ]]; then
@@ -14,7 +14,7 @@ else
examples? ( 
https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> 
qgis_sample_data-2.8.14.tar.gz )"
KEYWORDS="~amd64 ~x86"
 fi
-inherit cmake desktop python-single-r1 qmake-utils xdg
+inherit cmake python-single-r1 xdg
 
 DESCRIPTION="User friendly Geographic Information System"
 HOMEPAGE="https://www.qgis.org/;

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-.ebuild
index c8150cce4fe3..af65e82db8df 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ b/sci-geosciences/qgis/qgis-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 PYTHON_REQ_USE="sqlite"
 
 if [[ ${PV} = ** ]]; then
@@ -14,7 +14,7 @@ else
examples? ( 
https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> 
qgis_sample_data-2.8.14.tar.gz )"
KEYWORDS="~amd64 ~x86"
 fi
-inherit cmake desktop python-single-r1 qmake-utils xdg
+inherit cmake python-single-r1 xdg
 
 DESCRIPTION="User friendly Geographic Information System"
 HOMEPAGE="https://www.qgis.org/;

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: 9de6df5e358a5b7e158ce54e5f29b9586e1344e7
Author: Sam James  gentoo  org>
AuthorDate: Mon Nov 22 10:46:50 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov 22 10:55:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9de6df5e

sci-geosciences/qgis: add 3.22.1

Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/Manifest   |   1 +
 sci-geosciences/qgis/qgis-3.22.1.ebuild | 205 
 2 files changed, 206 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index b3e361a14acb..d4a7736de149 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,5 @@
 DIST qgis-3.18.3.tar.bz2 121178524 BLAKE2B 
9f4c5bb4b4bf980c81b91a38716b280f48bf28d894550563607e202a7764f72c78b9520f060319c219e484254eaa31315fc232b459bec8cc6a1bc07b587babc6
 SHA512 
d2c08f1f0bdb2ba56a108dc9626122dfe90caae4f300ceb7be2d40112ee9bcc7f286f092f7f207812428aca926c7fe0dabe49039bba0f32f2f371d290536f0ef
 DIST qgis-3.20.3.tar.bz2 133775542 BLAKE2B 
f92273d208d7948bcd1642c994d7dac6b3a1115aaee5738e1974ff0ac38e42432abb18a64e982d46be10dd2dcb9da809b9065bb66c3f353e587a5b7f5544ec91
 SHA512 
abad3eb9774bbe2eaa86d554256a46eb179016f2df849d0c27c96db1bad6b73116c4456b81b176107a459bbf52714ccaf11a79bb9b39641192cd46f188420df0
 DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 
54fdd8517e37931dcdc81ef1006859d58d9e60a994a60588109a8337ade68e48710f0f50fe41e6e73c0e095187f00f15209258eb940ea3c80bba4f249d081cd5
 SHA512 
dc214d90c465cc7b8a82196d666b94971d60e64a28e38742aba5cdd86058e27fdf7cc3564bca3b330cf1820c7594d9226576145461db399c458a26ee569e299b
+DIST qgis-3.22.1.tar.bz2 136772144 BLAKE2B 
ba3a5d9db2a487ff10800da0ab12de4b6d3c1dab72e286d0cafef1804429f59e6c80fd05d662e8abadb7216811f3cbe36bb50d54b077a5c4db7cabcb1002a826
 SHA512 
b49fdab97c707a3bd29c2ad288733373d406fe024e07873e6ba28653a9a8882f58115ae346523b2f07011be312e18bf2643c8f0b7979d4ba8ed07dce4579cba9
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.22.1.ebuild 
b/sci-geosciences/qgis/qgis-3.22.1.ebuild
new file mode 100644
index ..c8150cce4fe3
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.22.1.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_REQ_USE="sqlite"
+
+if [[ ${PV} = ** ]]; then
+   EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
+   inherit git-r3
+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"
+fi
+inherit cmake desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/;
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle 
polar postgres python qml serial"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+COMMON_DEPEND="
+   app-crypt/qca:2[qt5(+),ssl]
+   >=dev-db/spatialite-4.2.0
+   dev-db/sqlite:3
+   dev-libs/expat
+   dev-libs/libzip:=
+   dev-libs/protobuf:=
+   dev-libs/qtkeychain[qt5(+)]
+   dev-qt/designer:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5[ssl]
+   dev-qt/qtpositioning:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtsvg:5
+   dev-qt/qtsql:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   media-gfx/exiv2:=
+   >=sci-libs/gdal-3.0.4:=[geos]
+   sci-libs/geos
+   sci-libs/libspatialindex:=
+   sys-libs/zlib
+   >=sci-libs/proj-4.9.3:=
+   >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+   >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+   3d? ( dev-qt/qt3d:5 )
+   georeferencer? ( sci-libs/gsl:= )
+   grass? ( =sci-geosciences/grass-7*:= )
+   hdf5? ( sci-libs/hdf5:= )
+   mapserver? ( dev-libs/fcgi )
+   netcdf? ( sci-libs/netcdf:= )
+   opencl? ( virtual/opencl )
+   oracle? (
+   dev-db/oracle-instantclient:=
+   sci-libs/gdal:=[oracle]
+   )
+   polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+   postgres? ( dev-db/postgresql:= )
+   python? (
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   dev-python/future[${PYTHON_USEDEP}]
+   dev-python/httplib2[${PYTHON_USEDEP}]
+   

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit: a219f9ecf57b46d3f6f12834ab1e6a1be100b357
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Nov  9 15:23:35 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Nov  9 17:15:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a219f9ec

sci-geosciences/qgis: Drop 3.20.0-r2, 3.20.2-r1

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-geosciences/qgis/Manifest  |   2 -
 sci-geosciences/qgis/qgis-3.20.0-r2.ebuild | 204 
 sci-geosciences/qgis/qgis-3.20.2-r1.ebuild | 205 -
 3 files changed, 411 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 27954b25e10..b3e361a14ac 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,6 +1,4 @@
 DIST qgis-3.18.3.tar.bz2 121178524 BLAKE2B 
9f4c5bb4b4bf980c81b91a38716b280f48bf28d894550563607e202a7764f72c78b9520f060319c219e484254eaa31315fc232b459bec8cc6a1bc07b587babc6
 SHA512 
d2c08f1f0bdb2ba56a108dc9626122dfe90caae4f300ceb7be2d40112ee9bcc7f286f092f7f207812428aca926c7fe0dabe49039bba0f32f2f371d290536f0ef
-DIST qgis-3.20.0.tar.bz2 131619071 BLAKE2B 
c6644b6e858a38c5b15846d39293d5b92b849efb44d147b8968a5630db413b427150f20722a24e806a14af877b88c0b06774777fd01dd8753cd9305ba1c40e33
 SHA512 
0f1d9527d3cf4241ed7688fe4f13e459beb7848c99492a995ac30d8b0c874f3198007d25d9fbde51cc36e6e08029a2fdd2d023c88423adb925a0a99778df27bc
-DIST qgis-3.20.2.tar.bz2 132063211 BLAKE2B 
4482cb84e258d26313bab7fd045e3e0fee8541d6857de8f2192a351b51256b94e2c945c4e117d6394ee178c16b8e5a2f15cc1a51f99600e789a32ae14edb9601
 SHA512 
64d78fe16db1ae17dd22c5f05e83dac4ba50185a1c76e8dfe3205eeb39aa11d970ca59c83db72ff9828dc1610076fceab5a9fc797d6be2314165e95d3d9f2087
 DIST qgis-3.20.3.tar.bz2 133775542 BLAKE2B 
f92273d208d7948bcd1642c994d7dac6b3a1115aaee5738e1974ff0ac38e42432abb18a64e982d46be10dd2dcb9da809b9065bb66c3f353e587a5b7f5544ec91
 SHA512 
abad3eb9774bbe2eaa86d554256a46eb179016f2df849d0c27c96db1bad6b73116c4456b81b176107a459bbf52714ccaf11a79bb9b39641192cd46f188420df0
 DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 
54fdd8517e37931dcdc81ef1006859d58d9e60a994a60588109a8337ade68e48710f0f50fe41e6e73c0e095187f00f15209258eb940ea3c80bba4f249d081cd5
 SHA512 
dc214d90c465cc7b8a82196d666b94971d60e64a28e38742aba5cdd86058e27fdf7cc3564bca3b330cf1820c7594d9226576145461db399c458a26ee569e299b
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.20.0-r2.ebuild 
b/sci-geosciences/qgis/qgis-3.20.0-r2.ebuild
deleted file mode 100644
index 4cf3bfb4587..000
--- a/sci-geosciences/qgis/qgis-3.20.0-r2.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="sqlite"
-
-if [[ ${PV} = ** ]]; then
-   EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
-   inherit git-r3
-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"
-fi
-inherit cmake desktop python-single-r1 qmake-utils xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/;
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle 
polar postgres python qml serial"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-COMMON_DEPEND="
-   app-crypt/qca:2[qt5(+),ssl]
-   >=dev-db/spatialite-4.2.0
-   dev-db/sqlite:3
-   dev-libs/expat
-   dev-libs/libzip:=
-   dev-libs/protobuf:=
-   dev-libs/qtkeychain[qt5(+)]
-   dev-qt/designer:5
-   dev-qt/qtconcurrent:5
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5[ssl]
-   dev-qt/qtpositioning:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtsvg:5
-   dev-qt/qtsql:5
-   dev-qt/qtwidgets:5
-   dev-qt/qtxml:5
-   media-gfx/exiv2:=
-   >=sci-libs/gdal-3.0.4:=[geos]
-   sci-libs/geos
-   sci-libs/libspatialindex:=
-   sys-libs/zlib
-   >=sci-libs/proj-4.9.3:=
-   >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
-   >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-   3d? ( dev-qt/qt3d:5 )
-   georeferencer? ( sci-libs/gsl:= )
-   grass? ( =sci-geosciences/grass-7*:= )
-   hdf5? ( sci-libs/hdf5:= )
-   mapserver? ( dev-libs/fcgi )
-   netcdf? ( 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: edce817d1509321b845206b181dc050013d0fd5d
Author: Daniel M. Weeks  danweeks  net>
AuthorDate: Wed Oct 27 14:05:39 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 31 02:53:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edce817d

sci-geosciences/qgis: Fix qtserialport dependency

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Daniel M. Weeks  danweeks.net>
Closes: https://github.com/gentoo/gentoo/pull/22726
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/{qgis-3.20.0-r1.ebuild => qgis-3.20.0-r2.ebuild} | 1 -
 sci-geosciences/qgis/{qgis-3.20.2.ebuild => qgis-3.20.2-r1.ebuild}| 1 -
 sci-geosciences/qgis/{qgis-3.20.3.ebuild => qgis-3.20.3-r1.ebuild}| 1 -
 sci-geosciences/qgis/{qgis-3.22.0-r3.ebuild => qgis-3.22.0-r4.ebuild} | 1 -
 sci-geosciences/qgis/qgis-.ebuild | 1 -
 5 files changed, 5 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild 
b/sci-geosciences/qgis/qgis-3.20.0-r2.ebuild
similarity index 99%
rename from sci-geosciences/qgis/qgis-3.20.0-r1.ebuild
rename to sci-geosciences/qgis/qgis-3.20.0-r2.ebuild
index 5c5913d97ad..4cf3bfb4587 100644
--- a/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.0-r2.ebuild
@@ -43,7 +43,6 @@ COMMON_DEPEND="
dev-qt/qtnetwork:5[ssl]
dev-qt/qtpositioning:5
dev-qt/qtprintsupport:5
-   dev-qt/qtserialport:5
dev-qt/qtsvg:5
dev-qt/qtsql:5
dev-qt/qtwidgets:5

diff --git a/sci-geosciences/qgis/qgis-3.20.2.ebuild 
b/sci-geosciences/qgis/qgis-3.20.2-r1.ebuild
similarity index 99%
rename from sci-geosciences/qgis/qgis-3.20.2.ebuild
rename to sci-geosciences/qgis/qgis-3.20.2-r1.ebuild
index c9e0381c5f2..29d2851b45d 100644
--- a/sci-geosciences/qgis/qgis-3.20.2.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.2-r1.ebuild
@@ -43,7 +43,6 @@ COMMON_DEPEND="
dev-qt/qtnetwork:5[ssl]
dev-qt/qtpositioning:5
dev-qt/qtprintsupport:5
-   dev-qt/qtserialport:5
dev-qt/qtsvg:5
dev-qt/qtsql:5
dev-qt/qtwidgets:5

diff --git a/sci-geosciences/qgis/qgis-3.20.3.ebuild 
b/sci-geosciences/qgis/qgis-3.20.3-r1.ebuild
similarity index 99%
rename from sci-geosciences/qgis/qgis-3.20.3.ebuild
rename to sci-geosciences/qgis/qgis-3.20.3-r1.ebuild
index c9e0381c5f2..29d2851b45d 100644
--- a/sci-geosciences/qgis/qgis-3.20.3.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.3-r1.ebuild
@@ -43,7 +43,6 @@ COMMON_DEPEND="
dev-qt/qtnetwork:5[ssl]
dev-qt/qtpositioning:5
dev-qt/qtprintsupport:5
-   dev-qt/qtserialport:5
dev-qt/qtsvg:5
dev-qt/qtsql:5
dev-qt/qtwidgets:5

diff --git a/sci-geosciences/qgis/qgis-3.22.0-r3.ebuild 
b/sci-geosciences/qgis/qgis-3.22.0-r4.ebuild
similarity index 99%
rename from sci-geosciences/qgis/qgis-3.22.0-r3.ebuild
rename to sci-geosciences/qgis/qgis-3.22.0-r4.ebuild
index bb5286e0d88..c8150cce4fe 100644
--- a/sci-geosciences/qgis/qgis-3.22.0-r3.ebuild
+++ b/sci-geosciences/qgis/qgis-3.22.0-r4.ebuild
@@ -43,7 +43,6 @@ COMMON_DEPEND="
dev-qt/qtnetwork:5[ssl]
dev-qt/qtpositioning:5
dev-qt/qtprintsupport:5
-   dev-qt/qtserialport:5
dev-qt/qtsvg:5
dev-qt/qtsql:5
dev-qt/qtwidgets:5

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-.ebuild
index bb5286e0d88..c8150cce4fe 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ b/sci-geosciences/qgis/qgis-.ebuild
@@ -43,7 +43,6 @@ COMMON_DEPEND="
dev-qt/qtnetwork:5[ssl]
dev-qt/qtpositioning:5
dev-qt/qtprintsupport:5
-   dev-qt/qtserialport:5
dev-qt/qtsvg:5
dev-qt/qtsql:5
dev-qt/qtwidgets:5

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: 9cfc9af0ea3d0ca1864ad44bdfca16267770149b
Author: Sam James  gentoo  org>
AuthorDate: Wed Oct 27 22:31:22 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct 27 22:31:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cfc9af0

sci-geosciences/qgis: Stabilize 3.20.3 amd64, #820089

Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/qgis-3.20.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.20.3.ebuild 
b/sci-geosciences/qgis/qgis-3.20.3.ebuild
index ba166c28197..c9e0381c5f2 100644
--- a/sci-geosciences/qgis/qgis-3.20.3.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = ** ]]; 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
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: f98a5004a73f29d01f7901f3158a51f5a26cbc15
Author: Sam James  gentoo  org>
AuthorDate: Wed Oct 27 06:25:52 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct 27 06:26:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f98a5004

sci-geosciences/qgis: once again change PyQt5 dep

Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/{qgis-3.22.0-r2.ebuild => qgis-3.22.0-r3.ebuild} | 2 +-
 sci-geosciences/qgis/qgis-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.22.0-r2.ebuild 
b/sci-geosciences/qgis/qgis-3.22.0-r3.ebuild
similarity index 98%
rename from sci-geosciences/qgis/qgis-3.22.0-r2.ebuild
rename to sci-geosciences/qgis/qgis-3.22.0-r3.ebuild
index 005eb4fb7cb..bb5286e0d88 100644
--- a/sci-geosciences/qgis/qgis-3.22.0-r2.ebuild
+++ b/sci-geosciences/qgis/qgis-3.22.0-r3.ebuild
@@ -79,7 +79,7 @@ COMMON_DEPEND="
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/owslib[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
-   
dev-python/PyQt5[designer,network,positioning,printsupport,sql,svg,widgets,${PYTHON_USEDEP}]
+   
dev-python/PyQt5[designer,gui,network,positioning,printsupport,sql,svg,widgets,${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]
dev-python/pytz[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-.ebuild
index 005eb4fb7cb..bb5286e0d88 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ b/sci-geosciences/qgis/qgis-.ebuild
@@ -79,7 +79,7 @@ COMMON_DEPEND="
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/owslib[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
-   
dev-python/PyQt5[designer,network,positioning,printsupport,sql,svg,widgets,${PYTHON_USEDEP}]
+   
dev-python/PyQt5[designer,gui,network,positioning,printsupport,sql,svg,widgets,${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]
dev-python/pytz[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: 34aab6c54a181582d488e62145264cec28f405ea
Author: Sam James  gentoo  org>
AuthorDate: Wed Oct 27 06:04:28 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct 27 06:04:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34aab6c5

sci-geosciences/qgis: add more PyQt5 dependencies

Closes: https://bugs.gentoo.org/820269
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/{qgis-3.22.0-r1.ebuild => qgis-3.22.0-r2.ebuild} | 2 +-
 sci-geosciences/qgis/qgis-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.22.0-r1.ebuild 
b/sci-geosciences/qgis/qgis-3.22.0-r2.ebuild
similarity index 98%
rename from sci-geosciences/qgis/qgis-3.22.0-r1.ebuild
rename to sci-geosciences/qgis/qgis-3.22.0-r2.ebuild
index a5cfa1cb17a..005eb4fb7cb 100644
--- a/sci-geosciences/qgis/qgis-3.22.0-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.22.0-r2.ebuild
@@ -79,7 +79,7 @@ COMMON_DEPEND="
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/owslib[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
-   
dev-python/PyQt5[designer,network,positioning,sql,svg,${PYTHON_USEDEP}]
+   
dev-python/PyQt5[designer,network,positioning,printsupport,sql,svg,widgets,${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]
dev-python/pytz[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-.ebuild
index a5cfa1cb17a..005eb4fb7cb 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ b/sci-geosciences/qgis/qgis-.ebuild
@@ -79,7 +79,7 @@ COMMON_DEPEND="
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/owslib[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
-   
dev-python/PyQt5[designer,network,positioning,sql,svg,${PYTHON_USEDEP}]
+   
dev-python/PyQt5[designer,network,positioning,printsupport,sql,svg,widgets,${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]
dev-python/pytz[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: 362a4d1bbe6d8731b422e3055d032c110f70dccc
Author: Sam James  gentoo  org>
AuthorDate: Wed Oct 27 05:56:50 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct 27 05:57:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=362a4d1b

sci-geosciences/qgis: depend on dev-python/PyQt5[positioning]

Thanks-to: Bernd Feige  gmx.net>
Closes: https://bugs.gentoo.org/820401
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/{qgis-3.22.0.ebuild => qgis-3.22.0-r1.ebuild} | 2 +-
 sci-geosciences/qgis/qgis-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.22.0.ebuild 
b/sci-geosciences/qgis/qgis-3.22.0-r1.ebuild
similarity index 98%
rename from sci-geosciences/qgis/qgis-3.22.0.ebuild
rename to sci-geosciences/qgis/qgis-3.22.0-r1.ebuild
index ba166c28197..a5cfa1cb17a 100644
--- a/sci-geosciences/qgis/qgis-3.22.0.ebuild
+++ b/sci-geosciences/qgis/qgis-3.22.0-r1.ebuild
@@ -79,7 +79,7 @@ COMMON_DEPEND="
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/owslib[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
-   
dev-python/PyQt5[designer,network,sql,svg,${PYTHON_USEDEP}]
+   
dev-python/PyQt5[designer,network,positioning,sql,svg,${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]
dev-python/pytz[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-.ebuild
index ba166c28197..a5cfa1cb17a 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ b/sci-geosciences/qgis/qgis-.ebuild
@@ -79,7 +79,7 @@ COMMON_DEPEND="
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/owslib[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
-   
dev-python/PyQt5[designer,network,sql,svg,${PYTHON_USEDEP}]
+   
dev-python/PyQt5[designer,network,positioning,sql,svg,${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]
dev-python/pytz[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: d03c4a59a9ce447af26fffe3052e8d150ee19a55
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct 25 00:04:54 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 25 00:36:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d03c4a59

sci-geosciences/qgis: add 3.22.0

Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/Manifest   |   1 +
 sci-geosciences/qgis/qgis-3.22.0.ebuild | 206 
 2 files changed, 207 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index c5380f06630..27954b25e10 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -2,4 +2,5 @@ DIST qgis-3.18.3.tar.bz2 121178524 BLAKE2B 
9f4c5bb4b4bf980c81b91a38716b280f48bf2
 DIST qgis-3.20.0.tar.bz2 131619071 BLAKE2B 
c6644b6e858a38c5b15846d39293d5b92b849efb44d147b8968a5630db413b427150f20722a24e806a14af877b88c0b06774777fd01dd8753cd9305ba1c40e33
 SHA512 
0f1d9527d3cf4241ed7688fe4f13e459beb7848c99492a995ac30d8b0c874f3198007d25d9fbde51cc36e6e08029a2fdd2d023c88423adb925a0a99778df27bc
 DIST qgis-3.20.2.tar.bz2 132063211 BLAKE2B 
4482cb84e258d26313bab7fd045e3e0fee8541d6857de8f2192a351b51256b94e2c945c4e117d6394ee178c16b8e5a2f15cc1a51f99600e789a32ae14edb9601
 SHA512 
64d78fe16db1ae17dd22c5f05e83dac4ba50185a1c76e8dfe3205eeb39aa11d970ca59c83db72ff9828dc1610076fceab5a9fc797d6be2314165e95d3d9f2087
 DIST qgis-3.20.3.tar.bz2 133775542 BLAKE2B 
f92273d208d7948bcd1642c994d7dac6b3a1115aaee5738e1974ff0ac38e42432abb18a64e982d46be10dd2dcb9da809b9065bb66c3f353e587a5b7f5544ec91
 SHA512 
abad3eb9774bbe2eaa86d554256a46eb179016f2df849d0c27c96db1bad6b73116c4456b81b176107a459bbf52714ccaf11a79bb9b39641192cd46f188420df0
+DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 
54fdd8517e37931dcdc81ef1006859d58d9e60a994a60588109a8337ade68e48710f0f50fe41e6e73c0e095187f00f15209258eb940ea3c80bba4f249d081cd5
 SHA512 
dc214d90c465cc7b8a82196d666b94971d60e64a28e38742aba5cdd86058e27fdf7cc3564bca3b330cf1820c7594d9226576145461db399c458a26ee569e299b
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.22.0.ebuild 
b/sci-geosciences/qgis/qgis-3.22.0.ebuild
new file mode 100644
index 000..ba166c28197
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.22.0.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_REQ_USE="sqlite"
+
+if [[ ${PV} = ** ]]; then
+   EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
+   inherit git-r3
+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"
+fi
+inherit cmake desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/;
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle 
polar postgres python qml serial"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+COMMON_DEPEND="
+   app-crypt/qca:2[qt5(+),ssl]
+   >=dev-db/spatialite-4.2.0
+   dev-db/sqlite:3
+   dev-libs/expat
+   dev-libs/libzip:=
+   dev-libs/protobuf:=
+   dev-libs/qtkeychain[qt5(+)]
+   dev-qt/designer:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5[ssl]
+   dev-qt/qtpositioning:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtserialport:5
+   dev-qt/qtsvg:5
+   dev-qt/qtsql:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   media-gfx/exiv2:=
+   >=sci-libs/gdal-3.0.4:=[geos]
+   sci-libs/geos
+   sci-libs/libspatialindex:=
+   sys-libs/zlib
+   >=sci-libs/proj-4.9.3:=
+   >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+   >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+   3d? ( dev-qt/qt3d:5 )
+   georeferencer? ( sci-libs/gsl:= )
+   grass? ( =sci-geosciences/grass-7*:= )
+   hdf5? ( sci-libs/hdf5:= )
+   mapserver? ( dev-libs/fcgi )
+   netcdf? ( sci-libs/netcdf:= )
+   opencl? ( virtual/opencl )
+   oracle? (
+   dev-db/oracle-instantclient:=
+   sci-libs/gdal:=[oracle]
+   )
+   polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+   postgres? ( dev-db/postgresql:= )
+   python? (
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Michał Górny]

commit: 0fef24c1f5b80fe480f8e0980711a1574513c5c3
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Oct  9 06:35:52 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Oct  9 07:08:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fef24c1

sci-geosciences/qgis: Drop to ~x86 due to arch team slacking

Signed-off-by: Michał Górny  gentoo.org>

 sci-geosciences/qgis/qgis-3.18.3.ebuild | 2 +-
 sci-geosciences/qgis/qgis-3.20.2.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.18.3.ebuild 
b/sci-geosciences/qgis/qgis-3.18.3.ebuild
index d8e8430113f..9f48c0bfa4e 100644
--- a/sci-geosciences/qgis/qgis-3.18.3.ebuild
+++ b/sci-geosciences/qgis/qgis-3.18.3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = * ]]; 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.20.2.ebuild 
b/sci-geosciences/qgis/qgis-3.20.2.ebuild
index 51cd2ec672e..c9e0381c5f2 100644
--- a/sci-geosciences/qgis/qgis-3.20.2.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = ** ]]; 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
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Agostino Sarubbo]

commit: 836f749e817408e7eda9e34292b2f82bec09c379
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Sep 19 21:38:12 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Sep 19 21:39:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=836f749e

sci-geosciences/qgis: x86 stable wrt bug #813171

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-geosciences/qgis/qgis-3.20.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.20.2.ebuild 
b/sci-geosciences/qgis/qgis-3.20.2.ebuild
index c9e0381c5f2..51cd2ec672e 100644
--- a/sci-geosciences/qgis/qgis-3.20.2.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = ** ]]; 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
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Agostino Sarubbo]

commit: ff5b61ab9d4080f42213a480c9b818bd50646a8e
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Sep 17 14:14:54 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Sep 17 14:14:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff5b61ab

sci-geosciences/qgis: amd64 stable wrt bug #813171

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-geosciences/qgis/qgis-3.20.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.20.2.ebuild 
b/sci-geosciences/qgis/qgis-3.20.2.ebuild
index ba166c28197..c9e0381c5f2 100644
--- a/sci-geosciences/qgis/qgis-3.20.2.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = ** ]]; 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
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: 0fad94b2e8bdfcaa7048a7e4048a2f6752e0eeb6
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep 16 00:55:35 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep 16 01:17:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fad94b2

sci-geosciences/qgis: add 3.20.3

Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/Manifest | 1 +
 sci-geosciences/qgis/{qgis-.ebuild => qgis-3.20.3.ebuild} | 1 +
 sci-geosciences/qgis/qgis-.ebuild | 1 +
 3 files changed, 3 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 11e99a964bb..c5380f06630 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,5 @@
 DIST qgis-3.18.3.tar.bz2 121178524 BLAKE2B 
9f4c5bb4b4bf980c81b91a38716b280f48bf28d894550563607e202a7764f72c78b9520f060319c219e484254eaa31315fc232b459bec8cc6a1bc07b587babc6
 SHA512 
d2c08f1f0bdb2ba56a108dc9626122dfe90caae4f300ceb7be2d40112ee9bcc7f286f092f7f207812428aca926c7fe0dabe49039bba0f32f2f371d290536f0ef
 DIST qgis-3.20.0.tar.bz2 131619071 BLAKE2B 
c6644b6e858a38c5b15846d39293d5b92b849efb44d147b8968a5630db413b427150f20722a24e806a14af877b88c0b06774777fd01dd8753cd9305ba1c40e33
 SHA512 
0f1d9527d3cf4241ed7688fe4f13e459beb7848c99492a995ac30d8b0c874f3198007d25d9fbde51cc36e6e08029a2fdd2d023c88423adb925a0a99778df27bc
 DIST qgis-3.20.2.tar.bz2 132063211 BLAKE2B 
4482cb84e258d26313bab7fd045e3e0fee8541d6857de8f2192a351b51256b94e2c945c4e117d6394ee178c16b8e5a2f15cc1a51f99600e789a32ae14edb9601
 SHA512 
64d78fe16db1ae17dd22c5f05e83dac4ba50185a1c76e8dfe3205eeb39aa11d970ca59c83db72ff9828dc1610076fceab5a9fc797d6be2314165e95d3d9f2087
+DIST qgis-3.20.3.tar.bz2 133775542 BLAKE2B 
f92273d208d7948bcd1642c994d7dac6b3a1115aaee5738e1974ff0ac38e42432abb18a64e982d46be10dd2dcb9da809b9065bb66c3f353e587a5b7f5544ec91
 SHA512 
abad3eb9774bbe2eaa86d554256a46eb179016f2df849d0c27c96db1bad6b73116c4456b81b176107a459bbf52714ccaf11a79bb9b39641192cd46f188420df0
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-3.20.3.ebuild
similarity index 99%
copy from sci-geosciences/qgis/qgis-.ebuild
copy to sci-geosciences/qgis/qgis-3.20.3.ebuild
index 5c5913d97ad..ba166c28197 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.3.ebuild
@@ -123,6 +123,7 @@ src_configure() {
-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
-DQWT_INCLUDE_DIR=/usr/include/qwt6
-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
+   -DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml
-DPEDANTIC=OFF
-DUSE_CCACHE=OFF
-DWITH_ANALYSIS=ON

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-.ebuild
index 5c5913d97ad..ba166c28197 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ b/sci-geosciences/qgis/qgis-.ebuild
@@ -123,6 +123,7 @@ src_configure() {
-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
-DQWT_INCLUDE_DIR=/usr/include/qwt6
-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
+   -DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml
-DPEDANTIC=OFF
-DUSE_CCACHE=OFF
-DWITH_ANALYSIS=ON

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: 31abd35ca06a1f115470af72538574e29cf07376
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug 16 00:20:14 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 16 01:57:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31abd35c

sci-geosciences/qgis: add 3.20.2

Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/Manifest   |   1 +
 sci-geosciences/qgis/qgis-3.20.2.ebuild | 206 
 2 files changed, 207 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index d96957089cb..11e99a964bb 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,4 @@
 DIST qgis-3.18.3.tar.bz2 121178524 BLAKE2B 
9f4c5bb4b4bf980c81b91a38716b280f48bf28d894550563607e202a7764f72c78b9520f060319c219e484254eaa31315fc232b459bec8cc6a1bc07b587babc6
 SHA512 
d2c08f1f0bdb2ba56a108dc9626122dfe90caae4f300ceb7be2d40112ee9bcc7f286f092f7f207812428aca926c7fe0dabe49039bba0f32f2f371d290536f0ef
 DIST qgis-3.20.0.tar.bz2 131619071 BLAKE2B 
c6644b6e858a38c5b15846d39293d5b92b849efb44d147b8968a5630db413b427150f20722a24e806a14af877b88c0b06774777fd01dd8753cd9305ba1c40e33
 SHA512 
0f1d9527d3cf4241ed7688fe4f13e459beb7848c99492a995ac30d8b0c874f3198007d25d9fbde51cc36e6e08029a2fdd2d023c88423adb925a0a99778df27bc
+DIST qgis-3.20.2.tar.bz2 132063211 BLAKE2B 
4482cb84e258d26313bab7fd045e3e0fee8541d6857de8f2192a351b51256b94e2c945c4e117d6394ee178c16b8e5a2f15cc1a51f99600e789a32ae14edb9601
 SHA512 
64d78fe16db1ae17dd22c5f05e83dac4ba50185a1c76e8dfe3205eeb39aa11d970ca59c83db72ff9828dc1610076fceab5a9fc797d6be2314165e95d3d9f2087
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.20.2.ebuild 
b/sci-geosciences/qgis/qgis-3.20.2.ebuild
new file mode 100644
index 000..ba166c28197
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.20.2.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_REQ_USE="sqlite"
+
+if [[ ${PV} = ** ]]; then
+   EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
+   inherit git-r3
+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"
+fi
+inherit cmake desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/;
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle 
polar postgres python qml serial"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+COMMON_DEPEND="
+   app-crypt/qca:2[qt5(+),ssl]
+   >=dev-db/spatialite-4.2.0
+   dev-db/sqlite:3
+   dev-libs/expat
+   dev-libs/libzip:=
+   dev-libs/protobuf:=
+   dev-libs/qtkeychain[qt5(+)]
+   dev-qt/designer:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5[ssl]
+   dev-qt/qtpositioning:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtserialport:5
+   dev-qt/qtsvg:5
+   dev-qt/qtsql:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   media-gfx/exiv2:=
+   >=sci-libs/gdal-3.0.4:=[geos]
+   sci-libs/geos
+   sci-libs/libspatialindex:=
+   sys-libs/zlib
+   >=sci-libs/proj-4.9.3:=
+   >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+   >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+   3d? ( dev-qt/qt3d:5 )
+   georeferencer? ( sci-libs/gsl:= )
+   grass? ( =sci-geosciences/grass-7*:= )
+   hdf5? ( sci-libs/hdf5:= )
+   mapserver? ( dev-libs/fcgi )
+   netcdf? ( sci-libs/netcdf:= )
+   opencl? ( virtual/opencl )
+   oracle? (
+   dev-db/oracle-instantclient:=
+   sci-libs/gdal:=[oracle]
+   )
+   polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+   postgres? ( dev-db/postgresql:= )
+   python? (
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   dev-python/future[${PYTHON_USEDEP}]
+   dev-python/httplib2[${PYTHON_USEDEP}]
+   dev-python/jinja[${PYTHON_USEDEP}]
+   dev-python/markupsafe[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/owslib[${PYTHON_USEDEP}]
+   dev-python/pygments[${PYTHON_USEDEP}]
+   

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[David Seifert]

commit: c234acc551591776f4d0d1a582e4fe21655b7cde
Author: David Seifert  gentoo  org>
AuthorDate: Sat Jul 17 18:17:02 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Jul 17 18:17:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c234acc5

sci-geosciences/qgis: PYTHON_MULTI_USEDEP -> PYTHON_USEDEP

Signed-off-by: David Seifert  gentoo.org>

 sci-geosciences/qgis/qgis-3.18.3.ebuild| 32 +-
 sci-geosciences/qgis/qgis-3.20.0-r1.ebuild | 36 +++---
 sci-geosciences/qgis/qgis-.ebuild  | 36 +++---
 3 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.18.3.ebuild 
b/sci-geosciences/qgis/qgis-3.18.3.ebuild
index 7e4e3237f9f..d8e8430113f 100644
--- a/sci-geosciences/qgis/qgis-3.18.3.ebuild
+++ b/sci-geosciences/qgis/qgis-3.18.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="sqlite"
 
 if [[ ${PV} = * ]]; then
@@ -73,21 +73,21 @@ COMMON_DEPEND="
python? (
${PYTHON_DEPS}
$(python_gen_cond_dep '
-   dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
-   dev-python/jinja[${PYTHON_MULTI_USEDEP}]
-   dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
-   dev-python/owslib[${PYTHON_MULTI_USEDEP}]
-   dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-   
dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_MULTI_USEDEP}]
-   dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
-   dev-python/pytz[${PYTHON_MULTI_USEDEP}]
-   dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-   
>=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}]
-   dev-python/requests[${PYTHON_MULTI_USEDEP}]
-   =sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
-   postgres? ( 
dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
+   dev-python/httplib2[${PYTHON_USEDEP}]
+   dev-python/jinja[${PYTHON_USEDEP}]
+   dev-python/markupsafe[${PYTHON_USEDEP}]
+   dev-python/owslib[${PYTHON_USEDEP}]
+   dev-python/pygments[${PYTHON_USEDEP}]
+   
dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_USEDEP}]
+   dev-python/python-dateutil[${PYTHON_USEDEP}]
+   dev-python/pytz[${PYTHON_USEDEP}]
+   dev-python/pyyaml[${PYTHON_USEDEP}]
+   >=dev-python/qscintilla-python-2.10.3[${PYTHON_USEDEP}]
+   dev-python/requests[${PYTHON_USEDEP}]
+   =sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
+   postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
')
)
qml? ( dev-qt/qtdeclarative:5 )

diff --git a/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild 
b/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild
index d7f5ec4633f..5c5913d97ad 100644
--- a/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="sqlite"
 
 if [[ ${PV} = ** ]]; then
@@ -72,23 +72,23 @@ 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}]
-   dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-   dev-python/owslib[${PYTHON_MULTI_USEDEP}]
-   dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-   
dev-python/PyQt5[designer,network,sql,svg,${PYTHON_MULTI_USEDEP}]
-   dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
-   dev-python/pytz[${PYTHON_MULTI_USEDEP}]
-   dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-   
>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}]
-   dev-python/requests[${PYTHON_MULTI_USEDEP}]
-   =sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
-   postgres? ( 
dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
+   dev-python/future[${PYTHON_USEDEP}]
+   dev-python/httplib2[${PYTHON_USEDEP}]
+   dev-python/jinja[${PYTHON_USEDEP}]
+   dev-python/markupsafe[${PYTHON_USEDEP}]
+   

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit: aa01d5339cce93fa58abea6248e848a0159197fe
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jun 28 12:06:17 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jun 28 12:32:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa01d533

sci-geosciences/qgis: Drop 3.16.4, 3.16.8

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-geosciences/qgis/Manifest   |   2 -
 sci-geosciences/qgis/qgis-3.16.4.ebuild | 207 
 sci-geosciences/qgis/qgis-3.16.8.ebuild | 207 
 3 files changed, 416 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index a0c7a13da32..d96957089cb 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,5 +1,3 @@
-DIST qgis-3.16.4.tar.bz2 115427023 BLAKE2B 
1526350974b634d13f55b77e99ec54c8cd29eb523657657f72de0f9e9b2b47d931e503404b202fe2e181c8e191732cc4353091dd8dffcaefb6caa32ad47f
 SHA512 
a58ef90089416ac08ba014f483cf7f6f929ef97306e213a5d1855fe551ecc42631926f8e015134ebcbc368f134c9f3ed8f2fda1846a409f249ed00b104036d25
-DIST qgis-3.16.8.tar.bz2 116478775 BLAKE2B 
b4a310745ec24a41471073c390063e4aae2d58001dae18b8ea1f1b7f430e7380ae541c3fb7efc05a7bafe617f3bcc0b1f123654941622ee6d1d29cde40acc301
 SHA512 
4b4941c78a4eebf0ad2d6eaebdcd15cd1fa0a4435b4043b2c23bf388b9dc2e4ad0211cf9921e8c3b336bc94e619842ea9b21fe42ca4084e8c1bc889586f86db7
 DIST qgis-3.18.3.tar.bz2 121178524 BLAKE2B 
9f4c5bb4b4bf980c81b91a38716b280f48bf28d894550563607e202a7764f72c78b9520f060319c219e484254eaa31315fc232b459bec8cc6a1bc07b587babc6
 SHA512 
d2c08f1f0bdb2ba56a108dc9626122dfe90caae4f300ceb7be2d40112ee9bcc7f286f092f7f207812428aca926c7fe0dabe49039bba0f32f2f371d290536f0ef
 DIST qgis-3.20.0.tar.bz2 131619071 BLAKE2B 
c6644b6e858a38c5b15846d39293d5b92b849efb44d147b8968a5630db413b427150f20722a24e806a14af877b88c0b06774777fd01dd8753cd9305ba1c40e33
 SHA512 
0f1d9527d3cf4241ed7688fe4f13e459beb7848c99492a995ac30d8b0c874f3198007d25d9fbde51cc36e6e08029a2fdd2d023c88423adb925a0a99778df27bc
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.16.4.ebuild 
b/sci-geosciences/qgis/qgis-3.16.4.ebuild
deleted file mode 100644
index 7e4e3237f9f..000
--- a/sci-geosciences/qgis/qgis-3.16.4.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite"
-
-if [[ ${PV} = * ]]; then
-   EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
-   inherit git-r3
-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"
-fi
-inherit cmake desktop python-single-r1 qmake-utils xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/en/site/;
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle 
polar postgres python qml serial"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-BDEPEND="${PYTHON_DEPS}
-   dev-qt/linguist-tools:5
-   sys-devel/bison
-   sys-devel/flex
-"
-COMMON_DEPEND="
-   >=app-crypt/qca-2.3.0:2[ssl]
-   >=dev-db/spatialite-4.2.0
-   dev-db/sqlite:3
-   dev-libs/expat
-   dev-libs/libzip:=
-   dev-libs/protobuf:=
-   dev-libs/qtkeychain:=
-   dev-qt/designer:5
-   dev-qt/qtconcurrent:5
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5[ssl]
-   dev-qt/qtpositioning:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtsql:5
-   dev-qt/qtsvg:5
-   dev-qt/qtwidgets:5
-   dev-qt/qtxml:5
-   media-gfx/exiv2:=
-   >=sci-libs/gdal-3.0.4:=[geos]
-   sci-libs/geos
-   sci-libs/libspatialindex:=
-   >=sci-libs/proj-6.3.1:=
-   sys-libs/zlib
-   >=x11-libs/qscintilla-2.10.3:=
-   >=x11-libs/qwt-6.1.3-r2:6=[svg]
-   3d? ( dev-qt/qt3d:5 )
-   georeferencer? ( sci-libs/gsl:= )
-   grass? ( =sci-geosciences/grass-7*:= )
-   hdf5? ( sci-libs/hdf5:= )
-   mapserver? ( dev-libs/fcgi )
-   netcdf? ( sci-libs/netcdf:= )
-   opencl? ( virtual/opencl )
-   oracle? (
-   dev-db/oracle-instantclient:=
-   sci-libs/gdal:=[oracle]
-   )
-   polar? ( >=x11-libs/qwtpolar-1.1.1-r2 )
-   postgres? ( dev-db/postgresql:= )
-   python? (
-   ${PYTHON_DEPS}
-   

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit: cba4fa349314ab1a4d59ec75f19bc6a324cfc455
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jun 28 12:04:21 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jun 28 12:32:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cba4fa34

sci-geosciences/qgis: Disable WITH_QGIS_PROCESS if IUSE="-python"

Drop unused cmake variable.
Drop outdated QT_MIN_VER variable.

See also: https://bugs.gentoo.org/753236

Closes: https://bugs.gentoo.org/796821
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-geosciences/qgis/qgis-3.20.0-r1.ebuild | 57 +++---
 sci-geosciences/qgis/qgis-.ebuild  | 57 +++---
 2 files changed, 56 insertions(+), 58 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild 
b/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild
index 54363b3b17a..d7f5ec4633f 100644
--- a/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild
@@ -5,9 +5,8 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="sqlite"
-QT_MIN_VER="5.9.4"
 
-if [[ ${PV} = * ]]; then
+if [[ ${PV} = ** ]]; then
EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
inherit git-r3
 else
@@ -26,12 +25,9 @@ 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
-   sys-devel/bison
-   sys-devel/flex
-"
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
 COMMON_DEPEND="
app-crypt/qca:2[qt5(+),ssl]
>=dev-db/spatialite-4.2.0
@@ -40,18 +36,18 @@ COMMON_DEPEND="
dev-libs/libzip:=
dev-libs/protobuf:=
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:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5[ssl]
+   dev-qt/qtpositioning:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtserialport:5
+   dev-qt/qtsvg:5
+   dev-qt/qtsql:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
media-gfx/exiv2:=
>=sci-libs/gdal-3.0.4:=[geos]
sci-libs/geos
@@ -60,7 +56,7 @@ COMMON_DEPEND="
>=sci-libs/proj-4.9.3:=
>=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:5 )
georeferencer? ( sci-libs/gsl:= )
grass? ( =sci-geosciences/grass-7*:= )
hdf5? ( sci-libs/hdf5:= )
@@ -95,19 +91,22 @@ COMMON_DEPEND="
postgres? ( 
dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
')
)
-   qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
-   serial? ( >=dev-qt/qtserialport-${QT_MIN_VER}:5 )
+   qml? ( dev-qt/qtdeclarative:5 )
+   serial? ( dev-qt/qtserialport:5 )
 "
 DEPEND="${COMMON_DEPEND}
-   >=dev-qt/qttest-${QT_MIN_VER}:5
+   dev-qt/qttest:5
python? ( ${PYTHON_DEPS} )
 "
 RDEPEND="${COMMON_DEPEND}
sci-geosciences/gpsbabel
 "
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
+BDEPEND="
+   ${PYTHON_DEPS}
+   dev-qt/linguist-tools:5
+   sys-devel/bison
+   sys-devel/flex
+"
 
 pkg_setup() {
python-single-r1_pkg_setup
@@ -134,7 +133,6 @@ src_configure() {
-DENABLE_TESTS=OFF
-DWITH_3D=$(usex 3d)
-DWITH_GSL=$(usex georeferencer)
-   -DWITH_GEOREFERENCER=$(usex georeferencer)
-DWITH_GRASS7=$(usex grass)
$(cmake_use_find_package hdf5 HDF5)
-DWITH_SERVER=$(usex mapserver)
@@ -159,7 +157,8 @@ src_configure() {
mycmakeargs+=( -DGRASS_PREFIX7=${GRASSDIR} )
fi
 
-   use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
+   use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
+   mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue 
#39973
 
# bugs 612956, 648726
addpredict /dev/dri/renderD128

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-.ebuild
index 54363b3b17a..d7f5ec4633f 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: afa1ddd188a722f60925a4f14ed57c1d28946056
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 24 21:46:02 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 24 21:46:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afa1ddd1

sci-geosciences/qgis: Stabilize 3.18.3 x86, #798297

Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/qgis-3.18.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.18.3.ebuild 
b/sci-geosciences/qgis/qgis-3.18.3.ebuild
index 29a4f949adc..7e4e3237f9f 100644
--- a/sci-geosciences/qgis/qgis-3.18.3.ebuild
+++ b/sci-geosciences/qgis/qgis-3.18.3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = * ]]; 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
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: 7055261bb1046ca7bec5b2cb29251fcfd7887c26
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 24 21:42:57 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 24 21:42:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7055261b

sci-geosciences/qgis: Stabilize 3.18.3 amd64, #798297

Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/qgis-3.18.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.18.3.ebuild 
b/sci-geosciences/qgis/qgis-3.18.3.ebuild
index b9241f08516..29a4f949adc 100644
--- a/sci-geosciences/qgis/qgis-3.18.3.ebuild
+++ b/sci-geosciences/qgis/qgis-3.18.3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = * ]]; 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
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit: cfdaed855bf24e2b9cd961d8d857b4ba70f8ca9c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jun 24 08:51:21 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jun 24 08:51:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfdaed85

sci-geosciences/qgis: Drop 3.16.2-r1

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-geosciences/qgis/Manifest  |   1 -
 sci-geosciences/qgis/qgis-3.16.2-r1.ebuild | 207 -
 2 files changed, 208 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 05d84be13d3..a0c7a13da32 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,3 @@
-DIST qgis-3.16.2.tar.bz2 114086615 BLAKE2B 
85196072b792b5731dcbc85cfaaae1768e91d16bfdaa2190cfb6063753953b6ab0e8b17b0d3f5334259dffd5b8fb5be6b54a28ca9856dc4fc4079dee483888f6
 SHA512 
93582e54ff403ea05672a81be9e866b8f1fa9335e467723a087615511b8403c4a1d8447d5a433d0799c382b6cc99fb2f18cc9c6685ed6dc83cabb4d13a00f033
 DIST qgis-3.16.4.tar.bz2 115427023 BLAKE2B 
1526350974b634d13f55b77e99ec54c8cd29eb523657657f72de0f9e9b2b47d931e503404b202fe2e181c8e191732cc4353091dd8dffcaefb6caa32ad47f
 SHA512 
a58ef90089416ac08ba014f483cf7f6f929ef97306e213a5d1855fe551ecc42631926f8e015134ebcbc368f134c9f3ed8f2fda1846a409f249ed00b104036d25
 DIST qgis-3.16.8.tar.bz2 116478775 BLAKE2B 
b4a310745ec24a41471073c390063e4aae2d58001dae18b8ea1f1b7f430e7380ae541c3fb7efc05a7bafe617f3bcc0b1f123654941622ee6d1d29cde40acc301
 SHA512 
4b4941c78a4eebf0ad2d6eaebdcd15cd1fa0a4435b4043b2c23bf388b9dc2e4ad0211cf9921e8c3b336bc94e619842ea9b21fe42ca4084e8c1bc889586f86db7
 DIST qgis-3.18.3.tar.bz2 121178524 BLAKE2B 
9f4c5bb4b4bf980c81b91a38716b280f48bf28d894550563607e202a7764f72c78b9520f060319c219e484254eaa31315fc232b459bec8cc6a1bc07b587babc6
 SHA512 
d2c08f1f0bdb2ba56a108dc9626122dfe90caae4f300ceb7be2d40112ee9bcc7f286f092f7f207812428aca926c7fe0dabe49039bba0f32f2f371d290536f0ef

diff --git a/sci-geosciences/qgis/qgis-3.16.2-r1.ebuild 
b/sci-geosciences/qgis/qgis-3.16.2-r1.ebuild
deleted file mode 100644
index 7e4e3237f9f..000
--- a/sci-geosciences/qgis/qgis-3.16.2-r1.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite"
-
-if [[ ${PV} = * ]]; then
-   EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
-   inherit git-r3
-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"
-fi
-inherit cmake desktop python-single-r1 qmake-utils xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/en/site/;
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle 
polar postgres python qml serial"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-BDEPEND="${PYTHON_DEPS}
-   dev-qt/linguist-tools:5
-   sys-devel/bison
-   sys-devel/flex
-"
-COMMON_DEPEND="
-   >=app-crypt/qca-2.3.0:2[ssl]
-   >=dev-db/spatialite-4.2.0
-   dev-db/sqlite:3
-   dev-libs/expat
-   dev-libs/libzip:=
-   dev-libs/protobuf:=
-   dev-libs/qtkeychain:=
-   dev-qt/designer:5
-   dev-qt/qtconcurrent:5
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5[ssl]
-   dev-qt/qtpositioning:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtsql:5
-   dev-qt/qtsvg:5
-   dev-qt/qtwidgets:5
-   dev-qt/qtxml:5
-   media-gfx/exiv2:=
-   >=sci-libs/gdal-3.0.4:=[geos]
-   sci-libs/geos
-   sci-libs/libspatialindex:=
-   >=sci-libs/proj-6.3.1:=
-   sys-libs/zlib
-   >=x11-libs/qscintilla-2.10.3:=
-   >=x11-libs/qwt-6.1.3-r2:6=[svg]
-   3d? ( dev-qt/qt3d:5 )
-   georeferencer? ( sci-libs/gsl:= )
-   grass? ( =sci-geosciences/grass-7*:= )
-   hdf5? ( sci-libs/hdf5:= )
-   mapserver? ( dev-libs/fcgi )
-   netcdf? ( sci-libs/netcdf:= )
-   opencl? ( virtual/opencl )
-   oracle? (
-   dev-db/oracle-instantclient:=
-   sci-libs/gdal:=[oracle]
-   )
-   polar? ( >=x11-libs/qwtpolar-1.1.1-r2 )
-   postgres? ( dev-db/postgresql:= )
-   python? (
-   ${PYTHON_DEPS}
-   $(python_gen_cond_dep '
-   dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
-   dev-python/jinja[${PYTHON_MULTI_USEDEP}]
-   dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
-   dev-python/owslib[${PYTHON_MULTI_USEDEP}]
-   dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-   

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: e75d8d174545d9f72b1ac36caa220be1946a1458
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun 19 23:58:53 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 19 23:58:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e75d8d17

sci-geosciences/qgis: restore IUSE=serial

Closes: https://bugs.gentoo.org/796785
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/qgis-3.20.0-r1.ebuild | 4 +++-
 sci-geosciences/qgis/qgis-.ebuild  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild 
b/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild
index 1d740be8086..54363b3b17a 100644
--- a/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://www.qgis.org/;
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle 
polar postgres python qml"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle 
polar postgres python qml serial"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 
@@ -96,6 +96,7 @@ COMMON_DEPEND="
')
)
qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
+   serial? ( >=dev-qt/qtserialport-${QT_MIN_VER}:5 )
 "
 DEPEND="${COMMON_DEPEND}
>=dev-qt/qttest-${QT_MIN_VER}:5
@@ -145,6 +146,7 @@ src_configure() {
-DWITH_BINDINGS=$(usex python)
-DWITH_CUSTOM_WIDGETS=$(usex python)
-DWITH_QUICK=$(usex qml)
+   -DWITH_QT5SERIALPORT=$(usex serial)
-DWITH_QTWEBKIT=OFF
)
 

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-.ebuild
index 1d740be8086..54363b3b17a 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ b/sci-geosciences/qgis/qgis-.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://www.qgis.org/;
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle 
polar postgres python qml"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle 
polar postgres python qml serial"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 
@@ -96,6 +96,7 @@ COMMON_DEPEND="
')
)
qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
+   serial? ( >=dev-qt/qtserialport-${QT_MIN_VER}:5 )
 "
 DEPEND="${COMMON_DEPEND}
>=dev-qt/qttest-${QT_MIN_VER}:5
@@ -145,6 +146,7 @@ src_configure() {
-DWITH_BINDINGS=$(usex python)
-DWITH_CUSTOM_WIDGETS=$(usex python)
-DWITH_QUICK=$(usex qml)
+   -DWITH_QT5SERIALPORT=$(usex serial)
-DWITH_QTWEBKIT=OFF
)
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: d0027e6499f6174664e09ec9bdf98b7338f00887
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun 19 23:56:00 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 19 23:56:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0027e64

sci-geosciences/qgis: sync live ebuild

Add dev-libs/protobuf dependency here too.

Bug: https://bugs.gentoo.org/796770
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/qgis-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-.ebuild
index 4c2bb3fd009..1d740be8086 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ b/sci-geosciences/qgis/qgis-.ebuild
@@ -38,6 +38,7 @@ COMMON_DEPEND="
dev-db/sqlite:3
dev-libs/expat
dev-libs/libzip:=
+   dev-libs/protobuf:=
dev-libs/qtkeychain[qt5(+)]
>=dev-qt/designer-${QT_MIN_VER}:5
>=dev-qt/qtconcurrent-${QT_MIN_VER}:5

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: a227fe57173f1b88da147fed47e845d7d839fc50
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun 19 23:47:58 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 19 23:48:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a227fe57

sci-geosciences/qgis: add missing protobuf dep

Closes: https://bugs.gentoo.org/796770
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/{qgis-3.20.0.ebuild => qgis-3.20.0-r1.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-geosciences/qgis/qgis-3.20.0.ebuild 
b/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild
similarity index 99%
rename from sci-geosciences/qgis/qgis-3.20.0.ebuild
rename to sci-geosciences/qgis/qgis-3.20.0-r1.ebuild
index 4c2bb3fd009..1d740be8086 100644
--- a/sci-geosciences/qgis/qgis-3.20.0.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild
@@ -38,6 +38,7 @@ COMMON_DEPEND="
dev-db/sqlite:3
dev-libs/expat
dev-libs/libzip:=
+   dev-libs/protobuf:=
dev-libs/qtkeychain[qt5(+)]
>=dev-qt/designer-${QT_MIN_VER}:5
>=dev-qt/qtconcurrent-${QT_MIN_VER}:5

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: 5f0af375f318ccd4f1781c342fa52bf3c3aa1873
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun 19 02:10:01 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 19 02:10:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f0af375

sci-geosciences/qgis: guard sci-libs/gsl dep behind USE=georeferencer

Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/qgis-3.20.0.ebuild | 1 +
 sci-geosciences/qgis/qgis-.ebuild   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/sci-geosciences/qgis/qgis-3.20.0.ebuild 
b/sci-geosciences/qgis/qgis-3.20.0.ebuild
index 09e35f71d47..4c2bb3fd009 100644
--- a/sci-geosciences/qgis/qgis-3.20.0.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.0.ebuild
@@ -131,6 +131,7 @@ src_configure() {
-DWITH_QSPATIALITE=ON
-DENABLE_TESTS=OFF
-DWITH_3D=$(usex 3d)
+   -DWITH_GSL=$(usex georeferencer)
-DWITH_GEOREFERENCER=$(usex georeferencer)
-DWITH_GRASS7=$(usex grass)
$(cmake_use_find_package hdf5 HDF5)

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-.ebuild
index 09e35f71d47..4c2bb3fd009 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ b/sci-geosciences/qgis/qgis-.ebuild
@@ -131,6 +131,7 @@ src_configure() {
-DWITH_QSPATIALITE=ON
-DENABLE_TESTS=OFF
-DWITH_3D=$(usex 3d)
+   -DWITH_GSL=$(usex georeferencer)
-DWITH_GEOREFERENCER=$(usex georeferencer)
-DWITH_GRASS7=$(usex grass)
$(cmake_use_find_package hdf5 HDF5)

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: b7edc52ce77711610c6c1ff89909023b3a587c21
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun 19 00:04:17 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 19 00:04:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7edc52c

sci-geosciences/qgis: fix IncorrectCopyright

Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/qgis-3.20.0.ebuild | 2 +-
 sci-geosciences/qgis/qgis-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.20.0.ebuild 
b/sci-geosciences/qgis/qgis-3.20.0.ebuild
index 389d43b1494..09e35f71d47 100644
--- a/sci-geosciences/qgis/qgis-3.20.0.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-.ebuild
index 389d43b1494..09e35f71d47 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ b/sci-geosciences/qgis/qgis-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: e6172682bc3a8a6f33625d21ca3976dd1e8499c9
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 18 23:43:03 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 18 23:50:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6172682

sci-geosciences/qgis: add 3.16.8

Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/Manifest   |   1 +
 sci-geosciences/qgis/qgis-3.16.8.ebuild | 207 
 2 files changed, 208 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index be8c6dd9130..bdaa699fbd8 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,5 @@
 DIST qgis-3.16.2.tar.bz2 114086615 BLAKE2B 
85196072b792b5731dcbc85cfaaae1768e91d16bfdaa2190cfb6063753953b6ab0e8b17b0d3f5334259dffd5b8fb5be6b54a28ca9856dc4fc4079dee483888f6
 SHA512 
93582e54ff403ea05672a81be9e866b8f1fa9335e467723a087615511b8403c4a1d8447d5a433d0799c382b6cc99fb2f18cc9c6685ed6dc83cabb4d13a00f033
 DIST qgis-3.16.4.tar.bz2 115427023 BLAKE2B 
1526350974b634d13f55b77e99ec54c8cd29eb523657657f72de0f9e9b2b47d931e503404b202fe2e181c8e191732cc4353091dd8dffcaefb6caa32ad47f
 SHA512 
a58ef90089416ac08ba014f483cf7f6f929ef97306e213a5d1855fe551ecc42631926f8e015134ebcbc368f134c9f3ed8f2fda1846a409f249ed00b104036d25
+DIST qgis-3.16.8.tar.bz2 116478775 BLAKE2B 
b4a310745ec24a41471073c390063e4aae2d58001dae18b8ea1f1b7f430e7380ae541c3fb7efc05a7bafe617f3bcc0b1f123654941622ee6d1d29cde40acc301
 SHA512 
4b4941c78a4eebf0ad2d6eaebdcd15cd1fa0a4435b4043b2c23bf388b9dc2e4ad0211cf9921e8c3b336bc94e619842ea9b21fe42ca4084e8c1bc889586f86db7
 DIST qgis-3.18.3.tar.bz2 121178524 BLAKE2B 
9f4c5bb4b4bf980c81b91a38716b280f48bf28d894550563607e202a7764f72c78b9520f060319c219e484254eaa31315fc232b459bec8cc6a1bc07b587babc6
 SHA512 
d2c08f1f0bdb2ba56a108dc9626122dfe90caae4f300ceb7be2d40112ee9bcc7f286f092f7f207812428aca926c7fe0dabe49039bba0f32f2f371d290536f0ef
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.16.8.ebuild 
b/sci-geosciences/qgis/qgis-3.16.8.ebuild
new file mode 100644
index 000..b9241f08516
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.16.8.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="sqlite"
+
+if [[ ${PV} = * ]]; then
+   EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
+   inherit git-r3
+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"
+fi
+inherit cmake desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/en/site/;
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle 
polar postgres python qml serial"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+BDEPEND="${PYTHON_DEPS}
+   dev-qt/linguist-tools:5
+   sys-devel/bison
+   sys-devel/flex
+"
+COMMON_DEPEND="
+   >=app-crypt/qca-2.3.0:2[ssl]
+   >=dev-db/spatialite-4.2.0
+   dev-db/sqlite:3
+   dev-libs/expat
+   dev-libs/libzip:=
+   dev-libs/protobuf:=
+   dev-libs/qtkeychain:=
+   dev-qt/designer:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5[ssl]
+   dev-qt/qtpositioning:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtsql:5
+   dev-qt/qtsvg:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   media-gfx/exiv2:=
+   >=sci-libs/gdal-3.0.4:=[geos]
+   sci-libs/geos
+   sci-libs/libspatialindex:=
+   >=sci-libs/proj-6.3.1:=
+   sys-libs/zlib
+   >=x11-libs/qscintilla-2.10.3:=
+   >=x11-libs/qwt-6.1.3-r2:6=[svg]
+   3d? ( dev-qt/qt3d:5 )
+   georeferencer? ( sci-libs/gsl:= )
+   grass? ( =sci-geosciences/grass-7*:= )
+   hdf5? ( sci-libs/hdf5:= )
+   mapserver? ( dev-libs/fcgi )
+   netcdf? ( sci-libs/netcdf:= )
+   opencl? ( virtual/opencl )
+   oracle? (
+   dev-db/oracle-instantclient:=
+   sci-libs/gdal:=[oracle]
+   )
+   polar? ( >=x11-libs/qwtpolar-1.1.1-r2 )
+   postgres? ( dev-db/postgresql:= )
+   python? (
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+   dev-python/jinja[${PYTHON_MULTI_USEDEP}]
+   

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: 00f77af5ca55b979e14e1466648e57e6ca67ea10
Author: José de Paula Rodrigues  gmail  com>
AuthorDate: Fri May 28 20:54:12 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 19 00:03:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00f77af5

sci-geosciences/qgis: fixes for paths, adds PDAL option

Closes: https://bugs.gentoo.org/693074
Signed-off-by: José de Paula Rodrigues  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/qgis-.ebuild | 87 +--
 1 file changed, 42 insertions(+), 45 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-.ebuild
index b1e1845009f..60ed73da843 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ b/sci-geosciences/qgis/qgis-.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 PYTHON_REQ_USE="sqlite"
+QT_MIN_VER="5.9.4"
 
 if [[ ${PV} = * ]]; then
EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
@@ -17,48 +18,47 @@ fi
 inherit cmake desktop python-single-r1 qmake-utils xdg
 
 DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/en/site/;
+HOMEPAGE="https://www.qgis.org/;
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle 
polar postgres python qml"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle 
polar postgres python qml webkit"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 
-BDEPEND="${PYTHON_DEPS}
-   dev-qt/linguist-tools:5
+BDEPEND="
+   ${PYTHON_DEPS}
+   >=dev-qt/linguist-tools-${QT_MIN_VER}:5
sys-devel/bison
sys-devel/flex
 "
 COMMON_DEPEND="
-   >=app-crypt/qca-2.3.0:2[ssl]
+   app-crypt/qca:2[qt5(+),ssl]
>=dev-db/spatialite-4.2.0
dev-db/sqlite:3
dev-libs/expat
dev-libs/libzip:=
-   dev-libs/protobuf:=
-   dev-libs/qtkeychain:=
-   dev-qt/designer:5
-   dev-qt/qtconcurrent:5
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5[ssl]
-   dev-qt/qtpositioning:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtserialport:5
-   dev-qt/qtsql:5
-   dev-qt/qtsvg:5
-   dev-qt/qtwidgets:5
-   dev-qt/qtxml:5
+   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
media-gfx/exiv2:=
>=sci-libs/gdal-3.0.4:=[geos]
sci-libs/geos
sci-libs/libspatialindex:=
-   >=sci-libs/proj-6.3.1:=
-   sys-libs/zlib
-   >=x11-libs/qscintilla-2.10.3:=
-   >=x11-libs/qwt-6.1.3-r2:6=[svg]
-   3d? ( dev-qt/qt3d:5 )
+   >=sci-libs/proj-4.9.3:=
+   >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+   >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+   3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
georeferencer? ( sci-libs/gsl:= )
grass? ( =sci-geosciences/grass-7*:= )
hdf5? ( sci-libs/hdf5:= )
@@ -69,21 +69,23 @@ COMMON_DEPEND="
dev-db/oracle-instantclient:=
sci-libs/gdal:=[oracle]
)
-   polar? ( >=x11-libs/qwtpolar-1.1.1-r2 )
+   polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
postgres? ( dev-db/postgresql:= )
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}]
+   dev-python/numpy[${PYTHON_MULTI_USEDEP}]
dev-python/owslib[${PYTHON_MULTI_USEDEP}]
dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-   
dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_MULTI_USEDEP}]
+   
dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}]
dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
dev-python/pytz[${PYTHON_MULTI_USEDEP}]
dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-   
>=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}]
+ 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: ee1db344d0746f7f1e340777a5698acd6491109b
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 18 23:50:20 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 19 00:03:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee1db344

sci-geosciences/qgis: add 3.20.0, adjust live

* Drop USE=webkit (adds a deprecated dependency on qtwebkit)
* Restore zlib dependency

Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/Manifest |  1 +
 sci-geosciences/qgis/{qgis-.ebuild => qgis-3.20.0.ebuild} | 10 +-
 sci-geosciences/qgis/qgis-.ebuild | 10 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index bdaa699fbd8..05d84be13d3 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -2,4 +2,5 @@ DIST qgis-3.16.2.tar.bz2 114086615 BLAKE2B 
85196072b792b5731dcbc85cfaaae1768e91d
 DIST qgis-3.16.4.tar.bz2 115427023 BLAKE2B 
1526350974b634d13f55b77e99ec54c8cd29eb523657657f72de0f9e9b2b47d931e503404b202fe2e181c8e191732cc4353091dd8dffcaefb6caa32ad47f
 SHA512 
a58ef90089416ac08ba014f483cf7f6f929ef97306e213a5d1855fe551ecc42631926f8e015134ebcbc368f134c9f3ed8f2fda1846a409f249ed00b104036d25
 DIST qgis-3.16.8.tar.bz2 116478775 BLAKE2B 
b4a310745ec24a41471073c390063e4aae2d58001dae18b8ea1f1b7f430e7380ae541c3fb7efc05a7bafe617f3bcc0b1f123654941622ee6d1d29cde40acc301
 SHA512 
4b4941c78a4eebf0ad2d6eaebdcd15cd1fa0a4435b4043b2c23bf388b9dc2e4ad0211cf9921e8c3b336bc94e619842ea9b21fe42ca4084e8c1bc889586f86db7
 DIST qgis-3.18.3.tar.bz2 121178524 BLAKE2B 
9f4c5bb4b4bf980c81b91a38716b280f48bf28d894550563607e202a7764f72c78b9520f060319c219e484254eaa31315fc232b459bec8cc6a1bc07b587babc6
 SHA512 
d2c08f1f0bdb2ba56a108dc9626122dfe90caae4f300ceb7be2d40112ee9bcc7f286f092f7f207812428aca926c7fe0dabe49039bba0f32f2f371d290536f0ef
+DIST qgis-3.20.0.tar.bz2 131619071 BLAKE2B 
c6644b6e858a38c5b15846d39293d5b92b849efb44d147b8968a5630db413b427150f20722a24e806a14af877b88c0b06774777fd01dd8753cd9305ba1c40e33
 SHA512 
0f1d9527d3cf4241ed7688fe4f13e459beb7848c99492a995ac30d8b0c874f3198007d25d9fbde51cc36e6e08029a2fdd2d023c88423adb925a0a99778df27bc
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-3.20.0.ebuild
similarity index 95%
copy from sci-geosciences/qgis/qgis-.ebuild
copy to sci-geosciences/qgis/qgis-3.20.0.ebuild
index 60ed73da843..389d43b1494 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="sqlite"
 QT_MIN_VER="5.9.4"
 
@@ -22,7 +22,7 @@ HOMEPAGE="https://www.qgis.org/;
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle 
polar postgres python qml webkit"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle 
polar postgres python qml"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 
@@ -55,6 +55,7 @@ COMMON_DEPEND="
>=sci-libs/gdal-3.0.4:=[geos]
sci-libs/geos
sci-libs/libspatialindex:=
+   sys-libs/zlib
>=sci-libs/proj-4.9.3:=
>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
@@ -81,7 +82,7 @@ COMMON_DEPEND="
dev-python/numpy[${PYTHON_MULTI_USEDEP}]
dev-python/owslib[${PYTHON_MULTI_USEDEP}]
dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-   
dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}]
+   
dev-python/PyQt5[designer,network,sql,svg,${PYTHON_MULTI_USEDEP}]
dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
dev-python/pytz[${PYTHON_MULTI_USEDEP}]
dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
@@ -94,7 +95,6 @@ COMMON_DEPEND="
')
)
qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
-   webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20200309-r1:5 )
 "
 DEPEND="${COMMON_DEPEND}
>=dev-qt/qttest-${QT_MIN_VER}:5
@@ -143,7 +143,7 @@ src_configure() {
-DWITH_BINDINGS=$(usex python)
-DWITH_CUSTOM_WIDGETS=$(usex python)
-DWITH_QUICK=$(usex qml)
-   -DWITH_QTWEBKIT=$(usex webkit)
+   -DWITH_QTWEBKIT=OFF
)
 
if use grass; then

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-.ebuild

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andrew Ammerlaan]

commit: 87904651acf8af647a7d5259a17d798a1eb95239
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Tue Jun  1 19:19:19 2021 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Jun  1 19:19:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87904651

sci-geosciences/qgis: restrict to  gentoo.org>

 sci-geosciences/qgis/qgis-3.16.2-r1.ebuild | 2 +-
 sci-geosciences/qgis/qgis-3.16.4.ebuild| 2 +-
 sci-geosciences/qgis/qgis-3.18.3.ebuild| 2 +-
 sci-geosciences/qgis/qgis-.ebuild  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.16.2-r1.ebuild 
b/sci-geosciences/qgis/qgis-3.16.2-r1.ebuild
index eb880dfdcb7..7e4e3237f9f 100644
--- a/sci-geosciences/qgis/qgis-3.16.2-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.2-r1.ebuild
@@ -84,7 +84,7 @@ COMMON_DEPEND="
dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]

>=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}]
dev-python/requests[${PYTHON_MULTI_USEDEP}]
-   dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
+   =sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
postgres? ( 
dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )

diff --git a/sci-geosciences/qgis/qgis-3.16.4.ebuild 
b/sci-geosciences/qgis/qgis-3.16.4.ebuild
index eb880dfdcb7..7e4e3237f9f 100644
--- a/sci-geosciences/qgis/qgis-3.16.4.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.4.ebuild
@@ -84,7 +84,7 @@ COMMON_DEPEND="
dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]

>=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}]
dev-python/requests[${PYTHON_MULTI_USEDEP}]
-   dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
+   =sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
postgres? ( 
dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )

diff --git a/sci-geosciences/qgis/qgis-3.18.3.ebuild 
b/sci-geosciences/qgis/qgis-3.18.3.ebuild
index 80d2d316881..b9241f08516 100644
--- a/sci-geosciences/qgis/qgis-3.18.3.ebuild
+++ b/sci-geosciences/qgis/qgis-3.18.3.ebuild
@@ -84,7 +84,7 @@ COMMON_DEPEND="
dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]

>=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}]
dev-python/requests[${PYTHON_MULTI_USEDEP}]
-   dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
+   =sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
postgres? ( 
dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-.ebuild
index a7669d52a7e..b1e1845009f 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ b/sci-geosciences/qgis/qgis-.ebuild
@@ -85,7 +85,7 @@ COMMON_DEPEND="
dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]

>=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}]
dev-python/requests[${PYTHON_MULTI_USEDEP}]
-   dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
+   =sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
postgres? ( 
dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Agostino Sarubbo]

commit: 6ef85b2cf63603b176d100f4d05b1c7a2089a02c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu May 27 06:56:48 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu May 27 06:56:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ef85b2c

sci-geosciences/qgis: x86 stable wrt bug #790698

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-geosciences/qgis/qgis-3.16.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.16.4.ebuild 
b/sci-geosciences/qgis/qgis-3.16.4.ebuild
index 455fe2bc8c3..eb880dfdcb7 100644
--- a/sci-geosciences/qgis/qgis-3.16.4.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.4.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = * ]]; 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
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Agostino Sarubbo]

commit: 829b8c27c9661b35f4ae4fdd1519b9c64546b168
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed May 26 15:09:18 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed May 26 15:09:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=829b8c27

sci-geosciences/qgis: amd64 stable wrt bug #790698

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-geosciences/qgis/qgis-3.16.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.16.4.ebuild 
b/sci-geosciences/qgis/qgis-3.16.4.ebuild
index 80d2d316881..455fe2bc8c3 100644
--- a/sci-geosciences/qgis/qgis-3.16.4.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.4.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = * ]]; 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
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: 9ca12402d402ccae0d6968c586c224847dd1b09d
Author: Sam James  gentoo  org>
AuthorDate: Mon May 17 22:24:51 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 17 22:24:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ca12402

sci-geosciences/qgis: add 3.18.3

Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/Manifest   |   1 +
 sci-geosciences/qgis/qgis-3.18.3.ebuild | 207 
 2 files changed, 208 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index d7a5855a3f6..be8c6dd9130 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,4 @@
 DIST qgis-3.16.2.tar.bz2 114086615 BLAKE2B 
85196072b792b5731dcbc85cfaaae1768e91d16bfdaa2190cfb6063753953b6ab0e8b17b0d3f5334259dffd5b8fb5be6b54a28ca9856dc4fc4079dee483888f6
 SHA512 
93582e54ff403ea05672a81be9e866b8f1fa9335e467723a087615511b8403c4a1d8447d5a433d0799c382b6cc99fb2f18cc9c6685ed6dc83cabb4d13a00f033
 DIST qgis-3.16.4.tar.bz2 115427023 BLAKE2B 
1526350974b634d13f55b77e99ec54c8cd29eb523657657f72de0f9e9b2b47d931e503404b202fe2e181c8e191732cc4353091dd8dffcaefb6caa32ad47f
 SHA512 
a58ef90089416ac08ba014f483cf7f6f929ef97306e213a5d1855fe551ecc42631926f8e015134ebcbc368f134c9f3ed8f2fda1846a409f249ed00b104036d25
+DIST qgis-3.18.3.tar.bz2 121178524 BLAKE2B 
9f4c5bb4b4bf980c81b91a38716b280f48bf28d894550563607e202a7764f72c78b9520f060319c219e484254eaa31315fc232b459bec8cc6a1bc07b587babc6
 SHA512 
d2c08f1f0bdb2ba56a108dc9626122dfe90caae4f300ceb7be2d40112ee9bcc7f286f092f7f207812428aca926c7fe0dabe49039bba0f32f2f371d290536f0ef
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.18.3.ebuild 
b/sci-geosciences/qgis/qgis-3.18.3.ebuild
new file mode 100644
index 000..80d2d316881
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.18.3.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="sqlite"
+
+if [[ ${PV} = * ]]; then
+   EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
+   inherit git-r3
+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"
+fi
+inherit cmake desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/en/site/;
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle 
polar postgres python qml serial"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+BDEPEND="${PYTHON_DEPS}
+   dev-qt/linguist-tools:5
+   sys-devel/bison
+   sys-devel/flex
+"
+COMMON_DEPEND="
+   >=app-crypt/qca-2.3.0:2[ssl]
+   >=dev-db/spatialite-4.2.0
+   dev-db/sqlite:3
+   dev-libs/expat
+   dev-libs/libzip:=
+   dev-libs/protobuf:=
+   dev-libs/qtkeychain:=
+   dev-qt/designer:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5[ssl]
+   dev-qt/qtpositioning:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtsql:5
+   dev-qt/qtsvg:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   media-gfx/exiv2:=
+   >=sci-libs/gdal-3.0.4:=[geos]
+   sci-libs/geos
+   sci-libs/libspatialindex:=
+   >=sci-libs/proj-6.3.1:=
+   sys-libs/zlib
+   >=x11-libs/qscintilla-2.10.3:=
+   >=x11-libs/qwt-6.1.3-r2:6=[svg]
+   3d? ( dev-qt/qt3d:5 )
+   georeferencer? ( sci-libs/gsl:= )
+   grass? ( =sci-geosciences/grass-7*:= )
+   hdf5? ( sci-libs/hdf5:= )
+   mapserver? ( dev-libs/fcgi )
+   netcdf? ( sci-libs/netcdf:= )
+   opencl? ( virtual/opencl )
+   oracle? (
+   dev-db/oracle-instantclient:=
+   sci-libs/gdal:=[oracle]
+   )
+   polar? ( >=x11-libs/qwtpolar-1.1.1-r2 )
+   postgres? ( dev-db/postgresql:= )
+   python? (
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+   dev-python/jinja[${PYTHON_MULTI_USEDEP}]
+   dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
+   dev-python/owslib[${PYTHON_MULTI_USEDEP}]
+   dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+   
dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_MULTI_USEDEP}]
+   

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: c24f4ab513106b77f36df89a0cf5d00dfe071b9c
Author: Sam James  gentoo  org>
AuthorDate: Mon May 17 20:42:11 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 17 20:42:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c24f4ab5

sci-geosciences/qgis: fix IncorrectCopyright in 

Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/qgis-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-.ebuild
index 921c9439ce9..a7669d52a7e 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ b/sci-geosciences/qgis/qgis-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: 5e1231be59417d7a35a50639b1e610ea1741590e
Author: Daniel M. Weeks  danweeks  net>
AuthorDate: Sun Dec 27 15:25:02 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 17 20:40:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e1231be

sci-geosciences/qgis: Make qtserialport optional

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Daniel M. Weeks  danweeks.net>
Closes: https://github.com/gentoo/gentoo/pull/18836
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/metadata.xml  | 1 +
 sci-geosciences/qgis/{qgis-3.16.2.ebuild => qgis-3.16.2-r1.ebuild} | 5 +++--
 sci-geosciences/qgis/qgis-3.16.4.ebuild| 5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/sci-geosciences/qgis/metadata.xml 
b/sci-geosciences/qgis/metadata.xml
index 6d6203f5cea..c54d1821656 100644
--- a/sci-geosciences/qgis/metadata.xml
+++ b/sci-geosciences/qgis/metadata.xml
@@ -23,5 +23,6 @@
Enable OpenCL support
Enable support for the polar coordinate 
system via x11-libs/qwtpolar
Enable support Qml-based plugins using 
dev-qt/qtdeclarative
+   Enable support for serial GPS using 
dev-qt/qtserialport

 

diff --git a/sci-geosciences/qgis/qgis-3.16.2.ebuild 
b/sci-geosciences/qgis/qgis-3.16.2-r1.ebuild
similarity index 97%
rename from sci-geosciences/qgis/qgis-3.16.2.ebuild
rename to sci-geosciences/qgis/qgis-3.16.2-r1.ebuild
index ec3f713c80a..eb880dfdcb7 100644
--- a/sci-geosciences/qgis/qgis-3.16.2.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.2-r1.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://www.qgis.org/en/site/;
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle 
polar postgres python qml"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle 
polar postgres python qml serial"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 
@@ -45,7 +45,6 @@ COMMON_DEPEND="
dev-qt/qtnetwork:5[ssl]
dev-qt/qtpositioning:5
dev-qt/qtprintsupport:5
-   dev-qt/qtserialport:5
dev-qt/qtsql:5
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
@@ -92,6 +91,7 @@ COMMON_DEPEND="
')
)
qml? ( dev-qt/qtdeclarative:5 )
+   serial? ( dev-qt/qtserialport:5 )
 "
 DEPEND="${COMMON_DEPEND}
dev-qt/qttest:5
@@ -149,6 +149,7 @@ src_configure() {
-DWITH_BINDINGS=$(usex python)
-DWITH_CUSTOM_WIDGETS=$(usex python)
-DWITH_QUICK=$(usex qml)
+   -DWITH_QT5SERIALPORT=$(usex serial)
-DWITH_QTWEBKIT=OFF
)
 

diff --git a/sci-geosciences/qgis/qgis-3.16.4.ebuild 
b/sci-geosciences/qgis/qgis-3.16.4.ebuild
index de610e62b0f..80d2d316881 100644
--- a/sci-geosciences/qgis/qgis-3.16.4.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.4.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://www.qgis.org/en/site/;
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle 
polar postgres python qml"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle 
polar postgres python qml serial"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 
@@ -45,7 +45,6 @@ COMMON_DEPEND="
dev-qt/qtnetwork:5[ssl]
dev-qt/qtpositioning:5
dev-qt/qtprintsupport:5
-   dev-qt/qtserialport:5
dev-qt/qtsql:5
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
@@ -92,6 +91,7 @@ COMMON_DEPEND="
')
)
qml? ( dev-qt/qtdeclarative:5 )
+   serial? ( dev-qt/qtserialport:5 )
 "
 DEPEND="${COMMON_DEPEND}
dev-qt/qttest:5
@@ -149,6 +149,7 @@ src_configure() {
-DWITH_BINDINGS=$(usex python)
-DWITH_CUSTOM_WIDGETS=$(usex python)
-DWITH_QUICK=$(usex qml)
+   -DWITH_QT5SERIALPORT=$(usex serial)
-DWITH_QTWEBKIT=OFF
)
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: 138f05b842b0ee3a89b97550c8f02c998d3ccad8
Author: t0b3  gmail  com>
AuthorDate: Tue Mar 23 18:56:42 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 17 20:39:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=138f05b8

sci-geosciences/qgis: adapt path for grass78 (current ebuild)

Closes: https://bugs.gentoo.org/775245
Signed-off-by: t0b3  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/20082
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/qgis-3.16.2.ebuild | 2 +-
 sci-geosciences/qgis/qgis-3.16.4.ebuild | 2 +-
 sci-geosciences/qgis/qgis-.ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.16.2.ebuild 
b/sci-geosciences/qgis/qgis-3.16.2.ebuild
index 6217f4f7590..ec3f713c80a 100644
--- a/sci-geosciences/qgis/qgis-3.16.2.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.2.ebuild
@@ -154,7 +154,7 @@ src_configure() {
 
if use grass; then
mycmakeargs+=(
-   -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+   -DGRASS_PREFIX7=/usr/$(get_libdir)/grass78
)
fi
 

diff --git a/sci-geosciences/qgis/qgis-3.16.4.ebuild 
b/sci-geosciences/qgis/qgis-3.16.4.ebuild
index fbfc6e31fbf..de610e62b0f 100644
--- a/sci-geosciences/qgis/qgis-3.16.4.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.4.ebuild
@@ -154,7 +154,7 @@ src_configure() {
 
if use grass; then
mycmakeargs+=(
-   -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+   -DGRASS_PREFIX7=/usr/$(get_libdir)/grass78
)
fi
 

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-.ebuild
index e895dc65581..921c9439ce9 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ b/sci-geosciences/qgis/qgis-.ebuild
@@ -154,7 +154,7 @@ src_configure() {
 
if use grass; then
mycmakeargs+=(
-   -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+   -DGRASS_PREFIX7=/usr/$(get_libdir)/grass78
)
fi
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit: c8693e91a608a5b4e94498ffc48419b7acfe04df
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Mar 12 21:23:51 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Mar 12 21:48:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8693e91

sci-geosciences/qgis: Drop 3.16.3

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-geosciences/qgis/Manifest   |   1 -
 sci-geosciences/qgis/qgis-3.16.3.ebuild | 206 
 2 files changed, 207 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 7b0272bd550..d7a5855a3f6 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,3 @@
 DIST qgis-3.16.2.tar.bz2 114086615 BLAKE2B 
85196072b792b5731dcbc85cfaaae1768e91d16bfdaa2190cfb6063753953b6ab0e8b17b0d3f5334259dffd5b8fb5be6b54a28ca9856dc4fc4079dee483888f6
 SHA512 
93582e54ff403ea05672a81be9e866b8f1fa9335e467723a087615511b8403c4a1d8447d5a433d0799c382b6cc99fb2f18cc9c6685ed6dc83cabb4d13a00f033
-DIST qgis-3.16.3.tar.bz2 114542609 BLAKE2B 
e194881fbc25420c85dbe061388371da195e9696e86f441eb85a420d10a8e14ee01a7a4e4a353cdde2105ab54503b57f6f022a1800ae0dc3dc6fe87edccdeee2
 SHA512 
f45492ee0b1c1d45c9eca390c65ca8a6e7a35aa392beb3b55d7b7813eb7d437621441df251722fc9d0218e8d339f12cff7c1d2db366e1835c0b79236c89de365
 DIST qgis-3.16.4.tar.bz2 115427023 BLAKE2B 
1526350974b634d13f55b77e99ec54c8cd29eb523657657f72de0f9e9b2b47d931e503404b202fe2e181c8e191732cc4353091dd8dffcaefb6caa32ad47f
 SHA512 
a58ef90089416ac08ba014f483cf7f6f929ef97306e213a5d1855fe551ecc42631926f8e015134ebcbc368f134c9f3ed8f2fda1846a409f249ed00b104036d25
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.16.3.ebuild 
b/sci-geosciences/qgis/qgis-3.16.3.ebuild
deleted file mode 100644
index fbfc6e31fbf..000
--- a/sci-geosciences/qgis/qgis-3.16.3.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite"
-
-if [[ ${PV} = * ]]; then
-   EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
-   inherit git-r3
-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"
-fi
-inherit cmake desktop python-single-r1 qmake-utils xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/en/site/;
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle 
polar postgres python qml"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-BDEPEND="${PYTHON_DEPS}
-   dev-qt/linguist-tools:5
-   sys-devel/bison
-   sys-devel/flex
-"
-COMMON_DEPEND="
-   >=app-crypt/qca-2.3.0:2[ssl]
-   >=dev-db/spatialite-4.2.0
-   dev-db/sqlite:3
-   dev-libs/expat
-   dev-libs/libzip:=
-   dev-libs/protobuf:=
-   dev-libs/qtkeychain:=
-   dev-qt/designer:5
-   dev-qt/qtconcurrent:5
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5[ssl]
-   dev-qt/qtpositioning:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtserialport:5
-   dev-qt/qtsql:5
-   dev-qt/qtsvg:5
-   dev-qt/qtwidgets:5
-   dev-qt/qtxml:5
-   media-gfx/exiv2:=
-   >=sci-libs/gdal-3.0.4:=[geos]
-   sci-libs/geos
-   sci-libs/libspatialindex:=
-   >=sci-libs/proj-6.3.1:=
-   sys-libs/zlib
-   >=x11-libs/qscintilla-2.10.3:=
-   >=x11-libs/qwt-6.1.3-r2:6=[svg]
-   3d? ( dev-qt/qt3d:5 )
-   georeferencer? ( sci-libs/gsl:= )
-   grass? ( =sci-geosciences/grass-7*:= )
-   hdf5? ( sci-libs/hdf5:= )
-   mapserver? ( dev-libs/fcgi )
-   netcdf? ( sci-libs/netcdf:= )
-   opencl? ( virtual/opencl )
-   oracle? (
-   dev-db/oracle-instantclient:=
-   sci-libs/gdal:=[oracle]
-   )
-   polar? ( >=x11-libs/qwtpolar-1.1.1-r2 )
-   postgres? ( dev-db/postgresql:= )
-   python? (
-   ${PYTHON_DEPS}
-   $(python_gen_cond_dep '
-   dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
-   dev-python/jinja[${PYTHON_MULTI_USEDEP}]
-   dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
-   dev-python/owslib[${PYTHON_MULTI_USEDEP}]
-   dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-   

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit: da21c3eb7772fa65bba01c80496a0a83336b2ee6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Feb 25 11:49:37 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb 25 12:50:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da21c3eb

sci-geosciences/qgis: 3.16.4 version bump

Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-geosciences/qgis/Manifest   |   1 +
 sci-geosciences/qgis/qgis-3.16.4.ebuild | 206 
 2 files changed, 207 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index f6515188344..7b0272bd550 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,4 @@
 DIST qgis-3.16.2.tar.bz2 114086615 BLAKE2B 
85196072b792b5731dcbc85cfaaae1768e91d16bfdaa2190cfb6063753953b6ab0e8b17b0d3f5334259dffd5b8fb5be6b54a28ca9856dc4fc4079dee483888f6
 SHA512 
93582e54ff403ea05672a81be9e866b8f1fa9335e467723a087615511b8403c4a1d8447d5a433d0799c382b6cc99fb2f18cc9c6685ed6dc83cabb4d13a00f033
 DIST qgis-3.16.3.tar.bz2 114542609 BLAKE2B 
e194881fbc25420c85dbe061388371da195e9696e86f441eb85a420d10a8e14ee01a7a4e4a353cdde2105ab54503b57f6f022a1800ae0dc3dc6fe87edccdeee2
 SHA512 
f45492ee0b1c1d45c9eca390c65ca8a6e7a35aa392beb3b55d7b7813eb7d437621441df251722fc9d0218e8d339f12cff7c1d2db366e1835c0b79236c89de365
+DIST qgis-3.16.4.tar.bz2 115427023 BLAKE2B 
1526350974b634d13f55b77e99ec54c8cd29eb523657657f72de0f9e9b2b47d931e503404b202fe2e181c8e191732cc4353091dd8dffcaefb6caa32ad47f
 SHA512 
a58ef90089416ac08ba014f483cf7f6f929ef97306e213a5d1855fe551ecc42631926f8e015134ebcbc368f134c9f3ed8f2fda1846a409f249ed00b104036d25
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.16.4.ebuild 
b/sci-geosciences/qgis/qgis-3.16.4.ebuild
new file mode 100644
index 000..fbfc6e31fbf
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.16.4.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="sqlite"
+
+if [[ ${PV} = * ]]; then
+   EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
+   inherit git-r3
+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"
+fi
+inherit cmake desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/en/site/;
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle 
polar postgres python qml"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+BDEPEND="${PYTHON_DEPS}
+   dev-qt/linguist-tools:5
+   sys-devel/bison
+   sys-devel/flex
+"
+COMMON_DEPEND="
+   >=app-crypt/qca-2.3.0:2[ssl]
+   >=dev-db/spatialite-4.2.0
+   dev-db/sqlite:3
+   dev-libs/expat
+   dev-libs/libzip:=
+   dev-libs/protobuf:=
+   dev-libs/qtkeychain:=
+   dev-qt/designer:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5[ssl]
+   dev-qt/qtpositioning:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtserialport:5
+   dev-qt/qtsql:5
+   dev-qt/qtsvg:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   media-gfx/exiv2:=
+   >=sci-libs/gdal-3.0.4:=[geos]
+   sci-libs/geos
+   sci-libs/libspatialindex:=
+   >=sci-libs/proj-6.3.1:=
+   sys-libs/zlib
+   >=x11-libs/qscintilla-2.10.3:=
+   >=x11-libs/qwt-6.1.3-r2:6=[svg]
+   3d? ( dev-qt/qt3d:5 )
+   georeferencer? ( sci-libs/gsl:= )
+   grass? ( =sci-geosciences/grass-7*:= )
+   hdf5? ( sci-libs/hdf5:= )
+   mapserver? ( dev-libs/fcgi )
+   netcdf? ( sci-libs/netcdf:= )
+   opencl? ( virtual/opencl )
+   oracle? (
+   dev-db/oracle-instantclient:=
+   sci-libs/gdal:=[oracle]
+   )
+   polar? ( >=x11-libs/qwtpolar-1.1.1-r2 )
+   postgres? ( dev-db/postgresql:= )
+   python? (
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+   dev-python/jinja[${PYTHON_MULTI_USEDEP}]
+   dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
+   dev-python/owslib[${PYTHON_MULTI_USEDEP}]
+   dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+  

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/files/, sci-geosciences/qgis/

[Andreas Sturmlechner]

commit: d41469167b90b0a16722c68b95d149b24cd6540b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Jan 22 18:49:48 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jan 23 00:25:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4146916

sci-geosciences/qgis: Drop 3.16.0-r1

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-geosciences/qgis/Manifest  |   1 -
 .../qgis/files/qgis-3.4.7-default-qmldir.patch |  25 ---
 .../qgis/files/qgis-3.4.7-featuresummary.patch |  31 
 sci-geosciences/qgis/qgis-3.16.0-r1.ebuild | 206 -
 4 files changed, 263 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 89be781dcfc..f6515188344 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,3 @@
-DIST qgis-3.16.0.tar.bz2 113238659 BLAKE2B 
42bdf8d0d69b28c20aa0decd79883c3b83d2ff9aa9d7633866b6c7d624ad20cb602beeca0e22585077c3d0ceba791e51b81ba221bc305c9bd2ebff71a4ea4bd4
 SHA512 
c87959a6412f85b6e4d30d4677e0e0914fd9a1009348c8bfe6063d7e1a9416f0a33ae63ded15273d8edde26ae0e6c32ba4d62d83c33c2c6251c444360dc47d10
 DIST qgis-3.16.2.tar.bz2 114086615 BLAKE2B 
85196072b792b5731dcbc85cfaaae1768e91d16bfdaa2190cfb6063753953b6ab0e8b17b0d3f5334259dffd5b8fb5be6b54a28ca9856dc4fc4079dee483888f6
 SHA512 
93582e54ff403ea05672a81be9e866b8f1fa9335e467723a087615511b8403c4a1d8447d5a433d0799c382b6cc99fb2f18cc9c6685ed6dc83cabb4d13a00f033
 DIST qgis-3.16.3.tar.bz2 114542609 BLAKE2B 
e194881fbc25420c85dbe061388371da195e9696e86f441eb85a420d10a8e14ee01a7a4e4a353cdde2105ab54503b57f6f022a1800ae0dc3dc6fe87edccdeee2
 SHA512 
f45492ee0b1c1d45c9eca390c65ca8a6e7a35aa392beb3b55d7b7813eb7d437621441df251722fc9d0218e8d339f12cff7c1d2db366e1835c0b79236c89de365
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/files/qgis-3.4.7-default-qmldir.patch 
b/sci-geosciences/qgis/files/qgis-3.4.7-default-qmldir.patch
deleted file mode 100644
index 97f8ac12858..000
--- a/sci-geosciences/qgis/files/qgis-3.4.7-default-qmldir.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9d095f7d502cbcea8c70c127be322568b71f6663 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Sun, 28 Apr 2019 12:41:51 +0200
-Subject: [PATCH] cmake: Fix DEFAULT_QML_DIR path to comply with LFS layout
-

- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4626042ca4..fe93ff3c4f 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -660,7 +660,7 @@ IF (WITH_CORE)
-   SET (DEFAULT_LIBEXEC_SUBDIR lib${LIB_SUFFIX}/qgis)
-   SET (DEFAULT_PLUGIN_SUBDIR  lib${LIB_SUFFIX}/qgis/plugins)
-   SET (DEFAULT_INCLUDE_SUBDIR include/qgis)
--  SET (DEFAULT_QML_SUBDIR qml)
-+  SET (DEFAULT_QML_SUBDIR ${DEFAULT_DATA_SUBDIR}/qml)
- 
-   SET (DEFAULT_SERVER_MODULE_SUBDIR ${DEFAULT_LIBEXEC_SUBDIR}/server)
- ENDIF (APPLE)
--- 
-2.21.0
-

diff --git a/sci-geosciences/qgis/files/qgis-3.4.7-featuresummary.patch 
b/sci-geosciences/qgis/files/qgis-3.4.7-featuresummary.patch
deleted file mode 100644
index ec971cef779..000
--- a/sci-geosciences/qgis/files/qgis-3.4.7-featuresummary.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0744b51784b779eab4bb2e78ed084d31258b5b4d Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Sun, 28 Apr 2019 00:10:21 +0200
-Subject: [PATCH] cmake: Use FeatureSummary
-

- CMakeLists.txt | 4 
- 1 file changed, 4 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4dff8ea0f4..4626042ca4 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -71,6 +71,8 @@ IF(NOT MSVC)
-   endif(USE_CCACHE)
- endif(NOT MSVC)
- 
-+include(FeatureSummary)
-+
- # in generated makefiles use relative paths so the project dir is moveable
- # Note commented out since it cause problems but it would be nice to resolve 
these and enable
- #
-@@ -937,3 +939,5 @@ ENDIF (WITH_CORE)
- IF (UNIX AND NOT APPLE)
-   ADD_SUBDIRECTORY(linux)
- ENDIF (UNIX AND NOT APPLE)
-+
-+FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
--- 
-2.21.0
-

diff --git a/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild 
b/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
deleted file mode 100644
index d952288f81f..000
--- a/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite"
-
-if [[ ${PV} = * ]]; then
-   

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit: 091317329fd6236b12e2d101a94fc00c933bd9e5
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 22 18:45:18 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 22 18:45:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09131732

sci-geosciences/qgis: Stabilize 3.16.2 x86, #765562

Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/qgis/qgis-3.16.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.16.2.ebuild 
b/sci-geosciences/qgis/qgis-3.16.2.ebuild
index 2a1d767d336..6217f4f7590 100644
--- a/sci-geosciences/qgis/qgis-3.16.2.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = * ]]; 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
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Agostino Sarubbo]

commit: 37b9e6d989dc3b0ec30b9724f2633a752a729e38
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jan 21 13:31:47 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jan 21 13:31:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37b9e6d9

sci-geosciences/qgis: amd64 stable wrt bug #765562

Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-geosciences/qgis/qgis-3.16.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.16.2.ebuild 
b/sci-geosciences/qgis/qgis-3.16.2.ebuild
index c27cdfcd10c..2a1d767d336 100644
--- a/sci-geosciences/qgis/qgis-3.16.2.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} = * ]]; 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
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit: 6912d81d22746fc548f52aad7cf6593b1621de28
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jan 20 11:15:40 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jan 20 11:16:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6912d81d

sci-geosciences/qgis: Revert "Remove old"

This reverts commit 64e9a4ada230757c61483c86b3bd19582402043d.

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-geosciences/qgis/Manifest   |   1 +
 sci-geosciences/qgis/qgis-3.16.2.ebuild | 206 
 2 files changed, 207 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 3fa616c6251..89be781dcfc 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,4 @@
 DIST qgis-3.16.0.tar.bz2 113238659 BLAKE2B 
42bdf8d0d69b28c20aa0decd79883c3b83d2ff9aa9d7633866b6c7d624ad20cb602beeca0e22585077c3d0ceba791e51b81ba221bc305c9bd2ebff71a4ea4bd4
 SHA512 
c87959a6412f85b6e4d30d4677e0e0914fd9a1009348c8bfe6063d7e1a9416f0a33ae63ded15273d8edde26ae0e6c32ba4d62d83c33c2c6251c444360dc47d10
+DIST qgis-3.16.2.tar.bz2 114086615 BLAKE2B 
85196072b792b5731dcbc85cfaaae1768e91d16bfdaa2190cfb6063753953b6ab0e8b17b0d3f5334259dffd5b8fb5be6b54a28ca9856dc4fc4079dee483888f6
 SHA512 
93582e54ff403ea05672a81be9e866b8f1fa9335e467723a087615511b8403c4a1d8447d5a433d0799c382b6cc99fb2f18cc9c6685ed6dc83cabb4d13a00f033
 DIST qgis-3.16.3.tar.bz2 114542609 BLAKE2B 
e194881fbc25420c85dbe061388371da195e9696e86f441eb85a420d10a8e14ee01a7a4e4a353cdde2105ab54503b57f6f022a1800ae0dc3dc6fe87edccdeee2
 SHA512 
f45492ee0b1c1d45c9eca390c65ca8a6e7a35aa392beb3b55d7b7813eb7d437621441df251722fc9d0218e8d339f12cff7c1d2db366e1835c0b79236c89de365
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.16.2.ebuild 
b/sci-geosciences/qgis/qgis-3.16.2.ebuild
new file mode 100644
index 000..c27cdfcd10c
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.16.2.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="sqlite"
+
+if [[ ${PV} = * ]]; then
+   EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
+   inherit git-r3
+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"
+fi
+inherit cmake desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/en/site/;
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle 
polar postgres python qml"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+BDEPEND="${PYTHON_DEPS}
+   dev-qt/linguist-tools:5
+   sys-devel/bison
+   sys-devel/flex
+"
+COMMON_DEPEND="
+   >=app-crypt/qca-2.3.0:2[ssl]
+   >=dev-db/spatialite-4.2.0
+   dev-db/sqlite:3
+   dev-libs/expat
+   dev-libs/libzip:=
+   dev-libs/protobuf:=
+   dev-libs/qtkeychain:=
+   dev-qt/designer:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5[ssl]
+   dev-qt/qtpositioning:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtserialport:5
+   dev-qt/qtsql:5
+   dev-qt/qtsvg:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   media-gfx/exiv2:=
+   >=sci-libs/gdal-3.0.4:=[geos]
+   sci-libs/geos
+   sci-libs/libspatialindex:=
+   >=sci-libs/proj-6.3.1:=
+   sys-libs/zlib
+   >=x11-libs/qscintilla-2.10.3:=
+   >=x11-libs/qwt-6.1.3-r2:6=[svg]
+   3d? ( dev-qt/qt3d:5 )
+   georeferencer? ( sci-libs/gsl:= )
+   grass? ( =sci-geosciences/grass-7*:= )
+   hdf5? ( sci-libs/hdf5:= )
+   mapserver? ( dev-libs/fcgi )
+   netcdf? ( sci-libs/netcdf:= )
+   opencl? ( virtual/opencl )
+   oracle? (
+   dev-db/oracle-instantclient:=
+   sci-libs/gdal:=[oracle]
+   )
+   polar? ( >=x11-libs/qwtpolar-1.1.1-r2 )
+   postgres? ( dev-db/postgresql:= )
+   python? (
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+   dev-python/jinja[${PYTHON_MULTI_USEDEP}]
+   dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
+   dev-python/owslib[${PYTHON_MULTI_USEDEP}]
+   dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+  

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit: 775c5b91f58214b816771d76774e390cc0f474ef
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Jan 15 21:12:27 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jan 15 21:38:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=775c5b91

sci-geosciences/qgis: 3.16.3 version bump

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-geosciences/qgis/Manifest   |   1 +
 sci-geosciences/qgis/qgis-3.16.3.ebuild | 206 
 2 files changed, 207 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 123680b6b75..89be781dcfc 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,4 @@
 DIST qgis-3.16.0.tar.bz2 113238659 BLAKE2B 
42bdf8d0d69b28c20aa0decd79883c3b83d2ff9aa9d7633866b6c7d624ad20cb602beeca0e22585077c3d0ceba791e51b81ba221bc305c9bd2ebff71a4ea4bd4
 SHA512 
c87959a6412f85b6e4d30d4677e0e0914fd9a1009348c8bfe6063d7e1a9416f0a33ae63ded15273d8edde26ae0e6c32ba4d62d83c33c2c6251c444360dc47d10
 DIST qgis-3.16.2.tar.bz2 114086615 BLAKE2B 
85196072b792b5731dcbc85cfaaae1768e91d16bfdaa2190cfb6063753953b6ab0e8b17b0d3f5334259dffd5b8fb5be6b54a28ca9856dc4fc4079dee483888f6
 SHA512 
93582e54ff403ea05672a81be9e866b8f1fa9335e467723a087615511b8403c4a1d8447d5a433d0799c382b6cc99fb2f18cc9c6685ed6dc83cabb4d13a00f033
+DIST qgis-3.16.3.tar.bz2 114542609 BLAKE2B 
e194881fbc25420c85dbe061388371da195e9696e86f441eb85a420d10a8e14ee01a7a4e4a353cdde2105ab54503b57f6f022a1800ae0dc3dc6fe87edccdeee2
 SHA512 
f45492ee0b1c1d45c9eca390c65ca8a6e7a35aa392beb3b55d7b7813eb7d437621441df251722fc9d0218e8d339f12cff7c1d2db366e1835c0b79236c89de365
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.16.3.ebuild 
b/sci-geosciences/qgis/qgis-3.16.3.ebuild
new file mode 100644
index 000..fbfc6e31fbf
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.16.3.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="sqlite"
+
+if [[ ${PV} = * ]]; then
+   EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
+   inherit git-r3
+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"
+fi
+inherit cmake desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/en/site/;
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle 
polar postgres python qml"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+BDEPEND="${PYTHON_DEPS}
+   dev-qt/linguist-tools:5
+   sys-devel/bison
+   sys-devel/flex
+"
+COMMON_DEPEND="
+   >=app-crypt/qca-2.3.0:2[ssl]
+   >=dev-db/spatialite-4.2.0
+   dev-db/sqlite:3
+   dev-libs/expat
+   dev-libs/libzip:=
+   dev-libs/protobuf:=
+   dev-libs/qtkeychain:=
+   dev-qt/designer:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5[ssl]
+   dev-qt/qtpositioning:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtserialport:5
+   dev-qt/qtsql:5
+   dev-qt/qtsvg:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   media-gfx/exiv2:=
+   >=sci-libs/gdal-3.0.4:=[geos]
+   sci-libs/geos
+   sci-libs/libspatialindex:=
+   >=sci-libs/proj-6.3.1:=
+   sys-libs/zlib
+   >=x11-libs/qscintilla-2.10.3:=
+   >=x11-libs/qwt-6.1.3-r2:6=[svg]
+   3d? ( dev-qt/qt3d:5 )
+   georeferencer? ( sci-libs/gsl:= )
+   grass? ( =sci-geosciences/grass-7*:= )
+   hdf5? ( sci-libs/hdf5:= )
+   mapserver? ( dev-libs/fcgi )
+   netcdf? ( sci-libs/netcdf:= )
+   opencl? ( virtual/opencl )
+   oracle? (
+   dev-db/oracle-instantclient:=
+   sci-libs/gdal:=[oracle]
+   )
+   polar? ( >=x11-libs/qwtpolar-1.1.1-r2 )
+   postgres? ( dev-db/postgresql:= )
+   python? (
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+   dev-python/jinja[${PYTHON_MULTI_USEDEP}]
+   dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
+   dev-python/owslib[${PYTHON_MULTI_USEDEP}]
+   dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+  

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/, sci-geosciences/qgis/files/

[Andreas Sturmlechner]

commit: 467d0110a069cac15eb5bf460c64118fb5baafa6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Dec 22 16:14:37 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Dec 22 22:53:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=467d0110

sci-geosciences/qgis: Drop 3.16.1

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-geosciences/qgis/Manifest  |   1 -
 .../files/qgis-3.16.1-find-qt5linguisttools.patch  |  27 ---
 sci-geosciences/qgis/qgis-3.16.1.ebuild| 207 -
 3 files changed, 235 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index eab8f63ecd9..123680b6b75 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,3 @@
 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

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 01f60269439..000
--- 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 
-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 

- 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.1.ebuild
deleted file mode 100644
index 2bc3ef993a9..000
--- a/sci-geosciences/qgis/qgis-3.16.1.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite"
-
-if [[ ${PV} = * ]]; then
-   EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
-   inherit git-r3
-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"
-fi
-inherit cmake desktop python-single-r1 qmake-utils xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/en/site/;
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle 
polar postgres python qml"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-BDEPEND="${PYTHON_DEPS}
-   dev-qt/linguist-tools:5
-   sys-devel/bison
-   sys-devel/flex
-"
-COMMON_DEPEND="
-   >=app-crypt/qca-2.3.0:2[ssl]
-   >=dev-db/spatialite-4.2.0
-   dev-db/sqlite:3
-   dev-libs/expat
-   dev-libs/libzip:=
-   dev-libs/protobuf:=
-   dev-libs/qtkeychain:=
-   dev-qt/designer:5
-   dev-qt/qtconcurrent:5
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5[ssl]
-   dev-qt/qtpositioning:5
-   dev-qt/qtprintsupport:5
-

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit: 39786e95cbbf3c3c1af00a003ceff9b7ef52a51a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Dec 22 12:15:41 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Dec 22 22:53:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39786e95

sci-geosciences/qgis: 3.16.2 version bump

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-geosciences/qgis/Manifest   |   1 +
 sci-geosciences/qgis/qgis-3.16.2.ebuild | 206 
 2 files changed, 207 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index d86c91000ad..eab8f63ecd9 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,4 @@
 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

diff --git a/sci-geosciences/qgis/qgis-3.16.2.ebuild 
b/sci-geosciences/qgis/qgis-3.16.2.ebuild
new file mode 100644
index 000..c27cdfcd10c
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.16.2.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="sqlite"
+
+if [[ ${PV} = * ]]; then
+   EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
+   inherit git-r3
+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"
+fi
+inherit cmake desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/en/site/;
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle 
polar postgres python qml"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+BDEPEND="${PYTHON_DEPS}
+   dev-qt/linguist-tools:5
+   sys-devel/bison
+   sys-devel/flex
+"
+COMMON_DEPEND="
+   >=app-crypt/qca-2.3.0:2[ssl]
+   >=dev-db/spatialite-4.2.0
+   dev-db/sqlite:3
+   dev-libs/expat
+   dev-libs/libzip:=
+   dev-libs/protobuf:=
+   dev-libs/qtkeychain:=
+   dev-qt/designer:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5[ssl]
+   dev-qt/qtpositioning:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtserialport:5
+   dev-qt/qtsql:5
+   dev-qt/qtsvg:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   media-gfx/exiv2:=
+   >=sci-libs/gdal-3.0.4:=[geos]
+   sci-libs/geos
+   sci-libs/libspatialindex:=
+   >=sci-libs/proj-6.3.1:=
+   sys-libs/zlib
+   >=x11-libs/qscintilla-2.10.3:=
+   >=x11-libs/qwt-6.1.3-r2:6=[svg]
+   3d? ( dev-qt/qt3d:5 )
+   georeferencer? ( sci-libs/gsl:= )
+   grass? ( =sci-geosciences/grass-7*:= )
+   hdf5? ( sci-libs/hdf5:= )
+   mapserver? ( dev-libs/fcgi )
+   netcdf? ( sci-libs/netcdf:= )
+   opencl? ( virtual/opencl )
+   oracle? (
+   dev-db/oracle-instantclient:=
+   sci-libs/gdal:=[oracle]
+   )
+   polar? ( >=x11-libs/qwtpolar-1.1.1-r2 )
+   postgres? ( dev-db/postgresql:= )
+   python? (
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+   dev-python/jinja[${PYTHON_MULTI_USEDEP}]
+   dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
+   dev-python/owslib[${PYTHON_MULTI_USEDEP}]
+   dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+  

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/, sci-geosciences/qgis/files/

[Andreas Sturmlechner]

commit: 5d8db0c6c8a1cc7556c66b3ade0bbf959ebe71b8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Nov 23 22:10:06 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Nov 23 22:10:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d8db0c6

sci-geosciences/qgis: Fix Qt5LinguistTools detection (for lrelease)

Build system relied on lrelease available in PATH so far.

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/qgis-3.16.1-find-qt5linguisttools.patch  | 27 ++
 sci-geosciences/qgis/qgis-3.16.1.ebuild|  1 +
 2 files changed, 28 insertions(+)

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
new file mode 100644
index 000..01f60269439
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-3.16.1-find-qt5linguisttools.patch
@@ -0,0 +1,27 @@
+From db2fee6c199a34507e5742b2360d594a5bf67b18 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+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 
+---
+ 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.1.ebuild
index 54158d96a48..2bc3ef993a9 100644
--- a/sci-geosciences/qgis/qgis-3.16.1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.1.ebuild
@@ -109,6 +109,7 @@ PATCHES=(
# TODO upstream
"${FILESDIR}/${P}-featuresummary.patch"
"${FILESDIR}/${P}-default-qmldir.patch"
+   "${FILESDIR}/${P}-find-qt5linguisttools.patch"
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/, sci-geosciences/qgis/files/

[Andreas Sturmlechner]

commit: ca2e91369b76276e44cfd8355f209f60f92ef580
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Nov 20 19:28:48 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Nov 20 20:39:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca2e9136

sci-geosciences/qgis: 3.16.1 version bump

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-geosciences/qgis/Manifest   |  1 +
 ...lt-qmldir.patch => qgis-3.16.1-default-qmldir.patch} | 13 +++--
 ...resummary.patch => qgis-3.16.1-featuresummary.patch} | 17 +
 .../qgis/{qgis-.ebuild => qgis-3.16.1.ebuild}   |  7 ---
 sci-geosciences/qgis/qgis-.ebuild   |  4 ++--
 5 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 93502ed3377..d86c91000ad 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,2 +1,3 @@
 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_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/files/qgis--default-qmldir.patch 
b/sci-geosciences/qgis/files/qgis-3.16.1-default-qmldir.patch
similarity index 68%
rename from sci-geosciences/qgis/files/qgis--default-qmldir.patch
rename to sci-geosciences/qgis/files/qgis-3.16.1-default-qmldir.patch
index afcaa693ced..9a57d45984e 100644
--- a/sci-geosciences/qgis/files/qgis--default-qmldir.patch
+++ b/sci-geosciences/qgis/files/qgis-3.16.1-default-qmldir.patch
@@ -1,17 +1,18 @@
-From 9d095f7d502cbcea8c70c127be322568b71f6663 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Sun, 28 Apr 2019 12:41:51 +0200
+From ad432e066fcc3d985fb5a451ad128cdf35c1dad9 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Fri, 20 Nov 2020 20:41:36 +0100
 Subject: [PATCH] cmake: Fix DEFAULT_QML_DIR path to comply with LFS layout
 
+Signed-off-by: Andreas Sturmlechner 
 ---
  CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4626042ca4..fe93ff3c4f 100644
+index 61b4c863d0..e7d0bdc8d3 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -660,7 +660,7 @@ IF (WITH_CORE)
+@@ -750,7 +750,7 @@ if (WITH_CORE)
set (DEFAULT_LIBEXEC_SUBDIR lib${LIB_SUFFIX}/qgis)
set (DEFAULT_PLUGIN_SUBDIR  lib${LIB_SUFFIX}/qgis/plugins)
set (DEFAULT_INCLUDE_SUBDIR include/qgis)
@@ -21,5 +22,5 @@ index 4626042ca4..fe93ff3c4f 100644
set (DEFAULT_SERVER_MODULE_SUBDIR ${DEFAULT_LIBEXEC_SUBDIR}/server)
  endif()
 -- 
-2.21.0
+2.29.2
 

diff --git a/sci-geosciences/qgis/files/qgis--featuresummary.patch 
b/sci-geosciences/qgis/files/qgis-3.16.1-featuresummary.patch
similarity index 60%
rename from sci-geosciences/qgis/files/qgis--featuresummary.patch
rename to sci-geosciences/qgis/files/qgis-3.16.1-featuresummary.patch
index 8fa7ab0e842..b1098175647 100644
--- a/sci-geosciences/qgis/files/qgis--featuresummary.patch
+++ b/sci-geosciences/qgis/files/qgis-3.16.1-featuresummary.patch
@@ -1,18 +1,19 @@
-From 0744b51784b779eab4bb2e78ed084d31258b5b4d Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Sun, 28 Apr 2019 00:10:21 +0200
+From f0fd6e80ad034cf7c49f4ba3708819424b6857b2 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Fri, 20 Nov 2020 20:41:06 +0100
 Subject: [PATCH] cmake: Use FeatureSummary
 
+Signed-off-by: Andreas Sturmlechner 
 ---
  CMakeLists.txt | 4 
  1 file changed, 4 insertions(+)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4dff8ea0f4..4626042ca4 100644
+index f581b2c889..61b4c863d0 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -71,6 +71,8 @@ IF(NOT MSVC)
-   endif(USE_CCACHE)
+@@ -111,6 +111,8 @@ if (FORCE_STATIC_PROVIDERS)
+   set (HAVE_STATIC_PROVIDERS TRUE)
  endif()
  
 +include(FeatureSummary)
@@ -20,12 +21,12 @@ index 4dff8ea0f4..4626042ca4 100644
  # in generated makefiles use relative paths so the project dir is moveable
  # Note commented out since it cause problems but it would be nice 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/files/, sci-geosciences/qgis/

[Andreas Sturmlechner]

commit: 43aad7b6d7418a770b60076dfcb0a4ce2b15eb7a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Nov 18 18:40:51 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Nov 18 21:08:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43aad7b6

sci-geosciences/qgis: Drop 3.10.9

Closes: https://bugs.gentoo.org/753236
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-geosciences/qgis/Manifest  |   1 -
 .../qgis/files/qgis-3.10.0-cmake-lib-suffix.patch  |  12 --
 sci-geosciences/qgis/qgis-3.10.9.ebuild| 203 -
 3 files changed, 216 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 212b0bba175..93502ed3377 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,2 @@
-DIST qgis-3.10.9.tar.bz2 102418680 BLAKE2B 
53599dab784fc42b7a4505e13b1fd97cdb7c696bf1a004425ea0e7b88659b9af40f74b7107ef6103a138f4bc8886eda0a99a07a1c1466fb73c94d55ea39d8ea8
 SHA512 
91bba01db04094a194d1437a00276f076cd88d9ebcfe4792f20da8fb4339c984262e2bf79f666cf23af13081da358bbfb69bdff086e4988701c4431f53732275
 DIST qgis-3.16.0.tar.bz2 113238659 BLAKE2B 
42bdf8d0d69b28c20aa0decd79883c3b83d2ff9aa9d7633866b6c7d624ad20cb602beeca0e22585077c3d0ceba791e51b81ba221bc305c9bd2ebff71a4ea4bd4
 SHA512 
c87959a6412f85b6e4d30d4677e0e0914fd9a1009348c8bfe6063d7e1a9416f0a33ae63ded15273d8edde26ae0e6c32ba4d62d83c33c2c6251c444360dc47d10
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/files/qgis-3.10.0-cmake-lib-suffix.patch 
b/sci-geosciences/qgis/files/qgis-3.10.0-cmake-lib-suffix.patch
deleted file mode 100644
index 472b8aa466c..000
--- a/sci-geosciences/qgis/files/qgis-3.10.0-cmake-lib-suffix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naru a/cmake/PyQtMacros.cmake b/cmake/PyQtMacros.cmake
 a/cmake/PyQtMacros.cmake   2019-10-28 08:23:18.776024266 +0100
-+++ b/cmake/PyQtMacros.cmake   2019-10-28 08:24:17.316024213 +0100
-@@ -36,7 +36,7 @@
-   ELSE(CMAKE_HOST_WIN32)
- # TODO osx
- SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic-wrapper.sh")
--SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib")
-+SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib${LIB_SUFFIX}")
-   ENDIF(CMAKE_HOST_WIN32)
- 
-   FOREACH(it ${ARGN})

diff --git a/sci-geosciences/qgis/qgis-3.10.9.ebuild 
b/sci-geosciences/qgis/qgis-3.10.9.ebuild
deleted file mode 100644
index 65bdc947394..000
--- a/sci-geosciences/qgis/qgis-3.10.9.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="sqlite"
-QTMIN="5.9.4"
-
-if [[ ${PV} = * ]]; then
-   EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
-   inherit git-r3
-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"
-fi
-inherit cmake desktop python-single-r1 qmake-utils xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/;
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle 
polar postgres python qml webkit"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-BDEPEND="${PYTHON_DEPS}
-   >=dev-qt/linguist-tools-${QTMIN}:5
-   sys-devel/bison
-   sys-devel/flex
-"
-COMMON_DEPEND="
-   app-crypt/qca:2[qt5(+),ssl]
-   >=dev-db/spatialite-4.2.0
-   dev-db/sqlite:3
-   dev-libs/expat
-   dev-libs/libzip:=
-   dev-libs/qtkeychain[qt5(+)]
-   >=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-3.0.4:=[geos]
-   sci-libs/geos
-   sci-libs/libspatialindex:=
-   >=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-${QTMIN}:5 )
-   georeferencer? ( sci-libs/gsl:= )
-   grass? ( =sci-geosciences/grass-7*:= )
-   hdf5? ( sci-libs/hdf5:= )
-   

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/files/, sci-geosciences/qgis/

[Andreas Sturmlechner]

commit: 858f683062931d5e10da5e4ba517b4f420439377
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Nov 18 18:58:27 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Nov 18 21:08:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=858f6830

sci-geosciences/qgis: Fix  patches

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../qgis/files/qgis--default-qmldir.patch  | 25 +
 .../qgis/files/qgis--featuresummary.patch  | 31 ++
 sci-geosciences/qgis/qgis-.ebuild  |  6 ++---
 3 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/sci-geosciences/qgis/files/qgis--default-qmldir.patch 
b/sci-geosciences/qgis/files/qgis--default-qmldir.patch
new file mode 100644
index 000..afcaa693ced
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis--default-qmldir.patch
@@ -0,0 +1,25 @@
+From 9d095f7d502cbcea8c70c127be322568b71f6663 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sun, 28 Apr 2019 12:41:51 +0200
+Subject: [PATCH] cmake: Fix DEFAULT_QML_DIR path to comply with LFS layout
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4626042ca4..fe93ff3c4f 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -660,7 +660,7 @@ IF (WITH_CORE)
+   set (DEFAULT_LIBEXEC_SUBDIR lib${LIB_SUFFIX}/qgis)
+   set (DEFAULT_PLUGIN_SUBDIR  lib${LIB_SUFFIX}/qgis/plugins)
+   set (DEFAULT_INCLUDE_SUBDIR include/qgis)
+-  set (DEFAULT_QML_SUBDIR qml)
++  set (DEFAULT_QML_SUBDIR ${DEFAULT_DATA_SUBDIR}/qml)
+ 
+   set (DEFAULT_SERVER_MODULE_SUBDIR ${DEFAULT_LIBEXEC_SUBDIR}/server)
+ endif()
+-- 
+2.21.0
+

diff --git a/sci-geosciences/qgis/files/qgis--featuresummary.patch 
b/sci-geosciences/qgis/files/qgis--featuresummary.patch
new file mode 100644
index 000..8fa7ab0e842
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis--featuresummary.patch
@@ -0,0 +1,31 @@
+From 0744b51784b779eab4bb2e78ed084d31258b5b4d Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sun, 28 Apr 2019 00:10:21 +0200
+Subject: [PATCH] cmake: Use FeatureSummary
+
+---
+ CMakeLists.txt | 4 
+ 1 file changed, 4 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4dff8ea0f4..4626042ca4 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -71,6 +71,8 @@ IF(NOT MSVC)
+   endif(USE_CCACHE)
+ endif()
+ 
++include(FeatureSummary)
++
+ # in generated makefiles use relative paths so the project dir is moveable
+ # Note commented out since it cause problems but it would be nice to resolve 
these and enable
+ #
+@@ -937,3 +939,5 @@ ENDIF (WITH_CORE)
+ if (UNIX AND NOT APPLE)
+   add_subdirectory(linux)
+ endif()
++
++FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+-- 
+2.21.0
+

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-.ebuild
index f6b820db0fd..3f589eac32d 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ b/sci-geosciences/qgis/qgis-.ebuild
@@ -105,10 +105,10 @@ RESTRICT="test"
 
 PATCHES=(
# git master
-   "${FILESDIR}/${P}-cmake-lib-suffix.patch"
+   "${FILESDIR}/${PN}-3.16.0-cmake-lib-suffix.patch"
# TODO upstream
-   "${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
-   "${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
+   "${FILESDIR}/${PN}--featuresummary.patch"
+   "${FILESDIR}/${PN}--default-qmldir.patch"
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Agostino Sarubbo]

commit: 462e3c7a44f86565824aae4c587e9b4f56606f89
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Nov 18 06:51:00 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Nov 18 06:51:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=462e3c7a

sci-geosciences/qgis: amd64 stable wrt bug #753236

Package-Manager: Portage-3.0.8, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-geosciences/qgis/qgis-3.16.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild 
b/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
index 4e9d9ce8674..d952288f81f 100644
--- a/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = * ]]; 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
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Thomas Deutschmann]

commit: 1f5fc4790468b1c57fafb5edd317e3467e480afd
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Nov 17 22:00:48 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Nov 17 22:01:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f5fc479

sci-geosciences/qgis: x86 stable (bug #753236)

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 sci-geosciences/qgis/qgis-3.16.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild 
b/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
index cbedc2d578d..4e9d9ce8674 100644
--- a/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = * ]]; 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
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit: bafd33c2871256466aeb327bcd47c64c15be9a5f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Nov 11 21:47:03 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Nov 11 21:57:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bafd33c2

sci-geosciences/qgis: Disable WITH_QGIS_PROCESS if IUSE="-python"

Workaround until upstream issue #39973 is fixed.

Bug: https://bugs.gentoo.org/753236
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-geosciences/qgis/qgis-3.16.0-r1.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild 
b/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
index f6b820db0fd..cbedc2d578d 100644
--- a/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
@@ -158,7 +158,8 @@ src_configure() {
)
fi
 
-   use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
+   use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
+   mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue 
#39973
 
# bugs 612956, 648726
addpredict /dev/dri/renderD128

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit: 3f3fe48b4afac3673c1c36db8717c6b0a6afe3a0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Nov  3 20:57:14 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Nov  4 00:06:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f3fe48b

sci-geosciences/qgis: Add missing DEPENDs

Reported-by: Denis Lisov  gmail.com>
Closes: https://bugs.gentoo.org/751220
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-geosciences/qgis/{qgis-3.16.0.ebuild => qgis-3.16.0-r1.ebuild} | 4 +++-
 sci-geosciences/qgis/qgis-.ebuild  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.16.0.ebuild 
b/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
similarity index 99%
rename from sci-geosciences/qgis/qgis-3.16.0.ebuild
rename to sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
index 21e60cc41b1..f6b820db0fd 100644
--- a/sci-geosciences/qgis/qgis-3.16.0.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
@@ -36,6 +36,7 @@ COMMON_DEPEND="
dev-db/sqlite:3
dev-libs/expat
dev-libs/libzip:=
+   dev-libs/protobuf:=
dev-libs/qtkeychain:=
dev-qt/designer:5
dev-qt/qtconcurrent:5
@@ -45,8 +46,8 @@ COMMON_DEPEND="
dev-qt/qtpositioning:5
dev-qt/qtprintsupport:5
dev-qt/qtserialport:5
-   dev-qt/qtsvg:5
dev-qt/qtsql:5
+   dev-qt/qtsvg:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
media-gfx/exiv2:=
@@ -54,6 +55,7 @@ COMMON_DEPEND="
sci-libs/geos
sci-libs/libspatialindex:=
>=sci-libs/proj-6.3.1:=
+   sys-libs/zlib
>=x11-libs/qscintilla-2.10.3:=
>=x11-libs/qwt-6.1.3-r2:6=[svg]
3d? ( dev-qt/qt3d:5 )

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-.ebuild
index 21e60cc41b1..f6b820db0fd 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ b/sci-geosciences/qgis/qgis-.ebuild
@@ -36,6 +36,7 @@ COMMON_DEPEND="
dev-db/sqlite:3
dev-libs/expat
dev-libs/libzip:=
+   dev-libs/protobuf:=
dev-libs/qtkeychain:=
dev-qt/designer:5
dev-qt/qtconcurrent:5
@@ -45,8 +46,8 @@ COMMON_DEPEND="
dev-qt/qtpositioning:5
dev-qt/qtprintsupport:5
dev-qt/qtserialport:5
-   dev-qt/qtsvg:5
dev-qt/qtsql:5
+   dev-qt/qtsvg:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
media-gfx/exiv2:=
@@ -54,6 +55,7 @@ COMMON_DEPEND="
sci-libs/geos
sci-libs/libspatialindex:=
>=sci-libs/proj-6.3.1:=
+   sys-libs/zlib
>=x11-libs/qscintilla-2.10.3:=
>=x11-libs/qwt-6.1.3-r2:6=[svg]
3d? ( dev-qt/qt3d:5 )

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/, sci-geosciences/qgis/files/

[Andreas Sturmlechner]

commit: 04ec15cf24cdde041b3816f5f2d984b42109e2e0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Oct 23 18:49:17 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Oct 23 23:26:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04ec15cf

sci-geosciences/qgis: 3.16.0 version bump

- python3_9
- Update HOMEPAGE
- Cleanup outdated qt5(+) IUSE defaults
- Drop IUSE=webkit
- Drop obsolete QTMIN

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-geosciences/qgis/Manifest  |  1 +
 .../qgis/files/qgis-3.16.0-cmake-lib-suffix.patch  | 12 +
 .../qgis/{qgis-.ebuild => qgis-3.16.0.ebuild}  | 60 +++---
 sci-geosciences/qgis/qgis-.ebuild  | 60 +++---
 4 files changed, 73 insertions(+), 60 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index e377493e5a9..212b0bba175 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,2 +1,3 @@
 DIST qgis-3.10.9.tar.bz2 102418680 BLAKE2B 
53599dab784fc42b7a4505e13b1fd97cdb7c696bf1a004425ea0e7b88659b9af40f74b7107ef6103a138f4bc8886eda0a99a07a1c1466fb73c94d55ea39d8ea8
 SHA512 
91bba01db04094a194d1437a00276f076cd88d9ebcfe4792f20da8fb4339c984262e2bf79f666cf23af13081da358bbfb69bdff086e4988701c4431f53732275
+DIST qgis-3.16.0.tar.bz2 113238659 BLAKE2B 
42bdf8d0d69b28c20aa0decd79883c3b83d2ff9aa9d7633866b6c7d624ad20cb602beeca0e22585077c3d0ceba791e51b81ba221bc305c9bd2ebff71a4ea4bd4
 SHA512 
c87959a6412f85b6e4d30d4677e0e0914fd9a1009348c8bfe6063d7e1a9416f0a33ae63ded15273d8edde26ae0e6c32ba4d62d83c33c2c6251c444360dc47d10
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
 SHA512 
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/files/qgis-3.16.0-cmake-lib-suffix.patch 
b/sci-geosciences/qgis/files/qgis-3.16.0-cmake-lib-suffix.patch
new file mode 100644
index 000..1edba1f0e74
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-3.16.0-cmake-lib-suffix.patch
@@ -0,0 +1,12 @@
+diff -Naru a/cmake/PyQtMacros.cmake b/cmake/PyQtMacros.cmake
+--- a/cmake/PyQtMacros.cmake   2019-10-28 08:23:18.776024266 +0100
 b/cmake/PyQtMacros.cmake   2019-10-28 08:24:17.316024213 +0100
+@@ -36,7 +36,7 @@
+   ELSE(CMAKE_HOST_WIN32)
+ # TODO osx
+ SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic_wrapper.sh")
+-SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib")
++SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib${LIB_SUFFIX}")
+   ENDIF(CMAKE_HOST_WIN32)
+ 
+   FOREACH(it ${ARGN})

diff --git a/sci-geosciences/qgis/qgis-.ebuild 
b/sci-geosciences/qgis/qgis-3.16.0.ebuild
similarity index 79%
copy from sci-geosciences/qgis/qgis-.ebuild
copy to sci-geosciences/qgis/qgis-3.16.0.ebuild
index 5009332eb58..21e60cc41b1 100644
--- a/sci-geosciences/qgis/qgis-.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.0.ebuild
@@ -3,9 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="sqlite"
-QTMIN="5.9.4"
 
 if [[ ${PV} = * ]]; then
EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
@@ -18,46 +17,46 @@ fi
 inherit cmake desktop python-single-r1 qmake-utils xdg
 
 DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/;
+HOMEPAGE="https://www.qgis.org/en/site/;
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle 
polar postgres python qml webkit"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle 
polar postgres python qml"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 
 BDEPEND="${PYTHON_DEPS}
-   >=dev-qt/linguist-tools-${QTMIN}:5
+   dev-qt/linguist-tools:5
sys-devel/bison
sys-devel/flex
 "
 COMMON_DEPEND="
-   app-crypt/qca:2[qt5(+),ssl]
+   >=app-crypt/qca-2.3.0:2[ssl]
>=dev-db/spatialite-4.2.0
dev-db/sqlite:3
dev-libs/expat
dev-libs/libzip:=
-   dev-libs/qtkeychain[qt5(+)]
-   >=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
+   dev-libs/qtkeychain:=
+   dev-qt/designer:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5[ssl]
+   dev-qt/qtpositioning:5
+ 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit: 562ebfa9a1be3944267a1ce8cc76fbc95d4bf13f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Oct 13 14:16:51 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Oct 13 15:01:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=562ebfa9

sci-geosciences/qgis: Drop 3.10.7

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-geosciences/qgis/Manifest   |   1 -
 sci-geosciences/qgis/qgis-3.10.7.ebuild | 203 
 2 files changed, 204 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 86ffd5a417b..e377493e5a9 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,2 @@
-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

diff --git a/sci-geosciences/qgis/qgis-3.10.7.ebuild 
b/sci-geosciences/qgis/qgis-3.10.7.ebuild
deleted file mode 100644
index 65bdc947394..000
--- a/sci-geosciences/qgis/qgis-3.10.7.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="sqlite"
-QTMIN="5.9.4"
-
-if [[ ${PV} = * ]]; then
-   EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git;
-   inherit git-r3
-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"
-fi
-inherit cmake desktop python-single-r1 qmake-utils xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/;
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle 
polar postgres python qml webkit"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-BDEPEND="${PYTHON_DEPS}
-   >=dev-qt/linguist-tools-${QTMIN}:5
-   sys-devel/bison
-   sys-devel/flex
-"
-COMMON_DEPEND="
-   app-crypt/qca:2[qt5(+),ssl]
-   >=dev-db/spatialite-4.2.0
-   dev-db/sqlite:3
-   dev-libs/expat
-   dev-libs/libzip:=
-   dev-libs/qtkeychain[qt5(+)]
-   >=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-3.0.4:=[geos]
-   sci-libs/geos
-   sci-libs/libspatialindex:=
-   >=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-${QTMIN}:5 )
-   georeferencer? ( sci-libs/gsl:= )
-   grass? ( =sci-geosciences/grass-7*:= )
-   hdf5? ( sci-libs/hdf5:= )
-   mapserver? ( dev-libs/fcgi )
-   netcdf? ( sci-libs/netcdf:= )
-   opencl? ( virtual/opencl )
-   oracle? (
-   dev-db/oracle-instantclient:=
-   sci-libs/gdal:=[oracle]
-   )
-   polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
-   postgres? ( dev-db/postgresql:= )
-   python? (
-   ${PYTHON_DEPS}
-   $(python_gen_cond_dep '
-   dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
-   dev-python/jinja[${PYTHON_MULTI_USEDEP}]
-   dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
-   dev-python/owslib[${PYTHON_MULTI_USEDEP}]
-   dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-   
dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}]
-   dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
-   

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Agostino Sarubbo]

commit: 34da8243af1a488d333974dca9146bbc2f7cff5b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Oct 13 09:25:56 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Oct 13 09:25:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34da8243

sci-geosciences/qgis: amd64 stable wrt bug #747694

Package-Manager: Portage-3.0.4, Repoman-3.0.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-geosciences/qgis/qgis-3.10.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.10.9.ebuild 
b/sci-geosciences/qgis/qgis-3.10.9.ebuild
index 14cb6a77eff..65bdc947394 100644
--- a/sci-geosciences/qgis/qgis-3.10.9.ebuild
+++ b/sci-geosciences/qgis/qgis-3.10.9.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = * ]]; 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
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Agostino Sarubbo]

commit: e9ee09de3bc0a09af6cbfdbc21436e09f2576b6c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Oct 12 12:05:10 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Oct 12 12:05:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9ee09de

sci-geosciences/qgis: x86 stable wrt bug #747694

Package-Manager: Portage-3.0.4, Repoman-3.0.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-geosciences/qgis/qgis-3.10.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.10.9.ebuild 
b/sci-geosciences/qgis/qgis-3.10.9.ebuild
index 5009332eb58..14cb6a77eff 100644
--- a/sci-geosciences/qgis/qgis-3.10.9.ebuild
+++ b/sci-geosciences/qgis/qgis-3.10.9.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = * ]]; 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