| 1 |
commit: cba4fa349314ab1a4d59ec75f19bc6a324cfc455 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jun 28 12:04:21 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jun 28 12:32:26 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cba4fa34 |
| 7 |
|
| 8 |
sci-geosciences/qgis: Disable WITH_QGIS_PROCESS if IUSE="-python" |
| 9 |
|
| 10 |
Drop unused cmake variable. |
| 11 |
Drop outdated QT_MIN_VER variable. |
| 12 |
|
| 13 |
See also: https://bugs.gentoo.org/753236 |
| 14 |
|
| 15 |
Closes: https://bugs.gentoo.org/796821 |
| 16 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 17 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 18 |
|
| 19 |
sci-geosciences/qgis/qgis-3.20.0-r1.ebuild | 57 +++++++++++++++--------------- |
| 20 |
sci-geosciences/qgis/qgis-9999.ebuild | 57 +++++++++++++++--------------- |
| 21 |
2 files changed, 56 insertions(+), 58 deletions(-) |
| 22 |
|
| 23 |
diff --git a/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild b/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild |
| 24 |
index 54363b3b17a..d7f5ec4633f 100644 |
| 25 |
--- a/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild |
| 26 |
+++ b/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild |
| 27 |
@@ -5,9 +5,8 @@ EAPI=7 |
| 28 |
|
| 29 |
PYTHON_COMPAT=( python3_{7,8,9} ) |
| 30 |
PYTHON_REQ_USE="sqlite" |
| 31 |
-QT_MIN_VER="5.9.4" |
| 32 |
|
| 33 |
-if [[ ${PV} = *9999 ]]; then |
| 34 |
+if [[ ${PV} = *9999* ]]; then |
| 35 |
EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git" |
| 36 |
inherit git-r3 |
| 37 |
else |
| 38 |
@@ -26,12 +25,9 @@ IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar |
| 39 |
|
| 40 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" |
| 41 |
|
| 42 |
-BDEPEND=" |
| 43 |
- ${PYTHON_DEPS} |
| 44 |
- >=dev-qt/linguist-tools-${QT_MIN_VER}:5 |
| 45 |
- sys-devel/bison |
| 46 |
- sys-devel/flex |
| 47 |
-" |
| 48 |
+# Disabling test suite because upstream disallow running from install path |
| 49 |
+RESTRICT="test" |
| 50 |
+ |
| 51 |
COMMON_DEPEND=" |
| 52 |
app-crypt/qca:2[qt5(+),ssl] |
| 53 |
>=dev-db/spatialite-4.2.0 |
| 54 |
@@ -40,18 +36,18 @@ COMMON_DEPEND=" |
| 55 |
dev-libs/libzip:= |
| 56 |
dev-libs/protobuf:= |
| 57 |
dev-libs/qtkeychain[qt5(+)] |
| 58 |
- >=dev-qt/designer-${QT_MIN_VER}:5 |
| 59 |
- >=dev-qt/qtconcurrent-${QT_MIN_VER}:5 |
| 60 |
- >=dev-qt/qtcore-${QT_MIN_VER}:5 |
| 61 |
- >=dev-qt/qtgui-${QT_MIN_VER}:5 |
| 62 |
- >=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl] |
| 63 |
- >=dev-qt/qtpositioning-${QT_MIN_VER}:5 |
| 64 |
- >=dev-qt/qtprintsupport-${QT_MIN_VER}:5 |
| 65 |
- >=dev-qt/qtserialport-${QT_MIN_VER}:5 |
| 66 |
- >=dev-qt/qtsvg-${QT_MIN_VER}:5 |
| 67 |
- >=dev-qt/qtsql-${QT_MIN_VER}:5 |
| 68 |
- >=dev-qt/qtwidgets-${QT_MIN_VER}:5 |
| 69 |
- >=dev-qt/qtxml-${QT_MIN_VER}:5 |
| 70 |
+ dev-qt/designer:5 |
| 71 |
+ dev-qt/qtconcurrent:5 |
| 72 |
+ dev-qt/qtcore:5 |
| 73 |
+ dev-qt/qtgui:5 |
| 74 |
+ dev-qt/qtnetwork:5[ssl] |
| 75 |
+ dev-qt/qtpositioning:5 |
| 76 |
+ dev-qt/qtprintsupport:5 |
| 77 |
+ dev-qt/qtserialport:5 |
| 78 |
+ dev-qt/qtsvg:5 |
| 79 |
+ dev-qt/qtsql:5 |
| 80 |
+ dev-qt/qtwidgets:5 |
| 81 |
+ dev-qt/qtxml:5 |
| 82 |
media-gfx/exiv2:= |
| 83 |
>=sci-libs/gdal-3.0.4:=[geos] |
| 84 |
sci-libs/geos |
| 85 |
@@ -60,7 +56,7 @@ COMMON_DEPEND=" |
| 86 |
>=sci-libs/proj-4.9.3:= |
| 87 |
>=x11-libs/qscintilla-2.10.1:=[qt5(+)] |
| 88 |
>=x11-libs/qwt-6.1.2:6=[qt5(+),svg] |
| 89 |
- 3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 ) |
| 90 |
+ 3d? ( dev-qt/qt3d:5 ) |
| 91 |
georeferencer? ( sci-libs/gsl:= ) |
| 92 |
grass? ( =sci-geosciences/grass-7*:= ) |
| 93 |
hdf5? ( sci-libs/hdf5:= ) |
| 94 |
@@ -95,19 +91,22 @@ COMMON_DEPEND=" |
| 95 |
postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] ) |
| 96 |
') |
| 97 |
) |
| 98 |
- qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 ) |
| 99 |
- serial? ( >=dev-qt/qtserialport-${QT_MIN_VER}:5 ) |
| 100 |
+ qml? ( dev-qt/qtdeclarative:5 ) |
| 101 |
+ serial? ( dev-qt/qtserialport:5 ) |
| 102 |
" |
| 103 |
DEPEND="${COMMON_DEPEND} |
| 104 |
- >=dev-qt/qttest-${QT_MIN_VER}:5 |
| 105 |
+ dev-qt/qttest:5 |
| 106 |
python? ( ${PYTHON_DEPS} ) |
| 107 |
" |
| 108 |
RDEPEND="${COMMON_DEPEND} |
| 109 |
sci-geosciences/gpsbabel |
| 110 |
" |
| 111 |
- |
| 112 |
-# Disabling test suite because upstream disallow running from install path |
| 113 |
-RESTRICT="test" |
| 114 |
+BDEPEND=" |
| 115 |
+ ${PYTHON_DEPS} |
| 116 |
+ dev-qt/linguist-tools:5 |
| 117 |
+ sys-devel/bison |
| 118 |
+ sys-devel/flex |
| 119 |
+" |
| 120 |
|
| 121 |
pkg_setup() { |
| 122 |
python-single-r1_pkg_setup |
| 123 |
@@ -134,7 +133,6 @@ src_configure() { |
| 124 |
-DENABLE_TESTS=OFF |
| 125 |
-DWITH_3D=$(usex 3d) |
| 126 |
-DWITH_GSL=$(usex georeferencer) |
| 127 |
- -DWITH_GEOREFERENCER=$(usex georeferencer) |
| 128 |
-DWITH_GRASS7=$(usex grass) |
| 129 |
$(cmake_use_find_package hdf5 HDF5) |
| 130 |
-DWITH_SERVER=$(usex mapserver) |
| 131 |
@@ -159,7 +157,8 @@ src_configure() { |
| 132 |
mycmakeargs+=( -DGRASS_PREFIX7=${GRASSDIR} ) |
| 133 |
fi |
| 134 |
|
| 135 |
- use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) |
| 136 |
+ use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) || |
| 137 |
+ mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973 |
| 138 |
|
| 139 |
# bugs 612956, 648726 |
| 140 |
addpredict /dev/dri/renderD128 |
| 141 |
|
| 142 |
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild |
| 143 |
index 54363b3b17a..d7f5ec4633f 100644 |
| 144 |
--- a/sci-geosciences/qgis/qgis-9999.ebuild |
| 145 |
+++ b/sci-geosciences/qgis/qgis-9999.ebuild |
| 146 |
@@ -5,9 +5,8 @@ EAPI=7 |
| 147 |
|
| 148 |
PYTHON_COMPAT=( python3_{7,8,9} ) |
| 149 |
PYTHON_REQ_USE="sqlite" |
| 150 |
-QT_MIN_VER="5.9.4" |
| 151 |
|
| 152 |
-if [[ ${PV} = *9999 ]]; then |
| 153 |
+if [[ ${PV} = *9999* ]]; then |
| 154 |
EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git" |
| 155 |
inherit git-r3 |
| 156 |
else |
| 157 |
@@ -26,12 +25,9 @@ IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar |
| 158 |
|
| 159 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" |
| 160 |
|
| 161 |
-BDEPEND=" |
| 162 |
- ${PYTHON_DEPS} |
| 163 |
- >=dev-qt/linguist-tools-${QT_MIN_VER}:5 |
| 164 |
- sys-devel/bison |
| 165 |
- sys-devel/flex |
| 166 |
-" |
| 167 |
+# Disabling test suite because upstream disallow running from install path |
| 168 |
+RESTRICT="test" |
| 169 |
+ |
| 170 |
COMMON_DEPEND=" |
| 171 |
app-crypt/qca:2[qt5(+),ssl] |
| 172 |
>=dev-db/spatialite-4.2.0 |
| 173 |
@@ -40,18 +36,18 @@ COMMON_DEPEND=" |
| 174 |
dev-libs/libzip:= |
| 175 |
dev-libs/protobuf:= |
| 176 |
dev-libs/qtkeychain[qt5(+)] |
| 177 |
- >=dev-qt/designer-${QT_MIN_VER}:5 |
| 178 |
- >=dev-qt/qtconcurrent-${QT_MIN_VER}:5 |
| 179 |
- >=dev-qt/qtcore-${QT_MIN_VER}:5 |
| 180 |
- >=dev-qt/qtgui-${QT_MIN_VER}:5 |
| 181 |
- >=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl] |
| 182 |
- >=dev-qt/qtpositioning-${QT_MIN_VER}:5 |
| 183 |
- >=dev-qt/qtprintsupport-${QT_MIN_VER}:5 |
| 184 |
- >=dev-qt/qtserialport-${QT_MIN_VER}:5 |
| 185 |
- >=dev-qt/qtsvg-${QT_MIN_VER}:5 |
| 186 |
- >=dev-qt/qtsql-${QT_MIN_VER}:5 |
| 187 |
- >=dev-qt/qtwidgets-${QT_MIN_VER}:5 |
| 188 |
- >=dev-qt/qtxml-${QT_MIN_VER}:5 |
| 189 |
+ dev-qt/designer:5 |
| 190 |
+ dev-qt/qtconcurrent:5 |
| 191 |
+ dev-qt/qtcore:5 |
| 192 |
+ dev-qt/qtgui:5 |
| 193 |
+ dev-qt/qtnetwork:5[ssl] |
| 194 |
+ dev-qt/qtpositioning:5 |
| 195 |
+ dev-qt/qtprintsupport:5 |
| 196 |
+ dev-qt/qtserialport:5 |
| 197 |
+ dev-qt/qtsvg:5 |
| 198 |
+ dev-qt/qtsql:5 |
| 199 |
+ dev-qt/qtwidgets:5 |
| 200 |
+ dev-qt/qtxml:5 |
| 201 |
media-gfx/exiv2:= |
| 202 |
>=sci-libs/gdal-3.0.4:=[geos] |
| 203 |
sci-libs/geos |
| 204 |
@@ -60,7 +56,7 @@ COMMON_DEPEND=" |
| 205 |
>=sci-libs/proj-4.9.3:= |
| 206 |
>=x11-libs/qscintilla-2.10.1:=[qt5(+)] |
| 207 |
>=x11-libs/qwt-6.1.2:6=[qt5(+),svg] |
| 208 |
- 3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 ) |
| 209 |
+ 3d? ( dev-qt/qt3d:5 ) |
| 210 |
georeferencer? ( sci-libs/gsl:= ) |
| 211 |
grass? ( =sci-geosciences/grass-7*:= ) |
| 212 |
hdf5? ( sci-libs/hdf5:= ) |
| 213 |
@@ -95,19 +91,22 @@ COMMON_DEPEND=" |
| 214 |
postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] ) |
| 215 |
') |
| 216 |
) |
| 217 |
- qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 ) |
| 218 |
- serial? ( >=dev-qt/qtserialport-${QT_MIN_VER}:5 ) |
| 219 |
+ qml? ( dev-qt/qtdeclarative:5 ) |
| 220 |
+ serial? ( dev-qt/qtserialport:5 ) |
| 221 |
" |
| 222 |
DEPEND="${COMMON_DEPEND} |
| 223 |
- >=dev-qt/qttest-${QT_MIN_VER}:5 |
| 224 |
+ dev-qt/qttest:5 |
| 225 |
python? ( ${PYTHON_DEPS} ) |
| 226 |
" |
| 227 |
RDEPEND="${COMMON_DEPEND} |
| 228 |
sci-geosciences/gpsbabel |
| 229 |
" |
| 230 |
- |
| 231 |
-# Disabling test suite because upstream disallow running from install path |
| 232 |
-RESTRICT="test" |
| 233 |
+BDEPEND=" |
| 234 |
+ ${PYTHON_DEPS} |
| 235 |
+ dev-qt/linguist-tools:5 |
| 236 |
+ sys-devel/bison |
| 237 |
+ sys-devel/flex |
| 238 |
+" |
| 239 |
|
| 240 |
pkg_setup() { |
| 241 |
python-single-r1_pkg_setup |
| 242 |
@@ -134,7 +133,6 @@ src_configure() { |
| 243 |
-DENABLE_TESTS=OFF |
| 244 |
-DWITH_3D=$(usex 3d) |
| 245 |
-DWITH_GSL=$(usex georeferencer) |
| 246 |
- -DWITH_GEOREFERENCER=$(usex georeferencer) |
| 247 |
-DWITH_GRASS7=$(usex grass) |
| 248 |
$(cmake_use_find_package hdf5 HDF5) |
| 249 |
-DWITH_SERVER=$(usex mapserver) |
| 250 |
@@ -159,7 +157,8 @@ src_configure() { |
| 251 |
mycmakeargs+=( -DGRASS_PREFIX7=${GRASSDIR} ) |
| 252 |
fi |
| 253 |
|
| 254 |
- use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) |
| 255 |
+ use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) || |
| 256 |
+ mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973 |
| 257 |
|
| 258 |
# bugs 612956, 648726 |
| 259 |
addpredict /dev/dri/renderD128 |
Archives