9 files changed, 180 insertions, 7 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index f941a486ab5d..07e7eaa6b743 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 5c9acf42e3a1..5c64e01aa0e9 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -3,6 +3,8 @@ DIST android-tools-31.0.3-install-e2fsdroid-ext2simg.patch 2164 BLAKE2B 7f0b43ff
 DIST android-tools-31.0.3-no-gtest.patch 3152 BLAKE2B da71e3cba87b21ffcb144602a06d7e269faabd173233363b757cd2191c051f8d3281f591117d4551d7acc029d6e2d421f702f9f836dfe0dec6c676aa39a2d9fe SHA512 a28d2264bf40c420a279acf1f4c3b4588d96ce2d6e2d6d322abbde62d773804bef10dc33f13dd52c7de80ace6c58f91ae28f5d4e8e97dfae4d2a8473d8537423
 DIST android-tools-31.0.3.tar.xz 25768908 BLAKE2B e8ca8ff93fcd3936f447926769d7b45194dd96ad99cddd570183a1cbae34dbf49a23e0c53d9eb8f5c25dd09717e1f160829752dc7ebc9404c804b48de8de9889 SHA512 d2c16325b190f77a8ffa38de18ae1aea4bf6848926620f25d14873dc4a3fda3fe2b13349fa2eee197b960ca65738a4a1d2c1f28cf8286ab79e73502e7a8e6357
 DIST android-tools-31.0.3p2.tar.xz 22458776 BLAKE2B a51f839ac44e6e998092d802eb182566f4dc2a7f47a5687e0c877fa4fa6d419b16054f75066a6afe8e458e44f8bc5750ca88a2517619379d1044202d64b2ec80 SHA512 367a502c11a136ff15a060df44df14ceec46eb5eb386babb4d38783622e363421d2ec9a65a5810fb8f2b308912c2bdb980e6fce24ba532a111e413647efe67d5
+DIST android-tools-33.0.3.tar.xz 25300756 BLAKE2B 4254f0ab8657966cf56e2a7c3e9a3d889dfa9f26e61d8b46480bb74c5a8be33494f450827e3b2db4087006b3160892e6a846ef33719870cbbd032647cfc3ce78 SHA512 78c8141f5f13f1c0e5da474e1d79760a612e911519af4e9f21c0e5005f2ce99f3aeacf16f3fcdfe1250fc795a88190fa243592e1066a2156e1fd8d2b9c3d7f71
 EBUILD android-tools-31.0.3.ebuild 2207 BLAKE2B 075ba2bcbf2f30b9c3804be39c3b67397634e69baf1572096f32a3f0d927fd35526246ef2e4590dddf92f71350bc172bf58c1e70107cfbde015588ada9f90509 SHA512 57d1e597562ab7688f5715635b6c4f86e7dd5b8b00fc120793fd7a047924f647f9f4725e86b93afb0648c8c8c086cca5a7eeea56a90a2636d23fcf571daccde7
 EBUILD android-tools-31.0.3_p2.ebuild 2157 BLAKE2B 3f7738ccabc27a7b54f30f533613aca897efb4a70cae04a999a586320d42711329cb4521f5da8f19a6b091c72104aace5993fe74b04057f8a00e3f8269ed9436 SHA512 4b6621928d031ee07f0517b882cdd8f37a833aa5f2b398f7a40df6e4ba13b9c030c300f620daef43143f0573aff0ba955d8f59a5ca3d8475395118592add7fbd
+EBUILD android-tools-33.0.3.ebuild 2159 BLAKE2B 8adf5dfb99fd6d2c68d6073cbd8021829212540520226aa8070cbad13aa5d5ce18d1c0cd37b36b4fa835a5988800fc39c453e114cf5c73e031e2647f826edf98 SHA512 d55b55fe5b07e2b758c29d06c25236a3ef2922397ee87bd509b9ad4c5e1f7d5818ff4f2620dfd2fd095e6cf64ad2a87b763b1efa0f13e1d24f1bf0ef5b0e4914
 MISC metadata.xml 724 BLAKE2B 7ef6e07d806dff51946236dfee2f5eaf207fd7c9cde6e73cb7f372fea5cd8b2b559e4f1fe81a315c41beed5beba92603cc93a16183d63953fbed4ba0d2941116 SHA512 d47cf87259ad2b2a8d6f8edf6b2c2084d0046773447ed9647cc232437ec8f3e8c452cb26ac7e0a619b220e073518903b77c55ba7c2e9f7663069fea2e7096e75
diff --git a/dev-util/android-tools/android-tools-33.0.3.ebuild b/dev-util/android-tools/android-tools-33.0.3.ebuild
new file mode 100644
index 000000000000..412e78a5f808
--- /dev/null
+++ b/dev-util/android-tools/android-tools-33.0.3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake python-r1
+
+DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
+HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/"
+
+MY_PV="${PV//_/}"
+SRC_URI="https://github.com/nmeum/android-tools/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz
+	https://dev.gentoo.org/~zmedico/dist/${PN}-31.0.3-no-gtest.patch
+"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# The entire source code is Apache-2.0, except for fastboot which is BSD-2.
+LICENSE="Apache-2.0 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x86-linux"
+IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# dev-libs/libpcre only required for e2fsdroid
+DEPEND="
+	app-arch/brotli:=
+	app-arch/lz4:=
+	app-arch/zstd:=
+	dev-libs/libpcre2:=
+	>=dev-libs/protobuf-3.0.0:=
+	sys-libs/zlib:=
+	virtual/libusb:1=
+"
+RDEPEND="${DEPEND}
+	python? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	dev-lang/go
+"
+
+DOCS=()
+
+src_prepare() {
+	eapply "${DISTDIR}/${PN}-31.0.3-no-gtest.patch"
+	cd "${S}/vendor/core" || die
+	eapply "${S}/patches/core/0011-Remove-the-useless-dependency-on-gtest.patch"
+	cd "${S}/vendor/libziparchive" || die
+	eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch"
+	cd "${S}"
+	rm -r patches || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# Statically link the bundled boringssl
+		-DBUILD_SHARED_LIBS=OFF
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	export GOCACHE="${T}/go-build"
+	export GOFLAGS="-mod=vendor"
+	cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+	rm "${ED}/usr/bin/mkbootimg" || die
+	rm "${ED}/usr/bin/unpack_bootimg" || die
+	rm "${ED}/usr/bin/repack_bootimg" || die
+	if use python; then
+		python_foreach_impl python_newexe vendor/mkbootimg/mkbootimg.py mkbootimg
+		python_foreach_impl python_newexe vendor/mkbootimg/unpack_bootimg.py unpack_bootimg
+		python_foreach_impl python_newexe vendor/mkbootimg/repack_bootimg.py repack_bootimg
+	fi
+	docinto adb
+	dodoc vendor/adb/*.{txt,TXT}
+	docinto fastboot
+	dodoc vendor/core/fastboot/README.md
+}
diff --git a/dev-util/kdevelop-pg-qt/Manifest b/dev-util/kdevelop-pg-qt/Manifest
index 9d9d937d8baf..f912df4df13d 100644
--- a/dev-util/kdevelop-pg-qt/Manifest
+++ b/dev-util/kdevelop-pg-qt/Manifest
@@ -1,3 +1,5 @@
 DIST kdevelop-pg-qt-2.2.1.tar.xz 660904 BLAKE2B b3874ee4f36d43f6d39a28a79f4638601340ce0545c2fe965393e9fe266a960e904ce5cd3215a7903f7b011f2e138d3be8999563366ce796f50524084a36192b SHA512 0ef3daba60ee6c7d4602b31610bdc68709a730d4c3443770eac1aa1d298fc03e10b38bc0d2e34dd44df5bba1c3af945c87e80d8aaa818e0b1787121f056c78a9
+DIST kdevelop-pg-qt-2.2.1_p20220904-72138ed0.tar.gz 1131103 BLAKE2B a388fa38e27115912af7a589f43dc6f95f4af4790435bfda6344fa62245acb37254d86df48bda9201dc6341dc88f04d4bba7c3cfae90189a88e506af66fab95c SHA512 953dc8e76a7cf8d46963ec3b41252b9b19a03275469cfc145b649ef999df1b8aa8f45666616ee56c139eeb4b1e90e6f2fd85d18a1c2371a6133da674ce187106
 EBUILD kdevelop-pg-qt-2.2.1.ebuild 498 BLAKE2B 038fb285a2011f3ac700b5520c3ed1a509afce247a15697be0fae25b51a57253de8cf2586316d989cb48ee14aeb92e3ef99dd708c49c1ef1f63ff3e380152bf2 SHA512 dbc69484eef95d7cc080babc687e08ee4f4a81bf7a4513cf814b6f03deefd0aad4eddf02779ba568b437cae9987aa8b50635a7ab0bab96f0526bfe776632dd66
+EBUILD kdevelop-pg-qt-2.2.1_p20220904.ebuild 468 BLAKE2B 152953b32d60374e07f02daaf46185a04b93af9cc378ca0994fcd003fa216e5a353799fda9373acc1afdc3f297f6c4b7194dc601d3c4f821beac01a8482b6c7c SHA512 45adc4cdf825433884ac6a4db590fbbdf7ca83904a55c88c96f84f8922c86e375d19eab2cce68781fe28bc67036bde1dba0954bca89e9e82c3707b0bf5a15ad5
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.1_p20220904.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.1_p20220904.ebuild
new file mode 100644
index 000000000000..5dfcfc95edbb
--- /dev/null
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.1_p20220904.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+KDE_ORG_CATEGORY="kdevelop"
+KDE_ORG_COMMIT="72138ed04d427f520e65b146525632e967177abe"
+inherit ecm kde.org
+
+DESCRIPTION="LL(1) parser generator used mainly by KDevelop language plugins"
+HOMEPAGE="https://kdevelop.org/"
+
+LICENSE="LGPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
diff --git a/dev-util/massif-visualizer/Manifest b/dev-util/massif-visualizer/Manifest
index 1c1d71f183aa..f80bc3139334 100644
--- a/dev-util/massif-visualizer/Manifest
+++ b/dev-util/massif-visualizer/Manifest
@@ -1,4 +1,6 @@
 AUX massif-visualizer-0.7.0-fix-window-icon.patch 815 BLAKE2B 253bd14bef04a2f1abe531d0dffaec837502a4ae56db341a875888160553a3246cd71fcb01977844482eccbf123dbb4fc4ddcb4b50c06230ce7544dfebb4cb57 SHA512 ecb5d0aceefd82bc05da91fe2e76f999078e41f10821534e512a52f13f43ac247ddf88e7f5d0952e5d8aa07c2714f7ea8f2e31b8361a2a0eb1de5a25692dd984
+AUX massif-visualizer-0.7.0-linking.patch 1145 BLAKE2B 9fd6f9af189837ac6d76c7bbc9bfcd3d934c415e4176ed1ced88bbc393a058226776b894b91b01455bff55c00ad393e08e761d1866adf70e720acdbc64bce4f6 SHA512 18e9d4603898bdd55004694f64fc9b0d9417f479756a02959864502588f90d1a1b52d1836cacad315a4cbd03f78bccbaf472b87e8d0e1f19883fc01803f64219
+AUX massif-visualizer-0.7.0-unused-dep.patch 529 BLAKE2B 1641d497bdd34a6c2c4bd1d93c72f19e428d315b063384f21c090a5f797240769db732b5f3253eb9e3264f69fa832e1218fecf3ea125cb862242e41c0d0da87b SHA512 cbec2ae9f04c8c1411bd3a298dfcf6e55cd85ad00f3208eef912e99104435a5276d5bb3db63a88200d74766833950d92f168d36644485d178e811109504a15f8
 DIST massif-visualizer-0.7.0.tar.xz 257380 BLAKE2B fa6cce5377c2c8eb8d170970304384ec7d745ebf7e324ebe42fb4f57f230e1f39bc9078bf89ea5de7d84e0e669a61e4e6f027ebd7ebec31ab0479336f1cd72f7 SHA512 058412e34c0899a34fb4080a602cb0c70a9ac707f27b72a79fb412ea35a6e8c66ce06df15b3153fdc1a70a27232f98b508c7441b657eb73466962b33f9b2f561
-EBUILD massif-visualizer-0.7.0-r1.ebuild 1223 BLAKE2B 0d01853adba67f58eedab30ae4be2b875051835b9ee84df163b3bb993198b970585a02a731455685c9e5570c0e36a9df3df43e2b8e5c849bf1428810ed14701b SHA512 bf9093effd15663b66be01dcc275561aecce1d58e7570123f3f8037c022ed9f1daada3561615777dec72f07d1574cd67b5cf0ff70380c5967a618335acdd0730
+EBUILD massif-visualizer-0.7.0-r1.ebuild 1259 BLAKE2B 4fef6bdaf5b4d4a90aea33e10c83621516d3b6dcabe66f59fdedc395a0ce79c77f7cdcdd61506888d2c612a4bbe1940dd78669566bbdeffaf61d3ccae226f73b SHA512 321aafc5bc8ff13a56677c1a736d98e0211193fe4d6ad88afd1923babdf6e6dc0fdd33bc8b88115eef05787efa98d724b2e901aecf769e29d513e563ecb8701a
 MISC metadata.xml 439 BLAKE2B 84769f8b1a94b2661706e00447a047ff287c06347f4f5571d8deba82147bc9fc35d67774c45abd3b40ed3a11ea6a7f8ebe0e535ceb824b98abda6b3d417578a8 SHA512 9c5869ac9741956f11163181eec4483ead5578e5de85c4ea6f1850423c2b94be7cfaaee6ee4634bffb2f9f2cdd9e29fc19bddb2b3113c876365b6fb7ba4ec630
diff --git a/dev-util/massif-visualizer/files/massif-visualizer-0.7.0-linking.patch b/dev-util/massif-visualizer/files/massif-visualizer-0.7.0-linking.patch
new file mode 100644
index 000000000000..252d75ba6a0e
--- /dev/null
+++ b/dev-util/massif-visualizer/files/massif-visualizer-0.7.0-linking.patch
@@ -0,0 +1,36 @@
+From d49c8946fea8ce239e258c5e69fefd1cae5cb5fe Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Tue, 6 Apr 2021 00:29:33 +0200
+Subject: [PATCH] Add some missing linkages
+
+Currently things work due to transitiveness, but we better not rely on that
+---
+ massifdata/CMakeLists.txt | 1 +
+ test/CMakeLists.txt       | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/massifdata/CMakeLists.txt b/massifdata/CMakeLists.txt
+index a8a7b98..4881a30 100644
+--- a/massifdata/CMakeLists.txt
++++ b/massifdata/CMakeLists.txt
+@@ -21,4 +21,5 @@ LINK_PRIVATE
+     KF5::Archive
+     KF5::KIOCore
+     KF5::I18n
++    KF5::ConfigCore
+ )
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 38c510e..7ccbc2d 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ ecm_add_test(datamodeltest datamodeltest.cpp modeltest.cpp
+     TEST_NAME "datamodeltest"
+-    LINK_LIBRARIES mv-massifdata mv-visualizer Qt5::Core Qt5::Test KF5::KIOCore
++    LINK_LIBRARIES mv-massifdata mv-visualizer Qt5::Core Qt5::Test KF5::KIOCore KF5::ConfigCore
+ )
+ 
+ add_executable(massifparser massifparser.cpp)
+-- 
+GitLab
+
diff --git a/dev-util/massif-visualizer/files/massif-visualizer-0.7.0-unused-dep.patch b/dev-util/massif-visualizer/files/massif-visualizer-0.7.0-unused-dep.patch
new file mode 100644
index 000000000000..d6333da7185a
--- /dev/null
+++ b/dev-util/massif-visualizer/files/massif-visualizer-0.7.0-unused-dep.patch
@@ -0,0 +1,24 @@
+From c66b5a33885211da16cd720fd0f6ab5b4abba297 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Thu, 28 Oct 2021 00:20:53 +0200
+Subject: [PATCH] Remove unused XmlPatterns
+
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 569974f..f2f15f2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -23,7 +23,6 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED
+     Core
+     Widgets
+     Svg
+-    XmlPatterns
+     Test
+     PrintSupport
+ )
+-- 
+GitLab
+
diff --git a/dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild b/dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild
index 81ddb609d337..da42e66688b4 100644
--- a/dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild
+++ b/dev-util/massif-visualizer/massif-visualizer-0.7.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
 
 ECM_TEST="forceoptional"
 KFMIN=5.60.0
@@ -35,11 +35,13 @@ RDEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	callgraph? ( media-gfx/kgraphviewer:5 )
 "
-DEPEND="${RDEPEND}
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-"
+DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-fix-window-icon.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-fix-window-icon.patch"
+	"${FILESDIR}/${P}-linking.patch"
+	"${FILESDIR}/${P}-unused-dep.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(