gentoo Easter resync : 12.04.2020

7 files changed, 10 insertions, 230 deletions

diff --git a/net-misc/axel/Manifest b/net-misc/axel/Manifest
index b5193546f8e9..81cef2862ad2 100644
--- a/net-misc/axel/Manifest
+++ b/net-misc/axel/Manifest
@@ -1,15 +1,8 @@
 AUX axel-2.4-bffr-overflow.patch 333 BLAKE2B 67dcc951faf0090673d2e5ff48291b28981ea401052602b2e3c054d1d0485e02d4acc22699c08ac0fabcc2402450d9ce7bceadc0e428234a7e1446c441d9df3a SHA512 8072f7a7d15028f2272e45f6b42704fb3cadb30aec1ade093c80ee3b5d983d6362ed426c529bf46864f3f1adf8d2cd582be632796c8abcb43b125db87b1f0f75
 AUX axel-2.4-buildsystem.patch 566 BLAKE2B 47dd700ec0506824ff2bc3509a6c43cbd0b0b6c1676cb0600ec0ed96d4fd3f0daf7ccd3619f277c6bc7961fc3aeca18f12174bceb3cecd58b259d63f5520db7e SHA512 5a6d087a959adb88aed6ae7df602e3731c9a6773877eb731e670ab854c20fd0e41e24a91b759192882ccb9c5dff2a07d51f73b5e5cbb868f25b0aa991b6af428
 AUX axel-2.4-max-redir.patch 412 BLAKE2B 62146c6f0da6fdff0fe89aeeb487094020b04eee4d7ffbe223217910e32b81a5fadfb5a9e90a1602ee0ad80e6da47b2948b8eea534ef2cda53602fc8b753f9a5 SHA512 81aa9e566798959af38ff9f59f493462acfdff7e817c2285717456463505149a00970a39cf7f14cc4f5c79c159e5a57b83b76eff690d454921ecb80efabd7491
-DIST axel-2.12.tar.gz 82995 BLAKE2B da6e00cb577ffd9ab55c3b5b4362f0bdbc08ae89572a7cc224c092710da7911d2c974f52240fd4d2e16ce1d7657a68b5917d866120fb092b85736f181887adac SHA512 5e163c319366f7efd16f8b35dbcf901300c884ab303696dabe87ad47511f56cc3f1e399af738dc79ca717ca70fd529b6dd1adf30f5162cfb530105ce34e2eaf2
-DIST axel-2.14.1.tar.gz 89356 BLAKE2B 43e278f09304ed9f872c9348fb2113758a046819c6c8667bd6bff65824a8a55c3d0ac647027947f76b9c4f334495284f30066fa3bd60bc0eaab4f4b5b5059620 SHA512 72c37fc6def0c765ed8220c27efe22255073b1e3cf1c8f6bda5ee2ce9cd36ac46263ac602a185efd40ca8f197a268612f2dcda69bcb49891c2538b910d971e8b
-DIST axel-2.15.tar.gz 96474 BLAKE2B 73b35b0c234bf2c21b5c6038979061c908de7520d923ecf6d84d7d6cee348c3e17b8f8d3771909ed74cf20899e3d8ece2cba44764ce625755e0ff44563c0fc43 SHA512 b0a516850b56b74fe763df3320b98e47f9977dda208cff9a98a87bdc63e37f5e0fd31d30c240a375f9d992320674983ced8201ee631187149e62b42804c48eb6
 DIST axel-2.17.7.tar.xz 202632 BLAKE2B 2d799ad39c0742e2edfa09dd19f9d941c54c6136f4d5ec5a95f85d338bdebcc79545205cd1dde6ef25d28c89f494ae3cc278c73e375c9f4a96dabff73b139257 SHA512 ed1815199a7cc78897a820e1938a80dba72b83e1b40e6c1e81c6d3457aaa17faf20148a82383768524d61bbabda5b00cdcb2c15ff8ae5ed74e415da0b53be3aa
-DIST axel-2.4.tar.bz2 44995 BLAKE2B 03218c6243029695deae1a2d96b4e0cce719cf23602faf2d2fb4422f06ae313f5a1ed6759e7bc59a1ce756a732873ca5faed636742b608b6a66240b694b7189a SHA512 34d73cea19f2bf393aa8d3e4b6c24296f8b1d4e6177da6f4728763e013d5d9d073aa5dae31d0ff175126e8fcbd973daf94674a70f100afc9e7d00b92b78b8ec9
-EBUILD axel-2.12.ebuild 1108 BLAKE2B a8b96a4e82b041e098990502c07a4cf1c60addbd80032527f0df3ed7aa6071eb32c922d91afb865ec9be21bed374d8a70a02f9c5bb91d9bfca134c0bc5a9609b SHA512 b7df6f7160734344d763fbca4c095dbbbfe5e4afe98a91bccce2da958ce8f21a67dc433164586ddaa02e61e2041898d64dc74ca1d699a35fd5c8affc9219488f
-EBUILD axel-2.14.1.ebuild 1306 BLAKE2B 85d9063a51d8c0e51e9bf74be671605c1e79b6e427ac48f09565b857f9da70f3955ad6d5ad3b3ce8cfa0f207f03a6a4be348a28be6a6e789e2620395844ccae0 SHA512 4327edc03fcea40ad2132700c284b4361abe8c4508bf250b5ad4bfa65acfea3f6c1ff893f65716b8b1687289229933a1761850378dc99aa314cb477d41d3c5eb
-EBUILD axel-2.15.ebuild 1306 BLAKE2B 85d9063a51d8c0e51e9bf74be671605c1e79b6e427ac48f09565b857f9da70f3955ad6d5ad3b3ce8cfa0f207f03a6a4be348a28be6a6e789e2620395844ccae0 SHA512 4327edc03fcea40ad2132700c284b4361abe8c4508bf250b5ad4bfa65acfea3f6c1ff893f65716b8b1687289229933a1761850378dc99aa314cb477d41d3c5eb
-EBUILD axel-2.17.7.ebuild 1265 BLAKE2B 564377b6c9d3cb51c9d875a24f1d8d297a0486b277482948ad5bf28ec923344d0ee9a20cef14e34e083a3be00e7b685990f8c3d7002fcc1dcf2b535281d76d42 SHA512 fc37cbc285b8f993cfdeb0cf25a32fc1206d045020148c5fd102be977cc74de6736da8153a894c8b23906148e3c109fbef94c1aaeb6a2e740c09dd7cf9f8b58e
-EBUILD axel-2.4-r3.ebuild 1237 BLAKE2B d0d8ce79c27539a484d5fb95946dc899b795fb032983da603fe589915aaf0da3b23be582381ebbe721bc2d6dfab400765c57f7a6c2bac6857067d2894a8f547a SHA512 5df8d2b9540294029d86073950ae495a2ccea4f8a1f1b960963c3946fb0b5cf2c281b8264151e2104ebf0cec5dd1b27f55c9c636b132a9b44659024b8898fa02
-EBUILD axel-9999.ebuild 1187 BLAKE2B 4c472cbd4c0ba71f7bda52eaaae06193b175978072d7d7d60094f158e76a6fb0b51060b9aebc66260bb28751f2b8d5f57598511a8b00ba5d346278fb8421143d SHA512 c11ab2d39ef19797a4b2e0ddae4d7bcb80fc6979527bdccfd4fd600bb366c14d7c0cbae7f2bf55062b34f286246c45e6d4498296466d5fe179cb19c5cb6cc3ee
+DIST axel-2.17.8.tar.xz 201224 BLAKE2B 0a10187013aa888ae8fa7f165b88955f5a7d63241157f552778c042eaecc7873e10e27537a8c7a26a09df5e655097845037f23a6c39f4d46328d633f944a316a SHA512 9158cc0f1c7b54d84e5c15331ddcf6056b5eb654c0ad068e058eedbea99bb87c1b2e759b57872a86d76d83d6807500989ad6bbf87f1c0210db2d4dab100933ea
+EBUILD axel-2.17.7.ebuild 1260 BLAKE2B 1f976957b0425607de9728fc358454134191a4d0d136700d144d19f4348bead0e3167221091f9bd458d631f2bc09d5c9b4034175517659249174923bbd87ea69 SHA512 c5e24d64e0b781e7caa596eee0c82ee78a7d3fce9d8557e13a88c89a4eefe414e054ff4d80b5d9672d2cf9155575ae2fadfab15fb12e625daafda57231bf3cd8
+EBUILD axel-2.17.8.ebuild 1059 BLAKE2B e30d0a04e6d39c123c72ae51de2db98dc3cb9661010452a699139d40a03216dd788ccaff6e2e57230cedb104bcf992f0b224c62866e61b41afd1bbafdbc3b8c2 SHA512 b1b03f38c0c126b422732ae3cfe278b2270f46e812179aae7c2d2b68ed44fd544af0183291e17ac83474f45f62014ff0d4f6220d79f0ef41251c6e29900a6936
 MISC metadata.xml 410 BLAKE2B 89c374385d4e3a03953352d1d995029ca481386a0c522b1c4c2c18bc58c62f65e5eb287a656392093d72735174adc8e48dacd1771989d0bdd6ca2a0c77e3cd80 SHA512 f64c314f27882031b215373ded6b4a1e0a93b398ec96aff1a429ef6b01cc1d426c1692b8f2ecdea4f5503d853d753f292a7edac960a559bcb60ea491d5a1e7ce
diff --git a/net-misc/axel/axel-2.12.ebuild b/net-misc/axel/axel-2.12.ebuild
deleted file mode 100644
index deb3bcff1c1b..000000000000
--- a/net-misc/axel/axel-2.12.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Light Unix download accelerator"
-HOMEPAGE="https://github.com/eribertomota/axel"
-SRC_URI="https://github.com/eribertomota/axel/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris"
-IUSE="debug libressl nls ssl"
-
-CDEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-"
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )"
-RDEPEND="${CDEPEND}
-	nls? ( virtual/libintl virtual/libiconv )"
-
-DOCS=( doc/. )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with ssl openssl)
-}
-
-pkg_postinst() {
-	einfo 'To use axel with portage, try these settings in your make.conf'
-	einfo
-	einfo ' FETCHCOMMAND='\''axel -a -o "\${DISTDIR}/\${FILE}.axel" "\${URI}" && mv "\${DISTDIR}/\${FILE}.axel" "\${DISTDIR}/\${FILE}"'\'
-	einfo ' RESUMECOMMAND="${FETCHCOMMAND}"'
-}
diff --git a/net-misc/axel/axel-2.14.1.ebuild b/net-misc/axel/axel-2.14.1.ebuild
deleted file mode 100644
index aeda7636fbd5..000000000000
--- a/net-misc/axel/axel-2.14.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Light Unix download accelerator"
-HOMEPAGE="https://github.com/axel-download-accelerator/axel"
-SRC_URI="https://github.com/axel-download-accelerator/axel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris"
-IUSE="debug libressl nls ssl"
-
-CDEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-"
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )"
-RDEPEND="${CDEPEND}
-	nls? ( virtual/libintl virtual/libiconv )"
-
-DOCS=( doc/. )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with ssl)
-}
-
-pkg_postinst() {
-	einfo 'To use axel with portage, create a script in'
-	einfo '/usr/local/bin/fetchwrapper.sh with the following content:'
-	einfo
-	einfo ' #!/bin/bash'
-	einfo ' set -e'
-	einfo ' /usr/bin/axel -o "$1.axel" "$2"'
-	einfo ' mv "$1.axel" "$1"'
-	einfo
-	einfo 'and then add the following to your make.conf:'
-	einfo ' FETCHCOMMAND='\''/usr/local/bin/fetchwrapper.sh "\${DISTDIR}/\${FILE}" "\${URI}"'\'
-	einfo ' RESUMECOMMAND="${FETCHCOMMAND}"'
-}
diff --git a/net-misc/axel/axel-2.15.ebuild b/net-misc/axel/axel-2.15.ebuild
deleted file mode 100644
index aeda7636fbd5..000000000000
--- a/net-misc/axel/axel-2.15.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Light Unix download accelerator"
-HOMEPAGE="https://github.com/axel-download-accelerator/axel"
-SRC_URI="https://github.com/axel-download-accelerator/axel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris"
-IUSE="debug libressl nls ssl"
-
-CDEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-"
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )"
-RDEPEND="${CDEPEND}
-	nls? ( virtual/libintl virtual/libiconv )"
-
-DOCS=( doc/. )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with ssl)
-}
-
-pkg_postinst() {
-	einfo 'To use axel with portage, create a script in'
-	einfo '/usr/local/bin/fetchwrapper.sh with the following content:'
-	einfo
-	einfo ' #!/bin/bash'
-	einfo ' set -e'
-	einfo ' /usr/bin/axel -o "$1.axel" "$2"'
-	einfo ' mv "$1.axel" "$1"'
-	einfo
-	einfo 'and then add the following to your make.conf:'
-	einfo ' FETCHCOMMAND='\''/usr/local/bin/fetchwrapper.sh "\${DISTDIR}/\${FILE}" "\${URI}"'\'
-	einfo ' RESUMECOMMAND="${FETCHCOMMAND}"'
-}
diff --git a/net-misc/axel/axel-2.17.7.ebuild b/net-misc/axel/axel-2.17.7.ebuild
index 5a684ef22ffd..72e5d4d16651 100644
--- a/net-misc/axel/axel-2.17.7.ebuild
+++ b/net-misc/axel/axel-2.17.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/axel-download-accelerator/axel/releases/download/v${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris"
+KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris"
 IUSE="debug libressl nls ssl"
 
 CDEPEND="
diff --git a/net-misc/axel/axel-9999.ebuild b/net-misc/axel/axel-2.17.8.ebuild
index aeeaf251d69f..dad9472d9679 100644
--- a/net-misc/axel/axel-9999.ebuild
+++ b/net-misc/axel/axel-2.17.8.ebuild
@@ -3,16 +3,15 @@
 
 EAPI=7
 
-inherit autotools git-r3
+inherit autotools
 
 DESCRIPTION="Light Unix download accelerator"
 HOMEPAGE="https://github.com/axel-download-accelerator/axel"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/axel-download-accelerator/axel.git"
+SRC_URI="https://github.com/axel-download-accelerator/axel/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug libressl nls ssl"
 
 CDEPEND="
@@ -28,11 +27,6 @@ RDEPEND="${CDEPEND}
 
 DOCS=( doc/. )
 
-src_prepare() {
-	default
-	eautoreconf
-}
-
 src_configure() {
 	econf \
 		$(use_enable nls) \
@@ -40,15 +34,8 @@ src_configure() {
 }
 
 pkg_postinst() {
-	einfo 'To use axel with portage, create a script in'
-	einfo '/usr/local/bin/fetchwrapper.sh with the following content:'
-	einfo
-	einfo ' #!/bin/bash'
-	einfo ' set -e'
-	einfo ' /usr/bin/axel -o "$1.axel" "$2"'
-	einfo ' mv "$1.axel" "$1"'
+	einfo 'To use axel with Portage, one can configure make.conf with:'
 	einfo
-	einfo 'and then add the following to your make.conf:'
-	einfo ' FETCHCOMMAND='\''/usr/local/bin/fetchwrapper.sh "\${DISTDIR}/\${FILE}" "\${URI}"'\'
-	einfo ' RESUMECOMMAND="${FETCHCOMMAND}"'
+	einfo 'FETCHCOMMAND="axel --timeout=30 --alternate --no-clobber --output=\"\${DISTDIR}/\${FILE}\" \"\${URI}\""'
+	einfo 'RESUMECOMMAND="axel --timeout=30 --alternate --no-clobber --output=\"\${DISTDIR}/\${FILE}\" \"\${URI}\""'
 }
diff --git a/net-misc/axel/axel-2.4-r3.ebuild b/net-misc/axel/axel-2.4-r3.ebuild
deleted file mode 100644
index 8f06b29de4f1..000000000000
--- a/net-misc/axel/axel-2.4-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DOWNLOAD_ID=3016
-
-DESCRIPTION="Light Unix download accelerator"
-HOMEPAGE="http://axel.alioth.debian.org/"
-SRC_URI="http://alioth.debian.org/frs/download.php/${DOWNLOAD_ID}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris"
-IUSE="debug nls"
-
-DEPEND="nls? ( sys-devel/gettext )"
-RDEPEND="nls? ( virtual/libintl )"
-
-DOCS=( API CHANGES CREDITS README axelrc.example )
-
-src_prepare() {
-	append-lfs-flags
-	epatch \
-		"${FILESDIR}"/${P}-buildsystem.patch \
-		"${FILESDIR}"/${P}-bffr-overflow.patch \
-		"${FILESDIR}"/${P}-max-redir.patch
-	tc-export CC
-}
-
-src_configure() {
-	local myconf=()
-
-	use debug && myconf+=( --debug=1 )
-	myconf+=( --i18n=$(usex nls 1 0) )
-	econf \
-		--strip=0 \
-		${myconf[@]}
-}
-
-pkg_postinst() {
-	einfo 'To use axel with portage, try these settings in your make.conf'
-	einfo
-	einfo ' FETCHCOMMAND='\''axel -a -o "\${DISTDIR}/\${FILE}.axel" "\${URI}" && mv "\${DISTDIR}/\${FILE}.axel" "\${DISTDIR}/\${FILE}"'\'
-	einfo ' RESUMECOMMAND="${FETCHCOMMAND}"'
-}