diff options
Diffstat (limited to 'dev-python/qscintilla-python')
| -rw-r--r-- | dev-python/qscintilla-python/Manifest | 6 | ||||
| -rw-r--r-- | dev-python/qscintilla-python/qscintilla-python-2.11.6.ebuild | 6 | ||||
| -rw-r--r-- | dev-python/qscintilla-python/qscintilla-python-2.13.0.ebuild (renamed from dev-python/qscintilla-python/qscintilla-python-2.11.5.ebuild) | 52 |
3 files changed, 34 insertions, 30 deletions
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest index 9a411f7e9e40..31353313e595 100644 --- a/dev-python/qscintilla-python/Manifest +++ b/dev-python/qscintilla-python/Manifest @@ -1,5 +1,5 @@ -DIST QScintilla-2.11.5.tar.gz 3007564 BLAKE2B e1eb7794b2e09f7bbfebde69a7c62c1a952e36b95f9c7a38c3db0b6bbdab8d0bad4a6d780dc9bf9b5e8d64111046f1741c6710d8444504230ee0f4154ce0a304 SHA512 46bc3c896b4ab71fbcc821ce3a248ecc4200378e0b621adef8d39092f940928806c76abe529b7f27ce4280e7e49091d8cbeafe6f303ca85cf5675df2887fd99b DIST QScintilla-2.11.6.tar.gz 3027764 BLAKE2B 1eb5d9ba44040cbff30e8b0028e164cf2aa86c565a5368890500614b9395dbe861c5cd268cf6a4ec06e2c7d77860b2ad6064bc3d07fd63a6ede2b060f44a7117 SHA512 8055d72a40f9f5a7d45c6592055c1b8eb5e5c50ce9e51673babd5e567c769d60c64d244ba5a7def5731a3120099e9528d01ed94327a06bb56ae2fa2e5e37b198 -EBUILD qscintilla-python-2.11.5.ebuild 1776 BLAKE2B 5fb12707469657cdc578331fecfe6d249ac7a0931c7317ffa0fa21db6a2ed8ce10be77f0be52dea9b90e22a6f2f161c56e44b2042de9c4e7ebe150f612eb4b6a SHA512 1b50ec0477ebfbdc8d646cace0faa2c965de30f2f67cb22d02a2900d0a19dd4d4fd3ab5230bc7f3ed1c601998338a876fa0d391cbfb603abd230037ae36744c0 -EBUILD qscintilla-python-2.11.6.ebuild 1775 BLAKE2B 66678db25f96256fc2180b0202a2bfdc497871b38ac16a4404e5c41ad9ab76108441d1c30372dfe2f63954c7625fe5bef8e16320a9e9b357874cb763aaf47539 SHA512 a0dbf64b283f52c03c3ed1fa0ea176eb65560fc65adbe06985ac8d4d91ab9b01ba785e39a4e502b911f9194c65e6287128ffb84a0568fff236e13ff42e7510aa +DIST QScintilla_src-2.13.0.tar.gz 3059601 BLAKE2B 8de5440c3019cb3f67ea25db2935dc8d8cd711298a8a49ce3f632937c538da5b8b337851c3f68c59eb3cb8df8396eebd8ac4f0b4d6d715c2519598eeda9b6586 SHA512 c72676e2d8463dde6e7c620e15a526eae056cfbf00bb5d013c315ebbf20340fcc79188c6e60c336679f7d18287066a26bdc96be2f1ef8a98b3adcada3ee09fd1 +EBUILD qscintilla-python-2.11.6.ebuild 1777 BLAKE2B 99a1c78b5b6bb20e5396450e6c5d3443c881a66a18f62dd8ccaead47896092a55b859ba1ef3a952d342923cc527354a120ce21a38467745e9f39380e2adb2b3f SHA512 34f2ce3ca646d2d55f351987a5f1d88039a112a15aaa0ceb0cf30223141b73129b9f468574e468e7872e35ed71a222db58fd0c303c4b00671e80ecf2834bf97d +EBUILD qscintilla-python-2.13.0.ebuild 1863 BLAKE2B 6ca7d42d986b0c1849c477678764e0e93c3078880fe88133d72d8dffc162d9b511eb8b47d77cf830e4a5b32d1e10ba0ff91e21e576e2a8fc4a595ab9a5386aa1 SHA512 7874ecbc87db5ec40ce73576eb2957cedc13134a617d6263800cffa41b2ee1d7be8ea3f0aefb33a45a0ca7dd594c39022f2ab837e691b72b900d5c49a7fae25b MISC metadata.xml 678 BLAKE2B e849d949281fe5162977ac3cba9c3559258f0534ced3e4e160554e2ee166cd20f979545bebae2effb0690231c987abb0ad11ed2090dbcb1c6724fc3389edc195 SHA512 58afaba4b14bf09297c024e29d51bc6b22c9a8290a6ca7f2c8c5fd63dea01037a637eeddb2ad5dfc09f2fd09d92229f74f1ee9cfb200c835110236407296e530 diff --git a/dev-python/qscintilla-python/qscintilla-python-2.11.6.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.11.6.ebuild index 0a5d085b95f0..bea10fcea4e0 100644 --- a/dev-python/qscintilla-python/qscintilla-python-2.11.6.ebuild +++ b/dev-python/qscintilla-python/qscintilla-python-2.11.6.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7..9} ) inherit python-r1 qmake-utils DESCRIPTION="Python bindings for QScintilla" -HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro" +HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/" MY_PN=QScintilla MY_P=${MY_PN}-${PV/_pre/.dev} @@ -28,7 +28,7 @@ REQUIRED_USE=" RDEPEND=" ${PYTHON_DEPS} - >=dev-python/PyQt5-5.12[gui,printsupport,widgets,${PYTHON_USEDEP}] + <dev-python/PyQt5-5.15.5_pre[gui,printsupport,widgets,${PYTHON_USEDEP}] >=dev-python/PyQt5-sip-4.19.22:=[${PYTHON_USEDEP}] dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -37,7 +37,7 @@ RDEPEND=" ~x11-libs/qscintilla-${PV}:= " DEPEND="${RDEPEND} - >=dev-python/sip-4.19.22[${PYTHON_USEDEP}] + >=dev-python/sip-4.19.22:0[${PYTHON_USEDEP}] " S=${WORKDIR}/${MY_P}/Python diff --git a/dev-python/qscintilla-python/qscintilla-python-2.11.5.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.13.0.ebuild index 12eb318581e7..03cabdd434c2 100644 --- a/dev-python/qscintilla-python/qscintilla-python-2.11.5.ebuild +++ b/dev-python/qscintilla-python/qscintilla-python-2.13.0.ebuild @@ -1,68 +1,72 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit python-r1 qmake-utils DESCRIPTION="Python bindings for QScintilla" -HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro" +HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/ https://pypi.org/project/QScintilla/" MY_PN=QScintilla -MY_P=${MY_PN}-${PV/_pre/.dev} +MY_P=${MY_PN}_src-${PV/_pre/.dev} if [[ ${PV} == *_pre* ]]; then SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz" else SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz" fi +S=${WORKDIR}/${MY_P}/Python LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 x86" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" IUSE="debug" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} " -RDEPEND=" - ${PYTHON_DEPS} - >=dev-python/PyQt5-5.12[gui,printsupport,widgets,${PYTHON_USEDEP}] - >=dev-python/PyQt5-sip-4.19.22:=[${PYTHON_USEDEP}] +DEPEND="${PYTHON_DEPS} + >=dev-python/PyQt5-5.15.5_pre2107091435[gui,printsupport,widgets,${PYTHON_USEDEP}] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ~x11-libs/qscintilla-${PV}:= " -DEPEND="${RDEPEND} - >=dev-python/sip-4.19.22[${PYTHON_USEDEP}] +RDEPEND="${DEPEND} + >=dev-python/PyQt5-sip-12.9:=[${PYTHON_USEDEP}] +" +BDEPEND=" + >=dev-python/PyQt-builder-1.10[${PYTHON_USEDEP}] + >=dev-python/sip-6.2.0_pre2106291255[${PYTHON_USEDEP}] + dev-qt/qtcore:5 " -S=${WORKDIR}/${MY_P}/Python +src_prepare() { + default + mv pyproject{-qt5,}.toml || die +} src_configure() { configuration() { local myconf=( - "${PYTHON}" - "${S}"/configure.py - --pyqt=PyQt5 - --qmake="$(qt5_get_bindir)"/qmake - $(usex debug '--debug --trace' '') + sip-build --verbose + --build-dir="${BUILD_DIR}" + --scripts-dir="$(python_get_scriptdir)" + --qmake="$(qt5_get_bindir)"/qmake + --no-make + $(usev debug '--debug --qml-debug --tracing') ) echo "${myconf[@]}" "${myconf[@]}" || die - # Fix parallel install failure - sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_api' \ - ${MY_PN}.pro || die - # Run eqmake to respect toolchain and build flags - eqmake5 -recursive ${MY_PN}.pro + run_in_build_dir eqmake5 -recursive ${MY_PN}.pro } - python_foreach_impl run_in_build_dir configuration + python_foreach_impl configuration } src_compile() { |