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

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     8f7695744c503cfb459afef7ac3d0c952276d80b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  2 21:02:30 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar  2 21:13:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f769574

sci-geosciences/osm2pgsql: 0.92.0 version bump, sync live ebuild

USE=lua also needs to trigger a build switch.
Add dev-db/postgis to RDEPEND.
Live: Switch to git-r3.eclass. EAPI 6.
Last bumps seem to not have been made from more correct live ebuild.

Gentoo-bug: 608590

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-geosciences/osm2pgsql/Manifest                 |  1 +
 sci-geosciences/osm2pgsql/osm2pgsql-0.92.0.ebuild  | 42 ++++++++++++++++++++++
 .../osm2pgsql/osm2pgsql-99999999.ebuild            | 23 +++++++++---
 3 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/sci-geosciences/osm2pgsql/Manifest b/sci-geosciences/osm2pgsql/Manifest
index 46fd6e0df5e..887d349b534 100644
--- a/sci-geosciences/osm2pgsql/Manifest
+++ b/sci-geosciences/osm2pgsql/Manifest
@@ -4,3 +4,4 @@ DIST osm2pgsql-0.87.0.tar.gz 2139841 SHA256 6f5538d098e17a578a384f70f61b335f10ed
 DIST osm2pgsql-0.87.1.tar.gz 2139623 SHA256 49cdfb36ab1abbc568bd5d8593a671d76205ed47efba5a23d84ab1b975b4b62e SHA512 2efa1e350c24cc6a5aac69e9df60172bfbe99a5fc10d4fea8f1af28afaf4c0176e51dd357c89e2d68a264b283457e798746da47515684f2aeee3a26abe6d1171 WHIRLPOOL d00be1f2613c7fa779ece1ce2b16b68d423a365569d4355848fd5fcaa72cbcc49b11b9c083fd28533c92b42c0f59ab3a9538a4cc5253cb74c50ee271aacd948a
 DIST osm2pgsql-0.88.1.tar.gz 2140606 SHA256 08ec33c833768dec9856f537bbf4416ad45837ee0851eeeab0081c7bbed3449e SHA512 fe98afdeab9fa966bacc1b5886dc10494f2d58e0c8d26be1c732e782b583c1285689506c412d16b70cdd5b3e4146204f52201283ef54a0746fcf99f76cbe1fd5 WHIRLPOOL b20e84c2187a99555619e098035805e6916a7b9f96f27cc5e94f68f80d09e3ec3c773f1058a5b41b5fa8c834f7a78d39a7b4fb7a4b9901629bfd98007c392025
 DIST osm2pgsql-0.90.0.tar.gz 1326711 SHA256 cebf53c54ab2cd8b2fec351327f3849778ffd0c1c1fa811b8d5e7dae88ef4fd8 SHA512 ef523bb1e5600884143a8303af318792d0a7412515455230eeaa18875b453ea52b8b76a217416c1f30bf53245cc51e15d4d30b84067624d1b5692e3f3bff4ed8 WHIRLPOOL 093e5a3cdb0e2697be59d123a0476ae49299dc76ffe349ebeb801ebda0fddbd201ae2ac1231ed0cf65a087f383e7dad4cd099d34569d62c23cf8d1993411b7d7
+DIST osm2pgsql-0.92.0.tar.gz 1364481 SHA256 b741cfdf6489fd5def721f75a9558b8cda53165dda7ca9548fcc5b43e163ee77 SHA512 fc2afd6c06f8a44ce3c75e3a731d48cefa17b406c296208519f598531cb3d9561fcfd09c69bc20753ba7e9440087f3f5d38bfe117ab222d8b10987a8d3165ae8 WHIRLPOOL 4fd5d1c645e173f018618edb9fd49da692637fb59a9ccac13ddbef74003fd776af669f23fa2346bb33be2c7d89e121cc206892d18bd2c123debef032827ee45f

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.92.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.92.0.ebuild
new file mode 100644
index 00000000000..d39268a3f4f
--- /dev/null
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-0.92.0.ebuild
@@ -0,0 +1,42 @@
+# 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="http://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/geos-3.6.0
+	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-99999999.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
index 6f506c1d1ac..d8473b14ec2 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit cmake-utils git-2
+inherit cmake-utils git-r3
 
 EGIT_REPO_URI="git://github.com/openstreetmap/osm2pgsql.git"
 
@@ -20,10 +20,25 @@ DEPEND="
 	app-arch/bzip2
 	dev-db/postgresql:=
 	dev-libs/expat
-	dev-libs/boost
 	<sci-libs/geos-3.6.0
 	sci-libs/proj
 	sys-libs/zlib
 	lua? ( dev-lang/lua:= )
 "
-RDEPEND="${DEPEND}"
+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
+}