From 441d1370330332b7d78f238d2f5e13f7aed5e4e0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 25 Dec 2020 23:06:25 +0000 Subject: gentoo christmass resync : 25.12.2020 --- sci-geosciences/osm2pgsql/Manifest | 8 +++- .../files/osm2pgsql-1.4.0-cmake_lua_version.patch | 11 +++++ sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild | 2 +- .../osm2pgsql/osm2pgsql-1.4.0-r100.ebuild | 55 ++++++++++++++++++++++ sci-geosciences/osm2pgsql/osm2pgsql-1.4.0.ebuild | 43 +++++++++++++++++ .../osm2pgsql/osm2pgsql-99999999.ebuild | 22 +++++++-- 6 files changed, 133 insertions(+), 8 deletions(-) create mode 100644 sci-geosciences/osm2pgsql/files/osm2pgsql-1.4.0-cmake_lua_version.patch create mode 100644 sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild create mode 100644 sci-geosciences/osm2pgsql/osm2pgsql-1.4.0.ebuild (limited to 'sci-geosciences/osm2pgsql') diff --git a/sci-geosciences/osm2pgsql/Manifest b/sci-geosciences/osm2pgsql/Manifest index 9812efbdef23..79b8f6ba1a32 100644 --- a/sci-geosciences/osm2pgsql/Manifest +++ b/sci-geosciences/osm2pgsql/Manifest @@ -1,6 +1,10 @@ +AUX osm2pgsql-1.4.0-cmake_lua_version.patch 344 BLAKE2B 4edd5c655166104086c18cce8a33e8ef46adb94ce381a210f6d0d241af17acbe7cd27b2a4d5c28985faeae472f828f95fe11854c18db787f89f0624b4bf7c36b SHA512 47184a4cd60cd63dc4f2f72263cdc9c84a5f2e2d4b4f9e567fe3249113590f78894ec11ccab52d762611750e8cd331b56cb7ceeec5bd4dcde5c72ea53e20335c 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 EBUILD osm2pgsql-0.96.0.ebuild 930 BLAKE2B 7a5b8e4557fc0aaa76bbb34abc4dc431e4bf7a8d115fa457a538b0ab124f81cb246d0f340abe7d5366ad63cad42fe875aac570bf3c0cc89357863b0edef3d1de SHA512 3741889922dd3cbebadf15083b56a8a6611c9cec3402f36367f2fc1c510538e05856d8b610e1da06c69f077e67533a909a7a6136cbd5a06c472362c2135b6585 -EBUILD osm2pgsql-1.3.0.ebuild 864 BLAKE2B 333b7649760e69a2fc371faf51c6c7440732ddf882fb08ef10f6b163574de63a402fe36c5a94f1587e7d5e8f4ac3a70cdbeb31fe3ed501f7ea1e05feb9d61e11 SHA512 f4ecde80b4f06ef8594a32410db8848e79e431bbb229f6331aa7d191d71a50d3be6f3c9bba7c747f87b187c2c8d365ea8ced95140e7b66b2c81601901f13b966 -EBUILD osm2pgsql-99999999.ebuild 846 BLAKE2B 83328ed6e17271591e806e74c6f5053903b61c8606258fa2b0687ef3bb91392a1c885b290a2fc1dc36cb115f455f8b987f942bd200491e275afc4e3fb9296883 SHA512 c1953aeb701043590b204f830a190a3a482173bef58c8796156d6ce2f6f62e44bc11078a5cecf67f2dc744c486f5419411aa5e83888a45a3192cbad5aee8d95e +EBUILD osm2pgsql-1.3.0.ebuild 863 BLAKE2B d1f900a329faf5043d5a52f578ee582503698dccb7bb0233524f8f2e449c27295ed7b26dfb67bec7660955baebc4b79c69eb761aad90cac6804ad8f4a914e6d2 SHA512 3cf9f89c17e050457445d4cc2972d6de38eb20bdb7aee2ae2e98ed9c335551b8ddbb7d8baa311fd87371ad8997e1416765bb02abc9eb7ae1190ff9162aedb236 +EBUILD osm2pgsql-1.4.0-r100.ebuild 1276 BLAKE2B 4988850b6d4b1814b491cc20e709e217ab7b9d5ec6401da434079fe527c39547b7a1f38c8f936bbc21c489d5413e750ea34c4b51158221f9b5ca1555c3f428ca SHA512 b702dc3c08bb55e20940ed7d276f0a20e7cb1ba69b057274f39cc6f00cf91ba2b4717bee0002aa8d7e7c2d0ae584ffd9777b6b1fd43b0bb221a7440d5461e5b7 +EBUILD osm2pgsql-1.4.0.ebuild 864 BLAKE2B 333b7649760e69a2fc371faf51c6c7440732ddf882fb08ef10f6b163574de63a402fe36c5a94f1587e7d5e8f4ac3a70cdbeb31fe3ed501f7ea1e05feb9d61e11 SHA512 f4ecde80b4f06ef8594a32410db8848e79e431bbb229f6331aa7d191d71a50d3be6f3c9bba7c747f87b187c2c8d365ea8ced95140e7b66b2c81601901f13b966 +EBUILD osm2pgsql-99999999.ebuild 1258 BLAKE2B 5986238e26804a4320bb6e291d68bd112926cb84e64b0046b66f5d7b5f6c2928769214119cb2bb9eccd36a97463b67a110e8b41774c2d4178d481b7616e18073 SHA512 b556c71c67187a100b960968c4d6c7c9ab3a0f46f56dc1949e753c92a8e93fdd41eaece622d135156e290ec9eb5280593d7398acd0b072daa9b42ce65e0f0b89 MISC metadata.xml 793 BLAKE2B d74e55e2b2cd946a65cba5bd3f0ba953edf8528d6d30037fbd69640d7379ced6e07a0e81e57f02f2e49afde4a55b07c21cb5430de1d42a682e10bfd964ab7939 SHA512 2f76c2c5946179da213b0bf193e89f110c46818ab77a4dea41df1fc78d1527ace8ff81a3887ebb47e6ee0a799e0ee037364e22bfdd5ce72feb765209b6a3fcd6 diff --git a/sci-geosciences/osm2pgsql/files/osm2pgsql-1.4.0-cmake_lua_version.patch b/sci-geosciences/osm2pgsql/files/osm2pgsql-1.4.0-cmake_lua_version.patch new file mode 100644 index 000000000000..d7f35345ef52 --- /dev/null +++ b/sci-geosciences/osm2pgsql/files/osm2pgsql-1.4.0-cmake_lua_version.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -185,7 +185,7 @@ + include_directories(SYSTEM ${LUAJIT_INCLUDE_DIR}) + set(HAVE_LUAJIT 1) + else() +- find_package(Lua REQUIRED) ++ find_package(Lua ${LUA_VERSION} EXACT REQUIRED) + include_directories(SYSTEM ${LUA_INCLUDE_DIR}) + endif() + set(HAVE_LUA 1) diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild index 736fa938d656..0e3affca363d 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=" diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild new file mode 100644 index 000000000000..ac4caa5df5a2 --- /dev/null +++ b/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit cmake lua-single + +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" +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" + +COMMON_DEPEND=" + app-arch/bzip2 + dev-db/postgresql:= + dev-libs/expat + sci-libs/proj:= + sys-libs/zlib + lua? ( ${LUA_DEPS} ) +" +DEPEND="${COMMON_DEPEND} + dev-libs/boost +" +RDEPEND="${COMMON_DEPEND} + dev-db/postgis +" + +# Tries to connect to local postgres server and other shenanigans +RESTRICT="test" + +PATCHES=( + "${FILESDIR}"/${PN}-1.4.0-cmake_lua_version.patch +) + +src_configure() { + # Setting WITH_LUAJIT without "if use lua" guard is safe, upstream + # CMakeLists.txt only evaluates it if WITH_LUA is true. + local mycmakeargs=( + -DWITH_LUA=$(usex lua) + -DWITH_LUAJIT=$(usex lua_single_target_luajit) + -DBUILD_TESTS=OFF + ) + # To prevent the "unused variable" QA warning + if use lua && ! use lua_single_target_luajit; then + mycmakeargs+=( -DLUA_VERSION="$(lua_get_version)" ) + fi + cmake_src_configure +} 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 000000000000..736fa938d656 --- /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 +} diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild index 1d3ae4858241..96c27e44b3cd 100644 --- a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild +++ b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild @@ -3,7 +3,9 @@ EAPI=7 -inherit cmake git-r3 +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit cmake git-r3 lua-single EGIT_REPO_URI="https://github.com/openstreetmap/${PN}.git" @@ -14,7 +16,8 @@ SRC_URI="" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="+lua luajit" +IUSE="+lua" +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" COMMON_DEPEND=" app-arch/bzip2 @@ -22,8 +25,7 @@ COMMON_DEPEND=" dev-libs/expat sci-libs/proj:= sys-libs/zlib - lua? ( dev-lang/lua:0= ) - luajit? ( dev-lang/luajit:= ) + lua? ( ${LUA_DEPS} ) " DEPEND="${COMMON_DEPEND} dev-libs/boost @@ -35,11 +37,21 @@ RDEPEND="${COMMON_DEPEND} # Tries to connect to local postgres server and other shenanigans RESTRICT="test" +PATCHES=( + "${FILESDIR}"/${PN}-1.4.0-cmake_lua_version.patch +) + src_configure() { + # Setting WITH_LUAJIT without "if use lua" guard is safe, upstream + # CMakeLists.txt only evaluates it if WITH_LUA is true. local mycmakeargs=( -DWITH_LUA=$(usex lua) - -DWITH_LUAJIT=$(usex luajit) + -DWITH_LUAJIT=$(usex lua_single_target_luajit) -DBUILD_TESTS=OFF ) + # To prevent the "unused variable" QA warning + if use lua && ! use lua_single_target_luajit; then + mycmakeargs+=( -DLUA_VERSION="$(lua_get_version)" ) + fi cmake_src_configure } -- cgit v1.2.3