From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1605552-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 47C6F158041
	for <garchives@archives.gentoo.org>; Fri,  1 Mar 2024 00:48:45 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 46242E2A36;
	Fri,  1 Mar 2024 00:48:44 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 2949AE2A36
	for <gentoo-commits@lists.gentoo.org>; Fri,  1 Mar 2024 00:48:44 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 5B9BF3430B3
	for <gentoo-commits@lists.gentoo.org>; Fri,  1 Mar 2024 00:48:43 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id BCD6D118C
	for <gentoo-commits@lists.gentoo.org>; Fri,  1 Mar 2024 00:48:41 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1709254109.e6988357743d4db2556673e90357017d2e230206.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/gnuradio/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-wireless/gnuradio/gnuradio-3.10.9.2-r1.ebuild net-wireless/gnuradio/gnuradio-3.10.9.2-r2.ebuild net-wireless/gnuradio/gnuradio-9999.ebuild
X-VCS-Directories: net-wireless/gnuradio/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: e6988357743d4db2556673e90357017d2e230206
X-VCS-Branch: master
Date: Fri,  1 Mar 2024 00:48:41 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: ec9b3cc2-9922-464d-a374-2d7007b89ac5
X-Archives-Hash: d082aa13a7d0c4ff279cb74afff8bc59

commit:     e6988357743d4db2556673e90357017d2e230206
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Fri Mar  1 00:41:27 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar  1 00:48:29 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6988357

net-wireless/gnuradio: remove erroneous dependency on 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.

gnuradio checks for "MPLIB", which is internally implemented by first
checking for gmp, and if gmp cannot be found, checking for mpir.

mpir was never required, and if gmp happened to be installed, it would
be an automagic dependency.

Furthermore, there was a USE-conditional dependency on gmp for wavelets,
which I am not sure makes sense but when triggered, resulted in a forced
gmp dependency that then guaranteed mpir wouldn't be used.

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

 .../{gnuradio-3.10.9.2-r1.ebuild => gnuradio-3.10.9.2-r2.ebuild}       | 3 +--
 net-wireless/gnuradio/gnuradio-9999.ebuild                             | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/net-wireless/gnuradio/gnuradio-3.10.9.2-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.10.9.2-r2.ebuild
similarity index 99%
rename from net-wireless/gnuradio/gnuradio-3.10.9.2-r1.ebuild
rename to net-wireless/gnuradio/gnuradio-3.10.9.2-r2.ebuild
index bbbc55d8c42e..407afc6b82ff 100644
--- a/net-wireless/gnuradio/gnuradio-3.10.9.2-r1.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.10.9.2-r2.ebuild
@@ -45,12 +45,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 
 RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep 'dev-libs/boost:=[python,${PYTHON_USEDEP}]')
+	dev-libs/gmp:=
 	dev-libs/log4cpp:=
 	$(python_gen_cond_dep 'dev-python/jsonschema[${PYTHON_USEDEP}]')
 	dev-libs/spdlog:=
 	dev-libs/libfmt:=
 	sci-libs/fftw:3.0=
-	sci-libs/mpir:=
 	sci-libs/volk:=
 	media-libs/libsndfile
 	sys-libs/libunwind
@@ -108,7 +108,6 @@ RDEPEND="${PYTHON_DEPS}
 	)
 	wavelet? (
 		sci-libs/gsl:=
-		dev-libs/gmp:=
 		sci-libs/lapack
 	)
 	zeromq? ( >=net-libs/zeromq-2.1.11:= )

diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 6270b80fb9f0..04191082fbfe 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -45,12 +45,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 
 RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep 'dev-libs/boost:=[python,${PYTHON_USEDEP}]')
+	dev-libs/gmp:=
 	dev-libs/log4cpp:=
 	$(python_gen_cond_dep 'dev-python/jsonschema[${PYTHON_USEDEP}]')
 	dev-libs/spdlog:=
 	dev-libs/libfmt:=
 	sci-libs/fftw:3.0=
-	sci-libs/mpir:=
 	sci-libs/volk:=
 	media-libs/libsndfile
 	sys-libs/libunwind
@@ -108,7 +108,6 @@ RDEPEND="${PYTHON_DEPS}
 	)
 	wavelet? (
 		sci-libs/gsl:=
-		dev-libs/gmp:=
 		sci-libs/lapack
 	)
 	zeromq? ( >=net-libs/zeromq-2.1.11:= )