[gentoo-commits] proj/kde:master commit in: app-office/libalkimia/

["Sam James" <sam@gentoo.org>]

commit:     2b641d2a1cdd886f628067eee31c06672227fd16
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Fri Mar  1 23:42:17 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar  1 23:42:38 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2b641d2a

app-office/libalkimia: remove gmp USE flag, force it instead of mpir

mpir is an ancient fork of gmp from 2017. It claims to be focused on
speed. It doesn't build with modern compilers due to Modern C issues,
and it fails to build with LTO as well. Unlike gmp, this will never be
fixed.

Bug: https://bugs.gentoo.org/812950
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-office/libalkimia/libalkimia-8.9999.ebuild | 7 +++----
 app-office/libalkimia/libalkimia-9999.ebuild   | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app-office/libalkimia/libalkimia-8.9999.ebuild b/app-office/libalkimia/libalkimia-8.9999.ebuild
index 6b645c6c38..78c3eff6f6 100644
--- a/app-office/libalkimia/libalkimia-8.9999.ebuild
+++ b/app-office/libalkimia/libalkimia-8.9999.ebuild
@@ -21,9 +21,10 @@ https://community.kde.org/Alkimia"
 
 LICENSE="LGPL-2.1"
 SLOT="0/8"
-IUSE="doc gmp plasma webengine"
+IUSE="doc plasma webengine"
 
 DEPEND="
+	dev-libs/gmp:0=[cxx(+)]
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -40,8 +41,6 @@ DEPEND="
 	>=kde-frameworks/ktextwidgets-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	!gmp? ( sci-libs/mpir:=[cxx] )
-	gmp? ( dev-libs/gmp:0=[cxx(+)] )
 	plasma? (
 		>=kde-frameworks/kpackage-${KFMIN}:5
 		>=kde-plasma/libplasma-${KFMIN}:5
@@ -62,7 +61,7 @@ src_configure() {
 		-DBUILD_TOOLS=ON
 		-DBUILD_WITH_WEBKIT=OFF
 		$(cmake_use_find_package doc Doxygen)
-		$(cmake_use_find_package !gmp MPIR)
+		-DCMAKE_DISABLE_FIND_PACKAGE_MPIR=ON
 		-DBUILD_APPLETS=$(usex plasma)
 		-DBUILD_WITH_WEBENGINE=$(usex webengine)
 	)

diff --git a/app-office/libalkimia/libalkimia-9999.ebuild b/app-office/libalkimia/libalkimia-9999.ebuild
index 7892456059..22f13e44d1 100644
--- a/app-office/libalkimia/libalkimia-9999.ebuild
+++ b/app-office/libalkimia/libalkimia-9999.ebuild
@@ -20,9 +20,10 @@ https://community.kde.org/Alkimia"
 
 LICENSE="LGPL-2.1"
 SLOT="0/8"
-IUSE="doc gmp plasma webengine"
+IUSE="doc plasma webengine"
 
 DEPEND="
+	dev-libs/gmp:0=[cxx(+)]
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -39,8 +40,6 @@ DEPEND="
 	>=kde-frameworks/ktextwidgets-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	!gmp? ( sci-libs/mpir:=[cxx] )
-	gmp? ( dev-libs/gmp:0=[cxx(+)] )
 	plasma? (
 		>=kde-frameworks/kpackage-${KFMIN}:5
 		>=kde-plasma/libplasma-${KFMIN}:5
@@ -61,7 +60,7 @@ src_configure() {
 		-DBUILD_TOOLS=ON
 		-DBUILD_WITH_WEBKIT=OFF
 		$(cmake_use_find_package doc Doxygen)
-		$(cmake_use_find_package !gmp MPIR)
+		-DCMAKE_DISABLE_FIND_PACKAGE_MPIR=ON
 		-DBUILD_APPLETS=$(usex plasma)
 		-DBUILD_WITH_WEBENGINE=$(usex webengine)
 	)