Gentoo Archives: gentoo-commits

From: Marek Szuba <marecki@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/youtube-dl/
Date: Fri, 25 Jun 2021 09:50:18
Message-Id: 1624614603.70d0659c3dbcaf2600e6fe934e64d0d1a53dd5c4.marecki@gentoo
1 commit: 70d0659c3dbcaf2600e6fe934e64d0d1a53dd5c4
2 Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jun 25 09:48:28 2021 +0000
4 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
5 CommitDate: Fri Jun 25 09:50:03 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70d0659c
7
8 net-misc/youtube-dl: only mention optional pkgs if they are absent
9
10 Doing it with has_version directly because optfeature.eclass is geared
11 towards short descriptions and several of these are anything but.
12
13 Closes: https://bugs.gentoo.org/769917
14 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
15
16 net-misc/youtube-dl/youtube-dl-2021.05.16.ebuild | 39 +++++++++++++-----------
17 net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild | 39 +++++++++++++-----------
18 net-misc/youtube-dl/youtube-dl-9999.ebuild | 39 +++++++++++++-----------
19 3 files changed, 66 insertions(+), 51 deletions(-)
20
21 diff --git a/net-misc/youtube-dl/youtube-dl-2021.05.16.ebuild b/net-misc/youtube-dl/youtube-dl-2021.05.16.ebuild
22 index 3d701ad41fa..f6c4602df69 100644
23 --- a/net-misc/youtube-dl/youtube-dl-2021.05.16.ebuild
24 +++ b/net-misc/youtube-dl/youtube-dl-2021.05.16.ebuild
25 @@ -51,21 +51,26 @@ python_install_all() {
26 }
27
28 pkg_postinst() {
29 - elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
30 - elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
31 - elog
32 - elog "youtube-dl works fine on its own on most sites. However, if you want"
33 - elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
34 - elog "On some sites - most notably YouTube - videos can be retrieved in"
35 - elog "a higher quality format without sound. youtube-dl will detect whether"
36 - elog "ffmpeg is present and automatically pick the best option."
37 - elog
38 - elog "Videos or video formats streamed via RTMP protocol can only be"
39 - elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
40 - elog
41 - elog "Downloading MMS and RTSP videos requires either mplayer"
42 - elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
43 - elog
44 - elog "If you want youtube-dl to embed thumbnails from the metadata into the"
45 - elog "resulting MP4 files, consider installing media-video/atomicparsley"
46 + if ! has_version media-video/ffmpeg; then
47 + elog "${PN} works fine on its own on most sites. However, if you want"
48 + elog "to convert video/audio, you'll need media-video/ffmpeg."
49 + elog "On some sites - most notably YouTube - videos can be retrieved in"
50 + elog "a higher quality format without sound. ${PN} will detect whether"
51 + elog "ffmpeg is present and automatically pick the best option."
52 + fi
53 + if ! has_version media-video/rtmpdump; then
54 + elog
55 + elog "Videos or video formats streamed via RTMP protocol can only be"
56 + elog "downloaded when media-video/rtmpdump is installed."
57 + fi
58 + if ! has_version media-video/mplayer && ! has_version media-video/mpv; then
59 + elog
60 + elog "Downloading MMS and RTSP videos requires either media-video/mplayer"
61 + elog "or media-video/mpv to be installed."
62 + fi
63 + if ! has_version media-video/atomicparsley; then
64 + elog
65 + elog "Install media-video/atomicparsley if you want ${PN} to embed thumbnails"
66 + elog "from the metadata into the resulting MP4/M4A files."
67 + fi
68 }
69
70 diff --git a/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild b/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild
71 index 8ec79bfd981..5d46a59d125 100644
72 --- a/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild
73 +++ b/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild
74 @@ -48,21 +48,26 @@ python_install_all() {
75 }
76
77 pkg_postinst() {
78 - elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
79 - elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
80 - elog
81 - elog "youtube-dl works fine on its own on most sites. However, if you want"
82 - elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
83 - elog "On some sites - most notably YouTube - videos can be retrieved in"
84 - elog "a higher quality format without sound. youtube-dl will detect whether"
85 - elog "ffmpeg is present and automatically pick the best option."
86 - elog
87 - elog "Videos or video formats streamed via RTMP protocol can only be"
88 - elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
89 - elog
90 - elog "Downloading MMS and RTSP videos requires either mplayer"
91 - elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
92 - elog
93 - elog "If you want youtube-dl to embed thumbnails from the metadata into the"
94 - elog "resulting MP4 files, consider installing media-video/atomicparsley"
95 + if ! has_version media-video/ffmpeg; then
96 + elog "${PN} works fine on its own on most sites. However, if you want"
97 + elog "to convert video/audio, you'll need media-video/ffmpeg."
98 + elog "On some sites - most notably YouTube - videos can be retrieved in"
99 + elog "a higher quality format without sound. ${PN} will detect whether"
100 + elog "ffmpeg is present and automatically pick the best option."
101 + fi
102 + if ! has_version media-video/rtmpdump; then
103 + elog
104 + elog "Videos or video formats streamed via RTMP protocol can only be"
105 + elog "downloaded when media-video/rtmpdump is installed."
106 + fi
107 + if ! has_version media-video/mplayer && ! has_version media-video/mpv; then
108 + elog
109 + elog "Downloading MMS and RTSP videos requires either media-video/mplayer"
110 + elog "or media-video/mpv to be installed."
111 + fi
112 + if ! has_version media-video/atomicparsley; then
113 + elog
114 + elog "Install media-video/atomicparsley if you want ${PN} to embed thumbnails"
115 + elog "from the metadata into the resulting MP4/M4A files."
116 + fi
117 }
118
119 diff --git a/net-misc/youtube-dl/youtube-dl-9999.ebuild b/net-misc/youtube-dl/youtube-dl-9999.ebuild
120 index 50bd1337b3f..6ea8ff1593c 100644
121 --- a/net-misc/youtube-dl/youtube-dl-9999.ebuild
122 +++ b/net-misc/youtube-dl/youtube-dl-9999.ebuild
123 @@ -52,21 +52,26 @@ python_install_all() {
124 }
125
126 pkg_postinst() {
127 - elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
128 - elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
129 - elog
130 - elog "youtube-dl works fine on its own on most sites. However, if you want"
131 - elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
132 - elog "On some sites - most notably YouTube - videos can be retrieved in"
133 - elog "a higher quality format without sound. youtube-dl will detect whether"
134 - elog "ffmpeg is present and automatically pick the best option."
135 - elog
136 - elog "Videos or video formats streamed via RTMP protocol can only be"
137 - elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
138 - elog
139 - elog "Downloading MMS and RTSP videos requires either mplayer"
140 - elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
141 - elog
142 - elog "If you want youtube-dl to embed thumbnails from the metadata into the"
143 - elog "resulting MP4 files, consider installing media-video/atomicparsley"
144 + if ! has_version media-video/ffmpeg; then
145 + elog "${PN} works fine on its own on most sites. However, if you want"
146 + elog "to convert video/audio, you'll need media-video/ffmpeg."
147 + elog "On some sites - most notably YouTube - videos can be retrieved in"
148 + elog "a higher quality format without sound. ${PN} will detect whether"
149 + elog "ffmpeg is present and automatically pick the best option."
150 + fi
151 + if ! has_version media-video/rtmpdump; then
152 + elog
153 + elog "Videos or video formats streamed via RTMP protocol can only be"
154 + elog "downloaded when media-video/rtmpdump is installed."
155 + fi
156 + if ! has_version media-video/mplayer && ! has_version media-video/mpv; then
157 + elog
158 + elog "Downloading MMS and RTSP videos requires either media-video/mplayer"
159 + elog "or media-video/mpv to be installed."
160 + fi
161 + if ! has_version media-video/atomicparsley; then
162 + elog
163 + elog "Install media-video/atomicparsley if you want ${PN} to embed thumbnails"
164 + elog "from the metadata into the resulting MP4/M4A files."
165 + fi
166 }