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
