diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2021-09-08 10:20:57 +0200 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2021-09-08 10:20:57 +0200 |
| commit | 14d116caf2351fae887e51bb16860b1ac4d66670 (patch) | |
| tree | 6f25f3570d0944996714dea2b7632086ae1a86a2 | |
| parent | sys-apps/pv: fix PLOCALES list (diff) | |
| download | gentoo-14d116caf2351fae887e51bb16860b1ac4d66670.tar.gz gentoo-14d116caf2351fae887e51bb16860b1ac4d66670.tar.bz2 gentoo-14d116caf2351fae887e51bb16860b1ac4d66670.zip | |
net-misc/wget: Bump to version 1.21.2
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
| -rw-r--r-- | net-misc/wget/Manifest | 2 | ||||
| -rw-r--r-- | net-misc/wget/files/wget-1.20.3-gcc10-fno-common.patch | 32 | ||||
| -rw-r--r-- | net-misc/wget/wget-1.21.2.ebuild (renamed from net-misc/wget/wget-1.20.3-r3.ebuild) | 12 |
3 files changed, 9 insertions, 37 deletions
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest index e8fccc9a3bc3..4f427713655a 100644 --- a/net-misc/wget/Manifest +++ b/net-misc/wget/Manifest @@ -1,2 +1,2 @@ -DIST wget-1.20.3.tar.gz 4489249 BLAKE2B 89fa7997a02be6fb1a869d1bf359ce4e43b41f8069d1520e6d0b48739b9b6030b1dec7b7e8cbe833ea1070b30f551b1a9d72c6f4a43bb58df20b680b42a68805 SHA512 e8b82b40e270296228094a78d47f81580bdbdea9e6b93fd61b37dccb39430aeb9bda5397dc53a31c952a61629383c7e2a8c8abf414c8a4dd369af6ecf2717e6c DIST wget-1.21.1.tar.gz 4884887 BLAKE2B 28a3044f33df1d24e13900e8018a38cabae21fb41dd2e089bdbfd759b4adee3771ab558b84f5a8b6f546bc84a3387c973903f9fe06562093d3566e22d1528587 SHA512 784efbf9fe43a1671109e32a9c36237eb2d5c19cf756bf6f6e65517fb21464d3d94b1d6f491852d23b3ddff63e38fe6b60df9125c91b139993af59875e3a0712 +DIST wget-1.21.2.tar.gz 5004576 BLAKE2B e11c3a2b89ab26834dc4cbb445bcc6122d3a6b2a5b9c6de1ce9e8f062281f9e5aa1f80ca37a44791ba5aaf6a447015a26afef2199cdb75f1931d5e1ffb1f406b SHA512 3e35f92604486ca459f26df97d392579f1d83a9254519e8ce249b410bacf70dddf716d6caa3b29fd4865163f60410b2b8ad1ca1f7bb3dbb2456386b7647b988d diff --git a/net-misc/wget/files/wget-1.20.3-gcc10-fno-common.patch b/net-misc/wget/files/wget-1.20.3-gcc10-fno-common.patch deleted file mode 100644 index 3b99f4071af0..000000000000 --- a/net-misc/wget/files/wget-1.20.3-gcc10-fno-common.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 04b7369490344d014b05dee5d48ca78cd04733ce Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de> -Date: Sat, 22 Feb 2020 13:40:50 +0100 -Subject: [PATCH] * tests/unit-tests.c: Fix 'multiple definition of...' with - gcc 10 - ---- - tests/unit-tests.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/unit-tests.c b/tests/unit-tests.c -index 5fae8a219..f66e5e664 100644 ---- a/tests/unit-tests.c -+++ b/tests/unit-tests.c -@@ -37,7 +37,7 @@ as that of the covered work. */ - - #include "unit-tests.h" - --const char *program_argstring = "TEST"; -+extern const char *program_argstring; - - static int tests_run; - -@@ -69,7 +69,7 @@ all_tests(void) - return NULL; - } - --const char *program_name; /* Needed by lib/error.c. */ -+extern const char *program_name; /* Needed by lib/error.c. */ - - int - main (int argc _GL_UNUSED, const char *argv[]) diff --git a/net-misc/wget/wget-1.20.3-r3.ebuild b/net-misc/wget/wget-1.21.2.ebuild index 28c0a2fa04d9..5dee2e984f60 100644 --- a/net-misc/wget/wget-1.20.3-r3.ebuild +++ b/net-misc/wget/wget-1.21.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{7..9} ) inherit flag-o-matic python-any-r1 toolchain-funcs @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/wget/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="cookie_check debug gnutls idn ipv6 metalink nls ntlm pcre +ssl static test uuid zlib" REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )" RESTRICT="!test? ( test )" @@ -51,8 +51,6 @@ BDEPEND=" DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc ) -PATCHES=( "${FILESDIR}"/${P}-gcc10-fno-common.patch ) - pkg_setup() { use test && python-any-r1_pkg_setup } @@ -77,6 +75,12 @@ src_configure() { # the included gnutls -- force ioctl.h to include this header [[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1 + if [[ ${CHOST} == *-darwin* ]] ; then + # https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00050.html + # https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00051.html + append-cppflags '-D__nonnull\(X\)=' + fi + if use static ; then append-ldflags -static tc-export PKG_CONFIG |