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 9D51B138334 for ; Sun, 20 Oct 2019 14:21:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C7CB3E0ACA; Sun, 20 Oct 2019 14:21:05 +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 AA422E0ACD for ; Sun, 20 Oct 2019 14:21:05 +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 9574234C0C7 for ; Sun, 20 Oct 2019 14:21:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 91400897 for ; Sun, 20 Oct 2019 14:21:01 +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: <1571581176.edc61c208f0045cf5335a130d0dbad2909241073.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/spatialite/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/spatialite/spatialite-4.3.0a.ebuild X-VCS-Directories: dev-db/spatialite/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: edc61c208f0045cf5335a130d0dbad2909241073 X-VCS-Branch: master Date: Sun, 20 Oct 2019 14:21:01 +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: 8d70a666-67b7-4523-81db-aee10a7d8367 X-Archives-Hash: 5743442291dfcc835ea88e77f663af1a commit: edc61c208f0045cf5335a130d0dbad2909241073 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Oct 20 13:31:11 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Oct 20 14:19:36 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edc61c20 dev-db/spatialite: Workaround build with >=sci-libs/proj-6 Thanks-to: Dmitry Suloev gmail.com> Closes: https://bugs.gentoo.org/685668 Package-Manager: Portage-2.3.77, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-db/spatialite/spatialite-4.3.0a.ebuild | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dev-db/spatialite/spatialite-4.3.0a.ebuild b/dev-db/spatialite/spatialite-4.3.0a.ebuild index 796d1774d60..3fb9d3d53dd 100644 --- a/dev-db/spatialite/spatialite-4.3.0a.ebuild +++ b/dev-db/spatialite/spatialite-4.3.0a.ebuild @@ -3,6 +3,8 @@ EAPI=6 +inherit flag-o-matic + MY_PN="lib${PN}" MY_P="${MY_PN}-${PV}" @@ -19,7 +21,7 @@ RDEPEND=" >=dev-db/sqlite-3.7.5:3[extensions(+)] sys-libs/zlib geos? ( >=sci-libs/geos-3.4 ) - proj? ( sci-libs/proj ) + proj? ( sci-libs/proj:= ) xls? ( dev-libs/freexl ) xml? ( dev-libs/libxml2 ) " @@ -30,6 +32,9 @@ REQUIRED_USE="test? ( iconv )" S="${WORKDIR}/${MY_P}" src_configure() { + if use proj && has_version ">=sci-libs/proj-6.0.0"; then + append-flags "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" + fi econf \ --disable-examples \ --disable-static \