[gentoo-commits] repo/proj/guru:dev commit in: sys-apps/dool/

[gentoo-commits] repo/proj/guru:dev commit in: sys-apps/dool/

[Florian Schmaus]

commit:     4ee7c8fd40c19acff499fc0170fb0d59d6f7f8bb
Author:     Florian Schmaus <flo <AT> geekplace <DOT> eu>
AuthorDate: Sun Apr 11 07:59:26 2021 +0000
Commit:     Florian Schmaus <flo <AT> geekplace <DOT> eu>
CommitDate: Sun Apr 11 08:00:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4ee7c8fd

sys-apps/dool: initial import

Bug: https://bugs.gentoo.org/781173
Signed-off-by: Florian Schmaus <flo <AT> geekplace.eu>

 sys-apps/dool/Manifest                    |  1 +
 sys-apps/dool/dool-0.8_pre20191010.ebuild | 59 +++++++++++++++++++++++++++++++
 sys-apps/dool/dool-9999.ebuild            | 59 +++++++++++++++++++++++++++++++
 sys-apps/dool/metadata.xml                |  8 +++++
 4 files changed, 127 insertions(+)

diff --git a/sys-apps/dool/Manifest b/sys-apps/dool/Manifest
new file mode 100644
index 000000000..5d2cd1417
--- /dev/null
+++ b/sys-apps/dool/Manifest
@@ -0,0 +1 @@
+DIST dool-0.8_pre20191010.tar.gz 141224 BLAKE2B 9c1d733b340b3f1d51798ce85698e7fc526aea349b500431d348d413c1fd93d07d8ccb8241e671a40363275b8c4025ed2f4983b4dfc70f5e166178635935337e SHA512 5204eb1c0a37b225d447830048e5f2372dd3973d50cbd3fbc42972782a4853b809e566550e752c857502f86ceed7ea31620ea27059f9f334d27f28cc61abd968

diff --git a/sys-apps/dool/dool-0.8_pre20191010.ebuild b/sys-apps/dool/dool-0.8_pre20191010.ebuild
new file mode 100644
index 000000000..ae22099fd
--- /dev/null
+++ b/sys-apps/dool/dool-0.8_pre20191010.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit python-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
+	DOOL_COMMIT_ID="6b89f2d0b6e38e1c8d706e88a12e020367f5100d"
+	SRC_URI="https://github.com/scottchiefbaker/dool/archive/${DOOL_COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${DOOL_COMMIT_ID}"
+fi
+
+if [[ "${PV}" != "9999" ]]; then
+	KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc examples"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	:
+}
+
+src_install() {
+	python_foreach_impl python_doscript "${PN}"
+
+	insinto "/usr/share/${PN}"
+	newins "${PN}" "${PN}.py"
+	doins plugins/${PN}_*.py
+
+	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
+}

diff --git a/sys-apps/dool/dool-9999.ebuild b/sys-apps/dool/dool-9999.ebuild
new file mode 100644
index 000000000..ae22099fd
--- /dev/null
+++ b/sys-apps/dool/dool-9999.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit python-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
+	DOOL_COMMIT_ID="6b89f2d0b6e38e1c8d706e88a12e020367f5100d"
+	SRC_URI="https://github.com/scottchiefbaker/dool/archive/${DOOL_COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${DOOL_COMMIT_ID}"
+fi
+
+if [[ "${PV}" != "9999" ]]; then
+	KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc examples"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	:
+}
+
+src_install() {
+	python_foreach_impl python_doscript "${PN}"
+
+	insinto "/usr/share/${PN}"
+	newins "${PN}" "${PN}.py"
+	doins plugins/${PN}_*.py
+
+	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
+}

diff --git a/sys-apps/dool/metadata.xml b/sys-apps/dool/metadata.xml
new file mode 100644
index 000000000..bdf5f6f4f
--- /dev/null
+++ b/sys-apps/dool/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type='person'>
+		<email>flo@geekplace.eu</email>
+		<name>Florian Schmaus</name>
+	</maintainer>
+</pkgmetadata>

[gentoo-commits] repo/proj/guru:dev commit in: sys-apps/dool/

[Florian Schmaus]

commit:     046b09c9d5073e9b7d9ec72c4080ab4776b8ae40
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 06:37:59 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon May 30 06:37:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=046b09c9

sys-apps/dool: add 1.0.0, bump python support

Closes: https://bugs.gentoo.org/848408
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 sys-apps/dool/Manifest                                              | 2 +-
 sys-apps/dool/{dool-0.8_pre20191010-r1.ebuild => dool-1.0.0.ebuild} | 6 +++---
 sys-apps/dool/dool-9999.ebuild                                      | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sys-apps/dool/Manifest b/sys-apps/dool/Manifest
index 5d2cd1417..cce2385ed 100644
--- a/sys-apps/dool/Manifest
+++ b/sys-apps/dool/Manifest
@@ -1 +1 @@
-DIST dool-0.8_pre20191010.tar.gz 141224 BLAKE2B 9c1d733b340b3f1d51798ce85698e7fc526aea349b500431d348d413c1fd93d07d8ccb8241e671a40363275b8c4025ed2f4983b4dfc70f5e166178635935337e SHA512 5204eb1c0a37b225d447830048e5f2372dd3973d50cbd3fbc42972782a4853b809e566550e752c857502f86ceed7ea31620ea27059f9f334d27f28cc61abd968
+DIST dool-1.0.0.tar.gz 141224 BLAKE2B 9c1d733b340b3f1d51798ce85698e7fc526aea349b500431d348d413c1fd93d07d8ccb8241e671a40363275b8c4025ed2f4983b4dfc70f5e166178635935337e SHA512 5204eb1c0a37b225d447830048e5f2372dd3973d50cbd3fbc42972782a4853b809e566550e752c857502f86ceed7ea31620ea27059f9f334d27f28cc61abd968

diff --git a/sys-apps/dool/dool-0.8_pre20191010-r1.ebuild b/sys-apps/dool/dool-1.0.0.ebuild
similarity index 94%
rename from sys-apps/dool/dool-0.8_pre20191010-r1.ebuild
rename to sys-apps/dool/dool-1.0.0.ebuild
index f2ced2952..6c09eece2 100644
--- a/sys-apps/dool/dool-0.8_pre20191010-r1.ebuild
+++ b/sys-apps/dool/dool-1.0.0.ebuild
@@ -1,9 +1,9 @@
-# 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
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit python-r1
 

diff --git a/sys-apps/dool/dool-9999.ebuild b/sys-apps/dool/dool-9999.ebuild
index f2ced2952..6c09eece2 100644
--- a/sys-apps/dool/dool-9999.ebuild
+++ b/sys-apps/dool/dool-9999.ebuild
@@ -1,9 +1,9 @@
-# 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
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit python-r1
 

[gentoo-commits] repo/proj/guru:dev commit in: sys-apps/dool/

[Florian Schmaus]

commit:     f92fa7820b35b50d486cf436bd8b99a232fb8c35
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 19 07:27:36 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Apr 19 07:28:01 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f92fa782

sys-apps/dool: add 1.1.0

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 sys-apps/dool/Manifest          |  2 ++
 sys-apps/dool/dool-1.1.0.ebuild | 67 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+)

diff --git a/sys-apps/dool/Manifest b/sys-apps/dool/Manifest
index cce2385ed..ca8c52804 100644
--- a/sys-apps/dool/Manifest
+++ b/sys-apps/dool/Manifest
@@ -1 +1,3 @@
+DIST dool-1.0.0-fix-proc-diskstats-parsing.patch 7784 BLAKE2B 0c819c124ad5ec66800f2b8700f1b6d533311e91f978c0db16909ef089997605fe4660de8042533f3a8130db521671fbbe7c9064f1a08f108f39f4472d4720ce SHA512 8611cfc39eb1b3b7353c72234b28d13501f9bff544815ae7d939f37b2c1c18ec8b26f7e72db592d6c55481397b31ba0cd5929e0ad80547d3457dca685e9b589d
 DIST dool-1.0.0.tar.gz 141224 BLAKE2B 9c1d733b340b3f1d51798ce85698e7fc526aea349b500431d348d413c1fd93d07d8ccb8241e671a40363275b8c4025ed2f4983b4dfc70f5e166178635935337e SHA512 5204eb1c0a37b225d447830048e5f2372dd3973d50cbd3fbc42972782a4853b809e566550e752c857502f86ceed7ea31620ea27059f9f334d27f28cc61abd968
+DIST dool-1.1.0.tar.gz 141224 BLAKE2B 9c1d733b340b3f1d51798ce85698e7fc526aea349b500431d348d413c1fd93d07d8ccb8241e671a40363275b8c4025ed2f4983b4dfc70f5e166178635935337e SHA512 5204eb1c0a37b225d447830048e5f2372dd3973d50cbd3fbc42972782a4853b809e566550e752c857502f86ceed7ea31620ea27059f9f334d27f28cc61abd968

diff --git a/sys-apps/dool/dool-1.1.0.ebuild b/sys-apps/dool/dool-1.1.0.ebuild
new file mode 100644
index 000000000..67fc995a6
--- /dev/null
+++ b/sys-apps/dool/dool-1.1.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit python-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
+	DOOL_COMMIT_ID="6b89f2d0b6e38e1c8d706e88a12e020367f5100d"
+	SRC_URI="
+		https://github.com/scottchiefbaker/dool/archive/${DOOL_COMMIT_ID}.tar.gz -> ${P}.tar.gz
+		https://github.com/stanford-rc/dool/commit/fa079a43c97f772a4809304386dbed5f4afa9a54.patch
+			-> ${PN}-1.0.0-fix-proc-diskstats-parsing.patch
+	"
+	S="${WORKDIR}/${PN}-${DOOL_COMMIT_ID}"
+fi
+
+if [[ "${PV}" != "9999" ]]; then
+	KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc examples"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${DISTDIR}"/${PN}-1.0.0-fix-proc-diskstats-parsing.patch
+)
+
+src_compile() {
+	:
+}
+
+src_install() {
+	python_foreach_impl python_doscript "${PN}"
+
+	insinto "/usr/share/${PN}"
+	newins "${PN}" "${PN}.py"
+	doins plugins/${PN}_*.py
+
+	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
+}

[gentoo-commits] repo/proj/guru:dev commit in: sys-apps/dool/

[Florian Schmaus]

commit:     8aab641b263e642ba4a2a77589a5f3971138865f
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 19 07:30:41 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Apr 19 07:30:41 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8aab641b

sys-apps/dool: add github upstream metadata

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 sys-apps/dool/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sys-apps/dool/metadata.xml b/sys-apps/dool/metadata.xml
index 75209e7cb..9f3302d8a 100644
--- a/sys-apps/dool/metadata.xml
+++ b/sys-apps/dool/metadata.xml
@@ -5,4 +5,7 @@
 		<email>flow@gentoo.org</email>
 		<name>Florian Schmaus</name>
 	</maintainer>
+	<upstream>
+		<remote-id type='github'>scottchiefbaker/dool</remote-id>
+	</upstream>
 </pkgmetadata>

[gentoo-commits] repo/proj/guru:dev commit in: sys-apps/dool/

[Florian Schmaus]

commit:     b01a4a318340ad874c3067efeae83a9579f487d5
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 19 07:28:42 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Apr 19 07:28:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b01a4a31

sys-apps/dool: sync live

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 sys-apps/dool/dool-9999.ebuild | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/sys-apps/dool/dool-9999.ebuild b/sys-apps/dool/dool-9999.ebuild
index 6c09eece2..67fc995a6 100644
--- a/sys-apps/dool/dool-9999.ebuild
+++ b/sys-apps/dool/dool-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,11 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	DOOL_COMMIT_ID="6b89f2d0b6e38e1c8d706e88a12e020367f5100d"
-	SRC_URI="https://github.com/scottchiefbaker/dool/archive/${DOOL_COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="
+		https://github.com/scottchiefbaker/dool/archive/${DOOL_COMMIT_ID}.tar.gz -> ${P}.tar.gz
+		https://github.com/stanford-rc/dool/commit/fa079a43c97f772a4809304386dbed5f4afa9a54.patch
+			-> ${PN}-1.0.0-fix-proc-diskstats-parsing.patch
+	"
 	S="${WORKDIR}/${PN}-${DOOL_COMMIT_ID}"
 fi
 
@@ -32,7 +36,7 @@ RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/0001-Key-for-key-in-dool_disk_avgqu.py-to-avoid-KeyError.patch"
+	"${DISTDIR}"/${PN}-1.0.0-fix-proc-diskstats-parsing.patch
 )
 
 src_compile() {

[gentoo-commits] repo/proj/guru:dev commit in: sys-apps/dool/

[Florian Schmaus]

commit:     bee36a2aedb4986878feb70504bb7dd2a8f96fb7
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 19 07:28:21 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Apr 19 07:28:21 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bee36a2a

sys-apps/dool: drop 1.0.0

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 sys-apps/dool/Manifest          |  1 -
 sys-apps/dool/dool-1.0.0.ebuild | 63 -----------------------------------------
 2 files changed, 64 deletions(-)

diff --git a/sys-apps/dool/Manifest b/sys-apps/dool/Manifest
index ca8c52804..c627d0a66 100644
--- a/sys-apps/dool/Manifest
+++ b/sys-apps/dool/Manifest
@@ -1,3 +1,2 @@
 DIST dool-1.0.0-fix-proc-diskstats-parsing.patch 7784 BLAKE2B 0c819c124ad5ec66800f2b8700f1b6d533311e91f978c0db16909ef089997605fe4660de8042533f3a8130db521671fbbe7c9064f1a08f108f39f4472d4720ce SHA512 8611cfc39eb1b3b7353c72234b28d13501f9bff544815ae7d939f37b2c1c18ec8b26f7e72db592d6c55481397b31ba0cd5929e0ad80547d3457dca685e9b589d
-DIST dool-1.0.0.tar.gz 141224 BLAKE2B 9c1d733b340b3f1d51798ce85698e7fc526aea349b500431d348d413c1fd93d07d8ccb8241e671a40363275b8c4025ed2f4983b4dfc70f5e166178635935337e SHA512 5204eb1c0a37b225d447830048e5f2372dd3973d50cbd3fbc42972782a4853b809e566550e752c857502f86ceed7ea31620ea27059f9f334d27f28cc61abd968
 DIST dool-1.1.0.tar.gz 141224 BLAKE2B 9c1d733b340b3f1d51798ce85698e7fc526aea349b500431d348d413c1fd93d07d8ccb8241e671a40363275b8c4025ed2f4983b4dfc70f5e166178635935337e SHA512 5204eb1c0a37b225d447830048e5f2372dd3973d50cbd3fbc42972782a4853b809e566550e752c857502f86ceed7ea31620ea27059f9f334d27f28cc61abd968

diff --git a/sys-apps/dool/dool-1.0.0.ebuild b/sys-apps/dool/dool-1.0.0.ebuild
deleted file mode 100644
index 6c09eece2..000000000
--- a/sys-apps/dool/dool-1.0.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit python-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
-	DOOL_COMMIT_ID="6b89f2d0b6e38e1c8d706e88a12e020367f5100d"
-	SRC_URI="https://github.com/scottchiefbaker/dool/archive/${DOOL_COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${DOOL_COMMIT_ID}"
-fi
-
-if [[ "${PV}" != "9999" ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc examples"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/0001-Key-for-key-in-dool_disk_avgqu.py-to-avoid-KeyError.patch"
-)
-
-src_compile() {
-	:
-}
-
-src_install() {
-	python_foreach_impl python_doscript "${PN}"
-
-	insinto "/usr/share/${PN}"
-	newins "${PN}" "${PN}.py"
-	doins plugins/${PN}_*.py
-
-	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
-}

[gentoo-commits] repo/proj/guru:dev commit in: sys-apps/dool/

[Florian Schmaus]

commit:     d566b14ee79d5f601821b622b5435342edd903e9
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Mon May  6 09:36:58 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon May  6 09:38:19 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d566b14e

sys-apps/dool: add 1.3.1

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 sys-apps/dool/Manifest          |  1 +
 sys-apps/dool/dool-1.3.1.ebuild | 60 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+)

diff --git a/sys-apps/dool/Manifest b/sys-apps/dool/Manifest
index c627d0a668..3d056cb416 100644
--- a/sys-apps/dool/Manifest
+++ b/sys-apps/dool/Manifest
@@ -1,2 +1,3 @@
 DIST dool-1.0.0-fix-proc-diskstats-parsing.patch 7784 BLAKE2B 0c819c124ad5ec66800f2b8700f1b6d533311e91f978c0db16909ef089997605fe4660de8042533f3a8130db521671fbbe7c9064f1a08f108f39f4472d4720ce SHA512 8611cfc39eb1b3b7353c72234b28d13501f9bff544815ae7d939f37b2c1c18ec8b26f7e72db592d6c55481397b31ba0cd5929e0ad80547d3457dca685e9b589d
 DIST dool-1.1.0.tar.gz 141224 BLAKE2B 9c1d733b340b3f1d51798ce85698e7fc526aea349b500431d348d413c1fd93d07d8ccb8241e671a40363275b8c4025ed2f4983b4dfc70f5e166178635935337e SHA512 5204eb1c0a37b225d447830048e5f2372dd3973d50cbd3fbc42972782a4853b809e566550e752c857502f86ceed7ea31620ea27059f9f334d27f28cc61abd968
+DIST dool-1.3.1.tar.gz 150933 BLAKE2B 9aadd4e196cfb7c57fc5fd539f1211b3249b0da955aa2869c43c66b2c2a63816f5cb3e5bcffefada47269f8bd4e3f4b0ace8512f6b0de07e66e0e830ae50c0c2 SHA512 20cabbcbe09152c1ebcaed08bd182586e20d0bae297b61031f1cc52bfce3b9827cc84843e5e5a3dc0d3e790ef2d6da5eb5925d287647f80023925611eb9b04ee

diff --git a/sys-apps/dool/dool-1.3.1.ebuild b/sys-apps/dool/dool-1.3.1.ebuild
new file mode 100644
index 0000000000..eff98f06ff
--- /dev/null
+++ b/sys-apps/dool/dool-1.3.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit python-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
+	"
+fi
+
+if [[ "${PV}" != "9999" ]]; then
+	KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc examples"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	:
+}
+
+src_install() {
+	python_foreach_impl python_doscript "${PN}"
+
+	insinto "/usr/share/${PN}"
+	newins "${PN}" "${PN}.py"
+	doins plugins/${PN}_*.py
+
+	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
+}

[gentoo-commits] repo/proj/guru:dev commit in: sys-apps/dool/

[Florian Schmaus]

commit:     1887bf52f03c51c5f59c13f18bd644135d4d2c7f
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Mon May  6 09:37:53 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon May  6 09:38:19 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1887bf52

sys-apps/dool: sync live

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 sys-apps/dool/dool-9999.ebuild | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/sys-apps/dool/dool-9999.ebuild b/sys-apps/dool/dool-9999.ebuild
index 3239402b05..eff98f06ff 100644
--- a/sys-apps/dool/dool-9999.ebuild
+++ b/sys-apps/dool/dool-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit python-r1
 
@@ -14,13 +14,10 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/scottchiefbaker/dool.git"
 	inherit git-r3
 else
-	DOOL_COMMIT_ID="6b89f2d0b6e38e1c8d706e88a12e020367f5100d"
 	SRC_URI="
-		https://github.com/scottchiefbaker/dool/archive/${DOOL_COMMIT_ID}.tar.gz -> ${P}.tar.gz
-		https://github.com/stanford-rc/dool/commit/fa079a43c97f772a4809304386dbed5f4afa9a54.patch
-			-> ${PN}-1.0.0-fix-proc-diskstats-parsing.patch
+		https://github.com/scottchiefbaker/dool/archive/refs/tags/v${PV}.tar.gz
+			-> ${P}.tar.gz
 	"
-	S="${WORKDIR}/${PN}-${DOOL_COMMIT_ID}"
 fi
 
 if [[ "${PV}" != "9999" ]]; then
@@ -35,10 +32,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${DISTDIR}"/${PN}-1.0.0-fix-proc-diskstats-parsing.patch
-)
-
 src_compile() {
 	:
 }

[gentoo-commits] repo/proj/guru:dev commit in: sys-apps/dool/

[Florian Schmaus]

commit:     ca0c8b01cb9eda436e3935a9090887864db839d9
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Tue May  7 14:25:23 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue May  7 14:25:33 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ca0c8b01

sys-apps/dool: drop 1.1.0

Closes: https://bugs.gentoo.org/931478
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 sys-apps/dool/Manifest          |  2 --
 sys-apps/dool/dool-1.1.0.ebuild | 67 -----------------------------------------
 2 files changed, 69 deletions(-)

diff --git a/sys-apps/dool/Manifest b/sys-apps/dool/Manifest
index 3d056cb416..4490f647ff 100644
--- a/sys-apps/dool/Manifest
+++ b/sys-apps/dool/Manifest
@@ -1,3 +1 @@
-DIST dool-1.0.0-fix-proc-diskstats-parsing.patch 7784 BLAKE2B 0c819c124ad5ec66800f2b8700f1b6d533311e91f978c0db16909ef089997605fe4660de8042533f3a8130db521671fbbe7c9064f1a08f108f39f4472d4720ce SHA512 8611cfc39eb1b3b7353c72234b28d13501f9bff544815ae7d939f37b2c1c18ec8b26f7e72db592d6c55481397b31ba0cd5929e0ad80547d3457dca685e9b589d
-DIST dool-1.1.0.tar.gz 141224 BLAKE2B 9c1d733b340b3f1d51798ce85698e7fc526aea349b500431d348d413c1fd93d07d8ccb8241e671a40363275b8c4025ed2f4983b4dfc70f5e166178635935337e SHA512 5204eb1c0a37b225d447830048e5f2372dd3973d50cbd3fbc42972782a4853b809e566550e752c857502f86ceed7ea31620ea27059f9f334d27f28cc61abd968
 DIST dool-1.3.1.tar.gz 150933 BLAKE2B 9aadd4e196cfb7c57fc5fd539f1211b3249b0da955aa2869c43c66b2c2a63816f5cb3e5bcffefada47269f8bd4e3f4b0ace8512f6b0de07e66e0e830ae50c0c2 SHA512 20cabbcbe09152c1ebcaed08bd182586e20d0bae297b61031f1cc52bfce3b9827cc84843e5e5a3dc0d3e790ef2d6da5eb5925d287647f80023925611eb9b04ee

diff --git a/sys-apps/dool/dool-1.1.0.ebuild b/sys-apps/dool/dool-1.1.0.ebuild
deleted file mode 100644
index 3239402b05..0000000000
--- a/sys-apps/dool/dool-1.1.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit python-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
-	DOOL_COMMIT_ID="6b89f2d0b6e38e1c8d706e88a12e020367f5100d"
-	SRC_URI="
-		https://github.com/scottchiefbaker/dool/archive/${DOOL_COMMIT_ID}.tar.gz -> ${P}.tar.gz
-		https://github.com/stanford-rc/dool/commit/fa079a43c97f772a4809304386dbed5f4afa9a54.patch
-			-> ${PN}-1.0.0-fix-proc-diskstats-parsing.patch
-	"
-	S="${WORKDIR}/${PN}-${DOOL_COMMIT_ID}"
-fi
-
-if [[ "${PV}" != "9999" ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc examples"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${DISTDIR}"/${PN}-1.0.0-fix-proc-diskstats-parsing.patch
-)
-
-src_compile() {
-	:
-}
-
-src_install() {
-	python_foreach_impl python_doscript "${PN}"
-
-	insinto "/usr/share/${PN}"
-	newins "${PN}" "${PN}.py"
-	doins plugins/${PN}_*.py
-
-	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
-}

[gentoo-commits] repo/proj/guru:dev commit in: sys-apps/dool/

[Florian Schmaus]

commit:     24f0f3cfaa6de9bcef4f19b3ca88132702576e0c
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Tue May  7 14:25:06 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue May  7 14:25:33 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=24f0f3cf

sys-apps/dool: sync live

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 sys-apps/dool/dool-9999.ebuild | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/sys-apps/dool/dool-9999.ebuild b/sys-apps/dool/dool-9999.ebuild
index eff98f06ff..9159ce65de 100644
--- a/sys-apps/dool/dool-9999.ebuild
+++ b/sys-apps/dool/dool-9999.ebuild
@@ -18,10 +18,7 @@ else
 		https://github.com/scottchiefbaker/dool/archive/refs/tags/v${PV}.tar.gz
 			-> ${P}.tar.gz
 	"
-fi
-
-if [[ "${PV}" != "9999" ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+	KEYWORDS="~amd64 ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 "
 fi
 
 LICENSE="GPL-2"
@@ -36,12 +33,13 @@ src_compile() {
 	:
 }
 
-src_install() {
-	python_foreach_impl python_doscript "${PN}"
+python_install() {
+	python_doscript "${PN}"
+	python_domodule plugins/${PN}_*.py
+}
 
-	insinto "/usr/share/${PN}"
-	newins "${PN}" "${PN}.py"
-	doins plugins/${PN}_*.py
+src_install() {
+	python_foreach_impl python_install
 
 	doman "docs/${PN}.1"
 
@@ -50,6 +48,7 @@ src_install() {
 	if use examples; then
 		dodoc examples/{mstat,read}.py
 	fi
+
 	if use doc; then
 		dodoc docs/*.html
 	fi

[gentoo-commits] repo/proj/guru:dev commit in: sys-apps/dool/

[Florian Schmaus]

commit:     bf186b7775339d245835364123b1019ad02fba36
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Tue May  7 14:23:31 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue May  7 14:25:33 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bf186b77

sys-apps/dool: improve ebuild

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 .../dool/{dool-1.3.1.ebuild => dool-1.3.1-r1.ebuild}    | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/sys-apps/dool/dool-1.3.1.ebuild b/sys-apps/dool/dool-1.3.1-r1.ebuild
similarity index 78%
rename from sys-apps/dool/dool-1.3.1.ebuild
rename to sys-apps/dool/dool-1.3.1-r1.ebuild
index eff98f06ff..9159ce65de 100644
--- a/sys-apps/dool/dool-1.3.1.ebuild
+++ b/sys-apps/dool/dool-1.3.1-r1.ebuild
@@ -18,10 +18,7 @@ else
 		https://github.com/scottchiefbaker/dool/archive/refs/tags/v${PV}.tar.gz
 			-> ${P}.tar.gz
 	"
-fi
-
-if [[ "${PV}" != "9999" ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+	KEYWORDS="~amd64 ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 "
 fi
 
 LICENSE="GPL-2"
@@ -36,12 +33,13 @@ src_compile() {
 	:
 }
 
-src_install() {
-	python_foreach_impl python_doscript "${PN}"
+python_install() {
+	python_doscript "${PN}"
+	python_domodule plugins/${PN}_*.py
+}
 
-	insinto "/usr/share/${PN}"
-	newins "${PN}" "${PN}.py"
-	doins plugins/${PN}_*.py
+src_install() {
+	python_foreach_impl python_install
 
 	doman "docs/${PN}.1"
 
@@ -50,6 +48,7 @@ src_install() {
 	if use examples; then
 		dodoc examples/{mstat,read}.py
 	fi
+
 	if use doc; then
 		dodoc docs/*.html
 	fi

[gentoo-commits] repo/proj/guru:dev commit in: sys-apps/dool/

[Florian Schmaus]

commit:     f630902ea76db6f03cb1771ccb7d46525e76db16
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 27 12:48:52 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Sep 27 12:52:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f630902e

sys-apps/dool: add 1.3.2

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 sys-apps/dool/Manifest          |  1 +
 sys-apps/dool/dool-1.3.2.ebuild | 65 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+)

diff --git a/sys-apps/dool/Manifest b/sys-apps/dool/Manifest
index 4490f647f..0473f1ad3 100644
--- a/sys-apps/dool/Manifest
+++ b/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

diff --git a/sys-apps/dool/dool-1.3.2.ebuild b/sys-apps/dool/dool-1.3.2.ebuild
new file mode 100644
index 000000000..db89ec526
--- /dev/null
+++ b/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
+}

[gentoo-commits] repo/proj/guru:dev commit in: sys-apps/dool/

[Florian Schmaus]

commit:     d05ab15e3ebd9cffe8e3097771e2aca9bdde358a
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 27 12:51:59 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Sep 27 12:52:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d05ab15e

sys-apps/dool: sync live

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 sys-apps/dool/dool-9999.ebuild | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/sys-apps/dool/dool-9999.ebuild b/sys-apps/dool/dool-9999.ebuild
index 9159ce65d..db89ec526 100644
--- a/sys-apps/dool/dool-9999.ebuild
+++ b/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}"
-DEPEND="${RDEPEND}"
+src_prepare() {
+	default
 
-src_compile() {
-	:
-}
+	# 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
 
-python_install() {
-	python_doscript "${PN}"
-	python_domodule plugins/${PN}_*.py
+	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"
 

[gentoo-commits] repo/proj/guru:master commit in: sys-apps/dool/

[Florian Schmaus]

commit:     f630902ea76db6f03cb1771ccb7d46525e76db16
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 27 12:48:52 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Sep 27 12:52:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f630902e

sys-apps/dool: add 1.3.2

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 sys-apps/dool/Manifest          |  1 +
 sys-apps/dool/dool-1.3.2.ebuild | 65 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+)

diff --git a/sys-apps/dool/Manifest b/sys-apps/dool/Manifest
index 4490f647f..0473f1ad3 100644
--- a/sys-apps/dool/Manifest
+++ b/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

diff --git a/sys-apps/dool/dool-1.3.2.ebuild b/sys-apps/dool/dool-1.3.2.ebuild
new file mode 100644
index 000000000..db89ec526
--- /dev/null
+++ b/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
+}

[gentoo-commits] repo/proj/guru:dev commit in: sys-apps/dool/

[Florian Schmaus]

commit:     b8b08314dc129190a7638b28fb5a5bc8096792be
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 27 13:36:13 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Sep 27 13:36:19 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b8b08314

sys-apps/dool: add patch for plugin path, unconditionally install docs

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 sys-apps/dool/Manifest                             |  1 +
 .../{dool-1.3.2.ebuild => dool-1.3.2-r1.ebuild}    | 22 ++++++++++++----------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/sys-apps/dool/Manifest b/sys-apps/dool/Manifest
index 0473f1ad3..e10f56930 100644
--- a/sys-apps/dool/Manifest
+++ b/sys-apps/dool/Manifest
@@ -1,2 +1,3 @@
 DIST dool-1.3.1.tar.gz 150933 BLAKE2B 9aadd4e196cfb7c57fc5fd539f1211b3249b0da955aa2869c43c66b2c2a63816f5cb3e5bcffefada47269f8bd4e3f4b0ace8512f6b0de07e66e0e830ae50c0c2 SHA512 20cabbcbe09152c1ebcaed08bd182586e20d0bae297b61031f1cc52bfce3b9827cc84843e5e5a3dc0d3e790ef2d6da5eb5925d287647f80023925611eb9b04ee
+DIST dool-1.3.2-add-site-packages-dir-to-plugin-path.patch 1014 BLAKE2B 41aa9a29e4d45ac3971ab2248dc69ec5e0a0bade7925bf2b729cc0e538a9dc7afebff3f244c0753c40a22262d258f07b7d7164927851b76674b6d37843a27fc7 SHA512 05960aef68560eff30dd0957196b44cca5d3fa0aa015a2bf4f5bee4792eae5e3e3f60673d99adeb50f30d12e1c93fe1246162aa328ba9bfa9f3d00e9458c7076
 DIST dool-1.3.2.tar.gz 152959 BLAKE2B cd0cc6f82b89ba80cd7934d609aedaeb28bdcb10b332a70b7b706bf153668645b1a042c2da7f7e4c399e5119935b2db602ee651dc2ea85c900e254e27fd89d07 SHA512 792bec7c777746e68737b1c95dac02575262fe341a75da62fcd0ef1e09185779ac376389daa45e6407be06befb003b53f2ca16982302f6e24230bd0bed70ab06

diff --git a/sys-apps/dool/dool-1.3.2.ebuild b/sys-apps/dool/dool-1.3.2-r1.ebuild
similarity index 79%
rename from sys-apps/dool/dool-1.3.2.ebuild
rename to sys-apps/dool/dool-1.3.2-r1.ebuild
index db89ec526..5a991dd78 100644
--- a/sys-apps/dool/dool-1.3.2.ebuild
+++ b/sys-apps/dool/dool-1.3.2-r1.ebuild
@@ -22,13 +22,19 @@ else
 	KEYWORDS="~amd64 ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 "
 fi
 
+SRC_URI+="
+	https://github.com/scottchiefbaker/dool/pull/80/commits/5c538542a5bf2b16c496ab9d0a15f439f1ba1e49.patch
+		-> dool-1.3.2-add-site-packages-dir-to-plugin-path.patch
+"
+
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="doc examples"
 
-src_prepare() {
-	default
+PATCHES=(
+	"${DISTDIR}"/dool-1.3.2-add-site-packages-dir-to-plugin-path.patch
+)
 
+src_prepare() {
 	# https://github.com/scottchiefbaker/dool/pull/80
 	mv dool dool.py || die
 
@@ -42,6 +48,8 @@ src_prepare() {
 	EOF
 
 	sed -i 's/dool:__main/dool.dool:__main/' pyproject.toml || die
+
+	default
 }
 
 src_install() {
@@ -51,13 +59,7 @@ src_install() {
 
 	einstalldocs
 
-	if use examples; then
-		dodoc examples/{mstat,read}.py
-	fi
-
-	if use doc; then
-		dodoc docs/*.html
-	fi
+	dodoc examples/{mstat,read}.py docs/*.html
 }
 
 src_test() {

[gentoo-commits] repo/proj/guru:dev commit in: sys-apps/dool/

[Florian Schmaus]

commit:     c788db9a341ed66aa1ffa299b8b77b9441a96f1b
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 27 13:36:56 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Sep 27 13:36:56 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c788db9a

sys-apps/dool: sync live

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 sys-apps/dool/dool-9999.ebuild | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/sys-apps/dool/dool-9999.ebuild b/sys-apps/dool/dool-9999.ebuild
index db89ec526..5a991dd78 100644
--- a/sys-apps/dool/dool-9999.ebuild
+++ b/sys-apps/dool/dool-9999.ebuild
@@ -22,13 +22,19 @@ else
 	KEYWORDS="~amd64 ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 "
 fi
 
+SRC_URI+="
+	https://github.com/scottchiefbaker/dool/pull/80/commits/5c538542a5bf2b16c496ab9d0a15f439f1ba1e49.patch
+		-> dool-1.3.2-add-site-packages-dir-to-plugin-path.patch
+"
+
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="doc examples"
 
-src_prepare() {
-	default
+PATCHES=(
+	"${DISTDIR}"/dool-1.3.2-add-site-packages-dir-to-plugin-path.patch
+)
 
+src_prepare() {
 	# https://github.com/scottchiefbaker/dool/pull/80
 	mv dool dool.py || die
 
@@ -42,6 +48,8 @@ src_prepare() {
 	EOF
 
 	sed -i 's/dool:__main/dool.dool:__main/' pyproject.toml || die
+
+	default
 }
 
 src_install() {
@@ -51,13 +59,7 @@ src_install() {
 
 	einstalldocs
 
-	if use examples; then
-		dodoc examples/{mstat,read}.py
-	fi
-
-	if use doc; then
-		dodoc docs/*.html
-	fi
+	dodoc examples/{mstat,read}.py docs/*.html
 }
 
 src_test() {

[gentoo-commits] repo/proj/guru:dev commit in: sys-apps/dool/

[Florian Schmaus]

commit:     a4689956d8e85c8246bb6d4002fd4d7690c7d2a8
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 30 07:40:44 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Sep 30 07:42:56 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a4689956

sys-apps/dool: place html docs in the right directory

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 sys-apps/dool/{dool-1.3.2-r1.ebuild => dool-1.3.2-r2.ebuild} | 5 ++++-
 sys-apps/dool/dool-9999.ebuild                               | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/sys-apps/dool/dool-1.3.2-r1.ebuild b/sys-apps/dool/dool-1.3.2-r2.ebuild
similarity index 95%
rename from sys-apps/dool/dool-1.3.2-r1.ebuild
rename to sys-apps/dool/dool-1.3.2-r2.ebuild
index 5a991dd78..04a0d240b 100644
--- a/sys-apps/dool/dool-1.3.2-r1.ebuild
+++ b/sys-apps/dool/dool-1.3.2-r2.ebuild
@@ -59,7 +59,10 @@ src_install() {
 
 	einstalldocs
 
-	dodoc examples/{mstat,read}.py docs/*.html
+	dodoc examples/{mstat,read}.py
+
+	docinto html
+	dodoc docs/*.html
 }
 
 src_test() {

diff --git a/sys-apps/dool/dool-9999.ebuild b/sys-apps/dool/dool-9999.ebuild
index 5a991dd78..04a0d240b 100644
--- a/sys-apps/dool/dool-9999.ebuild
+++ b/sys-apps/dool/dool-9999.ebuild
@@ -59,7 +59,10 @@ src_install() {
 
 	einstalldocs
 
-	dodoc examples/{mstat,read}.py docs/*.html
+	dodoc examples/{mstat,read}.py
+
+	docinto html
+	dodoc docs/*.html
 }
 
 src_test() {