gentoo resync : 19.03.2019

5 files changed, 92 insertions, 14 deletions

diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 3e6542929083..8c6c3e7f98f8 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,6 +1,8 @@
-DIST youtube-dl-2019.02.18.tar.gz 3114830 BLAKE2B f948fc68d9bc2b7e400d22b4d2980b7f56bf734476a54b3e30b6ee33d5e4a0950233dfd74b0db26108a5759e3589acde4fe104d41ea856c88f68e165f330132b SHA512 86a321003b9e0bdc852294c8ac75d601141177f3469330c6ab01fa821758ee848dfcdf0e9dd514ca2da7b7e3c2a7f2dcddab9929f7fa8be2ab3c86d6eccbd5e3
 DIST youtube-dl-2019.03.01.tar.gz 3117441 BLAKE2B 92beb16920b6d9c3ead89d5ff930b73635f74d7aeba62a4ee8159e28b448931810f340857bc223ab587610704405083768137a62d7c92814a7525825adc60919 SHA512 ff037b2288b937ebc70bfa880a4c0cd10cb4a615725e25f8db998c828d4b505461088b5aaa926aa47f148189496275f1a70e03e187325c15d6ff425ed4da2dc7
-EBUILD youtube-dl-2019.02.18.ebuild 2021 BLAKE2B a7fe20e586f2d3243069237315e89ad05ff23c1684854a4029111c30622f23a8ba0c73325bb3a98f6fdc76203afd3ae4246ae62e0cfdc02c281188d3b1e25e40 SHA512 c589d6d581b2a91443ba9def42b278ed427bebc45a02b25a053dbb556c23dc299b5a8873540679394863a1ca2a3da929d27b779e467c0269707600fea55a7e7a
-EBUILD youtube-dl-2019.03.01.ebuild 2027 BLAKE2B 028f1bd62a12ad5b2b20eeaaf83e63c3dc765c0fd220ec2a187844993159f449b631a7e5c5d0b80977545e7ed47c9c452b3492c5001ce78c0452a69207120b8b SHA512 ce09e4ee4e17b44a51581d252ae5bda890d22168c612785033abd9297ea8be0409845b25a175775ddc64d9dbee0dd9324a2494df6316b4a41837fd4e8f483b23
-EBUILD youtube-dl-99999999.ebuild 1916 BLAKE2B 035ac8f58fec97b741be4d080401d6dea03531c95ef61782dcad898f51b2fe845d97ede3ddb4ac3ae52c327fb08d5729b41a1c057e8fb6c81e81afc3d87c4651 SHA512 ae1467fcc2b1bde3b33354a61e29b311a6d8876cbd0502186f55f0826c0182ea21afb229b34b39b37c9e625bb142d86348baa31dc0defc01e19beb427de40321
+DIST youtube-dl-2019.03.09.tar.gz 3120854 BLAKE2B 83c9dd22636dec34be497d28e28dcf8e68ad3566603acb5902dc422672aa73e27811bf27779da093e54fcee8068f9a3377eb21e8810f1a3cad95d4bdc920c8a7 SHA512 a827d481057ff502064acd4c170c5320c63e0abb1048ef9d3563083478dc518f0755ecdc3179fe75a1a949aa162f9bebdd96a59f913b34f0b7ed54b168fc2903
+DIST youtube-dl-2019.03.18.tar.gz 3122206 BLAKE2B 8a94cf92ebce960fe9b074d5cc23047fbf326fe4511c55f0a1c4843386e4e3c65da4f89a2401243dbaf73882f68aadc768e653e8ed9e5c91244172c24e55d8bb SHA512 0a683631da7d67aa2f23eb6326664e483b71ef776b3ff63c732bdef54f58c7f615733023f8c4b948078f59d136414bd059bdc753d89aec630126bbe826db58ce
+EBUILD youtube-dl-2019.03.01.ebuild 2025 BLAKE2B b6a2160f963618319a13803e39385f2a0811103ae2a5c88882ba600d68125f7b3b862b3676d5fcfad823d51864d6fc301ea71903ff3c5d631fe393d8bb44caa9 SHA512 3aa94e29d976d5fbab4835ef6e5327a72a7bb99cc5b36fffb1ac637fb48ba8d13ecad633b4e159d3c6da9ddd1e6d2b1109e1e7bb6f1553bbab7068574a68f2f1
+EBUILD youtube-dl-2019.03.09-r1.ebuild 2123 BLAKE2B 30c7bf09ce71e92554aa3149fd27be0dbb3608bb35303a496dc4b1388be8a5e67bee450d6d1ca185637c2409f74f52e0aeaee3dcaac30a3f3c57de092c4e2d17 SHA512 d86d5fe4dcef4cd09f200ebc9ff39a9eecc578522c1bfe8914f41fb16ebf525897511ed9114688c9b2172421f728f6608effa3521c75d2b1d11c47972b481139
+EBUILD youtube-dl-2019.03.18.ebuild 2117 BLAKE2B 5083bf39fb89c96f03b9d4b68353e30716c2649a502024e3116ead883c4007fdf291eee380b94259df2fa319baf78905288288278ef4b91a1629ad7e51d73616 SHA512 d8adef117e465905f79aed2ae691e136a3bae7c8f530f771750a98e661a018852ab499f71baebd39047213813ed382ecd88c46efc0f592264713e18c893d5ea6
+EBUILD youtube-dl-99999999.ebuild 2012 BLAKE2B 7ad819e850d30622c7b7e4c6ab21a5f3a0e3a5cbf9ab8f3c12f7e6c93ff8074a63f4b69ac1fd7ccb5bc9453cf298853756778e841a3f8988ee5c24e4a79f5c62 SHA512 2e5bfc2fa48edd888371b396bb09ba84a239ee0cc89ea80c39a5dd05bde5177935f5744dd2d1f7e9c0a18eca9a2014253a4fb9485129bbc68875f0fa030e92f0
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2019.03.01.ebuild b/net-misc/youtube-dl/youtube-dl-2019.03.01.ebuild
index 2cb0551f3e35..51dcb55b9d9f 100644
--- a/net-misc/youtube-dl/youtube-dl-2019.03.01.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2019.03.01.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6,3_7})
 inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
 
 DESCRIPTION="Download videos from YouTube.com (and more sites...)"
@@ -10,7 +10,7 @@ HOMEPAGE="https://rg3.github.com/youtube-dl/"
 SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
 LICENSE="public-domain"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 RESTRICT="test"
 SLOT="0"
 RDEPEND="
diff --git a/net-misc/youtube-dl/youtube-dl-2019.03.09-r1.ebuild b/net-misc/youtube-dl/youtube-dl-2019.03.09-r1.ebuild
new file mode 100644
index 000000000000..8249fc9c0e19
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2019.03.09-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 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,3_7})
+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"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+RESTRICT="test"
+SLOT="0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+	|| (
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+		dev-python/pycrypto[${PYTHON_USEDEP}]
+	)
+"
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+python_install_all() {
+	dodoc README.txt
+	doman ${PN}.1
+
+	newbashcomp ${PN}.bash-completion ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	insinto /usr/share/fish/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."
+	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-2019.02.18.ebuild b/net-misc/youtube-dl/youtube-dl-2019.03.18.ebuild
index d63726ec5fe0..38bace475e54 100644
--- a/net-misc/youtube-dl/youtube-dl-2019.02.18.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2019.03.18.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6,3_7})
 inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
 
 DESCRIPTION="Download videos from YouTube.com (and more sites...)"
@@ -13,11 +13,15 @@ LICENSE="public-domain"
 KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 RESTRICT="test"
 SLOT="0"
-RDEPEND="
+DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 "
-DEPEND="
-	${RDEPEND}
+RDEPEND="
+	${DEPEND}
+	|| (
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+		dev-python/pycrypto[${PYTHON_USEDEP}]
+	)
 "
 S="${WORKDIR}/${PN}"
 
diff --git a/net-misc/youtube-dl/youtube-dl-99999999.ebuild b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
index 632093ebfdb4..b34881e4d229 100644
--- a/net-misc/youtube-dl/youtube-dl-99999999.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6,3_7})
 inherit bash-completion-r1 distutils-r1 git-r3 readme.gentoo-r1
 
 DESCRIPTION="Download videos from YouTube.com (and more sites...)"
@@ -13,11 +13,15 @@ LICENSE="public-domain"
 KEYWORDS=""
 RESTRICT="test"
 SLOT="0"
-RDEPEND="
+DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 "
-DEPEND="
-	${RDEPEND}
+RDEPEND="
+	${DEPEND}
+	|| (
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+		dev-python/pycrypto[${PYTHON_USEDEP}]
+	)
 "
 
 src_compile() {