summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron W. Swenson <titanofold@gentoo.org>2020-11-22 21:11:46 -0500
committerAaron W. Swenson <titanofold@gentoo.org>2020-11-22 21:13:42 -0500
commit75a6025f101ccd4c03120850213e9734d7551428 (patch)
treef3deeb251e418c2ee1fc66000441806c30299686 /sci-geosciences/osm2pgsql
parentsys-cluster/kube-scheduler: 1.18.12 bump (diff)
downloadgentoo-75a6025f101ccd4c03120850213e9734d7551428.tar.gz
gentoo-75a6025f101ccd4c03120850213e9734d7551428.tar.bz2
gentoo-75a6025f101ccd4c03120850213e9734d7551428.zip
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@gentoo.org>
Diffstat (limited to 'sci-geosciences/osm2pgsql')
-rw-r--r--sci-geosciences/osm2pgsql/Manifest1
-rw-r--r--sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild43
-rw-r--r--sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild10
3 files changed, 49 insertions, 5 deletions
diff --git a/sci-geosciences/osm2pgsql/Manifest b/sci-geosciences/osm2pgsql/Manifest
index f9a0895ca097..71fdece51142 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-1.3.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild
new file mode 100644
index 000000000000..ded439c9e692
--- /dev/null
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-1.3.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:= )
+ 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-99999999.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
index 78b4534c993e..87037136ac87 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