gentoo resync : 17.10.2017

3 files changed, 2 insertions, 102 deletions

diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 0f77f3b1fd29..7bd537ee94e3 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,11 +1,9 @@
 DIST youtube-dl-2017.03.16.tar.gz 2631620 SHA256 55df3cbda9cf86e49baf54040340ec74c692bb3d6da3d2f5a1bc1238017dd492 SHA512 f3b8942f6b2be3b1cfd4bddfb74c17bad48c8ef4bea34114970ecb9d65b5a3dcbe71beba6d7c2dbda168371bbb2e8bbaddce58039bd9d158bf23950a2a88123c WHIRLPOOL 8345da00074e62ec9a9c244cb9ef64930fbd0e5e9e5bc1709bfcf56517cc6312031a09523c3016db2a1542c16a0297bea9d6883a201ae94e347e358307e92422
-DIST youtube-dl-2017.09.24.tar.gz 2810181 SHA256 7d7140ce63377e84a2072b4922809c7a2e90e3916cde2f4f1cc8860664395548 SHA512 de96406aeabb993a39941f5c67947fd1b77ec003be36b215cb3df1e5c90d63c7c570a5ca7627f5b2faae6a15ee07d45cf339cac6b511890acf49c5c38e6c5672 WHIRLPOOL e248990cce1bcbe50ae9e0ac6a95d760948809ec371b93126011d71599e721f1e9b0784690b832d3c5c04fb55c048b08c091193f821b18e1211f4c393ab2d017
-DIST youtube-dl-2017.10.01.tar.gz 2813364 SHA256 0b4f0e12b099c46ad47597764b10f45ceae3935834abf99d49ccd8cfb48dff10 SHA512 f1eafecb2418276df7e7bdb73402779521197f551be3431eda9727390884d42c50a73895d0c58fc3783ab04712e4bf5aa072dad6d3241724e19e6c4c80c0080d WHIRLPOOL 281b7cdb288c1890e785d15cf1aa7c1f8e33976c521559551924b0f18b26981fb33a0b60ff86df796613ef34d273a13b3ada3c5f3e851534dad4bf124260f509
 DIST youtube-dl-2017.10.07.tar.gz 2816312 SHA256 d9a8935087c1e2fa3307594ae15f1e9ea0f8676e825fa676a50a3a3d471bba83 SHA512 4842c8b324a10a4eff398226749ff8394ca60cf1e47873c1dfb5cf9828b77772670ea30891f32b26bab421aa0e7ca95e2815e062061a2cbaf22e6c5f76e1d87d WHIRLPOOL 525eb2eb3f18bf5ed1776f1a4d43dd010793b3b1681f27b3ed4ed4afdbd0c3dcd2c18b8e532de1fa3c318ac6a5f186c0bdf60fa4c7c69fe939335a7235679c3c
+DIST youtube-dl-2017.10.15.1.tar.gz 2820437 SHA256 da6ae68b2fbe81da7cf4ac6b989fa7bf27b3beb214eed551d466cc6e41d7297f SHA512 6093747f732dac4eda4c71d334ed01fc24ba70d29e5660c38ff795861f06c4029441c3a4576e6a5463974488aeb7732687e5634481c8b04127f77499a2405a1c WHIRLPOOL cc8fca27f2a110fde556e6c6506a88715d4e4a03c971b7e74e77a91a5b28916c66146afd6e476a19aca2fff3270719da102d254a05f62dbabb5dc2a10040d839
 EBUILD youtube-dl-2017.03.16.ebuild 2381 SHA256 9503230e2716a18498b74f5047095216fa36cdf4801cc6446e6f2075fa5cde50 SHA512 b47b7f8c00e04879aaac6bc70621d28f9e6e153b618bd246f95a2b11f8f09bf77cfefc5f0869b379759edf68a8f5d4afded6425032a9efdb8a1cbf44a23e9862 WHIRLPOOL ded7fa74a8649db1cc5c16eb98ab557853d264bcc458429374b0bbb29773f993a8621285bcfcbe243cf3892d982f91ff5278c45cb0e50b824b156a0a57786911
-EBUILD youtube-dl-2017.09.24.ebuild 2383 SHA256 e959a1068b24172b3b4ef9a21277befd8161fe9d514ed6924e79f194e011d39b SHA512 212115024819c4ace4aa20c649202883bfa78488e1cc903b49d05e6abc704cbb6051ec12c0f7942c1e7cef8c40925a9e5c984058be9183a367b8b91d20226174 WHIRLPOOL 0313b71a631fac8a921e718d7de6d9ef8e8803e6c18c05dccd80caa22aec292e5566f98fde2a12473feaa6ac0e174bcd49cca8920f5860503d034c91b40cea76
-EBUILD youtube-dl-2017.10.01.ebuild 2382 SHA256 6bcc95505bb69e73c3cbf3c7824a96e42e651b0461a44a27dda5549e8bf7e625 SHA512 ab1e5bfe8a287cf5ad8f74efeaa95469b66d62f28f45e65c0aa41e352661de8e3fac99a1d60f15c33b312985794ce6b08fd8e08340f2adce1d46391065be4e20 WHIRLPOOL 41f2c088f6bf4a0692e76a67a70c01f8d07ec381690316544b2d6267a8ef6ff3480800d5ff387cad24c306413b778abba3aa43da0aa67a561de70b5b6072b280
 EBUILD youtube-dl-2017.10.07.ebuild 2382 SHA256 6bcc95505bb69e73c3cbf3c7824a96e42e651b0461a44a27dda5549e8bf7e625 SHA512 ab1e5bfe8a287cf5ad8f74efeaa95469b66d62f28f45e65c0aa41e352661de8e3fac99a1d60f15c33b312985794ce6b08fd8e08340f2adce1d46391065be4e20 WHIRLPOOL 41f2c088f6bf4a0692e76a67a70c01f8d07ec381690316544b2d6267a8ef6ff3480800d5ff387cad24c306413b778abba3aa43da0aa67a561de70b5b6072b280
+EBUILD youtube-dl-2017.10.15.1.ebuild 2382 SHA256 6bcc95505bb69e73c3cbf3c7824a96e42e651b0461a44a27dda5549e8bf7e625 SHA512 ab1e5bfe8a287cf5ad8f74efeaa95469b66d62f28f45e65c0aa41e352661de8e3fac99a1d60f15c33b312985794ce6b08fd8e08340f2adce1d46391065be4e20 WHIRLPOOL 41f2c088f6bf4a0692e76a67a70c01f8d07ec381690316544b2d6267a8ef6ff3480800d5ff387cad24c306413b778abba3aa43da0aa67a561de70b5b6072b280
 EBUILD youtube-dl-99999999.ebuild 2089 SHA256 a46031a2c229d820634b16d31efc904c44bafe1d04c3367b9e40e5e0c8b1c953 SHA512 a390ee79a77aa98603ca01a702df6621ac4630e62e7afd089e065bd4468fc38bfd13bba365e28916024f0eb9e92627133281985f57692432522aeb4671a0cf11 WHIRLPOOL a358657c660c533e1b506339c615e781998aa5465408629c51722f6999fc3e5d3fd11b617b89314ada35df0d93aeaa514837ac1a2e3b7573c43657394f6ef4ae
 MISC ChangeLog 32089 SHA256 377c688fd528de367a40230423162256199da2c475ef85d3dc986b622e322fd6 SHA512 955715fa5304b1ee5ab4436e232b4ac5c882e28f4755d2edcd23cc4c760575518dc8c349c20b2e1b41145ca55bbd8df292d12a1b34768acf55ae1d6b80e2f2ca WHIRLPOOL a925103ccb1de53ada47dd94f927a42eff5f97e14b47c607ddfaeda4e719a2eb8be78be8e008e4b3036ab48acb946e283876d646388745288ad5b992e2574104
 MISC ChangeLog-2015 75434 SHA256 71ef7accb3e09eadb601b4541ead4ed3019cbd1e86b56df23130cc0e49572dd5 SHA512 3517da9014199375d7bb8d4841b52ad12eb3a25ca7a225e767dd9b60f8b81848cf7f6763066fb7c7bb7826602711e22f56d710fa319cb8172843a31eb69228e6 WHIRLPOOL 32aee6516cd3e7848eeb08ccd47cb60bc04da646b2e448970ce40fa5d0e8dc591ae5d7c8e1dfe99229b6ee70805e070d8dee2353a41515377083bd7d2f02b073
diff --git a/net-misc/youtube-dl/youtube-dl-2017.09.24.ebuild b/net-misc/youtube-dl/youtube-dl-2017.09.24.ebuild
deleted file mode 100644
index fa2e8cbf808f..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2017.09.24.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://rg3.github.com/youtube-dl/"
-SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="+offensive test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-python/nose[coverage(+)] )
-"
-
-S="${WORKDIR}/${PN}"
-
-python_prepare_all() {
-	if ! use offensive; then
-		sed -i -e "/..version../s|'$|+gentoo.no.offensive.sites'|g" \
-			youtube_dl/version.py || die
-		# these have single line import statements
-		local xxx=(
-			alphaporno anysex behindkink camwithher chaturbate eporner
-			eroprofile extremetube foxgay goshgay hellporno hentaistigma
-			hornbunny keezmovies lovehomeporn mofosex motherless myvidster
-			porn91 porncom pornflip pornhd pornotube pornovoisines pornoxo
-			ruleporn sexu slutload spankbang spankwire sunporno thisav tube8
-			vporn watchindianporn xbef xnxx xtube xvideos xxxymovies youjizz
-			youporn
-		)
-		# these have multi-line import statements
-		local mxxx=(
-			drtuber fourtube pornhub redtube tnaflix xhamster
-		)
-		# do single line imports
-		sed -i \
-			-e $( printf '/%s/d;' ${xxx[@]} ) \
-			youtube_dl/extractor/extractors.py \
-			|| die
-
-		# do multiple line imports
-		sed -i \
-			-e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
-			youtube_dl/extractor/extractors.py \
-			|| die
-
-		sed -i \
-			-e $( printf '/%s/d;' ${mxxx[@]} ) \
-			youtube_dl/extractor/generic.py \
-			|| die
-
-		rm \
-			$( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
-			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
-			test/test_age_restriction.py \
-			|| die
-	fi
-
-	eapply_user
-
-	distutils-r1_python_prepare_all
-}
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-python_test() {
-	emake test
-}
-
-python_install_all() {
-	dodoc README.txt
-	doman ${PN}.1
-
-	newbashcomp ${PN}.bash-completion ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins youtube-dl.zsh _youtube-dl
-
-	insinto /usr/share/fish/completions
-	doins youtube-dl.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2017.10.01.ebuild b/net-misc/youtube-dl/youtube-dl-2017.10.15.1.ebuild
index 975ce26c347e..975ce26c347e 100644
--- a/net-misc/youtube-dl/youtube-dl-2017.10.01.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2017.10.15.1.ebuild