gentoo resync : 16.04.2022

9 files changed, 18 insertions, 12 deletions

diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index da14d275ec97..30bdb317bc53 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/direwolf/Manifest b/media-radio/direwolf/Manifest
index 9d54a216e455..77d079ab5394 100644
--- a/media-radio/direwolf/Manifest
+++ b/media-radio/direwolf/Manifest
@@ -8,5 +8,5 @@ AUX direwolf.service 154 BLAKE2B 1284b0f93085f5e8a8cd8452b86c0ddf4b8abf9c01496bf
 DIST direwolf-1.5.tar.gz 17996557 BLAKE2B 6860075b764248f1e0ff06e2a533e2e31f65851ea45d74fb0aca11827940c6df0a8bab4b6b78aa98847ee54b2b344d3c5fc8da6947f9113d2fac6d3ea427d68b SHA512 c23e2ccebd47235f76a9583e14cf8e8df299b8f7456a6388534536e7b1114b3d9b9efee43da2c1708e01a0b9534db0ed93314368e20e9002bfcd5b3a2855d8a5
 DIST direwolf-1.6.tar.gz 22298168 BLAKE2B d0bffe78ecfdd7b41e4e2d458416e30e9151870d6890c3e4f65e44472699f0c1e1016fcbab5c30209978594ccaf567a8d53ae62194649e9df5cca4d4ea4689af SHA512 f29805dfea01ed5a81b133ac0a98455c2edfb6d18e0764db23c398475b11cc0e57c1c7c35c44cdaa5cf73129e8c18b836ad17dd3e9811e84277db0ef7b10bcd5
 EBUILD direwolf-1.5-r1.ebuild 2295 BLAKE2B acdb0f68dfef449865265bc6692f46a9966e71f2497cfc734762657fe4aa9e9ec92d68daa2c3f55aaa149b16ff118a18c13ab05d2d153209d78d06dd1cdec554 SHA512 354b9aaee3a0c5d13c629e275a3c080001e48ff2cca1e8025dd57447af74dcdc43d51a872f9d10b9ebb9b4a9b0db034cefe2373b7254c79dea08e9e7d342466d
-EBUILD direwolf-1.6.ebuild 1704 BLAKE2B 764a762ef16cbb2f7eb27af546c1fbcc534c6af5b0cbda96899c368d3b99a7fe48d111a430b924e8c97c7d2b285432cc92f2cecfb8e88ebde41426416f1fa614 SHA512 417362faeb7452929dfb4cd461f002be09952829f5d52202ba71128feeff824e448ea59859db9ef35eef31faf5fcf66e9e648ab5690943833e1ac39fd5d6dd46
+EBUILD direwolf-1.6.ebuild 1718 BLAKE2B 97602b768f91539265ba0f42c5346e5a207b054d92132e3e963c814bffa388123f499acd6f13dfb95ba7a0741141ec32a801c90c244fe209ae64af317f48b757 SHA512 c18cdf0b0d9c9487108c48e65307a13479b712d454bec1b72c4bd66df3d52c2b013dcb1f299b4268344005f02ee8c3903d3585e4d005c12478385f93f4947b64
 MISC metadata.xml 405 BLAKE2B 8ff48fe5c079a13419d626f07d42bcf22d19879d6cd5a48ca710a268ebe50656c83a40f92ce2dac49a7c049f3e58e4baa70a5b10d8be970fc52c5b37a034b9fd SHA512 802862b1c02705f44edd8e0a2f8e76ebee43217340c4c737bcc69a862a899847dbcdc7b3857f0052443152c3181985833e9f51455262b817187370e7bbc2c98e
diff --git a/media-radio/direwolf/direwolf-1.6.ebuild b/media-radio/direwolf/direwolf-1.6.ebuild
index 39412b6150f1..de0f9baf6b70 100644
--- a/media-radio/direwolf/direwolf-1.6.ebuild
+++ b/media-radio/direwolf/direwolf-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wb2osz/direwolf/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="gps hamlib test udev"
 RESTRICT="!test? ( test )"
 
diff --git a/media-radio/unixcw/Manifest b/media-radio/unixcw/Manifest
index 13c21c5f177d..dfbe33b4db21 100644
--- a/media-radio/unixcw/Manifest
+++ b/media-radio/unixcw/Manifest
@@ -1,5 +1,5 @@
 AUX unixcw-3.5-tinfo.patch 1212 BLAKE2B 00afb10b8318957f8c4d10ae9254586aef365674822d23da9fdafcc31956252e77ad754c3389ae535b5d78a8611c0750b5609bfd785b6e111d350cc98411eb00 SHA512 370f2bd601546dd5043dedf1387783c425d15d0c52a8f357c4bb1bb9eb0ebb8b54bb4afd79db14314603bf23838568041c590c830622017bc05bd9bfd97baf6f
 AUX unixcw-tests.patch 533 BLAKE2B 0b2c08f1f2bb9db4ad2c98a4af7d2097f408e873cde8f03b46c994adcbb06ed0a20f95e2951c55810821b92e7a3e529621914308726233a108879e3341e98cf5 SHA512 331a7e71a3f9686b08ce59e06e59d4812dd36c4e2597a0ae57f663c2c0b7f32eca3e70adbc1769886b12856ed2d96bd9f4279f95db70d401e31f477b183fa2b7
 DIST unixcw-3.5.1.tar.gz 740331 BLAKE2B 9b5b4b819cf75ca0b10d773ebdf9869bf835c49f10c54b5bd34441b417d48d9a92abc9390a41870bf1c09fbbfe932554307abba181cad3b8631947adcf9890b1 SHA512 b59499723d810a537a2f5ab2b4b34c83a1c8c815af82a60ba29f4d9cee445525e530136f4e202db6b87305ac7a818fa6e59214a45c6bffce299eb50b58c866e1
-EBUILD unixcw-3.5.1-r1.ebuild 1971 BLAKE2B bfd6b8e0086a2cf2f8658aa38764c90db77cb814177be08b3d8b250d2699e9cc706858852701f729396daa0c3cf421994dd41956ce9151999a0cb4a7062571f5 SHA512 5c486e4cbd7f52d2318c1ee79634db552e582a641092881f6a21f2817491a7b51bd0cda85c49cd1cb870c07e0f1ede73c428119ea6f91f09bbf9c261d83a0cbf
+EBUILD unixcw-3.5.1-r1.ebuild 2100 BLAKE2B fdd6a6f0eda7b0dd85d008b5a0985f401eb5fc5cb0f61b34551d20b5268d3b06a8692d331a0fc1f5b70a2d46e833871d0df8880af615e6d9936a0052f3c42a80 SHA512 da0649bc6ff3fbc4ed7529002bcb10e34dca486b9f32b099a81273fdbf5ccac39da81051a7e848176e277b3fd6feeb19d274dbca6bc60a13fba91653c634f1b8
 MISC metadata.xml 875 BLAKE2B 582b1ba40e9424d308e33d5f2bf430e270a2d4d106aeffec3d03e1736360758776f5aa8a8d0078aa03c0e4ca8ea206b9805be2223db69282bca0cb752c531314 SHA512 07b92861370f28e4723e48d75dac80e3517c7a944f7a4ac07e6afc75f80871b6ca6a4904d042bd79bce1dfcd81b74d3b85a25b0eab3f8c83dac7742f6fb10219
diff --git a/media-radio/unixcw/unixcw-3.5.1-r1.ebuild b/media-radio/unixcw/unixcw-3.5.1-r1.ebuild
index 09e46e9788f0..3124530b8bd4 100644
--- a/media-radio/unixcw/unixcw-3.5.1-r1.ebuild
+++ b/media-radio/unixcw/unixcw-3.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,6 +30,9 @@ src_prepare() {
 	append-cxxflags -std=gnu++11
 	eapply -p0 "${FILESDIR}"/${PN}-3.5-tinfo.patch \
 		"${FILESDIR}"/${PN}-tests.patch
+	# Bug# 837617
+	sed -i -e "s/curses, initscr/ncurses, initscr/" \
+		-e "s/_curses_initscr/_ncurses_initscr/" configure.ac || die
 	eapply_user
 	eautoreconf
 }
diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest
index eb60fb38d2ab..c8670c3d33f8 100644
--- a/media-radio/xastir/Manifest
+++ b/media-radio/xastir/Manifest
@@ -4,6 +4,6 @@ AUX xastir-2.1.6-automake-1.16.5.patch 426 BLAKE2B bded6c304ce675046d833fe1b52d4
 AUX xastir-2.1.8-scripts.diff 3112 BLAKE2B 2e2d96ab6788c700f0f660ce1698dbf59ccf697896404cbd11777cefa077660a1ee2abc7efb208683eb3b131a93c9ffc048c077054b9cf3d77c2458f1c522b39 SHA512 fcf5dc5ead6a0871d219323e78b9c33747e9ba1289a2c75e211af752f8a8d53d919b51dc5ef4c0618780c3d8869b19c10cbe785be8e70f5b75cbe71c97b70a4c
 DIST xastir-2.1.6.tar.gz 2687180 BLAKE2B 053ee4e8d1fd589bf0767c6ffdaa7de2ef14d292d5773b2f08239fc4b73d3695e5c061dccab75caae068bc8887f7924d3793f0dfb8368b2cd25526211e240914 SHA512 91f40f3788f51589619833102d1db997ff725f84e6fa5f9b7dd8942094a1b7a94433779243be1c14b980d96613972482a397cec8e15b8ea4784fdd106c32ae08
 DIST xastir-2.1.8.tar.gz 2222586 BLAKE2B 4cd623c2db7a06c2499bf73a0df8c8f07b6a3072d177d370b76f54cb4caa4cf03f2b5c511149eaefc26f1aa7e8fe3a89e1c42e26a20066dd3337ad41dd5300b6 SHA512 361c92381b385035af160578dcfc4c800edcfabdbaebc5eda1c4fd9a78e934f289a54813577d5b765bbed6eae50cb772735defec6f489dc65326941d2492850d
-EBUILD xastir-2.1.6.ebuild 2053 BLAKE2B 9aee91db280c9719be855d381f31c2acf43b0b6dda48f830b5d9c0125b093f1264597462fd3bad24b79a49eea57cf45f66b658aeb9e943550c127c942a59b253 SHA512 bd9b236d04fc845b0a7c235089e55ee52ef17e0ea0643979bc26b44b1e9a5cbdfdee054fcc13d807338f62b54e2d4f32b777574d8970a1f270e71563ed3285bb
-EBUILD xastir-2.1.8.ebuild 1926 BLAKE2B 34538ec648f14516d7f3473352b28a8b63eadbffd9258d9e428e6aa5502d31c15bdcd3e0f8e3b755d8f2ebe498a01fa5f1d63d8146b4e830dcf25589f7379680 SHA512 765576631d0f1fdd301ab21d7e9b82623375cadfbefdf10d8942a4959cfb614f6064b88b466962cddb5133d83f8ec04ec1d8771532b87fe237aed9f5ed27c61e
-MISC metadata.xml 394 BLAKE2B f1277742dc42b3ec0fd74c6ad56fccac145b0a6635232a0e64823cfcc002f79a912f5298a929a9dc3555d94f8771c8a405147f25d4383de8ef8786b65d349c94 SHA512 71caf8df00b9bd50a6c84799002e904f08461c9d3aefdb105fb12bf09f07c1c6090e0c83fc6f822178603d610f868d053afe84f0c7bc30558e5032fb480388b6
+EBUILD xastir-2.1.6.ebuild 2054 BLAKE2B 41a349cf8f61aa60ec54cb5498a42fceeefe05cc722bff8916ae4645488ae27cf59acf925b6836ca82d4a7e56ba3c848f7750de2c6a1b3eaafec5064b9a5a456 SHA512 2eda8c4f570c75e6490cf840e9093f8f19c2a2cd80b8e452b28d2af065fe582eaa7d023e4eef95ab0352b619e2993bd1b799a5ef7f3b28d41abd5fe45e7fa7fb
+EBUILD xastir-2.1.8.ebuild 1927 BLAKE2B d851873c1b8f9ebc3bc33ef5d0d56f90ca94bc170648df3a4a56cff57de3853c336c0b1cae90b8b1dbdc7bd62979b082c4c1cb12e37b1dcd63382c5f552d1411 SHA512 c7124938b3060b921d34f44c9a6f9bbc81b5ce5f3d6ef949826eedc04d134cc3ae4621b1999af11768892b62dc634cea9b9ce4a6c313a1591b833f89938c363d
+MISC metadata.xml 472 BLAKE2B ce31d7060b0e735a8ecda8ad847e3cd45c4f4a2749470d79cd6542be0ae164a5e06e476c536c67c34e23d6a19c6f4a6b94fcfdfdc77827784b4459737c99ccfa SHA512 40d9aa951fe33a6dae574a9cafe564d3241e2121fc7ff0852b4f0f2044661b1b4f49abe1b2819d4291f6bb8f53bceef29b880ab05584d416c0dc08595b92eab8
diff --git a/media-radio/xastir/metadata.xml b/media-radio/xastir/metadata.xml
index b96de3345070..791f91c41ca6 100644
--- a/media-radio/xastir/metadata.xml
+++ b/media-radio/xastir/metadata.xml
@@ -9,4 +9,7 @@
 		<flag name="geotiff">Install geotiff support. Allows using USGS DRG topo
 			maps or other types of geotiff mapes/images</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">Xastir/Xastir</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-radio/xastir/xastir-2.1.6.ebuild b/media-radio/xastir/xastir-2.1.6.ebuild
index fcd3f2a7f254..9ad868bd9212 100644
--- a/media-radio/xastir/xastir-2.1.6.ebuild
+++ b/media-radio/xastir/xastir-2.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit autotools flag-o-matic toolchain-funcs
 MY_P=${PN/x/X}-Release-${PV}
 
 DESCRIPTION="X Amateur Station Tracking and Information Reporting"
-HOMEPAGE="http://xastir.org/"
+HOMEPAGE="https://xastir.org/"
 SRC_URI="https://github.com/Xastir/Xastir/archive/Release-${PV}.tar.gz
 			-> ${P}.tar.gz"
 
diff --git a/media-radio/xastir/xastir-2.1.8.ebuild b/media-radio/xastir/xastir-2.1.8.ebuild
index fa5dfcadd886..796b47bf4772 100644
--- a/media-radio/xastir/xastir-2.1.8.ebuild
+++ b/media-radio/xastir/xastir-2.1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ inherit autotools flag-o-matic toolchain-funcs
 MY_P=${PN/x/X}-Release-${PV}
 
 DESCRIPTION="X Amateur Station Tracking and Information Reporting"
-HOMEPAGE="http://xastir.org/"
+HOMEPAGE="https://xastir.org/"
 SRC_URI="https://github.com/Xastir/Xastir/archive/Release-${PV}.tar.gz
 			-> ${P}.tar.gz"