From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1269248-garchives=archives.gentoo.org@lists.gentoo.org>
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 8C5E913835A
for <garchives@archives.gentoo.org>; Sat, 10 Apr 2021 12:40:43 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id AC2DAE0872;
Sat, 10 Apr 2021 12:40:42 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 941E4E0872
for <gentoo-commits@lists.gentoo.org>; Sat, 10 Apr 2021 12:40:42 +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 9EAE3340931
for <gentoo-commits@lists.gentoo.org>; Sat, 10 Apr 2021 12:40:40 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id BD33D5B8
for <gentoo-commits@lists.gentoo.org>; Sat, 10 Apr 2021 12:40:38 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1618058426.6b8d0f22a739a4ca454c9e14504426dad06f9188.sam@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.18.4_p20210410.ebuild sci-geosciences/merkaartor/merkaartor-9999.ebuild
X-VCS-Directories: sci-geosciences/merkaartor/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 6b8d0f22a739a4ca454c9e14504426dad06f9188
X-VCS-Branch: master
Date: Sat, 10 Apr 2021 12:40:38 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: af39fbd5-591c-4646-98b2-61c4e49f54d4
X-Archives-Hash: 717848f7655b38ade59866338b4a4853
commit: 6b8d0f22a739a4ca454c9e14504426dad06f9188
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 10 12:21:13 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 10 12:40:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b8d0f22
sci-geosciences/merkaartor: add 0.18.4_p20210410 (snapshot for PROJ 8)
Hot off the press snapshot to add compatibility with PROJ 8.
Closes: https://bugs.gentoo.org/685234
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/merkaartor/Manifest | 1 +
...tor-9999.ebuild => merkaartor-0.18.4_p20210410.ebuild} | 15 +++++++++++++--
sci-geosciences/merkaartor/merkaartor-9999.ebuild | 7 ++++++-
3 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest
index 3f1b0c066e1..ce9bffda55d 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -1 +1,2 @@
DIST merkaartor-0.18.4.tar.gz 6562065 BLAKE2B 2dbd85c81f337138b249807dcb404b9167cc63bec51cc19afa95b088733375bec234df75fef2652864c811ff6d9927c93f16df42044be3706b68332fcd817706 SHA512 16001688584fd13eb7573159092a21ed0189ae0ce900474bacd5b1e47b8cebb0c4b2bd5b904e13a0029ec01167b68a32a9936914b3f5a1360b389aa31858cf9c
+DIST merkaartor-0.18.4_p20210410.tar.gz 6566072 BLAKE2B d2788552794e2778d6b68cc39ad04ec081ef88d0e3748af380774ee3ac98871bdaf1f26a04065bfb591b9245d740acec4fcfb4b781311409b49932014dfa86bb SHA512 3051280fd1ab6fa5b9e40e4c1aa1df137b60f3f4062daaa9301dce3697c51d7f4514bd01d7954f5c332849e268f6fcf6f23a2bc58b13645c5e29f9a12c9a3a34
diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410.ebuild
similarity index 83%
copy from sci-geosciences/merkaartor/merkaartor-9999.ebuild
copy to sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410.ebuild
index 8ff9caf11e1..26387cc5076 100644
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,7 +7,13 @@ 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 l10n qmake-utils xdg-utils
if [[ ${PV} != *9999 ]] ; then
- SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ # Needed for new Proj API support
+ # bug #685234
+ COMMIT="7ae76834bcba9934f38d85058f7372fc016c1d1c"
+ SRC_URI="https://github.com/openstreetmap/merkaartor/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+ #SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/${PN}-${COMMIT}"
+
KEYWORDS="~amd64 ~x86"
else
EGIT_REPO_URI="https://github.com/openstreetmap/merkaartor.git"
@@ -71,6 +77,11 @@ src_prepare() {
}
src_configure() {
+ if has_version "<sci-libs/proj-8.0.0" ; then
+ # bug #685234
+ append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+ fi
+
# TRANSDIR_SYSTEM is for bug #385671
local myeqmakeargs=(
PREFIX="${ED}/usr"
diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
index 8ff9caf11e1..a18b587ed58 100644
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -71,6 +71,11 @@ src_prepare() {
}
src_configure() {
+ if has_version "<sci-libs/proj-8.0.0" ; then
+ # bug #685234
+ append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+ fi
+
# TRANSDIR_SYSTEM is for bug #385671
local myeqmakeargs=(
PREFIX="${ED}/usr"