gentoo resync : 26.11.2017

3 files changed, 106 insertions, 89 deletions

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 3d1c5487cdc1..e7e18d89d15c 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/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-2.10.1.ebuild 2394 SHA256 e02c4322388026955f1ca2ad2e83844c61bd9c77f5eb1c5d06bf7df54cef6d29 SHA512 30b19c28a963ee508f40b832bfdbbd69f284e9ffb6569d4c57cb0a451f40e6443a130e19dadcf0113c691f5ec0c2f4ddea3bf3b9058103090d144cf499449ff5 WHIRLPOOL 7a86488f159154552a8c1fa4723c6c8b332835501f2731ecb2a0bfc85dfff56b400c06ec9681254d096a15b89774f4b90fc93336194c552e88b6b570c7036d3b
-EBUILD qscintilla-2.9.2-r1.ebuild 1777 SHA256 1f7bd7a8f06f07e8e778f9295fb62246cbf690298f99066ea00fc37e7d9d7d41 SHA512 ede8971a07ae607c1c4fea4270bd24ff2631fea7511b0baf1417d41f082fac3b64b5aae8db95ee3ddcd2c4d97fbb04e55632f86b8605689eb8f99d9791420c95 WHIRLPOOL 7f4ec51cf244bfe0fdd30ab3f165819c646c36706e393ddabd0d75fe1d292ce9d23a69243574b8ed012993ab0dd3c47c47295ea1f3536944b7a80a5b06835e01
-EBUILD qscintilla-2.9.4.ebuild 1998 SHA256 949f87c4e2e2034e0027af644a3f137c2e7534f90d02c2ebc3b3212eb41f4301 SHA512 b17413f326e1f968d2f41a7df31e5709aff9c7f4b9f3d2954dd98ddf3026eaedaa073882010dc3c54fc8051b7cbdd8672189eea410da7ede732bea6ff57b4635 WHIRLPOOL cd6e7baa030e5e5f917a827e8e69be3a46d5b3a4c5b819f1f8e3e7df22c8374401d96ccb979ce7f3e47473c66569baee5d604c0313ec61634ed2209acaf3ee5c
-MISC ChangeLog 3865 SHA256 34fce0992e4657060bf5daf948d10129fcff1d81952264ee0f95f5462fc64709 SHA512 0359bf04fbf3830660bec3e9e5734791a6a1a600ae57078c1c4936928181fe0c19d0a59e6abd0d58d4f13f80cf8f0fb94893b558768004a9581a78fb75d4ef2f WHIRLPOOL 8c4ec2082187603e27453774300702c694fa4f7b21acffba2c6dc4ea8c0103796dee52d27978d9f52273ba9b4507df728e8b65ff86b300037ec1f7f592b028b7
-MISC ChangeLog-2015 25822 SHA256 a32a6b9f68f38489e3d8fa11e94ab71fb591fd0d9406c2a37de7c21c4f5cbc55 SHA512 ecf838408ea0990002758dd3a1e4804ccf9de4d0c2893a55d2740af86a96437e297074018e8f0646c89888141578753e19527a7a4a29cd9cfc1489feaa7e6943 WHIRLPOOL 8ffdfdec545ec1b6ca2ad2a8188da05fefb14051745c41f2e86afe8389f571a63689695893fd9847682eb5dca73ee3aa5e527cc2255f3aa693e858e3e474c0bd
-MISC metadata.xml 741 SHA256 2384c2c322b1f1798aa774af7937d432e263134cd4d47e79fc2b38ee05b338ae SHA512 393c6b16b403a5f14180ca4b010bd74b62dea7043dabaf463e6995690226105f872556d3df54e0cee1a6dfe2140b033aad25998fc65414e7380f41894201f43a WHIRLPOOL 68a66be849c4450b9e6dd1d5fd2ed4f5788841555bc8697b6396efb7833bf849e10e62ce1bee74e8d86aa55c1f229af76b6b04661b7fd6d3af4b52d03daa9ca7
+EBUILD qscintilla-2.10.1.ebuild 2394 BLAKE2B 026325e856fbfcc76883182673cfe3448c7aa91883d786dda570de396f04a789c4135d192c1647e4406ddbca21bd01b15cf3a112314ebc48f273add6c133fbb5 SHA512 30b19c28a963ee508f40b832bfdbbd69f284e9ffb6569d4c57cb0a451f40e6443a130e19dadcf0113c691f5ec0c2f4ddea3bf3b9058103090d144cf499449ff5
+EBUILD qscintilla-2.10.2.ebuild 2396 BLAKE2B 28f458ac59aa6a8fe3dea42ad42e4fb0e85d0f385c72c6afc8e67c64e95ae18c65b0b92b9498a8d7fd6808b430fbf74c82eb7e2e2dfaf962fc4d2f48f996b540 SHA512 ec04a36a7db01686439adb97aad938eb966928c4ba1b3f7df23365f59e2401efe35fff12de86016937cf1cb4fc03c9e5f2e3226d5410b13bda0c1d8d1f85c4e8
+EBUILD qscintilla-2.9.4.ebuild 1998 BLAKE2B a6aea660246162acf0f8dc4a79a8fa57523b364a16c635c28eccdea3d34fa747ad38dd6d4a32fed5730ce4a62dfe4600ca15557820d5d2b6681f2e1b6d84362a SHA512 b17413f326e1f968d2f41a7df31e5709aff9c7f4b9f3d2954dd98ddf3026eaedaa073882010dc3c54fc8051b7cbdd8672189eea410da7ede732bea6ff57b4635
+MISC metadata.xml 741 BLAKE2B 0ad895f5e6b73a5a89f527ceea61f323c13ec9329352b84a78982594a2bcdca2bd13bd67f4a4f60f21786cebef6da2bb233718fe0a90376c703de510b25e416f SHA512 393c6b16b403a5f14180ca4b010bd74b62dea7043dabaf463e6995690226105f872556d3df54e0cee1a6dfe2140b033aad25998fc65414e7380f41894201f43a
diff --git a/x11-libs/qscintilla/qscintilla-2.10.2.ebuild b/x11-libs/qscintilla/qscintilla-2.10.2.ebuild
new file mode 100644
index 000000000000..eb99746332b8
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.10.2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic multibuild qmake-utils
+
+MY_P=QScintilla_gpl-${PV/_pre/.dev}
+
+DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class"
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
+SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/13"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="designer doc +qt4 qt5"
+
+REQUIRED_USE="|| ( qt4 qt5 )"
+
+DEPEND="
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		designer? ( dev-qt/designer:4 )
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		designer? ( dev-qt/designer:5 )
+	)
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	default
+
+	# Sub-slot sanity check
+	local subslot=${SLOT#*/}
+	local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' "${S}"/Qt4Qt5/qscintilla.pro)
+	local major=${version%%.*}
+	if [[ ${subslot} != ${major} ]]; then
+		eerror
+		eerror "Ebuild sub-slot (${subslot}) does not match QScintilla major version (${major})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${major}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+
+	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
+	multibuild_copy_sources
+}
+
+qsci_run_in() {
+	pushd "$1" >/dev/null || die
+	shift || die
+	"$@" || die
+	popd >/dev/null || die
+}
+
+src_configure() {
+	use qt4 && append-cxxflags -std=gnu++0x
+
+	if use designer; then
+		# prevent building against system version (bug 466120)
+		append-cxxflags -I../Qt4Qt5
+		append-ldflags -L../Qt4Qt5
+	fi
+
+	qsci_configure() {
+		qsci_run_in Qt4Qt5 eqmake${MULTIBUILD_VARIANT#qt}
+		use designer && qsci_run_in designer-Qt4Qt5 eqmake${MULTIBUILD_VARIANT#qt}
+	}
+	multibuild_foreach_variant run_in_build_dir qsci_configure
+}
+
+src_compile() {
+	qsci_compile() {
+		qsci_run_in Qt4Qt5 emake
+		use designer && qsci_run_in designer-Qt4Qt5 emake
+	}
+	multibuild_foreach_variant run_in_build_dir qsci_compile
+}
+
+src_install() {
+	qsci_install() {
+		qsci_run_in Qt4Qt5 emake INSTALL_ROOT="${D}" install
+		use designer && qsci_run_in designer-Qt4Qt5 emake INSTALL_ROOT="${D}" install
+	}
+	multibuild_foreach_variant run_in_build_dir qsci_install
+
+	DOCS=( ChangeLog NEWS )
+	use doc && HTML_DOCS=( doc/html-Qt4Qt5/. )
+	einstalldocs
+}
diff --git a/x11-libs/qscintilla/qscintilla-2.9.2-r1.ebuild b/x11-libs/qscintilla/qscintilla-2.9.2-r1.ebuild
deleted file mode 100644
index c6c36a38c427..000000000000
--- a/x11-libs/qscintilla/qscintilla-2.9.2-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic qmake-utils
-
-MY_P=QScintilla_gpl-${PV}
-
-DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class"
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
-SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/12"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="designer doc +qt4"
-
-DEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	designer? ( dev-qt/designer:4 )
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	default
-
-	# Sub-slot sanity check
-	local subslot=${SLOT#*/}
-	local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' "${S}"/Qt4Qt5/qscintilla.pro)
-	local major=${version%%.*}
-	if [[ ${subslot} != ${major} ]]; then
-		eerror
-		eerror "Ebuild sub-slot (${subslot}) does not match QScintilla major version (${major})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${major}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-}
-
-qsci_run_in() {
-	pushd "$1" >/dev/null || die
-	shift || die
-	"$@" || die
-	popd >/dev/null || die
-}
-
-src_configure() {
-	qsci_run_in Qt4Qt5 eqmake4
-
-	if use designer; then
-		# prevent building against system version (bug 466120)
-		append-cxxflags -I../Qt4Qt5
-		append-ldflags -L../Qt4Qt5
-
-		qsci_run_in designer-Qt4Qt5 eqmake4
-	fi
-}
-
-src_compile() {
-	qsci_run_in Qt4Qt5 emake
-
-	use designer && qsci_run_in designer-Qt4Qt5 emake
-}
-
-src_install() {
-	qsci_run_in Qt4Qt5 emake INSTALL_ROOT="${D}" install
-
-	use designer && qsci_run_in designer-Qt4Qt5 emake INSTALL_ROOT="${D}" install
-
-	dodoc ChangeLog NEWS
-
-	if use doc; then
-		docinto html
-		dodoc -r doc/html-Qt4Qt5/*
-	fi
-}