10 files changed, 20 insertions, 273 deletions
diff --git a/dev-util/clippy/clippy-8.5.ebuild b/dev-util/clippy/clippy-8.5.ebuild
index a8fb125c2141..9353de42d5a5 100644
--- a/dev-util/clippy/clippy-8.5.ebuild
+++ b/dev-util/clippy/clippy-8.5.ebuild
@@ -31,6 +31,11 @@ BDEPEND="
 	sys-devel/flex
 "
 
+QA_CONFIG_IMPL_DECL_SKIP=(
+	mallinfo	# check in configure is fallback is needed
+	mallinfo2	# check in configure is fallback is needed
+)
+
 src_prepare() {
 	default
 	eautoreconf
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index 0bc8e28b92c5..114fc733ebe6 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,3 +1,2 @@
-DIST kdev-php-23.04.0.tar.xz 1086172 BLAKE2B 1ffe30d1eb12564f22cebe332e4d94af96b6729282a76c46b4c8a32ffa1393be7007a90a90fe9fe9f066a2bb8b89cee1e0ad455223ab65627143a8c28f557141 SHA512 fe49be01a9813fc2a1fb263fd460255cc821ee24e59724a59f534786f92c3c2b1b4413331eadfa9ad5685fe0f453b97cba082cf6451cbf3637d00cebf15051cd
 DIST kdev-php-23.04.2.tar.xz 1086232 BLAKE2B a35bb852fd6c310699a73dadc256c3e05359f8d49fc3b840c8a7b2fa7663ee0adc1f958d9a6bf554636b303080b519a1c7524937c1535e383c2c4d46f5f23268 SHA512 c48128b3e548920f5060bbf798f91381db4c2ebf05d5de913a1c227eccec1e97597efcfe80c6fb4037afdf0fedcdbde57eb4e95d690c3260f54f425da70a3f05
 DIST kdev-php-23.04.3.tar.xz 1086220 BLAKE2B 772a7bd55ee06e18fba6196cc2c1455d1b90cc318d65d475b2b6bc4b3739401e1c4308983e39bbc4f25ec3470cc4d604b621ff46fd6372d76a278b40f5373f53 SHA512 6b8774eebbb8a696fea511ebe40580422aeac524b45eb91c932f526f8e11300ce23fa2753c5952f4dcf4bea05155c0c632dfc84abefb2221535c7664e34a6121
diff --git a/dev-util/kdevelop-php/kdevelop-php-23.04.0.ebuild b/dev-util/kdevelop-php/kdevelop-php-23.04.0.ebuild
deleted file mode 100644
index f8df4e4bfdbb..000000000000
--- a/dev-util/kdevelop-php/kdevelop-php-23.04.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_HANDBOOK_DIR="docs"
-ECM_TEST="true"
-KDE_ORG_CATEGORY="kdevelop"
-KDE_ORG_NAME="kdev-php"
-KFMIN=5.104.0
-QTMIN=5.15.5
-VIRTUALX_REQUIRED="test"
-inherit ecm gear.kde.org
-
-DESCRIPTION="PHP plugin for KDevelop"
-HOMEPAGE="https://www.kdevelop.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5"
-IUSE=""
-KEYWORDS="amd64 arm64 ~x86"
-
-# remaining tests fail for some, bug 668530
-RESTRICT="test"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-util/kdevelop-pg-qt:5
-	dev-util/kdevelop:5=
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/threadweaver-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	test? ( dev-util/kdevelop:5[test] )
-"
-
-src_test() {
-	# tests hang, bug 667922
-	local myctestargs=(
-		-E "(completionbenchmark|duchain_multiplefiles)"
-	)
-	ecm_src_test
-}
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index fca9c2a086b0..68b562f9408c 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,3 +1,2 @@
-DIST kdev-python-23.04.0.tar.xz 1096352 BLAKE2B dc6d9c8247e1805d127fb7031bf216fe4b787746b96ab99b31e03ce74fbacba6c0ce13692057dfb5cace9582462ec3d2019449d670755d240af2da69235c81bc SHA512 56997fc93c993bbbd584ca7a3c531a9f49198a412b628c975aa3d392128e8df3904e0b182d8bf4fd452701b59b9485e8cd9e628cb5523d2a31cc34b9d8cf307c
 DIST kdev-python-23.04.2.tar.xz 1096320 BLAKE2B 8cb68b89b2066a6e5b2c381f363bbc0590b7a0221e0f05ca10f6432721a35cb8249ded3ac35610a3e23c1bcf948e6883c32026e22e6b9455b1cbea5bf8535d16 SHA512 95b646c66657a8ae44ef17ae4d5f95c91c76df09e1c5bc7f252e2b284797d47fb9df2c4ffc0e79d2bc5262be2eb7f6c3d5daeb81b2375e2c99e0893aeb611410
 DIST kdev-python-23.04.3.tar.xz 1096492 BLAKE2B 6ce236046fd7adb2ab48f140d8a2c9e3eb6b86ef686cf5eb783863823c5238dc52ea5392cb4e49c7ef66dc1e9ddc39dd22f5c0f103760d326258cfbc01bef728 SHA512 b66d759111cf0fb477e028362224e4b6c4b6fb721765ca19ede3e5345470b5eb21ba7824ee4b3bd56a8094ea5075570b61204aa2878649da30c696d6691abffb
diff --git a/dev-util/kdevelop-python/kdevelop-python-23.04.0.ebuild b/dev-util/kdevelop-python/kdevelop-python-23.04.0.ebuild
deleted file mode 100644
index 9e1db10c8ef2..000000000000
--- a/dev-util/kdevelop-python/kdevelop-python-23.04.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-KDE_ORG_CATEGORY="kdevelop"
-KDE_ORG_NAME="kdev-python"
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-KFMIN=5.104.0
-QTMIN=5.15.5
-inherit ecm gear.kde.org python-single-r1
-
-DESCRIPTION="Python plugin for KDevelop"
-HOMEPAGE="https://www.kdevelop.org/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-IUSE=""
-KEYWORDS="amd64 arm64 ~x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="test"
-
-DEPEND="${PYTHON_DEPS}
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-util/kdevelop:5=
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/threadweaver-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pycodestyle[${PYTHON_USEDEP}]
-	')
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index f1741d5d77ec..d091673ed8bf 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,3 +1,2 @@
-DIST kdevelop-23.04.0.tar.xz 8656872 BLAKE2B 10127854f56fc6d07e8ed974d5d9aacd33c74f6bc21c3ef77541ed446ae33562551708b8b46796bbd3cdc423642d3a6a07f719e81d56c7fd108fa30b671eae5c SHA512 1660f5e819302e3783358556c36d09197f5de4fc4acf25c597e86982ea0ff419f6fdabb718ed74e4a56d3cf9623758c32978f7a12afe0a619a97b626c8c04173
 DIST kdevelop-23.04.2.tar.xz 8660600 BLAKE2B e1f60965cab471dc43d9d1ebc2724f314c7ab67df60ade604b214f767147e7cc3bdf1c21c495301078767df8e6c4c83c73d379ce5f6c6b8fc9caf09ff603273a SHA512 1d971751c830f0d17590d7ae77d104699556bc079a1c74e63586f32eaa372a6462fd86135d405e3c673a229be93e9dbf30816216aa2ea717439ee2d524bcca91
 DIST kdevelop-23.04.3.tar.xz 8659696 BLAKE2B f5b8459e49f81aaeeceddc2529ba57c3b3d8956cb0562c9a1ae86424f31c0fdce9624e95ddd3bb69b893ff7342863b870377a9e9c76be2c85d54d3c970d24991 SHA512 f6734aada66757f03cf50793b3ba601748e5494c6cc4dbfba928927d7cf5c07a9522c4f506ef908ebe9b2a6f212e2f360b313c32398c1284adb43c43609f581c
diff --git a/dev-util/kdevelop/kdevelop-23.04.0.ebuild b/dev-util/kdevelop/kdevelop-23.04.0.ebuild
deleted file mode 100644
index 4e4fac18ef52..000000000000
--- a/dev-util/kdevelop/kdevelop-23.04.0.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KDE_ORG_CATEGORY="kdevelop"
-KFMIN=5.104.0
-LLVM_MAX_SLOT=16
-QTMIN=5.15.5
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit ecm gear.kde.org llvm optfeature
-
-DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
-HOMEPAGE="https://www.kdevelop.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm64 ~ppc64 ~x86"
-IUSE="+gdbui hex +plasma +qmake reviewboard subversion"
-
-# see bug 366471
-RESTRICT="test"
-
-COMMON_DEPEND="
-	dev-libs/grantlee:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qthelp-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qttest-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-util/astyle-3.1:=
-	kde-apps/libkomparediff2:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-frameworks/threadweaver-${KFMIN}:5
-	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
-	gdbui? ( kde-plasma/libksysguard:5= )
-	hex? ( app-editors/okteta:5 )
-	plasma? (
-		>=kde-frameworks/krunner-${KFMIN}:5
-		>=kde-frameworks/plasma-${KFMIN}:5
-	)
-	qmake? ( dev-util/kdevelop-pg-qt:5 )
-	reviewboard? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-	subversion? (
-		dev-libs/apr:1
-		dev-libs/apr-util:1
-		dev-vcs/subversion
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qdbus-${QTMIN}:*
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	dev-util/ninja
-	kde-apps/kapptemplate:5
-	kde-apps/kio-extras:5
-	>=sys-devel/gdb-7.0[python]
-	reviewboard? ( kde-apps/ktp-accounts-kcm:5 )
-"
-
-llvm_check_deps() {
-	has_version -d "sys-devel/clang:${LLVM_SLOT}"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_ROOT="$(get_llvm_prefix ${LLVM_SLOT})"
-		$(cmake_use_find_package gdbui KSysGuard)
-		-DBUILD_executeplasmoid=$(usex plasma)
-		$(cmake_use_find_package plasma KF5Plasma)
-		$(cmake_use_find_package hex OktetaKastenControllers)
-		$(cmake_use_find_package qmake KDevelop-PG-Qt)
-		$(cmake_use_find_package reviewboard KF5Purpose)
-		$(cmake_use_find_package subversion SubversionLibrary)
-	)
-
-	use gdbui || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5SysGuard=ON )
-	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "konsole view" kde-apps/konsole
-		optfeature "static C++ Qt code analysis" dev-util/clazy
-		optfeature "static C/C++ code analysis" dev-util/cppcheck
-		optfeature "heap memory profiling" "dev-util/heaptrack[gui]"
-		optfeature "meson project manager plugin" dev-util/meson
-		optfeature "formatting configurations via customscript plugin" dev-util/indent
-		optfeature "formatting configurations via customscript plugin" dev-util/uncrustify
-	fi
-	ecm_pkg_postinst
-}
diff --git a/dev-util/kio-perldoc/Manifest b/dev-util/kio-perldoc/Manifest
index cb9d14a831cf..7cc0c7f932c5 100644
--- a/dev-util/kio-perldoc/Manifest
+++ b/dev-util/kio-perldoc/Manifest
@@ -1,3 +1,2 @@
-DIST kdesdk-kio-22.12.3.tar.xz 40180 BLAKE2B caa7209cb9fb7ec1a9aef24ccad6f9c030bd637a1bce7fcac970cfb4d46e7974e081e101e10f6a8da82a62dab116640af2d6f40b07eda54357ec68a89b7e2b1b SHA512 599335a6503292a9ff599dd3cb2c046f321874f3029a11ffa3aef1a7f209e6b2c66152edfbcfcc356c340333994d76799a26e8106b3b56173fe4084f540ab6a9
 DIST kdesdk-kio-23.04.2.tar.xz 40108 BLAKE2B 7e8e77fd0be09f7cbfd48af6bc4ccfb05a97fa83643b838659e16d0c5d68cfa4b60184383d38689738d60f93fe7af5e59abdb8e441b37fa6083b858dfa5b1989 SHA512 24224163836f520b23edcc4c83c890750a3b8c55f20d09f94c0ae95393dd7b5b704ae9fbf03c62a3eccff07bb48a6bd542864fde8306298aea53574a20527aea
 DIST kdesdk-kio-23.04.3.tar.xz 40096 BLAKE2B 0c14a911ffd62c1c654abc2daa89cb33a9d2cbba11d4bb4ae5c93f23b10899b7ea406fa21cf21b0773c2c43aaf15ad01d3ac5ef31b46bc6fdc07aa38bdd6aa9a SHA512 ba7b701a9cc4e38c92a696f2de9ff16907c6637e314f6d7b081f1ee0c48b15a84f0f12603a1e180ca1a28305ca8979de443aacb600a86012b73e65e6a716fcc8
diff --git a/dev-util/kio-perldoc/kio-perldoc-22.12.3.ebuild b/dev-util/kio-perldoc/kio-perldoc-22.12.3.ebuild
deleted file mode 100644
index 5c40319492d6..000000000000
--- a/dev-util/kio-perldoc/kio-perldoc-22.12.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_NAME="kdesdk-kio"
-KFMIN=5.101.0
-inherit ecm gear.kde.org
-
-DESCRIPTION="KIO worker interface to browse Perl documentation"
-
-LICENSE="GPL-2+ || ( Artistic GPL-1+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	dev-lang/perl
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-util/upstream-ontologist/upstream-ontologist-0.1.35.ebuild b/dev-util/upstream-ontologist/upstream-ontologist-0.1.35-r1.ebuild
index 8de6e8aa930e..3f872e24219d 100644
--- a/dev-util/upstream-ontologist/upstream-ontologist-0.1.35.ebuild
+++ b/dev-util/upstream-ontologist/upstream-ontologist-0.1.35-r1.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=1
 PYPI_NO_NORMALIZE=1
 inherit edo distutils-r1 optfeature pypi
 
@@ -19,18 +20,22 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 RDEPEND="
-	dev-python/python-debian[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-vcs/breezy[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/python-debian[${PYTHON_USEDEP}]
+		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	')
+	dev-vcs/breezy[${PYTHON_SINGLE_USEDEP}]
 "
 BDEPEND="
 	test? (
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/markdown[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/tomlkit[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+			dev-python/docutils[${PYTHON_USEDEP}]
+			dev-python/lxml[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
+			dev-python/pygments[${PYTHON_USEDEP}]
+			dev-python/tomlkit[${PYTHON_USEDEP}]
+		')
 	)
 "
 
@@ -48,6 +53,7 @@ python_test() {
 
 src_install() {
 	distutils-r1_src_install
+
 	doman man/*
 	dodoc docs/*
 }