[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/

["Amy Liffey" <amynka@gentoo.org>]

commit:     7fee9321d16014b12fe82a608c79f860dba68a61
Author:     Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 30 07:17:40 2019 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Sun Jun 30 07:18:42 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fee9321

sci-geosciences/merkaartor: fix compilation with proj-6.0.0

Closes: https://bugs.gentoo.org/685234
Submitted-by: <phobosk <AT> fastmail.fm>
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
index d3bb9dded76..7c990dab379 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
 
-inherit gnome2-utils l10n qmake-utils xdg-utils
+inherit gnome2-utils l10n qmake-utils xdg-utils flag-o-matic
 
 DESCRIPTION="Qt based map editor for the openstreetmap.org project"
 HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
@@ -65,6 +65,8 @@ src_prepare() {
 }
 
 src_configure() {
+	append-flags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+
 	# TRANSDIR_SYSTEM is for bug #385671
 	eqmake5 \
 		PREFIX="${ED%/}/usr" \