Adding metadata

8 files changed, 251 insertions, 76 deletions

diff --git a/dev-cpp/lucene++/Manifest b/dev-cpp/lucene++/Manifest
index 3b24633ebe78..2cb8154eec92 100644
--- a/dev-cpp/lucene++/Manifest
+++ b/dev-cpp/lucene++/Manifest
@@ -1,2 +1 @@
-DIST lucene++-3.0.7.tar.gz 2013570 BLAKE2B 26abb1a2fa2a24d7240505f11639c078744313541b4993ed84e4d0129fda74346e841f0c4c7552e58a15dd492af9ffd33ea66866c8e6810cd41e5d675833ce79 SHA512 92f3bba320980673cc64c983616aa38d25b44ea811237ed226741b892757fb8151e4f833aa58a18dbe7a0c9a899d94e828aa15e6d7b48a69ab730d1d772db220
 DIST lucene++-3.0.9.tar.gz 2458287 BLAKE2B cbc6c32bd23525ad53fbcf500628f1806496d7f0575ee33baf0bc189d2ea5710334d07b23869e9b3b205bfa229400bc09c108ba6919e2b83bf0c6259e0a88564 SHA512 220fe1b46518018d176ae16434f03b1453fc345d8d552a294d1af927ea4ab69a83ee4b03c82938e648edaa3e7064526ca047fc86e1c71743b0958b520d59e225
diff --git a/dev-cpp/lucene++/files/lucene++-3.0.7-boost-1.58.patch b/dev-cpp/lucene++/files/lucene++-3.0.7-boost-1.58.patch
deleted file mode 100644
index 9ff33fd03005..000000000000
--- a/dev-cpp/lucene++/files/lucene++-3.0.7-boost-1.58.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-commit 1987082cf9278a639d772b4f35a8ae2d34944177
-Author: Václav Slavík <vaclav@slavik.io>
-Date:   Mon May 4 18:04:46 2015 +0200
-
-    Fix compilation with Boost 1.58
-    
-    1.58 introduces strict type checking in boost::get() and while that's
-    good in theory, the VariantUtils code makes it impractical to use.
-    Instead, use relaxed_get() to get the old behavior. relaxed_get() didn't
-    exist in older versions of Boost, so the code must check BOOST_VERSION.
-    
-    Fixes #93.
-
-diff --git a/include/VariantUtils.h b/include/VariantUtils.h
-index 1e6c243..5a72e59 100644
---- a/include/VariantUtils.h
-+++ b/include/VariantUtils.h
-@@ -8,6 +8,7 @@
- #define VARIANTUTILS_H
- 
- #include <boost/any.hpp>
-+#include <boost/version.hpp>
- #include "Lucene.h"
- #include "MiscUtils.h"
- 
-@@ -22,7 +23,11 @@ public:
- 
-     template <typename TYPE, typename VAR>
-     static TYPE get(VAR var) {
-+#if BOOST_VERSION < 105800
-         return var.type() == typeid(TYPE) ? boost::get<TYPE>(var) : TYPE();
-+#else
-+        return var.type() == typeid(TYPE) ? boost::relaxed_get<TYPE>(var) : TYPE();
-+#endif
-     }
- 
-     template <typename TYPE, typename VAR>
diff --git a/dev-cpp/lucene++/files/lucene++-3.0.9-boost-1.89.patch b/dev-cpp/lucene++/files/lucene++-3.0.9-boost-1.89.patch
new file mode 100644
index 000000000000..6ed4f4b4a03e
--- /dev/null
+++ b/dev-cpp/lucene++/files/lucene++-3.0.9-boost-1.89.patch
@@ -0,0 +1,83 @@
+Bug: https://bugs.gentoo.org/963333
+
+--- LucenePlusPlus-rel_3.0.9/cmake/dependencies.cmake
++++ LucenePlusPlus-rel_3.0.9-boost-1.89/cmake/dependencies.cmake
+@@ -7,7 +7,6 @@ find_package(Boost COMPONENTS
+   filesystem
+   iostreams
+   regex
+-  system
+   thread
+   REQUIRED
+ )
+@@ -20,7 +19,6 @@ set(lucene_boost_libs
+   ${Boost_FILESYSTEM_LIBRARIES}
+   ${Boost_IOSTREAMS_LIBRARIES}
+   ${Boost_REGEX_LIBRARIES}
+-  ${Boost_SYSTEM_LIBRARIES}
+   ${Boost_THREAD_LIBRARIES}
+ )
+ 
+--- LucenePlusPlus-rel_3.0.9/src/contrib/CMakeLists.txt
++++ LucenePlusPlus-rel_3.0.9-boost-1.89/src/contrib/CMakeLists.txt
+@@ -67,7 +67,6 @@ target_link_libraries(lucene++-contrib
+     Boost::filesystem
+     Boost::iostreams
+     Boost::regex
+-    Boost::system
+     Boost::thread
+     ZLIB::ZLIB
+     lucene++::lucene++)
+--- LucenePlusPlus-rel_3.0.9/src/core/CMakeLists.txt
++++ LucenePlusPlus-rel_3.0.9-boost-1.89/src/core/CMakeLists.txt
+@@ -57,7 +57,6 @@ target_link_libraries(lucene++
+     Boost::filesystem
+     Boost::iostreams
+     Boost::regex
+-    Boost::system
+     Boost::thread
+     ZLIB::ZLIB
+ )
+--- LucenePlusPlus-rel_3.0.9/src/demo/deletefiles/CMakeLists.txt
++++ LucenePlusPlus-rel_3.0.9-boost-1.89/src/demo/deletefiles/CMakeLists.txt
+@@ -38,7 +38,6 @@ target_link_libraries(deletefiles
+     Boost::filesystem
+     Boost::iostreams
+     Boost::regex
+-    Boost::system
+     Boost::thread
+     ZLIB::ZLIB
+     lucene++::lucene++
+diff -rup LucenePlusPlus-rel_3.0.9/src/demo/indexfiles/CMakeLists.txt LucenePlusPlus-rel_3.0.9-boost-1.89/src/demo/indexfiles/CMakeLists.txt
+--- LucenePlusPlus-rel_3.0.9/src/demo/indexfiles/CMakeLists.txt
++++ LucenePlusPlus-rel_3.0.9-boost-1.89/src/demo/indexfiles/CMakeLists.txt
+@@ -39,7 +39,6 @@ target_link_libraries(indexfiles
+     Boost::filesystem
+     Boost::iostreams
+     Boost::regex
+-    Boost::system
+     Boost::thread
+     ZLIB::ZLIB
+     lucene++::lucene++
+diff -rup LucenePlusPlus-rel_3.0.9/src/demo/searchfiles/CMakeLists.txt LucenePlusPlus-rel_3.0.9-boost-1.89/src/demo/searchfiles/CMakeLists.txt
+--- LucenePlusPlus-rel_3.0.9/src/demo/searchfiles/CMakeLists.txt
++++ LucenePlusPlus-rel_3.0.9-boost-1.89/src/demo/searchfiles/CMakeLists.txt
+@@ -38,7 +38,6 @@ target_link_libraries(searchfiles
+     Boost::filesystem
+     Boost::iostreams
+     Boost::regex
+-    Boost::system
+     Boost::thread
+     ZLIB::ZLIB
+     lucene++::lucene++
+diff -rup LucenePlusPlus-rel_3.0.9/src/test/CMakeLists.txt LucenePlusPlus-rel_3.0.9-boost-1.89/src/test/CMakeLists.txt
+--- LucenePlusPlus-rel_3.0.9/src/test/CMakeLists.txt
++++ LucenePlusPlus-rel_3.0.9-boost-1.89/src/test/CMakeLists.txt
+@@ -59,7 +59,6 @@ target_link_libraries(lucene++-tester
+     Boost::filesystem
+     Boost::iostreams
+     Boost::regex
+-    Boost::system
+     Boost::thread
+     ZLIB::ZLIB
+     gtest_main
diff --git a/dev-cpp/lucene++/files/lucene++-3.0.9-cmake4.patch b/dev-cpp/lucene++/files/lucene++-3.0.9-cmake4.patch
new file mode 100644
index 000000000000..4e4805fc852d
--- /dev/null
+++ b/dev-cpp/lucene++/files/lucene++-3.0.9-cmake4.patch
@@ -0,0 +1,62 @@
+From: https://github.com/luceneplusplus/LucenePlusPlus/pull/218
+
+From: Gianfranco Costamagna <locutusofborg@debian.org>
+Date: Mon, 8 Sep 2025 15:05:10 +0200
+Subject: [PATCH] Bump minimum required cmake version to 3.10, for new cmake 4
+ compatibility fix
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,7 +2,7 @@
+ # init
+ ####################################
+ 
+-cmake_minimum_required(VERSION 3.5)
++cmake_minimum_required(VERSION 3.10)
+ 
+ project(lucene++)
+ 
+--- a/cmake/cotire.cmake
++++ b/cmake/cotire.cmake
+@@ -37,7 +37,7 @@ set(__COTIRE_INCLUDED TRUE)
+ if (NOT CMAKE_SCRIPT_MODE_FILE)
+ 	cmake_policy(PUSH)
+ endif()
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 3.10)
+ if (NOT CMAKE_SCRIPT_MODE_FILE)
+ 	cmake_policy(POP)
+ endif()
+--- a/src/test/gtest/CMakeLists.txt
++++ b/src/test/gtest/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ # Note: CMake support is community-based. The maintainers do not use CMake
+ # internally.
+ 
+-cmake_minimum_required(VERSION 2.8.8)
++cmake_minimum_required(VERSION 3.10)
+ 
+ if (POLICY CMP0048)
+   cmake_policy(SET CMP0048 NEW)
+--- a/src/test/gtest/googlemock/CMakeLists.txt
++++ b/src/test/gtest/googlemock/CMakeLists.txt
+@@ -42,7 +42,7 @@ else()
+   cmake_policy(SET CMP0048 NEW)
+   project(gmock VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C)
+ endif()
+-cmake_minimum_required(VERSION 2.6.4)
++cmake_minimum_required(VERSION 3.10)
+ 
+ if (COMMAND set_up_hermetic_build)
+   set_up_hermetic_build()
+--- a/src/test/gtest/googletest/CMakeLists.txt
++++ b/src/test/gtest/googletest/CMakeLists.txt
+@@ -53,7 +53,7 @@ else()
+   cmake_policy(SET CMP0048 NEW)
+   project(gtest VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C)
+ endif()
+-cmake_minimum_required(VERSION 2.6.4)
++cmake_minimum_required(VERSION 3.10)
+ 
+ if (POLICY CMP0063) # Visibility
+   cmake_policy(SET CMP0063 NEW)
diff --git a/dev-cpp/lucene++/files/lucene++-3.0.9-gcc15.patch b/dev-cpp/lucene++/files/lucene++-3.0.9-gcc15.patch
new file mode 100644
index 000000000000..44d935e8eb14
--- /dev/null
+++ b/dev-cpp/lucene++/files/lucene++-3.0.9-gcc15.patch
@@ -0,0 +1,32 @@
+From: https://github.com/luceneplusplus/LucenePlusPlus/pull/218
+
+From: Gianfranco Costamagna <locutusofborg@debian.org>
+Date: Mon, 8 Sep 2025 15:05:58 +0200
+Subject: [PATCH] Bump minimum std-version to 17, fixing FTBFS with new gcc-15
+ and googletest
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -47,7 +47,7 @@ include(dependencies)
+ include(Lucene++Docs)
+ 
+ # Enable C++11
+-set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD 17)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ 
+ ####################################
+--- a/src/test/gtest/CMakeLists.txt
++++ b/src/test/gtest/CMakeLists.txt
+@@ -11,9 +11,9 @@ project(googletest-distribution)
+ set(GOOGLETEST_VERSION 1.10.0)
+ 
+ if (CMAKE_VERSION VERSION_LESS "3.1")
+-  add_definitions(-std=c++11)
++  add_definitions(-std=c++17)
+ else()
+-  set(CMAKE_CXX_STANDARD 11)
++  set(CMAKE_CXX_STANDARD 17)
+   set(CMAKE_CXX_STANDARD_REQUIRED ON)
+   if(NOT CYGWIN)
+     set(CMAKE_CXX_EXTENSIONS OFF)
diff --git a/dev-cpp/lucene++/files/lucene++-3.0.9-system-gtest.patch b/dev-cpp/lucene++/files/lucene++-3.0.9-system-gtest.patch
new file mode 100644
index 000000000000..11469a2c60fb
--- /dev/null
+++ b/dev-cpp/lucene++/files/lucene++-3.0.9-system-gtest.patch
@@ -0,0 +1,21 @@
+From: https://github.com/luceneplusplus/LucenePlusPlus/pull/218
+
+From: Gianfranco Costamagna <locutusofborg@debian.org>
+Date: Mon, 8 Sep 2025 15:05:34 +0200
+Subject: [PATCH] Find and use system googletest if available
+
+--- a/src/test/CMakeLists.txt
++++ b/src/test/CMakeLists.txt
+@@ -8,8 +8,10 @@ if(MSVC)
+   set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+ endif()
+ 
+-add_subdirectory(gtest)
+-
++find_package(GTest)
++if(NOT GTEST_FOUND)
++  add_subdirectory(gtest)
++endif()
+ 
+ ####################################
+ # src
diff --git a/dev-cpp/lucene++/lucene++-3.0.7-r3.ebuild b/dev-cpp/lucene++/lucene++-3.0.7-r3.ebuild
deleted file mode 100644
index c62a0aa44ca0..000000000000
--- a/dev-cpp/lucene++/lucene++-3.0.7-r3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="LucenePlusPlus-rel_${PV}"
-inherit cmake
-
-DESCRIPTION="C++ port of Lucene library, a high-performance, full-featured text search engine"
-HOMEPAGE="https://github.com/luceneplusplus/LucenePlusPlus"
-SRC_URI="https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="|| ( LGPL-3 Apache-2.0 )"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~loong ppc ppc64 ~sparc x86"
-IUSE="debug"
-
-RESTRICT="test"
-
-DEPEND="dev-libs/boost:=[zlib]"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS README.rst )
-
-PATCHES=(
-	"${FILESDIR}/${P}-boost-1.58.patch"
-	"${FILESDIR}/${P}-boost-1.85.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DEMO=OFF
-		-DENABLE_TEST=OFF
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/lucene++/lucene++-3.0.9-r1.ebuild b/dev-cpp/lucene++/lucene++-3.0.9-r1.ebuild
new file mode 100644
index 000000000000..14b3fda60ca6
--- /dev/null
+++ b/dev-cpp/lucene++/lucene++-3.0.9-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="LucenePlusPlus-rel_${PV}"
+inherit edo cmake flag-o-matic
+
+DESCRIPTION="C++ port of Lucene library, a high-performance, full-featured text search engine"
+HOMEPAGE="https://github.com/luceneplusplus/LucenePlusPlus"
+SRC_URI="https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="|| ( LGPL-3 Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~loong ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-libs/boost:=[zlib]"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.7-boost-1.85.patch"
+	"${FILESDIR}/${PN}-3.0.9-boost-1.87.patch"
+	"${FILESDIR}/${PN}-3.0.9-pkgconfig.patch"
+	"${FILESDIR}/${PN}-3.0.9-tests-gtest-cstdint.patch"
+	"${FILESDIR}/${PN}-3.0.9-cmake4.patch"
+	"${FILESDIR}/${PN}-3.0.9-system-gtest.patch"
+	"${FILESDIR}/${PN}-3.0.9-gcc15.patch"
+	"${FILESDIR}/${PN}-3.0.9-boost-1.89.patch"
+)
+
+src_configure() {
+	# Can't be tested with LTO because of ODR issues in test mocks
+	filter-lto
+
+	local mycmakeargs=(
+		-DENABLE_DEMO=OFF
+		-DENABLE_TEST=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	edo "${BUILD_DIR}"/src/test/lucene++-tester \
+		--test_dir="${S}"/src/test/testfiles \
+		--gtest_filter="-ParallelMultiSearcherTest*:SortTest.*:"
+}