gentoo resync : 29.06.2021

5 files changed, 53 insertions, 12 deletions

diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index a3d3d10eb3bf..9738d31eb6e8 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/fldigi/Manifest b/media-radio/fldigi/Manifest
index 193de999262d..0af038f7c37d 100644
--- a/media-radio/fldigi/Manifest
+++ b/media-radio/fldigi/Manifest
@@ -1,4 +1,6 @@
 AUX fldigi-c++11.patch 1140 BLAKE2B 987d33126e80340d7687cc1e346a8cc8b5701c9f6a4259357c08c8ab828eb71d871e1bb70652f4d35a57243fbb0738db2c59717a822f178bf2c7afb960305c42 SHA512 a2399caf67947b129d32563d3deb0f209f0814e39ea48ea46f664bacf7b64a2639f9c237889004af45df6553ef5668ec9d5c389d3ea7a6fb9922f54654bcc9ee
 DIST fldigi-4.1.18.tar.gz 4847091 BLAKE2B 5b5ab773a78370b3c6ea86d63af7631bea97b16c3eacdb3d3b4e1b18dbbe70c727afa2ddf04c1ca7934f483503b2373d5d94bf4fcd896ad52a843c723a7c5cd2 SHA512 4d7fef4d464fcedf075d226bae7fd7134cd7436d737e17b7e21607e5120c957a909d1775900dbfea608c68629409c04eaa70a399bef6cba27b6e12b255696633
+DIST fldigi-4.1.19.tar.gz 4900636 BLAKE2B 1fa8689bc3c0a8fff24514bd306c70815039b8610673e1834f6c2b567ef0c6e9170750ef208efd58c62fc2f872865ae30e64651c57eaeb14abc96896d73d0417 SHA512 68eaeb4879e58f648827d129fad7ccb799062ad220429f29afc6c75fd50794393bf31e130ba03628e409a2703d52598d2a04dfba8780960d32b132306cc177b4
 EBUILD fldigi-4.1.18.ebuild 1294 BLAKE2B 42e009ceec8ed2f22ada43ad5b7d0c4480b2e5b00dcc56a97bc992015da5d73485a70e6e3463d8e0e49dc29d04171854f1d3b27d7d9ec83cf217b1dc395e4c96 SHA512 cf08da38690c49cc7336be5e83644061374d802fdbd6e533ace5e7c20eeb396ce5cc4c29c294b3542b880f67a6f1582760db372fdaf94f4037ff9d444b7ce1ee
+EBUILD fldigi-4.1.19.ebuild 1296 BLAKE2B 8bdafd397cf5c0180488f0c3a7c2245655b39774900c91e56a4be6b0dfcb7891c43a17e465fb685af5125cc6e4ca06a557b4efd9119ed039fee1e7843c186237 SHA512 df546d9fd3664c796e6fc9bffa921dbe7a7aaf145b9b3cfff1d42f2cd360ebd34991dc3b22378e838b58748eea6059dd0ee00f7a6ea83dfc37e819b16b19635a
 MISC metadata.xml 495 BLAKE2B 9c6f1b29ffb13a553b74ded93c11d29ffdc5a02336adb8fef55b862800a1856e712cdcb06c4e7d90858712d43aafce79f6cf9a357dc0a3c3ca0fc5cdb0ff770e SHA512 fdd9bc3f065ccb354ed0ad5c6544ca70f2011828870b942f2bf2f7001bf1342f858d60a6031cf005623795d1f1d2ccbc3a42fb54dcbd465c3c73f29a928d9091
diff --git a/media-radio/fldigi/fldigi-4.1.19.ebuild b/media-radio/fldigi/fldigi-4.1.19.ebuild
new file mode 100644
index 000000000000..179a9c3176ab
--- /dev/null
+++ b/media-radio/fldigi/fldigi-4.1.19.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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}-c++11.patch )
+
+src_configure() {
+	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/flrig/Manifest b/media-radio/flrig/Manifest
index e74f80f6cf63..edf221941977 100644
--- a/media-radio/flrig/Manifest
+++ b/media-radio/flrig/Manifest
@@ -1,4 +1,3 @@
-AUX fix-bashism.patch 547 BLAKE2B b04673f95b56dc9258b2953e90aabf81b2ef3d2b7bc7e3aee736dad07c96bbb962ddb37061713ddebf39f543bc1ad46c2667345660e07aed37576487e95d8dd8 SHA512 4e37cac97a340171fbe995fa17b63827e278ce1b46fdafbd82ed03c5967565e1e09348d43fec9801a500e3d3793dde3111fb4c3bd4b0541cb2a0696e78f645a9
 DIST flrig-1.3.54.tar.gz 891644 BLAKE2B 9bb87c9a0960a3975cf27c67b0850c3d6ad3ac4efd41c5f49857fe9e3c1ea22c2db7e7fabfdaa1aeacb82ee3d712313681c5a0bf08cf790a6f63813d6de9a4e1 SHA512 0f143a2ba5afe766219133d76c398b0a8b3d61cd8313d50a18585f2b1454e4aa5802b9a4995b40e0dc4de3b1e58850f76fa9a5342ebe06be20ea1ace5c187eba
 DIST flrig-1.4.0.tar.gz 885450 BLAKE2B 1ad18c07a4812168653969e7f00c8cf2a865caa7764fbbab755ceabf95e6ccabc133a1d1b607b9ee7db9be2d805e76850864f06de5e01762361aeec54bf3d681 SHA512 2d0ebbc51af784b423fe0bc658bacc99975660ea44e613922847d2acdc072c4b0e89eccd05adb88773364cd96a19e2daf3535aa5313690e999b047acbb472ec8
 EBUILD flrig-1.3.54.ebuild 494 BLAKE2B 18a4362c3b53317561478c01954baffbe8b446143cc28d699a8b07c407ccba3b588052d9fd153e024e9605dc310716fe18c882d5a227537bcbf1150d7c2bea99 SHA512 186692d333262ddcd7454760618d5e075464cf43b7769d38804a38419fe7dc120befa0c687cccb19e3a3fdf732338d3c17a04c5edc36b0c3b51a71af90875e18
diff --git a/media-radio/flrig/files/fix-bashism.patch b/media-radio/flrig/files/fix-bashism.patch
deleted file mode 100644
index 53dac6b27d6c..000000000000
--- a/media-radio/flrig/files/fix-bashism.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- m4/fltk.m4.orig	2014-12-13 13:46:29.000000000 +0100
-+++ m4/fltk.m4	2014-12-13 14:03:44.000000000 +0100
-@@ -38,7 +38,7 @@
-           FLTK_LIBS=`$FLTK_CONFIG --ldflags --use-images`
-           if test "x$target_mingw32" != "xyes"; then
-               if test "x$target_darwin" != "xyes"; then
--                  if grep -q "lX11" <<< "$FLTK_LIBS"; then
-+                  if echo "$FLTK_LIBS" | grep -q "lX11" ; then
-                       FLTK_LIBS="$FLTK_LIBS";
-                   else
-                       FLTK_LIBS="$FLTK_LIBS -lm -lX11";