From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/
Date: Sat, 19 Jun 2021 00:03:55 +0000 (UTC) [thread overview]
Message-ID: <1624061021.ee1db344d0746f7f1e340777a5698acd6491109b.sam@gentoo> (raw)
commit: ee1db344d0746f7f1e340777a5698acd6491109b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 18 23:50:20 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 19 00:03:41 2021 +0000
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 <sam <AT> gentoo.org>
sci-geosciences/qgis/Manifest | 1 +
sci-geosciences/qgis/{qgis-9999.ebuild => qgis-3.20.0.ebuild} | 10 +++++-----
sci-geosciences/qgis/qgis-9999.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 1526350974b634d13f55b77e99ec54c8cd29eb523657657f72de0f9e9b2b47d931e503404b202fe2e181c8e1918888732cc4353091dd8dffcaefb6caa32ad47f 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-9999.ebuild b/sci-geosciences/qgis/qgis-3.20.0.ebuild
similarity index 95%
copy from sci-geosciences/qgis/qgis-9999.ebuild
copy to sci-geosciences/qgis/qgis-3.20.0.ebuild
index 60ed73da843..389d43b1494 100644
--- a/sci-geosciences/qgis/qgis-9999.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-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 60ed73da843..389d43b1494 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.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
next reply other threads:[~2021-06-19 0:04 UTC|newest]
Thread overview: 205+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-19 0:03 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-10-08 16:37 [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/ Andreas Sturmlechner
2024-09-14 19:56 Andreas Sturmlechner
2024-09-14 19:56 Andreas Sturmlechner
2024-09-14 19:56 Andreas Sturmlechner
2024-09-02 9:16 Andreas Sturmlechner
2024-09-02 9:16 Andreas Sturmlechner
2024-09-02 9:10 Andreas Sturmlechner
2024-09-02 9:10 Andreas Sturmlechner
2024-07-07 11:02 Sam James
2024-04-11 13:58 Andrew Ammerlaan
2024-04-11 12:43 Andrew Ammerlaan
2024-03-14 21:44 Sam James
2023-09-26 19:53 Andreas Sturmlechner
2023-09-18 19:53 Arthur Zamarin
2023-07-09 12:04 Andreas Sturmlechner
2023-07-08 17:28 Arthur Zamarin
2023-05-17 20:26 Andreas Sturmlechner
2023-05-17 20:26 Andreas Sturmlechner
2023-05-01 1:53 Sam James
2023-01-08 3:46 Sam James
2023-01-05 9:01 Sam James
2023-01-05 9:01 Sam James
2023-01-05 9:01 Sam James
2023-01-05 9:01 Sam James
2023-01-05 9:01 Sam James
2023-01-05 9:01 Sam James
2022-10-21 15:05 Andrew Ammerlaan
2022-09-12 18:33 Sam James
2022-09-07 13:15 Agostino Sarubbo
2022-07-29 2:33 Sam James
2022-07-15 14:50 Sam James
2022-06-17 23:28 Sam James
2022-06-10 2:45 Sam James
2022-06-07 2:02 Sam James
2022-06-03 3:14 Sam James
2022-06-03 3:14 Sam James
2022-06-01 1:56 Sam James
2022-05-14 21:24 Sam James
2022-05-04 23:28 Sam James
2022-04-16 19:21 Sam James
2022-04-15 20:15 Andreas Sturmlechner
2022-04-04 1:31 Sam James
2022-04-04 1:31 Sam James
2022-03-26 16:40 Andreas Sturmlechner
2022-02-18 22:48 Sam James
2022-01-14 15:41 Sam James
2021-12-22 3:57 Sam James
2021-12-05 18:28 Sam James
2021-11-22 11:13 Sam James
2021-11-22 10:55 Sam James
2021-11-09 17:15 Andreas Sturmlechner
2021-10-31 2:55 Sam James
2021-10-27 22:33 Sam James
2021-10-27 6:26 Sam James
2021-10-27 6:04 Sam James
2021-10-27 5:57 Sam James
2021-10-25 0:36 Sam James
2021-10-09 7:08 Michał Górny
2021-09-19 21:39 Agostino Sarubbo
2021-09-17 14:14 Agostino Sarubbo
2021-09-16 1:18 Sam James
2021-08-16 1:58 Sam James
2021-07-17 18:18 David Seifert
2021-06-28 12:32 Andreas Sturmlechner
2021-06-28 12:32 Andreas Sturmlechner
2021-06-24 21:47 Sam James
2021-06-24 21:47 Sam James
2021-06-24 9:07 Andreas Sturmlechner
2021-06-20 0:00 Sam James
2021-06-20 0:00 Sam James
2021-06-19 23:48 Sam James
2021-06-19 2:10 Sam James
2021-06-19 0:04 Sam James
2021-06-19 0:03 Sam James
2021-06-19 0:03 Sam James
2021-06-01 19:19 Andrew Ammerlaan
2021-05-27 6:57 Agostino Sarubbo
2021-05-26 15:09 Agostino Sarubbo
2021-05-17 22:25 Sam James
2021-05-17 20:42 Sam James
2021-05-17 20:41 Sam James
2021-05-17 20:41 Sam James
2021-03-12 21:49 Andreas Sturmlechner
2021-02-25 12:50 Andreas Sturmlechner
2021-01-22 18:45 Sam James
2021-01-21 13:31 Agostino Sarubbo
2021-01-20 11:16 Andreas Sturmlechner
2021-01-15 21:38 Andreas Sturmlechner
2020-12-22 22:54 Andreas Sturmlechner
2020-11-18 6:53 Agostino Sarubbo
2020-11-17 22:01 Thomas Deutschmann
2020-11-11 21:58 Andreas Sturmlechner
2020-11-04 0:06 Andreas Sturmlechner
2020-10-13 15:02 Andreas Sturmlechner
2020-10-13 9:26 Agostino Sarubbo
2020-10-12 12:05 Agostino Sarubbo
2020-09-21 6:07 Michał Górny
2020-08-18 17:49 Andreas Sturmlechner
2020-07-20 21:34 Andreas Sturmlechner
2020-07-20 6:42 Agostino Sarubbo
2020-07-19 7:43 Agostino Sarubbo
2020-06-21 15:30 Andreas Sturmlechner
2020-06-21 15:25 Andreas Sturmlechner
2020-06-21 15:25 Andreas Sturmlechner
2020-03-12 0:13 Andreas Sturmlechner
2020-02-09 16:36 Michał Górny
2020-02-04 10:36 Andreas Sturmlechner
2020-02-04 9:00 Agostino Sarubbo
2020-02-04 7:06 Agostino Sarubbo
2020-01-30 22:50 Andreas Sturmlechner
2020-01-30 21:27 Andreas Sturmlechner
2020-01-01 9:18 Andreas Sturmlechner
2020-01-01 9:17 Andreas Sturmlechner
2020-01-01 7:55 Andreas Sturmlechner
2020-01-01 7:55 Andreas Sturmlechner
2019-12-03 4:18 Aaron Bauman
2019-12-01 20:19 Andreas Sturmlechner
2019-11-18 15:52 Agostino Sarubbo
2019-11-14 15:41 Agostino Sarubbo
2019-10-23 23:32 Andreas Sturmlechner
2019-10-20 14:21 Andreas Sturmlechner
2019-10-20 14:21 Andreas Sturmlechner
2019-04-28 15:27 Andreas Sturmlechner
2019-04-28 15:27 Andreas Sturmlechner
2019-04-28 15:27 Andreas Sturmlechner
2019-04-28 15:27 Andreas Sturmlechner
2019-04-28 15:27 Andreas Sturmlechner
2019-04-28 15:27 Andreas Sturmlechner
2018-10-20 18:17 Mikle Kolyada
2018-10-14 1:44 Thomas Deutschmann
2018-09-17 21:25 Andreas Sturmlechner
2018-09-17 21:25 Andreas Sturmlechner
2018-08-22 15:29 Andreas Sturmlechner
2018-08-22 15:29 Andreas Sturmlechner
2018-08-03 16:59 Amy Liffey
2018-06-27 19:00 Andreas Sturmlechner
2018-06-26 2:04 Aaron Bauman
2018-06-25 23:20 Thomas Deutschmann
2018-06-24 13:18 Andreas Sturmlechner
2018-06-24 13:18 Andreas Sturmlechner
2018-06-24 13:18 Andreas Sturmlechner
2018-06-24 13:18 Andreas Sturmlechner
2018-06-24 13:18 Andreas Sturmlechner
2018-05-25 23:58 Thomas Deutschmann
2018-05-24 14:31 Agostino Sarubbo
2018-05-23 12:29 Andreas Sturmlechner
2018-04-22 23:11 Andreas Sturmlechner
2018-04-22 23:11 Andreas Sturmlechner
2018-04-22 23:11 Andreas Sturmlechner
2018-04-12 19:07 Thomas Deutschmann
2018-04-06 0:50 Aaron Bauman
2018-03-30 16:52 Andreas Sturmlechner
2018-03-30 16:52 Andreas Sturmlechner
2018-03-13 22:36 Andreas Sturmlechner
2018-03-13 22:36 Andreas Sturmlechner
2018-03-05 6:06 Andreas Sturmlechner
2018-03-05 6:06 Andreas Sturmlechner
2018-03-04 22:16 Davide Pesavento
2018-02-27 16:14 Andreas Sturmlechner
2018-02-24 9:48 Andreas Sturmlechner
2018-02-19 17:46 Andreas Sturmlechner
2018-02-19 17:46 Andreas Sturmlechner
2018-01-20 22:50 Andreas Sturmlechner
2018-01-14 23:05 Andreas Sturmlechner
2017-12-26 1:02 Andreas Sturmlechner
2017-12-21 9:02 Andreas Sturmlechner
2017-12-21 2:38 Andreas Sturmlechner
2017-10-28 8:33 Andreas Sturmlechner
2017-10-28 7:43 Andreas Sturmlechner
2017-09-30 1:32 Michael Palimaka
2017-09-30 1:32 Michael Palimaka
2017-09-10 13:06 Andreas Sturmlechner
2017-09-09 23:18 Andreas Sturmlechner
2017-09-09 12:40 Andreas Sturmlechner
2017-08-26 19:24 Andreas Sturmlechner
2017-08-26 19:19 Andreas Sturmlechner
2017-08-26 19:19 Andreas Sturmlechner
2017-07-01 15:56 Andreas Sturmlechner
2017-04-24 19:27 Andreas Sturmlechner
2017-04-24 19:27 Andreas Sturmlechner
2017-04-24 19:27 Andreas Sturmlechner
2017-04-24 19:27 Andreas Sturmlechner
2017-04-10 22:36 Andreas Sturmlechner
2017-04-10 22:36 Andreas Sturmlechner
2017-03-02 10:47 Agostino Sarubbo
2017-03-02 10:30 Agostino Sarubbo
2017-03-01 21:09 Andreas Sturmlechner
2017-03-01 18:12 Andreas Sturmlechner
2017-01-23 2:38 Andreas Sturmlechner
2017-01-21 16:14 Andreas Sturmlechner
2017-01-11 16:31 Amy Winston
2017-01-08 13:32 Amy Winston
2017-01-02 7:32 Amy Winston
2016-12-22 18:26 David Seifert
2016-12-19 9:39 Amy Winston
2016-12-19 9:35 Amy Winston
2016-12-18 12:44 Amy Winston
2016-12-16 21:22 Amy Winston
2016-12-15 10:58 Amy Winston
2016-08-17 10:56 Thomas Deutschmann
2015-12-30 17:41 Amy Winston
2015-12-28 19:56 Amy Winston
2015-12-21 14:29 Patrick Lauer
2015-09-24 19:01 Pacho Ramos
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1624061021.ee1db344d0746f7f1e340777a5698acd6491109b.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox