[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Thomas Deutschmann]

commit:     ba5d3812b26404087042d88de587f1855edd5275
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  2 21:08:02 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Nov  2 21:13:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba5d3812

x11-libs/qscintilla: x86 stable (bug #634982)

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 x11-libs/qscintilla/qscintilla-2.10.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.10.1.ebuild b/x11-libs/qscintilla/qscintilla-2.10.1.ebuild
index eb99746332b..1c0c6c6cb58 100644
--- a/x11-libs/qscintilla/qscintilla-2.10.1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.10.1.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="designer doc +qt4 qt5"
 
 REQUIRED_USE="|| ( qt4 qt5 )"

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Michał Górny]

commit:     b2ee016e2452b213b0941e16378762977c52b8fe
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed May  8 07:51:22 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May  8 07:54:01 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2ee016e

x11-libs/qscintilla: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 x11-libs/qscintilla/Manifest                 |  1 -
 x11-libs/qscintilla/qscintilla-2.13.3.ebuild | 80 ----------------------------
 x11-libs/qscintilla/qscintilla-2.14.1.ebuild | 80 ----------------------------
 3 files changed, 161 deletions(-)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 3ff66b83fdc4..96cf9c1d21e4 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,2 +1 @@
-DIST QScintilla_src-2.13.3.tar.gz 3060031 BLAKE2B e93dd884f630ef5f02fbf558ea8d9f94cfde1af03b811c8df9c3197ce9cadc430bf9727aec114ba118588effa5bc76166e3bda48800b6112edc8e8c598d72952 SHA512 be102fd6123fad0bc7f8de39080886369398889de48a4ec8873a0751890d7be1f238ae5194b71d31aac492e2881b6bf7885d9c06a2a47e36328780b47694f5b5
 DIST QScintilla_src-2.14.1.tar.gz 3233610 BLAKE2B 83b54378f0d3fa39ea120214a06c91982f81281e15c61fc70a9e83928be64724cfd2679b5e4aafee44a324e24a6c4729693cd118c6ad0b1636a199f2f41d34fe SHA512 19e2f9e0a14947501c575018df368d24eb7f8c74e74faa5246db36415bf28dc0beee507ed0e73107c02b36a99bbaf55f0ef3349f479d2332e1b92b2c4a32788a

diff --git a/x11-libs/qscintilla/qscintilla-2.13.3.ebuild b/x11-libs/qscintilla/qscintilla-2.13.3.ebuild
deleted file mode 100644
index 84cd701d95c2..000000000000
--- a/x11-libs/qscintilla/qscintilla-2.13.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 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 && local HTML_DOCS=( doc/html/. )
-	einstalldocs
-}

diff --git a/x11-libs/qscintilla/qscintilla-2.14.1.ebuild b/x11-libs/qscintilla/qscintilla-2.14.1.ebuild
deleted file mode 100644
index 33d840ca0d6f..000000000000
--- a/x11-libs/qscintilla/qscintilla-2.14.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 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 && local HTML_DOCS=( doc/html/. )
-	einstalldocs
-}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Jimi Huotari]

commit:     aecddf2e9f314168dddf8e357dce5bc26063a31e
Author:     José de Paula R. N. Assis <espinafre <AT> gmail <DOT> com>
AuthorDate: Tue Oct 24 16:13:43 2023 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Tue Apr 16 16:29:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aecddf2e

x11-libs/qscintilla: add USE=qt6 #916232

Adding USE=qt6 to x11-libs/qscintilla, based on previous work by @t0b3
(#31252), keeping qt5 support, via multibuild.

Closes: https://bugs.gentoo.org/916232
Signed-off-by: José P. R. N. Assis <espinafre <AT> gmail.com>
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.14.1-r1.ebuild | 114 ++++++++++++++++++++++++
 1 file changed, 114 insertions(+)

diff --git a/x11-libs/qscintilla/qscintilla-2.14.1-r1.ebuild b/x11-libs/qscintilla/qscintilla-2.14.1-r1.ebuild
new file mode 100644
index 000000000000..43e36261230c
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.14.1-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic multibuild 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 +qt5 qt6"
+
+REQUIRED_USE="|| ( qt5 qt6 )"
+
+# no tests
+RESTRICT="test"
+
+RDEPEND="
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		designer? ( dev-qt/designer:5 )
+	)
+	qt6? (
+		dev-qt/qtbase:6[gui,widgets]
+		designer? ( dev-qt/qttools:6[designer] )
+	)
+"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
+}
+
+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
+
+	multibuild_copy_sources
+}
+
+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
+	my_src_configure() {
+		case ${MULTIBUILD_VARIANT} in
+			qt5)
+				qsci_run_in "${BUILD_DIR}"/src eqmake5;
+				use designer && qsci_run_in "${BUILD_DIR}"/designer eqmake5;;
+			qt6)
+				qsci_run_in "${BUILD_DIR}"/src eqmake6;
+				use designer && qsci_run_in "${BUILD_DIR}"/designer eqmake6;;
+		esac
+	}
+
+	multibuild_foreach_variant my_src_configure
+}
+
+src_compile() {
+	my_src_compile() {
+		qsci_run_in "${BUILD_DIR}"/src emake
+		use designer && qsci_run_in "${BUILD_DIR}"/designer emake
+	}
+
+	multibuild_foreach_variant my_src_compile
+}
+
+src_install() {
+	my_src_install() {
+		qsci_run_in "${BUILD_DIR}"/src emake INSTALL_ROOT="${D}" install
+		use designer && qsci_run_in "${BUILD_DIR}"/designer emake INSTALL_ROOT="${D}" install
+	}
+
+	multibuild_foreach_variant my_src_install
+
+	use doc && local HTML_DOCS=( doc/html/. )
+	einstalldocs
+}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Arthur Zamarin]

commit:     5b2deff896e10bb9436a5d3bad34f9e01d329f86
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 18 15:41:43 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 18 15:41:43 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b2deff8

x11-libs/qscintilla: Stabilize 2.14.1 ppc, #915929

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.14.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.14.1.ebuild b/x11-libs/qscintilla/qscintilla-2.14.1.ebuild
index 128b29b2a32a..33d840ca0d6f 100644
--- a/x11-libs/qscintilla/qscintilla-2.14.1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.14.1.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0/15"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86"
 IUSE="designer doc"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Sam James]

commit:     ed97e24bd7aeea29b476a9fbc758629404dfed80
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 18 09:01:50 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 18 09:01:50 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed97e24b

x11-libs/qscintilla: Stabilize 2.14.1 arm, #915929

Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.14.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.14.1.ebuild b/x11-libs/qscintilla/qscintilla-2.14.1.ebuild
index 50e5ced860c5..128b29b2a32a 100644
--- a/x11-libs/qscintilla/qscintilla-2.14.1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.14.1.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0/15"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="designer doc"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Sam James]

commit:     2d46b49b7def34531e984b7cfae10bc3ab232653
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 18 09:01:47 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 18 09:01:47 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d46b49b

x11-libs/qscintilla: Stabilize 2.14.1 arm64, #915929

Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.14.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.14.1.ebuild b/x11-libs/qscintilla/qscintilla-2.14.1.ebuild
index d6db1ed1a5a9..8c68aad1107d 100644
--- a/x11-libs/qscintilla/qscintilla-2.14.1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.14.1.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0/15"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="designer doc"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Sam James]

commit:     e72b808b8145b5d6b63035af410c0b78d41f7b7b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 18 09:01:48 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 18 09:01:48 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e72b808b

x11-libs/qscintilla: Stabilize 2.14.1 amd64, #915929

Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.14.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.14.1.ebuild b/x11-libs/qscintilla/qscintilla-2.14.1.ebuild
index 8c68aad1107d..72e9728d1bf9 100644
--- a/x11-libs/qscintilla/qscintilla-2.14.1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.14.1.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0/15"
-KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="designer doc"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Sam James]

commit:     c995ee91cd185d0cf756a5fe77f720d84f5d68a8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 18 09:01:49 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 18 09:01:49 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c995ee91

x11-libs/qscintilla: Stabilize 2.14.1 x86, #915929

Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.14.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.14.1.ebuild b/x11-libs/qscintilla/qscintilla-2.14.1.ebuild
index 72e9728d1bf9..50e5ced860c5 100644
--- a/x11-libs/qscintilla/qscintilla-2.14.1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.14.1.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0/15"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="designer doc"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Sam James]

commit:     a28b0b0318aa6855f471d102f5d3b83f831adc4b
Author:     Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Sat Sep 16 21:33:52 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 17 06:16:46 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a28b0b03

x11-libs/qscintilla: 2.14.1 version bump

Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-libs/qscintilla/Manifest                 |  1 +
 x11-libs/qscintilla/qscintilla-2.14.1.ebuild | 80 ++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index e3f543929391..3ff66b83fdc4 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1 +1,2 @@
 DIST QScintilla_src-2.13.3.tar.gz 3060031 BLAKE2B e93dd884f630ef5f02fbf558ea8d9f94cfde1af03b811c8df9c3197ce9cadc430bf9727aec114ba118588effa5bc76166e3bda48800b6112edc8e8c598d72952 SHA512 be102fd6123fad0bc7f8de39080886369398889de48a4ec8873a0751890d7be1f238ae5194b71d31aac492e2881b6bf7885d9c06a2a47e36328780b47694f5b5
+DIST QScintilla_src-2.14.1.tar.gz 3233610 BLAKE2B 83b54378f0d3fa39ea120214a06c91982f81281e15c61fc70a9e83928be64724cfd2679b5e4aafee44a324e24a6c4729693cd118c6ad0b1636a199f2f41d34fe SHA512 19e2f9e0a14947501c575018df368d24eb7f8c74e74faa5246db36415bf28dc0beee507ed0e73107c02b36a99bbaf55f0ef3349f479d2332e1b92b2c4a32788a

diff --git a/x11-libs/qscintilla/qscintilla-2.14.1.ebuild b/x11-libs/qscintilla/qscintilla-2.14.1.ebuild
new file mode 100644
index 000000000000..d6db1ed1a5a9
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.14.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 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 && local HTML_DOCS=( doc/html/. )
+	einstalldocs
+}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Andreas Sturmlechner]

commit:     0321462ccf913be837478335cdc0d6695549ad67
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 23 21:13:32 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 23 21:13:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0321462c

x11-libs/qscintilla: drop 2.13.1

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 x11-libs/qscintilla/Manifest                 |  1 -
 x11-libs/qscintilla/qscintilla-2.13.1.ebuild | 80 ----------------------------
 2 files changed, 81 deletions(-)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 43c913a0fa93..e3f543929391 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,2 +1 @@
-DIST QScintilla_src-2.13.1.tar.gz 3059819 BLAKE2B 147d61cea2d557da6d922599f826a62c4b216f3252226892076ff785a080c9de1fef199297156fce55a00006567240af45e2833e085e423ad47e29c4f9b2241e SHA512 edf7f358e188235d8a39a7d4a8332ca478460a65a8829d9cafcab8f22b84abcd8d624de2076d81a66a56d5a5c53edc6ecc223459bbbb8ac876c5befd8873f700
 DIST QScintilla_src-2.13.3.tar.gz 3060031 BLAKE2B e93dd884f630ef5f02fbf558ea8d9f94cfde1af03b811c8df9c3197ce9cadc430bf9727aec114ba118588effa5bc76166e3bda48800b6112edc8e8c598d72952 SHA512 be102fd6123fad0bc7f8de39080886369398889de48a4ec8873a0751890d7be1f238ae5194b71d31aac492e2881b6bf7885d9c06a2a47e36328780b47694f5b5

diff --git a/x11-libs/qscintilla/qscintilla-2.13.1.ebuild b/x11-libs/qscintilla/qscintilla-2.13.1.ebuild
deleted file mode 100644
index 8dba82f8be1c..000000000000
--- a/x11-libs/qscintilla/qscintilla-2.13.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 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
-}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Sam James]

commit:     7e65d39cf2ef991ac2abab5a029d98654814e7c4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 18:55:01 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 18:55:01 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e65d39c

x11-libs/qscintilla: Stabilize 2.13.3 amd64, #878263

Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.13.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.13.3.ebuild b/x11-libs/qscintilla/qscintilla-2.13.3.ebuild
index 878971a0fc01..a187e042e5c0 100644
--- a/x11-libs/qscintilla/qscintilla-2.13.3.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.13.3.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0/15"
-KEYWORDS="~amd64 arm arm64 ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv ~x86"
 IUSE="designer doc"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Sam James]

commit:     b3135aad9a78a7c03b6347827b30bd188cc336b5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 18:55:03 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 18:55:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3135aad

x11-libs/qscintilla: Stabilize 2.13.3 x86, #878263

Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.13.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.13.3.ebuild b/x11-libs/qscintilla/qscintilla-2.13.3.ebuild
index a187e042e5c0..84cd701d95c2 100644
--- a/x11-libs/qscintilla/qscintilla-2.13.3.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.13.3.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0/15"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86"
 IUSE="designer doc"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Arthur Zamarin]

commit:     11b6127e6ef6c15f7d2a973308b31b9b8ec23786
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 18:52:49 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 18:52:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11b6127e

x11-libs/qscintilla: Stabilize 2.13.3 arm64, #878263

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.13.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.13.3.ebuild b/x11-libs/qscintilla/qscintilla-2.13.3.ebuild
index 4d6e336fbb0a..878971a0fc01 100644
--- a/x11-libs/qscintilla/qscintilla-2.13.3.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.13.3.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0/15"
-KEYWORDS="~amd64 arm ~arm64 ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm arm64 ppc ~ppc64 ~riscv ~x86"
 IUSE="designer doc"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Arthur Zamarin]

commit:     e7b27f3f99e5072a534acf9fcfc501c1031c0104
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 16:36:32 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 16:36:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7b27f3f

x11-libs/qscintilla: Stabilize 2.13.3 arm, #878263

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.13.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.13.3.ebuild b/x11-libs/qscintilla/qscintilla-2.13.3.ebuild
index 30367f10c011..4d6e336fbb0a 100644
--- a/x11-libs/qscintilla/qscintilla-2.13.3.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.13.3.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0/15"
-KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm ~arm64 ppc ~ppc64 ~riscv ~x86"
 IUSE="designer doc"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Arthur Zamarin]

commit:     8ef94177fa79dde7fabc5c3af8af67c9117416fb
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 16:33:21 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 16:33:21 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ef94177

x11-libs/qscintilla: Stabilize 2.13.3 ppc, #878263

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.13.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.13.3.ebuild b/x11-libs/qscintilla/qscintilla-2.13.3.ebuild
index ca1f4183654b..30367f10c011 100644
--- a/x11-libs/qscintilla/qscintilla-2.13.3.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.13.3.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0/15"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~x86"
 IUSE="designer doc"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Andreas Sturmlechner]

commit:     29740ac48b011a7e9945fa61ea526ac2bfb4cdef
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 24 11:08:32 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 26 17:15:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29740ac4

x11-libs/qscintilla: add 2.13.3

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 x11-libs/qscintilla/Manifest                 |  1 +
 x11-libs/qscintilla/qscintilla-2.13.3.ebuild | 80 ++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 73c74d6856e9..43c913a0fa93 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1 +1,2 @@
 DIST QScintilla_src-2.13.1.tar.gz 3059819 BLAKE2B 147d61cea2d557da6d922599f826a62c4b216f3252226892076ff785a080c9de1fef199297156fce55a00006567240af45e2833e085e423ad47e29c4f9b2241e SHA512 edf7f358e188235d8a39a7d4a8332ca478460a65a8829d9cafcab8f22b84abcd8d624de2076d81a66a56d5a5c53edc6ecc223459bbbb8ac876c5befd8873f700
+DIST QScintilla_src-2.13.3.tar.gz 3060031 BLAKE2B e93dd884f630ef5f02fbf558ea8d9f94cfde1af03b811c8df9c3197ce9cadc430bf9727aec114ba118588effa5bc76166e3bda48800b6112edc8e8c598d72952 SHA512 be102fd6123fad0bc7f8de39080886369398889de48a4ec8873a0751890d7be1f238ae5194b71d31aac492e2881b6bf7885d9c06a2a47e36328780b47694f5b5

diff --git a/x11-libs/qscintilla/qscintilla-2.13.3.ebuild b/x11-libs/qscintilla/qscintilla-2.13.3.ebuild
new file mode 100644
index 000000000000..ca1f4183654b
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.13.3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 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 && local HTML_DOCS=( doc/html/. )
+	einstalldocs
+}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Andreas Sturmlechner]

commit:     2fdb2af3fba99df762104c5ae2ef6f803c90665d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 24 10:46:26 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 26 17:15:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fdb2af3

x11-libs/qscintilla: drop 2.11.6

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 x11-libs/qscintilla/Manifest                 |  1 -
 x11-libs/qscintilla/qscintilla-2.11.6.ebuild | 82 ----------------------------
 2 files changed, 83 deletions(-)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 8247ffec01ab..73c74d6856e9 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,2 +1 @@
-DIST QScintilla-2.11.6.tar.gz 3027764 BLAKE2B 1eb5d9ba44040cbff30e8b0028e164cf2aa86c565a5368890500614b9395dbe861c5cd268cf6a4ec06e2c7d77860b2ad6064bc3d07fd63a6ede2b060f44a7117 SHA512 8055d72a40f9f5a7d45c6592055c1b8eb5e5c50ce9e51673babd5e567c769d60c64d244ba5a7def5731a3120099e9528d01ed94327a06bb56ae2fa2e5e37b198
 DIST QScintilla_src-2.13.1.tar.gz 3059819 BLAKE2B 147d61cea2d557da6d922599f826a62c4b216f3252226892076ff785a080c9de1fef199297156fce55a00006567240af45e2833e085e423ad47e29c4f9b2241e SHA512 edf7f358e188235d8a39a7d4a8332ca478460a65a8829d9cafcab8f22b84abcd8d624de2076d81a66a56d5a5c53edc6ecc223459bbbb8ac876c5befd8873f700

diff --git a/x11-libs/qscintilla/qscintilla-2.11.6.ebuild b/x11-libs/qscintilla/qscintilla-2.11.6.ebuild
deleted file mode 100644
index dbdee4023339..000000000000
--- a/x11-libs/qscintilla/qscintilla-2.11.6.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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}-${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
-
-LICENSE="GPL-3"
-SLOT="0/15"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 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}"
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Sam James]

commit:     4c0fd5b712d57006ec9411a9e7b72aee5434c4d6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  1 05:24:34 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun  1 05:24:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c0fd5b7

x11-libs/qscintilla: Stabilize 2.13.1 arm, #825670

Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.13.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.13.1.ebuild b/x11-libs/qscintilla/qscintilla-2.13.1.ebuild
index c42fca13bde7..8dba82f8be1c 100644
--- a/x11-libs/qscintilla/qscintilla-2.13.1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.13.1.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0/15"
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86"
 IUSE="designer doc"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Sam James]

commit:     1fb41c5d1cff25a61cbf03129801c29028281331
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  1 05:24:28 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun  1 05:24:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fb41c5d

x11-libs/qscintilla: Stabilize 2.13.1 arm64, #825670

Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.13.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.13.1.ebuild b/x11-libs/qscintilla/qscintilla-2.13.1.ebuild
index d1d7d7a057b0..c42fca13bde7 100644
--- a/x11-libs/qscintilla/qscintilla-2.13.1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.13.1.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0/15"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~riscv x86"
 IUSE="designer doc"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Sam James]

commit:     612151170733805e969ba43a7e526a12919e7ca1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  1 02:28:59 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun  1 02:28:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61215117

x11-libs/qscintilla: Stabilize 2.13.1 ppc, #825670

Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.13.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.13.1.ebuild b/x11-libs/qscintilla/qscintilla-2.13.1.ebuild
index 4288e42c4412..d1d7d7a057b0 100644
--- a/x11-libs/qscintilla/qscintilla-2.13.1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.13.1.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0/15"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86"
 IUSE="designer doc"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Sam James]

commit:     ee9169ae9df767eb3e98e72ab0508e0c7e891420
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  1 01:55:41 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun  1 01:55:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee9169ae

x11-libs/qscintilla: Stabilize 2.13.1 amd64, #825670

Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.13.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.13.1.ebuild b/x11-libs/qscintilla/qscintilla-2.13.1.ebuild
index e603fdbde9a7..4288e42c4412 100644
--- a/x11-libs/qscintilla/qscintilla-2.13.1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.13.1.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0/15"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="designer doc"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Sam James]

commit:     c6af86ca1ab35056aa984668d225c509a4b02e63
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  1 01:55:25 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun  1 01:55:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6af86ca

x11-libs/qscintilla: Stabilize 2.13.1 x86, #825670

Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.13.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.13.1.ebuild b/x11-libs/qscintilla/qscintilla-2.13.1.ebuild
index 28e0c4e73dc6..e603fdbde9a7 100644
--- a/x11-libs/qscintilla/qscintilla-2.13.1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.13.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0/15"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="designer doc"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     303e1f7688320ccf0e7111dba0a66ffb70973822
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 22 03:01:50 2021 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Oct 22 03:01:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=303e1f76

x11-libs/qscintilla: remove 2.13.0

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 x11-libs/qscintilla/Manifest                 |  1 -
 x11-libs/qscintilla/qscintilla-2.13.0.ebuild | 80 ----------------------------
 2 files changed, 81 deletions(-)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 03c601dda00..8247ffec01a 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,3 +1,2 @@
 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

diff --git a/x11-libs/qscintilla/qscintilla-2.13.0.ebuild b/x11-libs/qscintilla/qscintilla-2.13.0.ebuild
deleted file mode 100644
index 28e0c4e73dc..00000000000
--- a/x11-libs/qscintilla/qscintilla-2.13.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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
-}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     de7a32bfccad194ec0231dc8af55cae1d10b2625
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 19 04:29:03 2021 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Oct 19 04:29:03 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de7a32bf

x11-libs/qscintilla: add 2.13.1

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 x11-libs/qscintilla/Manifest                 |  1 +
 x11-libs/qscintilla/qscintilla-2.13.1.ebuild | 80 ++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 31ba2a34aea..03c601dda00 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,2 +1,3 @@
 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

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 00000000000..28e0c4e73dc
--- /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
+}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Yixun Lan]

commit:     3528446d952ec80c92fdff1c97f103ab8ad5855a
Author:     Alex Fan <alexfanqi <AT> yahoo <DOT> com>
AuthorDate: Mon Oct 11 05:27:17 2021 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Mon Oct 11 22:20:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3528446d

x11-libs/qscintilla: keyword 2.13.0 for ~riscv

Signed-off-by: Alex Fan <alexfanqi <AT> yahoo.com>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.13.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.13.0.ebuild b/x11-libs/qscintilla/qscintilla-2.13.0.ebuild
index b724431bd16..28e0c4e73dc 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="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     bbaf944759f258ec5f1131de29ec0648a3101af1
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  4 01:06:13 2021 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Aug  4 01:06:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbaf9447

x11-libs/qscintilla: remove 2.11.5

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 x11-libs/qscintilla/Manifest                 |  1 -
 x11-libs/qscintilla/qscintilla-2.11.5.ebuild | 82 ----------------------------
 2 files changed, 83 deletions(-)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 05ed79dc77b..31ba2a34aea 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,3 +1,2 @@
-DIST QScintilla-2.11.5.tar.gz 3007564 BLAKE2B e1eb7794b2e09f7bbfebde69a7c62c1a952e36b95f9c7a38c3db0b6bbdab8d0bad4a6d780dc9bf9b5e8d64111046f1741c6710d8444504230ee0f4154ce0a304 SHA512 46bc3c896b4ab71fbcc821ce3a248ecc4200378e0b621adef8d39092f940928806c76abe529b7f27ce4280e7e49091d8cbeafe6f303ca85cf5675df2887fd99b
 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

diff --git a/x11-libs/qscintilla/qscintilla-2.11.5.ebuild b/x11-libs/qscintilla/qscintilla-2.11.5.ebuild
deleted file mode 100644
index 301812495e5..00000000000
--- a/x11-libs/qscintilla/qscintilla-2.11.5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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}-${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
-
-LICENSE="GPL-3"
-SLOT="0/15"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 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}"
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Sam James]

commit:     618f822504b3205b09f198831161c4886a4e92b5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 31 06:22:45 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 31 06:22:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=618f8225

x11-libs/qscintilla: Stabilize 2.11.6 arm, #803791

Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.11.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.11.6.ebuild b/x11-libs/qscintilla/qscintilla-2.11.6.ebuild
index fde73f65f6f..eac20e58ad2 100644
--- a/x11-libs/qscintilla/qscintilla-2.11.6.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.11.6.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0/15"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~x86"
 IUSE="designer doc"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Sam James]

commit:     73ab45670fc652c1cdb5b08416a2f3e72779b078
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 31 04:13:16 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 31 04:13:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73ab4567

x11-libs/qscintilla: Stabilize 2.11.6 amd64, #803791

Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.11.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.11.6.ebuild b/x11-libs/qscintilla/qscintilla-2.11.6.ebuild
index a6390060742..fde73f65f6f 100644
--- a/x11-libs/qscintilla/qscintilla-2.11.6.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.11.6.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0/15"
-KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~x86"
 IUSE="designer doc"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Agostino Sarubbo]

commit:     2cb412e71c2893229837976bedd8b29549c99d8e
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 30 15:13:40 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Jul 30 15:13:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cb412e7

x11-libs/qscintilla: ppc stable wrt bug #803791

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.11.6.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.11.6.ebuild b/x11-libs/qscintilla/qscintilla-2.11.6.ebuild
index 82d8a6e8e81..a6390060742 100644
--- a/x11-libs/qscintilla/qscintilla-2.11.6.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.11.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0/15"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~x86"
 IUSE="designer doc"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     35177b30c86601a8b3cf86c8a78c4ee0d861c04f
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  9 02:37:27 2021 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Jul  9 02:37:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35177b30

x11-libs/qscintilla: add 2.13.0

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 x11-libs/qscintilla/Manifest                 |  1 +
 x11-libs/qscintilla/qscintilla-2.13.0.ebuild | 80 ++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index da06d802b0b..b8bfcc53e06 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,3 +1,4 @@
 DIST QScintilla-2.11.5.tar.gz 3007564 BLAKE2B e1eb7794b2e09f7bbfebde69a7c62c1a952e36b95f9c7a38c3db0b6bbdab8d0bad4a6d780dc9bf9b5e8d64111046f1741c6710d8444504230ee0f4154ce0a304 SHA512 46bc3c896b4ab71fbcc821ce3a248ecc4200378e0b621adef8d39092f940928806c76abe529b7f27ce4280e7e49091d8cbeafe6f303ca85cf5675df2887fd99b
 DIST QScintilla-2.11.6.tar.gz 3027764 BLAKE2B 1eb5d9ba44040cbff30e8b0028e164cf2aa86c565a5368890500614b9395dbe861c5cd268cf6a4ec06e2c7d77860b2ad6064bc3d07fd63a6ede2b060f44a7117 SHA512 8055d72a40f9f5a7d45c6592055c1b8eb5e5c50ce9e51673babd5e567c769d60c64d244ba5a7def5731a3120099e9528d01ed94327a06bb56ae2fa2e5e37b198
 DIST QScintilla_src-2.12.1.tar.gz 3059045 BLAKE2B 500c4ec3109e09d07011fa6271721633d2a510ea672ac04a2d6c9d550b7dd7426d7b971e7c604856b818fdcd847dd466a82a8f1a84afd42f4f7164d325789ddd SHA512 7e96b2e909f2bbd0f56220e53a8aaa6e6816b84fb96c4e22e3815a2e0322a87006d7567a05ae6b2490e9d2c51ca7c130e7b64780a897682579419ffd3a53ee1b
+DIST QScintilla_src-2.13.0.tar.gz 3059601 BLAKE2B 8de5440c3019cb3f67ea25db2935dc8d8cd711298a8a49ce3f632937c538da5b8b337851c3f68c59eb3cb8df8396eebd8ac4f0b4d6d715c2519598eeda9b6586 SHA512 c72676e2d8463dde6e7c620e15a526eae056cfbf00bb5d013c315ebbf20340fcc79188c6e60c336679f7d18287066a26bdc96be2f1ef8a98b3adcada3ee09fd1

diff --git a/x11-libs/qscintilla/qscintilla-2.13.0.ebuild b/x11-libs/qscintilla/qscintilla-2.13.0.ebuild
new file mode 100644
index 00000000000..b724431bd16
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.13.0.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 ~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
+}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     14d47719487d5e81fc1aaacb8e0d4e6347e65f10
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  9 02:46:57 2021 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Jul  9 02:46:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14d47719

x11-libs/qscintilla: remove 2.12.1

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 x11-libs/qscintilla/Manifest                 |  1 -
 x11-libs/qscintilla/qscintilla-2.12.1.ebuild | 80 ----------------------------
 2 files changed, 81 deletions(-)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index b8bfcc53e06..05ed79dc77b 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,4 +1,3 @@
 DIST QScintilla-2.11.5.tar.gz 3007564 BLAKE2B e1eb7794b2e09f7bbfebde69a7c62c1a952e36b95f9c7a38c3db0b6bbdab8d0bad4a6d780dc9bf9b5e8d64111046f1741c6710d8444504230ee0f4154ce0a304 SHA512 46bc3c896b4ab71fbcc821ce3a248ecc4200378e0b621adef8d39092f940928806c76abe529b7f27ce4280e7e49091d8cbeafe6f303ca85cf5675df2887fd99b
 DIST QScintilla-2.11.6.tar.gz 3027764 BLAKE2B 1eb5d9ba44040cbff30e8b0028e164cf2aa86c565a5368890500614b9395dbe861c5cd268cf6a4ec06e2c7d77860b2ad6064bc3d07fd63a6ede2b060f44a7117 SHA512 8055d72a40f9f5a7d45c6592055c1b8eb5e5c50ce9e51673babd5e567c769d60c64d244ba5a7def5731a3120099e9528d01ed94327a06bb56ae2fa2e5e37b198
-DIST QScintilla_src-2.12.1.tar.gz 3059045 BLAKE2B 500c4ec3109e09d07011fa6271721633d2a510ea672ac04a2d6c9d550b7dd7426d7b971e7c604856b818fdcd847dd466a82a8f1a84afd42f4f7164d325789ddd SHA512 7e96b2e909f2bbd0f56220e53a8aaa6e6816b84fb96c4e22e3815a2e0322a87006d7567a05ae6b2490e9d2c51ca7c130e7b64780a897682579419ffd3a53ee1b
 DIST QScintilla_src-2.13.0.tar.gz 3059601 BLAKE2B 8de5440c3019cb3f67ea25db2935dc8d8cd711298a8a49ce3f632937c538da5b8b337851c3f68c59eb3cb8df8396eebd8ac4f0b4d6d715c2519598eeda9b6586 SHA512 c72676e2d8463dde6e7c620e15a526eae056cfbf00bb5d013c315ebbf20340fcc79188c6e60c336679f7d18287066a26bdc96be2f1ef8a98b3adcada3ee09fd1

diff --git a/x11-libs/qscintilla/qscintilla-2.12.1.ebuild b/x11-libs/qscintilla/qscintilla-2.12.1.ebuild
deleted file mode 100644
index c754ae717fe..00000000000
--- a/x11-libs/qscintilla/qscintilla-2.12.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~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
-}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     b3847dedc5d0355de8069672a293986dd1f5b4ef
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 23 19:57:09 2021 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jun 23 19:57:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3847ded

x11-libs/qscintilla: add 2.12.1

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 x11-libs/qscintilla/Manifest                 |  1 +
 x11-libs/qscintilla/qscintilla-2.12.1.ebuild | 80 ++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 0b3102843cf..da06d802b0b 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,2 +1,3 @@
 DIST QScintilla-2.11.5.tar.gz 3007564 BLAKE2B e1eb7794b2e09f7bbfebde69a7c62c1a952e36b95f9c7a38c3db0b6bbdab8d0bad4a6d780dc9bf9b5e8d64111046f1741c6710d8444504230ee0f4154ce0a304 SHA512 46bc3c896b4ab71fbcc821ce3a248ecc4200378e0b621adef8d39092f940928806c76abe529b7f27ce4280e7e49091d8cbeafe6f303ca85cf5675df2887fd99b
 DIST QScintilla-2.11.6.tar.gz 3027764 BLAKE2B 1eb5d9ba44040cbff30e8b0028e164cf2aa86c565a5368890500614b9395dbe861c5cd268cf6a4ec06e2c7d77860b2ad6064bc3d07fd63a6ede2b060f44a7117 SHA512 8055d72a40f9f5a7d45c6592055c1b8eb5e5c50ce9e51673babd5e567c769d60c64d244ba5a7def5731a3120099e9528d01ed94327a06bb56ae2fa2e5e37b198
+DIST QScintilla_src-2.12.1.tar.gz 3059045 BLAKE2B 500c4ec3109e09d07011fa6271721633d2a510ea672ac04a2d6c9d550b7dd7426d7b971e7c604856b818fdcd847dd466a82a8f1a84afd42f4f7164d325789ddd SHA512 7e96b2e909f2bbd0f56220e53a8aaa6e6816b84fb96c4e22e3815a2e0322a87006d7567a05ae6b2490e9d2c51ca7c130e7b64780a897682579419ffd3a53ee1b

diff --git a/x11-libs/qscintilla/qscintilla-2.12.1.ebuild b/x11-libs/qscintilla/qscintilla-2.12.1.ebuild
new file mode 100644
index 00000000000..c754ae717fe
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.12.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~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
+}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     b2bee5666026d6e0286f87e5d234d8b2c43e41ed
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 17 00:57:11 2020 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Dec 17 01:17:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2bee566

x11-libs/qscintilla: add 2.11.6

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 x11-libs/qscintilla/Manifest                 |  1 +
 x11-libs/qscintilla/qscintilla-2.11.6.ebuild | 82 ++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 1c9a8bd81f4..0b3102843cf 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1 +1,2 @@
 DIST QScintilla-2.11.5.tar.gz 3007564 BLAKE2B e1eb7794b2e09f7bbfebde69a7c62c1a952e36b95f9c7a38c3db0b6bbdab8d0bad4a6d780dc9bf9b5e8d64111046f1741c6710d8444504230ee0f4154ce0a304 SHA512 46bc3c896b4ab71fbcc821ce3a248ecc4200378e0b621adef8d39092f940928806c76abe529b7f27ce4280e7e49091d8cbeafe6f303ca85cf5675df2887fd99b
+DIST QScintilla-2.11.6.tar.gz 3027764 BLAKE2B 1eb5d9ba44040cbff30e8b0028e164cf2aa86c565a5368890500614b9395dbe861c5cd268cf6a4ec06e2c7d77860b2ad6064bc3d07fd63a6ede2b060f44a7117 SHA512 8055d72a40f9f5a7d45c6592055c1b8eb5e5c50ce9e51673babd5e567c769d60c64d244ba5a7def5731a3120099e9528d01ed94327a06bb56ae2fa2e5e37b198

diff --git a/x11-libs/qscintilla/qscintilla-2.11.6.ebuild b/x11-libs/qscintilla/qscintilla-2.11.6.ebuild
new file mode 100644
index 00000000000..82d8a6e8e81
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.11.6.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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}-${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
+
+LICENSE="GPL-3"
+SLOT="0/15"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~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}"
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Sam James]

commit:     66e2cc2471fe988e459e685fce901d3ee76b89be
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  7 17:49:50 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov  7 17:49:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66e2cc24

x11-libs/qscintilla: Stabilize 2.11.5 arm, #709830

Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.11.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.11.5.ebuild b/x11-libs/qscintilla/qscintilla-2.11.5.ebuild
index 311d5d5e55d..301812495e5 100644
--- a/x11-libs/qscintilla/qscintilla-2.11.5.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.11.5.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0/15"
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
 IUSE="designer doc"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Sam James]

commit:     ddedf07cba45fc329ca909689fd85f00a47a09dd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  6 05:21:20 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov  6 05:21:20 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddedf07c

x11-libs/qscintilla: Stabilize 2.11.5 arm64, #734482

Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.11.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.11.5.ebuild b/x11-libs/qscintilla/qscintilla-2.11.5.ebuild
index b6721fffe96..311d5d5e55d 100644
--- a/x11-libs/qscintilla/qscintilla-2.11.5.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.11.5.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0/15"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 x86"
 IUSE="designer doc"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     21c6022d2138523e0d81b28e140eaa6c47e706cf
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 00:32:15 2020 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 00:33:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21c6022d

x11-libs/qscintilla: remove 2.11.4

Package-Manager: Portage-3.0.3, Repoman-3.0.0
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 x11-libs/qscintilla/Manifest                 |  1 -
 x11-libs/qscintilla/qscintilla-2.11.4.ebuild | 82 ----------------------------
 2 files changed, 83 deletions(-)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index bf6d8725a2b..1c9a8bd81f4 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,2 +1 @@
-DIST QScintilla-2.11.4.tar.gz 3007719 BLAKE2B b0f88a15a3636a0056d3bdac6e5d5bb05a065461c7de7fe0d5ad1740e87ca78a47bc1fd1af90a8751b553e8e326c830088a4cb38c9ebcad6be8bf9ebdb49bad0 SHA512 90fc2427121ca9ae55e34cf636460099bbdadd844318d9ef05f86790a36e25fb64528264bb7bb99e46b7add96378eff0cc69bb692940c6a1bddfadf86a9abdbd
 DIST QScintilla-2.11.5.tar.gz 3007564 BLAKE2B e1eb7794b2e09f7bbfebde69a7c62c1a952e36b95f9c7a38c3db0b6bbdab8d0bad4a6d780dc9bf9b5e8d64111046f1741c6710d8444504230ee0f4154ce0a304 SHA512 46bc3c896b4ab71fbcc821ce3a248ecc4200378e0b621adef8d39092f940928806c76abe529b7f27ce4280e7e49091d8cbeafe6f303ca85cf5675df2887fd99b

diff --git a/x11-libs/qscintilla/qscintilla-2.11.4.ebuild b/x11-libs/qscintilla/qscintilla-2.11.4.ebuild
deleted file mode 100644
index b6721fffe96..00000000000
--- a/x11-libs/qscintilla/qscintilla-2.11.4.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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}-${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
-
-LICENSE="GPL-3"
-SLOT="0/15"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 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}"
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Sam James]

commit:     ccb919edbdcd320ed4633c26c950487be585667b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 00:19:34 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 00:19:38 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccb919ed

x11-libs/qscintilla: ppc stable (bug #734482)

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.11.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.11.5.ebuild b/x11-libs/qscintilla/qscintilla-2.11.5.ebuild
index 740916d1c6b..b6721fffe96 100644
--- a/x11-libs/qscintilla/qscintilla-2.11.5.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.11.5.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0/15"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="designer doc"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Agostino Sarubbo]

commit:     859f230697f35c36be0709457590ea088abc3450
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 18 11:14:00 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Aug 18 11:14:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=859f2306

x11-libs/qscintilla: amd64 stable wrt bug #734482

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.11.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.11.5.ebuild b/x11-libs/qscintilla/qscintilla-2.11.5.ebuild
index 82d8a6e8e81..a5307c93f0d 100644
--- a/x11-libs/qscintilla/qscintilla-2.11.5.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.11.5.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0/15"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="designer doc"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     de2d107dc27c4132002e066c90dc46c3bdc3e024
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 16 05:31:26 2020 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jun 16 05:47:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de2d107d

x11-libs/qscintilla: add 2.11.5

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 x11-libs/qscintilla/Manifest                 |  1 +
 x11-libs/qscintilla/qscintilla-2.11.5.ebuild | 82 ++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 384eaefb3f3..bf6d8725a2b 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1 +1,2 @@
 DIST QScintilla-2.11.4.tar.gz 3007719 BLAKE2B b0f88a15a3636a0056d3bdac6e5d5bb05a065461c7de7fe0d5ad1740e87ca78a47bc1fd1af90a8751b553e8e326c830088a4cb38c9ebcad6be8bf9ebdb49bad0 SHA512 90fc2427121ca9ae55e34cf636460099bbdadd844318d9ef05f86790a36e25fb64528264bb7bb99e46b7add96378eff0cc69bb692940c6a1bddfadf86a9abdbd
+DIST QScintilla-2.11.5.tar.gz 3007564 BLAKE2B e1eb7794b2e09f7bbfebde69a7c62c1a952e36b95f9c7a38c3db0b6bbdab8d0bad4a6d780dc9bf9b5e8d64111046f1741c6710d8444504230ee0f4154ce0a304 SHA512 46bc3c896b4ab71fbcc821ce3a248ecc4200378e0b621adef8d39092f940928806c76abe529b7f27ce4280e7e49091d8cbeafe6f303ca85cf5675df2887fd99b

diff --git a/x11-libs/qscintilla/qscintilla-2.11.5.ebuild b/x11-libs/qscintilla/qscintilla-2.11.5.ebuild
new file mode 100644
index 00000000000..82d8a6e8e81
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.11.5.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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}-${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
+
+LICENSE="GPL-3"
+SLOT="0/15"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~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}"
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     bb3935c11c8bfc1b415d1b8386e11da3130a9dae
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 26 18:38:40 2020 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Mar 26 18:38:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb3935c1

x11-libs/qscintilla: drop 2.11.3

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 x11-libs/qscintilla/Manifest                 |  1 -
 x11-libs/qscintilla/qscintilla-2.11.3.ebuild | 82 ----------------------------
 2 files changed, 83 deletions(-)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index fbcc8117a9d..384eaefb3f3 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,2 +1 @@
-DIST QScintilla-2.11.3.tar.gz 3006383 BLAKE2B 6238aaff44d6136a64e8c38e38c4886357eb72aa4067f54eda1e876040c41ebce8577e244b81a062e9020c4d142439f5612ca88055d0ba87172ff5b8893938d7 SHA512 83406ef2f425c6288fcac52b01417853186ba860e33e14b236801271e034c327cbb00817cb7247e98bafc1844aeff9f24ec4878ac8ec4bd52d0d2d9778f6b884
 DIST QScintilla-2.11.4.tar.gz 3007719 BLAKE2B b0f88a15a3636a0056d3bdac6e5d5bb05a065461c7de7fe0d5ad1740e87ca78a47bc1fd1af90a8751b553e8e326c830088a4cb38c9ebcad6be8bf9ebdb49bad0 SHA512 90fc2427121ca9ae55e34cf636460099bbdadd844318d9ef05f86790a36e25fb64528264bb7bb99e46b7add96378eff0cc69bb692940c6a1bddfadf86a9abdbd

diff --git a/x11-libs/qscintilla/qscintilla-2.11.3.ebuild b/x11-libs/qscintilla/qscintilla-2.11.3.ebuild
deleted file mode 100644
index f6b4a37b459..00000000000
--- a/x11-libs/qscintilla/qscintilla-2.11.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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}-${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
-
-LICENSE="GPL-3"
-SLOT="0/15"
-KEYWORDS="amd64 ~arm ppc ~ppc64 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}"
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Agostino Sarubbo]

commit:     d8a467b6b8f5cf04e4cbb5c605d74d8eacc4c2e4
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 22 10:37:27 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Mar 22 10:37:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8a467b6

x11-libs/qscintilla: x86 stable wrt bug #711000

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.11.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.11.4.ebuild b/x11-libs/qscintilla/qscintilla-2.11.4.ebuild
index ac6b3e83a11..b6721fffe96 100644
--- a/x11-libs/qscintilla/qscintilla-2.11.4.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.11.4.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0/15"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="designer doc"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Agostino Sarubbo]

commit:     49811956fc936569b1a5bfe000093a3d13383c0b
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 21 16:49:25 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Mar 21 16:49:25 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49811956

x11-libs/qscintilla: ppc stable wrt bug #711000

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.11.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.11.4.ebuild b/x11-libs/qscintilla/qscintilla-2.11.4.ebuild
index a5307c93f0d..ac6b3e83a11 100644
--- a/x11-libs/qscintilla/qscintilla-2.11.4.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.11.4.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0/15"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~x86"
 IUSE="designer doc"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Agostino Sarubbo]

commit:     14f6178c9a91fbeff57f5cbd4dc8cf3f0592698f
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 21 15:52:48 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Mar 21 15:52:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14f6178c

x11-libs/qscintilla: amd64 stable wrt bug #711000

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.11.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.11.4.ebuild b/x11-libs/qscintilla/qscintilla-2.11.4.ebuild
index 82d8a6e8e81..a5307c93f0d 100644
--- a/x11-libs/qscintilla/qscintilla-2.11.4.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.11.4.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0/15"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="designer doc"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Michał Górny]

commit:     5c97d4e825197d7f60e25b5506b27ebb2932a744
Author:     Roy Bamford <neddyseagoon <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  6 12:14:24 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Mar  7 15:10:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c97d4e8

x11-libs/qscintilla: added ~arm64

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Roy Bamford <neddyseagoon <AT> gentoo.org>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.11.4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.11.4.ebuild b/x11-libs/qscintilla/qscintilla-2.11.4.ebuild
index 9c5354a9b46..82d8a6e8e81 100644
--- a/x11-libs/qscintilla/qscintilla-2.11.4.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.11.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0/15"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="designer doc"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Michał Górny]

commit:     a1736a98831499ec19c74ba934d73f9faf00aa88
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 16 07:50:22 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 07:52:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1736a98

x11-libs/qscintilla: Remove python@ from maintainers

I really have no clue why python@ is here.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 x11-libs/qscintilla/metadata.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/x11-libs/qscintilla/metadata.xml b/x11-libs/qscintilla/metadata.xml
index 6ad0a76f00c..c0732c358c3 100644
--- a/x11-libs/qscintilla/metadata.xml
+++ b/x11-libs/qscintilla/metadata.xml
@@ -5,10 +5,6 @@
 		<email>qt@gentoo.org</email>
 		<name>Gentoo Qt Project</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
 	<use>
 		<flag name="designer">Build plugin for Qt Designer</flag>
 	</use>

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     c78733baefaa8a0055e4f09793ab373fef865433
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 11 19:25:36 2020 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jan 11 19:25:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c78733ba

x11-libs/qscintilla: remove 2.10.8

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 x11-libs/qscintilla/Manifest                 |  1 -
 x11-libs/qscintilla/qscintilla-2.10.8.ebuild | 77 ----------------------------
 2 files changed, 78 deletions(-)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index a1ce86f8e01..fbcc8117a9d 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,3 +1,2 @@
 DIST QScintilla-2.11.3.tar.gz 3006383 BLAKE2B 6238aaff44d6136a64e8c38e38c4886357eb72aa4067f54eda1e876040c41ebce8577e244b81a062e9020c4d142439f5612ca88055d0ba87172ff5b8893938d7 SHA512 83406ef2f425c6288fcac52b01417853186ba860e33e14b236801271e034c327cbb00817cb7247e98bafc1844aeff9f24ec4878ac8ec4bd52d0d2d9778f6b884
 DIST QScintilla-2.11.4.tar.gz 3007719 BLAKE2B b0f88a15a3636a0056d3bdac6e5d5bb05a065461c7de7fe0d5ad1740e87ca78a47bc1fd1af90a8751b553e8e326c830088a4cb38c9ebcad6be8bf9ebdb49bad0 SHA512 90fc2427121ca9ae55e34cf636460099bbdadd844318d9ef05f86790a36e25fb64528264bb7bb99e46b7add96378eff0cc69bb692940c6a1bddfadf86a9abdbd
-DIST QScintilla_gpl-2.10.8.tar.gz 2736054 BLAKE2B 4bc7a2bc1974f8e10a96b7716a8e35d4854e9eeb8040734f99b796bddd9679ee2539f6517743689f9d7deff9ce523cdbb2f77ccd65eaadfc947dcc7a1337d918 SHA512 c0a216737dbda6bc390225196b37a43e4884c9cd67e6e81fc1b1b952683fe88dbfe7caf3c66d94a378f37502e1f08cbdf788426248e73f5f66ec65982b7652b5

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 ee5c0e80625..00000000000
--- 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
-}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Agostino Sarubbo]

commit:     12308e26799f01a7be913816fddc8c244edfbc80
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 31 14:15:47 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Dec 31 14:15:47 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12308e26

x11-libs/qscintilla: ppc stable wrt bug #703284

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.11.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.11.3.ebuild b/x11-libs/qscintilla/qscintilla-2.11.3.ebuild
index 867a830151d..f6b4a37b459 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="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Agostino Sarubbo]

commit:     b9b7fdf4bdd95fbc64f0d959ffea52ccb557da9a
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 31 14:06:06 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Dec 31 14:06:06 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9b7fdf4

x11-libs/qscintilla: amd64 stable wrt bug #703284

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.11.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.11.3.ebuild b/x11-libs/qscintilla/qscintilla-2.11.3.ebuild
index 82843a17ae4..867a830151d 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="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Agostino Sarubbo]

commit:     a6820c74a2c52cd7abeadaf1800471b93cc3a4d7
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 31 14:02:07 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Dec 31 14:02:07 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6820c74

x11-libs/qscintilla: x86 stable wrt bug #703284

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.11.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.11.3.ebuild b/x11-libs/qscintilla/qscintilla-2.11.3.ebuild
index 9c5354a9b46..82843a17ae4 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="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     3c7d6659f90d34966687063772fb48d268862a3d
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 27 00:55:48 2019 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Dec 27 01:01:09 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c7d6659

x11-libs/qscintilla: add 2.11.4

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 x11-libs/qscintilla/Manifest                 |  1 +
 x11-libs/qscintilla/qscintilla-2.11.4.ebuild | 82 ++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index afe4c275980..a1ce86f8e01 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,2 +1,3 @@
 DIST QScintilla-2.11.3.tar.gz 3006383 BLAKE2B 6238aaff44d6136a64e8c38e38c4886357eb72aa4067f54eda1e876040c41ebce8577e244b81a062e9020c4d142439f5612ca88055d0ba87172ff5b8893938d7 SHA512 83406ef2f425c6288fcac52b01417853186ba860e33e14b236801271e034c327cbb00817cb7247e98bafc1844aeff9f24ec4878ac8ec4bd52d0d2d9778f6b884
+DIST QScintilla-2.11.4.tar.gz 3007719 BLAKE2B b0f88a15a3636a0056d3bdac6e5d5bb05a065461c7de7fe0d5ad1740e87ca78a47bc1fd1af90a8751b553e8e326c830088a4cb38c9ebcad6be8bf9ebdb49bad0 SHA512 90fc2427121ca9ae55e34cf636460099bbdadd844318d9ef05f86790a36e25fb64528264bb7bb99e46b7add96378eff0cc69bb692940c6a1bddfadf86a9abdbd
 DIST QScintilla_gpl-2.10.8.tar.gz 2736054 BLAKE2B 4bc7a2bc1974f8e10a96b7716a8e35d4854e9eeb8040734f99b796bddd9679ee2539f6517743689f9d7deff9ce523cdbb2f77ccd65eaadfc947dcc7a1337d918 SHA512 c0a216737dbda6bc390225196b37a43e4884c9cd67e6e81fc1b1b952683fe88dbfe7caf3c66d94a378f37502e1f08cbdf788426248e73f5f66ec65982b7652b5

diff --git a/x11-libs/qscintilla/qscintilla-2.11.4.ebuild b/x11-libs/qscintilla/qscintilla-2.11.4.ebuild
new file mode 100644
index 00000000000..9c5354a9b46
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.11.4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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}-${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
+
+LICENSE="GPL-3"
+SLOT="0/15"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~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}"
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     cc5c08824aed4d4abd1ce2d4a15cfc327274fa76
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 23 00:09:41 2019 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Dec 23 00:09:41 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc5c0882

x11-libs/qscintilla: drop 2.11.1

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 x11-libs/qscintilla/Manifest                 |  1 -
 x11-libs/qscintilla/qscintilla-2.11.1.ebuild | 82 ----------------------------
 2 files changed, 83 deletions(-)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index c9fd8e685d5..afe4c275980 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,3 +1,2 @@
 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

diff --git a/x11-libs/qscintilla/qscintilla-2.11.1.ebuild b/x11-libs/qscintilla/qscintilla-2.11.1.ebuild
deleted file mode 100644
index ae3d709bc0d..00000000000
--- a/x11-libs/qscintilla/qscintilla-2.11.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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}_gpl-${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
-
-LICENSE="GPL-3"
-SLOT="0/15"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~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}"
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     705d145edba63bf2896488d7337a4e214aaf1875
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  3 02:19:59 2019 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Dec  3 02:56:50 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=705d145e

x11-libs/qscintilla: add 2.11.3

Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 x11-libs/qscintilla/Manifest                 |  1 +
 x11-libs/qscintilla/qscintilla-2.11.3.ebuild | 82 ++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 3b4a37e043f..c9fd8e685d5 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,2 +1,3 @@
+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

diff --git a/x11-libs/qscintilla/qscintilla-2.11.3.ebuild b/x11-libs/qscintilla/qscintilla-2.11.3.ebuild
new file mode 100644
index 00000000000..9c5354a9b46
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.11.3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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}-${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
+
+LICENSE="GPL-3"
+SLOT="0/15"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~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}"
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     879269753404a2af2b9109a09872d05f26cf9f83
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 16 19:55:09 2019 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Nov 16 19:55:09 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87926975

x11-libs/qscintilla: remove changelog from metadata

Upstream stopped publishing it at a stable URL

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 x11-libs/qscintilla/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/x11-libs/qscintilla/metadata.xml b/x11-libs/qscintilla/metadata.xml
index 29b7f3248ad..6ad0a76f00c 100644
--- a/x11-libs/qscintilla/metadata.xml
+++ b/x11-libs/qscintilla/metadata.xml
@@ -17,7 +17,6 @@
 			<email>phil@riverbankcomputing.com</email>
 			<name>Phil Thompson</name>
 		</maintainer>
-		<changelog>https://www.riverbankcomputing.com/static/Downloads/QScintilla/ChangeLog</changelog>
 		<doc>https://www.riverbankcomputing.com/static/Docs/QScintilla/</doc>
 		<bugs-to>mailto:qscintilla@riverbankcomputing.com</bugs-to>
 	</upstream>

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     60deb392bb7477ec998b8b6cd29063063e3eab1b
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  3 01:14:23 2019 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Apr  3 01:14:23 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60deb392

x11-libs/qscintilla: use the new canonical SRC_URI

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.11.1.ebuild | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.11.1.ebuild b/x11-libs/qscintilla/qscintilla-2.11.1.ebuild
index 548fa9681dc..ae3d709bc0d 100644
--- a/x11-libs/qscintilla/qscintilla-2.11.1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.11.1.ebuild
@@ -5,25 +5,30 @@ EAPI=7
 
 inherit flag-o-matic qmake-utils
 
-MY_P=QScintilla_gpl-${PV/_pre/.dev}
-
 DESCRIPTION="Qt port of Neil Hodgson's Scintilla C++ editor control"
 HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
-SRC_URI="https://www.riverbankcomputing.com/static/Downloads/QScintilla/${MY_P}.tar.gz"
+
+MY_PN=QScintilla
+MY_P=${MY_PN}_gpl-${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
 
 LICENSE="GPL-3"
 SLOT="0/15"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="designer doc"
 
-DEPEND="
+RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtprintsupport:5
 	dev-qt/qtwidgets:5
 	designer? ( dev-qt/designer:5 )
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     7ee262df89d8cb95482d6522fbc457e1bd2ae357
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 21 20:46:06 2019 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 20:46:22 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ee262df

x11-libs/qscintilla: update metadata.xml

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 x11-libs/qscintilla/metadata.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-libs/qscintilla/metadata.xml b/x11-libs/qscintilla/metadata.xml
index 29550d86338..29b7f3248ad 100644
--- a/x11-libs/qscintilla/metadata.xml
+++ b/x11-libs/qscintilla/metadata.xml
@@ -17,8 +17,8 @@
 			<email>phil@riverbankcomputing.com</email>
 			<name>Phil Thompson</name>
 		</maintainer>
+		<changelog>https://www.riverbankcomputing.com/static/Downloads/QScintilla/ChangeLog</changelog>
+		<doc>https://www.riverbankcomputing.com/static/Docs/QScintilla/</doc>
 		<bugs-to>mailto:qscintilla@riverbankcomputing.com</bugs-to>
-		<doc>http://pyqt.sourceforge.net/Docs/QScintilla2/</doc>
-		<remote-id type="sourceforge">pyqt</remote-id>
 	</upstream>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     8ddb93f9db10d5256980b2009b42109fca9106ba
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 21 19:54:05 2019 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 20:30:25 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ddb93f9

x11-libs/qscintilla: add 2.11.1

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 x11-libs/qscintilla/Manifest                 |  1 +
 x11-libs/qscintilla/qscintilla-2.11.1.ebuild | 77 ++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index a3b924ad27c..3b4a37e043f 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1 +1,2 @@
 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

diff --git a/x11-libs/qscintilla/qscintilla-2.11.1.ebuild b/x11-libs/qscintilla/qscintilla-2.11.1.ebuild
new file mode 100644
index 00000000000..548fa9681dc
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.11.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 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="Qt port of Neil Hodgson's Scintilla C++ editor control"
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
+SRC_URI="https://www.riverbankcomputing.com/static/Downloads/QScintilla/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/15"
+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
+}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     742e7e6eabdfa263d6c1024004e7625912e65092
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 31 23:43:18 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Dec 31 23:44:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=742e7e6e

x11-libs/qscintilla: remove 2.10.4

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 x11-libs/qscintilla/Manifest                 |  1 -
 x11-libs/qscintilla/qscintilla-2.10.4.ebuild | 77 ----------------------------
 2 files changed, 78 deletions(-)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 692c9be04f5..a3b924ad27c 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,2 +1 @@
-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

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 087f92e548d..00000000000
--- 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
-}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     c24b7d7de9df570c445b77a4b2728ed33e9854bd
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 31 22:26:02 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Dec 31 22:26:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c24b7d7d

x11-libs/qscintilla: amd64 stable (bug #673690)

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.10.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.10.8.ebuild b/x11-libs/qscintilla/qscintilla-2.10.8.ebuild
index d3291e19719..ee5c0e80625 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="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Thomas Deutschmann]

commit:     0e8f60f98c36e6dafd4f0a82333259abe8605fc2
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 29 18:51:05 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Dec 29 19:12:14 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e8f60f9

x11-libs/qscintilla: x86 stable (bug #673690)

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.10.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.10.8.ebuild b/x11-libs/qscintilla/qscintilla-2.10.8.ebuild
index a43abd98ebe..d3291e19719 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="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Sergei Trofimovich]

commit:     38cccf36fbfd5674727eca988d4807caeda753de
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 25 19:46:15 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Dec 25 19:46:15 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38cccf36

x11-libs/qscintilla: stable 2.10.8 for ppc, bug #673690

Package-Manager: Portage-2.3.52, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.10.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.10.8.ebuild b/x11-libs/qscintilla/qscintilla-2.10.8.ebuild
index 45509318b94..a43abd98ebe 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="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     f035df035f8640ed7ea4685105f0e7dd21aef51d
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 15 20:28:49 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Dec 15 20:37:47 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f035df03

x11-libs/qscintilla: remove 2.10.7

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 x11-libs/qscintilla/Manifest                 |  1 -
 x11-libs/qscintilla/qscintilla-2.10.7.ebuild | 77 ----------------------------
 2 files changed, 78 deletions(-)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index c6fc7b5655a..692c9be04f5 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,3 +1,2 @@
 DIST QScintilla_gpl-2.10.4.tar.gz 2721322 BLAKE2B df50dd0a34db96dd57147ddc399d4a30751b1bb4922dc1b8b3c3c1989e810937dc8345f92128e8a606b1edc04fde4b930a424ab8344818c9899c8fe496793a77 SHA512 dee6684f68173784d098931554c839a30e129b89f980cd9704f818c44eb7023199bd3682e4b342091fa3e0ce577ec576d34046477bdd1d7fc58ca5dd2ba947a3
-DIST QScintilla_gpl-2.10.7.tar.gz 2734778 BLAKE2B 9fea764828e1c95ce842b06b06c45398b52669c0823a660bcd45a4af4a33a4a5b75b6349f84dc844e18d394c301bbb66f3485abd9f56a5c056d2b507b67a0148 SHA512 d5489a308da265f09c305128d9984b195c90003e52a55f5342c8ea50090392619425a0fc3df692aae0d09467d5b0b496b548eb31ff93cba97c9f4f406500007c
 DIST QScintilla_gpl-2.10.8.tar.gz 2736054 BLAKE2B 4bc7a2bc1974f8e10a96b7716a8e35d4854e9eeb8040734f99b796bddd9679ee2539f6517743689f9d7deff9ce523cdbb2f77ccd65eaadfc947dcc7a1337d918 SHA512 c0a216737dbda6bc390225196b37a43e4884c9cd67e6e81fc1b1b952683fe88dbfe7caf3c66d94a378f37502e1f08cbdf788426248e73f5f66ec65982b7652b5

diff --git a/x11-libs/qscintilla/qscintilla-2.10.7.ebuild b/x11-libs/qscintilla/qscintilla-2.10.7.ebuild
deleted file mode 100644
index aa76e891b48..00000000000
--- a/x11-libs/qscintilla/qscintilla-2.10.7.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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
-}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     b882109a21c4b89a4c1ad335aedda02783000261
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  7 18:14:02 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Oct  7 23:21:40 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b882109a

x11-libs/qscintilla: bump to 2.10.8

Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11

 x11-libs/qscintilla/Manifest                 |  1 +
 x11-libs/qscintilla/qscintilla-2.10.8.ebuild | 77 ++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 67300618010..c6fc7b5655a 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,2 +1,3 @@
 DIST QScintilla_gpl-2.10.4.tar.gz 2721322 BLAKE2B df50dd0a34db96dd57147ddc399d4a30751b1bb4922dc1b8b3c3c1989e810937dc8345f92128e8a606b1edc04fde4b930a424ab8344818c9899c8fe496793a77 SHA512 dee6684f68173784d098931554c839a30e129b89f980cd9704f818c44eb7023199bd3682e4b342091fa3e0ce577ec576d34046477bdd1d7fc58ca5dd2ba947a3
 DIST QScintilla_gpl-2.10.7.tar.gz 2734778 BLAKE2B 9fea764828e1c95ce842b06b06c45398b52669c0823a660bcd45a4af4a33a4a5b75b6349f84dc844e18d394c301bbb66f3485abd9f56a5c056d2b507b67a0148 SHA512 d5489a308da265f09c305128d9984b195c90003e52a55f5342c8ea50090392619425a0fc3df692aae0d09467d5b0b496b548eb31ff93cba97c9f4f406500007c
+DIST QScintilla_gpl-2.10.8.tar.gz 2736054 BLAKE2B 4bc7a2bc1974f8e10a96b7716a8e35d4854e9eeb8040734f99b796bddd9679ee2539f6517743689f9d7deff9ce523cdbb2f77ccd65eaadfc947dcc7a1337d918 SHA512 c0a216737dbda6bc390225196b37a43e4884c9cd67e6e81fc1b1b952683fe88dbfe7caf3c66d94a378f37502e1f08cbdf788426248e73f5f66ec65982b7652b5

diff --git a/x11-libs/qscintilla/qscintilla-2.10.8.ebuild b/x11-libs/qscintilla/qscintilla-2.10.8.ebuild
new file mode 100644
index 00000000000..45509318b94
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.10.8.ebuild
@@ -0,0 +1,77 @@
+# 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
+}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     b015e7b7c0e5931b4128e1a36b1b14e17e3616b2
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 25 18:23:24 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Aug 25 18:48:18 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b015e7b7

x11-libs/qscintilla: bump to 2.10.7, EAPI 7

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 x11-libs/qscintilla/Manifest                 |  1 +
 x11-libs/qscintilla/qscintilla-2.10.7.ebuild | 77 ++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 9726cb430a4..67300618010 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1 +1,2 @@
 DIST QScintilla_gpl-2.10.4.tar.gz 2721322 BLAKE2B df50dd0a34db96dd57147ddc399d4a30751b1bb4922dc1b8b3c3c1989e810937dc8345f92128e8a606b1edc04fde4b930a424ab8344818c9899c8fe496793a77 SHA512 dee6684f68173784d098931554c839a30e129b89f980cd9704f818c44eb7023199bd3682e4b342091fa3e0ce577ec576d34046477bdd1d7fc58ca5dd2ba947a3
+DIST QScintilla_gpl-2.10.7.tar.gz 2734778 BLAKE2B 9fea764828e1c95ce842b06b06c45398b52669c0823a660bcd45a4af4a33a4a5b75b6349f84dc844e18d394c301bbb66f3485abd9f56a5c056d2b507b67a0148 SHA512 d5489a308da265f09c305128d9984b195c90003e52a55f5342c8ea50090392619425a0fc3df692aae0d09467d5b0b496b548eb31ff93cba97c9f4f406500007c

diff --git a/x11-libs/qscintilla/qscintilla-2.10.7.ebuild b/x11-libs/qscintilla/qscintilla-2.10.7.ebuild
new file mode 100644
index 00000000000..aa76e891b48
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.10.7.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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
+}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     f1771c127812c289d94c6d6ca016af3ed978c33f
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 25 18:10:21 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Aug 25 18:11:05 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1771c12

x11-libs/qscintilla: remove 2.10.3

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 x11-libs/qscintilla/Manifest                 |  1 -
 x11-libs/qscintilla/qscintilla-2.10.3.ebuild | 77 ----------------------------
 2 files changed, 78 deletions(-)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 4f7edbb1cb0..9726cb430a4 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,2 +1 @@
-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

diff --git a/x11-libs/qscintilla/qscintilla-2.10.3.ebuild b/x11-libs/qscintilla/qscintilla-2.10.3.ebuild
deleted file mode 100644
index 087f92e548d..00000000000
--- a/x11-libs/qscintilla/qscintilla-2.10.3.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
-}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Sergei Trofimovich]

commit:     7ffe266cf016a2871d494175ea59f8b3984741e2
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 14 20:11:47 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Jul 14 20:11:47 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ffe266c

x11-libs/qscintilla: stable 2.10.4 for ppc, bug #659708

Bug: https://bugs.gentoo.org/659708
Package-Manager: Portage-2.3.42, Repoman-2.3.9
RepoMan-Options: --include-arches="ppc"

 x11-libs/qscintilla/qscintilla-2.10.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.10.4.ebuild b/x11-libs/qscintilla/qscintilla-2.10.4.ebuild
index 29852a22c94..087f92e548d 100644
--- a/x11-libs/qscintilla/qscintilla-2.10.4.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.10.4.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="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Mikle Kolyada]

commit:     aa934400660cd42ac1d15c73e60830226ca74751
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  9 14:01:32 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon Jul  9 14:01:32 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa934400

x11-libs/qscintilla: amd64 stable wrt bug #659708

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 x11-libs/qscintilla/qscintilla-2.10.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.10.4.ebuild b/x11-libs/qscintilla/qscintilla-2.10.4.ebuild
index e21f66bf760..29852a22c94 100644
--- a/x11-libs/qscintilla/qscintilla-2.10.4.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.10.4.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="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Thomas Deutschmann]

commit:     da6b603c58b14cbac392dcd67b1fdd766968cc01
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  6 13:37:38 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Jul  6 13:42:00 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da6b603c

x11-libs/qscintilla: x86 stable (bug #659708)

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 x11-libs/qscintilla/qscintilla-2.10.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.10.4.ebuild b/x11-libs/qscintilla/qscintilla-2.10.4.ebuild
index 1b74d6e2214..e21f66bf760 100644
--- a/x11-libs/qscintilla/qscintilla-2.10.4.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.10.4.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="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Andreas Sturmlechner]

commit:     6e56663ad2f11eb0e3c0032dee225f75725bf3e5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 26 03:27:52 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 26 03:30:00 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e56663a

x11-libs/qscintilla: Drop 2.10.{1,2} with Qt4-support

Closes: https://bugs.gentoo.org/634970
Package-Manager: Portage-2.3.28, Repoman-2.3.9

 x11-libs/qscintilla/Manifest                 |   2 -
 x11-libs/qscintilla/qscintilla-2.10.1.ebuild | 100 ---------------------------
 x11-libs/qscintilla/qscintilla-2.10.2.ebuild | 100 ---------------------------
 3 files changed, 202 deletions(-)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index b8473672244..4f7edbb1cb0 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,4 +1,2 @@
-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

diff --git a/x11-libs/qscintilla/qscintilla-2.10.1.ebuild b/x11-libs/qscintilla/qscintilla-2.10.1.ebuild
deleted file mode 100644
index 5c8d5a899dc..00000000000
--- a/x11-libs/qscintilla/qscintilla-2.10.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# 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.10.2.ebuild b/x11-libs/qscintilla/qscintilla-2.10.2.ebuild
deleted file mode 100644
index eb99746332b..00000000000
--- a/x11-libs/qscintilla/qscintilla-2.10.2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# 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
-}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Matt Turner]

commit:     7af3609e3fc6132d0ca7bad4b3e97d5c1d5f13f1
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 26 03:00:44 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 26 03:00:44 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7af3609e

x11-libs/qscintilla: Drop to ~ppc64, bug 652648

 x11-libs/qscintilla/qscintilla-2.10.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.10.1.ebuild b/x11-libs/qscintilla/qscintilla-2.10.1.ebuild
index 34580af5018..5c8d5a899dc 100644
--- a/x11-libs/qscintilla/qscintilla-2.10.1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.10.1.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="designer doc +qt4 qt5"
 
 REQUIRED_USE="|| ( qt4 qt5 )"

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     58840ce1bb38086e6d975a4ecadf3c0d2230a188
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 15 17:10:24 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Apr 15 17:16:21 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58840ce1

x11-libs/qscintilla: version bump

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 x11-libs/qscintilla/Manifest                 |  1 +
 x11-libs/qscintilla/qscintilla-2.10.4.ebuild | 77 ++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index feab45d9ae3..b8473672244 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,3 +1,4 @@
 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

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 00000000000..1b74d6e2214
--- /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
+}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Sergei Trofimovich]

commit:     c5e914ce149f4a1c8cfe199903e5c9d53304a3ff
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 15 14:40:13 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Apr 15 14:40:13 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5e914ce

x11-libs/qscintilla: stable 2.10.3 for ppc, bug #652648

Tested-by: ernsteiswuerfel
Package-Manager: Portage-2.3.28, Repoman-2.3.9
RepoMan-Options: --include-arches="ppc"

 x11-libs/qscintilla/qscintilla-2.10.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.10.3.ebuild b/x11-libs/qscintilla/qscintilla-2.10.3.ebuild
index 29852a22c94..087f92e548d 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="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Thomas Deutschmann]

commit:     af9f5228d3926c877b09a03027f03f40806224d5
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 12 19:03:09 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Apr 12 19:06:37 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af9f5228

x11-libs/qscintilla: x86 stable (bug #652648)

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 x11-libs/qscintilla/qscintilla-2.10.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.10.3.ebuild b/x11-libs/qscintilla/qscintilla-2.10.3.ebuild
index b921763859e..29852a22c94 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="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Aaron Bauman]

commit:     e50e0694c0d287801c69a3558adbacd53141e25a
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  6 15:50:19 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Apr  6 15:51:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e50e0694

x11-libs/qscintilla: amd64 stable

Bug: https://bugs.gentoo.org/652648
Package-Manager: Portage-2.3.28, Repoman-2.3.9

 x11-libs/qscintilla/qscintilla-2.10.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.10.3.ebuild b/x11-libs/qscintilla/qscintilla-2.10.3.ebuild
index 1b74d6e2214..b921763859e 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="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     11c793a048ad9be6641ca80f0489377163f0dab6
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  4 21:55:06 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Mar  4 22:15:59 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11c793a0

x11-libs/qscintilla: 2.10.3 version bump, dropping qt4 support

Bug: https://bugs.gentoo.org/634970
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 x11-libs/qscintilla/Manifest                 |  1 +
 x11-libs/qscintilla/qscintilla-2.10.3.ebuild | 77 ++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 1e4c660b045..feab45d9ae3 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/x11-libs/qscintilla/qscintilla-2.10.3.ebuild b/x11-libs/qscintilla/qscintilla-2.10.3.ebuild
new file mode 100644
index 00000000000..1b74d6e2214
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.10.3.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
+}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Andreas Sturmlechner]

commit:     438bdf60f5fb7c5a48a6cb9e924f5d61db514cd6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 20 17:04:27 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 27 23:57:24 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=438bdf60

x11-libs/qscintilla: Drop old

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 x11-libs/qscintilla/Manifest                |  1 -
 x11-libs/qscintilla/qscintilla-2.9.4.ebuild | 91 -----------------------------
 2 files changed, 92 deletions(-)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index e59930c4912..1e4c660b045 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,3 +1,2 @@
 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

diff --git a/x11-libs/qscintilla/qscintilla-2.9.4.ebuild b/x11-libs/qscintilla/qscintilla-2.9.4.ebuild
deleted file mode 100644
index 66c07763353..00000000000
--- a/x11-libs/qscintilla/qscintilla-2.9.4.ebuild
+++ /dev/null
@@ -1,91 +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 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
-}
-
-qsci_run_in() {
-	pushd "$1" >/dev/null || die
-	shift || die
-	"$@" || die
-	popd >/dev/null || die
-}
-
-src_configure() {
-	local my_eqmake=eqmake$(usex qt5 5 4)
-
-	qsci_run_in Qt4Qt5 ${my_eqmake}
-
-	if use designer; then
-		# prevent building against system version (bug 466120)
-		append-cxxflags -I../Qt4Qt5
-		append-ldflags -L../Qt4Qt5
-
-		qsci_run_in designer-Qt4Qt5 ${my_eqmake}
-	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
-
-	DOCS=( ChangeLog NEWS )
-	use doc && HTML_DOCS=( doc/html-Qt4Qt5/. )
-	einstalldocs
-}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Sergei Trofimovich]

commit:     af0fa038b31bd10088ece6544372b17b2ba40c21
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 26 19:15:31 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Nov 26 19:15:31 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af0fa038

x11-libs/qscintilla: stable 2.10.1 for ppc, bug #634838

Package-Manager: Portage-2.3.16, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc"

 x11-libs/qscintilla/qscintilla-2.10.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.10.1.ebuild b/x11-libs/qscintilla/qscintilla-2.10.1.ebuild
index f8defa7d568..34580af5018 100644
--- a/x11-libs/qscintilla/qscintilla-2.10.1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.10.1.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="designer doc +qt4 qt5"
 
 REQUIRED_USE="|| ( qt4 qt5 )"

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Sergei Trofimovich]

commit:     74db07481ec4b19f0e132a11f7e2f347c30eb389
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 26 11:24:57 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Nov 26 12:17:54 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74db0748

x11-libs/qscintilla: stable 2.10.1 for ppc64, bug #634838

Package-Manager: Portage-2.3.16, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc64"

 x11-libs/qscintilla/qscintilla-2.10.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.10.1.ebuild b/x11-libs/qscintilla/qscintilla-2.10.1.ebuild
index bf85437f8fc..f8defa7d568 100644
--- a/x11-libs/qscintilla/qscintilla-2.10.1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.10.1.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="designer doc +qt4 qt5"
 
 REQUIRED_USE="|| ( qt4 qt5 )"

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     287dea9b9366fc74326376803b026b08c7d2853c
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 25 00:47:42 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Nov 25 00:47:42 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=287dea9b

x11-libs/qscintilla: version bump

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 x11-libs/qscintilla/Manifest                 |   1 +
 x11-libs/qscintilla/qscintilla-2.10.2.ebuild | 100 +++++++++++++++++++++++++++
 2 files changed, 101 insertions(+)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 1215b911094..e59930c4912 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,2 +1,3 @@
 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

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 00000000000..eb99746332b
--- /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
+}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     18113a5c8bc4718063dfc94e3dc428192fc02d60
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 25 00:33:05 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Nov 25 00:33:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18113a5c

x11-libs/qscintilla: remove old

alpha is dropped to ~arch due to lack of stable reverse deps

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 x11-libs/qscintilla/Manifest                   |  3 +-
 x11-libs/qscintilla/qscintilla-2.9.2-r1.ebuild | 81 --------------------------
 2 files changed, 1 insertion(+), 83 deletions(-)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 4138c7636c8..1215b911094 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,3 +1,2 @@
-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.9.4.tar.gz 2557199 SHA256 8b3a23023e9f0573caed6f9cee86f898d87b768ee15b8c211a423783a4cfa4e6 SHA512 5a2eebbe523a0f2f1c7bc63ce5ee9cb8793a597d00eea5b638f18f90d6e798e92c281be23ee5e7072d5afced9e1fccb6ae51526a3623d373d57c3db64d026b16 WHIRLPOOL 68aacdcd0fc7102494ccae1f0ea3e222845bdd3f9bef603d89fe50d50dba6ac77471228a84c1c281a46ccf74bdb6902aa3bb21f89388ec5408bdde5876cf8655

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 c6c36a38c42..00000000000
--- 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
-}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Manuel Rüger]

commit:     f94cc428c804a691a4947a88dd58a76ab711d823
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 20 15:30:21 2017 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Mon Nov 20 15:41:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f94cc428

x11-libs/qscintilla: Stable on amd64

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 x11-libs/qscintilla/qscintilla-2.10.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.10.1.ebuild b/x11-libs/qscintilla/qscintilla-2.10.1.ebuild
index 1c0c6c6cb58..bf85437f8fc 100644
--- a/x11-libs/qscintilla/qscintilla-2.10.1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.10.1.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="designer doc +qt4 qt5"
 
 REQUIRED_USE="|| ( qt4 qt5 )"

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Sergei Trofimovich]

commit:     0ab283f00493ade0425a5c2aeadaa61c1275d410
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 30 07:18:20 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Sep 30 07:18:20 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ab283f0

x11-libs/qscintilla: stable 2.9.4 for ia64, bug #632348

Package-Manager: Portage-2.3.10, Repoman-2.3.3
RepoMan-Options: --include-arches="ia64"

 x11-libs/qscintilla/qscintilla-2.9.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.9.4.ebuild b/x11-libs/qscintilla/qscintilla-2.9.4.ebuild
index 2869655cdec..66c07763353 100644
--- a/x11-libs/qscintilla/qscintilla-2.9.4.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.9.4.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="designer doc +qt4 qt5"
 
 REQUIRED_USE="^^ ( qt4 qt5 )"

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     9116125d71a293126c6d680fc4f9f7a8d35623f7
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 19 18:33:52 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Aug 19 18:39:50 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9116125d

x11-libs/qscintilla: version bump

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 x11-libs/qscintilla/Manifest                                            | 2 +-
 .../qscintilla/{qscintilla-2.10.ebuild => qscintilla-2.10.1.ebuild}     | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 80af86f450c..4138c7636c8 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,3 +1,3 @@
-DIST QScintilla_gpl-2.10.tar.gz 2662004 SHA256 16be30577bc178470936c458551f2512cc068aff6e7a7de6ed244e28c045f6ec SHA512 fe33471de0807bc4e0d6b86e78eac70531a20c96b5c3269111d4c89eca7ccae5e55752fc2a5c8f20f37220a3ccfb6e9d7d718c02058dd8b40075d40da211a93b WHIRLPOOL 40973a8f925e7a2545b8960ad09547ea62ac7e67ac964a00f775dd62259f8cfe7420a7bfb18e4cfce83ecfa67af68a43742ebee36e89fa89e4bc9b6204601429
+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.9.4.tar.gz 2557199 SHA256 8b3a23023e9f0573caed6f9cee86f898d87b768ee15b8c211a423783a4cfa4e6 SHA512 5a2eebbe523a0f2f1c7bc63ce5ee9cb8793a597d00eea5b638f18f90d6e798e92c281be23ee5e7072d5afced9e1fccb6ae51526a3623d373d57c3db64d026b16 WHIRLPOOL 68aacdcd0fc7102494ccae1f0ea3e222845bdd3f9bef603d89fe50d50dba6ac77471228a84c1c281a46ccf74bdb6902aa3bb21f89388ec5408bdde5876cf8655

diff --git a/x11-libs/qscintilla/qscintilla-2.10.ebuild b/x11-libs/qscintilla/qscintilla-2.10.1.ebuild
similarity index 100%
rename from x11-libs/qscintilla/qscintilla-2.10.ebuild
rename to x11-libs/qscintilla/qscintilla-2.10.1.ebuild

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Agostino Sarubbo]

commit:     cbe57276ab31e91584ad1de45fe4dae08d90ae36
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri May 26 14:59:29 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri May 26 14:59:29 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbe57276

x11-libs/qscintilla: ppc64 stable wrt bug #617694

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.9.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.9.4.ebuild b/x11-libs/qscintilla/qscintilla-2.9.4.ebuild
index e0967feb517..2869655cdec 100644
--- a/x11-libs/qscintilla/qscintilla-2.9.4.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.9.4.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="designer doc +qt4 qt5"
 
 REQUIRED_USE="^^ ( qt4 qt5 )"

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Agostino Sarubbo]

commit:     965f9a19b443779ffe06d7809c2fa989027948c5
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri May 26 14:05:29 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri May 26 14:05:29 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=965f9a19

x11-libs/qscintilla: x86 stable wrt bug #617694

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.9.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.9.4.ebuild b/x11-libs/qscintilla/qscintilla-2.9.4.ebuild
index a3751682d7e..e0967feb517 100644
--- a/x11-libs/qscintilla/qscintilla-2.9.4.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.9.4.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="designer doc +qt4 qt5"
 
 REQUIRED_USE="^^ ( qt4 qt5 )"

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Agostino Sarubbo]

commit:     5486227c1048f700661966a1ff197b36d2d5da94
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed May 24 13:42:14 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed May 24 13:42:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5486227c

x11-libs/qscintilla: amd64 stable wrt bug #617694

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.9.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.9.4.ebuild b/x11-libs/qscintilla/qscintilla-2.9.4.ebuild
index fb3bd57127a..a3751682d7e 100644
--- a/x11-libs/qscintilla/qscintilla-2.9.4.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.9.4.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="designer doc +qt4 qt5"
 
 REQUIRED_USE="^^ ( qt4 qt5 )"

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Michael Weber]

commit:     1dd836b53540c7bf4c5c7cca455c61c0082a2562
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Tue May 23 23:24:00 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue May 23 23:25:42 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dd836b5

x11-libs/qscintilla: ppc stable (bug 617694).

Package-Manager: Portage-2.3.6, Repoman-2.3.2
RepoMan-Options: --include-arches="ppc"

 x11-libs/qscintilla/qscintilla-2.9.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.9.4.ebuild b/x11-libs/qscintilla/qscintilla-2.9.4.ebuild
index 6a19ae6ec60..fb3bd57127a 100644
--- a/x11-libs/qscintilla/qscintilla-2.9.4.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.9.4.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="designer doc +qt4 qt5"
 
 REQUIRED_USE="^^ ( qt4 qt5 )"

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     8be994b1f3693dbd80c081d4d4cddacca4615c2d
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 23 23:36:44 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Apr 23 23:37:09 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8be994b1

x11-libs/qscintilla: rename "nested" functions to prevent name clashes

In particular, install() vs. /usr/bin/install

Gentoo-Bug: 616246
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 x11-libs/qscintilla/qscintilla-2.10.ebuild | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.10.ebuild b/x11-libs/qscintilla/qscintilla-2.10.ebuild
index 95c0fb66750..eb99746332b 100644
--- a/x11-libs/qscintilla/qscintilla-2.10.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.10.ebuild
@@ -65,33 +65,34 @@ qsci_run_in() {
 
 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
 
-	configure() {
+	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 configure
+	multibuild_foreach_variant run_in_build_dir qsci_configure
 }
 
 src_compile() {
-	compile() {
+	qsci_compile() {
 		qsci_run_in Qt4Qt5 emake
 		use designer && qsci_run_in designer-Qt4Qt5 emake
 	}
-	multibuild_foreach_variant run_in_build_dir compile
+	multibuild_foreach_variant run_in_build_dir qsci_compile
 }
 
 src_install() {
-	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 install
+	multibuild_foreach_variant run_in_build_dir qsci_install
 
 	DOCS=( ChangeLog NEWS )
 	use doc && HTML_DOCS=( doc/html-Qt4Qt5/. )

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     5029d048170884b9f4051e6a9c3b81ed3b5b9fcd
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 26 01:50:53 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Feb 26 01:50:53 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5029d048

x11-libs/qscintilla: version bump (p.masked)

Finally supports side-by-side installation of qt4 and qt5 variants.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 x11-libs/qscintilla/Manifest               |   1 +
 x11-libs/qscintilla/qscintilla-2.10.ebuild | 100 +++++++++++++++++++++++++++++
 2 files changed, 101 insertions(+)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 7bebb5af12..80af86f450 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,2 +1,3 @@
+DIST QScintilla_gpl-2.10.tar.gz 2662004 SHA256 16be30577bc178470936c458551f2512cc068aff6e7a7de6ed244e28c045f6ec SHA512 fe33471de0807bc4e0d6b86e78eac70531a20c96b5c3269111d4c89eca7ccae5e55752fc2a5c8f20f37220a3ccfb6e9d7d718c02058dd8b40075d40da211a93b WHIRLPOOL 40973a8f925e7a2545b8960ad09547ea62ac7e67ac964a00f775dd62259f8cfe7420a7bfb18e4cfce83ecfa67af68a43742ebee36e89fa89e4bc9b6204601429
 DIST QScintilla_gpl-2.9.2.tar.gz 2491222 SHA256 f2c8ccdc9d3dbb90764ceed53ea096da9bb13b6260da1324e6ab4ecea29e620a SHA512 28f88111d7eb6a016a4b87f04d2b7f5d6481b521a3361a526b3b45a56240f5c8de10310e819234fcba773c6df73bf398ae2dce622976a8e760f506be1defb7c8 WHIRLPOOL a04420c66fd417e5304c92a1ee3c1998f6849bccb9088dae96ed48c06cab0a9b1c012f073aafb1e05aaee46564de9ac89ae07145f3ded35cf47beac78065650a
 DIST QScintilla_gpl-2.9.4.tar.gz 2557199 SHA256 8b3a23023e9f0573caed6f9cee86f898d87b768ee15b8c211a423783a4cfa4e6 SHA512 5a2eebbe523a0f2f1c7bc63ce5ee9cb8793a597d00eea5b638f18f90d6e798e92c281be23ee5e7072d5afced9e1fccb6ae51526a3623d373d57c3db64d026b16 WHIRLPOOL 68aacdcd0fc7102494ccae1f0ea3e222845bdd3f9bef603d89fe50d50dba6ac77471228a84c1c281a46ccf74bdb6902aa3bb21f89388ec5408bdde5876cf8655

diff --git a/x11-libs/qscintilla/qscintilla-2.10.ebuild b/x11-libs/qscintilla/qscintilla-2.10.ebuild
new file mode 100644
index 0000000000..0a2c0de126
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.10.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+
+	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 configure
+}
+
+src_compile() {
+	compile() {
+		qsci_run_in Qt4Qt5 emake
+		use designer && qsci_run_in designer-Qt4Qt5 emake
+	}
+	multibuild_foreach_variant run_in_build_dir compile
+}
+
+src_install() {
+	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 install
+
+	DOCS=( ChangeLog NEWS )
+	use doc && HTML_DOCS=( doc/html-Qt4Qt5/. )
+	einstalldocs
+}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     009e2238148b7b0a235be91d13c4fcef2be1cf25
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 25 00:53:56 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jan 25 00:53:56 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=009e2238

x11-libs/qscintilla: use https in HOMEPAGE

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 x11-libs/qscintilla/qscintilla-2.9.2-r1.ebuild | 2 +-
 x11-libs/qscintilla/qscintilla-2.9.4.ebuild    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.9.2-r1.ebuild b/x11-libs/qscintilla/qscintilla-2.9.2-r1.ebuild
index 94a3e05..dde3265 100644
--- a/x11-libs/qscintilla/qscintilla-2.9.2-r1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.9.2-r1.ebuild
@@ -9,7 +9,7 @@ inherit flag-o-matic qmake-utils
 MY_P=QScintilla_gpl-${PV}
 
 DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class"
-HOMEPAGE="http://www.riverbankcomputing.com/software/qscintilla/intro"
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
 SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"

diff --git a/x11-libs/qscintilla/qscintilla-2.9.4.ebuild b/x11-libs/qscintilla/qscintilla-2.9.4.ebuild
index d63f3e1..7c3758c 100644
--- a/x11-libs/qscintilla/qscintilla-2.9.4.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -9,7 +9,7 @@ inherit flag-o-matic qmake-utils
 MY_P=QScintilla_gpl-${PV}
 
 DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class"
-HOMEPAGE="http://www.riverbankcomputing.com/software/qscintilla/intro"
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
 SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Michael Palimaka]

commit:     425fa09ddecf328d9bcc596caf18d4cc7873c008
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  1 14:19:45 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jan  1 14:20:30 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=425fa09d

x11-libs/qscintilla: remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 x11-libs/qscintilla/Manifest                   |  2 -
 x11-libs/qscintilla/qscintilla-2.8.4-r2.ebuild | 91 -------------------------
 x11-libs/qscintilla/qscintilla-2.9.3-r1.ebuild | 82 -----------------------
 x11-libs/qscintilla/qscintilla-2.9.3-r2.ebuild | 92 --------------------------
 4 files changed, 267 deletions(-)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 3f4483f..7bebb5a 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,4 +1,2 @@
-DIST QScintilla-gpl-2.8.4.tar.gz 3031919 SHA256 9b7b2d7440cc39736bbe937b853506b3bd218af3b79095d4f710cccb0fabe80f SHA512 ab10dc756231b293ddebc06e681bb65a11b2be2a4c4132a5b2a27ca583adef76af325fa95748888d9091f2e89a30494d370df262c4eaba7b7fbed04fb7c76907 WHIRLPOOL 7357addbc0ad8869c5749a67106c18e47d79e32399416cc2867461fa8ad0c662711b8937987cb7c3cd5b83fe9f88e1529911eefec28a972e86c7f242c8c0d634
 DIST QScintilla_gpl-2.9.2.tar.gz 2491222 SHA256 f2c8ccdc9d3dbb90764ceed53ea096da9bb13b6260da1324e6ab4ecea29e620a SHA512 28f88111d7eb6a016a4b87f04d2b7f5d6481b521a3361a526b3b45a56240f5c8de10310e819234fcba773c6df73bf398ae2dce622976a8e760f506be1defb7c8 WHIRLPOOL a04420c66fd417e5304c92a1ee3c1998f6849bccb9088dae96ed48c06cab0a9b1c012f073aafb1e05aaee46564de9ac89ae07145f3ded35cf47beac78065650a
-DIST QScintilla_gpl-2.9.3.tar.gz 2503568 SHA256 98aab93d73b05635867c2fc757acb383b5856a0b416e3fd7659f1879996ddb7e SHA512 43c0edb91b7cf31f4cca71aae54d7bfea8ee66e296c0e99b694069eeedf394762b8a670952debfa2671363fd8ab5c46dd7a7da60e8f1234406a12d12afa503ab WHIRLPOOL 4a46b6cf38486d1642ad8899fc986272ddbffc33e2cb2e60e9f74c56a014c22fabdbf0f24e434cf386a9463fb82b30987d554a1419d606e152e785c3286ae063
 DIST QScintilla_gpl-2.9.4.tar.gz 2557199 SHA256 8b3a23023e9f0573caed6f9cee86f898d87b768ee15b8c211a423783a4cfa4e6 SHA512 5a2eebbe523a0f2f1c7bc63ce5ee9cb8793a597d00eea5b638f18f90d6e798e92c281be23ee5e7072d5afced9e1fccb6ae51526a3623d373d57c3db64d026b16 WHIRLPOOL 68aacdcd0fc7102494ccae1f0ea3e222845bdd3f9bef603d89fe50d50dba6ac77471228a84c1c281a46ccf74bdb6902aa3bb21f89388ec5408bdde5876cf8655

diff --git a/x11-libs/qscintilla/qscintilla-2.8.4-r2.ebuild b/x11-libs/qscintilla/qscintilla-2.8.4-r2.ebuild
deleted file mode 100644
index 0d86621..00000000
--- a/x11-libs/qscintilla/qscintilla-2.8.4-r2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit flag-o-matic qmake-utils
-
-MY_P=QScintilla-gpl-${PV}
-
-DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class"
-HOMEPAGE="http://www.riverbankcomputing.com/software/qscintilla/intro"
-SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0/11"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="designer doc +qt4"
-
-DEPEND="
-	>=dev-qt/qtcore-4.8.5:4
-	>=dev-qt/qtgui-4.8.5:4
-	designer? ( >=dev-qt/designer-4.8.5: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
-}
-
-src_configure() {
-	pushd Qt4Qt5 > /dev/null
-	eqmake4
-	popd > /dev/null
-
-	if use designer; then
-		# prevent building against system version (bug 466120)
-		append-cxxflags -I../Qt4Qt5
-		append-ldflags -L../Qt4Qt5
-
-		pushd designer-Qt4Qt5 > /dev/null
-		eqmake4
-		popd > /dev/null
-	fi
-}
-
-src_compile() {
-	pushd Qt4Qt5 > /dev/null
-	emake
-	popd > /dev/null
-
-	if use designer; then
-		pushd designer-Qt4Qt5 > /dev/null
-		emake
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	pushd Qt4Qt5 > /dev/null
-	emake INSTALL_ROOT="${D}" install
-	popd > /dev/null
-
-	if use designer; then
-		pushd designer-Qt4Qt5 > /dev/null
-		emake INSTALL_ROOT="${D}" install
-		popd > /dev/null
-	fi
-
-	dodoc NEWS
-
-	if use doc; then
-		docinto html
-		dodoc -r doc/html-Qt4Qt5/*
-	fi
-}

diff --git a/x11-libs/qscintilla/qscintilla-2.9.3-r1.ebuild b/x11-libs/qscintilla/qscintilla-2.9.3-r1.ebuild
deleted file mode 100644
index a73439a..00000000
--- a/x11-libs/qscintilla/qscintilla-2.9.3-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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="http://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
-}

diff --git a/x11-libs/qscintilla/qscintilla-2.9.3-r2.ebuild b/x11-libs/qscintilla/qscintilla-2.9.3-r2.ebuild
deleted file mode 100644
index d63f3e1..00000000
--- a/x11-libs/qscintilla/qscintilla-2.9.3-r2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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="http://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 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
-}
-
-qsci_run_in() {
-	pushd "$1" >/dev/null || die
-	shift || die
-	"$@" || die
-	popd >/dev/null || die
-}
-
-src_configure() {
-	local my_eqmake=eqmake$(usex qt5 5 4)
-
-	qsci_run_in Qt4Qt5 ${my_eqmake}
-
-	if use designer; then
-		# prevent building against system version (bug 466120)
-		append-cxxflags -I../Qt4Qt5
-		append-ldflags -L../Qt4Qt5
-
-		qsci_run_in designer-Qt4Qt5 ${my_eqmake}
-	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
-
-	DOCS=( ChangeLog NEWS )
-	use doc && HTML_DOCS=( doc/html-Qt4Qt5/. )
-	einstalldocs
-}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Andrey Grozin]

commit:     b230556f4170b37579061e4be750f69f73011a3a
Author:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 31 06:02:22 2016 +0000
Commit:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Sat Dec 31 06:02:22 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b230556f

x11-libs/qscintilla: bump to 2.9.4

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 x11-libs/qscintilla/Manifest                |  1 +
 x11-libs/qscintilla/qscintilla-2.9.4.ebuild | 92 +++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index ad29ccd..3f4483f 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,3 +1,4 @@
 DIST QScintilla-gpl-2.8.4.tar.gz 3031919 SHA256 9b7b2d7440cc39736bbe937b853506b3bd218af3b79095d4f710cccb0fabe80f SHA512 ab10dc756231b293ddebc06e681bb65a11b2be2a4c4132a5b2a27ca583adef76af325fa95748888d9091f2e89a30494d370df262c4eaba7b7fbed04fb7c76907 WHIRLPOOL 7357addbc0ad8869c5749a67106c18e47d79e32399416cc2867461fa8ad0c662711b8937987cb7c3cd5b83fe9f88e1529911eefec28a972e86c7f242c8c0d634
 DIST QScintilla_gpl-2.9.2.tar.gz 2491222 SHA256 f2c8ccdc9d3dbb90764ceed53ea096da9bb13b6260da1324e6ab4ecea29e620a SHA512 28f88111d7eb6a016a4b87f04d2b7f5d6481b521a3361a526b3b45a56240f5c8de10310e819234fcba773c6df73bf398ae2dce622976a8e760f506be1defb7c8 WHIRLPOOL a04420c66fd417e5304c92a1ee3c1998f6849bccb9088dae96ed48c06cab0a9b1c012f073aafb1e05aaee46564de9ac89ae07145f3ded35cf47beac78065650a
 DIST QScintilla_gpl-2.9.3.tar.gz 2503568 SHA256 98aab93d73b05635867c2fc757acb383b5856a0b416e3fd7659f1879996ddb7e SHA512 43c0edb91b7cf31f4cca71aae54d7bfea8ee66e296c0e99b694069eeedf394762b8a670952debfa2671363fd8ab5c46dd7a7da60e8f1234406a12d12afa503ab WHIRLPOOL 4a46b6cf38486d1642ad8899fc986272ddbffc33e2cb2e60e9f74c56a014c22fabdbf0f24e434cf386a9463fb82b30987d554a1419d606e152e785c3286ae063
+DIST QScintilla_gpl-2.9.4.tar.gz 2557199 SHA256 8b3a23023e9f0573caed6f9cee86f898d87b768ee15b8c211a423783a4cfa4e6 SHA512 5a2eebbe523a0f2f1c7bc63ce5ee9cb8793a597d00eea5b638f18f90d6e798e92c281be23ee5e7072d5afced9e1fccb6ae51526a3623d373d57c3db64d026b16 WHIRLPOOL 68aacdcd0fc7102494ccae1f0ea3e222845bdd3f9bef603d89fe50d50dba6ac77471228a84c1c281a46ccf74bdb6902aa3bb21f89388ec5408bdde5876cf8655

diff --git a/x11-libs/qscintilla/qscintilla-2.9.4.ebuild b/x11-libs/qscintilla/qscintilla-2.9.4.ebuild
new file mode 100644
index 00000000..d63f3e1
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.9.4.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://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 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
+}
+
+qsci_run_in() {
+	pushd "$1" >/dev/null || die
+	shift || die
+	"$@" || die
+	popd >/dev/null || die
+}
+
+src_configure() {
+	local my_eqmake=eqmake$(usex qt5 5 4)
+
+	qsci_run_in Qt4Qt5 ${my_eqmake}
+
+	if use designer; then
+		# prevent building against system version (bug 466120)
+		append-cxxflags -I../Qt4Qt5
+		append-ldflags -L../Qt4Qt5
+
+		qsci_run_in designer-Qt4Qt5 ${my_eqmake}
+	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
+
+	DOCS=( ChangeLog NEWS )
+	use doc && HTML_DOCS=( doc/html-Qt4Qt5/. )
+	einstalldocs
+}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     23e8605d6f88d48559c0921dfbe4126245e9d53d
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 23 01:23:41 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Dec 23 01:23:41 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23e8605d

x11-libs/qscintilla: code style

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 x11-libs/qscintilla/qscintilla-2.9.3-r2.ebuild | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.9.3-r2.ebuild b/x11-libs/qscintilla/qscintilla-2.9.3-r2.ebuild
index f4626d9..d63f3e1 100644
--- a/x11-libs/qscintilla/qscintilla-2.9.3-r2.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.9.3-r2.ebuild
@@ -19,7 +19,7 @@ IUSE="designer doc +qt4 qt5"
 
 REQUIRED_USE="^^ ( qt4 qt5 )"
 
-RDEPEND="
+DEPEND="
 	qt4? (
 		dev-qt/qtcore:4
 		dev-qt/qtgui:4
@@ -31,8 +31,9 @@ RDEPEND="
 		dev-qt/qtprintsupport:5
 		dev-qt/qtwidgets:5
 		designer? ( dev-qt/designer:5 )
-	)"
-DEPEND="${RDEPEND}"
+	)
+"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
@@ -62,14 +63,15 @@ qsci_run_in() {
 
 src_configure() {
 	local my_eqmake=eqmake$(usex qt5 5 4)
-	qsci_run_in Qt4Qt5 $my_eqmake
+
+	qsci_run_in Qt4Qt5 ${my_eqmake}
 
 	if use designer; then
 		# prevent building against system version (bug 466120)
 		append-cxxflags -I../Qt4Qt5
 		append-ldflags -L../Qt4Qt5
 
-		qsci_run_in designer-Qt4Qt5 $my_eqmake
+		qsci_run_in designer-Qt4Qt5 ${my_eqmake}
 	fi
 }
 
@@ -84,6 +86,7 @@ src_install() {
 
 	use designer && qsci_run_in designer-Qt4Qt5 emake INSTALL_ROOT="${D}" install
 
+	DOCS=( ChangeLog NEWS )
 	use doc && HTML_DOCS=( doc/html-Qt4Qt5/. )
 	einstalldocs
 }

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[David Seifert]

commit:     5445db343d15bf741f107fc6e65112f4696ecc82
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 22 17:46:36 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 18:25:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5445db34

x11-libs/qscintilla: Make Qt5 compatible

Gentoo-bug: 541604

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3188

 ...-2.8.4-r1.ebuild => qscintilla-2.8.4-r2.ebuild} |  4 +--
 ...lla-2.9.2.ebuild => qscintilla-2.9.2-r1.ebuild} |  2 +-
 ...lla-2.9.3.ebuild => qscintilla-2.9.3-r1.ebuild} |  2 +-
 ...lla-2.9.3.ebuild => qscintilla-2.9.3-r2.ebuild} | 39 +++++++++++++---------
 4 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.8.4-r1.ebuild b/x11-libs/qscintilla/qscintilla-2.8.4-r2.ebuild
similarity index 96%
rename from x11-libs/qscintilla/qscintilla-2.8.4-r1.ebuild
rename to x11-libs/qscintilla/qscintilla-2.8.4-r2.ebuild
index 9c5ece9..0d86621 100644
--- a/x11-libs/qscintilla/qscintilla-2.8.4-r1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.8.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0/11"
 KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="designer doc"
+IUSE="designer doc +qt4"
 
 DEPEND="
 	>=dev-qt/qtcore-4.8.5:4

diff --git a/x11-libs/qscintilla/qscintilla-2.9.2.ebuild b/x11-libs/qscintilla/qscintilla-2.9.2-r1.ebuild
similarity index 98%
rename from x11-libs/qscintilla/qscintilla-2.9.2.ebuild
rename to x11-libs/qscintilla/qscintilla-2.9.2-r1.ebuild
index 5440631..caf9749 100644
--- a/x11-libs/qscintilla/qscintilla-2.9.2.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.9.2-r1.ebuild
@@ -15,7 +15,7 @@ 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"
+IUSE="designer doc +qt4"
 
 DEPEND="
 	dev-qt/qtcore:4

diff --git a/x11-libs/qscintilla/qscintilla-2.9.3.ebuild b/x11-libs/qscintilla/qscintilla-2.9.3-r1.ebuild
similarity index 98%
copy from x11-libs/qscintilla/qscintilla-2.9.3.ebuild
copy to x11-libs/qscintilla/qscintilla-2.9.3-r1.ebuild
index 103e457..a73439a 100644
--- a/x11-libs/qscintilla/qscintilla-2.9.3.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.9.3-r1.ebuild
@@ -15,7 +15,7 @@ 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"
+IUSE="designer doc +qt4"
 
 DEPEND="
 	dev-qt/qtcore:4

diff --git a/x11-libs/qscintilla/qscintilla-2.9.3.ebuild b/x11-libs/qscintilla/qscintilla-2.9.3-r2.ebuild
similarity index 76%
rename from x11-libs/qscintilla/qscintilla-2.9.3.ebuild
rename to x11-libs/qscintilla/qscintilla-2.9.3-r2.ebuild
index 103e457..f4626d9 100644
--- a/x11-libs/qscintilla/qscintilla-2.9.3.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.9.3-r2.ebuild
@@ -15,14 +15,24 @@ 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"
-
-DEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	designer? ( dev-qt/designer:4 )
-"
-RDEPEND="${DEPEND}"
+IUSE="designer doc +qt4 qt5"
+
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+RDEPEND="
+	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 )
+	)"
+DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
@@ -51,14 +61,15 @@ qsci_run_in() {
 }
 
 src_configure() {
-	qsci_run_in Qt4Qt5 eqmake4
+	local my_eqmake=eqmake$(usex qt5 5 4)
+	qsci_run_in Qt4Qt5 $my_eqmake
 
 	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
+		qsci_run_in designer-Qt4Qt5 $my_eqmake
 	fi
 }
 
@@ -73,10 +84,6 @@ src_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
+	use doc && HTML_DOCS=( doc/html-Qt4Qt5/. )
+	einstalldocs
 }

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Jeroen Roovers]

commit:     b1c7ab9cdffecc427d485a8a269d12129db7eca6
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  2 10:07:13 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Oct  2 10:07:13 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1c7ab9c

x11-libs/qscintilla: Stable for PPC64 (bug #552122).

Package-Manager: portage-2.3.1
RepoMan-Options: --ignore-arches

 x11-libs/qscintilla/qscintilla-2.9.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.9.2.ebuild b/x11-libs/qscintilla/qscintilla-2.9.2.ebuild
index d451398..5440631 100644
--- a/x11-libs/qscintilla/qscintilla-2.9.2.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.9.2.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="alpha amd64 ~arm ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="designer doc"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     66b5adb450583a806f77643ac2ee214c7c1cd567
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 27 09:22:39 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jul 27 09:22:39 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66b5adb4

x11-libs/qscintilla: version bump

Package-Manager: portage-2.3.0

 x11-libs/qscintilla/Manifest                |  1 +
 x11-libs/qscintilla/qscintilla-2.9.3.ebuild | 82 +++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 5b3e5c4..ad29ccd 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,2 +1,3 @@
 DIST QScintilla-gpl-2.8.4.tar.gz 3031919 SHA256 9b7b2d7440cc39736bbe937b853506b3bd218af3b79095d4f710cccb0fabe80f SHA512 ab10dc756231b293ddebc06e681bb65a11b2be2a4c4132a5b2a27ca583adef76af325fa95748888d9091f2e89a30494d370df262c4eaba7b7fbed04fb7c76907 WHIRLPOOL 7357addbc0ad8869c5749a67106c18e47d79e32399416cc2867461fa8ad0c662711b8937987cb7c3cd5b83fe9f88e1529911eefec28a972e86c7f242c8c0d634
 DIST QScintilla_gpl-2.9.2.tar.gz 2491222 SHA256 f2c8ccdc9d3dbb90764ceed53ea096da9bb13b6260da1324e6ab4ecea29e620a SHA512 28f88111d7eb6a016a4b87f04d2b7f5d6481b521a3361a526b3b45a56240f5c8de10310e819234fcba773c6df73bf398ae2dce622976a8e760f506be1defb7c8 WHIRLPOOL a04420c66fd417e5304c92a1ee3c1998f6849bccb9088dae96ed48c06cab0a9b1c012f073aafb1e05aaee46564de9ac89ae07145f3ded35cf47beac78065650a
+DIST QScintilla_gpl-2.9.3.tar.gz 2503568 SHA256 98aab93d73b05635867c2fc757acb383b5856a0b416e3fd7659f1879996ddb7e SHA512 43c0edb91b7cf31f4cca71aae54d7bfea8ee66e296c0e99b694069eeedf394762b8a670952debfa2671363fd8ab5c46dd7a7da60e8f1234406a12d12afa503ab WHIRLPOOL 4a46b6cf38486d1642ad8899fc986272ddbffc33e2cb2e60e9f74c56a014c22fabdbf0f24e434cf386a9463fb82b30987d554a1419d606e152e785c3286ae063

diff --git a/x11-libs/qscintilla/qscintilla-2.9.3.ebuild b/x11-libs/qscintilla/qscintilla-2.9.3.ebuild
new file mode 100644
index 0000000..103e457
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.9.3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://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"
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     c4618b94b6eca1525843b4bcef8a76d6481a8fdd
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 14 20:42:51 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 20:42:51 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4618b94

x11-libs/qscintilla: drop old unstable version

Package-Manager: portage-2.3.0

 x11-libs/qscintilla/Manifest                |  1 -
 x11-libs/qscintilla/qscintilla-2.9.1.ebuild | 91 -----------------------------
 2 files changed, 92 deletions(-)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 1a60776..5b3e5c4 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,3 +1,2 @@
 DIST QScintilla-gpl-2.8.4.tar.gz 3031919 SHA256 9b7b2d7440cc39736bbe937b853506b3bd218af3b79095d4f710cccb0fabe80f SHA512 ab10dc756231b293ddebc06e681bb65a11b2be2a4c4132a5b2a27ca583adef76af325fa95748888d9091f2e89a30494d370df262c4eaba7b7fbed04fb7c76907 WHIRLPOOL 7357addbc0ad8869c5749a67106c18e47d79e32399416cc2867461fa8ad0c662711b8937987cb7c3cd5b83fe9f88e1529911eefec28a972e86c7f242c8c0d634
-DIST QScintilla-gpl-2.9.1.tar.gz 2490144 SHA256 79e9c39d51549061d3d489387bcee86ff20c1f746d1b25ac173d5165426eabaf SHA512 709a5251c9273c527740b138b099e42a57cefa4fcda34c04da11f4640b0ee53ca9a0a58752e963bc8c63933e382ac8a6e774965d838c9123c11c1c59a9d7100e WHIRLPOOL f47319c2cebd1fdf4ae95f26781ab52758ab698b1b72e9d7db4e081e6c27bb41ef1d1da0b450c1cefebf0a9f1c1a128d45c44ba490d2be1a77276f3e1bf75224
 DIST QScintilla_gpl-2.9.2.tar.gz 2491222 SHA256 f2c8ccdc9d3dbb90764ceed53ea096da9bb13b6260da1324e6ab4ecea29e620a SHA512 28f88111d7eb6a016a4b87f04d2b7f5d6481b521a3361a526b3b45a56240f5c8de10310e819234fcba773c6df73bf398ae2dce622976a8e760f506be1defb7c8 WHIRLPOOL a04420c66fd417e5304c92a1ee3c1998f6849bccb9088dae96ed48c06cab0a9b1c012f073aafb1e05aaee46564de9ac89ae07145f3ded35cf47beac78065650a

diff --git a/x11-libs/qscintilla/qscintilla-2.9.1.ebuild b/x11-libs/qscintilla/qscintilla-2.9.1.ebuild
deleted file mode 100644
index 92d5dc1..0000000
--- a/x11-libs/qscintilla/qscintilla-2.9.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit flag-o-matic qmake-utils
-
-MY_P=QScintilla-gpl-${PV}
-
-DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class"
-HOMEPAGE="http://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"
-
-DEPEND="
-	>=dev-qt/qtcore-4.8.5:4
-	>=dev-qt/qtgui-4.8.5:4
-	designer? ( >=dev-qt/designer-4.8.5: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
-}
-
-src_configure() {
-	pushd Qt4Qt5 > /dev/null
-	eqmake4
-	popd > /dev/null
-
-	if use designer; then
-		# prevent building against system version (bug 466120)
-		append-cxxflags -I../Qt4Qt5
-		append-ldflags -L../Qt4Qt5
-
-		pushd designer-Qt4Qt5 > /dev/null
-		eqmake4
-		popd > /dev/null
-	fi
-}
-
-src_compile() {
-	pushd Qt4Qt5 > /dev/null
-	emake
-	popd > /dev/null
-
-	if use designer; then
-		pushd designer-Qt4Qt5 > /dev/null
-		emake
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	pushd Qt4Qt5 > /dev/null
-	emake INSTALL_ROOT="${D}" install
-	popd > /dev/null
-
-	if use designer; then
-		pushd designer-Qt4Qt5 > /dev/null
-		emake INSTALL_ROOT="${D}" install
-		popd > /dev/null
-	fi
-
-	dodoc NEWS
-
-	if use doc; then
-		docinto html
-		dodoc -r doc/html-Qt4Qt5/*
-	fi
-}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Michael Palimaka]

commit:     2751dfa73c4bfa12b070256ae97c71d0d1d7095e
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 21:21:14 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 21:22:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2751dfa7

x11-libs/qscintilla: amd64/x86 stable

Gentoo-bug: 552122

Package-Manager: portage-2.3.0

 x11-libs/qscintilla/qscintilla-2.9.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.9.2.ebuild b/x11-libs/qscintilla/qscintilla-2.9.2.ebuild
index 103e457..9c99215 100644
--- a/x11-libs/qscintilla/qscintilla-2.9.2.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.9.2.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="designer doc"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     33195264e51a3b9d74f473ec0bbcdde92ad58099
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 23 22:35:22 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Apr 23 22:36:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33195264

x11-libs/qscintilla: add <doc> metadata

Package-Manager: portage-2.2.28

 x11-libs/qscintilla/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/x11-libs/qscintilla/metadata.xml b/x11-libs/qscintilla/metadata.xml
index bbae5f5..29550d8 100644
--- a/x11-libs/qscintilla/metadata.xml
+++ b/x11-libs/qscintilla/metadata.xml
@@ -18,6 +18,7 @@
 			<name>Phil Thompson</name>
 		</maintainer>
 		<bugs-to>mailto:qscintilla@riverbankcomputing.com</bugs-to>
+		<doc>http://pyqt.sourceforge.net/Docs/QScintilla2/</doc>
 		<remote-id type="sourceforge">pyqt</remote-id>
 	</upstream>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     ba7c5fdd8f7bf06ffc1b64ffab9d9905ebfe58c0
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 18 16:39:57 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 00:38:03 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba7c5fdd

x11-libs/qscintilla: remove old

Package-Manager: portage-2.2.28

 x11-libs/qscintilla/Manifest              |  1 -
 x11-libs/qscintilla/qscintilla-2.9.ebuild | 91 -------------------------------
 2 files changed, 92 deletions(-)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 4169dcc..72e0c46 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,3 +1,2 @@
 DIST QScintilla-gpl-2.8.4.tar.gz 3031919 SHA256 9b7b2d7440cc39736bbe937b853506b3bd218af3b79095d4f710cccb0fabe80f SHA512 ab10dc756231b293ddebc06e681bb65a11b2be2a4c4132a5b2a27ca583adef76af325fa95748888d9091f2e89a30494d370df262c4eaba7b7fbed04fb7c76907 WHIRLPOOL 7357addbc0ad8869c5749a67106c18e47d79e32399416cc2867461fa8ad0c662711b8937987cb7c3cd5b83fe9f88e1529911eefec28a972e86c7f242c8c0d634
 DIST QScintilla-gpl-2.9.1.tar.gz 2490144 SHA256 79e9c39d51549061d3d489387bcee86ff20c1f746d1b25ac173d5165426eabaf SHA512 709a5251c9273c527740b138b099e42a57cefa4fcda34c04da11f4640b0ee53ca9a0a58752e963bc8c63933e382ac8a6e774965d838c9123c11c1c59a9d7100e WHIRLPOOL f47319c2cebd1fdf4ae95f26781ab52758ab698b1b72e9d7db4e081e6c27bb41ef1d1da0b450c1cefebf0a9f1c1a128d45c44ba490d2be1a77276f3e1bf75224
-DIST QScintilla-gpl-2.9.tar.gz 2435116 SHA256 d7c32e32582f93779de861006d87467b38b9ebc06e3d0b32e981cb24369fa417 SHA512 a74b7b1182e9f602aa9f61072877d8dba93c430453ed70e18d74013dbda8b0faef30629f2c086d3b06d0632b3f4980570362bb6e635c15686be1be47eaeecb00 WHIRLPOOL b27a3ff2b48dbbf034deb4fdf09259815dcee63bfffe29651cf1e5e9ceeedb408ebc0bae440479a8206af7046f80143c291c10a0293942b64eb61c5e02549ed4

diff --git a/x11-libs/qscintilla/qscintilla-2.9.ebuild b/x11-libs/qscintilla/qscintilla-2.9.ebuild
deleted file mode 100644
index 99f8001..0000000
--- a/x11-libs/qscintilla/qscintilla-2.9.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit flag-o-matic qmake-utils
-
-MY_P=QScintilla-gpl-${PV}
-
-DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class"
-HOMEPAGE="http://www.riverbankcomputing.com/software/qscintilla/intro"
-SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0/12"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="designer doc"
-
-DEPEND="
-	>=dev-qt/qtcore-4.8.5:4
-	>=dev-qt/qtgui-4.8.5:4
-	designer? ( >=dev-qt/designer-4.8.5: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
-}
-
-src_configure() {
-	pushd Qt4Qt5 > /dev/null
-	eqmake4
-	popd > /dev/null
-
-	if use designer; then
-		# prevent building against system version (bug 466120)
-		append-cxxflags -I../Qt4Qt5
-		append-ldflags -L../Qt4Qt5
-
-		pushd designer-Qt4Qt5 > /dev/null
-		eqmake4
-		popd > /dev/null
-	fi
-}
-
-src_compile() {
-	pushd Qt4Qt5 > /dev/null
-	emake
-	popd > /dev/null
-
-	if use designer; then
-		pushd designer-Qt4Qt5 > /dev/null
-		emake
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	pushd Qt4Qt5 > /dev/null
-	emake INSTALL_ROOT="${D}" install
-	popd > /dev/null
-
-	if use designer; then
-		pushd designer-Qt4Qt5 > /dev/null
-		emake INSTALL_ROOT="${D}" install
-		popd > /dev/null
-	fi
-
-	dodoc NEWS
-
-	if use doc; then
-		docinto html
-		dodoc -r doc/html-Qt4Qt5/*
-	fi
-}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     246690df749f75fa6c74290a05895e8593f4dac4
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 18 19:14:36 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 00:38:14 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=246690df

x11-libs/qscintilla: version bump, EAPI=6, fix LICENSE

Package-Manager: portage-2.2.28

 x11-libs/qscintilla/Manifest                       |  1 +
 x11-libs/qscintilla/qscintilla-2.9.1.ebuild        |  4 +-
 ...ntilla-2.9.1.ebuild => qscintilla-2.9.2.ebuild} | 51 +++++++++-------------
 3 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 72e0c46..1a60776 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,2 +1,3 @@
 DIST QScintilla-gpl-2.8.4.tar.gz 3031919 SHA256 9b7b2d7440cc39736bbe937b853506b3bd218af3b79095d4f710cccb0fabe80f SHA512 ab10dc756231b293ddebc06e681bb65a11b2be2a4c4132a5b2a27ca583adef76af325fa95748888d9091f2e89a30494d370df262c4eaba7b7fbed04fb7c76907 WHIRLPOOL 7357addbc0ad8869c5749a67106c18e47d79e32399416cc2867461fa8ad0c662711b8937987cb7c3cd5b83fe9f88e1529911eefec28a972e86c7f242c8c0d634
 DIST QScintilla-gpl-2.9.1.tar.gz 2490144 SHA256 79e9c39d51549061d3d489387bcee86ff20c1f746d1b25ac173d5165426eabaf SHA512 709a5251c9273c527740b138b099e42a57cefa4fcda34c04da11f4640b0ee53ca9a0a58752e963bc8c63933e382ac8a6e774965d838c9123c11c1c59a9d7100e WHIRLPOOL f47319c2cebd1fdf4ae95f26781ab52758ab698b1b72e9d7db4e081e6c27bb41ef1d1da0b450c1cefebf0a9f1c1a128d45c44ba490d2be1a77276f3e1bf75224
+DIST QScintilla_gpl-2.9.2.tar.gz 2491222 SHA256 f2c8ccdc9d3dbb90764ceed53ea096da9bb13b6260da1324e6ab4ecea29e620a SHA512 28f88111d7eb6a016a4b87f04d2b7f5d6481b521a3361a526b3b45a56240f5c8de10310e819234fcba773c6df73bf398ae2dce622976a8e760f506be1defb7c8 WHIRLPOOL a04420c66fd417e5304c92a1ee3c1998f6849bccb9088dae96ed48c06cab0a9b1c012f073aafb1e05aaee46564de9ac89ae07145f3ded35cf47beac78065650a

diff --git a/x11-libs/qscintilla/qscintilla-2.9.1.ebuild b/x11-libs/qscintilla/qscintilla-2.9.1.ebuild
index 99f8001..92d5dc1 100644
--- a/x11-libs/qscintilla/qscintilla-2.9.1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@ DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class"
 HOMEPAGE="http://www.riverbankcomputing.com/software/qscintilla/intro"
 SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
 
-LICENSE="|| ( GPL-2 GPL-3 )"
+LICENSE="GPL-3"
 SLOT="0/12"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="designer doc"

diff --git a/x11-libs/qscintilla/qscintilla-2.9.1.ebuild b/x11-libs/qscintilla/qscintilla-2.9.2.ebuild
similarity index 65%
copy from x11-libs/qscintilla/qscintilla-2.9.1.ebuild
copy to x11-libs/qscintilla/qscintilla-2.9.2.ebuild
index 99f8001..103e457 100644
--- a/x11-libs/qscintilla/qscintilla-2.9.1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.9.2.ebuild
@@ -1,26 +1,26 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit flag-o-matic qmake-utils
 
-MY_P=QScintilla-gpl-${PV}
+MY_P=QScintilla_gpl-${PV}
 
 DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class"
 HOMEPAGE="http://www.riverbankcomputing.com/software/qscintilla/intro"
 SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
 
-LICENSE="|| ( GPL-2 GPL-3 )"
+LICENSE="GPL-3"
 SLOT="0/12"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="designer doc"
 
 DEPEND="
-	>=dev-qt/qtcore-4.8.5:4
-	>=dev-qt/qtgui-4.8.5:4
-	designer? ( >=dev-qt/designer-4.8.5:4 )
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	designer? ( dev-qt/designer:4 )
 "
 RDEPEND="${DEPEND}"
 
@@ -43,46 +43,37 @@ src_unpack() {
 	fi
 }
 
+qsci_run_in() {
+	pushd "$1" >/dev/null || die
+	shift || die
+	"$@" || die
+	popd >/dev/null || die
+}
+
 src_configure() {
-	pushd Qt4Qt5 > /dev/null
-	eqmake4
-	popd > /dev/null
+	qsci_run_in Qt4Qt5 eqmake4
 
 	if use designer; then
 		# prevent building against system version (bug 466120)
 		append-cxxflags -I../Qt4Qt5
 		append-ldflags -L../Qt4Qt5
 
-		pushd designer-Qt4Qt5 > /dev/null
-		eqmake4
-		popd > /dev/null
+		qsci_run_in designer-Qt4Qt5 eqmake4
 	fi
 }
 
 src_compile() {
-	pushd Qt4Qt5 > /dev/null
-	emake
-	popd > /dev/null
+	qsci_run_in Qt4Qt5 emake
 
-	if use designer; then
-		pushd designer-Qt4Qt5 > /dev/null
-		emake
-		popd > /dev/null
-	fi
+	use designer && qsci_run_in designer-Qt4Qt5 emake
 }
 
 src_install() {
-	pushd Qt4Qt5 > /dev/null
-	emake INSTALL_ROOT="${D}" install
-	popd > /dev/null
+	qsci_run_in Qt4Qt5 emake INSTALL_ROOT="${D}" install
 
-	if use designer; then
-		pushd designer-Qt4Qt5 > /dev/null
-		emake INSTALL_ROOT="${D}" install
-		popd > /dev/null
-	fi
+	use designer && qsci_run_in designer-Qt4Qt5 emake INSTALL_ROOT="${D}" install
 
-	dodoc NEWS
+	dodoc ChangeLog NEWS
 
 	if use doc; then
 		docinto html

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[Davide Pesavento]

commit:     ec3099d108eacc9e14f32a0400da5f95655e381b
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 24 15:38:29 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Oct 24 15:44:13 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec3099d1

x11-libs/qscintilla: bump

Package-Manager: portage-2.2.23

 x11-libs/qscintilla/Manifest                |  1 +
 x11-libs/qscintilla/qscintilla-2.9.1.ebuild | 91 +++++++++++++++++++++++++++++
 2 files changed, 92 insertions(+)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 682d80e..4169dcc 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,2 +1,3 @@
 DIST QScintilla-gpl-2.8.4.tar.gz 3031919 SHA256 9b7b2d7440cc39736bbe937b853506b3bd218af3b79095d4f710cccb0fabe80f SHA512 ab10dc756231b293ddebc06e681bb65a11b2be2a4c4132a5b2a27ca583adef76af325fa95748888d9091f2e89a30494d370df262c4eaba7b7fbed04fb7c76907 WHIRLPOOL 7357addbc0ad8869c5749a67106c18e47d79e32399416cc2867461fa8ad0c662711b8937987cb7c3cd5b83fe9f88e1529911eefec28a972e86c7f242c8c0d634
+DIST QScintilla-gpl-2.9.1.tar.gz 2490144 SHA256 79e9c39d51549061d3d489387bcee86ff20c1f746d1b25ac173d5165426eabaf SHA512 709a5251c9273c527740b138b099e42a57cefa4fcda34c04da11f4640b0ee53ca9a0a58752e963bc8c63933e382ac8a6e774965d838c9123c11c1c59a9d7100e WHIRLPOOL f47319c2cebd1fdf4ae95f26781ab52758ab698b1b72e9d7db4e081e6c27bb41ef1d1da0b450c1cefebf0a9f1c1a128d45c44ba490d2be1a77276f3e1bf75224
 DIST QScintilla-gpl-2.9.tar.gz 2435116 SHA256 d7c32e32582f93779de861006d87467b38b9ebc06e3d0b32e981cb24369fa417 SHA512 a74b7b1182e9f602aa9f61072877d8dba93c430453ed70e18d74013dbda8b0faef30629f2c086d3b06d0632b3f4980570362bb6e635c15686be1be47eaeecb00 WHIRLPOOL b27a3ff2b48dbbf034deb4fdf09259815dcee63bfffe29651cf1e5e9ceeedb408ebc0bae440479a8206af7046f80143c291c10a0293942b64eb61c5e02549ed4

diff --git a/x11-libs/qscintilla/qscintilla-2.9.1.ebuild b/x11-libs/qscintilla/qscintilla-2.9.1.ebuild
new file mode 100644
index 0000000..99f8001
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.9.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit flag-o-matic qmake-utils
+
+MY_P=QScintilla-gpl-${PV}
+
+DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class"
+HOMEPAGE="http://www.riverbankcomputing.com/software/qscintilla/intro"
+SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0/12"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="designer doc"
+
+DEPEND="
+	>=dev-qt/qtcore-4.8.5:4
+	>=dev-qt/qtgui-4.8.5:4
+	designer? ( >=dev-qt/designer-4.8.5: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
+}
+
+src_configure() {
+	pushd Qt4Qt5 > /dev/null
+	eqmake4
+	popd > /dev/null
+
+	if use designer; then
+		# prevent building against system version (bug 466120)
+		append-cxxflags -I../Qt4Qt5
+		append-ldflags -L../Qt4Qt5
+
+		pushd designer-Qt4Qt5 > /dev/null
+		eqmake4
+		popd > /dev/null
+	fi
+}
+
+src_compile() {
+	pushd Qt4Qt5 > /dev/null
+	emake
+	popd > /dev/null
+
+	if use designer; then
+		pushd designer-Qt4Qt5 > /dev/null
+		emake
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	pushd Qt4Qt5 > /dev/null
+	emake INSTALL_ROOT="${D}" install
+	popd > /dev/null
+
+	if use designer; then
+		pushd designer-Qt4Qt5 > /dev/null
+		emake INSTALL_ROOT="${D}" install
+		popd > /dev/null
+	fi
+
+	dodoc NEWS
+
+	if use doc; then
+		docinto html
+		dodoc -r doc/html-Qt4Qt5/*
+	fi
+}