gentoo resync : 30.05.2020

3 files changed, 2 insertions, 52 deletions

diff --git a/media-radio/ax25-apps/Manifest b/media-radio/ax25-apps/Manifest
index c27bd90dcdc7..48f4339cee13 100644
--- a/media-radio/ax25-apps/Manifest
+++ b/media-radio/ax25-apps/Manifest
@@ -4,8 +4,6 @@ AUX ax25-apps-0.8.4-tinfo.patch 582 BLAKE2B 6f5431add14ef4c2ac789d6a3159ec30a4d0
 AUX ax25ipd.rc 379 BLAKE2B dfc102809a52feffee96d0a5f67874f9241b26a9ee18ccf88a5c04f154f0681f8b9da9190bbad81588de805e10bd49ec0fb0c534f5861405ab0ca59129852a33 SHA512 ce11d6f4bd4f66d79feafec81cde34a62278c9a980299da2feedba8137df8efc607298ff03324dc02ceaacebd2fef9e3a100533b887ba44dec191b759d8e1e67
 AUX ax25mond.rc 383 BLAKE2B 65f830cea757b7c649ab31480e7beaa0e8b40017c3fd59559969942c27c6459340dfa0223de829049bdc0cedd67a2441202ecca60c341162f5eaf621c6fef01e SHA512 c8d8dc7ada7fa427da85b794969e821c5e3cde66871427d36fa5cfc3a03c30735d869444594f3f17074529465325c7b48806a67257b9b3e0ef3fa6ca258e90c2
 AUX ax25rtd.rc 379 BLAKE2B 823318cdaf456d0536d843ddf0a25e2a614ddcc6dfe69f98b7c6c8dda555ef6b2977b873c9e35aaab10974f1ea3d91d8743798f228665908859dc33ff34f3708 SHA512 95df04124449a652bf76a60822c9468bce71d02490beadef409975da3709f7cf2a43ee9088468146d985464a6992125c90980e38efd397c145799cca537ff8dc
-DIST ax25-apps-0.0.8-rc4.tar.gz 442172 BLAKE2B 59a622c0e675cadc90a7d728b899b1820153d6b9e35f3ccdbac74d191f844d1642dd2e9192d6dce0f1208cbc26b98cb1643f8d1041ec3802b833ad5cbc903f81 SHA512 c99b553c5cadb0e389c1cb35e79fea61b628c76f5ef35c35876e492afc7ab796f8781c3ab5987a096f0816389e9772274fe54e88c16fca0fd30013da3d74d38b
 DIST ax25-apps-0.0.8-rc5.tar.gz 479590 BLAKE2B baa4814ebb68c435a9986158dcdad1333376c75202db8e3595ec35851fabb3c718e7015a721d587ee307b8b8c918a690b898addcf4194532f6d26b70219c4c98 SHA512 5886f79dcdd4b02374289e04a61101b1ccdcdd936a6a98bdefa7b091689381de75f722a0bf32a914c85a3759c7b42489fabf74a53492fe2f937b22c953fc230d
-EBUILD ax25-apps-0.0.8_rc4.ebuild 1121 BLAKE2B a8fc996669ddb0649340c40504fe0777621b0b555e553f0284fded4f85b9cd504b036a357a22e7a103e794eb1bfb8e7afd21cde3b6f5302ff32f979ae95f98b9 SHA512 92f3f3aba2a5307884c198d92d90e2bdacf57d8866815233859519b6b23cbb924a02b2289a28882016adfae306f76bd84dac60655614471ca89a03b2daeeed23
-EBUILD ax25-apps-0.0.8_rc5.ebuild 1174 BLAKE2B 7b57a64f8458b02dd846d23786b9ef28fcf0348e5a0565256549d2d5c4596b91e209d40debea4035f66209916b6579d00b9c2ff8ff2a407c417ea2157baea5b4 SHA512 1681b1265656bf0bb302966ff92e667ffaea4c4e4912759b277aef116142d0f1741288a0cfb7f7ee3fea3eefc652b25a74a6ab920d0c842911aaa3820dbf0ae7
+EBUILD ax25-apps-0.0.8_rc5.ebuild 1171 BLAKE2B fe9afd20e742e9f41a53bc9fae96671985c151e5388db22789351ad2c9a8a00a9e19f185c7f99937023f40f1933bf40913e2e1f6ba80227a90baed972feccb7d SHA512 dc1a2db2ce80d341bcfc61c7d884a45af802b56ff663cc563ba4ea3230898a0c7254b4a776f52df147916d7b274656bbdebe19d9c121c69748dec993a5f1f62f
 MISC metadata.xml 255 BLAKE2B 1be00b412c042706a649da1ef71b5e431369da25a82d18464ba48a54e0353ff297feb91071ac4d75007c756f8e65cb8c59da78efbdb725fb669644de5ba018e4 SHA512 35a18c5a178cc996bb71a27b11fb361198ae96d24ee3cbbc105a64824e1dcddd71d017270539daa3688ec2f04a8f564dd08ca491f62a3da4cca650c9bf35600d
diff --git a/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild b/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild
deleted file mode 100644
index f63f96a8ec95..000000000000
--- a/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Basic AX.25 (Amateur Radio) user tools, additional daemons"
-HOMEPAGE="http://www.linux-ax25.org"
-SRC_URI="http://www.linux-ax25.org/pub/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/libax25-0.0.12_rc2
-	sys-libs/ncurses:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	!media-sound/listen
-	!dev-ruby/listen"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "$FILESDIR"/$PN-0.8.4-tinfo.patch
-	epatch "$FILESDIR"/$PN-0.0.8-fno-common.patch
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/ax25ipd.rc ax25ipd
-	newinitd "${FILESDIR}"/ax25mond.rc ax25mond
-	newinitd "${FILESDIR}"/ax25rtd.rc ax25rtd
-
-	rm -rf "${ED}"/usr/share/doc/ax25-apps
-
-	dodoc AUTHORS ChangeLog NEWS README ax25ipd/README.ax25ipd \
-		ax25rtd/README.ax25rtd ax25ipd/HISTORY.ax25ipd ax25rtd/TODO.ax25rtd
-
-	dodir /var/lib/ax25/ax25rtd
-	touch "${ED}"/var/lib/ax25/ax25rtd/ax25_route
-	touch "${ED}"/var/lib/ax25/ax25rtd/ip_route
-}
diff --git a/media-radio/ax25-apps/ax25-apps-0.0.8_rc5.ebuild b/media-radio/ax25-apps/ax25-apps-0.0.8_rc5.ebuild
index 939745d86500..37448bf8141a 100644
--- a/media-radio/ax25-apps/ax25-apps-0.0.8_rc5.ebuild
+++ b/media-radio/ax25-apps/ax25-apps-0.0.8_rc5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.linux-ax25.org/pub/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/libax25-0.0.12_rc2