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 76D5413835A for ; Tue, 16 Feb 2021 17:54:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 87AE4E0837; Tue, 16 Feb 2021 17:54:40 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 7364BE0837 for ; Tue, 16 Feb 2021 17:54:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 B91423412CB for ; Tue, 16 Feb 2021 17:54:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 706854DE for ; Tue, 16 Feb 2021 17:54:37 +0000 (UTC) From: "Jian Lin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jian Lin" Message-ID: <1613498070.8df595c6b6a2c3aade2e3bfe6f3903dfd06e52f4.jian@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: media-video/qliveplayer/ X-VCS-Repository: repo/proj/guru X-VCS-Files: media-video/qliveplayer/qliveplayer-3.21.0-r1.ebuild media-video/qliveplayer/qliveplayer-3.21.1-r1.ebuild X-VCS-Directories: media-video/qliveplayer/ X-VCS-Committer: jian X-VCS-Committer-Name: Jian Lin X-VCS-Revision: 8df595c6b6a2c3aade2e3bfe6f3903dfd06e52f4 X-VCS-Branch: dev Date: Tue, 16 Feb 2021 17:54:37 +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: 64e7e62a-fee9-4f99-9c47-b3035db17ea2 X-Archives-Hash: 0c15b89c8e2c1c41ca634acadea38b3a commit: 8df595c6b6a2c3aade2e3bfe6f3903dfd06e52f4 Author: Jian Lin outlook com> AuthorDate: Tue Feb 16 17:53:58 2021 +0000 Commit: Jian Lin outlook com> CommitDate: Tue Feb 16 17:54:30 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8df595c6 media-video/qliveplayer: add check for sed Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Jian Lin outlook.com> media-video/qliveplayer/qliveplayer-3.21.0-r1.ebuild | 16 +++++++++------- media-video/qliveplayer/qliveplayer-3.21.1-r1.ebuild | 16 +++++++++------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/media-video/qliveplayer/qliveplayer-3.21.0-r1.ebuild b/media-video/qliveplayer/qliveplayer-3.21.0-r1.ebuild index 27026270..407d6797 100644 --- a/media-video/qliveplayer/qliveplayer-3.21.0-r1.ebuild +++ b/media-video/qliveplayer/qliveplayer-3.21.0-r1.ebuild @@ -47,13 +47,15 @@ src_prepare() { xdg_environment_reset cmake_src_prepare - # fix python version - sed -i "s/python3/${EPYTHON}/" src/qlphelper/bilivideo.cpp \ - || die "Sed failed to set python version!" - sed -i "s/python3/${EPYTHON}/" src/qlphelper/danmakulauncher.cpp \ - || die "Sed failed to set python version!" - sed -i "s/python3/${EPYTHON}/" src/qlphelper/streamfinder.cpp \ - || die "Sed failed to set python version!" + # respect PYTHON_SINGLE_TARGET + grep 'p.start("python3", args);' src/qlphelper/bilivideo.cpp >/dev/null || die + sed -i "s/python3/${EPYTHON}/" src/qlphelper/bilivideo.cpp || die + grep 'dmcPyProcess->start("python3", dmcPy);' \ + src/qlphelper/danmakulauncher.cpp >/dev/null || die + sed -i "s/python3/${EPYTHON}/" src/qlphelper/danmakulauncher.cpp || die + grep 'proc->start("python3", args);' \ + src/qlphelper/streamfinder.cpp >/dev/null || die + sed -i "s/python3/${EPYTHON}/" src/qlphelper/streamfinder.cpp || die } src_install() diff --git a/media-video/qliveplayer/qliveplayer-3.21.1-r1.ebuild b/media-video/qliveplayer/qliveplayer-3.21.1-r1.ebuild index d581231d..532060f9 100644 --- a/media-video/qliveplayer/qliveplayer-3.21.1-r1.ebuild +++ b/media-video/qliveplayer/qliveplayer-3.21.1-r1.ebuild @@ -47,13 +47,15 @@ src_prepare() { xdg_environment_reset cmake_src_prepare - # fix python version - sed -i "s/python3/${EPYTHON}/" src/qlphelper/bilivideo.cpp \ - || die "Sed failed to set python version!" - sed -i "s/python3/${EPYTHON}/" src/qlphelper/danmakulauncher.cpp \ - || die "Sed failed to set python version!" - sed -i "s/python3/${EPYTHON}/" src/qlphelper/streamfinder.cpp \ - || die "Sed failed to set python version!" + # respect PYTHON_SINGLE_TARGET + grep 'p.start("python3", args);' src/qlphelper/bilivideo.cpp >/dev/null || die + sed -i "s/python3/${EPYTHON}/" src/qlphelper/bilivideo.cpp || die + grep 'dmcPyProcess->start("python3", dmcPy);' \ + src/qlphelper/danmakulauncher.cpp >/dev/null || die + sed -i "s/python3/${EPYTHON}/" src/qlphelper/danmakulauncher.cpp || die + grep 'proc->start("python3", args);' \ + src/qlphelper/streamfinder.cpp >/dev/null || die + sed -i "s/python3/${EPYTHON}/" src/qlphelper/streamfinder.cpp || die } src_install()