commit: 5b0f46f9fca05221de3b9a549fa81330fe3fc49b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 29 13:55:38 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 28 15:24:26 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b0f46f9
sci-geosciences/osm2pgsql: drop 1.4.0-r100
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-geosciences/osm2pgsql/Manifest | 1 -
.../files/osm2pgsql-1.4.0-cmake_lua_version.patch | 11 -----
.../osm2pgsql/osm2pgsql-1.4.0-r100.ebuild | 55 ----------------------
3 files changed, 67 deletions(-)
diff --git a/sci-geosciences/osm2pgsql/Manifest
b/sci-geosciences/osm2pgsql/Manifest
index 608550816edb..e7b266c69e16 100644
--- a/sci-geosciences/osm2pgsql/Manifest
+++ b/sci-geosciences/osm2pgsql/Manifest
@@ -1,2 +1 @@
-DIST osm2pgsql-1.4.0.tar.gz 2429430 BLAKE2B
5d93a159a87c9cb12d85be8b89377f720e0d94564574f70d6f3686b215a99250967655d0eeee3dcda2742fcab356ecf62de2b4bab384d69a641a06829c401388
SHA512
f0eaceb7f78087a58bba3bbfafbb9d6d70aecd4c3ba1cfb0ce784116b52a57c69855c1a7459cce8b963c87955de269ca320cf4a3934b6ff5ad29b7554e07dd9e
DIST osm2pgsql-2.0.0.tar.gz 2712209 BLAKE2B
064bca5796f8ede6f6fb816c8fa3758f066788c8e41c300b4a9cadd8058ca9bed49379a260ee8e5990d7a38061808f7ec78d2895c4964e5546b2ed3862d74239
SHA512
24310f0370fe5e5f87f81f553c61cc24ec80d29054f0679a2d34a3f1d72eacff93ef59611ba0938e552c9faf167f187d7117f5a08f0c0c26f258d95ebee86743
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
deleted file mode 100644
index d7f35345ef52..000000000000
--- a/sci-geosciences/osm2pgsql/files/osm2pgsql-1.4.0-cmake_lua_version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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.4.0-r100.ebuild
b/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild
deleted file mode 100644
index accfe28a233f..000000000000
--- a/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 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
-}
