gentoo auto-resync : 09:05:2024 - 00:01:03

4 files changed, 2 insertions, 165 deletions

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index db4181f4e21a..8b933a1eb05d 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,6 +1,3 @@
-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
-EBUILD qscintilla-2.13.3.ebuild 1904 BLAKE2B 4efdf5c406362d834ee9e357cb5770cc41ebf3a398c15edbdc548783a70b3139cd731b20bb5b98fb10dc76e51905fffa1a7ac3960b0b6c193b2900d1ab04507c SHA512 5103d72ac50506fad4eb7f8c2b82c506e9b366d86cb04f978eb2eba53ef70fe35ff3468d81e9ad4da10eb6bc2f9a5e2c8c2df2ef7a2adfa7c80826190147365f
-EBUILD qscintilla-2.14.1-r1.ebuild 2548 BLAKE2B a359b3291b40f5da4d2f2093515fe8db6aa217defc9c38b04d41b0ea595d3ea0903afeb6181dbbd98f3b29156e8213fdf98f510bc1b51bb3e3403ddaca1403fb SHA512 a92118846b388c0f8817ce2edc6979789b180b5387f71e7cef5b5e9514f603d02bfc81fc334f28b5916ffb3468e5fab17262160bc24e6ef2b11ca6bc8cd05937
-EBUILD qscintilla-2.14.1.ebuild 1904 BLAKE2B 6499a6963083ebadf341c303ed75e16f18cda09ededf21c6c5f542cdb24eae5b2c964299c6b74dfab7947d15b9510d81ddb4fbfe19bb4cb09215bb5c4d2ce58c SHA512 5601d66b8917cdc0a9e0e022bfe2bbc82646691da7075278700596319fa68199db4a54d5e04aa629137aadca36b3b67f5c56a7226ab2d2b2ca3fa786864a5052
+EBUILD qscintilla-2.14.1-r1.ebuild 2543 BLAKE2B f043ae477f6ffaf701ed7cf0f3764f1e5cf75150f89b5ca1527e8a5bc2f97d33a975b0663e48c8f3178dc4285cb67fd6d6f2db4a0d768390cd70b16bdd1df0d1 SHA512 dfb2035169918515f103d3224cec34f33303aec28c0e1221138539dd982afd38ee4b97f2e797b0848bc5bfaddd91e4c348fde282585e02077c3c8449e92c7e62
 MISC metadata.xml 525 BLAKE2B ea837797a85fce59239fd47f3905fa2dcb7a28e4906062aff9bb115b8fcafdab629a7ac5e74327cc3f0d90353b707302701beba5b3dae5ecf93801084809b8fc SHA512 a0f22133439e058079ae75c0119ac02244a2af4663eb44ef8d3675d01ac1905ae0810afbbaf9f9a809bd82e03785641590a315a795f10ba584c255757afbd8d5
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-r1.ebuild b/x11-libs/qscintilla/qscintilla-2.14.1-r1.ebuild
index 50efd464a50b..fb9ddb9b51a3 100644
--- a/x11-libs/qscintilla/qscintilla-2.14.1-r1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.14.1-r1.ebuild
@@ -15,7 +15,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 +qt5 qt6"
 
 REQUIRED_USE="|| ( qt5 qt6 )"
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
-}