gentoo resync : 20.10.2021

3 files changed, 84 insertions, 2 deletions

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index a120f018aff6..4e336608297e 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,5 +1,7 @@
 DIST QScintilla-2.11.6.tar.gz 3027764 BLAKE2B 1eb5d9ba44040cbff30e8b0028e164cf2aa86c565a5368890500614b9395dbe861c5cd268cf6a4ec06e2c7d77860b2ad6064bc3d07fd63a6ede2b060f44a7117 SHA512 8055d72a40f9f5a7d45c6592055c1b8eb5e5c50ce9e51673babd5e567c769d60c64d244ba5a7def5731a3120099e9528d01ed94327a06bb56ae2fa2e5e37b198
 DIST QScintilla_src-2.13.0.tar.gz 3059601 BLAKE2B 8de5440c3019cb3f67ea25db2935dc8d8cd711298a8a49ce3f632937c538da5b8b337851c3f68c59eb3cb8df8396eebd8ac4f0b4d6d715c2519598eeda9b6586 SHA512 c72676e2d8463dde6e7c620e15a526eae056cfbf00bb5d013c315ebbf20340fcc79188c6e60c336679f7d18287066a26bdc96be2f1ef8a98b3adcada3ee09fd1
+DIST QScintilla_src-2.13.1.tar.gz 3059819 BLAKE2B 147d61cea2d557da6d922599f826a62c4b216f3252226892076ff785a080c9de1fef199297156fce55a00006567240af45e2833e085e423ad47e29c4f9b2241e SHA512 edf7f358e188235d8a39a7d4a8332ca478460a65a8829d9cafcab8f22b84abcd8d624de2076d81a66a56d5a5c53edc6ecc223459bbbb8ac876c5befd8873f700
 EBUILD qscintilla-2.11.6.ebuild 1959 BLAKE2B 5609b01ac7f134c828f00689ddfb3f63816b0098b028199edde287211a969cbdbfa4eeb1c3442fca58d8021d205bd9fb82cd736bb0c5e617cc85d362ea39cd3e SHA512 b8365aa48d71e5d2c6421dd45132601e58857f35569397f7d157b710af5c4210bffcf9c88ef6800fe1ce96c909e21cf6cf5cd71346ec5f35f5b38ebe1048290e
-EBUILD qscintilla-2.13.0.ebuild 1896 BLAKE2B 848a3f5f88a75733433a4dde205043d200d1983301c09696f2b93156b300128cc92a554c3653853d2f53e712fb4c74288b0a618fd0db7b061094bf3912546afe SHA512 cb5c43d8dc3651755928ee1ce640089374862ecb316affdcde06b4a79ae773a6c0b5212470b9079e025066fc941b84700c92e604733b0113a5e2146d25cba0e0
+EBUILD qscintilla-2.13.0.ebuild 1903 BLAKE2B 98ff80479a4440fa60b07b5d4aa92cda637b523ee62c728a985bf486dc81e5cedcf9f074156357325b8a96ecaa971d821d363b4d287648fbd3fd51c4c8fd7b51 SHA512 40d30762c011d7be0b63b2249860c4c1f643a39e36637393e7e27f65283885d377eee22b860667e4713c92132a5c73a3d9d2ab89d9d8cc2b1813df05bb78e2bc
+EBUILD qscintilla-2.13.1.ebuild 1903 BLAKE2B 98ff80479a4440fa60b07b5d4aa92cda637b523ee62c728a985bf486dc81e5cedcf9f074156357325b8a96ecaa971d821d363b4d287648fbd3fd51c4c8fd7b51 SHA512 40d30762c011d7be0b63b2249860c4c1f643a39e36637393e7e27f65283885d377eee22b860667e4713c92132a5c73a3d9d2ab89d9d8cc2b1813df05bb78e2bc
 MISC metadata.xml 605 BLAKE2B 926d6dffbaf1d0243678e72a7e09d537d58571413142bef96b5963ea21cf1edadb6404992a6c57c1698cc58f9154ef9eb80926f1472b0570f6f3c299e856304c SHA512 99a337e3019d6ea8f8887bd92130d3fbc8d042eeb4d0c42afd6ea943751b901dbe0bc94f3244ae55371e2e2b9cfc0e2c4709f2bcbd07b70e42c16c454ae83007
diff --git a/x11-libs/qscintilla/qscintilla-2.13.0.ebuild b/x11-libs/qscintilla/qscintilla-2.13.0.ebuild
index b724431bd160..28e0c4e73dc6 100644
--- a/x11-libs/qscintilla/qscintilla-2.13.0.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.13.0.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0/15"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="designer doc"
 
 RDEPEND="
diff --git a/x11-libs/qscintilla/qscintilla-2.13.1.ebuild b/x11-libs/qscintilla/qscintilla-2.13.1.ebuild
new file mode 100644
index 000000000000..28e0c4e73dc6
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.13.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic qmake-utils
+
+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}_src-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
+fi
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-3"
+SLOT="0/15"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="designer doc"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	designer? ( dev-qt/designer:5 )
+"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	default
+
+	# Sub-slot sanity check
+	local subslot=${SLOT#*/}
+	local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' "${S}"/src/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../src
+		append-ldflags -L../src
+	fi
+
+	qsci_run_in src eqmake5
+	use designer && qsci_run_in designer eqmake5
+}
+
+src_compile() {
+	qsci_run_in src emake
+	use designer && qsci_run_in designer emake
+}
+
+src_install() {
+	qsci_run_in src emake INSTALL_ROOT="${D}" install
+	use designer && qsci_run_in designer emake INSTALL_ROOT="${D}" install
+
+	use doc && HTML_DOCS=( doc/html/. )
+	einstalldocs
+}