From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8A012139694 for ; Sun, 4 Jun 2017 10:25:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CF07921C100; Sun, 4 Jun 2017 10:25:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9A77A21C100 for ; Sun, 4 Jun 2017 10:25:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 08A7E3418B4 for ; Sun, 4 Jun 2017 10:25:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 99E307470 for ; Sun, 4 Jun 2017 10:25:46 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1496571936.0bc29c73699c8115f225e9bce6bc0e4e7b798d7a.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/merkaartor/merkaartor-0.18.3-r1.ebuild sci-geosciences/merkaartor/metadata.xml X-VCS-Directories: sci-geosciences/merkaartor/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 0bc29c73699c8115f225e9bce6bc0e4e7b798d7a X-VCS-Branch: master Date: Sun, 4 Jun 2017 10:25:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: be12e709-d8a5-4656-9e7b-0b3220330876 X-Archives-Hash: bd29f8cce0b137f8451d097f758a280a commit: 0bc29c73699c8115f225e9bce6bc0e4e7b798d7a Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 4 09:40:38 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jun 4 10:25:36 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bc29c73 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 .../merkaartor/merkaartor-0.18.3-r1.ebuild | 64 ++++++---------------- sci-geosciences/merkaartor/metadata.xml | 1 - 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 9f96ba78ff5..30b1ceb20cd 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 0182aec4c09..47721d5d2eb 100644 --- a/sci-geosciences/merkaartor/metadata.xml +++ b/sci-geosciences/merkaartor/metadata.xml @@ -7,7 +7,6 @@ Use net-libs/libproxy for getting the HTTP/HTTPS/SOCKS proxy configuration - Enable QR code scanning with media-gfx/zbar Enable dev-qt/qtwebengine in some plugins