gentoo resync : 04.08.2018

4 files changed, 45 insertions, 19 deletions

diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index e843c370d728..a9dc82bd7f30 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,8 +1,8 @@
 DIST youtube-dl-2017.11.15.tar.gz 2834012 BLAKE2B fd93e3923f99874be58681a886c09e31ac10063975ab636badf27e59b44743c72cddf05e3a431c49ffd0f7b40f9b005f4d90feff85d4ca889dee80833300b076 SHA512 e10c0d53db7fdfb02610b53f54046c0a9354b305ba05c5d00a43649a283a6449263f66ff56171d52cf18f906c6aeccc25dc48ea708b4b1bb2b8323b937abca96
-DIST youtube-dl-2018.07.04.tar.gz 2993980 BLAKE2B 79bef6497c6dd5444608e8d75cffac72a0c1779d234a5537af16cb9e876a086bf7b57981e6e85f5f9504be794e0d6d1c46b3f98b1cae509d864799ce6ce7b03d SHA512 7a67948307d8909c0415635c9c560bdf809b085f1675aa2c4aafa8007b8f420beb6347a56e3fbe61507aca1b42ac932ce75ae46aa2cd62e129fa604cd6ceb6e0
-DIST youtube-dl-2018.07.10.tar.gz 3001810 BLAKE2B 4ffd9f678897be476983322921640007962cc307e1b0e095a012fd2840a26864bb1125b4f937ca43ba52134e32b80976b6ad185eb5e0f7523852915f61c1b293 SHA512 4f83bc02002d31bd04d9319d798c1b190b5a357864daca9661bcdeef3f71b258fb9b4b76ae1c19a0901ba5b0e56b834f0124353a4e4e3c6d0554a8f4f967c246
+DIST youtube-dl-2018.07.21.tar.gz 3006144 BLAKE2B 63b0fdf38f9e510b163a1737136956c0d4c497b0e3f78caad01170711c359e2ee9638f6448992ff28760cac60d0496c1572a04939f95d060560bc399d3399a4e SHA512 d0c75b8d651a4c401dd706c3ce86882098a16e9bb3e72b3871b3fe5284a345fc04bf5f7a9165a12af63091660a68a9b81f80a523b2090da3556856d69a81b6bf
+DIST youtube-dl-2018.07.29.tar.gz 3012839 BLAKE2B 9550f03b74db95fe26310348113883763240a187d69f1f859fe516848f6d9647555113d12397b7d30f3b4c7799c930b373825b54f2db05ac72b3be0e6b7efad0 SHA512 a41b97b5dca0715a891ff77d8317939d2b86e495fe2ec1cca6aaea72da545f6cdd6c4cf605c2ebd004a0add049d5fb1ed17b6dab9d99fc349f378e37ff6be330
 EBUILD youtube-dl-2017.11.15.ebuild 2376 BLAKE2B 184105b328f74b20fbb61357b33aeff4b3d4a984179398c9ebbd67a3973a0e0730b98e3414e52d7cf89c7bb15340491d110dc0480b033d4c49714c0cd3ff387c SHA512 baefa087e59c737053e923f7a384ab22ba727f3b9ffd02fad2d80d0fea957babe2ca40f19889eabbf4237416df9cdacfe4b5df2b106a3a7dd4fe1aed9c62a49f
-EBUILD youtube-dl-2018.07.04.ebuild 3291 BLAKE2B f8333e3a08fa02124c38adc08986a9cae6b58e5bd9d881e9b93e23c03f64e5f80df6ae90b1ae9f0cd0061f0296a12e7c74e878284be274f7eb5732928c0534a0 SHA512 73bcd09adad379e668f2046b7c7e6f7dbac936c073de7e722f135f0222ca3d7eedc7ae05fbbae4deb69ba97a78f6e6d7e18b12f884cd2955b2d7ab57c6c8d036
-EBUILD youtube-dl-2018.07.10.ebuild 3291 BLAKE2B f8333e3a08fa02124c38adc08986a9cae6b58e5bd9d881e9b93e23c03f64e5f80df6ae90b1ae9f0cd0061f0296a12e7c74e878284be274f7eb5732928c0534a0 SHA512 73bcd09adad379e668f2046b7c7e6f7dbac936c073de7e722f135f0222ca3d7eedc7ae05fbbae4deb69ba97a78f6e6d7e18b12f884cd2955b2d7ab57c6c8d036
-EBUILD youtube-dl-99999999.ebuild 2089 BLAKE2B df876c715ffaa403d175515951e751611df0cb89e815515b045bebb29add327aa0df50f25303864e1ff0abe8f19a53718e9d20c64dd9d3ead549ad57125376d0 SHA512 a390ee79a77aa98603ca01a702df6621ac4630e62e7afd089e065bd4468fc38bfd13bba365e28916024f0eb9e92627133281985f57692432522aeb4671a0cf11
+EBUILD youtube-dl-2018.07.21.ebuild 3291 BLAKE2B f8333e3a08fa02124c38adc08986a9cae6b58e5bd9d881e9b93e23c03f64e5f80df6ae90b1ae9f0cd0061f0296a12e7c74e878284be274f7eb5732928c0534a0 SHA512 73bcd09adad379e668f2046b7c7e6f7dbac936c073de7e722f135f0222ca3d7eedc7ae05fbbae4deb69ba97a78f6e6d7e18b12f884cd2955b2d7ab57c6c8d036
+EBUILD youtube-dl-2018.07.29-r1.ebuild 3312 BLAKE2B 98cedcc93b25d20e32cd550f48f2347f114b7cb34e0317f5dab3cdd26abe08ee875424f6f226f3c53df6ec6a4a88579c561301a3da07b4e25e6423056d0b0f8d SHA512 a43df4e5d3c563bc7ae67728b765387f62b090db24a96bf367f045ed0011db3e24f71014feaaff014b23db06c74cafee816594f2c6090825481346e31e7e7a0f
+EBUILD youtube-dl-99999999.ebuild 3168 BLAKE2B 2b6c54cc0441d82b300163338ee9f8d61afa8d0418fc860bec168c5a9eb156a4c2e31fda632ff5e69943aaaf98c6d8de49b4d9a38e75020e264b5a3ea3f2b0cf SHA512 23a01cefa9229f12b67c2d01f5a0abf5e463da6bd1dc3affc40ee9aa2305d0f7ff18d2b7de069da5be4fcbed4cbb4a7a26c65e0a60728e2432b3a53ac3d0ce5c
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2018.07.04.ebuild b/net-misc/youtube-dl/youtube-dl-2018.07.21.ebuild
index 37bffad45c8e..37bffad45c8e 100644
--- a/net-misc/youtube-dl/youtube-dl-2018.07.04.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2018.07.21.ebuild
diff --git a/net-misc/youtube-dl/youtube-dl-2018.07.10.ebuild b/net-misc/youtube-dl/youtube-dl-2018.07.29-r1.ebuild
index 37bffad45c8e..033b66fc205e 100644
--- a/net-misc/youtube-dl/youtube-dl-2018.07.10.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2018.07.29-r1.ebuild
@@ -87,7 +87,7 @@ python_install_all() {
 	insinto /usr/share/zsh/site-functions
 	newins youtube-dl.zsh _youtube-dl
 
-	insinto /usr/share/fish/completions
+	insinto /usr/share/fish/completions/vendor_completions.d
 	doins youtube-dl.fish
 
 	distutils-r1_python_install_all
diff --git a/net-misc/youtube-dl/youtube-dl-99999999.ebuild b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
index 683bc08f1a19..5d18c5096250 100644
--- a/net-misc/youtube-dl/youtube-dl-99999999.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 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 git-r3
+inherit bash-completion-r1 distutils-r1 git-r3 readme.gentoo-r1
 
 DESCRIPTION="Download videos from YouTube.com (and more sites...)"
 HOMEPAGE="https://rg3.github.com/youtube-dl/"
@@ -13,34 +12,32 @@ EGIT_REPO_URI="https://github.com/rg3/youtube-dl.git"
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS=""
-IUSE="offensive test"
+IUSE="+offensive test"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 "
 DEPEND="
 	${RDEPEND}
-	dev-python/sphinx[${PYTHON_USEDEP}]
 	test? ( dev-python/nose[coverage(+)] )
 "
 
 python_prepare_all() {
 	if ! use offensive; then
-		sed -i -e "/__version__/s|'$|-gentoo_no_offensive_sites'|g" \
+		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 fourtube 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
+			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 pornhub redtube tnaflix xhamster
+			drtuber fourtube motherless pornhub redtube tnaflix tube8 xhamster
 		)
 		# do single line imports
 		sed -i \
@@ -73,6 +70,8 @@ python_prepare_all() {
 
 src_compile() {
 	distutils-r1_src_compile
+
+	emake ${PN}.{bash-completion,fish,zsh}
 }
 
 python_test() {
@@ -82,7 +81,34 @@ python_test() {
 python_install_all() {
 	dodoc README.md
 
+	newbashcomp ${PN}.bash-completion ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	insinto /usr/share/fish/completions/vendor_completions.d
+	doins ${PN}.fish
+
 	distutils-r1_python_install_all
 
 	rm -r "${ED}"/usr/etc || die
+	rm -r "${ED}"/usr/share/doc/youtube_dl || die
+}
+
+pkg_postinst() {
+	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
+	elog "https://github.com/rg3/${PN}/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."
 }