gentoo resync : 11.05.2018

3 files changed, 2 insertions, 48 deletions

diff --git a/net-ftp/oftpd/Manifest b/net-ftp/oftpd/Manifest
index a258fdc25527..358b27f142f9 100644
--- a/net-ftp/oftpd/Manifest
+++ b/net-ftp/oftpd/Manifest
@@ -9,8 +9,7 @@ AUX oftpd-0.3.7-pthread-cancel.patch 797 BLAKE2B 07b08302c9cb1b50454031c16b2b01d
 AUX oftpd-0.3.7-unistd.patch 448 BLAKE2B 4f69ab2c867f2c443c0a5cfc0637b92a486a757d43a39d5b02ba81ebde87535949e4d0f6e5afa9a0d7c248477746f917a92091ca36d764f1896f60a007495662 SHA512 0e0ad78eecb9f2be425fcda44e624fe118ceb0ccb094a05bce96a9bb1268bf58e4a8efab553e767d4ad2165e9bc5b360f5d36ad28b21ccfee35f9a2809a96d7e
 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 1302 BLAKE2B 23f6df78911647ab2c89bcac21a591e3c209b532098edb1ac4612ace8bb51f7e66720edd8a99da1f045db538ec96ac901872a942036907ad88af516144720e64 SHA512 5d6d12cf2dea696be1ec86b9916598a6accedcdf7c945ee6b89a1ad1486a1357d5b94d0aaea8a1b837fd41583451dbb483b8ba1d3a5b12e2dd8bbe52cdeb3f06
-EBUILD oftpd-0.3.7-r7.ebuild 1122 BLAKE2B 92dc5aeffad04e5d801d592c1f49ff6e2f451ec2526590806f1684ab919f82ca69e39a41bb585a8e82c3bcae00519e75975af1b8d07b34e2c314cbe416814247 SHA512 c87bbc4ab04e0e3c58e97f99f1b1f8a5fbb7039b0018fc6a0145f87895612f14e6a585c31df9d57c1843b778519aa9f504ae9aa1fadcfd3d6943fe21e3930d10
+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-r10.ebuild b/net-ftp/oftpd/oftpd-0.3.7-r10.ebuild
index b1c5b9e701c4..b8a810ca1888 100644
--- a/net-ftp/oftpd/oftpd-0.3.7-r10.ebuild
+++ b/net-ftp/oftpd/oftpd-0.3.7-r10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.time-travellers.org/oftpd/${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ppc64 ~sh sparc x86"
+KEYWORDS="amd64 arm ppc ppc64 sh sparc x86"
 IUSE="ipv6"
 
 DEPEND="net-ftp/ftpbase"
diff --git a/net-ftp/oftpd/oftpd-0.3.7-r7.ebuild b/net-ftp/oftpd/oftpd-0.3.7-r7.ebuild
deleted file mode 100644
index d898a4dba669..000000000000
--- a/net-ftp/oftpd/oftpd-0.3.7-r7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-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
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --bindir=/usr/sbin $(use_enable ipv6)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS BUGS FAQ NEWS README TODO || die
-	keepdir /home/ftp
-	newinitd "${FILESDIR}"/init.d.oftpd-r7 oftpd || die
-	newconfd "${FILESDIR}"/conf.d.oftpd-r7 oftpd || die
-}