gentoo auto-resync : 11:08:2024 - 11:06:01

4 files changed, 15 insertions, 63 deletions

diff --git a/dev-util/kdevelop-pg-qt/Manifest b/dev-util/kdevelop-pg-qt/Manifest
index 11dc3555f695..352692ebb4da 100644
--- a/dev-util/kdevelop-pg-qt/Manifest
+++ b/dev-util/kdevelop-pg-qt/Manifest
@@ -1,5 +1,5 @@
-AUX kdevelop-pg-qt-2.2.2-port-away-from-depr-QString_midRef.patch 2233 BLAKE2B 47d0a31732915d5217b88aa573a2eb7d2803f9861455a67ad5bb0e88b8b689a789a23a13e7420757ddbfd23310af522ababb37fadefbbbc8e3e4c401fabd78fd SHA512 036a08ec55d4d1c2f766e499ef2c034255f02c0bf665b5651bb31d0e3a7ffa585ff18cc05a7f7efefb0933c727a5455caca0003a66b8a90258026bc419d78292
 DIST kdevelop-pg-qt-2.2.2.tar.xz 660708 BLAKE2B 822753315969cf4176ed1a25bb27516661af865a4c337f069a892b008802359f4a933ebc9e9e1ac0c91d2314a6ec5cdcf91db4641e624e07373dfec47a71dcf1 SHA512 e82f2fa2aafa2c9f949e298989de70a0455c30f6bef4a40e38977c23ad645ee49a0a8c57b5c45d0ddfef13ee7b7e4efd2dc2ed3003a456f24108161415700369
-EBUILD kdevelop-pg-qt-2.2.2-r1.ebuild 529 BLAKE2B 1a8de7446a647fe28bbc60e13b4866998139eca0aae03730edb0d0fe1434b81f716dfd0f266b442819b9f34693dde4bae285b2b0fcc615e1f9aaf5d9446182a3 SHA512 70421991d553425c6d86bedd1c23514bfc04d388dcc23a7773c38dfdb6973fb36b6961faf5e1e574ced4495c112db986a961a437a66f399e0d9bc8cc97adec8c
-EBUILD kdevelop-pg-qt-2.2.2.ebuild 453 BLAKE2B 5633113b1eecf783fc90c9252f6a6a38ce0758df9642ae505d69ee8db19d85fa7c8b1ce649853127596eec28e2ed6dd33e7d1349b4c8cc24d79e0eec9d0a384a SHA512 2344e46d69f787b252e6c6f0996f8c35cc92dc05ca93585f0c3999ef970deaa36ab1936cda56772665ff783a1b9cc9e52b8443c4c1004c39697beb3917ea8479
+DIST kdevelop-pg-qt-2.3.0.tar.xz 660164 BLAKE2B 4167068e8f8348c428e4260061abbd24a4c490588414a8a566d84b61913bfc6cb06292900cb881327b5ecdd3c0cf92aa02f6361cd870f9d8bc79f8ff295aa89a SHA512 27bd102cf64f9cd7b27940be02cb81b620732a11e2416327104a18edc6990e43b2a57281bec91697466c3ab3ac8d322412dd06673329e04583e3bc90862b43b9
+EBUILD kdevelop-pg-qt-2.2.2.ebuild 453 BLAKE2B 82a7082e942b85745690a862fb4bdfe90be8634f188915fa1e613461655772672aeae9f2eb005277486738108f8a9983bb527f21af9a041eed60bf951145fc59 SHA512 e9c49b5f62d2e9fa4713531df6292a82c06e71995e9da72a9358e19059b59e98cdf49f6b2bcb576f8952f2cbbac2a7a6b0babcd04ca735f67aa2c07c936b8e39
+EBUILD kdevelop-pg-qt-2.3.0.ebuild 574 BLAKE2B ef94c9f0e1aea6df6c041f7da892398f6dfabffd0b2f1ceba0a8835b1d47ef1f860aaa25e347a0ce6015f3fafbd04b3879f31088813ccdd9f1387dbc2dab97a3 SHA512 ba94f07d5a8ae86d944ab67179ca53e7102f81063d4ad817d06319c83b795606c786ee2a332da40c80189c4505e1220ed8de652ed567bf345ce9fac7e2b9a241
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-2.2.2-port-away-from-depr-QString_midRef.patch b/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-2.2.2-port-away-from-depr-QString_midRef.patch
deleted file mode 100644
index 360010c49cb3..000000000000
--- a/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-2.2.2-port-away-from-depr-QString_midRef.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From c210967f753b33db48dbf942c7b32e67363ca204 Mon Sep 17 00:00:00 2001
-From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
-Date: Sun, 30 Oct 2022 11:56:59 +0100
-Subject: [PATCH] Port away from deprecated QString::midRef
-
-GIT_SILENT
----
- kdev-pg/kdev-pg-debug-visitor-gen.cpp | 2 +-
- kdev-pg/kdev-pg-regexp.cpp            | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/kdev-pg/kdev-pg-debug-visitor-gen.cpp b/kdev-pg/kdev-pg-debug-visitor-gen.cpp
-index 418d044..d4394f7 100644
---- a/kdev-pg/kdev-pg-debug-visitor-gen.cpp
-+++ b/kdev-pg/kdev-pg-debug-visitor-gen.cpp
-@@ -72,7 +72,7 @@ void GenerateDebugVisitor::operator()()
-   out << "                tokenString += QStringLiteral(\" ...\");" << endl;
-   out << "                tokenString += QStringLiteral(\"%1 more\").arg(end-begin-20);" << endl;
-   out << "                tokenString += QStringLiteral(\"... \");" << endl;
--  out << "                tokenString += m_content.midRef(end-10, 10);" << endl;
-+  out << "                tokenString += QStringView(m_content).mid(end-10, 10);" << endl;
-   out << "            }" << endl;
-   out << "            else {" << endl;
-   out << "                tokenString = m_content.mid(begin, end-begin+1);" << endl;
-diff --git a/kdev-pg/kdev-pg-regexp.cpp b/kdev-pg/kdev-pg-regexp.cpp
-index fda19f9..808018f 100644
---- a/kdev-pg/kdev-pg-regexp.cpp
-+++ b/kdev-pg/kdev-pg-regexp.cpp
-@@ -71,10 +71,10 @@ inline QString codeForDot(QString str)
-     int npos = str.indexOf("\n\01!ASIgnore\"!!\n# ", pos);
-     if(npos == -1)
-     {
--      out += str.midRef(pos);
-+      out += QStringView(str).mid(pos);
-       break;
-     }
--    out += str.midRef(pos, npos - pos);
-+    out += QStringView(str).mid(pos, npos - pos);
-     int nlpos = str.indexOf('\n', npos + 17);
-     int codeendpos = str.indexOf("\n\01!AS/Ignore\"!!\n", nlpos);
-     if(nlpos == -1 || codeendpos == -1)
-@@ -82,7 +82,7 @@ inline QString codeForDot(QString str)
-       out += "<junk>";
-       break;
-     }
--    out += str.midRef(nlpos + 1, codeendpos - nlpos - 1);
-+    out += QStringView(str).mid(nlpos + 1, codeendpos - nlpos - 1);
-     pos = codeendpos + 17;
-   }
-   return out.replace('\"', "\\\"").replace('\n', '\t').trimmed();
--- 
-GitLab
-
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.2.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.2.ebuild
index 6a1eba74bdbb..cba62e3eea64 100644
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.2.ebuild
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.kdevelop.org/"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="LGPL-2+ LGPL-2.1+"
-SLOT="5"
+SLOT="0"
 KEYWORDS="amd64 arm64 ~ppc64 x86"
 
 BDEPEND="
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.2-r1.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.3.0.ebuild
index 1d77f74d84fc..23f621d53d9a 100644
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.2-r1.ebuild
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.3.0.ebuild
@@ -4,19 +4,24 @@
 EAPI=8
 
 ECM_TEST="true"
+KDE_ORG_CATEGORY="kdevelop"
+KFMIN=6.3.0
 inherit ecm kde.org
 
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64"
+fi
+
 DESCRIPTION="LL(1) parser generator used mainly by KDevelop language plugins"
 HOMEPAGE="https://www.kdevelop.org/"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="LGPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+SLOT="0"
+IUSE=""
 
+RDEPEND+=" !${CATEGORY}/${PN}:6"
 BDEPEND="
-	app-alternatives/yacc
 	app-alternatives/lex
+	app-alternatives/yacc
 "
-
-PATCHES=( "${FILESDIR}/${P}-port-away-from-depr-QString_midRef.patch" )