gentoo resync : 17.02.2020

4 files changed, 19 insertions, 59 deletions

diff --git a/sci-geosciences/osm2pgsql/Manifest b/sci-geosciences/osm2pgsql/Manifest
index f278272bfe46..d7bd15128464 100644
--- a/sci-geosciences/osm2pgsql/Manifest
+++ b/sci-geosciences/osm2pgsql/Manifest
@@ -1,6 +1,4 @@
-DIST osm2pgsql-0.94.0.tar.gz 1203310 BLAKE2B df9af84aab13bfd79763238e89dfc216401be2460be468a2f5467513dfcbd48650d779586f9cefd4100d6404f430a2401326919e9a1c72d86b80c6526881f206 SHA512 eceb5de7679048f51a9ad1be4ecf5b2d26da827b3eb8d6b0e86657603c8bf8a6f8d6f665c8ff8db91070a2966057f2deed5e4a3cc8bfb28e60a6031454e4758e
 DIST osm2pgsql-0.96.0.tar.gz 1219163 BLAKE2B a89e40e74ea52bf46593e48dd1f9047b958b645ce38aeb554c930e2d9efdf4f0bb9b6fd7a9b209342d59ca8a0d3ada3023f14324bf8b02b060d8dfd987763528 SHA512 6c6bb00c17995b9a99975076ad3af35a99678a7780db144f7fdd1f5c856b777883f1b1dac7e1c3ca9a2a490d3774f62c8aa9f8742c955c377c28d5b827657372
-EBUILD osm2pgsql-0.94.0.ebuild 864 BLAKE2B a500d39a0cb460cac74f228d6fafca27c9d8ac3c9b33e8c895f5287e6b7ec3fa88be469804068429c9c9390d19cf487f302412bcf8275e83906d12122b197640 SHA512 6605ebc9725f55851feb512b63f2f6b4e3a58147b87e5ee0cb91b4523737dca4f8d9b35a0db0aa762539ae9362a4193db6476562362dffed3e0493fdd5f5171c
-EBUILD osm2pgsql-0.96.0.ebuild 870 BLAKE2B ef29fd0117b292a6691bf77d8aedabd83bc2befb7414d3a0b9de518c75876f3b6bc59a3a38858fa47cec24ac273d5417fc9dcbe35d2e66a71fcdf6cd8aa32382 SHA512 3d381f02b8f1283867133da665fe8c97f37222964f84e2cce77f27ba910c2f439b5572871dda54b43dea74c62b00642f124a9e24f01022c999d024f837fcd2df
-EBUILD osm2pgsql-99999999.ebuild 812 BLAKE2B 3f4fd25082adf137822d07ac89cb27f5a8c7d9e80437ad047241e6589e90f746aacf5d7332093a8604b566ac41d638530b47efaf2c33382856e7bdbe48f4be5e SHA512 a70c0352ec4299ddc7df14d5d10c3756d569958ca78789989ee55460e0918315a076157e03477b6054a5614e1f537ba9fe9bd680d5102f49f3135f0c1b5475e1
+EBUILD osm2pgsql-0.96.0.ebuild 929 BLAKE2B 8e6439ecb63014d35000663c76b622d08e196ed81331c715122e6f512347e136d0157491d568baa693755f4d335b23c5782a7ef50d9e43487e5b12e88ff86949 SHA512 efdadf44119fedd15a4b15108e197edd16ffdff5f1b76e64a75091c4a8df3ac06a7bb21f3721391e15a0518ae96424b0ea7c17e410af1b7e642438153469cbfa
+EBUILD osm2pgsql-99999999.ebuild 913 BLAKE2B a41beca987915d3502321a499e7eff09fe69421e5d0c767c5f3c08a415739123b6df1b1c27ed12861556a684f5063df041a21f074b3fb44dc8cab66c6ed57712 SHA512 7cfb4ae3e48254f7c02563f6430ee8b8886d0b266f65762a12c3b4b6fb85979262ca0c71359355d1fac077e824ac3ff0de400a407e9032a9ef077a5e07cc04de
 MISC metadata.xml 793 BLAKE2B d74e55e2b2cd946a65cba5bd3f0ba953edf8528d6d30037fbd69640d7379ced6e07a0e81e57f02f2e49afde4a55b07c21cb5430de1d42a682e10bfd964ab7939 SHA512 2f76c2c5946179da213b0bf193e89f110c46818ab77a4dea41df1fc78d1527ace8ff81a3887ebb47e6ee0a799e0ee037364e22bfdd5ce72feb765209b6a3fcd6
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.94.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.94.0.ebuild
deleted file mode 100644
index f6ef3e3fbfc4..000000000000
--- a/sci-geosciences/osm2pgsql/osm2pgsql-0.94.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Converts OSM data to SQL and insert into PostgreSQL db"
-HOMEPAGE="https://wiki.openstreetmap.org/wiki/Osm2pgsql https://github.com/openstreetmap/osm2pgsql"
-SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+lua"
-
-COMMON_DEPEND="
-	app-arch/bzip2
-	dev-db/postgresql:=
-	dev-libs/expat
-	sci-libs/proj
-	sys-libs/zlib
-	lua? ( dev-lang/lua:= )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-db/postgis
-"
-
-# Tries to connect to local postgres server and other shenanigans
-RESTRICT="test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_LUA=$(usex lua)
-		-DBUILD_TESTS=OFF
-	)
-	cmake-utils_src_configure
-}
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild
index 990f5c9422a8..e5e751831c5d 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild
@@ -1,25 +1,25 @@
-# Copyright 1999-2018 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
+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"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+lua"
 
 COMMON_DEPEND="
 	app-arch/bzip2
 	dev-db/postgresql:=
 	dev-libs/expat
-	sci-libs/proj
+	sci-libs/proj:=
 	sys-libs/zlib
 	lua? ( dev-lang/lua:= )
 "
@@ -34,9 +34,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
 }
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
index 44e16db48041..78b4534c993e 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
 }