net-analyzer/munin-contrib: bump

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>

3 files changed, 91 insertions, 41 deletions

diff --git a/net-analyzer/munin-contrib/Manifest b/net-analyzer/munin-contrib/Manifest
index 1d89e5d2c..de5354f6c 100644
--- a/net-analyzer/munin-contrib/Manifest
+++ b/net-analyzer/munin-contrib/Manifest
@@ -1 +1 @@
-DIST munin-contrib-0_p20210318.tar.gz 6777350 BLAKE2B 5899abd4fa71f248d9da2fb4bafdac55ee054602339119b0ad5ba1098745c99859c1c56d800070538d0f6612bb155eedb24584f41e7c281f88fe2e348da8af30 SHA512 4500f625798a09eff4d8ab41226d166086748fdaf5b77c0826b62b165da299c7d9151a29eefc92ec5f602218c75760ea050bd548f22d3987193d1538f732e17a
+DIST munin-contrib-0_p20210325.tar.gz 6776895 BLAKE2B 15e9bb49b07e42f2e63a73367b162fbb8d87155d9fbfaa9aeda40b98468133ed03dc1e36d1c1a1184a0d1542dbfbd8ed76d3e371fd77987dea56bed08ee2acca SHA512 d972d2e965169a666861328e19744d7ea43b66f4852d86690c7d5d531ff2e3524e53259a09a29a364af91b492d15fa406f77c41fd1e99975c8e623bcbbf47911
diff --git a/net-analyzer/munin-contrib/munin-contrib-0_p20210318.ebuild b/net-analyzer/munin-contrib/munin-contrib-0_p20210318.ebuild
deleted file mode 100644
index 1a2ce0aff..000000000
--- a/net-analyzer/munin-contrib/munin-contrib-0_p20210318.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-COMMIT="7fd554f04b67a985e99f15aa56aa4546d6006f2f"
-
-SRC_URI="https://github.com/munin-monitoring/contrib/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-DESCRIPTION="user contributed stuff related to munin"
-HOMEPAGE="https://github.com/munin-monitoring/contrib"
-LICENSE="GPL-3+ Apache-2.0 GPL-2 LGPL-2 GPL-2+ LGPL-3+" #TODO: investigate all the licenses
-SLOT="0"
-IUSE="examples +plugins templates tools"
-RDEPEND="net-analyzer/munin"
-
-S="${WORKDIR}/contrib-${COMMIT}"
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	return
-}
-
-src_compile() {
-	return
-}
-
-src_install() {
-	insinto "/usr/libexec/munin"
-	use tools && doins -r tools
-	insinto "/usr/libexec/munin/plugins/contrib"
-	use plugins && doins -r plugins/*
-	insinto "/etc/munin/templates"
-	use templates && doins -r templates/munstrap
-	use examples && dodoc -r samples/munin.conf
-	dodoc README.md
-}
diff --git a/net-analyzer/munin-contrib/munin-contrib-0_p20210325.ebuild b/net-analyzer/munin-contrib/munin-contrib-0_p20210325.ebuild
new file mode 100644
index 000000000..665f36e50
--- /dev/null
+++ b/net-analyzer/munin-contrib/munin-contrib-0_p20210325.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+COMMIT="4af69a6d076a467d7f8faa0030e8da53b1de190f"
+
+SRC_URI="https://github.com/munin-monitoring/contrib/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+DESCRIPTION="user contributed stuff related to munin"
+HOMEPAGE="https://github.com/munin-monitoring/contrib"
+LICENSE="GPL-3+ Apache-2.0 GPL-2 LGPL-2 GPL-2+ LGPL-3+" #TODO: investigate all the licenses
+SLOT="0"
+IUSE="examples +plugins templates tools"
+RDEPEND="net-analyzer/munin"
+
+S="${WORKDIR}/contrib-${COMMIT}"
+README_PLUGINS=(
+	plugins/README.md
+	plugins/apache/apache_byprojects/README.md
+	plugins/apache/apache_vhosts/README.txt
+	plugins/apt/deb_packages/README.md
+	plugins/kamailio/README.md
+	plugins/network/linux_if/README.md
+	plugins/nfs-freebsd/README.rst
+	plugins/nginx/nginx_byprojects/README.md
+	plugins/prosody/README.rst
+	plugins/rackspace/README
+	plugins/tarsnap/README.md
+	plugins/varnish/README-varnish4.md
+	plugins/varnish/README.rst
+	plugins/znc/README.md
+	plugins/zope/README-zodb
+)
+README_TOOLS=(
+	tools/munin-node-c/README
+	tools/munin-node-from-hell/README.rst
+	tools/munin-plugins-busybox/README
+	tools/pmmn/plugins/README
+	tools/pypmmn/README.rst
+)
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	return
+}
+
+src_compile() {
+	return
+}
+
+src_install() {
+	if use tools ; then
+		for i in "${README_TOOLS[@]}" ; do
+			p="${ED}/usr/share/doc/${PF}/${i%/*}"
+			mkdir -p "${p}" || die
+			mv "${i}" "${p}" || die
+		done
+		insinto "/usr/libexec/munin"
+		doins -r tools
+	fi
+
+	if use plugins; then
+		#install documentation in subfolders
+		for i in plugins/{apt,}/*/example-graphs ; do
+			p="${ED}/usr/share/doc/${PF}/${i}"
+			mkdir -p "${p}" || die
+			mv "${i}" "${p}" || die
+		done
+		for i in "${README_PLUGINS[@]}" ; do
+			p="${ED}/usr/share/doc/${PF}/${i%/*}"
+			mkdir -p "${p}" || die
+			mv "${i}" "${p}" || die
+		done
+
+		#install plugins without getting mad at preserving exec bit
+		mkdir -p "${ED}/usr/libexec/munin/plugins/contrib" || die
+		mv plugins/* "${ED}/usr/libexec/munin/plugins/contrib" || die
+	fi
+
+	insinto "/etc/munin/templates"
+	use templates && doins -r templates/munstrap
+
+	use examples && dodoc -r samples/munin.conf
+
+	dodoc README.md
+}