gentoo resync : 16.04.2018

3 files changed, 81 insertions, 2 deletions

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index f5c7e98be98f..a89fd59a0ba2 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,7 +1,9 @@
 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.10.3.tar.gz 2721287 BLAKE2B cc85eea17e563ae5f4a130d26ca88bec3e1a6cbff7bc0af096c63789384d03149105641d6324f53b37a2bd8ab4681a285ccb76e6063a06e5db30d070d3fd8219 SHA512 a1b9d6869797ec074e4e0727164804779792fb77b2230aae80e6d6b5fb3a3ff9d84e17d775d18ab74c97b78bac454511fd2cb49be1fa36f71d9097abf88045b6
+DIST QScintilla_gpl-2.10.4.tar.gz 2721322 BLAKE2B df50dd0a34db96dd57147ddc399d4a30751b1bb4922dc1b8b3c3c1989e810937dc8345f92128e8a606b1edc04fde4b930a424ab8344818c9899c8fe496793a77 SHA512 dee6684f68173784d098931554c839a30e129b89f980cd9704f818c44eb7023199bd3682e4b342091fa3e0ce577ec576d34046477bdd1d7fc58ca5dd2ba947a3
 EBUILD qscintilla-2.10.1.ebuild 2392 BLAKE2B 8949f6e08aa13e41ec7ba1d8a0a2d029b3601c8cdb3c71e44a34a728cc05a923b5162c2f657df06bc564bd4042760f1229409f2e9e8420441731e769251e1522 SHA512 c53488e751beb5a52dfc6e9903442f436e976f26afaa4a765e9bada3d0621fec6acecf4df5c98e7434f206f04336b21f0a07dccb09372cd8a693ac6c0930ebec
 EBUILD qscintilla-2.10.2.ebuild 2396 BLAKE2B 28f458ac59aa6a8fe3dea42ad42e4fb0e85d0f385c72c6afc8e67c64e95ae18c65b0b92b9498a8d7fd6808b430fbf74c82eb7e2e2dfaf962fc4d2f48f996b540 SHA512 ec04a36a7db01686439adb97aad938eb966928c4ba1b3f7df23365f59e2401efe35fff12de86016937cf1cb4fc03c9e5f2e3226d5410b13bda0c1d8d1f85c4e8
-EBUILD qscintilla-2.10.3.ebuild 1793 BLAKE2B 1972dde3e7161b985c329e54afeb22f19735af3cf207f506df08329e25b66f6a0bb8048cfafc9777975e0957c9e317af7d48ee6d958bcc54bd4962e6ac14b8b6 SHA512 dc28d37297321c35131e096f47ad972b13e2bd7e8a24f6637890d1b6f1a375438c01ec14dad391775ddbd361faf23e637fff32e64613bda06cbaa44d7f0a29f6
+EBUILD qscintilla-2.10.3.ebuild 1792 BLAKE2B c5bc390ece8a01fc8ed9c709df1f941b3df050b61187d2db6868619435e13757fd2212182999cdf5f927123b4e100ad4ca16d291c5a25124eb74034d06b453bb SHA512 c44765c9c30c4e7ff0f9aca8595605f2620eb8b7a25ef7dad535f51976190a158dc1bb9c0a084e4ba9f3b6ca1c0b466fa18c08b9d74995b0d45e9abc0abc3ee3
+EBUILD qscintilla-2.10.4.ebuild 1795 BLAKE2B 36847c597a849c37bfdb2d4cd9d230dfdef8acd08b75a7acfb1f0508edc3742e705c0db20e9a867102ecd4858f3dccafd253e5ccef9c8e5b6028c1ccba571cae SHA512 934d5063e87b917059e3d49b01230f57b00b7272310bf1ee55c12a9962a76f274e877ab5e6362e47466729d3f832fa4435ab35f0c5a20cdba7760acef270ba64
 MISC metadata.xml 741 BLAKE2B 0ad895f5e6b73a5a89f527ceea61f323c13ec9329352b84a78982594a2bcdca2bd13bd67f4a4f60f21786cebef6da2bb233718fe0a90376c703de510b25e416f SHA512 393c6b16b403a5f14180ca4b010bd74b62dea7043dabaf463e6995690226105f872556d3df54e0cee1a6dfe2140b033aad25998fc65414e7380f41894201f43a
diff --git a/x11-libs/qscintilla/qscintilla-2.10.3.ebuild b/x11-libs/qscintilla/qscintilla-2.10.3.ebuild
index 29852a22c94b..087f92e548df 100644
--- a/x11-libs/qscintilla/qscintilla-2.10.3.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.10.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/13"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
 IUSE="designer doc"
 
 DEPEND="
diff --git a/x11-libs/qscintilla/qscintilla-2.10.4.ebuild b/x11-libs/qscintilla/qscintilla-2.10.4.ebuild
new file mode 100644
index 000000000000..1b74d6e22141
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.10.4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 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/_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="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="designer doc"
+
+DEPEND="
+	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
+}
+
+qsci_run_in() {
+	pushd "$1" >/dev/null || die
+	shift || die
+	"$@" || die
+	popd >/dev/null || die
+}
+
+src_configure() {
+	if use designer; then
+		# prevent building against system version (bug 466120)
+		append-cxxflags -I../Qt4Qt5
+		append-ldflags -L../Qt4Qt5
+	fi
+
+	qsci_run_in Qt4Qt5 eqmake5
+	use designer && qsci_run_in designer-Qt4Qt5 eqmake5
+}
+
+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
+
+	DOCS=( ChangeLog NEWS )
+	use doc && HTML_DOCS=( doc/html-Qt4Qt5/. )
+	einstalldocs
+}