gentoo resync : 01.12.2017

3 files changed, 24 insertions, 7 deletions

diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 76f0e299fe83..c4b7eeaaa15f 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,8 +1,8 @@
-DIST youtube-dl-2017.03.16.tar.gz 2631620 SHA256 55df3cbda9cf86e49baf54040340ec74c692bb3d6da3d2f5a1bc1238017dd492 SHA512 f3b8942f6b2be3b1cfd4bddfb74c17bad48c8ef4bea34114970ecb9d65b5a3dcbe71beba6d7c2dbda168371bbb2e8bbaddce58039bd9d158bf23950a2a88123c WHIRLPOOL 8345da00074e62ec9a9c244cb9ef64930fbd0e5e9e5bc1709bfcf56517cc6312031a09523c3016db2a1542c16a0297bea9d6883a201ae94e347e358307e92422
-DIST youtube-dl-2017.11.06.tar.gz 2831531 SHA256 6d0c0226a1e914c94a9a68e8bff5a6498bdf783ffb9513ecf18646139c1e58b6 SHA512 0f7707084f84e7375ae61ffa88979990ba27cf2afb44992d75172415190f5959fe317313b127cbdde33500ed6b0525e9ff03872116dfa7ca188a97e74d562574 WHIRLPOOL a077a96023aec039e74380f91c34c59208cae3e2e06635003547bf8ed7fbb80756bdc73fac7b5607449b9740ea61ce2f1185d2adc738ccd7f6cbfbc32fe9b4ad
-DIST youtube-dl-2017.11.15.tar.gz 2834012 SHA256 88b177baaad0ceafc496bbef790c24b35272cbd9527e2b64f536131aad040ce8 SHA512 e10c0d53db7fdfb02610b53f54046c0a9354b305ba05c5d00a43649a283a6449263f66ff56171d52cf18f906c6aeccc25dc48ea708b4b1bb2b8323b937abca96 WHIRLPOOL a9d82b0881c91ed410cb57c14a80417e1791a44a51e2a59f14b039ca8bed25715b8de5e70b4434d5b0e87ebbde9b17399e04cf468e878a14b09e3729f239f66f
+DIST youtube-dl-2017.03.16.tar.gz 2631620 BLAKE2B 2aff8710a296140a4329b0f8e7f57526684ca114ba39a7397eef81b1b79b4b5dfae685c1f0011cddf8569d8df1e50111bbce7f12647c067972c79ea3b116b2ff SHA512 f3b8942f6b2be3b1cfd4bddfb74c17bad48c8ef4bea34114970ecb9d65b5a3dcbe71beba6d7c2dbda168371bbb2e8bbaddce58039bd9d158bf23950a2a88123c
+DIST youtube-dl-2017.11.15.tar.gz 2834012 BLAKE2B fd93e3923f99874be58681a886c09e31ac10063975ab636badf27e59b44743c72cddf05e3a431c49ffd0f7b40f9b005f4d90feff85d4ca889dee80833300b076 SHA512 e10c0d53db7fdfb02610b53f54046c0a9354b305ba05c5d00a43649a283a6449263f66ff56171d52cf18f906c6aeccc25dc48ea708b4b1bb2b8323b937abca96
+DIST youtube-dl-2017.11.26.tar.gz 2839867 BLAKE2B c4f1b9739283fb4016ff0892bdcb0db86f1ddc88842553d76159fe4312e70e7145085f3b6a1bfc157d7f5811f28eb1ab79661db701a3366be12be2357b464f19 SHA512 ecf1eb88b37e271505a50709a468afcc6048f00bc6531e8df1eb064dcea62ad6fa2a5a9016d1d106e56b9d3b9904325e133491ca124e06ec64e6f4a5902a2368
 EBUILD youtube-dl-2017.03.16.ebuild 2381 BLAKE2B bbf217461544a08786e3ba044e9b704354133dde4197d05ad92a8cdfd2e402dd0c013964da8b7971475a31ced7db734c89ef3ea33991b0227980d4025490c0fa SHA512 b47b7f8c00e04879aaac6bc70621d28f9e6e153b618bd246f95a2b11f8f09bf77cfefc5f0869b379759edf68a8f5d4afded6425032a9efdb8a1cbf44a23e9862
-EBUILD youtube-dl-2017.11.06.ebuild 2382 BLAKE2B dc7476db3784bfbfdb2c9d818577e781cde3fe8a174b2d1ce7b11183e627f82d234f0d6d76ceb87a5169b9d014eed2b99985c7f0cc9a7ebad2dffbfe7351938f SHA512 ab1e5bfe8a287cf5ad8f74efeaa95469b66d62f28f45e65c0aa41e352661de8e3fac99a1d60f15c33b312985794ce6b08fd8e08340f2adce1d46391065be4e20
-EBUILD youtube-dl-2017.11.15.ebuild 2381 BLAKE2B 97cf491495c6ed4eaaf3db59e531303d380003925606530f5e76936425e8d06c45d1b8be970cb86b7e7f6c96a13e82641acddc381677ff170dfb77529bab4e49 SHA512 a45074412fd250f1c152951c64b9b8c53b646a5007544171498e4275197798b599ab25c0a266b7cb8dcd2b54781786ff42d15543b6c20a25691687ce402d8fc5
+EBUILD youtube-dl-2017.11.15.ebuild 2379 BLAKE2B 34ee4dfda07511e1f1e27576b967341bba6329312751cf5bc49fd54fe1bd6c2a5444ca0b82a25c15a40901b7a2edf743cfbb08e3bfcfca72e9dc5afe420605ed SHA512 f3996f3fe5ff5d92025a1adf594db099114e1a9a2e831d26fa8472c1cea1e3792a81996407b0349f244aeba1489f6ea1b757aaab827d5af55a6cad5a18a8eddf
+EBUILD youtube-dl-2017.11.26-r1.ebuild 3267 BLAKE2B 3227b519ffc0d8ee64afb3d67c2d4cdbae5a0a89af64f6a0fcb714e73f81031ba94c1af601e4d5ec9c3a0f01e6bac8a6e0c07b4d4a0596af985f72a96a1d884d SHA512 7eccbe2a3f18ee560043684aa0ff1868923adb79b6b2e35ab0da782920cfdf5e8b67b154c703918c23e23954b29c040438d60d9dfccbcbfa660c2d58885db96c
 EBUILD youtube-dl-99999999.ebuild 2089 BLAKE2B df876c715ffaa403d175515951e751611df0cb89e815515b045bebb29add327aa0df50f25303864e1ff0abe8f19a53718e9d20c64dd9d3ead549ad57125376d0 SHA512 a390ee79a77aa98603ca01a702df6621ac4630e62e7afd089e065bd4468fc38bfd13bba365e28916024f0eb9e92627133281985f57692432522aeb4671a0cf11
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2017.11.15.ebuild b/net-misc/youtube-dl/youtube-dl-2017.11.15.ebuild
index 55c0ffc7515d..a9e6d290efc1 100644
--- a/net-misc/youtube-dl/youtube-dl-2017.11.15.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2017.11.15.ebuild
@@ -11,7 +11,7 @@ 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"
+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="
diff --git a/net-misc/youtube-dl/youtube-dl-2017.11.06.ebuild b/net-misc/youtube-dl/youtube-dl-2017.11.26-r1.ebuild
index 975ce26c347e..1ca94c2424ec 100644
--- a/net-misc/youtube-dl/youtube-dl-2017.11.06.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2017.11.26-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-inherit bash-completion-r1 distutils-r1
+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/"
@@ -94,4 +94,21 @@ python_install_all() {
 	distutils-r1_python_install_all
 
 	rm -r "${ED}"/usr/etc || die
+	rm -r "${ED}"/usr/share/doc/youtube_dl || die
+
+	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."
 }