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 9E039138351 for ; Thu, 13 Feb 2020 21:28:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E0D86E083E; Thu, 13 Feb 2020 21:28:29 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 BCD99E083E for ; Thu, 13 Feb 2020 21:28:29 +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 69B8C34ED9E for ; Thu, 13 Feb 2020 21:28:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7F54613B for ; Thu, 13 Feb 2020 21:28:24 +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: <1581629270.7a2318a35d03633708e179573341ba25cfb2f816.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/osm2pgsql/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild X-VCS-Directories: sci-geosciences/osm2pgsql/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 7a2318a35d03633708e179573341ba25cfb2f816 X-VCS-Branch: master Date: Thu, 13 Feb 2020 21:28:24 +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: 066dad2a-dc00-4c2c-b995-4f85f03d8ef3 X-Archives-Hash: a537749b17d745f5a2c741befb127ffe commit: 7a2318a35d03633708e179573341ba25cfb2f816 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Feb 13 20:49:43 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Feb 13 21:27:50 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a2318a3 sci-geosciences/osm2pgsql: Sync live w/ release and back Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild | 4 ++-- sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild | 14 ++++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild index a6cb7e42a46..e5e751831c5 100644 --- a/sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild +++ b/sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild @@ -5,9 +5,9 @@ EAPI=7 inherit cmake flag-o-matic -DESCRIPTION="Converts OSM data to SQL and insert into PostgreSQL db" +DESCRIPTION="Converts OSM planet.osm data to a PostgreSQL/PostGIS database" HOMEPAGE="https://wiki.openstreetmap.org/wiki/Osm2pgsql - https://github.com/openstreetmap/osm2pgsql" + https://github.com/openstreetmap/osm2pgsql" SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild index 44e16db4804..78b4534c993 100644 --- a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild +++ b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild @@ -1,14 +1,15 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-utils git-r3 +inherit cmake flag-o-matic git-r3 EGIT_REPO_URI="https://github.com/openstreetmap/${PN}.git" DESCRIPTION="Converts OSM planet.osm data to a PostgreSQL/PostGIS database" -HOMEPAGE="https://wiki.openstreetmap.org/wiki/Osm2pgsql" +HOMEPAGE="https://wiki.openstreetmap.org/wiki/Osm2pgsql + https://github.com/openstreetmap/osm2pgsql" SRC_URI="" LICENSE="GPL-2" @@ -20,7 +21,7 @@ COMMON_DEPEND=" app-arch/bzip2 dev-db/postgresql:= dev-libs/expat - sci-libs/proj + sci-libs/proj:= sys-libs/zlib lua? ( dev-lang/lua:= ) " @@ -35,9 +36,10 @@ RDEPEND="${COMMON_DEPEND} RESTRICT="test" src_configure() { + append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1 local mycmakeargs=( -DWITH_LUA=$(usex lua) -DBUILD_TESTS=OFF ) - cmake-utils_src_configure + cmake_src_configure }