gentoo resync : 20.06.2021

9 files changed, 24 insertions, 40 deletions

diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index 2191d2ab69a3..8a5e87a0f241 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/flmsg/Manifest b/media-radio/flmsg/Manifest
index 93c1027e0213..029bab2e4a99 100644
--- a/media-radio/flmsg/Manifest
+++ b/media-radio/flmsg/Manifest
@@ -1,7 +1,5 @@
-DIST flmsg-4.0.14.tar.gz 874399 BLAKE2B 8daa939a1ddc52d0469ba23908a51ac3e873c93daeadea6d1b6fcd7136850db63719eb0409001a6de6c49cd71ed1be3392e17d7a128a58784185b2b8c6bb6d3c SHA512 367c881007a393c3aa6d9f4bc760717caed1681bd4479b8d7b54246c90bdaf023d60cbde92c538059fcf275ea09bbc47e49052dab3608c5e7d43830f9e573a85
+DIST flmsg-4.0.17-patches.tbz2 36036 BLAKE2B ff8bc30b1aca1694af6d736be8428d7f1e7efb848a574050daa2da1db257a23ed29fb0f696e84b23df81410c5b6130d67a3081f18580c6a936cf055040ed9841 SHA512 42fe8c595d0b12d16dde36a6d865136a7bfa59a02cc2d9dd229000752eb401778e85b39d2acb936a3c26c4ef6555367d9f975f2770511040eb892087e704c71b
 DIST flmsg-4.0.17.tar.gz 876560 BLAKE2B 553a8b71c490abdff99e2b3dbd51ba14cf6f97bbe8aed289c7efcfcdd84abfb9039a75639a377a6ff558566e8226be00643988bbc731c111fa52733810d284f5 SHA512 94abe4927c5bc8a5358d592cef55fbaba6207250798d45f8096ff1f290926a280b53db99ddf1c72a6ff30cbc58d95f639777e0d30a15b70ba8d3209664e22966
-DIST flmsg-4.0.3.tar.gz 898185 BLAKE2B 7a1b80a07b2eaa4d094ff956102bb659cffc9ad88e3a2daf5650805c9995a54383d1f296b1b0dbaca341e8087eacccf71943a3745b1bb75c8fd2a5f4d8cee227 SHA512 afc4e8ab40d05e6cdc6ecd86b1b3348be46a8251dbd88635316fbbf4592f9959022d0f757b9283849676fa6a4467d035568302e785017b55bafdcd99f2a2d326
-EBUILD flmsg-4.0.14.ebuild 456 BLAKE2B 8159729a363ef0715bf884c7f7a236aa6249e78a20b63f6b47a9afcea4e3585e8d68fbc5ea3f537e6aac5414be478095780dea955fe1509b32370bde3d3de316 SHA512 40d07dbd48554a367bfcee10e7c2735161640ca74a64f5f28a69a2ab9d7a4bd432b8003e428f71a975558358647563eb00ad57daca3b79140f6a9843ffbf6598
+EBUILD flmsg-4.0.17-r1.ebuild 701 BLAKE2B 30fddc542169138b25cfb96f323923173eb5a546f4e825c0f9cca28a4765dd6a26b3889f278771f8472e320cbe3177023b019d61d09fe501613990e8b7fddf40 SHA512 29e2ff3343ad348451a854442edddea1ca02b1bc4889e5b9ac6ebaf4c56fe460d8e65240dbae38c30ebae92b8fb66267cdad49e19d53524d3d42320ac4d08a6d
 EBUILD flmsg-4.0.17.ebuild 456 BLAKE2B 8159729a363ef0715bf884c7f7a236aa6249e78a20b63f6b47a9afcea4e3585e8d68fbc5ea3f537e6aac5414be478095780dea955fe1509b32370bde3d3de316 SHA512 40d07dbd48554a367bfcee10e7c2735161640ca74a64f5f28a69a2ab9d7a4bd432b8003e428f71a975558358647563eb00ad57daca3b79140f6a9843ffbf6598
-EBUILD flmsg-4.0.3.ebuild 456 BLAKE2B c833e12ed6a029016b926dd9eda838f2a10d6e60f8cb497327d22f51f7d059cf1a65cbd69c67ad6cae8bb5fb151b9d9378ca17c12f810b9301aeec576e0ec54c SHA512 5a658f38dbe17065c187d2f5642d0dbeb9cd6747dd4199de224c98613d05ccf9fdb026af200ad9e95ff9b24aaca432950f97d2cdcbab69ec5b3591e2ff44492a
 MISC metadata.xml 390 BLAKE2B 5f998bcf02cd83987c9e562a4f283691ed9be3a5bbf6191440f6c8cf345f19cd03f206a5ace9ae2a22566296dbfdcfd976b7f57abd63c9c8a3af4d3e709b3dde SHA512 e9770b26f6305cf387a9896d4ed923ebb4600f30d945ba4f015631065c539c71c67f2a596ad3eaad39d60d8b010f89fc092b3e20166ac36a1fad1203aa099eb8
diff --git a/media-radio/flmsg/flmsg-4.0.14.ebuild b/media-radio/flmsg/flmsg-4.0.17-r1.ebuild
index 5a5f5ba918ba..c88a558d8b11 100644
--- a/media-radio/flmsg/flmsg-4.0.14.ebuild
+++ b/media-radio/flmsg/flmsg-4.0.17-r1.ebuild
@@ -5,7 +5,8 @@ EAPI=7
 
 DESCRIPTION="Fldigi helper for creating radiograms"
 HOMEPAGE="http://www.w1hkj.com"
-SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz
+		https://dev.gentoo.org/~rich0/distfiles/flmsg-4.0.17-patches.tbz2"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -13,9 +14,14 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="media-radio/fldigi
-		 x11-libs/fltk:=
-		 x11-libs/libX11:="
+		x11-libs/fltk:=
+		x11-libs/libX11:="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 DOCS=( AUTHORS ChangeLog INSTALL README )
+
+PATCHES=(
+	"${WORKDIR}/${P}-0001-streampos-is-in-the-standard-library-and-access-from.patch"
+	"${WORKDIR}/${P}-0002-Minimal-but-extensive-update-to-remove-namespace-std.patch"
+)
diff --git a/media-radio/flmsg/flmsg-4.0.3.ebuild b/media-radio/flmsg/flmsg-4.0.3.ebuild
deleted file mode 100644
index f47400eb5fad..000000000000
--- a/media-radio/flmsg/flmsg-4.0.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Fldigi helper for creating radiograms"
-HOMEPAGE="http://www.w1hkj.com"
-SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-radio/fldigi
-		 x11-libs/fltk:=
-		 x11-libs/libX11:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog INSTALL README )
diff --git a/media-radio/fsync-mdc1200-decode/Manifest b/media-radio/fsync-mdc1200-decode/Manifest
index 468ed6e7d9c5..04374d2b79be 100644
--- a/media-radio/fsync-mdc1200-decode/Manifest
+++ b/media-radio/fsync-mdc1200-decode/Manifest
@@ -1,4 +1,4 @@
 DIST fsync-mdc1200-decode-1.0.tar.gz 19791 BLAKE2B 86000b3b6a71895c211ae123eedfd54ba0dfa9bfc8619a28effb1f5187349aa33968acf6a24fd4e7b10e07a5693cf3410d5242d9719f34bec0a847794098196a SHA512 94525b88800f285816d6c76f0474854543a805f85a3156cd516a3c952ce05e40c9c845dfb799eb5aea9cd2e659713c468e35407804b42db98981dff91d08fb92
-EBUILD fsync-mdc1200-decode-1.0.ebuild 809 BLAKE2B de869adbf5af54417d8bcf15d80ae2a5613840bc19a68b437a5fdaa662197799d33e34f9f843bf433954833879c883c8427014a480686df4d74b0616e502516b SHA512 566f24f94bcde7bdf2392dbb49507c3c46460fea102413ebab565b090c72bceaff6cf3495ba6365597eaf35b23f2772e3ec544ecd6d56e3135529cd146914bb8
-EBUILD fsync-mdc1200-decode-9999.ebuild 809 BLAKE2B de869adbf5af54417d8bcf15d80ae2a5613840bc19a68b437a5fdaa662197799d33e34f9f843bf433954833879c883c8427014a480686df4d74b0616e502516b SHA512 566f24f94bcde7bdf2392dbb49507c3c46460fea102413ebab565b090c72bceaff6cf3495ba6365597eaf35b23f2772e3ec544ecd6d56e3135529cd146914bb8
+EBUILD fsync-mdc1200-decode-1.0.ebuild 826 BLAKE2B 384b99cfa6fcd57523b6ab2fc0d87a45dff315cca958f8e71b9928874675d78033725e9443a4ac63207f4d1f4de128984561b2b6fb1d598d281ced98964607c1 SHA512 e874ba839dd75e8058b250aceac9374abd66c10968156c963b33e18464f2298e0a7fd087e213e0e82a93a459ef9ea31aa89181cdbeb58f562bbbd758a575bc99
+EBUILD fsync-mdc1200-decode-9999.ebuild 826 BLAKE2B 384b99cfa6fcd57523b6ab2fc0d87a45dff315cca958f8e71b9928874675d78033725e9443a4ac63207f4d1f4de128984561b2b6fb1d598d281ced98964607c1 SHA512 e874ba839dd75e8058b250aceac9374abd66c10968156c963b33e18464f2298e0a7fd087e213e0e82a93a459ef9ea31aa89181cdbeb58f562bbbd758a575bc99
 MISC metadata.xml 430 BLAKE2B 630acc81c8b5fe9af29816801bb95c49e6aa27b5e2bcac6ea803dad2e9767be83d666c8bd576bfda25607ebe6bef09d7debfe8a562e7276bb081bb44451219de SHA512 701207e4fd82cc75107b8a1669ae9354140811ff828a1f9b0313f39a4bfa663ebaa549f64b0b422255f9014f9fd6d8e0819d6d2b32d4df6504ac7bcc80c44cd9
diff --git a/media-radio/fsync-mdc1200-decode/fsync-mdc1200-decode-1.0.ebuild b/media-radio/fsync-mdc1200-decode/fsync-mdc1200-decode-1.0.ebuild
index 2316114ab76b..050d3b649115 100644
--- a/media-radio/fsync-mdc1200-decode/fsync-mdc1200-decode-1.0.ebuild
+++ b/media-radio/fsync-mdc1200-decode/fsync-mdc1200-decode-1.0.ebuild
@@ -23,7 +23,7 @@ IUSE=""
 
 DEPEND="media-sound/pulseaudio:="
 RDEPEND="${DEPEND}"
-BDEPEND=""
+BDEPEND="virtual/pkgconfig"
 
 src_compile() {
 	$(tc-getCC) -o fsync-mdc1200-decode ${CFLAGS} ${LDFLAGS} demod.c fsync_decode.c mdc_decode.c $($(tc-getPKG_CONFIG) --cflags --libs libpulse-simple)
diff --git a/media-radio/fsync-mdc1200-decode/fsync-mdc1200-decode-9999.ebuild b/media-radio/fsync-mdc1200-decode/fsync-mdc1200-decode-9999.ebuild
index 2316114ab76b..050d3b649115 100644
--- a/media-radio/fsync-mdc1200-decode/fsync-mdc1200-decode-9999.ebuild
+++ b/media-radio/fsync-mdc1200-decode/fsync-mdc1200-decode-9999.ebuild
@@ -23,7 +23,7 @@ IUSE=""
 
 DEPEND="media-sound/pulseaudio:="
 RDEPEND="${DEPEND}"
-BDEPEND=""
+BDEPEND="virtual/pkgconfig"
 
 src_compile() {
 	$(tc-getCC) -o fsync-mdc1200-decode ${CFLAGS} ${LDFLAGS} demod.c fsync_decode.c mdc_decode.c $($(tc-getPKG_CONFIG) --cflags --libs libpulse-simple)
diff --git a/media-radio/ibp/Manifest b/media-radio/ibp/Manifest
index 792d9a17acd9..d9d117928159 100644
--- a/media-radio/ibp/Manifest
+++ b/media-radio/ibp/Manifest
@@ -1,3 +1,3 @@
 DIST ibp-0.21.tgz 33536 BLAKE2B 0fee17215d6e6fc99dba6d216f4e2b79bf0be89f6edd68fe5b0c0f4ca6fee794274a9ec0c08b73f502fd57dd0208d1d0fcf362d0a8671d94d4a6a613f578e443 SHA512 784bdcae61ce41dff7d88eb2068171dafa607012660393188326e94e323fdf5badebf3d8a24016c83c96c770b6d0935fc35aef5aca6bbfd665b7f2ccf39118ca
-EBUILD ibp-0.21-r1.ebuild 1167 BLAKE2B cebd1220a37cb8105b7f5e4a4b8ef3e0f19e2d82476cb5cdeed9e08ccfc16f3eb2be488a77980de1097ab85c94091c7076b925ca9859ede6e03cfdaad2b64f6b SHA512 e3991259438d90d4cfd8183b1d962dd9f3fa660759b46c713df31e30db5cc30c6eed72d31a0e42a8ddc654151d0ce12ad946e6fb6f38e6ff6e45fa580709b360
+EBUILD ibp-0.21-r2.ebuild 1164 BLAKE2B 568e345c87dd5815bda07f04efd23cdfe029991677805a17c02307e297aabd2f0a330b3d22e8549765052b9714f4ab471d264c7154e919b0645de3e632a01e1e SHA512 890f366cf23fc30cfb9bbfe1a1ea93d05e5a320d79afe7899822c844d75ce10e5ffcabcea249c1f039059ef512d4d064e70e0e4b985ae141e54fe2592bfc98ed
 MISC metadata.xml 249 BLAKE2B d6fa8a349066f9684c68c3086f53e41ebf30b6e313e8e8e752a953c0eaa0853448fe17e5ed46836bc5e149a282a33c7408c675d3b39eb3d59ddc1c1ad86bf716 SHA512 965ae00fa198dd8f5869c4c14ff3e28c7d76be7182be6ba4bedbb68d7138da5be3c8bb993689db2c73ac328456015ebdf018ee1b308d6988067810d1156bd179
diff --git a/media-radio/ibp/ibp-0.21-r1.ebuild b/media-radio/ibp/ibp-0.21-r2.ebuild
index a02af617b34f..08a4b2b5fa4a 100644
--- a/media-radio/ibp/ibp-0.21-r1.ebuild
+++ b/media-radio/ibp/ibp-0.21-r2.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
+
 inherit toolchain-funcs
 
 DESCRIPTION="Shows currently transmitting beacons of the International Beacon Project (IBP)"
@@ -13,18 +14,18 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="X"
 
-RDEPEND="sys-libs/ncurses:0
+RDEPEND="sys-libs/ncurses:0=
 	X? ( x11-libs/libX11  )"
 DEPEND="${RDEPEND}
 	X? ( >=x11-misc/imake-1.0.8-r1 )"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
-	# respect CFLAGS if built without USE=X
+	# Respect CFLAGS if built without USE=X
 	sed -i -e "s/= -D/+= -D/" Makefile || die
-	# fix compile if ncurses is built with separate libtinfo
-	if has_version "sys-libs/ncurses:0[tinfo]" ;then
-		sed -i -e "s/-lcurses/-lcurses -ltinfo/" Imakefile Makefile || die
-	fi
+
+	# Fix compile if ncurses is built with separate libtinfo
+	sed -i -e "s:-lcurses:$($(tc-getPKG_CONFIG) --libs ncurses):" Imakefile Makefile || die
 
 	eapply_user
 }