commit: 04ec15cf24cdde041b3816f5f2d984b42109e2e0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 23 18:49:17 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct 23 23:26:57 2020 +0000
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 <asturm <AT> gentoo.org>
sci-geosciences/qgis/Manifest | 1 +
.../qgis/files/qgis-3.16.0-cmake-lib-suffix.patch | 12 +++++
.../qgis/{qgis-9999.ebuild => qgis-3.16.0.ebuild} | 60 +++++++++++-----------
sci-geosciences/qgis/qgis-9999.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 00000000000..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-9999.ebuild
b/sci-geosciences/qgis/qgis-3.16.0.ebuild
similarity index 79%
copy from sci-geosciences/qgis/qgis-9999.ebuild
copy to sci-geosciences/qgis/qgis-3.16.0.ebuild
index 5009332eb58..21e60cc41b1 100644
--- a/sci-geosciences/qgis/qgis-9999.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} = *9999 ]]; 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
+ 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:=
>=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 )
+ >=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:= )
@@ -68,7 +67,7 @@ COMMON_DEPEND="
dev-db/oracle-instantclient:=
sci-libs/gdal:=[oracle]
)
- polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+ polar? ( >=x11-libs/qwtpolar-1.1.1-r2 )
postgres? ( dev-db/postgresql:= )
python? (
${PYTHON_DEPS}
@@ -78,11 +77,11 @@ COMMON_DEPEND="
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/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.1[qt5(+),${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}]
dev-python/six[${PYTHON_MULTI_USEDEP}]
@@ -90,11 +89,10 @@ COMMON_DEPEND="
postgres? (
dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
')
)
- qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
- webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
+ qml? ( dev-qt/qtdeclarative:5 )
"
DEPEND="${COMMON_DEPEND}
- >=dev-qt/qttest-${QTMIN}:5
+ dev-qt/qttest:5
"
RDEPEND="${COMMON_DEPEND}
sci-geosciences/gpsbabel
@@ -105,7 +103,7 @@ RESTRICT="test"
PATCHES=(
# git master
- "${FILESDIR}/${PN}-3.10.0-cmake-lib-suffix.patch"
+ "${FILESDIR}/${P}-cmake-lib-suffix.patch"
# TODO upstream
"${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
"${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
@@ -117,6 +115,8 @@ pkg_setup() {
src_prepare() {
cmake_src_prepare
+ sed -e "/QtWebKit.*.py/d" \
+ -i python/PyQt/CMakeLists.txt || die
}
src_configure() {
@@ -147,7 +147,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 5009332eb58..21e60cc41b1 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.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} = *9999 ]]; 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
+ 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:=
>=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 )
+ >=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:= )
@@ -68,7 +67,7 @@ COMMON_DEPEND="
dev-db/oracle-instantclient:=
sci-libs/gdal:=[oracle]
)
- polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+ polar? ( >=x11-libs/qwtpolar-1.1.1-r2 )
postgres? ( dev-db/postgresql:= )
python? (
${PYTHON_DEPS}
@@ -78,11 +77,11 @@ COMMON_DEPEND="
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/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.1[qt5(+),${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}]
dev-python/six[${PYTHON_MULTI_USEDEP}]
@@ -90,11 +89,10 @@ COMMON_DEPEND="
postgres? (
dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
')
)
- qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
- webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
+ qml? ( dev-qt/qtdeclarative:5 )
"
DEPEND="${COMMON_DEPEND}
- >=dev-qt/qttest-${QTMIN}:5
+ dev-qt/qttest:5
"
RDEPEND="${COMMON_DEPEND}
sci-geosciences/gpsbabel
@@ -105,7 +103,7 @@ RESTRICT="test"
PATCHES=(
# git master
- "${FILESDIR}/${PN}-3.10.0-cmake-lib-suffix.patch"
+ "${FILESDIR}/${P}-cmake-lib-suffix.patch"
# TODO upstream
"${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
"${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
@@ -117,6 +115,8 @@ pkg_setup() {
src_prepare() {
cmake_src_prepare
+ sed -e "/QtWebKit.*.py/d" \
+ -i python/PyQt/CMakeLists.txt || die
}
src_configure() {
@@ -147,7 +147,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
