gentoo auto-resync : 19:01:2024 - 02:07:15

7 files changed, 125 insertions, 171 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index a4889c7004c3..65969bdc4b8b 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index 8b8c71be78c4..7664176cc965 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,8 +1,6 @@
-AUX gentoolkit-0.6.1-data_files.patch 1157 BLAKE2B 1b6bebcc9de77532df7f3eef8e19cb82ed011e36eb20e8dc7f0fcaaabf856c7845cf3c46722c947b8235e3745e2754f227ac02f7ca48ed14af5aa0c4ff7ae906 SHA512 309d36852d4b631cb8767b85059a33f430021598b83fd26cffbddf4ce6487f10a8588ccd835335c48b62ebfd36ddf5f6cf6bc0cc980192f7ceaea90991089891
-AUX gentoolkit-0.6.1-pkgindex.patch 1637 BLAKE2B 836024b833e516dcf2aa005b1ca8ed7a542c9cf4ac5eef7b79f0e05474a0994ef02aa3f14b7fe71b8e4e823f79743e40f7f61bc5e8b0481d3d1ea261ffd90606 SHA512 6afb4dad8a74f8fe2cc285d34f70c7a50db5977dee22129b81160d2e2a069ca8fd7f9b67f57d59e6ebe750a1518447e6cf4f85c6468777a3cfe7e54162c496bc
-DIST gentoolkit-0.6.1.tar.gz 3195781 BLAKE2B 27e370de77586b375dc70caa1abba4c2bc4207e8f08e0a7ea2953097135506949db71ff9102a0ead198e4dea425440c57b94ac7a811ca2d5e0016fc7e234bb0d SHA512 1ffc466b69a9c53f1bbd40f6f4d1eb33d5f0f4287bb65ba1a7b1b2675ad61ecffa55ed9fda7c1ae8148744f0a77e224315eb1903dfd61a2a3dab1600fc672d2d
 DIST gentoolkit-0.6.3.tar.bz2 3186163 BLAKE2B 0f9befac53faa2b578b461a55c7113934a60478fc5d8d5ab0e06cb836ff5a2de75bb290ed797a2b085ec9f33c8494e3c3d5d0d6b643c525fff4dd0a82657118f SHA512 cf51480213fd4bac45d44f5eb5e4be4cb5c5b97ad63ecd832eb54fc7043ab8e974491005431f0897d6c41d251ae0f9fc95cfdfc4d613fc56340630a094bfc61d
-EBUILD gentoolkit-0.6.1-r3.ebuild 2061 BLAKE2B f3cbbe94e63f285e9eb5826f98fe311649ea2b82ff034ba738ebeb851d9a6f757688f5fce84d7142074fd1a1cdfaf811ebd52f0321ed127a006f7bb5fd608d38 SHA512 75037990e0dbd389e1ff755831fb8773529696596b380cda30a0936b8efd03a39f544e042e57b10a1e080eb0f18ee317eb78fff960f3e7c2195b664846a44e23
+DIST gentoolkit-0.6.4.tar.bz2 3186751 BLAKE2B b6fa8a7acc40009d7b99e37bf30c79d603277f116d064a145b2032af651f56cf22b6412f4223afdb9270bfddbfe912803123ed181b63ea989beea0d45d8498cc SHA512 67f85eb8fbaa28b0c28e79e8f8fe3384e65e44d824a2b123e5585348d6df7d69f1a0b74e7bc5d9592e93c0d6d597972a3e592cb7310555a2a5718723968d0277
 EBUILD gentoolkit-0.6.3-r1.ebuild 2917 BLAKE2B 1a0900a830b07288501ac28afbf865713bb9ef3d57a3c39217ba0285ee8d989df10714ce87af84a4688c0f20c6604bac4e426e914248c093cb508dca7243fa50 SHA512 6cef14ee2210941974246a5c68584e33892ed5fc9184dbd1e9acf750949850e2b16f9de59eebf5368382c04ff10507ec7ca797773dfd73a8eaa7859aad37cc06
-EBUILD gentoolkit-9999.ebuild 2925 BLAKE2B 93dfe4ae2c135cbe5b1f5803f1c37d27284f6b9ecb61ce9debf93dc86e9f5b20d30bec7a54e9b241aeb4d3cec5d4ff48bcb6e6d88b57857fbec904cbc34c2800 SHA512 79d50b86bdc7bf0104cd06ab77d08c7239b28b66a21956ce45f3e176934478978ebc0d5ac5cbf2e3fa5487208447f23ed01b6acf200882e7c6b24b7acb28b4b8
+EBUILD gentoolkit-0.6.4.ebuild 2925 BLAKE2B cdf332db772fd686aaa1f9649404aea3bbe158fe329f23450d1fb4e3c694a3957e362f181159c90430b945005ef947a0a4cf9e70b866995ef5369264e8729a51 SHA512 4f5fa3c8726f4503252c2f9fd7434bbe1d99d49293b50d32678f1890fdd1cd99227c5063398c9bc488c6e35be20c5885198a6c373dff4cbd71090b72892ca63d
+EBUILD gentoolkit-9999.ebuild 2925 BLAKE2B cdf332db772fd686aaa1f9649404aea3bbe158fe329f23450d1fb4e3c694a3957e362f181159c90430b945005ef947a0a4cf9e70b866995ef5369264e8729a51 SHA512 4f5fa3c8726f4503252c2f9fd7434bbe1d99d49293b50d32678f1890fdd1cd99227c5063398c9bc488c6e35be20c5885198a6c373dff4cbd71090b72892ca63d
 MISC metadata.xml 737 BLAKE2B 4145e08f0b544b2bd32a5322944bad4d019d5a693e23ace8d7b0592230c6660bf7ef4d1df4f8852745af7939c8e88e58aa04233d3a69a6e7ad624349b8e335f0 SHA512 28ec82f6a523f69d2c908b4e2cf9823ff8825e39a01187b74d37f90ee78cec751002cdf0786b177df048a5cb1c728bb29fc9f2f743b18200bf307eccdf052ce8
diff --git a/app-portage/gentoolkit/files/gentoolkit-0.6.1-data_files.patch b/app-portage/gentoolkit/files/gentoolkit-0.6.1-data_files.patch
deleted file mode 100644
index 8039864d69f9..000000000000
--- a/app-portage/gentoolkit/files/gentoolkit-0.6.1-data_files.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 5b52ee6c6efab68111d128d45f386ac21eaf84f6 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Sun, 10 Jul 2022 13:41:36 -0700
-Subject: [PATCH] Revert "setup.py: migrate to setuptools"
-
-This reverts commit bbbde97b5e625a49a1a66e307931548cb33f260b.
-setuptools only installs data files to the python pkg directory
----
- setup.py | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 36995de..23e9b36 100755
---- a/setup.py
-+++ b/setup.py
-@@ -3,8 +3,8 @@
- import re
- import sys
- import subprocess
--
--from setuptools import setup, Command
-+from distutils import core
-+from distutils.cmd import Command
- from glob import glob
- 
- import os
-@@ -67,7 +67,7 @@ manpages = [
- ]
- 
- 
--class set_version(Command):
-+class set_version(core.Command):
-     """Set python __version__ and bash VERSION to our __version__."""
- 
-     description = "hardcode scripts' version using VERSION from environment"
-@@ -130,7 +130,7 @@ test_data = {
-     ]
- }
- 
--setup(
-+core.setup(
-     name="gentoolkit",
-     version=__version__,
-     description="Set of tools that work with and enhance portage.",
---
-libgit2 1.4.3
-
diff --git a/app-portage/gentoolkit/files/gentoolkit-0.6.1-pkgindex.patch b/app-portage/gentoolkit/files/gentoolkit-0.6.1-pkgindex.patch
deleted file mode 100644
index 193eacc2db8b..000000000000
--- a/app-portage/gentoolkit/files/gentoolkit-0.6.1-pkgindex.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From bf3eb16e451fd1bdee8ef03a0d22e0040e033f19 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Sun, 10 Jul 2022 23:41:33 -0700
-Subject: [PATCH] eclean/pkgindex.py: Fix typo in function call
-
-  File "/usr/lib/python3.10/site-packages/gentoolkit/eclean/pkgindex.py", line
-60, in clean_pkgs_index
-    if self.get_emaint_binhost():
-AttributeError: 'PkgIndex' object has no attribute 'get_emaint_binhost'. Did
-you mean: '_get_emaint_binhost'?
-
-Also fix too many parameters in line 68 for the self.controller() call
-
-Bug: https://bugs.gentoo.org/857555
-
-Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
----
- pym/gentoolkit/eclean/pkgindex.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pym/gentoolkit/eclean/pkgindex.py b/pym/gentoolkit/eclean/pkgindex.py
-index d0878a1..7d6fade 100644
---- a/pym/gentoolkit/eclean/pkgindex.py
-+++ b/pym/gentoolkit/eclean/pkgindex.py
-@@ -57,15 +57,15 @@ class PkgIndex:
-         statinfo = os.stat(file_)
-         size1 = statinfo.st_size
-         show_progress = not quiet
--        if self.get_emaint_binhost():
-+        if self._get_emaint_binhost():
-             self.taskmaster = TaskHandler(show_progress_bar=show_progress)
-             tasks = [self.binhost]
-             self.taskmaster.run_tasks(tasks)
-         else:
-             self.call_emaint()
-         statinfo = os.stat(file_)
-         clean_size = size1 - statinfo.st_size
--        self.controller("\n", clean_size, "Packages Index", file_, "Index")
-+        self.controller(clean_size, "Packages Index", file_, "Index")
-         return clean_size
- 
-     def call_emaint(self):
---
-libgit2 1.4.3
-
diff --git a/app-portage/gentoolkit/gentoolkit-0.6.1-r3.ebuild b/app-portage/gentoolkit/gentoolkit-0.6.1-r3.ebuild
deleted file mode 100644
index 7cd0e33034bb..000000000000
--- a/app-portage/gentoolkit/gentoolkit-0.6.1-r3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-PYTHON_REQ_USE="xml(+),threads(+)"
-
-inherit distutils-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.gz"
-	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"
-
-# Need newer Portage for XML fix, bug #857537
-DEPEND="
-	>=sys-apps/portage-3.0.32[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	app-alternatives/awk
-	sys-apps/gentoo-functions"
-
-PATCHES=(
-	"${FILESDIR}/gentoolkit-0.6.1-data_files.patch"
-	"${FILESDIR}/gentoolkit-0.6.1-pkgindex.patch"
-)
-
-distutils_enable_tests setup.py
-
-python_prepare_all() {
-	python_setup
-	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	distutils-r1_python_prepare_all
-
-	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
-}
-
-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
-}
diff --git a/app-portage/gentoolkit/gentoolkit-0.6.4.ebuild b/app-portage/gentoolkit/gentoolkit-0.6.4.ebuild
new file mode 100644
index 000000000000..551b618d223a
--- /dev/null
+++ b/app-portage/gentoolkit/gentoolkit-0.6.4.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} 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}"
+
+# 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)
+"
+
+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}
+		-Deprefix="${EPREFIX}"
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+	)
+
+	meson_src_configure
+	code_only=true
+}
+
+src_compile() {
+	python_foreach_impl meson_src_compile
+}
+
+src_test() {
+	python_foreach_impl meson_src_test --no-rebuild --verbose
+}
+
+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_fix_shebang "${pydirs[@]}"
+	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
+}
diff --git a/app-portage/gentoolkit/gentoolkit-9999.ebuild b/app-portage/gentoolkit/gentoolkit-9999.ebuild
index a4e22666a537..551b618d223a 100644
--- a/app-portage/gentoolkit/gentoolkit-9999.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild
@@ -25,7 +25,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # Need newer Portage for eclean-pkg API, bug #900224
 DEPEND="
-	>=sys-apps/portage-3.0.53[${PYTHON_USEDEP}]
+	>=sys-apps/portage-3.0.57[${PYTHON_USEDEP}]
 "
 RDEPEND="
 	${DEPEND}