Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/
Date: Mon, 17 May 2021 20:41:25
Message-Id: 1621284057.5e1231be59417d7a35a50639b1e610ea1741590e.sam@gentoo
1 commit: 5e1231be59417d7a35a50639b1e610ea1741590e
2 Author: Daniel M. Weeks <dan <AT> danweeks <DOT> net>
3 AuthorDate: Sun Dec 27 15:25:02 2020 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon May 17 20:40:57 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e1231be
7
8 sci-geosciences/qgis: Make qtserialport optional
9
10 Package-Manager: Portage-3.0.12, Repoman-3.0.2
11 Signed-off-by: Daniel M. Weeks <dan <AT> danweeks.net>
12 Closes: https://github.com/gentoo/gentoo/pull/18836
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 sci-geosciences/qgis/metadata.xml | 1 +
16 sci-geosciences/qgis/{qgis-3.16.2.ebuild => qgis-3.16.2-r1.ebuild} | 5 +++--
17 sci-geosciences/qgis/qgis-3.16.4.ebuild | 5 +++--
18 3 files changed, 7 insertions(+), 4 deletions(-)
19
20 diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml
21 index 6d6203f5cea..c54d1821656 100644
22 --- a/sci-geosciences/qgis/metadata.xml
23 +++ b/sci-geosciences/qgis/metadata.xml
24 @@ -23,5 +23,6 @@
25 <flag name="opencl">Enable OpenCL support</flag>
26 <flag name="polar">Enable support for the polar coordinate system via <pkg>x11-libs/qwtpolar</pkg></flag>
27 <flag name="qml">Enable support Qml-based plugins using <pkg>dev-qt/qtdeclarative</pkg></flag>
28 + <flag name="serial">Enable support for serial GPS using <pkg>dev-qt/qtserialport</pkg></flag>
29 </use>
30 </pkgmetadata>
31
32 diff --git a/sci-geosciences/qgis/qgis-3.16.2.ebuild b/sci-geosciences/qgis/qgis-3.16.2-r1.ebuild
33 similarity index 97%
34 rename from sci-geosciences/qgis/qgis-3.16.2.ebuild
35 rename to sci-geosciences/qgis/qgis-3.16.2-r1.ebuild
36 index ec3f713c80a..eb880dfdcb7 100644
37 --- a/sci-geosciences/qgis/qgis-3.16.2.ebuild
38 +++ b/sci-geosciences/qgis/qgis-3.16.2-r1.ebuild
39 @@ -21,7 +21,7 @@ HOMEPAGE="https://www.qgis.org/en/site/"
40
41 LICENSE="GPL-2+ GPL-3+"
42 SLOT="0"
43 -IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml"
44 +IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml serial"
45
46 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
47
48 @@ -45,7 +45,6 @@ COMMON_DEPEND="
49 dev-qt/qtnetwork:5[ssl]
50 dev-qt/qtpositioning:5
51 dev-qt/qtprintsupport:5
52 - dev-qt/qtserialport:5
53 dev-qt/qtsql:5
54 dev-qt/qtsvg:5
55 dev-qt/qtwidgets:5
56 @@ -92,6 +91,7 @@ COMMON_DEPEND="
57 ')
58 )
59 qml? ( dev-qt/qtdeclarative:5 )
60 + serial? ( dev-qt/qtserialport:5 )
61 "
62 DEPEND="${COMMON_DEPEND}
63 dev-qt/qttest:5
64 @@ -149,6 +149,7 @@ src_configure() {
65 -DWITH_BINDINGS=$(usex python)
66 -DWITH_CUSTOM_WIDGETS=$(usex python)
67 -DWITH_QUICK=$(usex qml)
68 + -DWITH_QT5SERIALPORT=$(usex serial)
69 -DWITH_QTWEBKIT=OFF
70 )
71
72
73 diff --git a/sci-geosciences/qgis/qgis-3.16.4.ebuild b/sci-geosciences/qgis/qgis-3.16.4.ebuild
74 index de610e62b0f..80d2d316881 100644
75 --- a/sci-geosciences/qgis/qgis-3.16.4.ebuild
76 +++ b/sci-geosciences/qgis/qgis-3.16.4.ebuild
77 @@ -21,7 +21,7 @@ HOMEPAGE="https://www.qgis.org/en/site/"
78
79 LICENSE="GPL-2+ GPL-3+"
80 SLOT="0"
81 -IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml"
82 +IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml serial"
83
84 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
85
86 @@ -45,7 +45,6 @@ COMMON_DEPEND="
87 dev-qt/qtnetwork:5[ssl]
88 dev-qt/qtpositioning:5
89 dev-qt/qtprintsupport:5
90 - dev-qt/qtserialport:5
91 dev-qt/qtsql:5
92 dev-qt/qtsvg:5
93 dev-qt/qtwidgets:5
94 @@ -92,6 +91,7 @@ COMMON_DEPEND="
95 ')
96 )
97 qml? ( dev-qt/qtdeclarative:5 )
98 + serial? ( dev-qt/qtserialport:5 )
99 "
100 DEPEND="${COMMON_DEPEND}
101 dev-qt/qttest:5
102 @@ -149,6 +149,7 @@ src_configure() {
103 -DWITH_BINDINGS=$(usex python)
104 -DWITH_CUSTOM_WIDGETS=$(usex python)
105 -DWITH_QUICK=$(usex qml)
106 + -DWITH_QT5SERIALPORT=$(usex serial)
107 -DWITH_QTWEBKIT=OFF
108 )