gentoo resync : 29.10.2017

4 files changed, 72 insertions, 8 deletions

diff --git a/net-misc/axel/Manifest b/net-misc/axel/Manifest
index 1dc3cba80865..0a2b81b1c7cc 100644
--- a/net-misc/axel/Manifest
+++ b/net-misc/axel/Manifest
@@ -3,11 +3,13 @@ AUX axel-2.4-buildsystem.patch 566 SHA256 da7ccc2dc5969eb4c4f5cc8631c1f75823cb3f
 AUX axel-2.4-max-redir.patch 412 SHA256 0007c9c2f61ec39769d13ef93e4820f0f819d598bcd40aca7382fe098071b55c SHA512 81aa9e566798959af38ff9f59f493462acfdff7e817c2285717456463505149a00970a39cf7f14cc4f5c79c159e5a57b83b76eff690d454921ecb80efabd7491 WHIRLPOOL 3e01fa52c69a4c28d552faf326405ee89eb523f3c1ff4069f440466c939d6426fc15d08f8f468a6379caa57a9b1b95343d29a0c29c87ab4f40401323716cba2d
 DIST axel-2.12.tar.gz 82995 SHA256 28e7bb26b7be3f56a61b60ef07e15e05ea9a41850b0ed45a0c56d6d2202f4a8b SHA512 5e163c319366f7efd16f8b35dbcf901300c884ab303696dabe87ad47511f56cc3f1e399af738dc79ca717ca70fd529b6dd1adf30f5162cfb530105ce34e2eaf2 WHIRLPOOL dece4ad9eae5441e0b24952a96189417e75eb155ad46b199ce531b35fa6d027ffb75a16c016044a37dd4e76601865e51c0310b69b7fc70b974f9b67a6b2b1fe5
 DIST axel-2.14.1.tar.gz 89356 SHA256 acf6820d98a792faf309fc9acf22f7caf4b8a4b7001072c8f546b3c4fc755e39 SHA512 72c37fc6def0c765ed8220c27efe22255073b1e3cf1c8f6bda5ee2ce9cd36ac46263ac602a185efd40ca8f197a268612f2dcda69bcb49891c2538b910d971e8b WHIRLPOOL 1384ab65a689200f68d2549deb2f22526ae82a25f1b580ce5a270babc33d577513c2732a57676ea1e51b99eb09267960a5e24b6507ebca64a61d6ab4070eb374
+DIST axel-2.15.tar.gz 96474 SHA256 0e223f18954e4c6c34b882a474c526b9c7d107168220c2f3892598248236a172 SHA512 b0a516850b56b74fe763df3320b98e47f9977dda208cff9a98a87bdc63e37f5e0fd31d30c240a375f9d992320674983ced8201ee631187149e62b42804c48eb6 WHIRLPOOL 64b0d6f071ddd66fefc5d980b34797feece8fbba2bab173c3fe6627c9b6fdcb213e30b84e26d1d6699d9cdf514bda1fb39985ef820fae0c31f3533a7c8e756eb
 DIST axel-2.4.tar.bz2 44995 SHA256 ebc7d40e989c680d2afa632a17e5208101608924cf446da20814a6f3c3338612 SHA512 34d73cea19f2bf393aa8d3e4b6c24296f8b1d4e6177da6f4728763e013d5d9d073aa5dae31d0ff175126e8fcbd973daf94674a70f100afc9e7d00b92b78b8ec9 WHIRLPOOL 373af984738008572847ae0ed84a518d0b61323e3612f48affa96175792b0856c2bd13601ddcdd0c81ead5059ee41130759bf9b0ada2a2654f767ec69d992a0f
 EBUILD axel-2.12.ebuild 1155 SHA256 989c636775a189e4ba72c9054bc0b8c1a0fc70e6168115184eca34af2ed3dea2 SHA512 5070aeaefbc1649011db1791fd3594adc79f39aa530207324e73fafbffb3496da83302dfe3c994dae87d90bf28c7ecebd327458882629061f0255d61ac6bb1f2 WHIRLPOOL c317ec66f89658047214f4db1d13ba45e67179a0f18276f668e7c02e7935f70b2b401e8982ff382fd6b4f8b894d057bdd706ada27404877e0e6abe196552a469
-EBUILD axel-2.14.1.ebuild 1358 SHA256 2dff4ac46259acc893742f994e9d529958fd5228fcfeaaf2235392f760a14ab2 SHA512 d5e22c787ca992239a5d7cf3064cb1cc074fcc3d3d95635ed9fa5b7f2f6243ba1ca024d4e3b17ab4a7fe3af72c115fcf6b487698503543a4d39ebdb6ecde548b WHIRLPOOL 3473f00f6c7e8ed74b5e0550fbffa9b0ebf226f39523052630177acd9727b52b63a12ab289d5267ef932427f6f89a009e7db4840a678c28b2dac216c7614f538
+EBUILD axel-2.14.1.ebuild 1353 SHA256 da687dbca7356076af719084130989404809c6658a029d4a6df1f9752046a4ac SHA512 9a112722dea3a9c143dcf30dd761ded084193f26df326353533f51b3100746a7a3a8e7bd9144bd057344b725806c639e15889947133b90b690d31dc8a23633e1 WHIRLPOOL 75ca32c8dc83cba2552a6d268432018d0937dee343968f285526be8285c6a305719fd64dbfd1096c7fa5d3ac22a8f9e7fe89f3c044c495af355b556e31f6be31
+EBUILD axel-2.15.ebuild 1353 SHA256 da687dbca7356076af719084130989404809c6658a029d4a6df1f9752046a4ac SHA512 9a112722dea3a9c143dcf30dd761ded084193f26df326353533f51b3100746a7a3a8e7bd9144bd057344b725806c639e15889947133b90b690d31dc8a23633e1 WHIRLPOOL 75ca32c8dc83cba2552a6d268432018d0937dee343968f285526be8285c6a305719fd64dbfd1096c7fa5d3ac22a8f9e7fe89f3c044c495af355b556e31f6be31
 EBUILD axel-2.4-r3.ebuild 1247 SHA256 60e4e41abe8d92a8c3052d870e9db0ccaaae9ca18319c42025feb1afcfaf6c22 SHA512 faa5ee4628df473cef38395d5e458743697ee03cca323a690796d21ea26427e052b25a42b3362fa289a716fb12b600eeb19ef2fa833448aa150d9afe41221b08 WHIRLPOOL 3795796d1a229df4333c243c22cb442419a2524c36c8e29f1960726729194e3be7be8de7459106ccfc042fcc7dbc2099fa9aefc26aa6b8c17d01552ab05782fc
-EBUILD axel-9999.ebuild 1027 SHA256 72ea1aa89eed76250fabe357198536e6e61bbd1dbedad3c2681f9223d0ef72ce SHA512 86dc06242516228d50eef795f79124dc085660fa6f1b6eee9fa62a404fd1762683de8c242a08feea7ffa4dcfa1552cbc0f91d6d0d967223a4ef3864f887b5bc5 WHIRLPOOL f79ce7e7554a0f7a5d8b2f56897e41d14a2e2aa037153b08a1ae1b702ab57d31dded65eb44ac301705d5bf553315c5c7da82ec14900ecb40ac45c8ec519ea018
+EBUILD axel-9999.ebuild 1224 SHA256 4e79789a4cf31621cc40c45c92523484da9f969ee18994a18804a4a45b848ab9 SHA512 0b08a3fdbce4297c749d35a3e490bc2f2581058fe385a6e326d10fb052af93af1c7646fef76d133b14c5f67b828f0de973c385a49a55dd65fec50fd50e50f0e7 WHIRLPOOL bc40e0263f47dde19a1a9118315f9faeb35adb912caf54177517c66ea22ec6fd67aeb2f9349f4ec5807f5bf6a32312d012d28f38c72de59dec1e9bfb399be077
 MISC ChangeLog 4030 SHA256 9d962ecf6ad498532e81f70f07ce29ce08a68cccc01a69afe9a1ba323b60d98e SHA512 3cfcb2b934827c5c62718148eef092a02d5701fcda79eea1b98a9cdfe69284a1f58b522115271ea470f0ff039de3b937f93a3c2ac0ff4286dc5650f11ea63530 WHIRLPOOL b2f9256f8245dc5ad5788ed0dc661b82a9266afbe8bccbc1d56303db297b57b341ca91505c3dab188c435c8a820e67902cd8e211acceb8683e78e12f3a2f18d3
 MISC ChangeLog-2015 7608 SHA256 579fc6aa7f68ef2c3554329a481c9bd7008ce2844e61207b69398d83b5c55831 SHA512 904527bdfd9f6ad80eb103a811cf162d1a0781067063b3b4171e3ecf3af380e22d23ce5a3b041611ed6e7dde2e79384664a115fba8c36d0c509102248640254f WHIRLPOOL 50cf0a4a76766fa482212e44549392d9d952d4c02f2e29dd2b975fcd6db30858add12ff4794c0e285f9886371ac70bd21fd6ed7173f0dc874cf803ade371aae4
 MISC metadata.xml 297 SHA256 2f8bb0e67e181f88997e57eee8f05aef14fe9d99261a632031f1a0504feb0aef SHA512 8d005244ca7b5f8dd30f9a158e4a53880d8a395bf11c73f8a3c7a3c668153a4c126b0a88942d3bd895a0e5ddc1f672eb770858356d0e12af75a098d36a80d56d WHIRLPOOL f08be791e102bbce96877f9e1e97ae9a0c53ea595739388e5a4ee25e27d13baf90594d80b0513622ccfe997f17fd0bf48749bd682908f9d6b7d4b4959306f1a8
diff --git a/net-misc/axel/axel-2.14.1.ebuild b/net-misc/axel/axel-2.14.1.ebuild
index 4bd7ad89659d..778e289857a0 100644
--- a/net-misc/axel/axel-2.14.1.ebuild
+++ b/net-misc/axel/axel-2.14.1.ebuild
@@ -50,6 +50,6 @@ pkg_postinst() {
 	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}.axel" "\${URI}"'\'
+	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
new file mode 100644
index 000000000000..778e289857a0
--- /dev/null
+++ b/net-misc/axel/axel-2.15.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris"
+IUSE="debug libressl nls ssl"
+
+REQUIRED_USE="libressl? ( 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-9999.ebuild b/net-misc/axel/axel-9999.ebuild
index 70eda56e3f0d..d4a43d0094fd 100644
--- a/net-misc/axel/axel-9999.ebuild
+++ b/net-misc/axel/axel-9999.ebuild
@@ -6,9 +6,9 @@ EAPI=6
 inherit autotools git-r3
 
 DESCRIPTION="Light Unix download accelerator"
-HOMEPAGE="https://github.com/eribertomota/axel"
+HOMEPAGE="https://github.com/axel-download-accelerator/axel"
 SRC_URI=""
-EGIT_REPO_URI="https://github.com/eribertomota/axel.git"
+EGIT_REPO_URI="https://github.com/axel-download-accelerator/axel.git"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -38,12 +38,19 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable nls) \
-		$(use_with ssl openssl)
+		$(use_with ssl)
 }
 
 pkg_postinst() {
-	einfo 'To use axel with portage, try these settings in your make.conf'
+	einfo 'To use axel with portage, create a script in'
+	einfo '/usr/local/bin/fetchwrapper.sh with the following content:'
 	einfo
-	einfo ' FETCHCOMMAND='\''axel -a -o "\${DISTDIR}/\${FILE}.axel" "\${URI}" && mv "\${DISTDIR}/\${FILE}.axel" "\${DISTDIR}/\${FILE}"'\'
+	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}"'
 }