1 |
commit: bc1f037fd9968571cfb37951b8bbe171512af8ee |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 2 23:27:03 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Mar 3 00:14:07 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc1f037f |
7 |
|
8 |
sci-geosciences/merkaartor: Add USE=webengine, drop Qt4 support |
9 |
|
10 |
Qt4 is deprecated upstream. |
11 |
|
12 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
13 |
|
14 |
sci-geosciences/merkaartor/merkaartor-9999.ebuild | 75 +++++++---------------- |
15 |
sci-geosciences/merkaartor/metadata.xml | 1 + |
16 |
2 files changed, 23 insertions(+), 53 deletions(-) |
17 |
|
18 |
diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild |
19 |
index dfce8ca18ad..5e16f21d97d 100644 |
20 |
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild |
21 |
+++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild |
22 |
@@ -1,4 +1,4 @@ |
23 |
-# Copyright 1999-2016 Gentoo Foundation |
24 |
+# Copyright 1999-2017 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
|
27 |
EAPI=6 |
28 |
@@ -7,7 +7,7 @@ PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi z |
29 |
|
30 |
inherit fdo-mime gnome2-utils git-r3 l10n qmake-utils |
31 |
|
32 |
-DESCRIPTION="A Qt based map editor for the openstreetmap.org project" |
33 |
+DESCRIPTION="Qt based map editor for the openstreetmap.org project" |
34 |
HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor" |
35 |
SRC_URI="" |
36 |
EGIT_REPO_URI="https://github.com/openstreetmap/merkaartor.git" |
37 |
@@ -15,39 +15,27 @@ EGIT_REPO_URI="https://github.com/openstreetmap/merkaartor.git" |
38 |
LICENSE="GPL-2" |
39 |
SLOT="0" |
40 |
KEYWORDS="" |
41 |
-IUSE="debug exif gps libproxy qrcode qt5" |
42 |
- |
43 |
-REQUIRED_USE="qrcode? ( !qt5 )" |
44 |
+IUSE="debug exif gps libproxy webengine" |
45 |
|
46 |
RDEPEND=" |
47 |
- !qt5? ( |
48 |
- dev-qt/qtcore:4 |
49 |
- dev-qt/qtgui:4 |
50 |
- dev-qt/qtsingleapplication[qt4] |
51 |
- dev-qt/qtsvg:4 |
52 |
- dev-qt/qtwebkit:4 |
53 |
- ) |
54 |
- qt5? ( |
55 |
- dev-qt/qtconcurrent:5 |
56 |
- dev-qt/qtcore:5 |
57 |
- dev-qt/qtgui:5 |
58 |
- dev-qt/qtprintsupport:5 |
59 |
- dev-qt/qtsvg:5 |
60 |
- dev-qt/qtwebkit:5 |
61 |
- dev-qt/qtwidgets:5 |
62 |
- dev-qt/qtxml:5 |
63 |
- ) |
64 |
- dev-qt/qtsingleapplication[X,qt5?] |
65 |
- >=sci-libs/gdal-1.6.0 |
66 |
- >=sci-libs/proj-4.6 |
67 |
+ dev-qt/qtconcurrent:5 |
68 |
+ dev-qt/qtcore:5 |
69 |
+ dev-qt/qtgui:5 |
70 |
+ dev-qt/qtprintsupport:5 |
71 |
+ dev-qt/qtsingleapplication[X,qt5] |
72 |
+ dev-qt/qtsvg:5 |
73 |
+ dev-qt/qtwidgets:5 |
74 |
+ dev-qt/qtxml:5 |
75 |
+ sci-libs/gdal |
76 |
+ sci-libs/proj |
77 |
sys-libs/zlib |
78 |
exif? ( media-gfx/exiv2:= ) |
79 |
gps? ( >=sci-geosciences/gpsd-3.13[cxx] ) |
80 |
libproxy? ( net-libs/libproxy ) |
81 |
- qrcode? ( media-gfx/zbar[qt4] ) |
82 |
+ webengine? ( dev-qt/qtwebengine:5 ) |
83 |
" |
84 |
DEPEND="${RDEPEND} |
85 |
- qt5? ( dev-qt/linguist-tools:5 ) |
86 |
+ dev-qt/linguist-tools:5 |
87 |
virtual/pkgconfig |
88 |
" |
89 |
|
90 |
@@ -67,11 +55,7 @@ src_prepare() { |
91 |
|
92 |
if [[ -n "$(l10n_get_locales)" ]]; then |
93 |
l10n_for_each_disabled_locale_do my_rm_loc |
94 |
- if use qt5 ; then |
95 |
- $(qt5_get_bindir)/lrelease src/src.pro || die |
96 |
- else |
97 |
- $(qt4_get_bindir)/lrelease src/src.pro || die |
98 |
- fi |
99 |
+ $(qt5_get_bindir)/lrelease src/src.pro || die |
100 |
fi |
101 |
|
102 |
# build system expects to be building from git |
103 |
@@ -82,33 +66,18 @@ src_prepare() { |
104 |
|
105 |
src_configure() { |
106 |
# TRANSDIR_SYSTEM is for bug #385671 |
107 |
- if use qt5 ; then |
108 |
- eqmake5 \ |
109 |
+ eqmake5 \ |
110 |
PREFIX="${ED}usr" \ |
111 |
LIBDIR="${ED}usr/$(get_libdir)" \ |
112 |
TRANSDIR_MERKAARTOR="${ED}usr/share/${PN}/translations" \ |
113 |
TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" \ |
114 |
SYSTEM_QTSA=1 \ |
115 |
- NODEBUG="$(usex debug '0' '1')" \ |
116 |
- GEOIMAGE="$(usex exif '1' '0')" \ |
117 |
- GPSDLIB="$(usex gps '1' '0')" \ |
118 |
- LIBPROXY="$(usex libproxy '1' '0')" \ |
119 |
- ZBAR="$(usex qrcode '1' '0')" \ |
120 |
+ NODEBUG=$(usex debug 0 1) \ |
121 |
+ GEOIMAGE=$(usex exif 1 0) \ |
122 |
+ GPSDLIB=$(usex gps 1 0) \ |
123 |
+ LIBPROXY=$(usex libproxy 1 0) \ |
124 |
+ USEWEBENGINE=$(usex webengine 1 0) \ |
125 |
Merkaartor.pro |
126 |
- else |
127 |
- eqmake4 \ |
128 |
- PREFIX="${ED}usr" \ |
129 |
- LIBDIR="${ED}usr/$(get_libdir)" \ |
130 |
- TRANSDIR_MERKAARTOR="${ED}usr/share/${PN}/translations" \ |
131 |
- TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt4/translations" \ |
132 |
- SYSTEM_QTSA=1 \ |
133 |
- NODEBUG="$(usex debug '0' '1')" \ |
134 |
- GEOIMAGE="$(usex exif '1' '0')" \ |
135 |
- GPSDLIB="$(usex gps '1' '0')" \ |
136 |
- LIBPROXY="$(usex libproxy '1' '0')" \ |
137 |
- ZBAR="$(usex qrcode '1' '0')" \ |
138 |
- Merkaartor.pro |
139 |
- fi |
140 |
} |
141 |
|
142 |
pkg_preinst() { |
143 |
|
144 |
diff --git a/sci-geosciences/merkaartor/metadata.xml b/sci-geosciences/merkaartor/metadata.xml |
145 |
index ac3993f6272..0182aec4c09 100644 |
146 |
--- a/sci-geosciences/merkaartor/metadata.xml |
147 |
+++ b/sci-geosciences/merkaartor/metadata.xml |
148 |
@@ -8,6 +8,7 @@ |
149 |
<use> |
150 |
<flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for getting the HTTP/HTTPS/SOCKS proxy configuration</flag> |
151 |
<flag name="qrcode">Enable QR code scanning with <pkg>media-gfx/zbar</pkg></flag> |
152 |
+ <flag name="webengine">Enable <pkg>dev-qt/qtwebengine</pkg> in some plugins</flag> |
153 |
</use> |
154 |
<upstream> |
155 |
<remote-id type="github">openstreetmap/merkaartor</remote-id> |