4 files changed, 131 insertions, 2 deletions
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 1cdb71297b3b..fd8ab6c64d77 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index e4d1a16d0100..bd1a1f02d2c1 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -2,9 +2,11 @@ DIST gentoolkit-0.6.3.tar.bz2 3186163 BLAKE2B 0f9befac53faa2b578b461a55c7113934a
 DIST gentoolkit-0.6.5.tar.bz2 3186457 BLAKE2B 7f873385b183e51b03e1c4be0edbabc89556e1b3a1dce2be71584c9ea927dd09185ba1022e570de0ed2a46cbb764c67f6eaccf97dc5892f4f355244bac7c0545 SHA512 cff9e7b1b8122941b03f7e156f25b5b416c5e4bbf1b759ecf006c271758f2548323bf59ba94a14f3268eea43081ccbba3ab63e118123af870c0257aaecbb9554
 DIST gentoolkit-0.6.6.tar.bz2 3187351 BLAKE2B f8add246e9d968c57a8d0e5c842a40a7646e92cc165ca611df35988ba55bd0221a26eefb351680f53e81adcf608a20eab604d0a9b9e52f936ebc7c20575c597c SHA512 73fc4b8d98dc118d3c505c49d94dd248c92d2bde883c130c65dcf814d200a165084e9c94713e93341e7c54b59b59db83279538440e0822902de688c135b8949d
 DIST gentoolkit-0.6.7.tar.bz2 3187598 BLAKE2B 54c576fa7ded310fae24100171e069bfc79c0f908199384d33cac34d49f62e5cac4bda3e7f93db1866f8d4cf75afb465d82038eebb4df27070e14e73fba65feb SHA512 a5fb73c9b43e74541ccbb0537f860b6623284b84feb8922c95b5b5dd1dbd3db5117cbc3f899483c1a99086fcd8ddf49f71b81475e29af9e8bcdd1255553501fe
+DIST gentoolkit-0.6.8.tar.bz2 3190065 BLAKE2B 2f792d174a25c03e0f1b895fe06282412d383561e5456d5b4d2d918f7648790846fa9390b3bb9c862618ffefe749d9ccc236682be9fecde12ef8fda17c79359d SHA512 91ba97d8000d90350ea63c4d3be69dda919795b62ae84fe264ae8fee24ce6f6250599e03b086a334344df402781372ba9ced4cedb1c2fc66e2a4f6115ee57fc5
 EBUILD gentoolkit-0.6.3-r1.ebuild 2882 BLAKE2B cdb424adeadfa09664fb4d4402c0b232bf572ce29f0e69e2010f66a86aecc3038ddd099930a1cbf445fa202aa781a41c5886043f62d3c6c0dc8b6dd557c035a2 SHA512 73c1d50ddaa39ad7523a0851c6be9c426058dc4bc160d5bb284d5c1ad7fe1cbec79aeaacfd3b274c564b6574257c0541b76bded39c318dfc64a786b3f11c030f
 EBUILD gentoolkit-0.6.5.ebuild 2882 BLAKE2B 0fc5bc941e2c240bb0eff83068ddf87995f8affd6b8f7b83e46271b0e0302a20092ffa00a537a1b216fe5b44525d90bfdd536e8ac496cc632033b77ebe23b66d SHA512 74a5a94402ae06114bc4509e39c42aef376808068ecb8995992c51999c2c17d3fed865b258e68a232cf9b6269a5d70156e8eef795244cd272ac82a964631a6b2
 EBUILD gentoolkit-0.6.6.ebuild 3005 BLAKE2B 921ac48c126c9202866fee650e46b802123ebb933405a165338092e549cd41ed2c56121a6b8b7e384dd9b337f3309c35c807e585ef15ae555695d6bedb1fd2df SHA512 b218339fd79b8892acbf22647250fbd89ef83e8eb5e60ecf25657647af42e61746bd99e2a4143c7bb66c4faaeb561fcae09b96138e0410e5999667ec52aafc41
-EBUILD gentoolkit-0.6.7.ebuild 3018 BLAKE2B b71b1cebc50d25d94e850520f0063c344f96af41c806c365d91c1b3767e06b18d60c6b5f3d2cb67bbf026bd2beca7b3ee003b13c58fbba62427162e2f9888aff SHA512 542a3d886d5e4b3faa00d9831c282c6d7f8d94d49d57e319cf63cc56264a15c3c5d94ad2a6fe8aa199effd6b2034bcbc31cd394944e1733411d5c72591664b30
+EBUILD gentoolkit-0.6.7.ebuild 3010 BLAKE2B 27f9cae1c64ff8414ea68a5ac0c1ad4c0adc8a46fb8c83930d75c72083389a9842627773ff1a8a4dfe5febbe18e85e537340538bfaf866c8103beba31271a4ff SHA512 adfdb8f7c9fa580695b2ab731e06135c03bceb4116d1660d7fa056ee27b2a56bbaf7ef56ba6bd2ccc762476300616a0416bd3bebb13db1f765fa87aa42ef7ff5
+EBUILD gentoolkit-0.6.8.ebuild 3018 BLAKE2B b71b1cebc50d25d94e850520f0063c344f96af41c806c365d91c1b3767e06b18d60c6b5f3d2cb67bbf026bd2beca7b3ee003b13c58fbba62427162e2f9888aff SHA512 542a3d886d5e4b3faa00d9831c282c6d7f8d94d49d57e319cf63cc56264a15c3c5d94ad2a6fe8aa199effd6b2034bcbc31cd394944e1733411d5c72591664b30
 EBUILD gentoolkit-9999.ebuild 3018 BLAKE2B b71b1cebc50d25d94e850520f0063c344f96af41c806c365d91c1b3767e06b18d60c6b5f3d2cb67bbf026bd2beca7b3ee003b13c58fbba62427162e2f9888aff SHA512 542a3d886d5e4b3faa00d9831c282c6d7f8d94d49d57e319cf63cc56264a15c3c5d94ad2a6fe8aa199effd6b2034bcbc31cd394944e1733411d5c72591664b30
 MISC metadata.xml 737 BLAKE2B 4145e08f0b544b2bd32a5322944bad4d019d5a693e23ace8d7b0592230c6660bf7ef4d1df4f8852745af7939c8e88e58aa04233d3a69a6e7ad624349b8e335f0 SHA512 28ec82f6a523f69d2c908b4e2cf9823ff8825e39a01187b74d37f90ee78cec751002cdf0786b177df048a5cb1c728bb29fc9f2f743b18200bf307eccdf052ce8
diff --git a/app-portage/gentoolkit/gentoolkit-0.6.7.ebuild b/app-portage/gentoolkit/gentoolkit-0.6.7.ebuild
index a463fae5ad9d..cdf0defdfb25 100644
--- a/app-portage/gentoolkit/gentoolkit-0.6.7.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.6.7.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Collection of administration scripts for Gentoo"
diff --git a/app-portage/gentoolkit/gentoolkit-0.6.8.ebuild b/app-portage/gentoolkit/gentoolkit-0.6.8.ebuild
new file mode 100644
index 000000000000..a463fae5ad9d
--- /dev/null
+++ b/app-portage/gentoolkit/gentoolkit-0.6.8.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+PYTHON_REQ_USE="xml(+),threads(+)"
+
+inherit meson python-r1 tmpfiles
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoolkit.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+DESCRIPTION="Collection of administration scripts for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
+
+LICENSE="GPL-2"
+SLOT="0"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Need newer Portage for eclean-pkg API, bug #900224
+DEPEND="
+	>=sys-apps/portage-3.0.57[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+	app-alternatives/awk
+	sys-apps/gentoo-functions
+"
+
+# setuptools is still needed as a workaround for Python 3.12+ for now.
+# https://github.com/mesonbuild/meson/issues/7702
+#
+# >=meson-1.2.1-r1 for bug #912051
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-build/meson-1.2.1-r1
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	' python3_12)
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+src_prepare() {
+	default
+	if use prefix-guest ; then
+		# use correct repo name, bug #632223
+		sed -i \
+			-e "/load_profile_data/s/repo='gentoo'/repo='gentoo_prefix'/" \
+			pym/gentoolkit/profile.py || die
+	fi
+}
+
+src_configure() {
+	local code_only=false
+	python_foreach_impl my_src_configure
+}
+
+my_src_configure() {
+	local emesonargs=(
+		-Dcode-only=${code_only}
+		$(meson_use test tests)
+		-Deprefix="${EPREFIX}"
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+	)
+
+	meson_src_configure
+	code_only=true
+}
+
+src_compile() {
+	python_foreach_impl meson_src_compile
+}
+
+src_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	python_foreach_impl epytest
+}
+
+src_install() {
+	python_foreach_impl my_src_install
+	dotmpfiles data/tmpfiles.d/revdep-rebuild.conf
+
+	local scripts
+	mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/bin/* || die)
+	python_replicate_script "${scripts[@]}"
+}
+
+my_src_install() {
+	local pydirs=(
+		"${D}$(python_get_sitedir)"
+	)
+
+	meson_src_install
+	python_optimize "${pydirs[@]}"
+}
+
+pkg_postinst() {
+	tmpfiles_process revdep-rebuild.conf
+
+	# Only show the elog information on a new install
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "For further information on gentoolkit, please read the gentoolkit"
+		elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
+		elog
+		elog "Another alternative to equery is app-portage/portage-utils"
+		elog
+		elog "Additional tools that may be of interest:"
+		elog
+		elog "    app-admin/eclean-kernel"
+		elog "    app-portage/diffmask"
+		elog "    app-portage/flaggie"
+		elog "    app-portage/portpeek"
+		elog "    app-portage/smart-live-rebuild"
+	fi
+}