gentoo auto-resync : 15:09:2022 - 23:13:44

4 files changed, 8 insertions, 63 deletions

diff --git a/media-radio/fldigi/Manifest b/media-radio/fldigi/Manifest
index ef85546da4f8..7460e40eeed3 100644
--- a/media-radio/fldigi/Manifest
+++ b/media-radio/fldigi/Manifest
@@ -1,8 +1,6 @@
 AUX fldigi-4.1.20-musl.patch 309 BLAKE2B 501ca7335497f0c8dcc4c6b40cab5ed437b084cdce42c4068d8a9ca5ef8a91e6d0a079f4e46ea9592836121075385b5103ed0e9bc6d405bd42d1263377be4386 SHA512 4a56a8bbc9eeeb94d31d3f27a870c68c8eca6646b46f68e71121939d3baa7fc1eb1a28aab637ba52794c0ac792da9684f7dbe4770d33ed6a66935a00dd3beb1b
-DIST fldigi-4.1.20.tar.gz 4906451 BLAKE2B ed12be269828a1c8a9b1eeab470981ca95d47a330a9eec098c6ce241e36a18bfaf5d36eecb480542aff128c7b7f6b06d85af1a37f30a9b721ed1712cf90a4df3 SHA512 97c4ae9d0721a3d264af55483e9e3e6dd22e33c879d60f7818489c2e8eb0f0615f8698c67c39fa066b05baccd75c06e1988d9f7ea3dc180158da77ed604a0d0f
 DIST fldigi-4.1.22.tar.gz 4934496 BLAKE2B 9db73c51acba4fe521c9acc90a7dcd5728aae8a0bf596c6d10831de2ba66bb1661bdff0be499585379db6951cc4312aae27491681b3325da41d36ae1dcae003a SHA512 e5b724afdd16b25d366ccfc549b4c39e7eed58c19fbf189d53bade0e27695d63124c5a1e02df7e256ce5ce145e85ba77e86da357faa6ccda8167c20698e70536
 DIST fldigi-4.1.23.tar.gz 4933875 BLAKE2B 73c9598d73e3f8f4a4299edebf687254830196d81470b4563bc530b0434e7b8beb6d9d0cbbd97029fba2da3491ec354f3fc723045e4691b60db7d03666624a07 SHA512 c01d579fb23325f097969cbb93bd488c8e0c61ef552097166c902a56ce119d7c20694df5cd76ae9b2cb485d68570720745d961b1f1dd9918c6f466f0441005fb
-EBUILD fldigi-4.1.20.ebuild 1422 BLAKE2B e984daeb48ee8fbc8a6800464f1ea9dc3e8e07ea32c9117e20e74db577016974f928507adb22007a366898b1505199f59f2b18eb336c7a8e67ebcd0de9622644 SHA512 ae8099035196e5ea38f64fb571b0e9005ee8514f14a367a817f93d87960e691c94f62ae593d876fbc01e290a6d72cad54a53d9b9e06ff5b50b1eec49217d8eb5
-EBUILD fldigi-4.1.22.ebuild 1422 BLAKE2B e984daeb48ee8fbc8a6800464f1ea9dc3e8e07ea32c9117e20e74db577016974f928507adb22007a366898b1505199f59f2b18eb336c7a8e67ebcd0de9622644 SHA512 ae8099035196e5ea38f64fb571b0e9005ee8514f14a367a817f93d87960e691c94f62ae593d876fbc01e290a6d72cad54a53d9b9e06ff5b50b1eec49217d8eb5
-EBUILD fldigi-4.1.23.ebuild 1424 BLAKE2B df5d4bc4463be1e317ee4513a23ab9f9b0d0320f7fe68fc535ed6e23f64ca480c10f4798bfa15f1c6acffd373d4d990c879370131daa442712882c9ff25563e8 SHA512 d4eb4a9addf1f74abbc2ba90a9341e8cf09f0a8a5f4cf208b388e7c7bfc1436d3ee3b69b8e79cb088a7f3bb766c663c815dcc52279bdcf50516ce458e1696021
+EBUILD fldigi-4.1.22.ebuild 1479 BLAKE2B f8731fe72892e1a31cfc9ff903024d429fd75dd7d839b6313b73aaa6eef5dd0b9ac21f419a4616efd5a6cd4b02596ed4f43cb7ec17f45fc49797211e64fce374 SHA512 d7e227faa7e2d347846d2d589d0d334d3d85dc2eab7851e243ae651fbbaa851ef02132f07d739eb8f432f3d5eeeefa77e2a98565b678e227e6aca2f395825d3e
+EBUILD fldigi-4.1.23.ebuild 1481 BLAKE2B 81d14bc8c4c66aa563b7c22ddac657f87d4cefeddbe4f749db6a9e2293a60c90ef3611f9c084f61aa2c11dfa52776e8bc3ea423285ebeb58058a09322c4ab9ca SHA512 ae661cbe620799e2c9326e784826334ea8adb645562e4141dab43504639f1085a172a7e894726e15f8a4ae9dc5917e33ddb3b2075c6de27f84648ab8e03b9db4
 MISC metadata.xml 548 BLAKE2B c527aea6c74ff1af56467b594775abdd47e6c57b0f1772013a38f941a5ca32eae9edebf2224c0f435a3f3ca6cbe076d1e33996f66d81e25504e2bd66e04cb9ad SHA512 200dba843700a8361c0f1367038a24c2d8d1389ad6bb36a609543272b44ae672118ab9c74ab7a63036b2bb130a1a288487a204b187e1780dc2bef132e6a1511d
diff --git a/media-radio/fldigi/fldigi-4.1.20.ebuild b/media-radio/fldigi/fldigi-4.1.20.ebuild
deleted file mode 100644
index 792f85ce34c9..000000000000
--- a/media-radio/fldigi/fldigi-4.1.20.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-
-DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
-HOMEPAGE="http://www.w1hkj.com"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="hamlib nls pulseaudio"
-IUSE_CPU_FLAGS=" sse sse2 sse3"
-IUSE+=" ${IUSE_CPU_FLAGS// / cpu_flags_x86_}"
-
-RDEPEND="x11-libs/fltk:1[threads,xft]
-	media-libs/libsamplerate
-	media-libs/libpng:0
-	x11-misc/xdg-utils
-	dev-perl/RPC-XML
-	dev-perl/Term-ReadLine-Perl
-	|| (
-		media-libs/portaudio[oss]
-		media-libs/portaudio[alsa]
-	)
-	hamlib? ( media-libs/hamlib:= )
-	pulseaudio? ( media-sound/pulseaudio )
-	>=media-libs/libsndfile-1.0.10"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-PATCHES=( "${FILESDIR}/${PN}-4.1.20-musl.patch" )
-
-src_prepare() {
-	eapply ${PATCHES[@]}
-	eapply_user
-}
-
-src_configure() {
-	append-cxxflags $(test-flags-CXX -std=c++14)
-	local myconf=""
-
-	use cpu_flags_x86_sse && myconf="${myconf} --enable-optimizations=sse"
-	use cpu_flags_x86_sse2 && myconf="${myconf} --enable-optimizations=sse2"
-	use cpu_flags_x86_sse3 && myconf="${myconf} --enable-optimizations=sse3"
-
-	econf ${myconf} \
-		--with-sndfile \
-		$(use_with hamlib) \
-		$(use_enable nls) \
-		$(use_with pulseaudio) \
-		--without-asciidoc
-}
diff --git a/media-radio/fldigi/fldigi-4.1.22.ebuild b/media-radio/fldigi/fldigi-4.1.22.ebuild
index 792f85ce34c9..b6268dae8b30 100644
--- a/media-radio/fldigi/fldigi-4.1.22.ebuild
+++ b/media-radio/fldigi/fldigi-4.1.22.ebuild
@@ -43,6 +43,9 @@ src_prepare() {
 }
 
 src_configure() {
+	#fails to compile with -flto (bug #860405)
+	filter-lto
+
 	append-cxxflags $(test-flags-CXX -std=c++14)
 	local myconf=""
 
diff --git a/media-radio/fldigi/fldigi-4.1.23.ebuild b/media-radio/fldigi/fldigi-4.1.23.ebuild
index aa6226f74f7f..78512dcf4f0c 100644
--- a/media-radio/fldigi/fldigi-4.1.23.ebuild
+++ b/media-radio/fldigi/fldigi-4.1.23.ebuild
@@ -43,6 +43,9 @@ src_prepare() {
 }
 
 src_configure() {
+	#fails to compile with -flto (bug #860405)
+	filter-lto
+
 	append-cxxflags $(test-flags-CXX -std=c++14)
 	local myconf=""