gentoo resync : 18.11.2018

3 files changed, 121 insertions, 2 deletions

diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index ff2006e10f86..108e1a19a058 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -2,9 +2,11 @@ DIST youtube-dl-2017.11.15.tar.gz 2834012 BLAKE2B fd93e3923f99874be58681a886c09e
 DIST youtube-dl-2018.08.22.tar.gz 3025389 BLAKE2B e8d2d8bccab8c169d08de35544e5efb05c65799c26894807e075edfe090d36de30fea787f54d59e4fc8b671356ce2e1d9002627948fb05becc9d2e3bc634164c SHA512 ef17c744ac27b3bf547124f18a155908a66ee75f3f6fb5d7dd8a1d8da61a5a598bbade6cf0362e8c93c337dcf47750db5f56357919226430f02d0b764011ffb5
 DIST youtube-dl-2018.10.05.tar.gz 3044157 BLAKE2B c65651eebda6bd9c28245415f7aa804c78a74fa33a9717a3e9589734334ed8d12d5432eadd18d55ee46d4b51b1cacbe458c2ad175ed2e135b838fac54d468192 SHA512 b581372522d467b3277d81bdc9978352c720d4f33e0d8249cd0271eb1814a153324a5b34608d88d392bb52b1c57d0a6f425baf8377d5609810ef770839586714
 DIST youtube-dl-2018.10.29.tar.gz 3045428 BLAKE2B cf21d3113c07b7d62a373ada4a366fa61231eb8aa7f14192683451c99cf3f4f59d1abc04053359c2c3b40e7f80cfc2c5325f66a1b73196bb561a2244988f5114 SHA512 86f94acc888084348466d8aabc3711f25cbeb28c9a7afe08dcf23034d3b43d0e0a9c58dab60fe9c7eb2ab8ce2e3ce97b849e1eb11f547d173bb25dbb9df1b39f
+DIST youtube-dl-2018.11.18.tar.gz 3057924 BLAKE2B eb995cd269c3febcda950d87466df85a31128aaf95dbbd1cb9ee3d329610ffae3194c57f5063b47e49de3e387b5f60a5e10c237dc5d944ce47a6cffacab31935 SHA512 47e503c18f2db948beeda6a61b034953fab61d7d122641be7564a0f6dc0fe66ff93d6ef436c2acbcaf7255248a0b53e4df8c5ed1efca1139dc518a3ffacb737d
 EBUILD youtube-dl-2017.11.15.ebuild 2365 BLAKE2B cff79a16ba920a6b85b9e7970a12065fade413701a7b0fbd86e739887ea86dde832e7d9344f73fef2480e32d689c8c89ed3926afc9f2cf702b9385550dd38c04 SHA512 5be26dbc448c37d37db450f7b70aed88124794e7f80ba584485ee99fdb6288093e5bae05ca8b2e58eb783b7a398fc5b866728711588d43da6bf46c07f47bf1fb
 EBUILD youtube-dl-2018.08.22.ebuild 3286 BLAKE2B 998db6c1bf8f4bdb39152fa75712e4ebe98a9d69422b464328da90fb986e8ea07ddeb9e90cbff52dcd8012cce96ab06e48d7e4c87e6a660cc5fd90dfa5bd731a SHA512 927eab9548db77ce0a3455023a2f85bab64a0dae9a03d09d8b1ce96ec891bf32e49b2b2292abc5688db940eefae51473918df6449469f054a859820398782a11
 EBUILD youtube-dl-2018.10.05.ebuild 3439 BLAKE2B 2e9fcd2e40f815a9d75bb7adff01f12afa5345c027f5dc55b9e20b30a3055bef402d66361048a9cc6cb71e1e6b3982e3b059bee837fb8d36c886be616d078490 SHA512 b46ab94dffbea58076d3b83de105a1c51ed1ae2213ff9b26b074cdcc41ec8ed97223baf92aec78ca2c56d0614826893a01ee0ca8e2e5667561dc43fec12ebbca
 EBUILD youtube-dl-2018.10.29.ebuild 3439 BLAKE2B 2e9fcd2e40f815a9d75bb7adff01f12afa5345c027f5dc55b9e20b30a3055bef402d66361048a9cc6cb71e1e6b3982e3b059bee837fb8d36c886be616d078490 SHA512 b46ab94dffbea58076d3b83de105a1c51ed1ae2213ff9b26b074cdcc41ec8ed97223baf92aec78ca2c56d0614826893a01ee0ca8e2e5667561dc43fec12ebbca
-EBUILD youtube-dl-99999999.ebuild 3306 BLAKE2B 7bd4ace3451b5edfef9e1ec119fc76b903aff5263e56a556334ccdf9df33fb223f3490de38edb61ce60e78efa5bcff7b8b3de144152db729b25b9ff58d9fc51e SHA512 ce0d4ae78c44450821d42948736ff85c78a84a1f96857588d18d0c43ac82dc55514c5d3b4b489ba6684565c800676231badab8e892f5b7110831432d6bf8807f
+EBUILD youtube-dl-2018.11.18.ebuild 3441 BLAKE2B ad19ee4cbb330369e7a007d43d9c44c3cf2ce2f2ecf6d0900d47aa8bff6940a5a6700e600391b2b155b0dc4128dbcc9d779ef72cb647c34f523c715dd22c8e2d SHA512 549810dea84371496b5d4c284949c9d5f3fd6aebc126223a1f7b03b92dfe1f4f2920c15224b774bfbb1ed0278256dfb4c8b1df86e70cdb4ba83cc5906c228c04
+EBUILD youtube-dl-99999999.ebuild 3308 BLAKE2B 6bf8e21c62c0da4f88a67f785a7304ea014022db3872fd1ff678184e2142e4d9337387287c925a08d783b5b5a0b9cb679320df27abb3f1145f577b7370c42c1d SHA512 31c0050ec83f3261432c8fccfcba7986019ee8e72655ded191053d08c7d209f7cf74fa6455d2565fcde061cc31a2e9f03fa550d24aed3090c672064731536410
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2018.11.18.ebuild b/net-misc/youtube-dl/youtube-dl-2018.11.18.ebuild
new file mode 100644
index 000000000000..c28ce5a6c074
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2018.11.18.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://rg3.github.com/youtube-dl/"
+SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-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 myvidster porn91 porncom
+			pornflip pornhd pornotube pornovoisines pornoxo ruleporn sexu
+			slutload spankbang spankwire sunporno thisav vporn watchindianporn
+			xbef xnxx xtube xvideos xxxymovies youjizz youporn
+		)
+		# these have multi-line import statements
+		local mxxx=(
+			drtuber fourtube motherless pornhub redtube tnaflix tube8 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/vendor_completions.d
+	doins youtube-dl.fish
+
+	distutils-r1_python_install_all
+
+	rm -r "${ED}"/usr/etc || die
+	rm -r "${ED}"/usr/share/doc/youtube_dl || die
+}
+
+pkg_postinst() {
+	elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
+	elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
+	elog
+	elog "${PN} works fine on its own on most sites. However, if you want"
+	elog "to convert video/audio, you'll need avconf (media-video/libav) or"
+	elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
+	elog "videos can be retrieved in a higher quality format without sound."
+	elog "${PN} will detect whether avconv/ffmpeg is present and"
+	elog "automatically pick the best option."
+	elog
+	elog "Videos or video formats streamed via RTMP protocol can only be"
+	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
+	elog "Downloading MMS and RTSP videos requires either mplayer"
+	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
+	elog
+	elog "If you want ${PN} to embed thumbnails from the metadata into the"
+	elog "resulting MP4 files, consider installing media-video/atomicparsley"
+}
diff --git a/net-misc/youtube-dl/youtube-dl-99999999.ebuild b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
index 62abae9c2005..4de5d95c46fd 100644
--- a/net-misc/youtube-dl/youtube-dl-99999999.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="7"
 PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
 inherit bash-completion-r1 distutils-r1 git-r3 readme.gentoo-r1