1 |
commit: 40c0022324cce624eb8b47eed466d77f1e3965ec |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Apr 27 21:30:43 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Apr 28 15:26:43 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40c00223 |
7 |
|
8 |
sci-geosciences/qgis: EAPI-7 bump |
9 |
|
10 |
Package-Manager: Portage-2.3.65, Repoman-2.3.12 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
sci-geosciences/qgis/qgis-9999.ebuild | 36 ++++++++++++++--------------------- |
14 |
1 file changed, 14 insertions(+), 22 deletions(-) |
15 |
|
16 |
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild |
17 |
index 9e1e9a34acb..9a778816327 100644 |
18 |
--- a/sci-geosciences/qgis/qgis-9999.ebuild |
19 |
+++ b/sci-geosciences/qgis/qgis-9999.ebuild |
20 |
@@ -1,22 +1,21 @@ |
21 |
# Copyright 1999-2019 Gentoo Authors |
22 |
# Distributed under the terms of the GNU General Public License v2 |
23 |
|
24 |
-EAPI=6 |
25 |
+EAPI=7 |
26 |
|
27 |
PYTHON_COMPAT=( python3_{5,6} ) |
28 |
PYTHON_REQ_USE="sqlite" |
29 |
QT_MIN_VER="5.9.4" |
30 |
|
31 |
-if [[ ${PV} != *9999 ]]; then |
32 |
+if [[ ${PV} = *9999 ]]; then |
33 |
+ EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git" |
34 |
+ inherit git-r3 |
35 |
+else |
36 |
SRC_URI="https://qgis.org/downloads/${P}.tar.bz2 |
37 |
examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )" |
38 |
KEYWORDS="~amd64 ~x86" |
39 |
-else |
40 |
- GIT_ECLASS="git-r3" |
41 |
- EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git" |
42 |
fi |
43 |
-inherit cmake-utils desktop ${GIT_ECLASS} gnome2-utils python-single-r1 qmake-utils xdg-utils |
44 |
-unset GIT_ECLASS |
45 |
+inherit cmake-utils desktop python-single-r1 qmake-utils xdg |
46 |
|
47 |
DESCRIPTION="User friendly Geographic Information System" |
48 |
HOMEPAGE="https://www.qgis.org/" |
49 |
@@ -27,6 +26,11 @@ IUSE="3d examples georeferencer grass mapserver oracle polar postgres python qml |
50 |
|
51 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" |
52 |
|
53 |
+BDEPEND=" |
54 |
+ >=dev-qt/linguist-tools-${QT_MIN_VER}:5 |
55 |
+ sys-devel/bison |
56 |
+ sys-devel/flex |
57 |
+" |
58 |
COMMON_DEPEND=" |
59 |
app-crypt/qca:2[qt5(+),ssl] |
60 |
>=dev-db/spatialite-4.2.0 |
61 |
@@ -84,11 +88,8 @@ COMMON_DEPEND=" |
62 |
webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) |
63 |
" |
64 |
DEPEND="${COMMON_DEPEND} |
65 |
- >=dev-qt/linguist-tools-${QT_MIN_VER}:5 |
66 |
>=dev-qt/qttest-${QT_MIN_VER}:5 |
67 |
>=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5 |
68 |
- sys-devel/bison |
69 |
- sys-devel/flex |
70 |
python? ( ${PYTHON_DEPS} ) |
71 |
" |
72 |
RDEPEND="${COMMON_DEPEND} |
73 |
@@ -124,7 +125,6 @@ src_prepare() { |
74 |
src_configure() { |
75 |
local mycmakeargs=( |
76 |
-DQGIS_MANUAL_SUBDIR=/share/man/ |
77 |
- -DBUILD_SHARED_LIBS=ON |
78 |
-DQGIS_LIB_SUBDIR=$(get_libdir) |
79 |
-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis |
80 |
-DQWT_INCLUDE_DIR=/usr/include/qwt6 |
81 |
@@ -187,11 +187,11 @@ src_install() { |
82 |
fi |
83 |
|
84 |
if use python; then |
85 |
- python_optimize "${ED%/}"/usr/share/qgis/python |
86 |
+ python_optimize "${ED}"/usr/share/qgis/python |
87 |
fi |
88 |
|
89 |
if use grass; then |
90 |
- python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts |
91 |
+ python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts |
92 |
fi |
93 |
} |
94 |
|
95 |
@@ -210,13 +210,5 @@ pkg_postinst() { |
96 |
elog "QGIS is now based on PyQt5. Old scripts may not work anymore." |
97 |
fi |
98 |
|
99 |
- gnome2_icon_cache_update |
100 |
- xdg_mimeinfo_database_update |
101 |
- xdg_desktop_database_update |
102 |
-} |
103 |
- |
104 |
-pkg_postrm() { |
105 |
- gnome2_icon_cache_update |
106 |
- xdg_mimeinfo_database_update |
107 |
- xdg_desktop_database_update |
108 |
+ xdg_pkg_postinst |
109 |
} |