gentoo resync : 05.04.2019

4 files changed, 84 insertions, 6 deletions

diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index 01a41a0ae4d2..45d6291f70a3 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,3 +1,5 @@
 DIST QScintilla_gpl-2.10.8.tar.gz 2736054 BLAKE2B 4bc7a2bc1974f8e10a96b7716a8e35d4854e9eeb8040734f99b796bddd9679ee2539f6517743689f9d7deff9ce523cdbb2f77ccd65eaadfc947dcc7a1337d918 SHA512 c0a216737dbda6bc390225196b37a43e4884c9cd67e6e81fc1b1b952683fe88dbfe7caf3c66d94a378f37502e1f08cbdf788426248e73f5f66ec65982b7652b5
-EBUILD qscintilla-python-2.10.8.ebuild 1553 BLAKE2B 210cad565973dfaecd9e2affebb750b112edef43551847206639228ff2f4d7be21b28e964cc3d4e5491c4cb7979774f7f86893f8cb8c7312755dcf647ba235af SHA512 a5f467336e07bff0b6bc6375e263169ff27febc274fdbc4d202667ed1e4a5bdf7aa6f8bf5adcb2574426a45650041bf606c041ae976d195c069c9084a97242b7
-MISC metadata.xml 666 BLAKE2B ca3cfedb72c4bc624270f669034a78c1fd41ed48a261b6d2fd84ee9994d130d1b558578925028eed57a85db021f3cfe4b70e51eeb9a42f4f71392994f7bade82 SHA512 f78ce18443d32b17307e96f8177bc5fb46f5b9f6b4d797e79dcacb6eb76bba578f7d666469576bd5e326717bcd9167fe34a5e1bd1ead5679619816ef8f0363da
+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
+MISC metadata.xml 776 BLAKE2B 63270d838d1a2bc0deddcf6ec6ff08a9cf0233720ba826a1b457b7369492ec4e292c16ef76b55ce37bf35e7d2497f2beb0c5d03bd23a84558829bd3e84c558e4 SHA512 08ee336155dd291545fc1579ffe8d9894ade3eb0f1d671d5df59933651ec3262239c3a15f32378fc5cedd3a40459e79c3c64a38b53fa95a6619572290bdd0367
diff --git a/dev-python/qscintilla-python/metadata.xml b/dev-python/qscintilla-python/metadata.xml
index 7054692c3439..3e46f747a5e4 100644
--- a/dev-python/qscintilla-python/metadata.xml
+++ b/dev-python/qscintilla-python/metadata.xml
@@ -14,8 +14,9 @@
 			<email>phil@riverbankcomputing.com</email>
 			<name>Phil Thompson</name>
 		</maintainer>
+		<changelog>https://www.riverbankcomputing.com/static/Downloads/QScintilla/ChangeLog</changelog>
+		<doc>https://www.riverbankcomputing.com/static/Docs/QScintilla/</doc>
 		<bugs-to>mailto:qscintilla@riverbankcomputing.com</bugs-to>
-		<doc>http://pyqt.sourceforge.net/Docs/QScintilla2/</doc>
-		<remote-id type="sourceforge">pyqt</remote-id>
+		<remote-id type="pypi">QScintilla</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.10.8.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.10.8.ebuild
index a03ddc26eb02..1b2bcb06dd65 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.10.8.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.10.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 inherit python-r1 qmake-utils
 
 MY_P=QScintilla_gpl-${PV/_pre/.dev}
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
new file mode 100644
index 000000000000..b5af9609872c
--- /dev/null
+++ b/dev-python/qscintilla-python/qscintilla-python-2.11.1-r1.ebuild
@@ -0,0 +1,75 @@
+# 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} )
+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}_gpl-${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' ${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
+}