Adding metadata

6 files changed, 19 insertions, 81 deletions

diff --git a/dev-cpp/muParser/Manifest b/dev-cpp/muParser/Manifest
index 71a9a28a4c96..0a5facbe3090 100644
--- a/dev-cpp/muParser/Manifest
+++ b/dev-cpp/muParser/Manifest
@@ -1,3 +1,2 @@
-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/metadata.xml b/dev-cpp/muParser/metadata.xml
index 9aacdcacdfcf..21c8260ba7e0 100644
--- a/dev-cpp/muParser/metadata.xml
+++ b/dev-cpp/muParser/metadata.xml
@@ -11,8 +11,5 @@
 		precalculating constant parts of it.
 	</longdescription>
  
- <use>
-  <flag name="wchar">Add support for wide character (wchar_t)</flag>
- </use>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-cpp/muParser/muParser-2.3.2-r1.ebuild b/dev-cpp/muParser/muParser-2.3.2-r1.ebuild
deleted file mode 100644
index 9023bc7bc987..000000000000
--- a/dev-cpp/muParser/muParser-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 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/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 openmp test"
-RESTRICT="!test? ( test )"
-
-PATCHES=( "${FILESDIR}/muParser-2.3-export-cmake.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_OPENMP=$(usex openmp)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_src_compile test
-}
-
-src_install() {
-	cmake_src_install
-	dodoc Changes.txt
-}
diff --git a/dev-cpp/muParser/muParser-2.3.3.ebuild b/dev-cpp/muParser/muParser-2.3.3-r2.ebuild
index fc2e66b58f60..cc9e5ae7de10 100644
--- a/dev-cpp/muParser/muParser-2.3.3.ebuild
+++ b/dev-cpp/muParser/muParser-2.3.3-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 # The upstream tag is v2.3.3-1 instead of v2.3.3
 suffix="-1"
@@ -21,6 +21,14 @@ RESTRICT="!test? ( test )"
 
 S="${S}${suffix}"
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_OPENMP=$(usex openmp)
@@ -31,7 +39,3 @@ src_configure() {
 src_test() {
 	cmake_src_compile test
 }
-
-src_install() {
-	cmake_src_install
-}
diff --git a/dev-cpp/muParser/muParser-2.3.3-r1.ebuild b/dev-cpp/muParser/muParser-2.3.4-r1.ebuild
index 669ac8313f52..896a68e294bb 100644
--- a/dev-cpp/muParser/muParser-2.3.3-r1.ebuild
+++ b/dev-cpp/muParser/muParser-2.3.4-r1.ebuild
@@ -3,28 +3,30 @@
 
 EAPI=8
 
-inherit cmake
-
-# The upstream tag is v2.3.3-1 instead of v2.3.3
-suffix="-1"
+inherit cmake toolchain-funcs
 
 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"
+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"
+IUSE="doc openmp test"
 RESTRICT="!test? ( test )"
 
-S="${S}${suffix}"
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
 
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_WIDE_CHAR=$(usex wchar)
 	)
 	cmake_src_configure
 }
diff --git a/dev-cpp/muParser/muParser-2.3.4.ebuild b/dev-cpp/muParser/muParser-2.3.4.ebuild
deleted file mode 100644
index d085086ce7f7..000000000000
--- a/dev-cpp/muParser/muParser-2.3.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 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 )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_WIDE_CHAR=$(usex wchar)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_src_compile test
-}