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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E9AD6158042 for ; Mon, 21 Oct 2024 17:58:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 44608E0A49; Mon, 21 Oct 2024 17:58:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 2FE1BE09DE for ; Mon, 21 Oct 2024 17:58:40 +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 79A7E340BE2 for ; Mon, 21 Oct 2024 17:58:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DB0421682 for ; Mon, 21 Oct 2024 17:58:37 +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: <1729533400.04cad82a4b70b691cc22a8909de026ae20d10d9e.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/merkaartor/Manifest sci-geosciences/merkaartor/merkaartor-0.20.0.ebuild X-VCS-Directories: sci-geosciences/merkaartor/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 04cad82a4b70b691cc22a8909de026ae20d10d9e X-VCS-Branch: master Date: Mon, 21 Oct 2024 17:58:37 +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: b4f02661-b3db-4235-9b9c-fc9b345be04e X-Archives-Hash: 88f73bb129af1db8ae2f0c1cea6b1514 commit: 04cad82a4b70b691cc22a8909de026ae20d10d9e Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Oct 21 17:55:23 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Oct 21 17:56:40 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04cad82a sci-geosciences/merkaartor: add 0.20.0 Closes: https://bugs.gentoo.org/941138 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-geosciences/merkaartor/Manifest | 1 + .../merkaartor/merkaartor-0.20.0.ebuild | 71 ++++++++++++++++++++++ 2 files changed, 72 insertions(+) diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest index eb14ca0751f1..511699b85cad 100644 --- a/sci-geosciences/merkaartor/Manifest +++ b/sci-geosciences/merkaartor/Manifest @@ -1 +1,2 @@ DIST merkaartor-0.19.0.tar.gz 5665947 BLAKE2B 1ade571b8e429b9da89206d50b0f33f69cb0973d4ada30dc0d84d4c6c47394170ddb8503490eeda8666656eeb07159498d02bbc36e61f2dffedef167f221be01 SHA512 2e832ba14fd89861a4ae2940d281c801d039e09aaf30ada996ac508e084a29d033f8ac3d3e4711c78d1f36df84ab133bd0a901e0e8fa72efa098001724940a6d +DIST merkaartor-0.20.0.tar.gz 5592116 BLAKE2B 9a78f66cea55bab3262d80d594da93f80bb834c7121960da1ade02624f8435545168b911a944d005995a0c60e4974fd58494867a6ec2eca47b1430968677a9d3 SHA512 db64c3053618a0bed7984223c9aa8e4175fdf7db2dd70bf3c6ec021b46fae1d095c513c3e151086baf07446c7cf81c49923a2e43e79963d956d29643d7f93910 diff --git a/sci-geosciences/merkaartor/merkaartor-0.20.0.ebuild b/sci-geosciences/merkaartor/merkaartor-0.20.0.ebuild new file mode 100644 index 000000000000..892191a4c37c --- /dev/null +++ b/sci-geosciences/merkaartor/merkaartor-0.20.0.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake 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="https://www.merkaartor.be https://github.com/openstreetmap/merkaartor" + +LICENSE="GPL-2" +SLOT="0" +IUSE="exif gps libproxy webengine zbar" + +# bundles qtsingleapplication again, unfortunately +DEPEND=" + dev-libs/protobuf:= + dev-qt/qt5compat:6 + dev-qt/qtbase:6[concurrent,gui,network,widgets,xml] + dev-qt/qtnetworkauth:6 + dev-qt/qtsvg:6 + sci-libs/gdal:= + sci-libs/proj:= + sys-libs/zlib + exif? ( media-gfx/exiv2:= ) + gps? ( >=sci-geosciences/gpsd-3.17-r2:= ) + libproxy? ( >=net-libs/libproxy-0.5 ) + webengine? ( dev-qt/qtwebengine:6[widgets] ) + zbar? ( media-gfx/zbar ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + dev-qt/qttools:6[linguist] + virtual/pkgconfig +" + +DOCS=( AUTHORS CHANGELOG ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.20.0-disable-git.patch # downstream patch + # pending upstream PR: https://github.com/openstreetmap/merkaartor/pull/291 + "${FILESDIR}"/${PN}-0.20.0-GNUInstallDirs.patch +) + +src_prepare() { + # no Qt5 automagic, please + sed -e "/^ *find_package.*QT NAMES/s/Qt5 //" -i CMakeLists.txt || die + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DGEOIMAGE=$(usex exif) + -DGPSD=$(usex gps) + -DLIBPROXY=$(usex libproxy) + -DWEBENGINE=$(usex webengine) + -DZBAR=$(usex zbar) + -DEXTRA_TESTS=OFF + ) + + cmake_src_configure +}