gentoo resync : 29.06.2021

4 files changed, 69 insertions, 54 deletions

diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 1dd9aa555f10..2aa1f89e68eb 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,6 +1,6 @@
 DIST youtube-dl-2021.05.16.tar.gz 3336051 BLAKE2B b73206355187a9f61c51749ce01db40757937f79f988a3b81513a5cbe2c854d1b7f2268d7e02c4a0eb3d46c0852990950dfd400acc09f7616aeccb2e8cba6cf9 SHA512 a78ebfc16cc52458e2a036deb48693110f20c046ca3a509be9adbca76d23429953fcf3cd3aab8390a19af747291950bb9261e5339e5cbb0903b98848216c7aca
 DIST youtube-dl-2021.06.06.tar.gz 3336227 BLAKE2B f30252927ddd79062995ec78d45854e1723fe561ca34777fb0a337750bf09c76da8c205af63869c68c6bc09bfe8f6de1d3f5ee240914ae871bb7920076d8d16c SHA512 7b4d453723d03c3fde46451277d5c44be01469ed1b414ce94e782d6228c132c982835805207222862d0d7b8ba162157196f976400fd15cea7ea513e3595aeea3
-EBUILD youtube-dl-2021.05.16.ebuild 2132 BLAKE2B aca117606444a348e36c1899222b24c091ed717dfa799f48a92de68c4ad07b9671719eaa15e084843d4fead0905d00302884da3ebd56e6e39297da42b446a38b SHA512 9f0f20088a069af5f33ffcab5c4db0bf850e01c34b70bd72279140b9485f838e4f947d48adbe8fc8a30ee064078aae02c08d7c7a5632d42803ae47d39431e99d
-EBUILD youtube-dl-2021.06.06.ebuild 2104 BLAKE2B 569aa65da08a7dd77d3988ff9583a5af8f8c8f556d4d6b7742ddc7c7b11d8266a969cbd40a39f0fb22a245cb4d5a93ad5bdc771fb54b421f25f2cb2719bc387a SHA512 9d91adeafb7ad3f3caca35c5e65b7caaf86cdaa37b5b7c1a7312175dcd7665a4ac84bd5e72d2c7c3f81c6b33fabec9829ead0e94c3f7e3739019c045220ed47a
-EBUILD youtube-dl-9999.ebuild 2097 BLAKE2B 193cf2464a2d5f7fe0f6fcbbeefa919884d8bfff551446930a12a98afa0827ff178a9e8af7bc9df827d09ce539a824781b155286b57cd2e7f3e7e1629b08be1b SHA512 a51572c892c8774eccc3ebe098ba634a9c60d3b68e956e980e62313e0ddce524c5cf3e686b820f6a12ee60ef849512004d9677eeea6b54b0d3d1c2504a7ec801
+EBUILD youtube-dl-2021.05.16.ebuild 2185 BLAKE2B ae2b6ad60b6ec44cceeb957c121976720ef9eea4e446e604e598e3e69eb3ed981c838f1bebd16d30c559ec1c1366eca418f6594a34ea64cfc6b407298d62f51e SHA512 2c7917b52f4b75ac4429ff546bf099057ca7d4d4c3ddc9ad9a05b6d07a5ddec6bd3df7530362d6973002776656847905c0e8dd01f60bac56b2495697474272e5
+EBUILD youtube-dl-2021.06.06.ebuild 2157 BLAKE2B 63acd2a5c3cc48f9cd3dd9edaeb9c6c6dd29f2d58222fd6cd9f870c25e6e284bcfd7ce78efc422f82a60f7e8fd605d797f8b79774b6229345d20a8618d8d0044 SHA512 154191b8d145b9669ce427bfcb918b5bd69f2c8417b236b2485687d0f3a71927404203ac5ef11519a3289491d98b909a26d21d7cba64dbcde9870178a18071eb
+EBUILD youtube-dl-9999.ebuild 2150 BLAKE2B 845e5d04d4ce84654c07ac59a7d3ee585fd8c514fc26ef6bf6d768c9812e8f72a8be6c41b76c74d995b8e0cef84e5d5e9dc3a4f20d6789c7160bc287cf0a011f SHA512 bc42946c393450632744e8c2e06a2defaa4066322756caccf8010a6d3c9db12d9296f9f366b7e8375283d166655089f06beb4cb3be313c1a7ec2bc74f4d576f0
 MISC metadata.xml 377 BLAKE2B dde3a782cb62c9f3b65479ba2496706e5c02b19b32aa3ed4be66a8d819485f04d62d6d0c383eaa65409551f6696d990077af553f1095163db8226cc9bfcc8339 SHA512 367f0cec4f63096ea8832cc8a8eb3bbc4c5b14b26f8a9bf4189ae7337381ec9f2444475521156e3f3965242f5b1a9bce456a286c80c22b9f05a11d41ac73b623
diff --git a/net-misc/youtube-dl/youtube-dl-2021.05.16.ebuild b/net-misc/youtube-dl/youtube-dl-2021.05.16.ebuild
index 3d701ad41fa9..f6c4602df69f 100644
--- a/net-misc/youtube-dl/youtube-dl-2021.05.16.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2021.05.16.ebuild
@@ -51,21 +51,26 @@ python_install_all() {
 }
 
 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 "youtube-dl works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
-	elog "On some sites - most notably YouTube - videos can be retrieved in"
-	elog "a higher quality format without sound. youtube-dl will detect whether"
-	elog "ffmpeg is present and 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
-	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 youtube-dl to embed thumbnails from the metadata into the"
-	elog "resulting MP4 files, consider installing media-video/atomicparsley"
+	if ! has_version media-video/ffmpeg; then
+		elog "${PN} works fine on its own on most sites. However, if you want"
+		elog "to convert video/audio, you'll need media-video/ffmpeg."
+		elog "On some sites - most notably YouTube - videos can be retrieved in"
+		elog "a higher quality format without sound. ${PN} will detect whether"
+		elog "ffmpeg is present and automatically pick the best option."
+	fi
+	if ! has_version media-video/rtmpdump; then
+		elog
+		elog "Videos or video formats streamed via RTMP protocol can only be"
+		elog "downloaded when media-video/rtmpdump is installed."
+	fi
+	if ! has_version media-video/mplayer && ! has_version media-video/mpv; then
+		elog
+		elog "Downloading MMS and RTSP videos requires either media-video/mplayer"
+		elog "or media-video/mpv to be installed."
+	fi
+	if ! has_version media-video/atomicparsley; then
+		elog
+		elog "Install media-video/atomicparsley if you want ${PN} to embed thumbnails"
+		elog "from the metadata into the resulting MP4/M4A files."
+	fi
 }
diff --git a/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild b/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild
index 8ec79bfd981f..5d46a59d125b 100644
--- a/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild
@@ -48,21 +48,26 @@ python_install_all() {
 }
 
 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 "youtube-dl works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
-	elog "On some sites - most notably YouTube - videos can be retrieved in"
-	elog "a higher quality format without sound. youtube-dl will detect whether"
-	elog "ffmpeg is present and 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
-	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 youtube-dl to embed thumbnails from the metadata into the"
-	elog "resulting MP4 files, consider installing media-video/atomicparsley"
+	if ! has_version media-video/ffmpeg; then
+		elog "${PN} works fine on its own on most sites. However, if you want"
+		elog "to convert video/audio, you'll need media-video/ffmpeg."
+		elog "On some sites - most notably YouTube - videos can be retrieved in"
+		elog "a higher quality format without sound. ${PN} will detect whether"
+		elog "ffmpeg is present and automatically pick the best option."
+	fi
+	if ! has_version media-video/rtmpdump; then
+		elog
+		elog "Videos or video formats streamed via RTMP protocol can only be"
+		elog "downloaded when media-video/rtmpdump is installed."
+	fi
+	if ! has_version media-video/mplayer && ! has_version media-video/mpv; then
+		elog
+		elog "Downloading MMS and RTSP videos requires either media-video/mplayer"
+		elog "or media-video/mpv to be installed."
+	fi
+	if ! has_version media-video/atomicparsley; then
+		elog
+		elog "Install media-video/atomicparsley if you want ${PN} to embed thumbnails"
+		elog "from the metadata into the resulting MP4/M4A files."
+	fi
 }
diff --git a/net-misc/youtube-dl/youtube-dl-9999.ebuild b/net-misc/youtube-dl/youtube-dl-9999.ebuild
index 50bd1337b3fd..6ea8ff1593c3 100644
--- a/net-misc/youtube-dl/youtube-dl-9999.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-9999.ebuild
@@ -52,21 +52,26 @@ python_install_all() {
 }
 
 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 "youtube-dl works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
-	elog "On some sites - most notably YouTube - videos can be retrieved in"
-	elog "a higher quality format without sound. youtube-dl will detect whether"
-	elog "ffmpeg is present and 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
-	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 youtube-dl to embed thumbnails from the metadata into the"
-	elog "resulting MP4 files, consider installing media-video/atomicparsley"
+	if ! has_version media-video/ffmpeg; then
+		elog "${PN} works fine on its own on most sites. However, if you want"
+		elog "to convert video/audio, you'll need media-video/ffmpeg."
+		elog "On some sites - most notably YouTube - videos can be retrieved in"
+		elog "a higher quality format without sound. ${PN} will detect whether"
+		elog "ffmpeg is present and automatically pick the best option."
+	fi
+	if ! has_version media-video/rtmpdump; then
+		elog
+		elog "Videos or video formats streamed via RTMP protocol can only be"
+		elog "downloaded when media-video/rtmpdump is installed."
+	fi
+	if ! has_version media-video/mplayer && ! has_version media-video/mpv; then
+		elog
+		elog "Downloading MMS and RTSP videos requires either media-video/mplayer"
+		elog "or media-video/mpv to be installed."
+	fi
+	if ! has_version media-video/atomicparsley; then
+		elog
+		elog "Install media-video/atomicparsley if you want ${PN} to embed thumbnails"
+		elog "from the metadata into the resulting MP4/M4A files."
+	fi
 }