From f191cdee2c217ad2a0af7f37459c438614650472 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Sun, 22 Jan 2023 20:06:16 -0600 Subject: dev-cpp/muParser: Remove USE=wchar Unfortunately, this innocent looking USE flag incurs a silent ABI change that let's all its reverse dependencies fail. A number of the reverse dependencies of muParser already set muParser[-wchar] explicitly and the rest is probably also not compiling. Thus, remove the use flag. If someone wants to have wchar_t support in muParser then a proper solution would be to slot the package and install both ABI variants simultaneously. Closes: https://bugs.gentoo.org/880133 Signed-off-by: Matthias Maier --- dev-cpp/muParser/metadata.xml | 3 --- dev-cpp/muParser/muParser-2.3.3-r1.ebuild | 34 ------------------------------- dev-cpp/muParser/muParser-2.3.3-r2.ebuild | 33 ++++++++++++++++++++++++++++++ dev-cpp/muParser/muParser-2.3.4-r1.ebuild | 28 +++++++++++++++++++++++++ dev-cpp/muParser/muParser-2.3.4.ebuild | 29 -------------------------- 5 files changed, 61 insertions(+), 66 deletions(-) delete mode 100644 dev-cpp/muParser/muParser-2.3.3-r1.ebuild create mode 100644 dev-cpp/muParser/muParser-2.3.3-r2.ebuild create mode 100644 dev-cpp/muParser/muParser-2.3.4-r1.ebuild delete mode 100644 dev-cpp/muParser/muParser-2.3.4.ebuild (limited to 'dev-cpp/muParser') diff --git a/dev-cpp/muParser/metadata.xml b/dev-cpp/muParser/metadata.xml index 05a26448f3c7..c81547b2e58d 100644 --- a/dev-cpp/muParser/metadata.xml +++ b/dev-cpp/muParser/metadata.xml @@ -14,7 +14,4 @@ muparser beltoforion/muparser - - Add support for wide character (wchar_t) - diff --git a/dev-cpp/muParser/muParser-2.3.3-r1.ebuild b/dev-cpp/muParser/muParser-2.3.3-r1.ebuild deleted file mode 100644 index 669ac8313f52..000000000000 --- a/dev-cpp/muParser/muParser-2.3.3-r1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2023 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 wchar" -RESTRICT="!test? ( test )" - -S="${S}${suffix}" - -src_configure() { - local mycmakeargs=( - -DENABLE_OPENMP=$(usex openmp) - -DENABLE_WIDE_CHAR=$(usex wchar) - ) - cmake_src_configure -} - -src_test() { - cmake_src_compile test -} diff --git a/dev-cpp/muParser/muParser-2.3.3-r2.ebuild b/dev-cpp/muParser/muParser-2.3.3-r2.ebuild new file mode 100644 index 000000000000..cab8c4f6caf3 --- /dev/null +++ b/dev-cpp/muParser/muParser-2.3.3-r2.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2023 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}" + +src_configure() { + local mycmakeargs=( + -DENABLE_OPENMP=$(usex openmp) + ) + cmake_src_configure +} + +src_test() { + cmake_src_compile test +} diff --git a/dev-cpp/muParser/muParser-2.3.4-r1.ebuild b/dev-cpp/muParser/muParser-2.3.4-r1.ebuild new file mode 100644 index 000000000000..363cf05aaf0d --- /dev/null +++ b/dev-cpp/muParser/muParser-2.3.4-r1.ebuild @@ -0,0 +1,28 @@ +# 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" +RESTRICT="!test? ( test )" + +src_configure() { + local mycmakeargs=( + -DENABLE_OPENMP=$(usex openmp) + ) + cmake_src_configure +} + +src_test() { + cmake_src_compile test +} 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 -} -- cgit v1.2.3-65-gdbad