gentoo auto-resync : 30:07:2022 - 09:09:33

3 files changed, 116 insertions, 0 deletions

diff --git a/dev-cpp/clucene/Manifest b/dev-cpp/clucene/Manifest
index 293cb949dad7..a520fae21081 100644
--- a/dev-cpp/clucene/Manifest
+++ b/dev-cpp/clucene/Manifest
@@ -2,8 +2,10 @@ AUX clucene-2.3.3.4-contrib.patch 1697 BLAKE2B 2aebc143ff0dafb2765cb3bd5d8e5183b
 AUX clucene-2.3.3.4-fix-clang.patch 2219 BLAKE2B 7572c05d9e2676eedb3aabc8030eea6b97a19af9f02eb1c336b40606105bc89800a8da8ea6f899ef550fa114776133fec962622ac3e337ca0f52fc0305c81bd3 SHA512 f3822c5d127b37fdb0a405a3fa0a2d2a168133da106a222de0311c2074aaacb7d9651a1be7ad7afda44da22cc2c8baa8d5db756aaaef5c344e12d52625e2c2e1
 AUX clucene-2.3.3.4-gcc6.patch 1102 BLAKE2B c7a264585532237d38ad5d06d1e1b96559e47145dc9ecbfe73ec6b8a493fd9c0eef73611305de213e432dd94736dc49dbc140b47d0c65081228989aa21a3fe62 SHA512 367e97d9b5d59bca880d8ec70b37078406f581267a896ff6b35cd3ab21f983f4b21152482bb34fb813e426b4cae14a6d319ccdb08e3bf968de8ece3c28a18722
 AUX clucene-2.3.3.4-gmtime.patch 477 BLAKE2B 0c453684f6850ad7eb2eeff2624a9d23c7ea5f78321447b75acea625add44b7cae8c8c220c8848ed8ac39c66f8329f20e9c60005a1e2d237097771ecb0c2370f SHA512 1c23c08edf5512c29a061e4a8515dfa209151af83e46680842f0aeee1269d529a14fd4a89aab7c25312fd7dbb9daf80912a265d21fcf08ac892a467be4a59a60
+AUX clucene-2.3.3.4-libcxx.patch 1486 BLAKE2B 237f5a6b674a56c238ffb42282b610d92f8500e5dad4423536ef1dd7184fbbfadd223ac5e79794370c086780ae91863bb3f5444cc0ad8aebc77512b33b6cd487 SHA512 7602a10f3fdd5f4a40a10603abf65f2661eb3cddda9d2c38382f7d362564c0eb8ca1968755090ae78ec5a9a9e6c7d3f889c11fefe9f140c10818c824c7c5f77f
 AUX clucene-2.3.3.4-musl-pthread.patch 256 BLAKE2B 30c38a06d98c2e4c34f1ebf1c8b0021d57e66fd2b49e01cd9f165c3c7fef8a67152ed2136ccc733b2e6b07b8c39b3057b3fc4961330e3195c9d0b4c0d686fb95 SHA512 329ae45428e1d9b2f005c818b69030e7146b6441ca0a8d17bc3c711f76aa4c384c61718b717170fd88a1ae16e371396b77f8ba072aac6879b82aedaba3238207
 AUX clucene-2.3.3.4-pkgconfig.patch 871 BLAKE2B a108d0c4427159a09d2575b351bedfd38c6305219e01a7927b66aacfcab3587d3c08315f0a7e58a123e6779d2d8fec17fb06127de32dfd5782408cbc5c916ed5 SHA512 afcdf00537c8eb9c75ed569356520551ea194c8edc636f6e82bd0b1ef60e33396c1e2722b895aced2b58358950b3c5c1df2a914295074e9e99485ca6cee21c18
 DIST clucene-core-2.3.3.4.tar.gz 2241498 BLAKE2B e7c02d3976fd8d722a81ad4c6d43363b9af0073aa68edb8303cada495f8b8514cb8c86a85f398f8c9ffc1f78a49c0718cde5af4145c32869572d21e8af633846 SHA512 1c9da9077edcebd46563bd9e47d330518e0b30061016650a759cfe051e9748fdad8932a472b1cca53a6adafed5f41656527271fc5f55ddfcefb558f0d83286b4
 EBUILD clucene-2.3.3.4-r7.ebuild 1567 BLAKE2B 7643f76d4468d77a6f81f78a4e0ef33ea8bceeaf0990b69eb3c7ca2e53ba2b11e413b78c2a51097b8fddfdc6ba4f45232e6f732b8c9260c8dfbd734527820cc7 SHA512 ed532c29d7e7bf35b42cf9a601839ca674f8b9d175650ce34329b7a0f25617f7ff5ec5d6735fdd18e7e4bf3c7976211c543e4f5f852112dc999008e69e10be91
+EBUILD clucene-2.3.3.4-r8.ebuild 1596 BLAKE2B 2ddd3a91158728e12f427eb03737333ced9ba6d6f65ae8b71407168f168f102dab2a8d5f3a6fbf17e878fbf69cbf8d614d1e3ae62721a76601e11faa0081ec27 SHA512 655b254c31d256aa99bdb155133e1cceb183b8f18e78259a7cd41c59b2e10d19216b232107ba019bd78c15767eead770f172a9c59af974bdff970d816f3c087a
 MISC metadata.xml 243 BLAKE2B f6749558bd65896555f359d7b6f67fdb5a9656eecbb944c5074a450ec952b2c9d5285be4d078c3eba5622bf4084d535f3d0860b8812cc4ad6590f18e593134c1 SHA512 675d016d3802dc7f8d70f98c6f044f39b32ca7722c7e0aa1e1aa6aad4acf83da129cddce37d72a4c899e2dd202f2ba1eba7ea7137ad24354b2c927f310732bae
diff --git a/dev-cpp/clucene/clucene-2.3.3.4-r8.ebuild b/dev-cpp/clucene/clucene-2.3.3.4-r8.ebuild
new file mode 100644
index 000000000000..6c22b70622bf
--- /dev/null
+++ b/dev-cpp/clucene/clucene-2.3.3.4-r8.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN}"-core
+MY_P="${MY_PN}"-"${PV}"
+
+inherit cmake
+
+DESCRIPTION="High-performance, full-featured text search engine based off of lucene in C++"
+HOMEPAGE="http://clucene.sourceforge.net/"
+SRC_URI="mirror://sourceforge/clucene/${MY_P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+IUSE="debug doc static-libs"
+
+BDEPEND="
+	doc? ( >=app-doc/doxygen-1.4.2 )
+"
+
+RESTRICT="test"
+
+DOCS=(AUTHORS ChangeLog README README.PACKAGE REQUESTS)
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-clang.patch"
+	"${FILESDIR}/${P}-contrib.patch"
+	"${FILESDIR}/${P}-pkgconfig.patch"
+	"${FILESDIR}/${P}-gcc6.patch"
+	"${FILESDIR}/${P}-gmtime.patch"
+	"${FILESDIR}/${P}-musl-pthread.patch"
+	"${FILESDIR}/${P}-libcxx.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# patch out installing bundled boost headers, we build against system one
+	sed -i \
+		-e '/ADD_SUBDIRECTORY (src\/ext)/d' \
+		CMakeLists.txt || die
+	rm -rf src/ext || die
+}
+
+src_configure() {
+	# Disabled threads: see upstream bug
+	# https://sourceforge.net/p/clucene/bugs/197/
+	local mycmakeargs=(
+		-DENABLE_ASCII_MODE=OFF
+		-DENABLE_PACKAGING=OFF
+		-DDISABLE_MULTITHREADING=OFF
+		-DBUILD_CONTRIBS_LIB=ON
+		"-DLIB_DESTINATION=${EPREFIX}/usr/$(get_libdir)"
+		-DENABLE_DEBUG=$(usex debug)
+		-DENABLE_CLDOCS=$(usex doc)
+		-DBUILD_STATIC_LIBRARIES=$(usex static-libs)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/clucene/files/clucene-2.3.3.4-libcxx.patch b/dev-cpp/clucene/files/clucene-2.3.3.4-libcxx.patch
new file mode 100644
index 000000000000..268b887f6d86
--- /dev/null
+++ b/dev-cpp/clucene/files/clucene-2.3.3.4-libcxx.patch
@@ -0,0 +1,48 @@
+https://bugs.gentoo.org/862195
+https://cgit.freebsd.org/ports/tree/textproc/clucene/files/patch-src__core__CLucene__index__DocumentsWriter.cpp
+https://cgit.freebsd.org/ports/plain/textproc/clucene/files/patch-src__core__CLucene__util__VoidMap.h
+--- a/src/core/CLucene/index/DocumentsWriter.cpp
++++ b/src/core/CLucene/index/DocumentsWriter.cpp
+@@ -125,7 +125,7 @@
+   if (this->postingsFreeListDW.values){
+       if (this->postingsFreeCountDW < this->postingsFreeListDW.length) {
+           memset(this->postingsFreeListDW.values + this->postingsFreeCountDW
+-              , NULL
++              , 0
+               , sizeof(Posting*));
+       }
+       postingsFreeListDW.deleteUntilNULL();
+
+--- a/src/core/CLucene/util/VoidMap.h
++++ b/src/core/CLucene/util/VoidMap.h
+@@ -11,8 +11,13 @@
+ #include "CLucene/LuceneThreads.h"
+ 
+ #if defined(_CL_HAVE_TR1_UNORDERED_MAP) && defined(_CL_HAVE_TR1_UNORDERED_SET)
++#if defined(_LIBCPP_VERSION)
++	#include <unordered_map>
++	#include <unordered_set>
++#else
+ 	#include <tr1/unordered_map>
+ 	#include <tr1/unordered_set>
++#endif
+ #elif defined(_CL_HAVE_HASH_MAP) && defined(_CL_HAVE_HASH_SET)
+ 	//hashing is all or nothing!
+ 	#include <hash_map>
+@@ -83,7 +88,7 @@
+ 	_vt get( _kt k) const {
+ 		const_iterator itr = base::find(k);
+ 		if ( itr==base::end() )
+-			return (_vt)NULL;
++			return static_cast<_vt>(0);
+ 		else
+ 			return itr->second;
+ 	}
+@@ -316,6 +321,7 @@
+ 		if ( _this::dk || _this::dv )
+ 			_this::remove(k);
+ 
++		(*this)[k] = v;;
+ 	}
+ };
+