gentoo resync : 08.10.2021

6 files changed, 2 insertions, 103 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 567ad9c0fbd8..bfb232c40fc5 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/atftp/Manifest b/net-ftp/atftp/Manifest
index 20edf0a074cb..35c940bd3c5e 100644
--- a/net-ftp/atftp/Manifest
+++ b/net-ftp/atftp/Manifest
@@ -1,11 +1,8 @@
-AUX atftp-0.7.2-CFLAGS.patch 611 BLAKE2B a897ae1d9f03387283826c5b9795028b9190ca5a55e9db795d6a3753c7ce45ccd75a8d37eb2de228bd1b8fc57472fb3f662860c0f1efdc5a0ceab2d1a178c1dc SHA512 b020e761af2b73193e0bc3ef0e11e293babdfaedeac5429f3ad89079d686ce9c69737a4f74e147a023a92a2424241d61f17574feaadc39a5b6bd361245886c8a
 AUX atftp-0.7.5-CFLAGS.patch 637 BLAKE2B c73bc1edf2ca1206da54c2c3b6881bc011c45dd69af5715723c1ec62ded7376bab032c842c63714cbd06c9f8513a69bd3c32f3dad65ea8b23d7c1dfcb424524f SHA512 eb6a30659da36033ce52ceb9de6609044def40260cd1c98746463f3b3852c62e650f90fa3258854342bb40d26e7ec1aeec49373af3420ff8fe9fdca69cd586a7
 AUX atftp.confd 105 BLAKE2B 6672479bce2240d4c34c70853227a769fa45c06e4b5c04f7d5aebdbceb0987316a9ec906182cacf5337fce5190aeac3bfc4cda0be72b8d48e99a5b2cbc2eca0e SHA512 cdbd63df16c2cee7491209de8ec44e05e10beccc6286cf7cb1c5dc7731c616d41bc94ce4d6c020b4ac8bb77b27956e9ee36d9b5703dcd3477e8b14927d154b91
 AUX atftp.init 438 BLAKE2B 1783431801dbf04353bde6c3766c7d0acdd06b8ec853c8fba5cf1bbfe6c7020b55305f44992e3921a63654f290a28c28373dd94f925188c72105c8a3dd047dca SHA512 b64f78658d2da17a4fe4237835c0a6a0cc59d0b7278e8f6f49673ffd8a97a9473e4773b43bcc70d312043ee4324d8105c50f0cfcf6055c0755ce598c9d7e5a23
 AUX atftp.service 233 BLAKE2B 4c9a1a8041ffc4cdf71a24800494f340121beb9bde9760fa090b9e515ef0b2aa7dd73173543c75fde465dbf9cc229b04acc9e72c296fa27cace2063128de06c6 SHA512 533372c4863e39d6139ddc491c2b2b2051f1094a90d9854879f28bae7975c8dc997696318794cd1136f9cc542a8f418ad8361b87dd6b3455445d8528d2cc993a
 AUX atftp.service.conf 45 BLAKE2B dd52bd3ef0d72f28d2e317282026d354b6023f8b51634d0374623c782afacae1284f5385967dfa91026553845f9283be59b4c7d96031da85261067b7be6544f7 SHA512 661befb6873eee6c0ed25fd5cb156e3d7c4ef801d2f58cda8df0f0c5fd851c7eb28089a9399529164c61505963e9d10143df2195d57ff66f85ad0e2750fbbd57
-DIST atftp-0.7.4.tar.gz 249699 BLAKE2B 8aa30df1cc92982b0e718cd9bcc68cf397e29f6abb795cf9fdfd0b9942d9a7dd16beafb24d69d7339f9ab4cbda16404eadf40096a8dfdb684fbc7ec1c7f81c9f SHA512 f9ff9b72b7d1d659d4ca00d990c28b9da8dea0228e66610ee2d17a3959fcd142998a7539f8ea68effdfe830d2f5e68c154a2911afb9cad52acd24a6a642d76a4
 DIST atftp-0.7.5.tar.gz 253626 BLAKE2B aa0a0311d29fd52b77f8ae021407221f815a39fe85cabac36ee18dce8918a5b0accda455e2df5fecf34f09e93e583bfbc86162b60a7237bd6d34b0c658ec2970 SHA512 457101136e59f7a1657ce591e9ea678ab9091a59219d41b6c522fad4a3555c5cbcb8c9e0c3267fd871940d99b5f8673ab4ce5ec9737dee52f017e5c80a4e59d7
-EBUILD atftp-0.7.4.ebuild 1447 BLAKE2B 6508f1a2d3be859cb6cfb6e44ac306811342a6522f3b305bd3714b23b8d6ba9ab601495a1742ce24e7e8fda907347e4c60e897b2ee083fb484563aeec79b0889 SHA512 5d69276f37f510e10884a67a3ee8010bfff68076e5d10550a0b689fee35672804c18cc3feae8e7397cfed4a000e474707976dd50d6924e3f7909245090c0bce0
-EBUILD atftp-0.7.5.ebuild 1441 BLAKE2B f2e7e0f0fc1a08712419be9625176e75531171c3f34520a715c77da305753099fae133f4acdb471329642cc13a41e66f384790ab5131f83b80d3363203e51a31 SHA512 a1f6effeb8af89272af9a26e7d512f66218eca61c5d62f648b890babdbdea7a49e3b3dd60aba5e5f2a7b8a7c3d1bfcc0ad08706c8d1c4477eea693b7f54b92a9
+EBUILD atftp-0.7.5.ebuild 1440 BLAKE2B 1611bd0149e27e5b329e7fffc902c2d4e356c2ab21c65a015a1f62944bbd019f4d4fd814f5f9684c46b181fdafd70b9bd5fe1b211481a8032b1345260ff9be40 SHA512 fe97c2f312a28b62c6f3bc459b3df09e8cedd3200f6f2761746686fd370d0ab1bb6a583cfccc854229f94298e0dfac8be641a6978d80d3cf05e0bda26ee7f971
 MISC metadata.xml 449 BLAKE2B 11050f78a3331914e98ba7a89fd29c9ebc5d36f5f34c1143850af8e1d5c5f3a4eb0d01c8b0d79d5c9a03e0877cfb0f0604f38bf94c9e85301ce2dde548c6d09a SHA512 d4f4b423d74484fa8f72796904014647939f2bf5f4ebe52a28cd1f029ea7160b3c07c8dfdbaf4eda06d8b5bce94b22297ab4874b150058b29624c55009b7e132
diff --git a/net-ftp/atftp/atftp-0.7.4.ebuild b/net-ftp/atftp/atftp-0.7.4.ebuild
deleted file mode 100644
index b467be06846f..000000000000
--- a/net-ftp/atftp/atftp-0.7.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2021 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}/atftp-0.7.2-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
-	TEMPDIR=. ./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.5.ebuild b/net-ftp/atftp/atftp-0.7.5.ebuild
index afc07d53b0e2..a4680708a6b5 100644
--- a/net-ftp/atftp/atftp-0.7.5.ebuild
+++ b/net-ftp/atftp/atftp-0.7.5.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 )
diff --git a/net-ftp/atftp/files/atftp-0.7.2-CFLAGS.patch b/net-ftp/atftp/files/atftp-0.7.2-CFLAGS.patch
deleted file mode 100644
index 749f8e8e6d38..000000000000
--- a/net-ftp/atftp/files/atftp-0.7.2-CFLAGS.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -69,29 +69,6 @@
- dnl Check for AIX
- AC_AIX
- 
--CFLAGS="$CFLAGS -g -Wall -D_REENTRANT"
--
--if test x$debug = xtrue; then
--   CFLAGS="$CFLAGS -O0 -DDEBUG"
--else
--  if test -n "$auto_cflags"; then
--    if test -n "$GCC"; then
--      CFLAGS="$CFLAGS -g -O2 -Wall -Wno-implicit"
--    else
--      case "$host_os" in
--        *hpux*)  CFLAGS="$CFLAGS +O3"
--	  ;;
--        *ultrix* | *osf*) CFLAGS="$CFLAGS -O -Olimit 2000"
--	  ;;
--        *)       CFLAGS="$CFLAGS -O2"
--	  ;;
--      esac
--    fi
--  else
--    CFLAGS="$CFLAGS -O2"
--  fi
--fi
--
- AC_PROG_MAKE_SET
- AC_PROG_INSTALL
- 
diff --git a/net-ftp/atftp/files/atftp.init b/net-ftp/atftp/files/atftp.init
index 8ab499127ba4..8ab499127ba4 100644..100755
--- a/net-ftp/atftp/files/atftp.init
+++ b/net-ftp/atftp/files/atftp.init