gentoo resync : 12.01.2019

3 files changed, 2 insertions, 81 deletions

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index ee17a026620e..707fa6560e39 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,5 +1,3 @@
-DIST QScintilla_gpl-2.10.4.tar.gz 2721322 BLAKE2B df50dd0a34db96dd57147ddc399d4a30751b1bb4922dc1b8b3c3c1989e810937dc8345f92128e8a606b1edc04fde4b930a424ab8344818c9899c8fe496793a77 SHA512 dee6684f68173784d098931554c839a30e129b89f980cd9704f818c44eb7023199bd3682e4b342091fa3e0ce577ec576d34046477bdd1d7fc58ca5dd2ba947a3
 DIST QScintilla_gpl-2.10.8.tar.gz 2736054 BLAKE2B 4bc7a2bc1974f8e10a96b7716a8e35d4854e9eeb8040734f99b796bddd9679ee2539f6517743689f9d7deff9ce523cdbb2f77ccd65eaadfc947dcc7a1337d918 SHA512 c0a216737dbda6bc390225196b37a43e4884c9cd67e6e81fc1b1b952683fe88dbfe7caf3c66d94a378f37502e1f08cbdf788426248e73f5f66ec65982b7652b5
-EBUILD qscintilla-2.10.4.ebuild 1792 BLAKE2B c5bc390ece8a01fc8ed9c709df1f941b3df050b61187d2db6868619435e13757fd2212182999cdf5f927123b4e100ad4ca16d291c5a25124eb74034d06b453bb SHA512 c44765c9c30c4e7ff0f9aca8595605f2620eb8b7a25ef7dad535f51976190a158dc1bb9c0a084e4ba9f3b6ca1c0b466fa18c08b9d74995b0d45e9abc0abc3ee3
-EBUILD qscintilla-2.10.8.ebuild 1797 BLAKE2B e201b569df41e5d4be5d7ec8ef26aedb7fb89714795964a93cfd31a50ba985df567e2f4963cf900976355fb668e79df37017f926b3f0a7a627b3c87f77e55aaa SHA512 4a447a9a6d67c7ef2795817558d0fc781b150bed243570b721644fee57839661e8a14f38da78407da46a4c227a2ca1fb1b195e06a395cbe094cd626219301bd9
+EBUILD qscintilla-2.10.8.ebuild 1796 BLAKE2B d32e1be6bd53bbd8b893c4dbd755350430907213b38b95462ce26742affda2b3c93588189b636cfe6df1b3854e7b825555b5993fe4a766135ee802c239b8d906 SHA512 7f5906dc73b378fc93bbbd97394e269d55f335f7404b05e8d04f3048084637710a6ab6d4c4e4a7e121834b1f966bff07bf53df13400735af301d8026c63d3f61
 MISC metadata.xml 741 BLAKE2B 0ad895f5e6b73a5a89f527ceea61f323c13ec9329352b84a78982594a2bcdca2bd13bd67f4a4f60f21786cebef6da2bb233718fe0a90376c703de510b25e416f SHA512 393c6b16b403a5f14180ca4b010bd74b62dea7043dabaf463e6995690226105f872556d3df54e0cee1a6dfe2140b033aad25998fc65414e7380f41894201f43a
diff --git a/x11-libs/qscintilla/qscintilla-2.10.4.ebuild b/x11-libs/qscintilla/qscintilla-2.10.4.ebuild
deleted file mode 100644
index 087f92e548df..000000000000
--- a/x11-libs/qscintilla/qscintilla-2.10.4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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
-}
diff --git a/x11-libs/qscintilla/qscintilla-2.10.8.ebuild b/x11-libs/qscintilla/qscintilla-2.10.8.ebuild
index d3291e197194..ee5c0e806255 100644
--- a/x11-libs/qscintilla/qscintilla-2.10.8.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.10.8.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="