diff --git a/app-doc/cppman/Manifest b/app-doc/cppman/Manifest
index 310e833c6cf7f..83e9f28fa0b68 100644
--- a/app-doc/cppman/Manifest
+++ b/app-doc/cppman/Manifest
@@ -1,2 +1,2 @@
-DIST cppman-0.5.6.tar.gz 3820427 BLAKE2B ca4c3bc05e3f8b7de432147dcff861ab4b1d3b3de2729da2dc4cb8513f96b3b92e9a7ebbbf0ad577d7372ebc7d152290431d4d95127c63a1a9122c2dd5f12aae SHA512 bf4c0aa01d0a7158818f5769c66c420fb982fb3c0daaf83e4089f122e59ac5d9d2637b9ff079ea3ee7259bbb92b72992bcb2b1a593fc1bb7223288077fb523b6
 DIST cppman-0.5.9.tar.gz 4657401 BLAKE2B 9d9bdbe81808ad26b242670c61d04cb6e5ce85f644ca5c0bba1e348fd36615a3252e705810abf3deb5d5f74db9b55682850a7ca83775ed30c1cc0c74b8dd038d SHA512 5a660be80c99fee0a68fe0a114548fde6998c18aaacca7a3030b28b8b44bdfd8071c72f0c5bbd8bdce86932f5a57b186373de89796182e39dd1149cf4019c3a1
+DIST cppman-0.6.0.tar.gz 1645897 BLAKE2B 7127a3bc216a3be0c6ea6364bc7979cae47bb3ecb103e54e23dc0244f59d9bdbc98a6f1f2134a6b86e2fb5479baa6627ac1b0c6b4b23ca7b8bb93f6c4202d369 SHA512 a9160238eaac847a6e34b84789cf1be06675b82aceac1ed338e4c11eddf529bbfe68aa28095bc6d4d8d6031087004ade15318cfd674200425fd03b302e7562d6
diff --git a/app-doc/cppman/cppman-0.5.6-r1.ebuild b/app-doc/cppman/cppman-0.6.0.ebuild
similarity index 64%
rename from app-doc/cppman/cppman-0.5.6-r1.ebuild
rename to app-doc/cppman/cppman-0.6.0.ebuild
index b74f5103ca402..f980812c99f37 100644
--- a/app-doc/cppman/cppman-0.5.6-r1.ebuild
+++ b/app-doc/cppman/cppman-0.6.0.ebuild
@@ -1,21 +1,23 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..14} )
 PYTHON_REQ_USE="sqlite,threads(+)"
 DISTUTILS_SINGLE_IMPL=yes
 DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 bash-completion-r1
+inherit distutils-r1 shell-completion edo
 
 DESCRIPTION="C++ man pages for Linux, with source from cplusplus.com and cppreference.com"
 HOMEPAGE="https://github.com/aitjcize/cppman"
-SRC_URI="https://github.com/aitjcize/cppman/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SRC_URI="https://github.com/aitjcize/cppman/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
+IUSE="test"
 PROPERTIES="test_network"
 RESTRICT="test"
 
@@ -23,8 +25,11 @@ RDEPEND="
 	sys-apps/groff
 	$(python_gen_cond_dep '
 		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-	')
+		dev-python/html5lib[${PYTHON_USEDEP}]')
+"
+BDEPEND="
+	test? ( $(python_gen_cond_dep '
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]') )
 "
 
 src_prepare() {
@@ -35,7 +40,7 @@ src_prepare() {
 }
 
 python_test() {
-	${EPYTHON} test/test.py || die
+	edo ${EPYTHON} test/test.py
 }
 
 src_install() {
@@ -43,10 +48,6 @@ src_install() {
 	doman misc/cppman.1
 
 	newbashcomp misc/completions/cppman.bash cppman
-
-	insinto /usr/share/zsh/site-functions
-	doins misc/completions/zsh/_cppman
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins misc/completions/fish/cppman.fish
+	dozshcomp misc/completions/zsh/_cppman
+	dofishcomp misc/completions/fish/cppman.fish
 }
diff --git a/media-gfx/gimp/gimp-3.0.6.ebuild b/media-gfx/gimp/gimp-3.0.6.ebuild
index 424765652d748..3fe2b7f1207d5 100644
--- a/media-gfx/gimp/gimp-3.0.6.ebuild
+++ b/media-gfx/gimp/gimp-3.0.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 x86"
 
 IUSE="X aalib alsa doc fits gnome heif javascript jpeg2k jpegxl lua mng openexr openmp postscript test udev unwind vala vector-icons wayland webp wmf xpm"
 REQUIRED_USE="