gentoo resync : 20.05.2018

6 files changed, 2 insertions, 101 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 6f7c913bf10a..2aa355ea2730 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/oftpd/Manifest b/net-ftp/oftpd/Manifest
index 358b27f142f9..fc709cf76715 100644
--- a/net-ftp/oftpd/Manifest
+++ b/net-ftp/oftpd/Manifest
@@ -10,6 +10,4 @@ AUX oftpd-0.3.7-unistd.patch 448 BLAKE2B 4f69ab2c867f2c443c0a5cfc0637b92a486a757
 DIST oftpd-0.3.6-ipv6rel2.patch.gz 12478 BLAKE2B 1d367979261fff05bdfa22201cf06ae537d7bc7cd656708cd2c672b8c437ec8b42d94c84c387ee450da140feab4af98e4601a1126077acdd93959284a28548b2 SHA512 76d12b82424a9a338f151534df55310511d3138a1e80851e6ebb8f4a841cd075892ab1a02851d871772a2229c107ec35de2d5fb3572c72207a65629e10e55dba
 DIST oftpd-0.3.7.tar.gz 97364 BLAKE2B 4fef7204d905d248f5fbf1e641d015c0549dfcc08b0ad98ac3557250ca91dda2e25d0aaffe09c9d68d47318b977a637f693e5bbd359c20e894a656a412fccf59 SHA512 36bfd15dbe84043aee9678acbcc2c1312091887b381bee36a6a57f2516a5ec742a1733bf570c7cc71aaa28bd053d686976e6bfd549443a8bb398f8176db1a6a8
 EBUILD oftpd-0.3.7-r10.ebuild 1300 BLAKE2B a91dac4853eafd26eee790ed50adc993ba0a9dc4ce4ae76c52c2b3db4ec42fdc81f1593908c20ada6a1f2876d6e6bcc6ae07de300a452d8ef273baf81902fd1f SHA512 b7a7edeb28fc46bd16d574b67ad04248bf7c6b023cd7cf539a876e13949a50e2842014b7ba0e10b36a72370f6cfec1054b44151f8e8191fd7922dfe4dda81a8b
-EBUILD oftpd-0.3.7-r8.ebuild 1142 BLAKE2B f7349d9da7243c6e78cc17d59df6356120cabc22d21166023f3c0cb625555abfac1b397180b6b033d6662b84b91aa069a4d2c17bc1c2d9a19ffeeaa9e199ef6f SHA512 4b1da7307d64982fc1ed31bf71908cfde352ff8e19219a16f7744d18de62b5ad83b6939384342f0120fa982641c595e42bedb948c592d96d26f13379c7be1c50
-EBUILD oftpd-0.3.7-r9.ebuild 1199 BLAKE2B 2c9edb9d1dc5ae6a4d54f925640b5b2a73f6da56fedb3c88f51553525fa146cc054ac9ac298f96e81aa05e50acd2259a9afac9852ba8326f38c60844e082b868 SHA512 89e5f21643f26c2fbcc855fe1a473918e17949cddaeedb9137a41636664205166b53e3d7716e606f867bf8057194247071aa73948cd397b930545def3013437b
 MISC metadata.xml 243 BLAKE2B f6898ed42cda5e8c4bb81d5737f88ff6118fe3507e7ddcebf4686fa26effb75d03176ee091289e1011788f1a98cab52d5374e29dc04c2c298112c47a2c336f02 SHA512 efed1be9deecfbfc884a140e4ecb918eb473ec755a7910ab9afd29fa236d3c34c09c8d11454a0f8c26331539cbad1461f4824ff348b7fb7335cc88fb51d3882b
diff --git a/net-ftp/oftpd/oftpd-0.3.7-r8.ebuild b/net-ftp/oftpd/oftpd-0.3.7-r8.ebuild
deleted file mode 100644
index 431e783eb9b9..000000000000
--- a/net-ftp/oftpd/oftpd-0.3.7-r8.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools eutils
-
-DESCRIPTION="Secure, small, anonymous only ftpd"
-HOMEPAGE="http://www.time-travellers.org/oftpd"
-SRC_URI="http://www.time-travellers.org/oftpd/${P}.tar.gz
-	ftp://ftp.deepspace6.net/pub/ds6/sources/${PN}/${PN}-0.3.6-ipv6rel2.patch.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="ipv6"
-
-DEPEND="net-ftp/ftpbase"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	epatch "${FILESDIR}"/oftpd-0.3.7-ipv6rel2-0.3.6-to-0.3.7.patch
-
-	cd "${S}" || die
-	epatch "${WORKDIR}"/${PN}-0.3.6-ipv6rel2.patch
-
-	# Don't crash when using an unsupported address family, #159178.
-	# updated in bug #157005
-	epatch "${FILESDIR}"/${P}-family-1.patch
-
-	# htons patch #371963
-	epatch "${FILESDIR}"/${P}-htons.patch
-
-	epatch "${FILESDIR}"/${P}-unistd.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf --bindir=/usr/sbin $(use_enable ipv6)
-}
-
-src_install() {
-	default
-	keepdir /home/ftp
-	newinitd "${FILESDIR}"/init.d.oftpd-r7 oftpd
-	newconfd "${FILESDIR}"/conf.d.oftpd-r7 oftpd
-}
diff --git a/net-ftp/oftpd/oftpd-0.3.7-r9.ebuild b/net-ftp/oftpd/oftpd-0.3.7-r9.ebuild
deleted file mode 100644
index 510f2bb03cf9..000000000000
--- a/net-ftp/oftpd/oftpd-0.3.7-r9.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools eutils
-
-DESCRIPTION="Secure, small, anonymous only ftpd"
-HOMEPAGE="http://www.time-travellers.org/oftpd"
-SRC_URI="http://www.time-travellers.org/oftpd/${P}.tar.gz
-	ftp://ftp.deepspace6.net/pub/ds6/sources/${PN}/${PN}-0.3.6-ipv6rel2.patch.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="ipv6"
-
-DEPEND="net-ftp/ftpbase"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	epatch "${FILESDIR}"/oftpd-0.3.7-ipv6rel2-0.3.6-to-0.3.7.patch
-
-	cd "${S}" || die
-	epatch "${WORKDIR}"/${PN}-0.3.6-ipv6rel2.patch
-	epatch "${FILESDIR}"/${PN}-0.3.7-delay-root-check.patch
-
-	# Don't crash when using an unsupported address family, #159178.
-	# updated in bug #157005
-	epatch "${FILESDIR}"/${P}-family-1.patch
-
-	# htons patch #371963
-	epatch "${FILESDIR}"/${P}-htons.patch
-
-	epatch "${FILESDIR}"/${P}-unistd.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf --bindir=/usr/sbin $(use_enable ipv6)
-}
-
-src_install() {
-	default
-	keepdir /home/ftp
-	newinitd "${FILESDIR}"/init.d.oftpd-r7 oftpd
-	newconfd "${FILESDIR}"/conf.d.oftpd-r7 oftpd
-}
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index c3b915d099f6..c961ddf78946 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -6,7 +6,7 @@ AUX pure-ftpd.rc11 1990 BLAKE2B a0f4bccad43ae3f767188326ec1853c516165c0268e31756
 AUX pure-ftpd.xinetd 247 BLAKE2B aa2b0f8b4b6ff45e9b8dd632af5ff680ddd5abe51647dda91ca78bf3cb9ba9a090b20433f460213e95b8e57958d711f4bd7fa594b3d33fae818b853ec5aaee5d SHA512 e8ac0527daf1e182e7514d17f04bd20e789231e627cc7228ac23a241a4c420204a61ef9438c57e63f402eb3608ae0acc15a72fe484c99bb4e172bbd5ece2b72d
 DIST pure-ftpd-1.0.45.tar.bz2 497695 BLAKE2B c905675253d992757e44baf1fae42d8363789ce3eb4d71d6f0e5c994a63efd307af69fb81aadb1875f0f2da952c0b3c8fbbc79c9c5c0b22c2d2f82029b417f11 SHA512 bb22b6b88778e2586411318905aa165e590185f7a87ac30761d6250f4de22a1deec6be5441926eae28011d3a5a923bad2ac366e237cc96a4d7932e3dbc9a1f2a
 DIST pure-ftpd-1.0.47.tar.bz2 489177 BLAKE2B 06e71ead47b87dedf47a84e488b2de127fcd297c2e9ca7a617c2ee2760cf55b816884763721826c512558d016cbd38a87a11ca0e8c2334d93145edc6f88d9287 SHA512 c1920a3f67f04635fde600fe226a7730b801e7e64658b25f1d9f9c0b35a704664be4adfb0b291594f7e0f10beade25eae9a5e6cc3b6777a3b413f3c2d9574e63
-EBUILD pure-ftpd-1.0.45-r2.ebuild 3944 BLAKE2B 6aae69a820f6bc379f0bcf42daf5a7047a4bc424a44b7018cd59d2b644329f3669d620a75e3eed9f7748a056ce667435f5babf7587268b7a969454a5cf14c306 SHA512 232589647aaba6adfec80a8cc024c5674f27968f4db3491711cb6cf00fd30515eb224b0a93de3bd618066c2e4025372d0cc906be9dc4159fb4c867ff92ba4af0
+EBUILD pure-ftpd-1.0.45-r2.ebuild 3945 BLAKE2B fcf652d9d3cf7e1e0619296bd04e035493ad0d8711da57f0820823ac38965b6baacc120843e0ab623e246a244d79581291b4de8fe1569b212e056cf9355cd106 SHA512 8d95be72f88c8d758a3272478a96d5ba8997e24f5d229df6ce2e65f8119631814191585120bb944d8198762b5661c106fd6ceade58c38b2766a319d2ea9e05a1
 EBUILD pure-ftpd-1.0.47-r1.ebuild 3915 BLAKE2B 0d216396715a08d42477a4b6fe8d846b08fcd941e704a870e8e9b4a4c8dc0f41f9ecfc52e148d2a954349fa77393b65c17bb8180c7a4ffa2e0cbb77055b1499e SHA512 85e3ff0ee728198655a72d85f363e13c806f2c5316c24e6434f7d52b643908b61289c5d38cc45f654797bc62d6e4420813764d0021ed57c5a8c800de1fc5272f
 EBUILD pure-ftpd-1.0.47.ebuild 3867 BLAKE2B 0c1930e2ddc0aa3efbbe1388d6017fcd5fe0e75b399819676c23c14b9b26eb4a9e2d124c086454fe522d56b2c75940e0fae6d6501ef26a82d8ae9d04c7289afa SHA512 02420399d83ba5e5d54fdca2b57dc87a28f23bd7a39f2ad28960feb30603a5b8ebc6614bae77fedc87a4a73f1ac3c75a5a878a815908a6440e0ed7a59df6d855
 MISC metadata.xml 1233 BLAKE2B 02ea0260dacca81d5b2eef251f98756f151b03ee7abcf3ccc46832167848b8aa80dba90d855c118908b87ce7085921cae81f3a747402c5e0fb70401dd668150b SHA512 ce47470d3c8bfeba9c02f6d6638e7b0bb6e0ddeddd1aaf0362342aadf07e823f1093523a1432c703bd410c3b760049a1e1c32e3f36718844b3a1ba44144afea4
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r2.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r2.ebuild
index d448d8f15cd2..496333d7e7e8 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r2.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 inherit eutils flag-o-matic
 
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86"
 
 DESCRIPTION="Fast, production-quality, standard-conformant FTP server"
 HOMEPAGE="http://www.pureftpd.org/"