gentoo resync : 26.11.2017

3 files changed, 94 insertions, 78 deletions

diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index 4f7e8b564246..df48b729d489 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,9 +1,7 @@
-DIST QScintilla_gpl-2.10.1.tar.gz 2663446 SHA256 97f98a9d91f908db6ce37fecc6d241d955b388a1c487173b60726cba9a3dfa64 SHA512 ea9b95ca371a8af9262493ab59ecaef77e1697ba21d1d594aab39e836917884fd829aa4f6c4e72cce60b0d3f40eac654157cc507d027945f0034881855123ccc WHIRLPOOL 96261f2c2c38458891afad057716bdfee05f74e9f15a8b8ce2eab4445b8c56256cbcb33326631ac1f3624e2c998d490f5e057c348b3a3eb44a9260c938beda61
-DIST QScintilla_gpl-2.9.2.tar.gz 2491222 SHA256 f2c8ccdc9d3dbb90764ceed53ea096da9bb13b6260da1324e6ab4ecea29e620a SHA512 28f88111d7eb6a016a4b87f04d2b7f5d6481b521a3361a526b3b45a56240f5c8de10310e819234fcba773c6df73bf398ae2dce622976a8e760f506be1defb7c8 WHIRLPOOL a04420c66fd417e5304c92a1ee3c1998f6849bccb9088dae96ed48c06cab0a9b1c012f073aafb1e05aaee46564de9ac89ae07145f3ded35cf47beac78065650a
+DIST QScintilla_gpl-2.10.1.tar.gz 2663446 BLAKE2B 720ce990b4e3dd65d47cd26b473bffc07240d76b2c10d393cba41331c6f160472d87b9b22985fd45b5b8064d5358b3b25f0decfe8759542a9c987381249bca42 SHA512 ea9b95ca371a8af9262493ab59ecaef77e1697ba21d1d594aab39e836917884fd829aa4f6c4e72cce60b0d3f40eac654157cc507d027945f0034881855123ccc
+DIST QScintilla_gpl-2.10.2.tar.gz 2665138 BLAKE2B 1c6349ea717997681e678cdfa6cc590a6a1cfbe652f2dd52d57fefff71229251c46cd4554b546d2e272deb7c3f970c44f657966ad08e45279813215a775c637d SHA512 755f486d62275acb5908262c4a50ad31dd9d8fca0501eb1eeec1aa2181872f8d16179b42f4213b207fd6b46fd8a72d25af7ce6c5cc10eabb363a92c0600ca972
 DIST QScintilla_gpl-2.9.4.tar.gz 2557199 SHA256 8b3a23023e9f0573caed6f9cee86f898d87b768ee15b8c211a423783a4cfa4e6 SHA512 5a2eebbe523a0f2f1c7bc63ce5ee9cb8793a597d00eea5b638f18f90d6e798e92c281be23ee5e7072d5afced9e1fccb6ae51526a3623d373d57c3db64d026b16 WHIRLPOOL 68aacdcd0fc7102494ccae1f0ea3e222845bdd3f9bef603d89fe50d50dba6ac77471228a84c1c281a46ccf74bdb6902aa3bb21f89388ec5408bdde5876cf8655
-EBUILD qscintilla-python-2.10.1-r1.ebuild 1977 SHA256 0480202c4c9970a8043d8f4101632e728f6fef1fb48d79a559deefd1f3487710 SHA512 af165c096785ced3ffcf5c0f0332b445c0e9c75102ee880e85a12d087adface591caa19b11b25d7626527ae35e952a1e645bf24f7837d3900d8e5eb1bec82c5a WHIRLPOOL 82a963ee41230c2cea8c8f5f5fa1132fc32f0b82a0467f72db1af60bdb57ed0cba063e7fc959fc3f82323ca001c2a99c27c692c30335cc2d84d197a5124ba252
-EBUILD qscintilla-python-2.9.2-r1.ebuild 1486 SHA256 221fd6bf46fc651d78697c0749328df376d3a64e265270b82bbaf7086f10f398 SHA512 f51fe63953aacd8a8652ccd11dbf5a4875ee9c826b70ca2a751d77777570e2993ddb5bd58570db3d617e51b5d97722df7ee3c9be656bb6f343e997ada9cb5e64 WHIRLPOOL 3a062ba5e21dcac3c9ba41a7c124b072b3cb78177ea9cd5c5e5f80b5173c2aeee447a0730d8ce62a9fb057698fd7f53c2509a7a7432d7d8c39f72b44896518a5
-EBUILD qscintilla-python-2.9.4-r1.ebuild 1772 SHA256 2f06475354a779482882b5a454ca35a4b6e87af9a614376118d73cbd7f888a4b SHA512 7e171629e9f4e52c49a9254f8ab54dd4d27088b19adb5a59c78de4b47646d1cb2149272f5d34e992ce35b40291e7fc7f7c598942e4f13a1aeab3bf8616861698 WHIRLPOOL d51876de703181df2e5dd09bfebf39a7119f37c0e75e8cd674f057e9489ae0cc32d636261a85cd98ca413af0e2bf0a6d1c1faa3689bcfff087e458dfc2daed5b
-MISC ChangeLog 4331 SHA256 299e9fb37d9733ff48a9cd13e087fb962ae1afdb0d742b6f2842e2ac5076590f SHA512 db72b669de88184af4c10893459716edbf7aa357825c838d22f8bcffecd48321b2aea0a29df796edd3847adc2dda43046f315ad225f85452411dca4c61332bdb WHIRLPOOL 3ce85eea261005cce24ccdec913c14aa1dc2fc85f97ceaa6829e2edd44e8235b1c70c63686d5481b23c7ea7bdca10d7b88b181b7677a74bb167e6736950949e1
-MISC ChangeLog-2015 17889 SHA256 89db89a2f66009868ad919e88fddd4c5948804787ebe5ea57ca66415d6555bfc SHA512 659af4bcf5e2ed9a0cdc184e1ef1c1d9a0e114ce50380f53fae751981685b4e4897d5162111ab1227751d3903a6c2300f6b2ccba2cd4bca48bc2b1b82cf07c07 WHIRLPOOL 19208585f37302dc68689e7aa17950b60ea249f7d6031c5b86893a6e6a385f7e807e78d7d7a18705fd50385bbe57643320c541e18dc7e0bbbc2488702f1ff576
-MISC metadata.xml 666 SHA256 a82ce94f00779be34343e403965f42f6b80b9bbec0f3fe326f5d66fae16d3b3f SHA512 f78ce18443d32b17307e96f8177bc5fb46f5b9f6b4d797e79dcacb6eb76bba578f7d666469576bd5e326717bcd9167fe34a5e1bd1ead5679619816ef8f0363da WHIRLPOOL 434d6a2b4e8c6159c0e1a1ed84dd68e9335a0686cc5061085dffa20bcd8ea526b3c4033be92ff86d354acf3125411cb1c89a1bfb62d4dfd0171d8289c9e38306
+EBUILD qscintilla-python-2.10.1-r1.ebuild 1977 BLAKE2B 06efa137a2b74ecba71b7a42ae696b0fa873a528f68ca216d404f81e73f4088bed21338e97275e20c94a2a206f00c284fda5df91f0b84eb88f14ae276753f3e5 SHA512 af165c096785ced3ffcf5c0f0332b445c0e9c75102ee880e85a12d087adface591caa19b11b25d7626527ae35e952a1e645bf24f7837d3900d8e5eb1bec82c5a
+EBUILD qscintilla-python-2.10.2.ebuild 1979 BLAKE2B de320b5b36a55ae2d38a44a85cba8188acc74714fe635ddd77fd5875281f787da70f635c518526df0b3f47ab565c9799dc043f7be5158f03fb9426bd13cde2e2 SHA512 0f71ca4bed1f084fde43e3a6b3bab93510a8d359c5239e936f2f5537d10a51a6158ec2db1d0e7c06c491f944542cd48a24b293c823997df7c67c0941fc860d43
+EBUILD qscintilla-python-2.9.4-r1.ebuild 1772 BLAKE2B 76cac4f3b2e35358c77bc6f97529331330c3d85b99e6e07cceb8629e3ad47971ce12773460fe926c8503a8118f580aa54b9ac1568fa7ec1e8f4668b36f25fe2e SHA512 7e171629e9f4e52c49a9254f8ab54dd4d27088b19adb5a59c78de4b47646d1cb2149272f5d34e992ce35b40291e7fc7f7c598942e4f13a1aeab3bf8616861698
+MISC metadata.xml 666 BLAKE2B ca3cfedb72c4bc624270f669034a78c1fd41ed48a261b6d2fd84ee9994d130d1b558578925028eed57a85db021f3cfe4b70e51eeb9a42f4f71392994f7bade82 SHA512 f78ce18443d32b17307e96f8177bc5fb46f5b9f6b4d797e79dcacb6eb76bba578f7d666469576bd5e326717bcd9167fe34a5e1bd1ead5679619816ef8f0363da
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.10.2.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.10.2.ebuild
new file mode 100644
index 000000000000..ddaeac5786b7
--- /dev/null
+++ b/dev-python/qscintilla-python/qscintilla-python-2.10.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit multibuild python-r1 qmake-utils
+
+MY_P=QScintilla_gpl-${PV/_pre/.dev}
+
+DESCRIPTION="Python bindings for Qscintilla"
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
+SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug +qt4 qt5"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( qt4 qt5 )
+"
+
+DEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/sip-4.19:=[${PYTHON_USEDEP}]
+	~x11-libs/qscintilla-${PV}:=[qt4?,qt5?]
+	qt4? (
+		>=dev-python/PyQt4-4.11.3[X,${PYTHON_USEDEP}]
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	qt5? (
+		dev-python/PyQt5[gui,printsupport,widgets,${PYTHON_USEDEP}]
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+	)
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}/Python
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
+}
+
+src_configure() {
+	configuration() {
+		# Fix out-of-source build and installation of .sip files
+		ln -s "${S}"/sip || die
+
+		local my_qt_ver=4
+		if [[ ${MULTIBUILD_ID} == *qt5* ]]; then
+			my_qt_ver=5
+		fi
+
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			--qmake="$(qt${my_qt_ver}_get_bindir)"/qmake
+			--sip-incdir="$(python_get_includedir)"
+			--pyqt=PyQt${my_qt_ver}
+			$(usex debug '--debug --trace' '')
+			--verbose
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		# Run eqmake to respect toolchain, build flags, and prevent stripping
+		eqmake${my_qt_ver} -recursive
+	}
+	multibuild_foreach_variant python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	multibuild_foreach_variant python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		emake INSTALL_ROOT="${D}" install
+		python_optimize
+	}
+	multibuild_foreach_variant python_foreach_impl run_in_build_dir installation
+}
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.9.2-r1.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.9.2-r1.ebuild
deleted file mode 100644
index 185c56368ada..000000000000
--- a/dev-python/qscintilla-python/qscintilla-python-2.9.2-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit python-r1 qmake-utils
-
-MY_P=QScintilla_gpl-${PV}
-
-DESCRIPTION="Python bindings for Qscintilla"
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
-SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc x86"
-IUSE="debug"
-
-DEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/sip-4.18:=[${PYTHON_USEDEP}]
-	>=dev-python/PyQt4-4.11.3[X,${PYTHON_USEDEP}]
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	~x11-libs/qscintilla-${PV}:=[qt4(-)]
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S=${WORKDIR}/${MY_P}/Python
-
-src_prepare() {
-	default
-	python_copy_sources
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			configure.py
-			--qmake="$(qt4_get_bindir)"/qmake
-			--destdir="$(python_get_sitedir)"/PyQt4
-			--sip-incdir="$(python_get_includedir)"
-			--pyqt=PyQt4
-			$(usex debug '--debug --trace' '')
-			--verbose
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		# Run eqmake4 to respect toolchain, build flags, and prevent stripping
-		eqmake4 -recursive
-	}
-	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
-}