[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/osm2pgsql/files/, sci-geosciences/osm2pgsql/

[Sven Wegener]

commit:     47b1f99142bef95022d8c524e016d759ae57f14e
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 24 05:41:19 2024 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Thu Oct 24 05:43:42 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47b1f991

sci-geosciences/osm2pgsql: update lua version patch for live ebuild

Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>

 .../files/osm2pgsql-1.7.0-cmake_lua_version.patch       | 11 -----------
 .../files/osm2pgsql-2.0.0-cmake_lua_version.patch       | 11 +++++++++++
 sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild     | 17 ++++++-----------
 3 files changed, 17 insertions(+), 22 deletions(-)

diff --git 
a/sci-geosciences/osm2pgsql/files/osm2pgsql-1.7.0-cmake_lua_version.patch 
b/sci-geosciences/osm2pgsql/files/osm2pgsql-1.7.0-cmake_lua_version.patch
deleted file mode 100644
index 054624d02d62..000000000000
--- a/sci-geosciences/osm2pgsql/files/osm2pgsql-1.7.0-cmake_lua_version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -193,7 +193,7 @@
-         add_definitions(-DHAVE_LUAJIT=1)
-     else()
-         message(STATUS "Building with Lua support")
--        find_package(Lua REQUIRED)
-+        find_package(Lua ${LUA_VERSION} EXACT REQUIRED)
-         include_directories(SYSTEM ${LUA_INCLUDE_DIR})
-     endif()
-     add_definitions(-DHAVE_LUA=1)

diff --git 
a/sci-geosciences/osm2pgsql/files/osm2pgsql-2.0.0-cmake_lua_version.patch 
b/sci-geosciences/osm2pgsql/files/osm2pgsql-2.0.0-cmake_lua_version.patch
new file mode 100644
index 000000000000..1839587fecfe
--- /dev/null
+++ b/sci-geosciences/osm2pgsql/files/osm2pgsql-2.0.0-cmake_lua_version.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -190,7 +190,7 @@ if (WITH_LUAJIT)
+     add_definitions(-DHAVE_LUAJIT=1)
+ else()
+     message(STATUS "Building with Lua (but not LuaJIT) support")
+-    find_package(Lua REQUIRED)
++    find_package(Lua ${LUA_VERSION} EXACT REQUIRED)
+     include_directories(SYSTEM ${LUA_INCLUDE_DIR})
+ endif()
+ 

diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild 
b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
index b8c509281a26..fc19645cfbce 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
@@ -16,8 +16,8 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="+lua"
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+IUSE=""
+REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 COMMON_DEPEND="
        app-arch/bzip2
@@ -25,7 +25,7 @@ COMMON_DEPEND="
        dev-libs/expat
        sci-libs/proj:=
        sys-libs/zlib
-       lua? ( ${LUA_DEPS} )
+       ${LUA_DEPS}
 "
 DEPEND="${COMMON_DEPEND}
        dev-cpp/nlohmann_json
@@ -39,20 +39,15 @@ RDEPEND="${COMMON_DEPEND}
 RESTRICT="test"
 
 PATCHES=(
-       "${FILESDIR}"/${PN}-1.7.0-cmake_lua_version.patch
+       "${FILESDIR}"/${PN}-2.0.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)
+               # To prevent the "unused variable" QA warning
+               $(usex !lua_single_target_luajit 
"-DLUA_VERSION=$(lua_get_version)" "")
                -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
 }