gentoo resync : 03.11.2017

3 files changed, 2 insertions, 54 deletions

diff --git a/net-ftp/ncftp/Manifest b/net-ftp/ncftp/Manifest
index 4e7eff40fd9a..3075853b6e12 100644
--- a/net-ftp/ncftp/Manifest
+++ b/net-ftp/ncftp/Manifest
@@ -1,8 +1,5 @@
-DIST ncftp-3.2.5.474.tar.bz2 454682 SHA256 b4ebe2415761a5137cd1d313c8fc1352f26d8963cc9e9e354e29720aa2089d42 SHA512 ebd7f618e5a9ac5e59f3e3dbf9b15765e80404416865212c0b2ee7339aafe2296867faf02fad2084e5a6377796e787d5cfc6599ec3f0e544c6b137734cfdc405 WHIRLPOOL 4b9c0a6bc5b90149d3a1b9ea24dea030faefa4dfe9e361c7694a2e1f133182bf85e46041de209a9a34d7be81b70870298c718a19dd41458dbc9c90283478cfd8
 DIST ncftp-3.2.6.tar.xz 418836 SHA256 7abd3e8f848f0efb4bb6a4bc5da58a59524d4378fc8d70a52adb0fe1fd00b89d SHA512 040db7e2ca2ee78b79d682a951fd98c1e0ee2936b64462259992d70c51241fa50ae06c66b4f40933ad0ab7122f581bbb8ba7cda764dba5f70a1f8c7d3d751199 WHIRLPOOL 9d41e9e1f9119482cdbb10b819a48b0e58e2df2f3f56fb1ccd0443527592d31aba48642b1831b272231fabb230b0c7c673099d2d272a6a9077001abbb02491a5
-DIST ncftp-325-v6.diff.gz 23295 SHA256 7fb95240c33aeca67e53be58f6016a7e1dcd753b125940f539dab7595e0d02ba SHA512 6e2e740fba2c2b5268ab5928db979ac813bd29dd76633603d69d747fdf765858e1de893a6067518b0b1f01d0b90d8d6426998f5d9b37bbbebe144951878e2b0a WHIRLPOOL 2f7868bdc0e74707a0b0e2e8a2a1b7d0634fd86ff440e5046a48d5b01c1efb86621a5844d56b0e8793d243fa1a998b6136d147a1a9aeeb95c00e1d312415ebb6
-EBUILD ncftp-3.2.5-r3.ebuild 1167 SHA256 2c1ffedc45bb169e925eab4515c763ae5771f46917cc7adf1d4617fce16a9390 SHA512 e17fbd19e18b55cf757cedca548a0568b366ee38dfc370468a03daecc9d5f028e3045999e54875e85bfc00c45bf32ac1fb7c50c7abbfed62fb1b89dc9e7c16ba WHIRLPOOL 1a6d1975cf8befd7e0c5e1c2d8ceeac793f88759d5af1e9ff0b6ab1ea48f16baa0ceb44c7f2b01ab1dff146a1ea9061c3b685d31fbd6b8be36f50ef06233da76
-EBUILD ncftp-3.2.6.ebuild 1059 SHA256 ea8743d757402770c68f27c4aebd855e4a4344b45316c0850297a5dd44ba1428 SHA512 3008cd651504685fc2fdc0121df8825b3e69038917f4ec925d0b77b96bbfb87e53bcee1901203780a6c78c53f478f2305e6c90ede211111e2ad4672ceb4ed5f7 WHIRLPOOL 19509eef59522bf63c45e7c960cc6956e028af3d5a8e3df4f70cbf273c3b429434b3709aa560faf7df9f66e660461608c04494dee2dfc02ea347eb505c306f0a
+EBUILD ncftp-3.2.6.ebuild 1058 SHA256 065ce428c3fc7d529c2f21ef42db6fbce9abeaf7d5f86974d280dfbc6a6bd4fb SHA512 3425f30eaa416e7a03f25de9914e0d814f9104fec7714cae9dfbc9ec06121b8a5367831914fe1b811e0330e2fda50a11a1554413c603b60a8f8bf7565178659b WHIRLPOOL dc95f9fd2d1c19072f2d963fd0aa788cba3a6596ac184375a3e698201c75284ebc59495d35a8e96793a49fe9ba9fe00d086c8909c336cdf70153a5ca1705ff99
 MISC ChangeLog 2322 SHA256 9fd24ac61d902f6f69d1fc2e7538514fd21c16a2cfd52f346b52c1a53ef0d426 SHA512 b9c010dbaa123607a58c6d242e623a035e1f077e8a44b44ea413d5bc81f990db4cabcced811e98ffd8e500ca88ea494af9ab6e1992f5a43df3dd0686c86dccae WHIRLPOOL 0c7e1ad3f4bb741c127228be97f2c841b19565696e942106aa638d63485c8549ed359746f4d1048c8db7b772c6f825bdcfd78cee57142a82a795829a067a9ced
 MISC ChangeLog-2015 17803 SHA256 34f41bacc4fdf891983dcf4095aca1c5f28015754e4bdd9dcd29162c8bd2597e SHA512 b6d0a8be68acc8fcdf0c3a745685196808db6803991039f44f71d54c65ce930288fbe37c24aee47a623847c1a372c108897e5bd39321e18e821895965df5a1ad WHIRLPOOL b7f44ab88ccfd667a6632ac24cce1439e09170a15378077c872566499d4b477eb22091551689f59f586ac1cdac512d9486b639201af705d6cfde8d559ab83650
 MISC metadata.xml 738 SHA256 719fb096a36c8d1be308c67234688f6af2dea89fe59a0ef3445fdcc76d61008f SHA512 e792a9cbbc371515f5137c4c00faad6936b4c6cc27bcfd5bfab151b00002ae8159cb9b76777a4bdd59dd87ea951ea62898ac74f6afd8a4ec0a1e5dcec12210b3 WHIRLPOOL 6b08b542a318a5ab4e01163db4c1a631fbb709c4e0bb0df4842c30145583874dfce9a859206f0b4337e8e929e2cf5332bbb54d5892747a8fd14f2b79faaa35f3
diff --git a/net-ftp/ncftp/ncftp-3.2.5-r3.ebuild b/net-ftp/ncftp/ncftp-3.2.5-r3.ebuild
deleted file mode 100644
index b0903768db2b..000000000000
--- a/net-ftp/ncftp/ncftp-3.2.5-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="An extremely configurable ftp client"
-HOMEPAGE="http://www.ncftp.com/"
-SRC_URI="
-	ftp://ftp.${PN}.com/${PN}/${P}-src.tar.bz2 -> ${P}.474.tar.bz2
-	mirror://openbsd/distfiles/${P//.}-v6.diff.gz
-"
-
-LICENSE="Clarified-Artistic"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
-IUSE="ipv6 pch"
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P/.474}
-
-src_prepare() {
-	epatch "${WORKDIR}"/${P//.}-v6.diff
-	tc-export CC
-	sed -i \
-		-e "s:CC=gcc:CC ?= ${CC}:" \
-		-e 's:@SFLAG@::' \
-		-e 's:@STRIP@:true:' \
-		Makefile.in */Makefile.in || die
-	AT_M4DIR=autoconf_local/ eautoreconf
-}
-
-src_configure() {
-	LC_ALL="C" \
-	LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses)" \
-		econf \
-		$(use_enable ipv6) \
-		$(use_enable pch precomp) \
-		--disable-ccdv \
-		--disable-universal
-}
-
-src_install() {
-	default
-	dodoc README.txt doc/*.txt
-	dohtml doc/html/*.html
-}
diff --git a/net-ftp/ncftp/ncftp-3.2.6.ebuild b/net-ftp/ncftp/ncftp-3.2.6.ebuild
index 6d1ec1918465..6186cd069fa7 100644
--- a/net-ftp/ncftp/ncftp-3.2.6.ebuild
+++ b/net-ftp/ncftp/ncftp-3.2.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="Clarified-Artistic"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
 IUSE="pch"
 
 DEPEND="