diff options
| author | Liguros - Gitlab CI/CD [feature/flatten] <gitlab@liguros.net> | 2020-08-03 12:27:26 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [feature/flatten] <gitlab@liguros.net> | 2020-08-03 12:27:26 +0000 |
| commit | 57d18ac12dd7438bbfacd385692bc17a5a780828 (patch) | |
| tree | 213b96b904d79c05fe3899627bd5a52c3e26214b /dev-python/PyQt5 | |
| parent | cfe67ba8b3c510e448497536272cf134ebab6028 (diff) | |
| download | baldeagleos-repo-57d18ac12dd7438bbfacd385692bc17a5a780828.tar.gz baldeagleos-repo-57d18ac12dd7438bbfacd385692bc17a5a780828.tar.xz baldeagleos-repo-57d18ac12dd7438bbfacd385692bc17a5a780828.zip | |
Updating liguros repo
Diffstat (limited to 'dev-python/PyQt5')
| -rw-r--r-- | dev-python/PyQt5/PyQt5-5.14.2.ebuild (renamed from dev-python/PyQt5/PyQt5-5.14.2-r1.ebuild) | 23 | ||||
| -rw-r--r-- | dev-python/PyQt5/PyQt5-5.15.0.ebuild (renamed from dev-python/PyQt5/PyQt5-5.15.0-r1.ebuild) | 23 | ||||
| -rw-r--r-- | dev-python/PyQt5/metadata.xml | 2 |
3 files changed, 37 insertions, 11 deletions
diff --git a/dev-python/PyQt5/PyQt5-5.14.2-r1.ebuild b/dev-python/PyQt5/PyQt5-5.14.2.ebuild index 6f47872f089c..6b80e9f1f794 100644 --- a/dev-python/PyQt5/PyQt5-5.14.2-r1.ebuild +++ b/dev-python/PyQt5/PyQt5-5.14.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8,9} ) +PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} ) inherit multibuild python-r1 qmake-utils DESCRIPTION="Python bindings for the Qt framework" @@ -54,7 +54,11 @@ REQUIRED_USE=" # Minimal supported version of Qt. QT_PV="5.12:5" -RDEPEND="${PYTHON_DEPS} +RDEPEND=" + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/enum34[${PYTHON_USEDEP}] + ' -2) >=dev-python/PyQt5-sip-4.19.20:=[${PYTHON_USEDEP}] >=dev-qt/qtcore-${QT_PV} >=dev-qt/qtxml-${QT_PV} @@ -152,8 +156,13 @@ src_configure() { "${myconf[@]}" || die # Fix parallel install failure - sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_qscintilla_api' \ - ${PN}.pro || die + 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 # Run eqmake to respect toolchain and build flags eqmake5 -recursive ${PN}.pro @@ -178,7 +187,11 @@ src_install() { done local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic - rm -r "${uic_dir}"/port_v2 || die + if python_is_python3; then + rm -r "${uic_dir}"/port_v2 || die + else + rm -r "${uic_dir}"/port_v3 || die + fi multibuild_merge_root "${tmp_root}" "${D}" python_optimize diff --git a/dev-python/PyQt5/PyQt5-5.15.0-r1.ebuild b/dev-python/PyQt5/PyQt5-5.15.0.ebuild index 46c99c6e00aa..ae0ffbe7b6ad 100644 --- a/dev-python/PyQt5/PyQt5-5.15.0-r1.ebuild +++ b/dev-python/PyQt5/PyQt5-5.15.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{5,6,7,8,9} ) +PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} ) inherit multibuild python-r1 qmake-utils DESCRIPTION="Python bindings for the Qt framework" @@ -54,7 +54,11 @@ REQUIRED_USE=" # Minimal supported version of Qt. QT_PV="5.12:5" -RDEPEND="${PYTHON_DEPS} +RDEPEND=" + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/enum34[${PYTHON_USEDEP}] + ' -2) >=dev-python/PyQt5-sip-4.19.23:=[${PYTHON_USEDEP}] >=dev-qt/qtcore-${QT_PV} >=dev-qt/qtxml-${QT_PV} @@ -152,8 +156,13 @@ src_configure() { "${myconf[@]}" || die # Fix parallel install failure - sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_qscintilla_api' \ - ${PN}.pro || die + 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 # Run eqmake to respect toolchain and build flags eqmake5 -recursive ${PN}.pro @@ -178,7 +187,11 @@ src_install() { done local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic - rm -r "${uic_dir}"/port_v2 || die + if python_is_python3; then + rm -r "${uic_dir}"/port_v2 || die + else + rm -r "${uic_dir}"/port_v3 || die + fi multibuild_merge_root "${tmp_root}" "${D}" python_optimize diff --git a/dev-python/PyQt5/metadata.xml b/dev-python/PyQt5/metadata.xml index cf34e66687de..50fa8c75b2ed 100644 --- a/dev-python/PyQt5/metadata.xml +++ b/dev-python/PyQt5/metadata.xml @@ -40,5 +40,5 @@ <bugs-to>mailto:pyqt@riverbankcomputing.com</bugs-to> <remote-id type="pypi">PyQt5</remote-id> </upstream> - <origin>gentoo-staging</origin> + <origin>calculatelinux-overlay</origin> </pkgmetadata> |