gentoo resync : 29.01.2021

3 files changed, 2 insertions, 70 deletions

diff --git a/net-ftp/atftp/Manifest b/net-ftp/atftp/Manifest
index 49855c910e4c..0507c3a937e9 100644
--- a/net-ftp/atftp/Manifest
+++ b/net-ftp/atftp/Manifest
@@ -6,7 +6,6 @@ AUX atftp.init 438 BLAKE2B 1783431801dbf04353bde6c3766c7d0acdd06b8ec853c8fba5cf1
 AUX atftp.service 233 BLAKE2B 4c9a1a8041ffc4cdf71a24800494f340121beb9bde9760fa090b9e515ef0b2aa7dd73173543c75fde465dbf9cc229b04acc9e72c296fa27cace2063128de06c6 SHA512 533372c4863e39d6139ddc491c2b2b2051f1094a90d9854879f28bae7975c8dc997696318794cd1136f9cc542a8f418ad8361b87dd6b3455445d8528d2cc993a
 AUX atftp.service.conf 45 BLAKE2B dd52bd3ef0d72f28d2e317282026d354b6023f8b51634d0374623c782afacae1284f5385967dfa91026553845f9283be59b4c7d96031da85261067b7be6544f7 SHA512 661befb6873eee6c0ed25fd5cb156e3d7c4ef801d2f58cda8df0f0c5fd851c7eb28089a9399529164c61505963e9d10143df2195d57ff66f85ad0e2750fbbd57
 DIST atftp-0.7.2.tar.gz 248038 BLAKE2B 3ca44624bf989009c2ebd0ae97927b0784e3c617a79a1bd00212a72a185302cf84f51c8bcda2012981d67cfed4d241b70f8719e78155207608f07a2227e6c437 SHA512 d602bb69451175a36e619abcff412ab1f6d0e7baf8c3f9a2b32081530fbc5816157404b80d42a8b6caa89cc83675b5cbeefcd57a5d98b8f5b43c6254b20ef28b
-EBUILD atftp-0.7.2-r1.ebuild 1454 BLAKE2B 1dd9278366a7bbc136e6f7fcf584a7f52076de01a53cdf2b65e486bd1582c75211cca6e7380ddc8978f3760a369be5b580dfcac99c4d5672e9a86a8478ff8450 SHA512 a7f27b1c0087aceb9f8c4e9e645cc932b9d69faecc0a7d51529f8395017a2a8ea8a25f9a882f2d128fbd0cb4a51b53cc351b2310b12ae207e543047bc32801c0
-EBUILD atftp-0.7.2-r2.ebuild 1499 BLAKE2B e1fedac27e5d2b097d706c3ee99d03df03ad27ad61c4297c83d222f3a5b4c69b1d3b6ee4966622db073d2e18ccde24ebe4e16508bac156e88027d34086faa45b SHA512 de134e6a16c57f253af44b1a53e5c1f849943e52683f06d4945d042cd4c4f1bcd776379fcae0176149395617efe6f2b5ef9d587ccb2f7ab35cf683bde2164a03
+EBUILD atftp-0.7.2-r2.ebuild 1494 BLAKE2B 1b360f602465ee0dea30a42151ec36cb3d0b918d80dad948b25ee2851f994586cbaecdc893e75d4d782a785ae1769188944581aa84b2e4087f2550b4186caee8 SHA512 4f11fd15e3b4504a973b07c70383f1e9edfd16e5a42b824eda20e63fc6bf87c96439a91c1cf68fbfcc8a914dfbb0a9bc52992b3b30e1fd1a0ccf620d89297553
 EBUILD atftp-0.7.2-r3.ebuild 1537 BLAKE2B 1e56e24731a2f43d58b6a819c8f561c2669240fc87553d1d187047f0d27303a785828b7d0c976d5eb32d76c2c76c7277158d77369e71d66c0f3ea5315bc81d3c SHA512 0208bfc439df1b605bbdb8aeb5d91fea46c45196cb5417340f636f1c149e606ab06f2eb75c8dd57ee5bdb7b44336ff44eeec7cac282ce0c9622cfd2ad7dc3897
 MISC metadata.xml 418 BLAKE2B 882119fa041eaa33650c5e3efaa440e3ed25056f05dda4667a150a8646f32f620b3479821b0e6c3220541afd811f35b6060127aa58b98e7604fc498536e8c724 SHA512 cff57d66fe14a48905bd9280e15f794a66df58f83fff73290db3dc7a8d2196c5ffba05693d9e8909e3bf710bb05b72e00001747bd9d92379a7cdfc0dbaba57cb
diff --git a/net-ftp/atftp/atftp-0.7.2-r1.ebuild b/net-ftp/atftp/atftp-0.7.2-r1.ebuild
deleted file mode 100644
index ed32bfa406cf..000000000000
--- a/net-ftp/atftp/atftp-0.7.2-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Advanced TFTP implementation client/server"
-HOMEPAGE="https://sourceforge.net/projects/atftp/"
-SRC_URI="mirror://sourceforge/atftp/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 ~s390 ~sparc x86"
-IUSE="selinux tcpd readline pcre"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	readline? ( sys-libs/readline:0= )
-	pcre? ( dev-libs/libpcre )"
-RDEPEND="${DEPEND}
-	!net-ftp/tftp-hpa
-	!net-ftp/uftpd
-	selinux? ( sec-policy/selinux-tftp )"
-BDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}/${P}-CFLAGS.patch"
-)
-
-src_prepare() {
-	append-cppflags -D_REENTRANT -DRATE_CONTROL
-	# fix #561720 by restoring pre-GCC5 inline semantics
-	append-cflags -std=gnu89
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable tcpd libwrap) \
-		$(use_enable readline libreadline) \
-		$(use_enable pcre libpcre) \
-		--enable-mtftp
-}
-
-src_test() {
-	cd "${S}"/test || die
-	# Try to run the tests
-	./test.sh || die
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/atftp.init atftp
-	newconfd "${FILESDIR}"/atftp.confd atftp
-
-	systemd_dounit "${FILESDIR}"/atftp.service
-	systemd_install_serviced "${FILESDIR}"/atftp.service.conf
-
-	dodoc README* BUGS FAQ Changelog INSTALL TODO
-	dodoc "${S}"/docs/*
-
-	docinto test
-	cd "${S}"/test || die
-	dodoc load.sh mtftp.conf pcre_pattern.txt test.sh test_suite.txt
-}
diff --git a/net-ftp/atftp/atftp-0.7.2-r2.ebuild b/net-ftp/atftp/atftp-0.7.2-r2.ebuild
index 28a0da5d668f..fec89f3f92a4 100644
--- a/net-ftp/atftp/atftp-0.7.2-r2.ebuild
+++ b/net-ftp/atftp/atftp-0.7.2-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/atftp/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm ppc ppc64 ~s390 ~sparc x86"
 IUSE="selinux tcpd readline pcre"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )