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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 05FEE15806E for ; Mon, 15 May 2023 21:28:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 49B65E08C4; Mon, 15 May 2023 21:28:38 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 34BE3E08C4 for ; Mon, 15 May 2023 21:28:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7DAA4340DD4 for ; Mon, 15 May 2023 21:28:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C59D5A68 for ; Mon, 15 May 2023 21:28:35 +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: <1684186082.6d1c0fa63caaf34e86731b96dd09adf7039a182d.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.19.0-r1.ebuild X-VCS-Directories: sci-geosciences/merkaartor/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 6d1c0fa63caaf34e86731b96dd09adf7039a182d X-VCS-Branch: master Date: Mon, 15 May 2023 21:28:35 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7e1ce222-4ae7-4b08-a3f5-7cbb364036f4 X-Archives-Hash: 3a65cf7e2d12d3b8451cc1e33a8517d8 commit: 6d1c0fa63caaf34e86731b96dd09adf7039a182d Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon May 15 21:08:12 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon May 15 21:28:02 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d1c0fa6 sci-geosciences/merkaartor: Redo 0.19.0 from 9999, restore PROJ-8 compat As it should be done. Bug: https://bugs.gentoo.org/828781 Closes: https://bugs.gentoo.org/836098 Signed-off-by: Andreas Sturmlechner gentoo.org> .../merkaartor/merkaartor-0.19.0-r1.ebuild | 101 +++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/sci-geosciences/merkaartor/merkaartor-0.19.0-r1.ebuild b/sci-geosciences/merkaartor/merkaartor-0.19.0-r1.ebuild new file mode 100644 index 000000000000..f0f4b1dbd195 --- /dev/null +++ b/sci-geosciences/merkaartor/merkaartor-0.19.0-r1.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PLOCALES="cs de en es fi fr hr hu id_ID it ja nl pl pt_BR ru sv uk zh_TW" +inherit flag-o-matic plocale qmake-utils xdg + +if [[ ${PV} != *9999 ]] ; then + SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +else + EGIT_REPO_URI="https://github.com/openstreetmap/merkaartor.git" + inherit git-r3 +fi + +DESCRIPTION="Qt based map editor for the openstreetmap.org project" +HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor" + +LICENSE="GPL-2" +SLOT="0" +IUSE="debug exif gps libproxy webengine" + +DEPEND=" + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsingleapplication[X,qt5(+)] + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + sci-libs/gdal:= + sci-libs/proj:= + sys-libs/zlib + exif? ( media-gfx/exiv2:= ) + gps? ( >=sci-geosciences/gpsd-3.17-r2:= ) + libproxy? ( net-libs/libproxy ) + webengine? ( dev-qt/qtwebengine:5[widgets] ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + dev-qt/linguist-tools:5 + virtual/pkgconfig +" + +PATCHES=( "${FILESDIR}"/${PN}-0.18.3-sharedir-pluginsdir.patch ) # bug 621826 + +DOCS=( AUTHORS CHANGELOG ) + +src_prepare() { + default + + rm -r 3rdparty || die "Failed to remove bundled libs" + + my_rm_loc() { + sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die + rm "translations/${PN}_${1}.ts" || die + } + + if [[ -n "$(plocale_get_locales)" ]]; then + plocale_for_each_disabled_locale my_rm_loc + $(qt5_get_bindir)/lrelease src/src.pro || die + fi + + # build system expects to be building from git + if [[ ${PV} != *9999 ]] ; then + sed -i src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die + fi +} + +src_configure() { + if has_version "