Merge updates from master

sys-apps/dool/Manifest

@@ -1 +1,2 @@
 DIST dool-1.3.1.tar.gz 150933 BLAKE2B 9aadd4e196cfb7c57fc5fd539f1211b3249b0da955aa2869c43c66b2c2a63816f5cb3e5bcffefada47269f8bd4e3f4b0ace8512f6b0de07e66e0e830ae50c0c2 SHA512 20cabbcbe09152c1ebcaed08bd182586e20d0bae297b61031f1cc52bfce3b9827cc84843e5e5a3dc0d3e790ef2d6da5eb5925d287647f80023925611eb9b04ee
+DIST dool-1.3.2.tar.gz 152959 BLAKE2B cd0cc6f82b89ba80cd7934d609aedaeb28bdcb10b332a70b7b706bf153668645b1a042c2da7f7e4c399e5119935b2db602ee651dc2ea85c900e254e27fd89d07 SHA512 792bec7c777746e68737b1c95dac02575262fe341a75da62fcd0ef1e09185779ac376389daa45e6407be06befb003b53f2ca16982302f6e24230bd0bed70ab06

sys-apps/dool/dool-1.3.2.ebuild

@@ -0,0 +1,65 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="Versatile replacement for vmstat, iostat and ifstat (clone of dstat)"
+HOMEPAGE="https://github.com/scottchiefbaker/dool"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/scottchiefbaker/dool.git"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/scottchiefbaker/dool/archive/refs/tags/v${PV}.tar.gz
+			-> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 "
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc examples"
+
+src_prepare() {
+	default
+
+	# https://github.com/scottchiefbaker/dool/pull/80
+	mv dool dool.py || die
+
+	mkdir dool || die
+	mv plugins dool || die
+	mv dool.py dool || die
+
+	cat <<-EOF > dool/__init__.py || die
+	"""Versatile replacement for vmstat, iostat and ifstat (clone of dstat)"""
+	__version__ = "${PV}"
+	EOF
+
+	sed -i 's/dool:__main/dool.dool:__main/' pyproject.toml || die
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	doman "docs/${PN}.1"
+
+	einstalldocs
+
+	if use examples; then
+		dodoc examples/{mstat,read}.py
+	fi
+
+	if use doc; then
+		dodoc docs/*.html
+	fi
+}
+
+src_test() {
+	python_foreach_impl emake test
+}

sys-apps/dool/dool-9999.ebuild

@@ -3,9 +3,10 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{10..13} )
 
-inherit python-r1
+inherit distutils-r1
 
 DESCRIPTION="Versatile replacement for vmstat, iostat and ifstat (clone of dstat)"
 HOMEPAGE="https://github.com/scottchiefbaker/dool"
@@ -24,22 +25,27 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="doc examples"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="${PYTHON_DEPS}"
+src_prepare() {
-DEPEND="${RDEPEND}"
+	default
 
-src_compile() {
+	# https://github.com/scottchiefbaker/dool/pull/80
-	:
+	mv dool dool.py || die
-}
 
-python_install() {
+	mkdir dool || die
-	python_doscript "${PN}"
+	mv plugins dool || die
-	python_domodule plugins/${PN}_*.py
+	mv dool.py dool || die
+
+	cat <<-EOF > dool/__init__.py || die
+	"""Versatile replacement for vmstat, iostat and ifstat (clone of dstat)"""
+	__version__ = "${PV}"
+	EOF
+
+	sed -i 's/dool:__main/dool.dool:__main/' pyproject.toml || die
 }
 
 src_install() {
-	python_foreach_impl python_install
+	distutils-r1_src_install
 
 	doman "docs/${PN}.1"