6 files changed, 37 insertions, 121 deletions
diff --git a/dev-cpp/clucene/clucene-2.3.3.4-r7.ebuild b/dev-cpp/clucene/clucene-2.3.3.4-r7.ebuild
deleted file mode 100644
index f91d27d74715..000000000000
--- a/dev-cpp/clucene/clucene-2.3.3.4-r7.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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="https://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}"/clucene-2.3.3.4-fix-clang.patch
-	"${FILESDIR}/${P}-contrib.patch"
-	"${FILESDIR}/${P}-pkgconfig.patch"
-	"${FILESDIR}/${P}-gcc6.patch"
-	"${FILESDIR}/${P}-gmtime.patch"
-	"${FILESDIR}/${P}-musl-pthread.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/muParser/Manifest b/dev-cpp/muParser/Manifest
index 2a400643c4b5..71a9a28a4c96 100644
--- a/dev-cpp/muParser/Manifest
+++ b/dev-cpp/muParser/Manifest
@@ -1,2 +1,3 @@
 DIST muParser-2.3.2.tar.gz 103979 BLAKE2B f892b4d440a1b7326be27aa0a2b703ccafc02de5e881ef4780e8907688cf7905284f3e5f5855ad2596683f1dad309d287ebae527d917ebf5e0dad045551df7de SHA512 8ef5c8b3834da3995a782b7364a4eb4197fb706bee4cadabe5511d2a9cf2912c3db6de422a91eff7f9690f8c9c355b9900335e940749d5c243cb732ac1992aef
 DIST muParser-2.3.3.tar.gz 112100 BLAKE2B 79a0a29781596f114aeea9756a5a2141eed19857c08d0a32093353eb049f8b179af577cbd07747d2b8093e448714397b47f36c68e54bbce22386f5ec06365bda SHA512 f7e01c83f6ffe71e240653c47fdb8f3152d7fdf61b5997a3c717dec50d0175065c4fc4241ec95fb35b60b968c5c965a820009163ebe84f0fa57d64b3a23226b4
+DIST muParser-2.3.4.tar.gz 112693 BLAKE2B 860c24d45140ad4339efcd5f5c221454c051565a1362907fd01499cfda0ef3c304333507c4d9c43644dac63e5fb4963fef6e3a2e565febf1a80807e0a0242c87 SHA512 5226fd666eaf3ff7e661bbf72e60114d0ceed10491ffa4ed2dd34cd669c6c21c037eff0388402d6b9d60b0a5a27b03ca35153e0c048328abc75dfd1eaf38ceca
diff --git a/dev-cpp/muParser/muParser-2.3.4.ebuild b/dev-cpp/muParser/muParser-2.3.4.ebuild
new file mode 100644
index 000000000000..4dd7dfcdf406
--- /dev/null
+++ b/dev-cpp/muParser/muParser-2.3.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Library for parsing mathematical expressions"
+HOMEPAGE="https://beltoforion.de/en/muparser/"
+SRC_URI="https://github.com/beltoforion/muparser/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/muparser-${PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc openmp test wchar"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+)
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_WIDE_CHAR=$(usex wchar)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_src_compile test
+}
+
+src_install() {
+	cmake_src_install
+}
diff --git a/dev-cpp/pstreams/Manifest b/dev-cpp/pstreams/Manifest
deleted file mode 100644
index f5e3e547d8d6..000000000000
--- a/dev-cpp/pstreams/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST pstreams-1.0.1.tar.gz 66188 BLAKE2B 937b9ae833dcace9f0f44dbac6907d5c73c5757f604ea96835c0ddf0ec9abd5fa4f40a1c01872a47fd0bcdc094f90215da6b7f80f261172f93f7b5233b60a5cb SHA512 279f758a4aeba124227e3de07e202f6cd838bfca4f34829a446f2f20cf426bd404f28960b881f810b5f2038e3946d38174ca09e6a07d5dacc0501f41746245e6
-DIST pstreams-docs-1.0.1.tar.gz 178382 BLAKE2B dd44e4c6acd83dfc6896145e77408d7c23150c1156e477ccb4052341e041d82163d0ee3e8069ea5fda9033617c3a1162fc2068835d089f6ce7614477c2e3e58b SHA512 e645cb3d1c20cc0c717d03aa24e500489452d0880af0feddcf234e713878159b22a891ec04a66f0aad6988e71418a224a4ba66064e6a83578ecf957d9af167e2
diff --git a/dev-cpp/pstreams/metadata.xml b/dev-cpp/pstreams/metadata.xml
deleted file mode 100644
index 0e1c6fd2d664..000000000000
--- a/dev-cpp/pstreams/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>printing@gentoo.org</email>
-  <name>Gentoo Printing Project</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-cpp/pstreams/pstreams-1.0.1.ebuild b/dev-cpp/pstreams/pstreams-1.0.1.ebuild
deleted file mode 100644
index 9f2d12528d54..000000000000
--- a/dev-cpp/pstreams/pstreams-1.0.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="C++ wrapper for the POSIX.2 functions popen(3) and pclose(3)"
-HOMEPAGE="http://pstreams.sourceforge.net/"
-SRC_URI="
-	mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? ( mirror://sourceforge/${PN}/${PN}-docs-${PV}.tar.gz )"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="doc"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-src_compile() {
-	if use doc; then
-		doxygen -u || die
-		emake docs
-	fi
-}
-
-src_test() {
-	emake \
-		CXX="$(tc-getCXX)" \
-		CXXFLAGS="${CXXFLAGS}" \
-		check
-}
-
-src_install() {
-	doheader pstream.h
-
-	dodoc AUTHORS ChangeLog README
-
-	if use doc ; then
-		docinto html
-		dodoc -r "${WORKDIR}"/${PN}-docs-${PV}/*
-	fi
-}