gentoo resync : 15.01.2020

4 files changed, 5 insertions, 84 deletions

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index a8c8aa933040..450b3029f488 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,7 +1,5 @@
 DIST QScintilla-2.11.3.tar.gz 3006383 BLAKE2B 6238aaff44d6136a64e8c38e38c4886357eb72aa4067f54eda1e876040c41ebce8577e244b81a062e9020c4d142439f5612ca88055d0ba87172ff5b8893938d7 SHA512 83406ef2f425c6288fcac52b01417853186ba860e33e14b236801271e034c327cbb00817cb7247e98bafc1844aeff9f24ec4878ac8ec4bd52d0d2d9778f6b884
-DIST QScintilla_gpl-2.10.8.tar.gz 2736054 BLAKE2B 4bc7a2bc1974f8e10a96b7716a8e35d4854e9eeb8040734f99b796bddd9679ee2539f6517743689f9d7deff9ce523cdbb2f77ccd65eaadfc947dcc7a1337d918 SHA512 c0a216737dbda6bc390225196b37a43e4884c9cd67e6e81fc1b1b952683fe88dbfe7caf3c66d94a378f37502e1f08cbdf788426248e73f5f66ec65982b7652b5
-DIST QScintilla_gpl-2.11.1.tar.gz 2932060 BLAKE2B 9f2f9fd89667cc04c95d0a36e4a615dcf3c1c11a5446e19a43104513894b76bc7478f2aed7e8c94ce413f940327deb09e51507bee1fa35c79c176e01e6b74767 SHA512 40b600aa8eec17bc99491a08aeaee72bf498a66f0257d310a8df2667de82805715b9c859885c092acfb03ba8f69433a6517d0d4bb324bf99bd9db461172c08d5
-EBUILD qscintilla-2.10.8.ebuild 1796 BLAKE2B d32e1be6bd53bbd8b893c4dbd755350430907213b38b95462ce26742affda2b3c93588189b636cfe6df1b3854e7b825555b5993fe4a766135ee802c239b8d906 SHA512 7f5906dc73b378fc93bbbd97394e269d55f335f7404b05e8d04f3048084637710a6ab6d4c4e4a7e121834b1f966bff07bf53df13400735af301d8026c63d3f61
-EBUILD qscintilla-2.11.1.ebuild 1961 BLAKE2B 4c43f10d33d3019b2500640314b0c02fe88f112a4e76d40334a7476a4b44c75da6b8b747e82a79e10fb1406cc32c89a0f6589288e122fe1761f9c24aea7476a1 SHA512 0fcc9259f8f3d8f391faa6180b7f440132c2e59814b22f3b8c80ceeaccd6e2187d353a29b36db21189d48d22d17bfdd77031365da2d9217e21f6a1bb9fdeac13
-EBUILD qscintilla-2.11.3.ebuild 1957 BLAKE2B 84a7752f28ce961ab39d41f5c2c63c6c040bb78ce4789075305496024d5fd0878689b095af9d01503998bc8c9c070750827314b6c1ce1abdb0ddc4c9235f2702 SHA512 d139200a4e02325878bded6c8f6858a47ed0444a1a6044992e783e79034b3896fe2aa68726f917faddf83dc112ae6b1764eac305394aea55efa7c6d069150078
+DIST QScintilla-2.11.4.tar.gz 3007719 BLAKE2B b0f88a15a3636a0056d3bdac6e5d5bb05a065461c7de7fe0d5ad1740e87ca78a47bc1fd1af90a8751b553e8e326c830088a4cb38c9ebcad6be8bf9ebdb49bad0 SHA512 90fc2427121ca9ae55e34cf636460099bbdadd844318d9ef05f86790a36e25fb64528264bb7bb99e46b7add96378eff0cc69bb692940c6a1bddfadf86a9abdbd
+EBUILD qscintilla-2.11.3.ebuild 1954 BLAKE2B 249d3628025e2ecd7c026290d337a1eefa30efb5700612b76189adc35a346593814b6c0d581cf7d31746d5ed631680440185dff5ab0e3e91810a1aa910ac027e SHA512 3df250303393e3b9cd8408cb47fffd83c7063e7b0f4961eab6ed24f45c2a9dc0cd4d19016d850e048c209d90cd944b74d7be7ac073bd51c268d85e1b844d3517
+EBUILD qscintilla-2.11.4.ebuild 1957 BLAKE2B 84a7752f28ce961ab39d41f5c2c63c6c040bb78ce4789075305496024d5fd0878689b095af9d01503998bc8c9c070750827314b6c1ce1abdb0ddc4c9235f2702 SHA512 d139200a4e02325878bded6c8f6858a47ed0444a1a6044992e783e79034b3896fe2aa68726f917faddf83dc112ae6b1764eac305394aea55efa7c6d069150078
 MISC metadata.xml 705 BLAKE2B c0c287bbd6ea54929cae6ebc67434bed9fb068a3f560a870412e6182e0da5543abcaf0c38aa3c84e4597cbdcbc4be09775be679d6c83b52a8d6f10166fdb6c53 SHA512 39849b3d5febe51eb9dcad9333ca64ee7cc81c48fa411b167e3398a03a2d4f75d5380bf4650e2e625952e0b3d842242859f487136d25cea768dcf128f35f490e
diff --git a/x11-libs/qscintilla/qscintilla-2.10.8.ebuild b/x11-libs/qscintilla/qscintilla-2.10.8.ebuild
deleted file mode 100644
index ee5c0e806255..000000000000
--- a/x11-libs/qscintilla/qscintilla-2.10.8.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 || die)
-	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.11.3.ebuild b/x11-libs/qscintilla/qscintilla-2.11.3.ebuild
index 9c5354a9b46e..f6b4a37b4593 100644
--- a/x11-libs/qscintilla/qscintilla-2.11.3.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.11.3.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0/15"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
 IUSE="designer doc"
 
 RDEPEND="
diff --git a/x11-libs/qscintilla/qscintilla-2.11.1.ebuild b/x11-libs/qscintilla/qscintilla-2.11.4.ebuild
index ae3d709bc0df..9c5354a9b46e 100644
--- a/x11-libs/qscintilla/qscintilla-2.11.1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.11.4.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Qt port of Neil Hodgson's Scintilla C++ editor control"
 HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
 
 MY_PN=QScintilla
-MY_P=${MY_PN}_gpl-${PV/_pre/.dev}
+MY_P=${MY_PN}-${PV/_pre/.dev}
 if [[ ${PV} == *_pre* ]]; then
 	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
 else