public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/osm2pgsql/
@ 2015-12-19 17:15 Sven Wegener
  0 siblings, 0 replies; 29+ messages in thread
From: Sven Wegener @ 2015-12-19 17:15 UTC (permalink / raw
  To: gentoo-commits

commit:     0e2da2b8eefff525c6eb950300725ac22445a972
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 19 16:58:58 2015 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Sat Dec 19 17:12:39 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e2da2b8

sci-geosciences/osm2pgsql: Depend on expat instead of libxml2

Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>

 sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
index a780ec6..4dc9574 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
@@ -20,8 +20,8 @@ IUSE="+lua +pbf"
 DEPEND="
 	app-arch/bzip2
 	dev-db/postgresql:=
+	dev-libs/expat
 	dev-libs/boost
-	dev-libs/libxml2:2
 	sci-libs/geos
 	sci-libs/proj
 	sys-libs/zlib


^ permalink raw reply related	[flat|nested] 29+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/osm2pgsql/
@ 2015-12-19 17:15 Sven Wegener
  0 siblings, 0 replies; 29+ messages in thread
From: Sven Wegener @ 2015-12-19 17:15 UTC (permalink / raw
  To: gentoo-commits

commit:     0cefc3ce338c91886f13c1ec3c87301bf810f6ba
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 19 17:06:11 2015 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Sat Dec 19 17:12:45 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cefc3ce

sci-geosciences/osm2pgsql: Remove protobuf-c

osm2pgsql now uses an internal parser

Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>

 sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
index 4dc9574..de249ca 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
@@ -15,7 +15,7 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="+lua +pbf"
+IUSE="+lua"
 
 DEPEND="
 	app-arch/bzip2
@@ -26,6 +26,5 @@ DEPEND="
 	sci-libs/proj
 	sys-libs/zlib
 	lua? ( dev-lang/lua:= )
-	pbf? ( dev-libs/protobuf-c )
 "
 RDEPEND="${DEPEND}"


^ permalink raw reply related	[flat|nested] 29+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/osm2pgsql/
@ 2015-12-19 17:15 Sven Wegener
  0 siblings, 0 replies; 29+ messages in thread
From: Sven Wegener @ 2015-12-19 17:15 UTC (permalink / raw
  To: gentoo-commits

commit:     582f5af68c8e92d0735ef27aecbcf240c9916eb6
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 31 21:14:39 2015 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Sat Dec 19 17:11:43 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=582f5af6

sci-geosciences/osm2pgsql: Switch live ebuild to cmake

Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>

 sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
index 3a7fcf7..a780ec6 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
@@ -4,10 +4,9 @@
 
 EAPI=5
 
-inherit autotools git-2
+inherit cmake-utils git-2
 
 EGIT_REPO_URI="git://github.com/openstreetmap/osm2pgsql.git"
-EGIT_BOOTSTRAP="eautoreconf"
 
 DESCRIPTION="Converts OSM planet.osm data to a PostgreSQL/PostGIS database"
 HOMEPAGE="http://wiki.openstreetmap.org/wiki/Osm2pgsql"


^ permalink raw reply related	[flat|nested] 29+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/osm2pgsql/
@ 2016-01-12 20:10 Amy Winston
  0 siblings, 0 replies; 29+ messages in thread
From: Amy Winston @ 2016-01-12 20:10 UTC (permalink / raw
  To: gentoo-commits

commit:     3bf4ad99982d99c17e85516f3444fb3642e1f7fe
Author:     Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 12 20:10:09 2016 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Tue Jan 12 20:10:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bf4ad99

sci-geosciences/osm2pgsql: 0.88.1 version bump bug #564496

Package-Manager: portage-2.2.24

 sci-geosciences/osm2pgsql/Manifest                |  1 +
 sci-geosciences/osm2pgsql/osm2pgsql-0.88.1.ebuild | 36 +++++++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/sci-geosciences/osm2pgsql/Manifest b/sci-geosciences/osm2pgsql/Manifest
index 67d0b54..d13754c 100644
--- a/sci-geosciences/osm2pgsql/Manifest
+++ b/sci-geosciences/osm2pgsql/Manifest
@@ -2,3 +2,4 @@ DIST osm2pgsql-0.84.0.tar.gz 1037670 SHA256 cc0a2c4c677833c4c2c0c00a35ed25ad8ee4
 DIST osm2pgsql-0.86.0.tar.gz 2101740 SHA256 6599366c562a7ed6b2c92dffc3ebfb4f6917c7216a2f0d01f154b01549525140 SHA512 f16f67c97b771d58df124aa99b1f414f379f293580451dbb288c460814a5b11a5e3c607d9623cc8e9705117a204425af3599498f9358f2efbcd1c408215fe7f0 WHIRLPOOL 437e0ed9923a07a6d9c507c6442b47cf1d1affa9921b2c8d4b36441c03df6577fee18596204928f4bbc291e8c7e6f9cd1e3f6c19e5d0ab65a5e366f1354d47f2
 DIST osm2pgsql-0.87.0.tar.gz 2139841 SHA256 6f5538d098e17a578a384f70f61b335f10edb04114d5cdc5233ca97f868ad0f6 SHA512 f3dd88b6f89c7ecbadf3ad65d548ba0430726bf3c11b5a32c214dddb74f6f7371fd10d712fed965045605749b80d796fc67e4a4d085ffca11310140161059381 WHIRLPOOL 67ef36defd4f0fbbb16ab561790fc4b5abff715e315c83db15735fc11c21069c44d48687dddaba7edd5476f71fe9ce54485e3c8b2279fe7348ee929868233997
 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

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.88.1.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.88.1.ebuild
new file mode 100644
index 0000000..503e663
--- /dev/null
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-0.88.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# Tries to connect to local postgres server and other shenanigans
+RESTRICT="test"
+
+inherit autotools
+
+DESCRIPTION="Converts OSM data to SQL and insert into PostgreSQL db"
+HOMEPAGE="http://wiki.openstreetmap.org/wiki/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 +pbf"
+
+DEPEND="
+	app-arch/bzip2
+	dev-db/postgresql:=
+	dev-libs/libxml2:2
+	dev-libs/boost
+	sci-libs/geos
+	sci-libs/proj
+	sys-libs/zlib
+	lua? ( dev-lang/lua:= )
+	pbf? ( dev-libs/protobuf-c )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	eautoreconf
+}


^ permalink raw reply related	[flat|nested] 29+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/osm2pgsql/
@ 2016-03-27 12:02 Sam Jorna
  0 siblings, 0 replies; 29+ messages in thread
From: Sam Jorna @ 2016-03-27 12:02 UTC (permalink / raw
  To: gentoo-commits

commit:     67146ac16be952ce8d374bb8dbcc40a28e4112d2
Author:     Sam Jorna <wraeth <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 11:41:24 2016 +0000
Commit:     Sam Jorna <wraeth <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 11:58:03 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67146ac1

sci-geosciences/osm2pgsql: bump to 0.90.0

Package-Manager: portage-2.2.28

 sci-geosciences/osm2pgsql/Manifest                |  1 +
 sci-geosciences/osm2pgsql/osm2pgsql-0.90.0.ebuild | 32 +++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/sci-geosciences/osm2pgsql/Manifest b/sci-geosciences/osm2pgsql/Manifest
index d13754c..46fd6e0 100644
--- a/sci-geosciences/osm2pgsql/Manifest
+++ b/sci-geosciences/osm2pgsql/Manifest
@@ -3,3 +3,4 @@ DIST osm2pgsql-0.86.0.tar.gz 2101740 SHA256 6599366c562a7ed6b2c92dffc3ebfb4f6917
 DIST osm2pgsql-0.87.0.tar.gz 2139841 SHA256 6f5538d098e17a578a384f70f61b335f10edb04114d5cdc5233ca97f868ad0f6 SHA512 f3dd88b6f89c7ecbadf3ad65d548ba0430726bf3c11b5a32c214dddb74f6f7371fd10d712fed965045605749b80d796fc67e4a4d085ffca11310140161059381 WHIRLPOOL 67ef36defd4f0fbbb16ab561790fc4b5abff715e315c83db15735fc11c21069c44d48687dddaba7edd5476f71fe9ce54485e3c8b2279fe7348ee929868233997
 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

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.90.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.90.0.ebuild
new file mode 100644
index 0000000..5c39914
--- /dev/null
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-0.90.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# Tries to connect to local postgres server and other shenanigans
+RESTRICT="test"
+
+inherit cmake-utils
+
+DESCRIPTION="Converts OSM data to SQL and insert into PostgreSQL db"
+HOMEPAGE="http://wiki.openstreetmap.org/wiki/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 +pbf"
+
+DEPEND="
+	app-arch/bzip2
+	dev-db/postgresql:=
+	dev-libs/libxml2:2
+	dev-libs/boost
+	sci-libs/geos
+	sci-libs/proj
+	sys-libs/zlib
+	lua? ( dev-lang/lua:= )
+	pbf? ( dev-libs/protobuf-c )
+"
+RDEPEND="${DEPEND}"


^ permalink raw reply related	[flat|nested] 29+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/osm2pgsql/
@ 2017-02-10 10:27 Amy Liffey
  0 siblings, 0 replies; 29+ messages in thread
From: Amy Liffey @ 2017-02-10 10:27 UTC (permalink / raw
  To: gentoo-commits

commit:     dd361c5a36dfc26991ce8827ef9e4f863948eef4
Author:     Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 10 10:24:18 2017 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Fri Feb 10 10:25:38 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd361c5a

sci-geosciences/osm2pgsql: fix dep bug #607456

Suggested-by: bugtrack <AT> web.de
Upstream-bug: https://github.com/openstreetmap/osm2pgsql/issues/634

Package-Manager: portage-2.3.0

 sci-geosciences/osm2pgsql/osm2pgsql-0.84.0.ebuild   | 4 ++--
 sci-geosciences/osm2pgsql/osm2pgsql-0.86.0.ebuild   | 4 ++--
 sci-geosciences/osm2pgsql/osm2pgsql-0.87.0.ebuild   | 4 ++--
 sci-geosciences/osm2pgsql/osm2pgsql-0.87.1.ebuild   | 4 ++--
 sci-geosciences/osm2pgsql/osm2pgsql-0.88.1.ebuild   | 4 ++--
 sci-geosciences/osm2pgsql/osm2pgsql-0.90.0.ebuild   | 4 ++--
 sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.84.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.84.0.ebuild
index f2acefa66d..e80207d729 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-0.84.0.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-0.84.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,7 +19,7 @@ DEPEND="
 	app-arch/bzip2
 	dev-db/postgresql:=
 	dev-libs/libxml2:2
-	sci-libs/geos
+	<sci-libs/geos-3.6.0
 	sci-libs/proj
 	sys-libs/zlib
 	lua? ( dev-lang/lua:= )

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.86.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.86.0.ebuild
index f2acefa66d..e80207d729 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-0.86.0.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-0.86.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,7 +19,7 @@ DEPEND="
 	app-arch/bzip2
 	dev-db/postgresql:=
 	dev-libs/libxml2:2
-	sci-libs/geos
+	<sci-libs/geos-3.6.0
 	sci-libs/proj
 	sys-libs/zlib
 	lua? ( dev-lang/lua:= )

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.87.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.87.0.ebuild
index 59d937c964..364ca710e3 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-0.87.0.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-0.87.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -23,7 +23,7 @@ DEPEND="
 	dev-db/postgresql:=
 	dev-libs/libxml2:2
 	dev-libs/boost
-	sci-libs/geos
+	<sci-libs/geos-3.6.0
 	sci-libs/proj
 	sys-libs/zlib
 	lua? ( dev-lang/lua:= )

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.87.1.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.87.1.ebuild
index 59d937c964..364ca710e3 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-0.87.1.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-0.87.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -23,7 +23,7 @@ DEPEND="
 	dev-db/postgresql:=
 	dev-libs/libxml2:2
 	dev-libs/boost
-	sci-libs/geos
+	<sci-libs/geos-3.6.0
 	sci-libs/proj
 	sys-libs/zlib
 	lua? ( dev-lang/lua:= )

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.88.1.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.88.1.ebuild
index 503e66326b..364ca710e3 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-0.88.1.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-0.88.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -23,7 +23,7 @@ DEPEND="
 	dev-db/postgresql:=
 	dev-libs/libxml2:2
 	dev-libs/boost
-	sci-libs/geos
+	<sci-libs/geos-3.6.0
 	sci-libs/proj
 	sys-libs/zlib
 	lua? ( dev-lang/lua:= )

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.90.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.90.0.ebuild
index 5c399142f8..0e245c5df5 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-0.90.0.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-0.90.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -23,7 +23,7 @@ DEPEND="
 	dev-db/postgresql:=
 	dev-libs/libxml2:2
 	dev-libs/boost
-	sci-libs/geos
+	<sci-libs/geos-3.6.0
 	sci-libs/proj
 	sys-libs/zlib
 	lua? ( dev-lang/lua:= )

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
index de249ca951..d0385055fc 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -22,7 +22,7 @@ DEPEND="
 	dev-db/postgresql:=
 	dev-libs/expat
 	dev-libs/boost
-	sci-libs/geos
+	<sci-libs/geos-3.6.0
 	sci-libs/proj
 	sys-libs/zlib
 	lua? ( dev-lang/lua:= )


^ permalink raw reply related	[flat|nested] 29+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/osm2pgsql/
@ 2017-03-02 21:13 Andreas Sturmlechner
  0 siblings, 0 replies; 29+ messages in thread
From: Andreas Sturmlechner @ 2017-03-02 21:13 UTC (permalink / raw
  To: gentoo-commits

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
+}


^ permalink raw reply related	[flat|nested] 29+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/osm2pgsql/
@ 2017-04-11 17:38 Sven Wegener
  0 siblings, 0 replies; 29+ messages in thread
From: Sven Wegener @ 2017-04-11 17:38 UTC (permalink / raw
  To: gentoo-commits

commit:     0956de5b18c794358d39e074f0a7476ab0c3d563
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 11 17:36:33 2017 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Tue Apr 11 17:36:33 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0956de5b

sci-geosciences/osm2pgsql: Fix *DEPEND setting

Package-Manager: Portage-2.3.3, Repoman-2.3.2

 sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
index d8473b14ec2..7f4973d86b8 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE="+lua"
 
-DEPEND="
+COMMON_DEPEND="
 	app-arch/bzip2
 	dev-db/postgresql:=
 	dev-libs/expat


^ permalink raw reply related	[flat|nested] 29+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/osm2pgsql/
@ 2017-04-23 13:49 Aaron Swenson
  0 siblings, 0 replies; 29+ messages in thread
From: Aaron Swenson @ 2017-04-23 13:49 UTC (permalink / raw
  To: gentoo-commits

commit:     0782b03149241c4f94006e90c56e06170e2e2256
Author:     Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 23 13:48:24 2017 +0000
Commit:     Aaron Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Sun Apr 23 13:48:24 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0782b031

sci-geosciences/osm2pgsql: Drop sci-libs/geos dependency

No longer depends on GEOS.

Bugs: 616270

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
index 7f4973d86b8..675ca03e0dd 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
@@ -20,7 +20,6 @@ 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:= )


^ permalink raw reply related	[flat|nested] 29+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/osm2pgsql/
@ 2017-04-23 13:52 Aaron Swenson
  0 siblings, 0 replies; 29+ messages in thread
From: Aaron Swenson @ 2017-04-23 13:52 UTC (permalink / raw
  To: gentoo-commits

commit:     6d1d7c64eed652a9910fc1bd0c8a85e013b56c2c
Author:     Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 23 13:52:37 2017 +0000
Commit:     Aaron Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Sun Apr 23 13:52:37 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d1d7c64

sci-geosciences/osm2pgsql: Remove old

Clean out old versions, and remove the now unused “pbf” USE flag
description from the metadata.xml.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-geosciences/osm2pgsql/Manifest                |  6 ----
 sci-geosciences/osm2pgsql/metadata.xml            |  5 ----
 sci-geosciences/osm2pgsql/osm2pgsql-0.84.0.ebuild | 31 --------------------
 sci-geosciences/osm2pgsql/osm2pgsql-0.86.0.ebuild | 31 --------------------
 sci-geosciences/osm2pgsql/osm2pgsql-0.87.0.ebuild | 35 -----------------------
 sci-geosciences/osm2pgsql/osm2pgsql-0.87.1.ebuild | 35 -----------------------
 sci-geosciences/osm2pgsql/osm2pgsql-0.88.1.ebuild | 35 -----------------------
 sci-geosciences/osm2pgsql/osm2pgsql-0.90.0.ebuild | 31 --------------------
 8 files changed, 209 deletions(-)

diff --git a/sci-geosciences/osm2pgsql/Manifest b/sci-geosciences/osm2pgsql/Manifest
index 887d349b534..e18771ef3eb 100644
--- a/sci-geosciences/osm2pgsql/Manifest
+++ b/sci-geosciences/osm2pgsql/Manifest
@@ -1,7 +1 @@
-DIST osm2pgsql-0.84.0.tar.gz 1037670 SHA256 cc0a2c4c677833c4c2c0c00a35ed25ad8ee4e378ad0ab834f151aaee5e7f6f85 SHA512 f706c57ecc63382db7f031f5c16ce94949340aa96bf45c85e71e8c5fcafda0756e91673369fa46e1217733dd8aa12a24cf1260362995d1c9dce258242704f42d WHIRLPOOL 49c1be45844693262108d31e23249e41eda2da7319e93b0c9739d8c5d61c035e7e75ea5182e04e3ddc3063cc248865751da8a55651e2c94e1d8a0797eeb68f4e
-DIST osm2pgsql-0.86.0.tar.gz 2101740 SHA256 6599366c562a7ed6b2c92dffc3ebfb4f6917c7216a2f0d01f154b01549525140 SHA512 f16f67c97b771d58df124aa99b1f414f379f293580451dbb288c460814a5b11a5e3c607d9623cc8e9705117a204425af3599498f9358f2efbcd1c408215fe7f0 WHIRLPOOL 437e0ed9923a07a6d9c507c6442b47cf1d1affa9921b2c8d4b36441c03df6577fee18596204928f4bbc291e8c7e6f9cd1e3f6c19e5d0ab65a5e366f1354d47f2
-DIST osm2pgsql-0.87.0.tar.gz 2139841 SHA256 6f5538d098e17a578a384f70f61b335f10edb04114d5cdc5233ca97f868ad0f6 SHA512 f3dd88b6f89c7ecbadf3ad65d548ba0430726bf3c11b5a32c214dddb74f6f7371fd10d712fed965045605749b80d796fc67e4a4d085ffca11310140161059381 WHIRLPOOL 67ef36defd4f0fbbb16ab561790fc4b5abff715e315c83db15735fc11c21069c44d48687dddaba7edd5476f71fe9ce54485e3c8b2279fe7348ee929868233997
-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/metadata.xml b/sci-geosciences/osm2pgsql/metadata.xml
index bc345ef34ca..5c2215ccfe5 100644
--- a/sci-geosciences/osm2pgsql/metadata.xml
+++ b/sci-geosciences/osm2pgsql/metadata.xml
@@ -14,11 +14,6 @@
         suitable for specific applications like rendering into map tiles by
         Mapnik or geocoding with Nominatim.
     </longdescription>
-    <use>
-        <flag name="pbf">
-            Add support for importing the new "Protocolbuffer Binary Format"
-        </flag>
-    </use>
     <upstream>
         <remote-id type="github">openstreetmap/osm2pgsql</remote-id>
     </upstream>

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.84.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.84.0.ebuild
deleted file mode 100644
index 6f1a08bfe5d..00000000000
--- a/sci-geosciences/osm2pgsql/osm2pgsql-0.84.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools
-
-DESCRIPTION="Converts OSM data to SQL and insert into PostgreSQL db"
-HOMEPAGE="http://wiki.openstreetmap.org/wiki/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 +pbf"
-
-DEPEND="
-	app-arch/bzip2
-	dev-db/postgresql:=
-	dev-libs/libxml2:2
-	<sci-libs/geos-3.6.0
-	sci-libs/proj
-	sys-libs/zlib
-	lua? ( dev-lang/lua:= )
-	pbf? ( dev-libs/protobuf-c )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eautoreconf
-}

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.86.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.86.0.ebuild
deleted file mode 100644
index 6f1a08bfe5d..00000000000
--- a/sci-geosciences/osm2pgsql/osm2pgsql-0.86.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools
-
-DESCRIPTION="Converts OSM data to SQL and insert into PostgreSQL db"
-HOMEPAGE="http://wiki.openstreetmap.org/wiki/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 +pbf"
-
-DEPEND="
-	app-arch/bzip2
-	dev-db/postgresql:=
-	dev-libs/libxml2:2
-	<sci-libs/geos-3.6.0
-	sci-libs/proj
-	sys-libs/zlib
-	lua? ( dev-lang/lua:= )
-	pbf? ( dev-libs/protobuf-c )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eautoreconf
-}

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.87.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.87.0.ebuild
deleted file mode 100644
index 555343b5397..00000000000
--- a/sci-geosciences/osm2pgsql/osm2pgsql-0.87.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# Tries to connect to local postgres server and other shenanigans
-RESTRICT="test"
-
-inherit autotools
-
-DESCRIPTION="Converts OSM data to SQL and insert into PostgreSQL db"
-HOMEPAGE="http://wiki.openstreetmap.org/wiki/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 +pbf"
-
-DEPEND="
-	app-arch/bzip2
-	dev-db/postgresql:=
-	dev-libs/libxml2:2
-	dev-libs/boost
-	<sci-libs/geos-3.6.0
-	sci-libs/proj
-	sys-libs/zlib
-	lua? ( dev-lang/lua:= )
-	pbf? ( dev-libs/protobuf-c )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eautoreconf
-}

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.87.1.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.87.1.ebuild
deleted file mode 100644
index 555343b5397..00000000000
--- a/sci-geosciences/osm2pgsql/osm2pgsql-0.87.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# Tries to connect to local postgres server and other shenanigans
-RESTRICT="test"
-
-inherit autotools
-
-DESCRIPTION="Converts OSM data to SQL and insert into PostgreSQL db"
-HOMEPAGE="http://wiki.openstreetmap.org/wiki/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 +pbf"
-
-DEPEND="
-	app-arch/bzip2
-	dev-db/postgresql:=
-	dev-libs/libxml2:2
-	dev-libs/boost
-	<sci-libs/geos-3.6.0
-	sci-libs/proj
-	sys-libs/zlib
-	lua? ( dev-lang/lua:= )
-	pbf? ( dev-libs/protobuf-c )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eautoreconf
-}

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.88.1.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.88.1.ebuild
deleted file mode 100644
index 555343b5397..00000000000
--- a/sci-geosciences/osm2pgsql/osm2pgsql-0.88.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# Tries to connect to local postgres server and other shenanigans
-RESTRICT="test"
-
-inherit autotools
-
-DESCRIPTION="Converts OSM data to SQL and insert into PostgreSQL db"
-HOMEPAGE="http://wiki.openstreetmap.org/wiki/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 +pbf"
-
-DEPEND="
-	app-arch/bzip2
-	dev-db/postgresql:=
-	dev-libs/libxml2:2
-	dev-libs/boost
-	<sci-libs/geos-3.6.0
-	sci-libs/proj
-	sys-libs/zlib
-	lua? ( dev-lang/lua:= )
-	pbf? ( dev-libs/protobuf-c )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eautoreconf
-}

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.90.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.90.0.ebuild
deleted file mode 100644
index 83dc31772ae..00000000000
--- a/sci-geosciences/osm2pgsql/osm2pgsql-0.90.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Tries to connect to local postgres server and other shenanigans
-RESTRICT="test"
-
-inherit cmake-utils
-
-DESCRIPTION="Converts OSM data to SQL and insert into PostgreSQL db"
-HOMEPAGE="http://wiki.openstreetmap.org/wiki/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 +pbf"
-
-DEPEND="
-	app-arch/bzip2
-	dev-db/postgresql:=
-	dev-libs/libxml2:2
-	dev-libs/boost
-	<sci-libs/geos-3.6.0
-	sci-libs/proj
-	sys-libs/zlib
-	lua? ( dev-lang/lua:= )
-	pbf? ( dev-libs/protobuf-c )
-"
-RDEPEND="${DEPEND}"


^ permalink raw reply related	[flat|nested] 29+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/osm2pgsql/
@ 2017-07-30 10:04 Michał Górny
  0 siblings, 0 replies; 29+ messages in thread
From: Michał Górny @ 2017-07-30 10:04 UTC (permalink / raw
  To: gentoo-commits

commit:     c20ce40a5f000e1855cc30d8393295c4fa05ae79
Author:     David Hicks <david <AT> hicks <DOT> id <DOT> au>
AuthorDate: Sat Jul 29 18:59:09 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 30 10:04:26 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c20ce40a

sci-geosciences/osm2pgsql: use HTTPS for GitHub and HOMEPAGE

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 sci-geosciences/osm2pgsql/osm2pgsql-0.92.0.ebuild   | 2 +-
 sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.92.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.92.0.ebuild
index d39268a3f4f..5baceefb803 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-0.92.0.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-0.92.0.ebuild
@@ -6,7 +6,7 @@ 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"
+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"

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
index 675ca03e0dd..44e16db4804 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
@@ -5,10 +5,10 @@ EAPI=6
 
 inherit cmake-utils git-r3
 
-EGIT_REPO_URI="git://github.com/openstreetmap/osm2pgsql.git"
+EGIT_REPO_URI="https://github.com/openstreetmap/${PN}.git"
 
 DESCRIPTION="Converts OSM planet.osm data to a PostgreSQL/PostGIS database"
-HOMEPAGE="http://wiki.openstreetmap.org/wiki/Osm2pgsql"
+HOMEPAGE="https://wiki.openstreetmap.org/wiki/Osm2pgsql"
 SRC_URI=""
 
 LICENSE="GPL-2"


^ permalink raw reply related	[flat|nested] 29+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/osm2pgsql/
@ 2017-10-14 22:27 Aaron Swenson
  0 siblings, 0 replies; 29+ messages in thread
From: Aaron Swenson @ 2017-10-14 22:27 UTC (permalink / raw
  To: gentoo-commits

commit:     e15c545607ff77ddc8205888c2b3c2a05cce3339
Author:     Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 14 22:26:53 2017 +0000
Commit:     Aaron Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Sat Oct 14 22:26:53 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e15c5456

sci-geosciences/osm2pgsql: Version bump to 0.94.0

Gentoo-Bug: 634086
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 sci-geosciences/osm2pgsql/Manifest                |  1 +
 sci-geosciences/osm2pgsql/osm2pgsql-0.94.0.ebuild | 41 +++++++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/sci-geosciences/osm2pgsql/Manifest b/sci-geosciences/osm2pgsql/Manifest
index e18771ef3eb..8f7ba787528 100644
--- a/sci-geosciences/osm2pgsql/Manifest
+++ b/sci-geosciences/osm2pgsql/Manifest
@@ -1 +1,2 @@
 DIST osm2pgsql-0.92.0.tar.gz 1364481 SHA256 b741cfdf6489fd5def721f75a9558b8cda53165dda7ca9548fcc5b43e163ee77 SHA512 fc2afd6c06f8a44ce3c75e3a731d48cefa17b406c296208519f598531cb3d9561fcfd09c69bc20753ba7e9440087f3f5d38bfe117ab222d8b10987a8d3165ae8 WHIRLPOOL 4fd5d1c645e173f018618edb9fd49da692637fb59a9ccac13ddbef74003fd776af669f23fa2346bb33be2c7d89e121cc206892d18bd2c123debef032827ee45f
+DIST osm2pgsql-0.94.0.tar.gz 1203310 SHA256 9e67e400deca48185313921431884171fb087dfe9e0d21e31857b8b06f20d317 SHA512 eceb5de7679048f51a9ad1be4ecf5b2d26da827b3eb8d6b0e86657603c8bf8a6f8d6f665c8ff8db91070a2966057f2deed5e4a3cc8bfb28e60a6031454e4758e WHIRLPOOL 2ebc7f0c09079a9417f7c67b7c2fa8ea275b35f20df9cbfed1c9223d7ee1385af9313c6fc3c165ef410b7480517333284921e2e46c0e2706d318cb21d0761b3b

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.94.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.94.0.ebuild
new file mode 100644
index 00000000000..801da8b39d7
--- /dev/null
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-0.94.0.ebuild
@@ -0,0 +1,41 @@
+# 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
+}


^ permalink raw reply related	[flat|nested] 29+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/osm2pgsql/
@ 2017-10-14 22:44 Aaron Swenson
  0 siblings, 0 replies; 29+ messages in thread
From: Aaron Swenson @ 2017-10-14 22:44 UTC (permalink / raw
  To: gentoo-commits

commit:     a7f4c2f7d5406d668f391422441f4b95eb33b6c2
Author:     Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 14 22:43:57 2017 +0000
Commit:     Aaron Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Sat Oct 14 22:43:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7f4c2f7

sci-geosciences/osm2pgsql: Remove 0.92.0

Drop old version that depended on an old GEOS.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 sci-geosciences/osm2pgsql/Manifest                |  1 -
 sci-geosciences/osm2pgsql/osm2pgsql-0.92.0.ebuild | 42 -----------------------
 2 files changed, 43 deletions(-)

diff --git a/sci-geosciences/osm2pgsql/Manifest b/sci-geosciences/osm2pgsql/Manifest
index 8f7ba787528..73d42f842ed 100644
--- a/sci-geosciences/osm2pgsql/Manifest
+++ b/sci-geosciences/osm2pgsql/Manifest
@@ -1,2 +1 @@
-DIST osm2pgsql-0.92.0.tar.gz 1364481 SHA256 b741cfdf6489fd5def721f75a9558b8cda53165dda7ca9548fcc5b43e163ee77 SHA512 fc2afd6c06f8a44ce3c75e3a731d48cefa17b406c296208519f598531cb3d9561fcfd09c69bc20753ba7e9440087f3f5d38bfe117ab222d8b10987a8d3165ae8 WHIRLPOOL 4fd5d1c645e173f018618edb9fd49da692637fb59a9ccac13ddbef74003fd776af669f23fa2346bb33be2c7d89e121cc206892d18bd2c123debef032827ee45f
 DIST osm2pgsql-0.94.0.tar.gz 1203310 SHA256 9e67e400deca48185313921431884171fb087dfe9e0d21e31857b8b06f20d317 SHA512 eceb5de7679048f51a9ad1be4ecf5b2d26da827b3eb8d6b0e86657603c8bf8a6f8d6f665c8ff8db91070a2966057f2deed5e4a3cc8bfb28e60a6031454e4758e WHIRLPOOL 2ebc7f0c09079a9417f7c67b7c2fa8ea275b35f20df9cbfed1c9223d7ee1385af9313c6fc3c165ef410b7480517333284921e2e46c0e2706d318cb21d0761b3b

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.92.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.92.0.ebuild
deleted file mode 100644
index 5baceefb803..00000000000
--- a/sci-geosciences/osm2pgsql/osm2pgsql-0.92.0.ebuild
+++ /dev/null
@@ -1,42 +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/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
-}


^ permalink raw reply related	[flat|nested] 29+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/osm2pgsql/
@ 2017-12-29 19:02 Mikle Kolyada
  0 siblings, 0 replies; 29+ messages in thread
From: Mikle Kolyada @ 2017-12-29 19:02 UTC (permalink / raw
  To: gentoo-commits

commit:     94de013fa336ab1c388aebcf426ac322dfdbdbaf
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 29 19:02:26 2017 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Dec 29 19:02:44 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94de013f

sci-geosciences/osm2pgsql: amd64 stable wrt bug #641138

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 sci-geosciences/osm2pgsql/osm2pgsql-0.94.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.94.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.94.0.ebuild
index 41228c63339..f6ef3e3fbfc 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-0.94.0.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-0.94.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+lua"
 
 COMMON_DEPEND="


^ permalink raw reply related	[flat|nested] 29+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/osm2pgsql/
@ 2018-05-15  9:39 Aaron Swenson
  0 siblings, 0 replies; 29+ messages in thread
From: Aaron Swenson @ 2018-05-15  9:39 UTC (permalink / raw
  To: gentoo-commits

commit:     cc804aafb409561fb0675e91f7a4a18b036c460b
Author:     Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Tue May 15 09:37:39 2018 +0000
Commit:     Aaron Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Tue May 15 09:37:39 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc804aaf

sci-geosciences/osm2pgsql: Bump to 0.96.0

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sci-geosciences/osm2pgsql/Manifest                |  1 +
 sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild | 42 +++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/sci-geosciences/osm2pgsql/Manifest b/sci-geosciences/osm2pgsql/Manifest
index 1c489c5633e..f698e617569 100644
--- a/sci-geosciences/osm2pgsql/Manifest
+++ b/sci-geosciences/osm2pgsql/Manifest
@@ -1 +1,2 @@
 DIST osm2pgsql-0.94.0.tar.gz 1203310 BLAKE2B df9af84aab13bfd79763238e89dfc216401be2460be468a2f5467513dfcbd48650d779586f9cefd4100d6404f430a2401326919e9a1c72d86b80c6526881f206 SHA512 eceb5de7679048f51a9ad1be4ecf5b2d26da827b3eb8d6b0e86657603c8bf8a6f8d6f665c8ff8db91070a2966057f2deed5e4a3cc8bfb28e60a6031454e4758e
+DIST osm2pgsql-0.96.0.tar.gz 1219163 BLAKE2B a89e40e74ea52bf46593e48dd1f9047b958b645ce38aeb554c930e2d9efdf4f0bb9b6fd7a9b209342d59ca8a0d3ada3023f14324bf8b02b060d8dfd987763528 SHA512 6c6bb00c17995b9a99975076ad3af35a99678a7780db144f7fdd1f5c856b777883f1b1dac7e1c3ca9a2a490d3774f62c8aa9f8742c955c377c28d5b827657372

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild
new file mode 100644
index 00000000000..990f5c9422a
--- /dev/null
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 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
+}


^ permalink raw reply related	[flat|nested] 29+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/osm2pgsql/
@ 2020-02-12 23:24 Andreas Sturmlechner
  0 siblings, 0 replies; 29+ messages in thread
From: Andreas Sturmlechner @ 2020-02-12 23:24 UTC (permalink / raw
  To: gentoo-commits

commit:     e74b00434c481d8e2f1f25390ab8ae3c573dca9f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 12 23:22:33 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 12 23:23:41 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e74b0043

sci-geosciences/osm2pgsql: EAPI-7 bump, switch to cmake.eclass

Bug: https://bugs.gentoo.org/688110
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 | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild
index 990f5c9422a..26bab47005f 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild
@@ -1,9 +1,9 @@
-# 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"
 HOMEPAGE="https://wiki.openstreetmap.org/wiki/Osm2pgsql
@@ -19,7 +19,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:= )
 "
@@ -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
 }


^ permalink raw reply related	[flat|nested] 29+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/osm2pgsql/
@ 2020-02-13 12:03 Agostino Sarubbo
  0 siblings, 0 replies; 29+ messages in thread
From: Agostino Sarubbo @ 2020-02-13 12:03 UTC (permalink / raw
  To: gentoo-commits

commit:     6598427a91547c4adadfeffc052c398829241937
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 13 12:01:34 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Feb 13 12:01:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6598427a

sci-geosciences/osm2pgsql: amd64 stable wrt bug #688110

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild
index 26bab47005f..0217a5b0136 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+lua"
 
 COMMON_DEPEND="


^ permalink raw reply related	[flat|nested] 29+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/osm2pgsql/
@ 2020-02-13 12:46 Agostino Sarubbo
  0 siblings, 0 replies; 29+ messages in thread
From: Agostino Sarubbo @ 2020-02-13 12:46 UTC (permalink / raw
  To: gentoo-commits

commit:     5f5f61ac25ca9f44b1e610c46f970e6582153d90
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 13 12:44:55 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Feb 13 12:44:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f5f61ac

sci-geosciences/osm2pgsql: x86 stable wrt bug #688110

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild
index 0217a5b0136..a6cb7e42a46 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+lua"
 
 COMMON_DEPEND="


^ permalink raw reply related	[flat|nested] 29+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/osm2pgsql/
@ 2020-02-13 21:28 Andreas Sturmlechner
  0 siblings, 0 replies; 29+ messages in thread
From: Andreas Sturmlechner @ 2020-02-13 21:28 UTC (permalink / raw
  To: gentoo-commits

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
 }


^ permalink raw reply related	[flat|nested] 29+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/osm2pgsql/
@ 2020-02-13 21:28 Andreas Sturmlechner
  0 siblings, 0 replies; 29+ messages in thread
From: Andreas Sturmlechner @ 2020-02-13 21:28 UTC (permalink / raw
  To: gentoo-commits

commit:     6d63a3482a4c02738ef7f55ef247fe23dcc426bd
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 13 20:41:36 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=6d63a348

sci-geosciences/osm2pgsql: Drop 0.94.0

Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/osm2pgsql/Manifest                |  1 -
 sci-geosciences/osm2pgsql/osm2pgsql-0.94.0.ebuild | 41 -----------------------
 2 files changed, 42 deletions(-)

diff --git a/sci-geosciences/osm2pgsql/Manifest b/sci-geosciences/osm2pgsql/Manifest
index f698e617569..f9a0895ca09 100644
--- a/sci-geosciences/osm2pgsql/Manifest
+++ b/sci-geosciences/osm2pgsql/Manifest
@@ -1,2 +1 @@
-DIST osm2pgsql-0.94.0.tar.gz 1203310 BLAKE2B df9af84aab13bfd79763238e89dfc216401be2460be468a2f5467513dfcbd48650d779586f9cefd4100d6404f430a2401326919e9a1c72d86b80c6526881f206 SHA512 eceb5de7679048f51a9ad1be4ecf5b2d26da827b3eb8d6b0e86657603c8bf8a6f8d6f665c8ff8db91070a2966057f2deed5e4a3cc8bfb28e60a6031454e4758e
 DIST osm2pgsql-0.96.0.tar.gz 1219163 BLAKE2B a89e40e74ea52bf46593e48dd1f9047b958b645ce38aeb554c930e2d9efdf4f0bb9b6fd7a9b209342d59ca8a0d3ada3023f14324bf8b02b060d8dfd987763528 SHA512 6c6bb00c17995b9a99975076ad3af35a99678a7780db144f7fdd1f5c856b777883f1b1dac7e1c3ca9a2a490d3774f62c8aa9f8742c955c377c28d5b827657372

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 f6ef3e3fbfc..00000000000
--- 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
-}


^ permalink raw reply related	[flat|nested] 29+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/osm2pgsql/
@ 2020-11-23  2:14 Aaron W. Swenson
  0 siblings, 0 replies; 29+ messages in thread
From: Aaron W. Swenson @ 2020-11-23  2:14 UTC (permalink / raw
  To: gentoo-commits

commit:     75a6025f101ccd4c03120850213e9734d7551428
Author:     Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 23 02:11:46 2020 +0000
Commit:     Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Mon Nov 23 02:13:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75a6025f

sci-geosciences/osm2pgsql: Bump to 1.3.0, fixes

Bug: https://bugs.gentoo.org/688110
Bug: https://bugs.gentoo.org/720916
Signed-off-by: Aaron W. Swenson <titanofold <AT> gentoo.org>

 sci-geosciences/osm2pgsql/Manifest                       |  1 +
 ...{osm2pgsql-99999999.ebuild => osm2pgsql-1.3.0.ebuild} | 16 +++++++---------
 sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild      | 10 +++++-----
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/sci-geosciences/osm2pgsql/Manifest b/sci-geosciences/osm2pgsql/Manifest
index f9a0895ca09..71fdece5114 100644
--- a/sci-geosciences/osm2pgsql/Manifest
+++ b/sci-geosciences/osm2pgsql/Manifest
@@ -1 +1,2 @@
 DIST osm2pgsql-0.96.0.tar.gz 1219163 BLAKE2B a89e40e74ea52bf46593e48dd1f9047b958b645ce38aeb554c930e2d9efdf4f0bb9b6fd7a9b209342d59ca8a0d3ada3023f14324bf8b02b060d8dfd987763528 SHA512 6c6bb00c17995b9a99975076ad3af35a99678a7780db144f7fdd1f5c856b777883f1b1dac7e1c3ca9a2a490d3774f62c8aa9f8742c955c377c28d5b827657372
+DIST osm2pgsql-1.3.0.tar.gz 2460451 BLAKE2B ac52523bf6d35a06528ad22a51465388e70baf9f94bb3664c39c301b429ff453370d9cd44549781e4ee50d698094ddfe83f0e39a7c3d6c01556ea95e10feaf75 SHA512 e643f3a1987ead36763c96d34b5dd7e170273b77a521106c21311dc7b01d2b34470b2e00e3214050f2cbdd3d89703a1827ee6c35928ed77cc7f35fc4e20331f3

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild
similarity index 68%
copy from sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
copy to sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild
index 78b4534c993..ded439c9e69 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild
@@ -3,19 +3,16 @@
 
 EAPI=7
 
-inherit cmake flag-o-matic git-r3
-
-EGIT_REPO_URI="https://github.com/openstreetmap/${PN}.git"
+inherit cmake
 
 DESCRIPTION="Converts OSM planet.osm data to a PostgreSQL/PostGIS database"
-HOMEPAGE="https://wiki.openstreetmap.org/wiki/Osm2pgsql
-	https://github.com/openstreetmap/osm2pgsql"
-SRC_URI=""
+HOMEPAGE="https://osm2pgsql.org/"
+SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="+lua"
+KEYWORDS="~amd64 ~x86"
+IUSE="+lua luajit"
 
 COMMON_DEPEND="
 	app-arch/bzip2
@@ -24,6 +21,7 @@ COMMON_DEPEND="
 	sci-libs/proj:=
 	sys-libs/zlib
 	lua? ( dev-lang/lua:= )
+	luajit? ( dev-lang/luajit:= )
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
@@ -36,9 +34,9 @@ RDEPEND="${COMMON_DEPEND}
 RESTRICT="test"
 
 src_configure() {
-	append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1
 	local mycmakeargs=(
 		-DWITH_LUA=$(usex lua)
+		-DWITH_LUAJIT=$(usex luajit)
 		-DBUILD_TESTS=OFF
 	)
 	cmake_src_configure

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
index 78b4534c993..87037136ac8 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
@@ -3,19 +3,18 @@
 
 EAPI=7
 
-inherit cmake flag-o-matic git-r3
+inherit cmake 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
-	https://github.com/openstreetmap/osm2pgsql"
+HOMEPAGE="https://osm2pgsql.org/"
 SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="+lua"
+IUSE="+lua luajit"
 
 COMMON_DEPEND="
 	app-arch/bzip2
@@ -24,6 +23,7 @@ COMMON_DEPEND="
 	sci-libs/proj:=
 	sys-libs/zlib
 	lua? ( dev-lang/lua:= )
+	luajit? ( dev-lang/luajit:= )
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
@@ -36,9 +36,9 @@ RDEPEND="${COMMON_DEPEND}
 RESTRICT="test"
 
 src_configure() {
-	append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1
 	local mycmakeargs=(
 		-DWITH_LUA=$(usex lua)
+		-DWITH_LUAJIT=$(usex luajit)
 		-DBUILD_TESTS=OFF
 	)
 	cmake_src_configure


^ permalink raw reply related	[flat|nested] 29+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/osm2pgsql/
@ 2020-12-21 10:35 Aaron W. Swenson
  0 siblings, 0 replies; 29+ messages in thread
From: Aaron W. Swenson @ 2020-12-21 10:35 UTC (permalink / raw
  To: gentoo-commits

commit:     8aa3c9f12a68509937e049b2316eb86377cbf0fd
Author:     Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 21 10:31:11 2020 +0000
Commit:     Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Mon Dec 21 10:31:11 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aa3c9f1

sci-geosciences/osm2pgsql: Bump to 1.4.0

Signed-off-by: Aaron W. Swenson <titanofold <AT> gentoo.org>

 sci-geosciences/osm2pgsql/Manifest               |  1 +
 sci-geosciences/osm2pgsql/osm2pgsql-1.4.0.ebuild | 43 ++++++++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/sci-geosciences/osm2pgsql/Manifest b/sci-geosciences/osm2pgsql/Manifest
index 71fdece5114..918e9f7a7b4 100644
--- a/sci-geosciences/osm2pgsql/Manifest
+++ b/sci-geosciences/osm2pgsql/Manifest
@@ -1,2 +1,3 @@
 DIST osm2pgsql-0.96.0.tar.gz 1219163 BLAKE2B a89e40e74ea52bf46593e48dd1f9047b958b645ce38aeb554c930e2d9efdf4f0bb9b6fd7a9b209342d59ca8a0d3ada3023f14324bf8b02b060d8dfd987763528 SHA512 6c6bb00c17995b9a99975076ad3af35a99678a7780db144f7fdd1f5c856b777883f1b1dac7e1c3ca9a2a490d3774f62c8aa9f8742c955c377c28d5b827657372
 DIST osm2pgsql-1.3.0.tar.gz 2460451 BLAKE2B ac52523bf6d35a06528ad22a51465388e70baf9f94bb3664c39c301b429ff453370d9cd44549781e4ee50d698094ddfe83f0e39a7c3d6c01556ea95e10feaf75 SHA512 e643f3a1987ead36763c96d34b5dd7e170273b77a521106c21311dc7b01d2b34470b2e00e3214050f2cbdd3d89703a1827ee6c35928ed77cc7f35fc4e20331f3
+DIST osm2pgsql-1.4.0.tar.gz 2429430 BLAKE2B 5d93a159a87c9cb12d85be8b89377f720e0d94564574f70d6f3686b215a99250967655d0eeee3dcda2742fcab356ecf62de2b4bab384d69a641a06829c401388 SHA512 f0eaceb7f78087a58bba3bbfafbb9d6d70aecd4c3ba1cfb0ce784116b52a57c69855c1a7459cce8b963c87955de269ca320cf4a3934b6ff5ad29b7554e07dd9e

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0.ebuild
new file mode 100644
index 00000000000..736fa938d65
--- /dev/null
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Converts OSM planet.osm data to a PostgreSQL/PostGIS database"
+HOMEPAGE="https://osm2pgsql.org/"
+SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+lua luajit"
+
+COMMON_DEPEND="
+	app-arch/bzip2
+	dev-db/postgresql:=
+	dev-libs/expat
+	sci-libs/proj:=
+	sys-libs/zlib
+	lua? ( dev-lang/lua:0= )
+	luajit? ( dev-lang/luajit:= )
+"
+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)
+		-DWITH_LUAJIT=$(usex luajit)
+		-DBUILD_TESTS=OFF
+	)
+	cmake_src_configure
+}


^ permalink raw reply related	[flat|nested] 29+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/osm2pgsql/
@ 2020-12-22 18:57 Sam James
  0 siblings, 0 replies; 29+ messages in thread
From: Sam James @ 2020-12-22 18:57 UTC (permalink / raw
  To: gentoo-commits

commit:     5f23028f6c8dfdd535ddb03eebfb0806e806d9d7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 22 18:57:10 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 22 18:57:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f23028f

sci-geosciences/osm2pgsql: Stabilize 1.3.0 amd64, #761268

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild
index 736fa938d65..0e3affca363 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+lua luajit"
 
 COMMON_DEPEND="


^ permalink raw reply related	[flat|nested] 29+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/osm2pgsql/
@ 2021-01-04 15:32 Sam James
  0 siblings, 0 replies; 29+ messages in thread
From: Sam James @ 2021-01-04 15:32 UTC (permalink / raw
  To: gentoo-commits

commit:     2fe1f78b14dd31392ce07eedac1044d9b08a6e01
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  4 15:31:12 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan  4 15:31:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fe1f78b

sci-geosciences/osm2pgsql: Stabilize 1.3.0 x86, #761268

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild
index 0e3affca363..1e47df20181 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+lua luajit"
 
 COMMON_DEPEND="


^ permalink raw reply related	[flat|nested] 29+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/osm2pgsql/
@ 2021-01-23  4:09 Sam James
  0 siblings, 0 replies; 29+ messages in thread
From: Sam James @ 2021-01-23  4:09 UTC (permalink / raw
  To: gentoo-commits

commit:     b278c48d134bc7685f6dfefbad9ab8dbff30b26c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 04:09:37 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 04:09:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b278c48d

sci-geosciences/osm2pgsql: Stabilize 1.4.0-r100 amd64, #766528

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild
index ac4caa5df5a..834bf1881e5 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+lua"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 29+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/osm2pgsql/
@ 2021-01-23  4:20 Sam James
  0 siblings, 0 replies; 29+ messages in thread
From: Sam James @ 2021-01-23  4:20 UTC (permalink / raw
  To: gentoo-commits

commit:     d61d0fcc0c908f0d9ba55cc890e6234ebcc6c4cf
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 04:19:48 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 04:19:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d61d0fcc

sci-geosciences/osm2pgsql: Stabilize 1.4.0-r100 x86, #766528

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild
index 834bf1881e5..552e4a10ca9 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+lua"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 29+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/osm2pgsql/
@ 2021-02-27 10:36 Aaron W. Swenson
  0 siblings, 0 replies; 29+ messages in thread
From: Aaron W. Swenson @ 2021-02-27 10:36 UTC (permalink / raw
  To: gentoo-commits

commit:     b8ba237389d58f2fec3c55f1ddda6540bece8cc2
Author:     Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 27 10:35:14 2021 +0000
Commit:     Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 10:35:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8ba2373

sci-geosciences/osm2pgsql: Cleanup

Closes: https://bugs.gentoo.org/688110
Signed-off-by: Aaron W. Swenson <titanofold <AT> gentoo.org>

 sci-geosciences/osm2pgsql/Manifest               |  1 -
 sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild | 43 ------------------------
 sci-geosciences/osm2pgsql/osm2pgsql-1.4.0.ebuild | 43 ------------------------
 3 files changed, 87 deletions(-)

diff --git a/sci-geosciences/osm2pgsql/Manifest b/sci-geosciences/osm2pgsql/Manifest
index a077a0e2ab6..bfae50571f5 100644
--- a/sci-geosciences/osm2pgsql/Manifest
+++ b/sci-geosciences/osm2pgsql/Manifest
@@ -1,2 +1 @@
-DIST osm2pgsql-1.3.0.tar.gz 2460451 BLAKE2B ac52523bf6d35a06528ad22a51465388e70baf9f94bb3664c39c301b429ff453370d9cd44549781e4ee50d698094ddfe83f0e39a7c3d6c01556ea95e10feaf75 SHA512 e643f3a1987ead36763c96d34b5dd7e170273b77a521106c21311dc7b01d2b34470b2e00e3214050f2cbdd3d89703a1827ee6c35928ed77cc7f35fc4e20331f3
 DIST osm2pgsql-1.4.0.tar.gz 2429430 BLAKE2B 5d93a159a87c9cb12d85be8b89377f720e0d94564574f70d6f3686b215a99250967655d0eeee3dcda2742fcab356ecf62de2b4bab384d69a641a06829c401388 SHA512 f0eaceb7f78087a58bba3bbfafbb9d6d70aecd4c3ba1cfb0ce784116b52a57c69855c1a7459cce8b963c87955de269ca320cf4a3934b6ff5ad29b7554e07dd9e

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild
deleted file mode 100644
index 1e47df20181..00000000000
--- a/sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Converts OSM planet.osm data to a PostgreSQL/PostGIS database"
-HOMEPAGE="https://osm2pgsql.org/"
-SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+lua luajit"
-
-COMMON_DEPEND="
-	app-arch/bzip2
-	dev-db/postgresql:=
-	dev-libs/expat
-	sci-libs/proj:=
-	sys-libs/zlib
-	lua? ( dev-lang/lua:0= )
-	luajit? ( dev-lang/luajit:= )
-"
-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)
-		-DWITH_LUAJIT=$(usex luajit)
-		-DBUILD_TESTS=OFF
-	)
-	cmake_src_configure
-}

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0.ebuild
deleted file mode 100644
index 736fa938d65..00000000000
--- a/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Converts OSM planet.osm data to a PostgreSQL/PostGIS database"
-HOMEPAGE="https://osm2pgsql.org/"
-SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+lua luajit"
-
-COMMON_DEPEND="
-	app-arch/bzip2
-	dev-db/postgresql:=
-	dev-libs/expat
-	sci-libs/proj:=
-	sys-libs/zlib
-	lua? ( dev-lang/lua:0= )
-	luajit? ( dev-lang/luajit:= )
-"
-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)
-		-DWITH_LUAJIT=$(usex luajit)
-		-DBUILD_TESTS=OFF
-	)
-	cmake_src_configure
-}


^ permalink raw reply related	[flat|nested] 29+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/osm2pgsql/
@ 2022-02-19 10:54 Sven Wegener
  0 siblings, 0 replies; 29+ messages in thread
From: Sven Wegener @ 2022-02-19 10:54 UTC (permalink / raw
  To: gentoo-commits

commit:     88ed3fadd8e72ac2f82320e24cf48172392b5c37
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 19 10:49:18 2022 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 10:54:21 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88ed3fad

sci-geosciences/osm2pgsql: Add sub-slot dependency on boost

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>

 sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild | 4 ++--
 sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild
index 552e4a10ca94..a377b456ed4a 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,7 @@ COMMON_DEPEND="
 	lua? ( ${LUA_DEPS} )
 "
 DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
+	dev-libs/boost:=
 "
 RDEPEND="${COMMON_DEPEND}
 	dev-db/postgis

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
index 96c27e44b3cd..d9f18aee8602 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,7 +28,7 @@ COMMON_DEPEND="
 	lua? ( ${LUA_DEPS} )
 "
 DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
+	dev-libs/boost:=
 "
 RDEPEND="${COMMON_DEPEND}
 	dev-db/postgis


^ permalink raw reply related	[flat|nested] 29+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/osm2pgsql/
@ 2024-01-13 21:40 Sven Wegener
  0 siblings, 0 replies; 29+ messages in thread
From: Sven Wegener @ 2024-01-13 21:40 UTC (permalink / raw
  To: gentoo-commits

commit:     d3be9d9f3813a0fe533eedc6f07a05e547bf376d
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 29 15:53:27 2023 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 21:39:59 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3be9d9f

sci-geosciences/osm2pgsql: depend on dev-cpp/nlohmann_json

Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>

 sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
index 767664197f02..b8c509281a26 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,6 +28,7 @@ COMMON_DEPEND="
 	lua? ( ${LUA_DEPS} )
 "
 DEPEND="${COMMON_DEPEND}
+	dev-cpp/nlohmann_json
 	dev-libs/boost:=
 "
 RDEPEND="${COMMON_DEPEND}


^ permalink raw reply related	[flat|nested] 29+ messages in thread
end of thread, other threads:[~2024-01-13 21:40 UTC | newest]

Thread overview: 29+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-23  4:09 [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/osm2pgsql/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2024-01-13 21:40 Sven Wegener
2022-02-19 10:54 Sven Wegener
2021-02-27 10:36 Aaron W. Swenson
2021-01-23  4:20 Sam James
2021-01-04 15:32 Sam James
2020-12-22 18:57 Sam James
2020-12-21 10:35 Aaron W. Swenson
2020-11-23  2:14 Aaron W. Swenson
2020-02-13 21:28 Andreas Sturmlechner
2020-02-13 21:28 Andreas Sturmlechner
2020-02-13 12:46 Agostino Sarubbo
2020-02-13 12:03 Agostino Sarubbo
2020-02-12 23:24 Andreas Sturmlechner
2018-05-15  9:39 Aaron Swenson
2017-12-29 19:02 Mikle Kolyada
2017-10-14 22:44 Aaron Swenson
2017-10-14 22:27 Aaron Swenson
2017-07-30 10:04 Michał Górny
2017-04-23 13:52 Aaron Swenson
2017-04-23 13:49 Aaron Swenson
2017-04-11 17:38 Sven Wegener
2017-03-02 21:13 Andreas Sturmlechner
2017-02-10 10:27 Amy Liffey
2016-03-27 12:02 Sam Jorna
2016-01-12 20:10 Amy Winston
2015-12-19 17:15 Sven Wegener
2015-12-19 17:15 Sven Wegener
2015-12-19 17:15 Sven Wegener

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox