From d29c7d768cbd7807ae60b30dc4a48e9cbe4d2415 Mon Sep 17 00:00:00 2001
From: "Rick Farina (Zero_Chaos)" <zerochaos@gentoo.org>
Date: Wed, 6 Sep 2023 13:49:34 -0400
Subject: [PATCH] munin: drop old, minor qa

---
 net-misc/munin/Manifest               |  1 -
 net-misc/munin/munin-0.14.1-r2.ebuild | 67 ---------------------------
 net-misc/munin/munin-0.20.0.ebuild    |  7 ++-
 3 files changed, 3 insertions(+), 72 deletions(-)
 delete mode 100644 net-misc/munin/munin-0.14.1-r2.ebuild

diff --git a/net-misc/munin/Manifest b/net-misc/munin/Manifest
index 4bf819fd6..1dd14640b 100644
--- a/net-misc/munin/Manifest
+++ b/net-misc/munin/Manifest
@@ -1,2 +1 @@
-DIST munin-0.14.1.tar.gz 751967 BLAKE2B 0217f8c05b56c9645c10001b86328e32372227e30e09cb7d47f53bf9f377ccd96081042ff21701ec801199ad9de9f6368e68416c39781f9ab666ad237ca414dc SHA512 24561ad4888aae7d141ea3f0990091326989dac73aa0999eaaf7589eda0ae1c56a0f993d47b0cb21bc4f6d1f308985f4630dd81696b40cfc2434f6ed8fcbaad5
 DIST munin-0.20.0.tar.gz 758943 BLAKE2B 77948644aa7f2c4c629878bdaf00648431f65aac94bb73778a83f266ff940af1254ccbbe566196caeae4f070f35407c6cfc3b48df065803e30564da9f747e672 SHA512 eb7f12cadf5ba84a5c458876b9d87184fbcb4a6daba9287d2c02f5881e2dd12e332656e05608eb560843962f7e9f2a98963fbec10c71ef5644fc7fd8464a6e26
diff --git a/net-misc/munin/munin-0.14.1-r2.ebuild b/net-misc/munin/munin-0.14.1-r2.ebuild
deleted file mode 100644
index cceff36a1..000000000
--- a/net-misc/munin/munin-0.14.1-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit eutils python-single-r1
-
-DESCRIPTION="Online hash checker for Virustotal and other services"
-HOMEPAGE="https://github.com/Neo23x0/munin"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Neo23x0/munin"
-else
-	SRC_URI="https://github.com/Neo23x0/munin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~mips ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]
-		dev-python/future[${PYTHON_USEDEP}]
-		>=dev-python/selenium-3.9.0[${PYTHON_USEDEP}]
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pymisp[${PYTHON_USEDEP}]
-		dev-python/ipy[${PYTHON_USEDEP}]
-		dev-python/pycurl[${PYTHON_USEDEP}]
-		dev-python/dnspython[${PYTHON_USEDEP}]
-	')"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Update warning messages
-	sed -e "s: munin.ini : /etc/${PN}/munin.ini :" \
-		-i *.py || die "sed filed!"
-
-	python_fix_shebang "${S}"
-	default
-}
-
-src_install() {
-	insinto "/usr/share/${PN}"
-	doins -r lib *.py
-	python_optimize "${D}/usr/share/${PN}"
-
-	for x in munin-checker munin-checker-host; do
-		make_wrapper "${x}" \
-			"${EPYTHON} /usr/share/${PN}/${x//-checker/}.py -i /etc/${PN}/${PN}.ini"
-	done
-
-	insinto "/etc/${PN}"
-	doins ${PN}.ini
-
-	dodoc README.md munin-*demo.txt
-}
diff --git a/net-misc/munin/munin-0.20.0.ebuild b/net-misc/munin/munin-0.20.0.ebuild
index 63a0c2298..4cace48f4 100644
--- a/net-misc/munin/munin-0.20.0.ebuild
+++ b/net-misc/munin/munin-0.20.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{10..11} )
 
-inherit eutils python-single-r1
+inherit python-single-r1 wrapper
 
 DESCRIPTION="Online hash checker for Virustotal and other services"
 HOMEPAGE="https://github.com/Neo23x0/munin"
@@ -27,7 +27,6 @@ DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	$(python_gen_cond_dep '
 		>=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]
-		>=dev-python/future-0.16.0[${PYTHON_USEDEP}]
 		>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
 		>=dev-python/pymisp-2.4.123[${PYTHON_USEDEP}]
 		>=dev-python/flask-1.0[${PYTHON_USEDEP}]