summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2017-06-04 11:40:38 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2017-06-04 12:25:36 +0200
commit0bc29c73699c8115f225e9bce6bc0e4e7b798d7a (patch)
tree5a02b81c4b62144714a55b6f24dd93a4b891d2ff
parentsci-geosciences/qgis: 2.18.9 version bump (diff)
downloadgentoo-0bc29c73699c8115f225e9bce6bc0e4e7b798d7a.zip
gentoo-0bc29c73699c8115f225e9bce6bc0e4e7b798d7a.tar.gz
gentoo-0bc29c73699c8115f225e9bce6bc0e4e7b798d7a.tar.bz2
sci-geosciences/merkaartor: Drop USE=qt5,qrcode
USE !qt5 depends on dev-qt/qtwebkit:4 which is ancient and will never see any security updates. Gentoo-bug: 620746 Package-Manager: Portage-2.3.5, Repoman-2.3.1
-rw-r--r--sci-geosciences/merkaartor/merkaartor-0.18.3-r1.ebuild64
-rw-r--r--sci-geosciences/merkaartor/metadata.xml1
2 files changed, 16 insertions, 49 deletions
diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r1.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r1.ebuild
index 9f96ba7..30b1ceb 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.18.3-r1.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,46 +7,34 @@ 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
inherit fdo-mime gnome2-utils l10n qmake-utils
-DESCRIPTION="A Qt based map editor for the openstreetmap.org project"
+DESCRIPTION="Qt based map editor for the openstreetmap.org project"
HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="debug exif gps libproxy qrcode qt5"
-
-REQUIRED_USE="qrcode? ( !qt5 )"
+IUSE="debug exif gps libproxy"
RDEPEND="
- !qt5? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qtsingleapplication[qt4]
- dev-qt/qtsvg:4
- dev-qt/qtwebkit:4
- )
- qt5? (
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsvg:5
- dev-qt/qtwebkit:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- )
- dev-qt/qtsingleapplication[X,qt5?]
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwebkit:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ dev-qt/qtsingleapplication[X,qt5]
>=sci-libs/gdal-1.6.0
>=sci-libs/proj-4.6
sys-libs/zlib
exif? ( media-gfx/exiv2:= )
gps? ( >=sci-geosciences/gpsd-3.13[cxx] )
libproxy? ( net-libs/libproxy )
- qrcode? ( media-gfx/zbar[qt4] )
"
DEPEND="${RDEPEND}
- qt5? ( dev-qt/linguist-tools:5 )
+ dev-qt/linguist-tools:5
virtual/pkgconfig
"
@@ -62,11 +50,7 @@ src_prepare() {
if [[ -n "$(l10n_get_locales)" ]]; then
l10n_for_each_disabled_locale_do my_rm_loc
- if use qt5 ; then
- $(qt5_get_bindir)/lrelease src/src.pro || die
- else
- $(qt4_get_bindir)/lrelease src/src.pro || die
- fi
+ $(qt5_get_bindir)/lrelease src/src.pro || die
fi
# build system expects to be building from git
@@ -75,8 +59,7 @@ src_prepare() {
src_configure() {
# TRANSDIR_SYSTEM is for bug #385671
- if use qt5 ; then
- eqmake5 \
+ eqmake5 \
PREFIX="${ED}usr" \
LIBDIR="${ED}usr/$(get_libdir)" \
TRANSDIR_MERKAARTOR="${ED}usr/share/${PN}/translations" \
@@ -87,23 +70,8 @@ src_configure() {
GEOIMAGE="$(usex exif '1' '0')" \
GPSDLIB="$(usex gps '1' '0')" \
LIBPROXY="$(usex libproxy '1' '0')" \
- ZBAR="$(usex qrcode '1' '0')" \
- Merkaartor.pro
- else
- eqmake4 \
- PREFIX="${ED}usr" \
- LIBDIR="${ED}usr/$(get_libdir)" \
- TRANSDIR_MERKAARTOR="${ED}usr/share/${PN}/translations" \
- TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt4/translations" \
- SYSTEM_QTSA=1 \
- RELEASE=1 \
- NODEBUG="$(usex debug '0' '1')" \
- GEOIMAGE="$(usex exif '1' '0')" \
- GPSDLIB="$(usex gps '1' '0')" \
- LIBPROXY="$(usex libproxy '1' '0')" \
- ZBAR="$(usex qrcode '1' '0')" \
+ ZBAR=0 \
Merkaartor.pro
- fi
}
pkg_preinst() {
diff --git a/sci-geosciences/merkaartor/metadata.xml b/sci-geosciences/merkaartor/metadata.xml
index 0182aec..47721d5 100644
--- a/sci-geosciences/merkaartor/metadata.xml
+++ b/sci-geosciences/merkaartor/metadata.xml
@@ -7,7 +7,6 @@
</maintainer>
<use>
<flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for getting the HTTP/HTTPS/SOCKS proxy configuration</flag>
- <flag name="qrcode">Enable QR code scanning with <pkg>media-gfx/zbar</pkg></flag>
<flag name="webengine">Enable <pkg>dev-qt/qtwebengine</pkg> in some plugins</flag>
</use>
<upstream>