gentoo resync : 29.01.2021

9 files changed, 9 insertions, 141 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 78a6796e3b8a..b5ddfe630fd0 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
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 )
diff --git a/net-ftp/ftpbase/Manifest b/net-ftp/ftpbase/Manifest
index 3f32fdfa0205..81a4adc19f29 100644
--- a/net-ftp/ftpbase/Manifest
+++ b/net-ftp/ftpbase/Manifest
@@ -1,5 +1,5 @@
 AUX ftp-pamd 700 BLAKE2B c867c659cac367c51021504dd4da0a9dc90609564613f580a0a01a94d2a87d0df903f22486561f23722901df4df06a33d7d7b643ffa4562cf426f2058391d887 SHA512 61aceee28610cb7a6989fca0ee82702df1118dd2e964bb26fe5cfcb508250599e9e1cdb9aa5dfb61df9c5fef25af4334a87d5f1f4065f693193912dfe172bb68
 AUX ftp-pamd-include 632 BLAKE2B 28aa913499698f136e784e8ed420748fe1415d0ddeb64761b8ed71b869e4b9afb6b86df4b8a8a748ec3a740d99c000fcc4789ee45c3a302f81ffbaab07c7e106 SHA512 adc59c544b815bd88b7e91a43cb5620008d1f83d15a08620f56242d74991ba413e56b31bcca8e5fcfe71f05362bbad89b02d5289260f08649d38965c8951ec76
 AUX ftpusers 300 BLAKE2B 02489b8eed29bfd4cea148b1b4214ac5ba798faa44da1be68cea06c18680e44f0054c952107810e4a199398b6ba382c649a481cf9d7388cd5caa10ace50e06d3 SHA512 29a8bdca1a6bb516c5189e6c69969cba3c220ea878e352e78bb6ea5cb2ac7476306736240155dc6d3f7512aac48164354db68721ea952d1010639e8ae14635e0
-EBUILD ftpbase-0.01-r3.ebuild 927 BLAKE2B db4e6d0f12bb078c8ca22b09a8965c7065fbdd669dc436e80b544631eb944dd553d81e22235c835d29c57feef057780d1c78dcca7e3b50fcee695c23deb0c91f SHA512 587f5d0c8f157426cec5b7cacfcbd729f5dce4c403226ad8f6adbb49164dba2a88773b1773adf4eb4e21abf49432461f1704e2e8ffa0e28a91b41a673ffc55d6
+EBUILD ftpbase-0.01-r4.ebuild 737 BLAKE2B 57c9261641cf526027abe518458c58a682055dd4ff525ac3f30944e679a64c490a06004fe306be62fed870639451273fd15b082385c9f3a53dda2c7dc7a8b8c4 SHA512 44ff0ea193c476162f94b118681c08f0ca670a12e2618f09db67434bb78a193b96be0ee96c13d841e2d235560c38054b74fbc243c3e4df15f28047fd566586d8
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild b/net-ftp/ftpbase/ftpbase-0.01-r4.ebuild
index f278d506cefe..19eee733db9e 100644
--- a/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild
+++ b/net-ftp/ftpbase/ftpbase-0.01-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils pam user
+inherit pam
 
 DESCRIPTION="FTP layout package"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
@@ -30,10 +30,7 @@ src_install() {
 	insinto /etc
 	doins "${FILESDIR}/ftpusers"
 
-	cp "${FILESDIR}/ftp-pamd-include" "${T}" || die
-	if use elibc_FreeBSD; then
-		sed -i -e "/pam_listfile.so/s/^.*$/account  required  pam_ftpusers.so no_warn disallow/" \
-			"${T}"/ftp-pamd-include || die
+	if use pam; then
+		newpamd "${FILESDIR}"/ftp-pamd-include ftp
 	fi
-	newpamd "${T}"/ftp-pamd-include ftp
 }
diff --git a/net-ftp/pureadmin/Manifest b/net-ftp/pureadmin/Manifest
index ef8692e86b58..af5473f513ee 100644
--- a/net-ftp/pureadmin/Manifest
+++ b/net-ftp/pureadmin/Manifest
@@ -2,6 +2,5 @@ AUX pureadmin-0.4-QA-desktop-file.patch 186 BLAKE2B 964d5fa4353b6514dd70f997f251
 AUX pureadmin-0.4-fno-common.patch 1071 BLAKE2B 4c1b6be9a4f87a35f5359dd3e5f47ed1eebfb08096d02fef96d5a3cc0b54788ab5d399701be66d38a56c3f6baf28fcbf43a074870d866079cd20b073a6ba1dc0 SHA512 ac93ec4c8ec7deae4f2a2a4fc48c8448e15c108d74ba4d732bb523a07173f762ad2bac812d4d07bf0dfc260760e7898678305525f90ce7920d9236c1613094a0
 AUX pureadmin-0.4-gold.patch 583 BLAKE2B 8567eaf1f18d2751aed81e71a1fe947b3cb735421885e7010488204029a13e096c7d02cb7a425986d6c3ffafb2090105ae7f6901c1c1e452c8a557095375953d SHA512 71bf32b5a0bcb718ab41d1d8bd13d443a486ae553be8ee27142dd5a8a56e089700275e74d31aa1179cfb1a6ec8e8cfab3b8e5d01f909c01ca46d75685556f13c
 DIST pureadmin-0.4.tar.gz 386739 BLAKE2B e0699210d6f22f4043bd667e82993b019e8a58b16d42157be42f4497ee383e1da7935beca77491e105a1b3537ef1920cbe57b0cc8ce1e48fb30c01c491f9605e SHA512 46fd4caff0d6c123412478690411409038d5590cc7388993eed35fc33a34302b8310ae1ede971ed31cbf29ba4ef3b4c21ce5b8c9b225659b3110c6abcd1e78c6
-EBUILD pureadmin-0.4-r1.ebuild 1293 BLAKE2B d29a24337ed7162606ecdff73eca78c63695d7bbacbfa2628ad124c4aa43b12d03a6c028d5d439cd85cee0e9533a326bb4ee60b7f1f47892e945761852ae0128 SHA512 fb1889e5bb130b02c6d67471b4e125a1830389d88b00dfe293358e59876a9ca8cc8d4903d6735d57de0f1038dcfdf010ae85d4b476f2c73dc3bce5733fea1284
-EBUILD pureadmin-0.4-r2.ebuild 1392 BLAKE2B 17b6dfd5bc708a66f80d7167f5bf9b4992170a28b164b954d68487556c786fd81c83590bad2d11a1208e18659971989f21a9b3aba9728128177d9a136692cc3f SHA512 782991cfea38dd0a5408e19b6de0fd4c82960b4d6ec854b61c4a35d3011ea60f9f0a646ba429009d17d663bf2a6b7d522726dd164c2ab356f31c7f7f009e8137
+EBUILD pureadmin-0.4-r2.ebuild 1391 BLAKE2B 2bac911989580ed38e4f9938d4d6f0735255b01668021a614bd0a33d7e88afac16cb3d395d24e1e13b6dbc53bf828f62976d33cc60dc1c9df7d2e36e1111e6e0 SHA512 36af165ef740997f61e5895fa118e544b71bfde17b54d99e57a2b64dac0e59750788920303d86e63b27385790c306091cd0ae6103eeee551643a242b3a6cd0d4
 MISC metadata.xml 243 BLAKE2B 92e4be4dc62f417ee02761d2b2c43ab9b95775a33959160c8ca1af42923063413b128c2169b5d10dfa5b9a14753686f2df8ce32648935924e2e985800b2d6914 SHA512 b51712ea8ad59d4f1138caaa9889a7f35c9b3dea5ba47ee1e93b44d66f4d4d1faee4f52ff95c9c09041593086cf8cb3ba5eeca655a58a754df5e9f956b6867f2
diff --git a/net-ftp/pureadmin/pureadmin-0.4-r1.ebuild b/net-ftp/pureadmin/pureadmin-0.4-r1.ebuild
deleted file mode 100644
index e2cb7b43a5f8..000000000000
--- a/net-ftp/pureadmin/pureadmin-0.4-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop
-
-DESCRIPTION="GUI tool used to make the management of Pure-FTPd a little easier"
-HOMEPAGE="http://purify.sourceforge.net/"
-SRC_URI="mirror://sourceforge/purify/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="doc"
-
-RDEPEND="
-	gnome-base/libglade:2.0
-	sys-libs/zlib
-	virtual/fam
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gold.patch
-	"${FILESDIR}"/${P}-QA-desktop-file.patch
-)
-
-src_prepare() {
-	default
-
-	cat >> po/POTFILES.skip <<- EOF || die
-		src/eggstatusicon.c
-		src/eggtrayicon.c
-		src/prereq_usrmanager.c
-	EOF
-}
-
-src_install() {
-	default
-
-	# Move the docs to the correct location, if we want the docs
-	use doc &&
-		dodoc -r "${ED}"/usr/share/pureadmin/docs/.
-	rm -Rfv "${ED}"/usr/share/pureadmin/docs || die
-
-	make_desktop_entry pureadmin "Pure-FTPd menu config" pureadmin
-}
-
-pkg_postinst() {
-	ewarn "PureAdmin is at a beta-stage right now and it may break your"
-	ewarn "configuration. DO NOT use it for safety critical system"
-	ewarn "or production use!"
-
-	elog
-	elog "You need root-privileges to be able to use PureAdmin."
-	elog "This will probably change in the future."
-	elog
-}
diff --git a/net-ftp/pureadmin/pureadmin-0.4-r2.ebuild b/net-ftp/pureadmin/pureadmin-0.4-r2.ebuild
index 9932e66fe383..4abbc85ee016 100644
--- a/net-ftp/pureadmin/pureadmin-0.4-r2.ebuild
+++ b/net-ftp/pureadmin/pureadmin-0.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/purify/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="doc"
 
 RDEPEND="