commit: 7a2318a35d03633708e179573341ba25cfb2f816 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Feb 13 20:49:43 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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 }
