From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E9D341393C0 for ; Fri, 25 Jun 2021 09:50:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 167C6E088A; Fri, 25 Jun 2021 09:50:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D7A9EE088A for ; Fri, 25 Jun 2021 09:50:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DE574335C56 for ; Fri, 25 Jun 2021 09:50:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 550817A1 for ; Fri, 25 Jun 2021 09:50:14 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1624614603.70d0659c3dbcaf2600e6fe934e64d0d1a53dd5c4.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/youtube-dl/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/youtube-dl/youtube-dl-2021.05.16.ebuild net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild net-misc/youtube-dl/youtube-dl-9999.ebuild X-VCS-Directories: net-misc/youtube-dl/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 70d0659c3dbcaf2600e6fe934e64d0d1a53dd5c4 X-VCS-Branch: master Date: Fri, 25 Jun 2021 09:50:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5fe77e6a-a1c7-4f41-8099-e19e392be0f6 X-Archives-Hash: 0b94352d5cba96e1b2c3cd6513f5828a commit: 70d0659c3dbcaf2600e6fe934e64d0d1a53dd5c4 Author: Marek Szuba gentoo org> AuthorDate: Fri Jun 25 09:48:28 2021 +0000 Commit: Marek Szuba gentoo org> CommitDate: Fri Jun 25 09:50:03 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70d0659c net-misc/youtube-dl: only mention optional pkgs if they are absent Doing it with has_version directly because optfeature.eclass is geared towards short descriptions and several of these are anything but. Closes: https://bugs.gentoo.org/769917 Signed-off-by: Marek Szuba gentoo.org> net-misc/youtube-dl/youtube-dl-2021.05.16.ebuild | 39 +++++++++++++----------- net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild | 39 +++++++++++++----------- net-misc/youtube-dl/youtube-dl-9999.ebuild | 39 +++++++++++++----------- 3 files changed, 66 insertions(+), 51 deletions(-) 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 3d701ad41fa..f6c4602df69 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 8ec79bfd981..5d46a59d125 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 50bd1337b3f..6ea8ff1593c 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 }