From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1297327-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 8C144139335
for <garchives@archives.gentoo.org>; Mon, 28 Jun 2021 12:32:47 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id AF8E9E085B;
Mon, 28 Jun 2021 12:32:46 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 61A56E085B
for <gentoo-commits@lists.gentoo.org>; Mon, 28 Jun 2021 12:32:46 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id E405933E695
for <gentoo-commits@lists.gentoo.org>; Mon, 28 Jun 2021 12:32:44 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 804F97BD
for <gentoo-commits@lists.gentoo.org>; Mon, 28 Jun 2021 12:32:43 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1624883546.cba4fa349314ab1a4d59ec75f19bc6a324cfc455.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sci-geosciences/qgis/qgis-3.20.0-r1.ebuild sci-geosciences/qgis/qgis-9999.ebuild
X-VCS-Directories: sci-geosciences/qgis/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: cba4fa349314ab1a4d59ec75f19bc6a324cfc455
X-VCS-Branch: master
Date: Mon, 28 Jun 2021 12:32:43 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: e4421bf5-3de8-48ac-938b-9431ef6761b8
X-Archives-Hash: eadf0dc649f0872be42d1920388b55c2
commit: cba4fa349314ab1a4d59ec75f19bc6a324cfc455
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 28 12:04:21 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 28 12:32:26 2021 +0000
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 <asturm <AT> gentoo.org>
sci-geosciences/qgis/qgis-3.20.0-r1.ebuild | 57 +++++++++++++++---------------
sci-geosciences/qgis/qgis-9999.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} = *9999 ]]; then
+if [[ ${PV} = *9999* ]]; 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-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 54363b3b17a..d7f5ec4633f 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.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} = *9999 ]]; then
+if [[ ${PV} = *9999* ]]; 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