gentoo resync : 29.12.2022

4 files changed, 42 insertions, 63 deletions

diff --git a/dev-cpp/muParser/Manifest b/dev-cpp/muParser/Manifest
index e3a6eb59e273..3f119af0a46b 100644
--- a/dev-cpp/muParser/Manifest
+++ b/dev-cpp/muParser/Manifest
@@ -1,7 +1,6 @@
-AUX muParser-1.32-parallel-build.patch 680 BLAKE2B 7699b129186f0173bfbc7f742d51175ed67eddb9898b61f7d6a3a462e1a262112a2d4af445e12501caa88d4630308bb5f273ef2a704e2948db9cdb7649ee6bb7 SHA512 a39af330803786ebb86259dd86ecfac00ca04978b0e623b418d887f6b20a6eb6cee2b37da8164aa7038b3accf388b40b6a6d4eccd2f20afdfd6051cc3505ac90
 AUX muParser-2.3-export-cmake.patch 13652 BLAKE2B a83680f1214a6941a89f28fbdf0789fd665ca002d4259ffb802cc32c37f83a48f45b601c52640a9e0bcb39b4e4869317ccb71898b557f9b19caaf5b3ee11ecec SHA512 a126199cb71e8160f78bd3872fe252ce7cc77f99185af8922750bee85b0a60a2657a688913a9df897d15c76bd0446d16371cf792f334b96e101e07d84856bb6b
-DIST muParser-2.2.6.1.tar.gz 755653 BLAKE2B b3b6b8da57c0e8a0bda74038689d444ba8da00d6cce80030d8b35693209f0293874e4822c4941974be21fd4b7c09ba7df2c9cef861bc10b890aae4f641040faf SHA512 01bfc8cc48158c8413ae5e1da2ddbac1c9f0b9075470b1ab75853587d641dd195ebea268e1060a340098fd8015bc5f77d8e9cde5f81cffeade2f157c5f295496
 DIST muParser-2.3.2.tar.gz 103979 BLAKE2B f892b4d440a1b7326be27aa0a2b703ccafc02de5e881ef4780e8907688cf7905284f3e5f5855ad2596683f1dad309d287ebae527d917ebf5e0dad045551df7de SHA512 8ef5c8b3834da3995a782b7364a4eb4197fb706bee4cadabe5511d2a9cf2912c3db6de422a91eff7f9690f8c9c355b9900335e940749d5c243cb732ac1992aef
-EBUILD muParser-2.2.6.1.ebuild 888 BLAKE2B ecc692c05dbdc3b35de7226b36d390b1694b3a9fcaff3f407a21d85a9f4c4fc769b3d67691af783cf452bea7c6709526240311f98247ac8c3010816d9d93a53a SHA512 1e30e1c3d9f5a9eb60f726436cdff5231f36067270160b7df8abf66d15dda81db77c4b1218d0765966b0fae543dfc76dfa943b1ddcf5d84d730b853baf335d27
+DIST muParser-2.3.3.tar.gz 112100 BLAKE2B 79a0a29781596f114aeea9756a5a2141eed19857c08d0a32093353eb049f8b179af577cbd07747d2b8093e448714397b47f36c68e54bbce22386f5ec06365bda SHA512 f7e01c83f6ffe71e240653c47fdb8f3152d7fdf61b5997a3c717dec50d0175065c4fc4241ec95fb35b60b968c5c965a820009163ebe84f0fa57d64b3a23226b4
 EBUILD muParser-2.3.2-r1.ebuild 760 BLAKE2B d4ef7432bf604bf572d0288def30e751e1e2e1cd805eae9e11661a7d4bd944b21f7feecca2f52210cc55e9816df971e97a7827f85e1bdba01979b8a1ade5700d SHA512 8b1f3729601ce7c4b1b0c9dac06d89ecbe8f81792190b5cf3bab1ea15e398c3e5317738a5d292a59dcafc43f6782f2d78f348143bb09eb1c75ef38ac32c246ab
+EBUILD muParser-2.3.3.ebuild 805 BLAKE2B 96e4e669cecdc344e4d31a05c37e5030495233568b1c135bdafe9815757c055c4483fa21267046cb3a21d82f268a42f91e8e99c0f514e5082bd38d09f11c5d60 SHA512 096f4854dbd88dcf3b78fd04e555df9d26a53588f1f31060b38e9ea40d9bf4421b577f96e53ad37f4d936940e1b9a1b2293384853a27777986ad682402d5f2b2
 MISC metadata.xml 625 BLAKE2B 319444cf45ae4e0e7ad24cc11590e5141a5a7b05404fcb9b95373e548e4ca0b23dda45057317a68051006805c77d031cdd4ff55b6b4c827e1cdf36ac9b0df3b7 SHA512 029296e964eecf47ba83943e51bb14dc251d55de449a0d6c3f0396f5b3e8fcd19c02074f46ad5d71dd03f46c61029d6300569d3b9bfaa106464515adecf0b1ee
diff --git a/dev-cpp/muParser/files/muParser-1.32-parallel-build.patch b/dev-cpp/muParser/files/muParser-1.32-parallel-build.patch
deleted file mode 100644
index 1681c6e68034..000000000000
--- a/dev-cpp/muParser/files/muParser-1.32-parallel-build.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fixing parallel build issue
-
-http://bugs.gentoo.org/show_bug.cgi?id=310037
-
---- muparser_v132/Makefile.in
-+++ muparser_v132/Makefile.in
-@@ -291,7 +291,7 @@
- @COND_SHARED_1@	rm -f $(DESTDIR)$(prefix)/$$f; \
- @COND_SHARED_1@	done
- 
--@COND_SAMPLES_1@$(top_builddir)/samples/example1/example1$(EXEEXT): $(EXAMPLE1_OBJECTS) $(__muParser_lib___depname)
-+@COND_SAMPLES_1@$(top_builddir)/samples/example1/example1$(EXEEXT): $(EXAMPLE1_OBJECTS) $(__muParser_lib___depname) lib
- @COND_SAMPLES_1@	$(CXX) -o $@ $(EXAMPLE1_OBJECTS) -L$(top_builddir)/lib   -L$(srcdir)/lib $(LDFLAGS)  -lmuparser$(DEBUG_BUILD_POSTFIX) $(LIBS)
- @COND_SAMPLES_1@	
- @COND_SAMPLES_1@	$(__example1___mac_setfilecmd)
diff --git a/dev-cpp/muParser/muParser-2.2.6.1.ebuild b/dev-cpp/muParser/muParser-2.2.6.1.ebuild
deleted file mode 100644
index d8bd2f678d9a..000000000000
--- a/dev-cpp/muParser/muParser-2.2.6.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Library for parsing mathematical expressions"
-HOMEPAGE="https://beltoforion.de/en/muparser/"
-SRC_URI="https://github.com/beltoforion/muparser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/muparser-${PV}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.32-parallel-build.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's:-O2::g' \
-		configure || die
-}
-
-src_configure() {
-	econf $(use_enable test samples)
-}
-
-src_test() {
-	cat > test.sh <<- EOFTEST
-	LD_LIBRARY_PATH="${S}/lib" samples/example1/example1 <<- EOF
-	quit
-	EOF
-	EOFTEST
-	sh ./test.sh || die "test failed"
-}
-
-src_install() {
-	default
-	dodoc Changes.txt
-}
diff --git a/dev-cpp/muParser/muParser-2.3.3.ebuild b/dev-cpp/muParser/muParser-2.3.3.ebuild
new file mode 100644
index 000000000000..54b7acfabeb2
--- /dev/null
+++ b/dev-cpp/muParser/muParser-2.3.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+# The upstream tag is v2.3.3-1 instead of v2.3.3
+suffix="-1"
+
+DESCRIPTION="Library for parsing mathematical expressions"
+HOMEPAGE="https://beltoforion.de/en/muparser/"
+SRC_URI="https://github.com/beltoforion/muparser/archive/refs/tags/v${PV}${suffix}.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"
+RESTRICT="!test? ( test )"
+
+S="${S}${suffix}"
+
+PATCHES=(
+)
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_OPENMP=$(usex openmp)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_src_compile test
+}
+
+src_install() {
+	cmake_src_install
+}