From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 44CE5138359 for ; Mon, 23 Nov 2020 02:14:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 94B48E0828; Mon, 23 Nov 2020 02:14:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 68A35E0828 for ; Mon, 23 Nov 2020 02:14:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 54F5233BE61 for ; Mon, 23 Nov 2020 02:14:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 09C3E44F for ; Mon, 23 Nov 2020 02:14:05 +0000 (UTC) From: "Aaron W. Swenson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aaron W. Swenson" Message-ID: <1606097622.75a6025f101ccd4c03120850213e9734d7551428.titanofold@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/osm2pgsql/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/osm2pgsql/Manifest sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild X-VCS-Directories: sci-geosciences/osm2pgsql/ X-VCS-Committer: titanofold X-VCS-Committer-Name: Aaron W. Swenson X-VCS-Revision: 75a6025f101ccd4c03120850213e9734d7551428 X-VCS-Branch: master Date: Mon, 23 Nov 2020 02:14:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 20abd1d1-0487-4d6a-a1fb-4475f9fa668a X-Archives-Hash: 9231eeb016c4eb9d9fcc9af6ce2c04c8 commit: 75a6025f101ccd4c03120850213e9734d7551428 Author: Aaron W. Swenson gentoo org> AuthorDate: Mon Nov 23 02:11:46 2020 +0000 Commit: Aaron W. Swenson gentoo 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 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