6 files changed, 27 insertions, 20 deletions
diff --git a/dev-util/crash/Manifest b/dev-util/crash/Manifest
index b5137def4ef9..2a3fac062f85 100644
--- a/dev-util/crash/Manifest
+++ b/dev-util/crash/Manifest
@@ -1,5 +1,5 @@
-DIST crash-7.3.0.tar.gz 1326319 BLAKE2B 7a775c3a8b81f986fc3444939b30db7245c5573556ab3e07e2b7762c75ccbf2b9d828d75bde8dc4b8d8df8532b3dfb6dba500723f2c2cb02e2d4166749c92705 SHA512 bc288821892c3d7ecbf192d9fe6ea9e73216f8074a24d12a00fbcaf967a1faa38ee69c4a5a97aa93bf75426293f5b275f5ab496c154b4e7be265ba0e263b2bc8
 DIST crash-7.3.1.tar.gz 1329499 BLAKE2B 9c9fd88d7f8874557b99a173b4bd615bb5d41d35b051ee6e82c10a8928b150861dbfdecb3ba94e1367c62c6bb8583c85d39ce7015945d4983d3ce1e1d86dac78 SHA512 018fc33daa144906a29120660951755856169be3df123bcf2bec9c1c4586a18f528c14634f794e658d3dab308419b7a6a7f56b9b0ac5aad68b5ff18ae442f63b
+DIST crash-8.0.0-patches-1.tar.xz 38880 BLAKE2B b1b22a55f07e7c23c90d13769cdf0db92d3015d5aa5af20bef85394013635bb393c4bbc36fb0af2a925b59b98289e33b3c092ca39c9c90c7213ba5e4b9af8b74 SHA512 17f638c4a5d2cff472a75f58d82d3b7325e6cf9444641c85ec6a3be5b4980aae90ec19dae66ae4b5022f938faae6876b4b50c0b791087fbd20629745b9909ac6
 DIST crash-8.0.0.tar.gz 1281026 BLAKE2B bb86bc64d04ce136295bf57097674e96d29e5c934b2fc55f2bd5fa331f2d0086929e1fc7ce60b75b4df1ded128e71048e555bffc3321f6f860d00a8fae8bc09e SHA512 c52afab6c8187dc0c44a13b2a5b33bd7df33d9ee12bcecc6b7e94e8bc98d9470c134cb0fbe941b750f36a66028aad718bfd6f1a00524ad38ce43d1f278048a3b
 DIST gdb-10.2.tar.gz 40267550 BLAKE2B cee3ab45a52ed378fc718e49c4d153393200fd1b85306888e4085919ab27277bb85d66f9297e6d0aaa1fb47d65fc31d4b97a2fc476e2ccedd4dba0fbec778ab4 SHA512 aa89caf47c1c84366020377d47e7c51ddbc48e5b7686f244e38797c8eb88411cf57fcdc37eb669961efb41ceeac4181747f429625fd1acce7712cb9a1fea9c41
 DIST gdb-7.6.tar.gz 31437633 BLAKE2B fb8cb9f0c33f360c864c5776c3dd0233ad534d376a9df8157c7bc9f1c4ccfc8698933409561700f134705c0107038d8bfa23844e512cd3a08e24925d37a1ce58 SHA512 02d9c62fa73bcb79138d14c7fc182443f0ca82d4545b4d260b67d3f0074ed75f899a657814a56727e601032a668b0ddd7b48aabd49215fc012eeea6077bca368
diff --git a/dev-util/crash/crash-7.3.0.ebuild b/dev-util/crash/crash-8.0.0-r1.ebuild
index 25d3d913e8f2..13cee473e98b 100644
--- a/dev-util/crash/crash-7.3.0.ebuild
+++ b/dev-util/crash/crash-8.0.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -12,7 +12,8 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/crash-utility/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-		mirror://gnu/gdb/gdb-7.6.tar.gz"
+		https://dev.gentoo.org/~dlan/distfiles/${CATEGORY}/${PN}/${PN}-8.0.0-patches-1.tar.xz
+		mirror://gnu/gdb/gdb-10.2.tar.gz"
 	KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86"
 fi
 
@@ -26,10 +27,12 @@ IUSE=""
 # make rules catch it and tests fail
 RESTRICT="test"
 
+PATCHES=( "${WORKDIR}"/${P}-patches/ )
+
 src_prepare() {
-	sed -i -e "s|ar -rs|\${AR} -rs|g" Makefile || die
-	ln -s "${DISTDIR}"/gdb-7.6.tar.gz . || die
 	default
+	sed -i -e "s|ar -rs|\${AR} -rs|g" Makefile || die
+	ln -s "${DISTDIR}"/gdb-10.2.tar.gz . || die
 }
 
 src_compile() {
diff --git a/dev-util/crash/crash-9999.ebuild b/dev-util/crash/crash-9999.ebuild
index 25d3d913e8f2..f55b7b3c70b8 100644
--- a/dev-util/crash/crash-9999.ebuild
+++ b/dev-util/crash/crash-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/crash-utility/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-		mirror://gnu/gdb/gdb-7.6.tar.gz"
+		mirror://gnu/gdb/gdb-10.2.tar.gz"
 	KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86"
 fi
 
@@ -27,9 +27,9 @@ IUSE=""
 RESTRICT="test"
 
 src_prepare() {
-	sed -i -e "s|ar -rs|\${AR} -rs|g" Makefile || die
-	ln -s "${DISTDIR}"/gdb-7.6.tar.gz . || die
 	default
+	sed -i -e "s|ar -rs|\${AR} -rs|g" Makefile || die
+	ln -s "${DISTDIR}"/gdb-10.2.tar.gz . || die
 }
 
 src_compile() {
diff --git a/dev-util/kdstatemachineeditor/Manifest b/dev-util/kdstatemachineeditor/Manifest
index 646664b223b5..831bcf128600 100644
--- a/dev-util/kdstatemachineeditor/Manifest
+++ b/dev-util/kdstatemachineeditor/Manifest
@@ -1 +1 @@
-DIST kdstatemachineeditor-1.2.4.tar.gz 222160 BLAKE2B c0194282b1f17c550454d16fb3790e6747c785b01f867aa115134a3f1298c7d0bdd522d07bdc26ab4353d62482a8602c1418dd8e480a6b5b5665b8dfe8ca1d93 SHA512 f1c076a8646a26d3a6629298523b02589fcf53fc8ac01d93928b1bc42179d3a26c7f90d595e2226e5cf3d54d90d143719e72854f3b756489f6d0b8643810675f
+DIST kdstatemachineeditor-1.2.8.tar.gz 243271 BLAKE2B 0b44598115d6bf7272ef8a534a857c02141a34070836a010021b8925002f2b87bd590c3c76413904ac52de297bcb322db0dea6d76f5e04947bd98257e2ece229 SHA512 728b8576d2d0b32b285b0fccbd698b426c557ab08470fc4ec044ec5acce5dc7a394c183d24ae3e9cde02d872b3eaef6b60424a3acd22052508b2456b0dad10a3
diff --git a/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.4.ebuild b/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.8.ebuild
index b059c970683b..d67368a4579c 100644
--- a/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.4.ebuild
+++ b/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.8.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake qmake-utils
 
 DESCRIPTION="Framework for creating Qt State Machine metacode using graphical user interfaces"
 HOMEPAGE="https://github.com/KDAB/KDStateMachineEditor"
 
-if [[ ${PV} == 9999 ]] ; then
+if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/KDAB/KDStateMachineEditor.git"
 else
@@ -17,9 +17,10 @@ else
 fi
 
 LICENSE="GPL-2+"
+SLOT="0"
 IUSE="doc test"
+
 RESTRICT="!test? ( test )"
-SLOT="0"
 
 RDEPEND="
 	dev-qt/qtcore:5
@@ -45,6 +46,7 @@ BDEPEND="
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_EXAMPLES=OFF
+		-DWITH_INTERNAL_GRAPHVIZ=OFF
 		-DBUILD_DOCS=$(usex doc)
 		-DBUILD_TESTING=$(usex test)
 		-DECM_MKSPECS_INSTALL_DIR=$(qt5_get_mkspecsdir)/modules
diff --git a/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild b/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild
index b059c970683b..d67368a4579c 100644
--- a/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild
+++ b/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake qmake-utils
 
 DESCRIPTION="Framework for creating Qt State Machine metacode using graphical user interfaces"
 HOMEPAGE="https://github.com/KDAB/KDStateMachineEditor"
 
-if [[ ${PV} == 9999 ]] ; then
+if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/KDAB/KDStateMachineEditor.git"
 else
@@ -17,9 +17,10 @@ else
 fi
 
 LICENSE="GPL-2+"
+SLOT="0"
 IUSE="doc test"
+
 RESTRICT="!test? ( test )"
-SLOT="0"
 
 RDEPEND="
 	dev-qt/qtcore:5
@@ -45,6 +46,7 @@ BDEPEND="
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_EXAMPLES=OFF
+		-DWITH_INTERNAL_GRAPHVIZ=OFF
 		-DBUILD_DOCS=$(usex doc)
 		-DBUILD_TESTING=$(usex test)
 		-DECM_MKSPECS_INSTALL_DIR=$(qt5_get_mkspecsdir)/modules