| 1 |
commit: c716e3b0b2dcd4c6a2c90893295165003992a794 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 1 09:52:34 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 1 23:19:38 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c716e3b0 |
| 7 |
|
| 8 |
dev-python/PyQt5: Drop python2_7 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.1, Repoman-2.3.23 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
...{PyQt5-5.14.2.ebuild => PyQt5-5.14.2-r1.ebuild} | 23 +++++----------------- |
| 14 |
...{PyQt5-5.15.0.ebuild => PyQt5-5.15.0-r1.ebuild} | 23 +++++----------------- |
| 15 |
2 files changed, 10 insertions(+), 36 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-python/PyQt5/PyQt5-5.14.2.ebuild b/dev-python/PyQt5/PyQt5-5.14.2-r1.ebuild |
| 18 |
similarity index 90% |
| 19 |
rename from dev-python/PyQt5/PyQt5-5.14.2.ebuild |
| 20 |
rename to dev-python/PyQt5/PyQt5-5.14.2-r1.ebuild |
| 21 |
index 04c639a05ba..6f47872f089 100644 |
| 22 |
--- a/dev-python/PyQt5/PyQt5-5.14.2.ebuild |
| 23 |
+++ b/dev-python/PyQt5/PyQt5-5.14.2-r1.ebuild |
| 24 |
@@ -3,7 +3,7 @@ |
| 25 |
|
| 26 |
EAPI=7 |
| 27 |
|
| 28 |
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} ) |
| 29 |
+PYTHON_COMPAT=( python3_{6,7,8,9} ) |
| 30 |
inherit multibuild python-r1 qmake-utils |
| 31 |
|
| 32 |
DESCRIPTION="Python bindings for the Qt framework" |
| 33 |
@@ -54,11 +54,7 @@ REQUIRED_USE=" |
| 34 |
# Minimal supported version of Qt. |
| 35 |
QT_PV="5.12:5" |
| 36 |
|
| 37 |
-RDEPEND=" |
| 38 |
- ${PYTHON_DEPS} |
| 39 |
- $(python_gen_cond_dep ' |
| 40 |
- dev-python/enum34[${PYTHON_USEDEP}] |
| 41 |
- ' -2) |
| 42 |
+RDEPEND="${PYTHON_DEPS} |
| 43 |
>=dev-python/PyQt5-sip-4.19.20:=[${PYTHON_USEDEP}] |
| 44 |
>=dev-qt/qtcore-${QT_PV} |
| 45 |
>=dev-qt/qtxml-${QT_PV} |
| 46 |
@@ -156,13 +152,8 @@ src_configure() { |
| 47 |
"${myconf[@]}" || die |
| 48 |
|
| 49 |
# Fix parallel install failure |
| 50 |
- if python_is_python3; then |
| 51 |
- sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_qscintilla_api' \ |
| 52 |
- ${PN}.pro || die |
| 53 |
- else |
| 54 |
- sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_qscintilla_api' \ |
| 55 |
- ${PN}.pro || die |
| 56 |
- fi |
| 57 |
+ sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_qscintilla_api' \ |
| 58 |
+ ${PN}.pro || die |
| 59 |
|
| 60 |
# Run eqmake to respect toolchain and build flags |
| 61 |
eqmake5 -recursive ${PN}.pro |
| 62 |
@@ -187,11 +178,7 @@ src_install() { |
| 63 |
done |
| 64 |
|
| 65 |
local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic |
| 66 |
- if python_is_python3; then |
| 67 |
- rm -r "${uic_dir}"/port_v2 || die |
| 68 |
- else |
| 69 |
- rm -r "${uic_dir}"/port_v3 || die |
| 70 |
- fi |
| 71 |
+ rm -r "${uic_dir}"/port_v2 || die |
| 72 |
|
| 73 |
multibuild_merge_root "${tmp_root}" "${D}" |
| 74 |
python_optimize |
| 75 |
|
| 76 |
diff --git a/dev-python/PyQt5/PyQt5-5.15.0.ebuild b/dev-python/PyQt5/PyQt5-5.15.0-r1.ebuild |
| 77 |
similarity index 90% |
| 78 |
rename from dev-python/PyQt5/PyQt5-5.15.0.ebuild |
| 79 |
rename to dev-python/PyQt5/PyQt5-5.15.0-r1.ebuild |
| 80 |
index 3d51e939103..075b0001293 100644 |
| 81 |
--- a/dev-python/PyQt5/PyQt5-5.15.0.ebuild |
| 82 |
+++ b/dev-python/PyQt5/PyQt5-5.15.0-r1.ebuild |
| 83 |
@@ -3,7 +3,7 @@ |
| 84 |
|
| 85 |
EAPI=7 |
| 86 |
|
| 87 |
-PYTHON_COMPAT=( python2_7 python3_{6..9} ) |
| 88 |
+PYTHON_COMPAT=( python3_{6..9} ) |
| 89 |
inherit multibuild python-r1 qmake-utils |
| 90 |
|
| 91 |
DESCRIPTION="Python bindings for the Qt framework" |
| 92 |
@@ -54,11 +54,7 @@ REQUIRED_USE=" |
| 93 |
# Minimal supported version of Qt. |
| 94 |
QT_PV="5.12:5" |
| 95 |
|
| 96 |
-RDEPEND=" |
| 97 |
- ${PYTHON_DEPS} |
| 98 |
- $(python_gen_cond_dep ' |
| 99 |
- dev-python/enum34[${PYTHON_USEDEP}] |
| 100 |
- ' -2) |
| 101 |
+RDEPEND="${PYTHON_DEPS} |
| 102 |
>=dev-python/PyQt5-sip-4.19.23:=[${PYTHON_USEDEP}] |
| 103 |
>=dev-qt/qtcore-${QT_PV} |
| 104 |
>=dev-qt/qtxml-${QT_PV} |
| 105 |
@@ -156,13 +152,8 @@ src_configure() { |
| 106 |
"${myconf[@]}" || die |
| 107 |
|
| 108 |
# Fix parallel install failure |
| 109 |
- if python_is_python3; then |
| 110 |
- sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_qscintilla_api' \ |
| 111 |
- ${PN}.pro || die |
| 112 |
- else |
| 113 |
- sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_qscintilla_api' \ |
| 114 |
- ${PN}.pro || die |
| 115 |
- fi |
| 116 |
+ sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_qscintilla_api' \ |
| 117 |
+ ${PN}.pro || die |
| 118 |
|
| 119 |
# Run eqmake to respect toolchain and build flags |
| 120 |
eqmake5 -recursive ${PN}.pro |
| 121 |
@@ -187,11 +178,7 @@ src_install() { |
| 122 |
done |
| 123 |
|
| 124 |
local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic |
| 125 |
- if python_is_python3; then |
| 126 |
- rm -r "${uic_dir}"/port_v2 || die |
| 127 |
- else |
| 128 |
- rm -r "${uic_dir}"/port_v3 || die |
| 129 |
- fi |
| 130 |
+ rm -r "${uic_dir}"/port_v2 || die |
| 131 |
|
| 132 |
multibuild_merge_root "${tmp_root}" "${D}" |
| 133 |
python_optimize |
Archives