gentoo resync : 10.11.2019

5 files changed, 2 insertions, 58 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index f492332e751d..39d54b3574bb 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/ftpbase/Manifest b/net-ftp/ftpbase/Manifest
index ac25704a0732..08a05646b655 100644
--- a/net-ftp/ftpbase/Manifest
+++ b/net-ftp/ftpbase/Manifest
@@ -1,6 +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-r2.ebuild 1446 BLAKE2B a0110890fbe381b7facd47dbef24eecc9d20077e8a162a57aa431f29fe8dde8ea77b9f3259f88b0188af541eb371f239d7b097303dbf14797738f3630af0cd84 SHA512 ce63497757547f916e94e6c42e7e174d30b1a6865011330fb77296d32917707bb3ac406de9e66bcb65186c3040b125db39239d2a1b7a1eb42263db191bc31044
 EBUILD ftpbase-0.01-r3.ebuild 916 BLAKE2B ff3044d2c9411ab76df784d83081bb502ec4556e3b3649b4918ede39975744448db18d1dcf912b45b3f507d8509c7c7354ffdbefd3b30f451061236a513150c4 SHA512 8053ee744deb339d1bc4b93b6fe4ef19c0baf76a4a5edbf8393f7a379dac71481bf2119f64300b335818eaf49ae42c62df5ed623fc3b6db01f8a3d4129e78fad
 MISC metadata.xml 235 BLAKE2B da947ee7650abf01b4eee1667349a14d2d8d496ec234acd60db66c1059d42d6e9a1d30403068b7977a397f4e0a2934fe4e7c2c04d356b2c23a5e8a87ac7266a1 SHA512 fa78af8197737bd5d9b44305bac24dacac9034fd96284af1e3c89428fc418e17a4bea91fa53f07dce02e6ab8afe6455343db364d031ab342225a26d0364c23da
diff --git a/net-ftp/ftpbase/ftpbase-0.01-r2.ebuild b/net-ftp/ftpbase/ftpbase-0.01-r2.ebuild
deleted file mode 100644
index 370bb9c1a29a..000000000000
--- a/net-ftp/ftpbase/ftpbase-0.01-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils pam user
-
-DESCRIPTION="FTP layout package"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="pam"
-
-DEPEND="pam? ( sys-libs/pam )
-	!<net-ftp/proftpd-1.2.10-r6
-	!<net-ftp/pure-ftpd-1.0.20-r2
-	!<net-ftp/vsftpd-2.0.3-r1"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	# Check if home exists
-	local exists=false
-	[[ -d "${ROOT}home/ftp" ]] && exists=true
-
-	# Add our default ftp user
-	enewgroup ftp 21
-	enewuser ftp 21 -1 /home/ftp ftp
-
-	# If home did not exist and does now then we created it in the enewuser
-	# command. Now we have to change it's permissions to something sane.
-	if [[ ${exists} == "false" && -d "${ROOT}home/ftp" ]] ; then
-		chown root:ftp "${ROOT}"home/ftp
-	fi
-}
-
-src_install() {
-	# The ftpusers file is a list of people who are NOT allowed
-	# to use the ftp service.
-	insinto /etc
-	doins "${FILESDIR}/ftpusers" || die
-
-	# Ideally we would create the home directory here with a dodir.
-	# But we cannot until bug #9849 is solved - so we kludge in pkg_postinst()
-
-	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
-	fi
-	newpamd "${T}"/ftp-pamd-include ftp
-}
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 0ec36dbd1367..4e3478c94776 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -26,5 +26,5 @@ DIST proftpd-mod-msg-0.4.1.tar.gz 8082 BLAKE2B 970b46b19d25bac22ecb01495270a5239
 DIST proftpd-mod_clamav-0.14rc2.tar.gz 19710 BLAKE2B 3435e198cf029337904d4666910414124a3b7e1529d4b12f7acd8a9be563009fff4d9a30eb132a2d7361d2c830e5601c4a00a8814282585b6915e991cc29bc13 SHA512 b8e56880fadf36513215fa4c20be6db7cdf1274337072a9b29c3c3477b3de4743ebcdb1179572ec4cb1501fac0064330c855b1f818bf0cc52f0e91170f059772
 EBUILD proftpd-1.3.6-r5.ebuild 8696 BLAKE2B c03fabf7f49be982302ea74eee75580304dae1393d7a452e9aacadfb5790b6b49a82320999ef4a9863f90e26d48788301ae423262172d3f1c04a5e18008cf0e9 SHA512 e64ad6c8e38b8b81dfc1dcef02c05e0ae591972baede8642df393b521499652075e2c970e6cd33cc1bda2e0f853dc79ea7277ba85d4a5df4ce081cb540d323cc
 EBUILD proftpd-1.3.6-r6.ebuild 8756 BLAKE2B f38b4a1066f45b044497f72f4f7467e09c7fcec70cb68ac09095f65aa872f8d4c91124007c6f62bf04e88fec45e56b3a687936fef476ac5f8ca182a241cf7328 SHA512 6a7963148c4526cf8234ffc964165f290968d1164b140e4e85764248140c990efc58217f87b58f18c18cfb7998294347747d5dd884af92b3d4c216b694141898
-EBUILD proftpd-1.3.6b.ebuild 8643 BLAKE2B c4ca7605b23def3b33af90a2d4dac3d3e860801fa08398cf1076010295184be42099cfcab39ac1cb7a534facba91bf74df703186cde2f234dfe6e65767008fbd SHA512 4d022316ba35ee8903d402530b50e3a298a5ae2201c99b6d8179bfc85a4adeac84af94f75e03e14a1e6a0b2fc97817eade8b33486250377d4722d93c7f17890a
+EBUILD proftpd-1.3.6b.ebuild 8642 BLAKE2B 4b2833164dbc7ad4c3094b1efa45af00669d3217d491bff8db75be2f12c786f37447ce2d18851f9c61694d0a4b1dfca8c4cd29d241c164dba12d5418ce2e9929 SHA512 1836470eb6d59e847366e8491a5bc396f27048f35b2b5ca8127415c5d547341dc0e64dfd2186aa936fbf378214c1dcf46414b170e12b14bbeb0754f49802cdf9
 MISC metadata.xml 2930 BLAKE2B f3f8218a737f50599ff687030bd8c84f1818b290d6d89bd6627ab8eb02598d196f1bae03d7b15e4eb02967fb7e0d826cdda10588c8bfe4f8a387a49d70d9cab0 SHA512 c90941671532512e4d085f3c6b4f56f3c2a252a613bf5c978d763fb0f8f9190431a41816f4fddde47e28eaeddcd17a7aef52064e5825499801bcdfbd72745be8
diff --git a/net-ftp/proftpd/proftpd-1.3.6b.ebuild b/net-ftp/proftpd/proftpd-1.3.6b.ebuild
index 2d371bcb83b3..e8c605dc56e4 100644
--- a/net-ftp/proftpd/proftpd-1.3.6b.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6b.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6
 	kerberos ldap libressl log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
 	ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot"