gentoo resync : 19.04.2018

3 files changed, 2 insertions, 42 deletions

diff --git a/net-misc/wput/Manifest b/net-misc/wput/Manifest
index 10b769c04eaa..3b81cdf8262f 100644
--- a/net-misc/wput/Manifest
+++ b/net-misc/wput/Manifest
@@ -1,6 +1,5 @@
 AUX wput-0.6-gentoo.diff 641 BLAKE2B 2876ac3eb4f42590d01cde847cd5866ddfc7cd7e4630d901e573ef87f8b99d55e08c063c8ff0e497fae3cc75ccb72acddfd1787f19dfef12672a5447b364ceb6 SHA512 7fdf3cd385753dac4fa219aaebde585427f9b4b208252f36f48132b850f28cf58934d4972cefcaf4a1f8b97eb02f32ca1b60eec2ca68f2fc3f1a623f6bf4817a
 AUX wput-0.6-respectldflags.patch 391 BLAKE2B fd2c41ce1fcc4866b5951bba49f4cd4d7ff5f4a9891016460e99d14ff78d3275273d234fd86df1b1cb3ecc5d5a4c7527f5b80cb2a00106a69f5d82badfc46497 SHA512 3ae0d882e94b23a84b40b3c79a793dd21c7a070019fe3003f6aa213e269eef455826830e316483328507c359b0c27e5723f919d383af0a73eb0d8559954db146
 DIST wput-0.6.1.tgz 312342 BLAKE2B 67053f71307e9fbb3f085e9347c7843f4bcaf951858164fa228f9cfd80898192efc344f1f9cbf65a3db286fae5b514da64ed3599627f264586c9242ac753f62b SHA512 f5eb5e343c77cec0f3370e8d73679e3c720a848a963c2cdc64e6c52f30b47d76e0de9ccde965da9af97d2e5f23f45dd894f26371f56ead498d28fadffe65fc4b
-EBUILD wput-0.6.1-r1.ebuild 772 BLAKE2B 021df49888874a7aa20fc506f3ac463477118b7267e8bf144121f2ff5ba825d7ffa95a5cd51ffe61be2934f31e88f06d6a950fa43f88e3546bc0e726af91dbdb SHA512 14ccbce2d2562dd3e3c0f50f7c9b23f69ac2cb8a336227e0982422de98c98cb723d303941bddb73d6c9ec0e82f4372cde32e90e2aae6eadd608485ea24d7fd67
-EBUILD wput-0.6.1.ebuild 937 BLAKE2B 280991485b1ebdd0a3535724fea44dc200c7170e17f419cb4ccf5e78c2fc969638cd8ebffcec8174bff1c02d8476dea669ac7528bf7849234d5540389e58043d SHA512 09ff86266767d47be0269d2d35d0d6e5d79669a7e587075622f5248cb1be597234e84314080fe01117ad58e1858841ec0adf5009df336488571897fafffcec68
+EBUILD wput-0.6.1-r1.ebuild 771 BLAKE2B 11233a6e15d359f028f1abe461ad17b63236daf5eede7311e0fe86989941153033334575be4c41a8470f931161e1de535be12446ebccaf47037a6684e11e9ea8 SHA512 284e8945df93ba93a2322f1f62254b4fa671a1bd6045cecbe52bfcb54918b12f27cde9d710f896ea39839cafa1dfe617597fe6674717d8c297cf512dc43e9702
 MISC metadata.xml 213 BLAKE2B fc154a4a8f3de9a525bbf6fb99faa45fbc8a7acc300b3ebc91e2c7b69a2094f47fa312e0141e060b3e4f83e9f7fbc3b61f3d2c8946b3c6663120f1a791834f86 SHA512 6aa0dd15c8b17b8007764f93049ca69537377c25282ff538d14b792fda16dd1eb4d847b2354d140e1ff68c2df28b4280d6e93b2ca0c90f862c4a6748d916ae4c
diff --git a/net-misc/wput/wput-0.6.1-r1.ebuild b/net-misc/wput/wput-0.6.1-r1.ebuild
index 95361822ca98..4622df777968 100644
--- a/net-misc/wput/wput-0.6.1-r1.ebuild
+++ b/net-misc/wput/wput-0.6.1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="debug nls ssl"
 
 RDEPEND="ssl? ( net-libs/gnutls )"
diff --git a/net-misc/wput/wput-0.6.1.ebuild b/net-misc/wput/wput-0.6.1.ebuild
deleted file mode 100644
index 1d495ab77a2c..000000000000
--- a/net-misc/wput/wput-0.6.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils
-
-DESCRIPTION="Tiny program like wget, to upload files/whole directories via FTP"
-HOMEPAGE="http://wput.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="debug nls ssl"
-
-RDEPEND="ssl? ( net-libs/gnutls )"
-DEPEND="${RDEPEND}
-		nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-0.6-gentoo.diff"
-	# Fix bug 126828
-	epatch "${FILESDIR}/wput-0.6-respectldflags.patch"
-}
-
-src_compile() {
-	local myconf
-	use debug && myconf="--enable-memdbg=yes" || myconf="--enable-g-switch=no"
-	econf ${myconf} \
-		$(use_enable nls) \
-		$(use_with ssl) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc ChangeLog INSTALL TODO
-}