gentoo resync : 15.12.2019

3 files changed, 80 insertions, 2 deletions

diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index 6fb4fd99571a..be20344279b7 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,5 +1,7 @@
+DIST QScintilla-2.11.3.tar.gz 3006383 BLAKE2B 6238aaff44d6136a64e8c38e38c4886357eb72aa4067f54eda1e876040c41ebce8577e244b81a062e9020c4d142439f5612ca88055d0ba87172ff5b8893938d7 SHA512 83406ef2f425c6288fcac52b01417853186ba860e33e14b236801271e034c327cbb00817cb7247e98bafc1844aeff9f24ec4878ac8ec4bd52d0d2d9778f6b884
 DIST QScintilla_gpl-2.10.8.tar.gz 2736054 BLAKE2B 4bc7a2bc1974f8e10a96b7716a8e35d4854e9eeb8040734f99b796bddd9679ee2539f6517743689f9d7deff9ce523cdbb2f77ccd65eaadfc947dcc7a1337d918 SHA512 c0a216737dbda6bc390225196b37a43e4884c9cd67e6e81fc1b1b952683fe88dbfe7caf3c66d94a378f37502e1f08cbdf788426248e73f5f66ec65982b7652b5
 DIST QScintilla_gpl-2.11.1.tar.gz 2932060 BLAKE2B 9f2f9fd89667cc04c95d0a36e4a615dcf3c1c11a5446e19a43104513894b76bc7478f2aed7e8c94ce413f940327deb09e51507bee1fa35c79c176e01e6b74767 SHA512 40b600aa8eec17bc99491a08aeaee72bf498a66f0257d310a8df2667de82805715b9c859885c092acfb03ba8f69433a6517d0d4bb324bf99bd9db461172c08d5
 EBUILD qscintilla-python-2.10.8.ebuild 1551 BLAKE2B bff3a35fec9120904fa4b3e9c5c731334a0d9bd61de51cfa582a0cf41a26d64602a682fe5fdc0f27d4c916b50418c71c1344cf3fe88d47ea05613886d3180c51 SHA512 b559358ecbb09e10250d64145b1629795bd0b57e228cbada6239199a8436a951e5dd298916be6d1904f1c99bc70ee04592b1b9cd300ca7f4adb1f42ffe340965
-EBUILD qscintilla-python-2.11.1-r1.ebuild 1744 BLAKE2B 82be7cd42fbd8c1348fc14e08fb1981e8baad99361c79b076340a634d629dcc218df7ae952c5a865dacf34fe4312ab3da3280fa4d34e6115cc91eb45b5d7da7f SHA512 618eaa127ea65050ab2b0028622433a58d8a358e11995253e5602df1dd52e7d67a947dbef4bb4affe45543ba9143a004fcc53a969c75d15fa26b71ef6f573734
+EBUILD qscintilla-python-2.11.1-r1.ebuild 1746 BLAKE2B 8081d98716c04e0a1b8bbaaec121cfa7550c60894ab17a71e7562fc66f007b7a355cb2e348a1da29257ab72ef7f02ac184795217cd503a157da169d3c7d05829 SHA512 85fe725fd05114b438423c8ac6248c0b0dc3a9ffed4bc073ba803500d69974403bda0dcf594001c9fd20dc46a6c3a20865d725eba8d4a068e8feb3c7c82dd6e2
+EBUILD qscintilla-python-2.11.3.ebuild 1780 BLAKE2B 3f6a76d7518bf64053a2e28e274c23b8fb58c32e6bb93dae2ffcdcb02f362d00b09bdbc3957dc9470de14aff88216455f2ec320f3f79997e4986fa9c191f1cf2 SHA512 1973fe56f30b8fc94a51ea51fd9c0e0b9d206160f40151708ae3c5e91dd7979bc08bfc44958063406b511ad2459ecf8ee14abfafc66d86b526d87ec706316a88
 MISC metadata.xml 678 BLAKE2B e849d949281fe5162977ac3cba9c3559258f0534ced3e4e160554e2ee166cd20f979545bebae2effb0690231c987abb0ad11ed2090dbcb1c6724fc3389edc195 SHA512 58afaba4b14bf09297c024e29d51bc6b22c9a8290a6ca7f2c8c5fd63dea01037a637eeddb2ad5dfc09f2fd09d92229f74f1ee9cfb200c835110236407296e530
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.11.1-r1.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.11.1-r1.ebuild
index b5af9609872c..e5efd8e7353c 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.11.1-r1.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.11.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
 inherit python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for QScintilla"
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.11.3.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.11.3.ebuild
new file mode 100644
index 000000000000..a058f7a3eab6
--- /dev/null
+++ b/dev-python/qscintilla-python/qscintilla-python-2.11.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+inherit python-r1 qmake-utils
+
+DESCRIPTION="Python bindings for QScintilla"
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
+
+MY_PN=QScintilla
+MY_P=${MY_PN}-${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
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~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.14:=[${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.14[${PYTHON_USEDEP}]
+"
+
+S=${WORKDIR}/${MY_P}/Python
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			--pyqt=PyQt5
+			--qmake="$(qt5_get_bindir)"/qmake
+			$(usex debug '--debug --trace' '')
+			--verbose
+		)
+		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
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		emake INSTALL_ROOT="${D}" install
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+}