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 F0D2C13835A for ; Sat, 1 Aug 2020 23:20:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B49BE0A64; Sat, 1 Aug 2020 23:20:35 +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 F25A2E0A64 for ; Sat, 1 Aug 2020 23:20:34 +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 2974B34EF81 for ; Sat, 1 Aug 2020 23:20:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9035930D for ; Sat, 1 Aug 2020 23:20:01 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1596323978.c716e3b0b2dcd4c6a2c90893295165003992a794.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/PyQt5/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/PyQt5/PyQt5-5.14.2-r1.ebuild dev-python/PyQt5/PyQt5-5.14.2.ebuild dev-python/PyQt5/PyQt5-5.15.0-r1.ebuild dev-python/PyQt5/PyQt5-5.15.0.ebuild X-VCS-Directories: dev-python/PyQt5/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: c716e3b0b2dcd4c6a2c90893295165003992a794 X-VCS-Branch: master Date: Sat, 1 Aug 2020 23:20:01 +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: 2e5c78af-5eae-4706-b2a4-0f0393571ca7 X-Archives-Hash: cd4f0baf1db3781585f13d830bef9e92 commit: c716e3b0b2dcd4c6a2c90893295165003992a794 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Aug 1 09:52:34 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Aug 1 23:19:38 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c716e3b0 dev-python/PyQt5: Drop python2_7 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner gentoo.org> ...{PyQt5-5.14.2.ebuild => PyQt5-5.14.2-r1.ebuild} | 23 +++++----------------- ...{PyQt5-5.15.0.ebuild => PyQt5-5.15.0-r1.ebuild} | 23 +++++----------------- 2 files changed, 10 insertions(+), 36 deletions(-) diff --git a/dev-python/PyQt5/PyQt5-5.14.2.ebuild b/dev-python/PyQt5/PyQt5-5.14.2-r1.ebuild similarity index 90% rename from dev-python/PyQt5/PyQt5-5.14.2.ebuild rename to dev-python/PyQt5/PyQt5-5.14.2-r1.ebuild index 04c639a05ba..6f47872f089 100644 --- a/dev-python/PyQt5/PyQt5-5.14.2.ebuild +++ b/dev-python/PyQt5/PyQt5-5.14.2-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) inherit multibuild python-r1 qmake-utils DESCRIPTION="Python bindings for the Qt framework" @@ -54,11 +54,7 @@ REQUIRED_USE=" # Minimal supported version of Qt. QT_PV="5.12:5" -RDEPEND=" - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/enum34[${PYTHON_USEDEP}] - ' -2) +RDEPEND="${PYTHON_DEPS} >=dev-python/PyQt5-sip-4.19.20:=[${PYTHON_USEDEP}] >=dev-qt/qtcore-${QT_PV} >=dev-qt/qtxml-${QT_PV} @@ -156,13 +152,8 @@ src_configure() { "${myconf[@]}" || die # Fix parallel install failure - if python_is_python3; then - sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_qscintilla_api' \ - ${PN}.pro || die - else - sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_qscintilla_api' \ - ${PN}.pro || die - fi + sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_qscintilla_api' \ + ${PN}.pro || die # Run eqmake to respect toolchain and build flags eqmake5 -recursive ${PN}.pro @@ -187,11 +178,7 @@ src_install() { done local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic - if python_is_python3; then - rm -r "${uic_dir}"/port_v2 || die - else - rm -r "${uic_dir}"/port_v3 || die - fi + rm -r "${uic_dir}"/port_v2 || die multibuild_merge_root "${tmp_root}" "${D}" python_optimize diff --git a/dev-python/PyQt5/PyQt5-5.15.0.ebuild b/dev-python/PyQt5/PyQt5-5.15.0-r1.ebuild similarity index 90% rename from dev-python/PyQt5/PyQt5-5.15.0.ebuild rename to dev-python/PyQt5/PyQt5-5.15.0-r1.ebuild index 3d51e939103..075b0001293 100644 --- a/dev-python/PyQt5/PyQt5-5.15.0.ebuild +++ b/dev-python/PyQt5/PyQt5-5.15.0-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{6..9} ) +PYTHON_COMPAT=( python3_{6..9} ) inherit multibuild python-r1 qmake-utils DESCRIPTION="Python bindings for the Qt framework" @@ -54,11 +54,7 @@ REQUIRED_USE=" # Minimal supported version of Qt. QT_PV="5.12:5" -RDEPEND=" - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/enum34[${PYTHON_USEDEP}] - ' -2) +RDEPEND="${PYTHON_DEPS} >=dev-python/PyQt5-sip-4.19.23:=[${PYTHON_USEDEP}] >=dev-qt/qtcore-${QT_PV} >=dev-qt/qtxml-${QT_PV} @@ -156,13 +152,8 @@ src_configure() { "${myconf[@]}" || die # Fix parallel install failure - if python_is_python3; then - sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_qscintilla_api' \ - ${PN}.pro || die - else - sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_qscintilla_api' \ - ${PN}.pro || die - fi + sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_qscintilla_api' \ + ${PN}.pro || die # Run eqmake to respect toolchain and build flags eqmake5 -recursive ${PN}.pro @@ -187,11 +178,7 @@ src_install() { done local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic - if python_is_python3; then - rm -r "${uic_dir}"/port_v2 || die - else - rm -r "${uic_dir}"/port_v3 || die - fi + rm -r "${uic_dir}"/port_v2 || die multibuild_merge_root "${tmp_root}" "${D}" python_optimize