gentoo resync : 14.07.2018

5 files changed, 30 insertions, 2 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 83d92529b3ef..2fef14b51940 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/uftpd/Manifest b/net-ftp/uftpd/Manifest
index dd5c0c342e09..3a42a23c716b 100644
--- a/net-ftp/uftpd/Manifest
+++ b/net-ftp/uftpd/Manifest
@@ -1,6 +1,8 @@
 DIST uftpd-2.4.tar.xz 173132 BLAKE2B 5bb1d90a2353e34d1a2346fa09c9843e598827875cc2c09beabf3916e34693dca17bc0d1f00773ce823cb79685204a20fa16d7abc8d4c88085dd1bdafc7e5acc SHA512 1ed9ed4429a3e7a08ac902ebac95610e58164f3528a8fc00a745c0545aae4e13d3bcbf597bcae6ba045b24ee9ba3c39ec0617068920bcc4bbc3f5ef246d4c404
 DIST uftpd-2.5.tar.xz 178652 BLAKE2B 888f6a6be9752d36470de0aa0dd3ec5ffeca335099897fb9a03a0573752257b88d5662f53cfb8c078f2b8efe3dd384b12833def2bea38c5440915b60b3832e78 SHA512 7f7f80f0a291cf57d68570de62c663804af0fa0fa4f0e5e199280c97d0d662881a05d1e0cc908f33e85cc8e07d825813e63271a94a69cd2e6bb974820566ccac
+DIST uftpd-2.6.tar.xz 93532 BLAKE2B 472b6dec74d5df50a93c27f85cff1ceff9bac8bcf3343d7ca7842e2bd51813ba8c0b5b679062eba5dccca0d5ec586302ad7889dd69273b4e08fe6330d70b7dbd SHA512 56e893cda1e807b01021130a763d6409a0e480f7dfb03e3ac9378d76d459a38c9c602d7fac523c3cf353fe972a61e2f8c131003e7dd0c07e5588f3a18b3e3c4d
 EBUILD uftpd-2.4-r1.ebuild 457 BLAKE2B 33c4de8d31cbf9d7c14efd8173fda8136afc8c3fa4f43d964220c9c7c05cd6ac95d1dfe2556b1887e6a3545b05dc4c45be537ce034f423cab6fab714406c061f SHA512 f0451976a5643cc09a4e185c4c01b8a3ffdb7ade01609f68b849af1697db1cfe45b1ed2709b18934e847f02bce3b061cddb221788184a5b57a202398f84bfedc
 EBUILD uftpd-2.4.ebuild 428 BLAKE2B b047cc73d1822a2f401074c34aaf804b3fbf7a3b87b3d7e217c96f8f7f000f7dbfbb0fd695b8e69021910d23e49c388ea39c404c4f514e1bf19bb14f663d57b1 SHA512 94172f2592ca4164e8eaecbae9fcc12d972b4ab2703968cc80eee7a034f557d60840db8ee2c4546956a200c3b98d48b8efdbd02b8c852fd6ec89da4f7be40634
 EBUILD uftpd-2.5.ebuild 511 BLAKE2B b3a02f0678a9dc91cec8ecaa10ed8836b0d59ea616705195afe880490c960ff48bdbffe6b70f35c66b075bc5ac6cb9188bbc163eaeb37c7ba7d5bd9ca9337e9a SHA512 99fde323bbaf3da57bc17f65e55556f8a87c8528c1fcc4cc57ce7c084bd41c21a29049a38c6273d7273f61f35ef4dcbd9483edb6328fc1d0f350446e5caf0eb1
+EBUILD uftpd-2.6.ebuild 513 BLAKE2B 40927218cccbe80700c23723d4f96e2134e76039bbe2dc6887e9b743f4397f7af5ebd7b2afb37e12f5731be4d7b6217e0f02c24c7a731cd9f52bef4859c4a31a SHA512 b836ceee94a9b610c50ae864b320830cb2855093e4fa922caf5fbd7c8767f63a1b4fce0db196d1a2d20df5cbe88da12d78f16561aaa670c16169b5e32056327b
 MISC metadata.xml 919 BLAKE2B b8bb2ddc64dc727547cf908e62df335d5cdf71132a2292e14a7e995d48364de64adde5d0035af3ddbdbdd8b64640b929cd3de0cdd62f49e2480154b1e5d543e4 SHA512 fec60605c1a67eee40734f15395129e76cfd0d0fbde24e977a61973e960704cd5be83e68094d45b0b2ce9b688c5d27cf41c4fb540094b7be532e1563ab622d31
diff --git a/net-ftp/uftpd/uftpd-2.6.ebuild b/net-ftp/uftpd/uftpd-2.6.ebuild
new file mode 100644
index 000000000000..db164de0144d
--- /dev/null
+++ b/net-ftp/uftpd/uftpd-2.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="The no nonsense TFTP/FTP server"
+HOMEPAGE="https://github.com/troglobit/uftpd"
+SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/libite
+	dev-libs/libuev"
+
+RDEPEND="
+	${DEPEND}
+	!net-misc/uftp
+	!net-ftp/atftp"
+
+src_install() {
+	emake DESTDIR="${D}" install doc_DATA=README.md
+}
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index 32a3b9f0b687..b59bde7d24b0 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -26,6 +26,6 @@ EBUILD vsftpd-3.0.2-r3.ebuild 3661 BLAKE2B 16ee2fdf7dfaf0c8a3149b02ab512caa9c66f
 EBUILD vsftpd-3.0.2-r4.ebuild 3661 BLAKE2B f5ebacfb33b4ed0b5b91aff5bfcf15e13bde730ccaf3baee1f42a7aec2658ec2100b1ce28c95089c0d877a61f21dfa194a5b37213138e1b029f5f339ecf60d50 SHA512 7c08ecd9613820e3ddc97c39f10cd07b26b501881cebf2097d7fb2fb86682545dae6347e3551bb31cec1b9ac0045792435856bc8437cd556205d952d64f537d6
 EBUILD vsftpd-3.0.2.ebuild 3149 BLAKE2B d0e49b3fcea35ef606a68754cfbcc1a27241978cd68be9d6147af914acf58c38cb92a85b99a16e16c5ae4f014087b60568a7a6bc35f4b01c33c0a88c79dd0709 SHA512 b34f37765dbce220c4416ac509e38c04b8770d280d4f05ed414a87940671b35f4b8959a2b3b551b9059993ef8f8e6f0163f628f087afcf166802f15c299ea2de
 EBUILD vsftpd-3.0.3-r1.ebuild 3652 BLAKE2B c84736785a7023e1373d3439dc57a7da549d66d2febca816151b45a7cf0b0d0dc94a5738a96b3524fbc762734ae264396fc36b854e560f61e5d6ab4e4eb16780 SHA512 55b936fc31fe73981d89f5b87f8042e3824faaa1414df6403a9b4c7251d455b615e1cb548f88c05aa622c76f07757326ba95dc8e81ad1f1d270dcd763d500c33
-EBUILD vsftpd-3.0.3-r2.ebuild 3707 BLAKE2B 5b34da59ef11e8967962402bda5d68406a587a6ee8fd54e60e2fc11754b53f338187be610356de21afe2046ee3162e1bbb6ea6f2599e1dfd60378b0f674d8d26 SHA512 7db4315a4d89db53ff5e4c714e201a30a5f63a9efbbe07ce19adf170530814cf5175fd8d49f66efe77d097e200dfb64540ac1a7a71610b5289d1004f67b3da84
+EBUILD vsftpd-3.0.3-r2.ebuild 3706 BLAKE2B ea396f463bd91bab18c73b1a962b2f52e3e61552448d6a847b8014f723f3861f93da3794b41e18b224d6cc6c10935523cfebdc784b7cd23d9d7a867c2a5202d0 SHA512 6fb9ca1d426cbde4d668c1ec90bc01c09718259a05b04748c4e9b864f034707f79d9a9a1459b20d61cd90e0b43070f9facd7b5b53ed71f19ee4366b8edef9e8d
 EBUILD vsftpd-3.0.3.ebuild 3594 BLAKE2B d12430e805fda76679da43feb7554fc63f2ceb39376c3ff5e6fd7378d29a5bce023d153e1e7ae20178b41bc87938226e3ba95e66cf51c382817aecd2af643f95 SHA512 967e258a7e72cab67c5adc433658687593fecd89894845e58999d0f40aa13ff39aef8a1eee53751b7b2fa623faa085830c7c6f0c75723c72ff68cd8611138649
 MISC metadata.xml 372 BLAKE2B a6655b8af8eb08968f4d61f1b7ee6720aa0096f27ee54794fb97cc218d20700189a6769632e792d222ae86d368c47c7bd4d9f8d85bf25e26970e6c4d1d837a26 SHA512 d673dfbc265acd4e0231111adcd9d099b6a465a508f64b031edd12601ac45cded8994eab8b3bd912ab00858197c9d68c4f83d461cd19a488e67daa055c2db334
diff --git a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
index 682c7ee1a2fc..058433db1b66 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://security.appspot.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 IUSE="caps libressl pam tcpd ssl selinux xinetd"
 
 DEPEND="caps? ( >=sys-libs/libcap-2 )