commit: fac246a557389b552e0631352264dc4f1442e440
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 17 16:50:13 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 17 16:50:13 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fac246a5
dev-util/kdevelop-python: fixup ebuild
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-util/kdevelop-python/kdevelop-python-24.12.3.ebuild | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/dev-util/kdevelop-python/kdevelop-python-24.12.3.ebuild
b/dev-util/kdevelop-python/kdevelop-python-24.12.3.ebuild
index b2f54611479d..d426e15f4661 100644
--- a/dev-util/kdevelop-python/kdevelop-python-24.12.3.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-24.12.3.ebuild
@@ -6,13 +6,8 @@ EAPI=8
ECM_TEST="forceoptional"
KDE_ORG_CATEGORY="kdevelop"
KDE_ORG_NAME="kdev-python"
-<<<<<<< HEAD:dev-util/kdevelop-python/kdevelop-python-24.12.3.ebuild
-PYTHON_COMPAT=( python3_{10..12} )
-KFMIN=6.7.0
-=======
PYTHON_COMPAT=( python3_{10..13} )
-KFMIN=6.9.0
->>>>>>> 4c736eb28226 (dev-util/kdevelop-python: enable
py3.13):dev-util/kdevelop-python/kdevelop-python-25.03.80.ebuild
+KFMIN=6.7.0
QTMIN=6.7.2
inherit ecm gear.kde.org python-single-r1
