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 3EFC21382C5 for ; Sat, 5 Dec 2020 02:04:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 63736E095A; Sat, 5 Dec 2020 02:04:45 +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 46170E095A for ; Sat, 5 Dec 2020 02:04:45 +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 E1446340C9A for ; Sat, 5 Dec 2020 02:04:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5070C468 for ; Sat, 5 Dec 2020 02:04:42 +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: <1607133837.1cccc8604c0955b7681eee5c593a4aa5cdbdcdd3.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.20.1-r1.ebuild media-video/qliveplayer/qliveplayer-3.20.1.ebuild X-VCS-Directories: media-video/qliveplayer/ X-VCS-Committer: jian X-VCS-Committer-Name: Jian Lin X-VCS-Revision: 1cccc8604c0955b7681eee5c593a4aa5cdbdcdd3 X-VCS-Branch: dev Date: Sat, 5 Dec 2020 02:04:42 +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: 25a5bfb2-75a8-40e5-97fd-003fd4f0066b X-Archives-Hash: c100c1e40959b80dd03ccb31d12e8f11 commit: 1cccc8604c0955b7681eee5c593a4aa5cdbdcdd3 Author: Jian Lin outlook com> AuthorDate: Sat Dec 5 02:03:03 2020 +0000 Commit: Jian Lin outlook com> CommitDate: Sat Dec 5 02:03:57 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1cccc860 media-video/qliveplayer: fix python dependency Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Jian Lin outlook.com> ...-3.20.1.ebuild => qliveplayer-3.20.1-r1.ebuild} | 23 +++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/media-video/qliveplayer/qliveplayer-3.20.1.ebuild b/media-video/qliveplayer/qliveplayer-3.20.1-r1.ebuild similarity index 59% rename from media-video/qliveplayer/qliveplayer-3.20.1.ebuild rename to media-video/qliveplayer/qliveplayer-3.20.1-r1.ebuild index 40941f99..45575fd8 100644 --- a/media-video/qliveplayer/qliveplayer-3.20.1.ebuild +++ b/media-video/qliveplayer/qliveplayer-3.20.1-r1.ebuild @@ -3,7 +3,9 @@ EAPI=7 -inherit xdg cmake optfeature +PYTHON_COMPAT=( python3_{7..9} ) + +inherit xdg cmake optfeature python-single-r1 MY_P="QLivePlayer-${PV}" @@ -15,8 +17,10 @@ S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" COMMON_DEPEND=" + ${PYTHON_DEPS} >=dev-qt/qtcore-5.12 >=dev-qt/qtgraphicaleffects-5.12 >=dev-qt/qtquickcontrols-5.12 @@ -24,17 +28,30 @@ COMMON_DEPEND=" " RDEPEND=" ${COMMON_DEPEND} - dev-python/aiohttp + $(python_gen_cond_dep ' + dev-python/aiohttp[${PYTHON_USEDEP}] + ') media-video/mpv media-video/ffmpeg net-misc/curl - >=dev-lang/python-3.7.0 " DEPEND=" ${COMMON_DEPEND} kde-frameworks/extra-cmake-modules " +src_prepare() +{ + 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!" +} + pkg_postinst() { xdg_pkg_postinst