gentoo resync : 25.11.2020

8 files changed, 47 insertions, 33 deletions

diff --git a/net-misc/wput/Manifest b/net-misc/wput/Manifest
index 9bd2302729f1..97033860d4cb 100644
--- a/net-misc/wput/Manifest
+++ b/net-misc/wput/Manifest
@@ -1,9 +1,10 @@
-AUX wput-0.6-gentoo.diff 641 BLAKE2B 2876ac3eb4f42590d01cde847cd5866ddfc7cd7e4630d901e573ef87f8b99d55e08c063c8ff0e497fae3cc75ccb72acddfd1787f19dfef12672a5447b364ceb6 SHA512 7fdf3cd385753dac4fa219aaebde585427f9b4b208252f36f48132b850f28cf58934d4972cefcaf4a1f8b97eb02f32ca1b60eec2ca68f2fc3f1a623f6bf4817a
-AUX wput-0.6-respectldflags.patch 391 BLAKE2B fd2c41ce1fcc4866b5951bba49f4cd4d7ff5f4a9891016460e99d14ff78d3275273d234fd86df1b1cb3ecc5d5a4c7527f5b80cb2a00106a69f5d82badfc46497 SHA512 3ae0d882e94b23a84b40b3c79a793dd21c7a070019fe3003f6aa213e269eef455826830e316483328507c359b0c27e5723f919d383af0a73eb0d8559954db146
-AUX wput-0.6.2-respect-destdir.patch 763 BLAKE2B 2f933c1c8f30df659726997d6380ec8e18c4abc987804b8f492a35399ff65bbc9a13e28d9263218776a0e68319adf6980db23d27f161a9a68a431760ea7b73c8 SHA512 868412a0ed44476960c723bff0167ee411fbc6161c9e0254eadcf2dc4cf3fe5efedf2a9d1fccd7381b384d73d977f297cfa37715ecdf377d98d0fe0a3f6d7129
-AUX wput-fix-crash.patch 2183 BLAKE2B 5d27232a74f895567ede151843df61d21f43913689b27f380c71cbd0dfd619fc081f6d01d24ab34b2cc183c9f5d60f6c419307efc4875a00bcf8b95b4b5e73f6 SHA512 bd8d2ac244486968a977257f32d47cb18b158756bf73aebb19a69c4e4f3c60fbe58b8bfb2118edaf7ec28e42b5e0b270c383cb3014d4f48b8e766d73c24fac50
+AUX wput-0.6-gentoo.diff 519 BLAKE2B 0a157c48c2f9764dc91c64783ec0c00e4a73bafccda6dc52be7f0784cd08386991452429202088521527d56a7fd808eca11936f1caae2d5a2ea88f237f2d28f8 SHA512 74a6902283f405649eb358781b8f9373b02ad2825fe5a425233b3e7a3a270bdaa4ac8f8ac76c4ace03c760505aa9eaa089b98706bc669bb9a536dedd5f0c94d7
+AUX wput-0.6-respectldflags.patch 290 BLAKE2B e2880dc839b0eb2052f6f71e32bcb7f37e7ea57b162b661e0a0da216f35cc878f564d05bac1e209a9e0d0851d81f53781002a6237ae8ca2fcf133edd5d79d017 SHA512 48d7f547b5d386f0d80cc3dd96293f112144416b3c59f69ce7827c6f96b303a26cbcd17094b8988ed816113a70e3181846c415de6939034ed5c5c69baab91113
+AUX wput-0.6.2-fno-common.patch 559 BLAKE2B 47937469ca44f74bdbfede40b43fe2900153747ba3fc3735e70b4f6949cb80adb4cb878a7cd9c046d19e05f68921f125b8dd1fdc41459227b5fdd30062e92536 SHA512 4c48dd943e9551d54a70b5c0e289f85af5f4b1518c238a2184e75e62f2fcc1869f681edc48dc40a1249acf98c228c7e79595bc70930b22c1720d82b3e39dc123
+AUX wput-0.6.2-respect-destdir.patch 694 BLAKE2B 4c4466c56b8ecd1e36036c3d33901b76dfe53f918f40f7b3bb34f5e58dc02b701ea7a1969b71d2fdf788b9478d4c5fcaecc7136848fcf2f9e06da09761e58b88 SHA512 a92ef8c35a94b4ff624cb9f1b548cba656151ae88708ed6da889c297e6d09cf161282de9f5324f41ac3d02f2aa0817e86b663637577ff519d780d587cb214c15
+AUX wput-fix-crash.patch 1974 BLAKE2B 229d5afe628682831d28ce1ccad0856883061749d863073dbcf58bd0a0cc435d84434d26068309154154e3c15922a0432ecc3fe01127d18767aea5b8d01a83b2 SHA512 2fa1e6793b9cda2695255196f30a5e615a013883efa5b10983c5bd38debf616bfb36ad2e61675700b32f32c0b4057ef7ec0c33c502fc3ead37e1547ecd944783
 DIST wput-0.6.1.tgz 312342 BLAKE2B 67053f71307e9fbb3f085e9347c7843f4bcaf951858164fa228f9cfd80898192efc344f1f9cbf65a3db286fae5b514da64ed3599627f264586c9242ac753f62b SHA512 f5eb5e343c77cec0f3370e8d73679e3c720a848a963c2cdc64e6c52f30b47d76e0de9ccde965da9af97d2e5f23f45dd894f26371f56ead498d28fadffe65fc4b
 DIST wput-0.6.2.tgz 368510 BLAKE2B bf59720e220d837354aff7d90bf06dcf54df4adf10c53ca844cb18dc6f327793ebd5dce7beecc76b43ddccfe273435a1eca918ab2272145dc8bf47293f601004 SHA512 e1d0fb8570cbda44c97215ee1a021a9867f2e91323b3d7f7df1d7fd68a1b2aba40a7f3068e5e85e8c736b1dba1fba62df375af99e3fb96cd0fd414b139c641bd
-EBUILD wput-0.6.1-r1.ebuild 771 BLAKE2B 11233a6e15d359f028f1abe461ad17b63236daf5eede7311e0fe86989941153033334575be4c41a8470f931161e1de535be12446ebccaf47037a6684e11e9ea8 SHA512 284e8945df93ba93a2322f1f62254b4fa671a1bd6045cecbe52bfcb54918b12f27cde9d710f896ea39839cafa1dfe617597fe6674717d8c297cf512dc43e9702
-EBUILD wput-0.6.2.ebuild 792 BLAKE2B a50545adf471673b1685a7c806fa8b23017b6a2d01d54f5e9c8f2991c3ef59c978b7c9cded040e58e0faf9239f021eaf66b183974d881004fae5cebd2d7943c1 SHA512 973f29353ff28d8131a8121f73749b3265e4cbe47e40862eb7dfebded29e8c25d29892390ea1e5ff98816f674c47cb23c31da6b2f9616bd9d24d8b6c92a2e4e1
+EBUILD wput-0.6.1-r1.ebuild 792 BLAKE2B c24a667aa36e9651d537a4e1b4650f71293401c637d9c0c14e4bb87fb99172f5cebde554bf99fa28eab233a903d1374cd1cfbcc3323dcf454833bdc8d8d11ee8 SHA512 332d9d377d7154bc9209e709c52a805759b2d0b22182696b539ad3b9fbb01c46874ba5b1a6afce96cba5fab921ff39f13bed841adef0c0893db9945291a5da03
+EBUILD wput-0.6.2.ebuild 839 BLAKE2B 117175f94dbde239cfaa0917a02194437e147f5b623204b124bd5e58b51b8dd02539aeb23e4b54bd38e9e3abf6157077bec49b8f477ec13ed7aa943966effcd2 SHA512 b230a872dd44ffc0da8af27fbbfacfe5a946bba1ae60c9acbeaec2f5d6a31233c08d6cf807114da3fe6cd12359615baa703b04f60e5eb389c5385193a02a9514
 MISC metadata.xml 239 BLAKE2B a1e387e39d693cc8b109174934b235238904f96fb78916bc73bd86e4b442443cc3b225409745025fb826de6086eb6356429527338c3aa1b42e92f1d886d7a094 SHA512 8326a50cb35d854df982951d3632c3b36672f9ba75f9644da70a4814a27ffda0c7c435e733c5be15210e2d2eb39ca781500ce55c1d409a1e81844fcecd859a10
diff --git a/net-misc/wput/files/wput-0.6-gentoo.diff b/net-misc/wput/files/wput-0.6-gentoo.diff
index 312172348d02..7ddf0ba3ba19 100644
--- a/net-misc/wput/files/wput-0.6-gentoo.diff
+++ b/net-misc/wput/files/wput-0.6-gentoo.diff
@@ -1,6 +1,5 @@
-diff -urN wput/Makefile.in wput/Makefile.in
---- wput/Makefile.in	2006-04-04 18:16:52.000000000 +0100
-+++ wput/Makefile.in	2006-11-07 17:31:10.000000000 +0000
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -15,8 +15,12 @@
  
  install: all
diff --git a/net-misc/wput/files/wput-0.6-respectldflags.patch b/net-misc/wput/files/wput-0.6-respectldflags.patch
index d2b460b339b3..9f0e09c4a78d 100644
--- a/net-misc/wput/files/wput-0.6-respectldflags.patch
+++ b/net-misc/wput/files/wput-0.6-respectldflags.patch
@@ -1,6 +1,4 @@
-Index: wput/src/Makefile.in
-===================================================================
---- wput.orig/src/Makefile.in
+--- wput/src/Makefile.in
 +++ wput/src/Makefile.in
 @@ -23,7 +23,7 @@ ftplib.o: socketlib.h ftplib.h
  ftp-ls.o: ftp.h wget.h url.h
diff --git a/net-misc/wput/files/wput-0.6.2-fno-common.patch b/net-misc/wput/files/wput-0.6.2-fno-common.patch
new file mode 100644
index 000000000000..f188141aa87b
--- /dev/null
+++ b/net-misc/wput/files/wput-0.6.2-fno-common.patch
@@ -0,0 +1,25 @@
+https://sources.debian.org/patches/wput/0.6.2+git20130413-9/single-declaration.patch/
+https://bugs.gentoo.org/706954
+--- a/src/wput.h
++++ b/src/wput.h
+@@ -140,7 +140,9 @@
+ 
+   unsigned short int retry_interval;
+   unsigned       int speed_limit;
+-} opt;
++};
++
++extern struct global_options opt;
+ 
+ extern _fsession * fsession_queue_entry_point;
+ extern char * email_address;
+--- a/src/wput.c
++++ b/src/wput.c
+@@ -55,6 +55,7 @@
+ #include "utils.h"
+ 
+ extern char *optarg;
++struct global_options opt;
+ 
+ #ifdef WIN32
+ const static char * version = "0.6.2-w32";
diff --git a/net-misc/wput/files/wput-0.6.2-respect-destdir.patch b/net-misc/wput/files/wput-0.6.2-respect-destdir.patch
index f0cbfcdebd69..9cece1f388f8 100644
--- a/net-misc/wput/files/wput-0.6.2-respect-destdir.patch
+++ b/net-misc/wput/files/wput-0.6.2-respect-destdir.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile.in b/Makefile.in
-index 6756cd2..6debea8 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -16,12 +16,12 @@ win-clean:
diff --git a/net-misc/wput/files/wput-fix-crash.patch b/net-misc/wput/files/wput-fix-crash.patch
index 2afab8e59913..3d0efc9fd37f 100644
--- a/net-misc/wput/files/wput-fix-crash.patch
+++ b/net-misc/wput/files/wput-fix-crash.patch
@@ -1,6 +1,5 @@
-diff -ur wput-0.6.2+git20130413.orig/src/progress.c wput-0.6.2+git20130413/src/progress.c
---- wput-0.6.2+git20130413.orig/src/progress.c	2013-07-15 00:05:50.000000000 +0200
-+++ wput-0.6.2+git20130413/src/progress.c	2016-10-25 16:48:05.909105000 +0200
+--- a/src/progress.c
++++ b/src/progress.c
 @@ -181,7 +181,7 @@
    static char output[15];
    time_t secs = time (NULL);
diff --git a/net-misc/wput/wput-0.6.1-r1.ebuild b/net-misc/wput/wput-0.6.1-r1.ebuild
index 4622df777968..4121f54eca36 100644
--- a/net-misc/wput/wput-0.6.1-r1.ebuild
+++ b/net-misc/wput/wput-0.6.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-DESCRIPTION="Tiny program like wget, to upload files/whole directories via FTP"
+DESCRIPTION="Tiny program like wget to upload files/whole directories via FTP"
 HOMEPAGE="http://wput.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
@@ -12,15 +12,14 @@ SLOT="0"
 KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="debug nls ssl"
 
+BDEPEND="nls? ( sys-devel/gettext )"
 RDEPEND="ssl? ( net-libs/gnutls )"
-
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.6-gentoo.diff"
 	"${FILESDIR}/${PN}-0.6-respectldflags.patch"
+	"${FILESDIR}/${PN}-0.6.2-fno-common.patch"
 )
 
 DOCS=( ChangeLog INSTALL TODO )
@@ -33,7 +32,3 @@ src_configure() {
 		$(use_with ssl) \
 		"${myconf}"
 }
-
-src_install() {
-	default
-}
diff --git a/net-misc/wput/wput-0.6.2.ebuild b/net-misc/wput/wput-0.6.2.ebuild
index c95956b3e7b1..b9fa842bf3ab 100644
--- a/net-misc/wput/wput-0.6.2.ebuild
+++ b/net-misc/wput/wput-0.6.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Tiny program like wget, to upload files/whole directories via FTP"
 HOMEPAGE="http://wput.sourceforge.net/"
@@ -9,19 +9,18 @@ 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"
 
+BDEPEND="nls? ( sys-devel/gettext )"
 RDEPEND="ssl? ( net-libs/gnutls )"
-
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.6.2-respect-destdir.patch"
 	"${FILESDIR}/${PN}-0.6-respectldflags.patch"
 	"${FILESDIR}/${PN}-fix-crash.patch"
+	"${FILESDIR}/${PN}-0.6.2-fno-common.patch"
 )
 
 DOCS=( ChangeLog INSTALL TODO )