commit: 8df595c6b6a2c3aade2e3bfe6f3903dfd06e52f4 Author: Jian Lin <jlin.gentoo <AT> outlook <DOT> com> AuthorDate: Tue Feb 16 17:53:58 2021 +0000 Commit: Theo Anderson <telans <AT> posteo <DOT> de> 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 <jlin.gentoo <AT> 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()