public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:master commit in: net-analyzer/munin-contrib/
@ 2021-03-25 14:08 Andrew Ammerlaan
  0 siblings, 0 replies; 11+ messages in thread
From: Andrew Ammerlaan @ 2021-03-25 14:08 UTC (permalink / raw
  To: gentoo-commits

commit:     df303668e06528de8c2eb5f79436997eb1b484be
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Thu Mar 25 02:28:21 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Thu Mar 25 02:31:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=df303668

net-analyzer/munin-contrib: use a better folder

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

 net-analyzer/munin-contrib/munin-contrib-0_p20210318.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/munin-contrib/munin-contrib-0_p20210318.ebuild b/net-analyzer/munin-contrib/munin-contrib-0_p20210318.ebuild
index a759a1dc3..1a2ce0aff 100644
--- a/net-analyzer/munin-contrib/munin-contrib-0_p20210318.ebuild
+++ b/net-analyzer/munin-contrib/munin-contrib-0_p20210318.ebuild
@@ -32,7 +32,7 @@ src_install() {
 	insinto "/usr/libexec/munin"
 	use tools && doins -r tools
 	insinto "/usr/libexec/munin/plugins/contrib"
-	use plugins && doins -r plugins
+	use plugins && doins -r plugins/*
 	insinto "/etc/munin/templates"
 	use templates && doins -r templates/munstrap
 	use examples && dodoc -r samples/munin.conf


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-analyzer/munin-contrib/
@ 2021-03-25 14:08 Andrew Ammerlaan
  0 siblings, 0 replies; 11+ messages in thread
From: Andrew Ammerlaan @ 2021-03-25 14:08 UTC (permalink / raw
  To: gentoo-commits

commit:     6ebb117e034fbace56c9670937d085c3c51b52be
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Thu Mar 25 02:25:22 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Thu Mar 25 02:31:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6ebb117e

net-analyzer/munin-contrib: new package

php, python, ruby, java, perl, etc. runtime deps
aren't listed on purpose

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

 net-analyzer/munin-contrib/Manifest                |  1 +
 net-analyzer/munin-contrib/metadata.xml            | 16 +++++++++
 .../munin-contrib/munin-contrib-0_p20210318.ebuild | 40 ++++++++++++++++++++++
 3 files changed, 57 insertions(+)

diff --git a/net-analyzer/munin-contrib/Manifest b/net-analyzer/munin-contrib/Manifest
new file mode 100644
index 000000000..1d89e5d2c
--- /dev/null
+++ b/net-analyzer/munin-contrib/Manifest
@@ -0,0 +1 @@
+DIST munin-contrib-0_p20210318.tar.gz 6777350 BLAKE2B 5899abd4fa71f248d9da2fb4bafdac55ee054602339119b0ad5ba1098745c99859c1c56d800070538d0f6612bb155eedb24584f41e7c281f88fe2e348da8af30 SHA512 4500f625798a09eff4d8ab41226d166086748fdaf5b77c0826b62b165da299c7d9151a29eefc92ec5f602218c75760ea050bd548f22d3987193d1538f732e17a

diff --git a/net-analyzer/munin-contrib/metadata.xml b/net-analyzer/munin-contrib/metadata.xml
new file mode 100644
index 000000000..e21a6d882
--- /dev/null
+++ b/net-analyzer/munin-contrib/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>lssndrbarbieri@gmail.com</email>
+    <name>Alessandro Barbieri</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">munin-monitoring/contrib</remote-id>
+  </upstream>
+  <use>
+    <flag name="plugins">contrib munin plugins</flag>
+    <flag name="templates">contrib munin tools</flag>
+    <flag name="tools">munin contrib tools</flag>
+  </use>
+</pkgmetadata>

diff --git a/net-analyzer/munin-contrib/munin-contrib-0_p20210318.ebuild b/net-analyzer/munin-contrib/munin-contrib-0_p20210318.ebuild
new file mode 100644
index 000000000..a759a1dc3
--- /dev/null
+++ b/net-analyzer/munin-contrib/munin-contrib-0_p20210318.ebuild
@@ -0,0 +1,40 @@
+# 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
+}


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-analyzer/munin-contrib/
@ 2021-03-27 15:38 Andrew Ammerlaan
  0 siblings, 0 replies; 11+ messages in thread
From: Andrew Ammerlaan @ 2021-03-27 15:38 UTC (permalink / raw
  To: gentoo-commits

commit:     28d910eb99abf0a556863d215592974119745c7d
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sat Mar 27 00:23:05 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sat Mar 27 00:23:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=28d910eb

net-analyzer/munin-contrib: bump

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

 net-analyzer/munin-contrib/Manifest                |  2 +-
 .../munin-contrib/munin-contrib-0_p20210318.ebuild | 40 ----------
 .../munin-contrib/munin-contrib-0_p20210325.ebuild | 90 ++++++++++++++++++++++
 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
+}


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-analyzer/munin-contrib/
@ 2021-05-02 10:51 Theo Anderson
  0 siblings, 0 replies; 11+ messages in thread
From: Theo Anderson @ 2021-05-02 10:51 UTC (permalink / raw
  To: gentoo-commits

commit:     0c967a3896eaeaeac600efb5d521dd9795b46b86
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sun May  2 09:30:30 2021 +0000
Commit:     Theo Anderson <telans <AT> posteo <DOT> de>
CommitDate: Sun May  2 09:30:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0c967a38

net-analyzer/munin-contrib: build with emake

Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 net-analyzer/munin-contrib/munin-contrib-0.2021.04.27.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/munin-contrib/munin-contrib-0.2021.04.27.ebuild b/net-analyzer/munin-contrib/munin-contrib-0.2021.04.27.ebuild
index 448d54ea0..11e3b63e0 100644
--- a/net-analyzer/munin-contrib/munin-contrib-0.2021.04.27.ebuild
+++ b/net-analyzer/munin-contrib/munin-contrib-0.2021.04.27.ebuild
@@ -56,7 +56,7 @@ src_compile() {
 	export CC=$(tc-getCC)
 
 	pushd plugins/cpu || die
-		${CC} ${CFLAGS} -o multicpu1sec-c multicpu1sec-c.c || die
+		emake multicpu1sec-c || die
 		rm multicpu1sec-c.c || die
 	popd
 	pushd plugins/disk/smart-c || die
@@ -64,7 +64,7 @@ src_compile() {
 		rm *.h *.o *.c Makefile || die
 	popd
 	pushd plugins/network || die
-		${CC} ${CFLAGS} -o if1sec-c if1sec-c.c || die
+		emake if1sec-c || die
 		rm if1sec-c.c || die
 	popd
 }


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-analyzer/munin-contrib/
@ 2021-05-02 10:51 Theo Anderson
  0 siblings, 0 replies; 11+ messages in thread
From: Theo Anderson @ 2021-05-02 10:51 UTC (permalink / raw
  To: gentoo-commits

commit:     ca95a3840dc9836db5884204b1faea9f99ef3292
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sun May  2 09:26:49 2021 +0000
Commit:     Theo Anderson <telans <AT> posteo <DOT> de>
CommitDate: Sun May  2 09:26:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ca95a384

net-analyzer/munin-contrib: add 0.2021.04.27, drop 0_p20210325

Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 net-analyzer/munin-contrib/Manifest                |  2 +-
 ...25.ebuild => munin-contrib-0.2021.04.27.ebuild} | 25 ++++++++++++++++++----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/net-analyzer/munin-contrib/Manifest b/net-analyzer/munin-contrib/Manifest
index de5354f6c..b91a3e99b 100644
--- a/net-analyzer/munin-contrib/Manifest
+++ b/net-analyzer/munin-contrib/Manifest
@@ -1 +1 @@
-DIST munin-contrib-0_p20210325.tar.gz 6776895 BLAKE2B 15e9bb49b07e42f2e63a73367b162fbb8d87155d9fbfaa9aeda40b98468133ed03dc1e36d1c1a1184a0d1542dbfbd8ed76d3e371fd77987dea56bed08ee2acca SHA512 d972d2e965169a666861328e19744d7ea43b66f4852d86690c7d5d531ff2e3524e53259a09a29a364af91b492d15fa406f77c41fd1e99975c8e623bcbbf47911
+DIST munin-contrib-0.2021.04.27.tar.gz 6782163 BLAKE2B 6977d16a84a37bc15bbcae6295d52a087f9d6b694069cb384a8c79d1b2d0233052fc3057ae5bd14da305de78e9f0614b18768e51d5c49bee12f0ee6c3ccadeaa SHA512 2f7aca7a51b34a600e7d27cb5b4beebf6d8ddd1d4edfbb8a9ca6e4c4912acd38e0213efe9bef028b674c54ec91ecdc66b4782c00987e6dfd833cf86191c8dbfb

diff --git a/net-analyzer/munin-contrib/munin-contrib-0_p20210325.ebuild b/net-analyzer/munin-contrib/munin-contrib-0.2021.04.27.ebuild
similarity index 76%
rename from net-analyzer/munin-contrib/munin-contrib-0_p20210325.ebuild
rename to net-analyzer/munin-contrib/munin-contrib-0.2021.04.27.ebuild
index 665f36e50..448d54ea0 100644
--- a/net-analyzer/munin-contrib/munin-contrib-0_p20210325.ebuild
+++ b/net-analyzer/munin-contrib/munin-contrib-0.2021.04.27.ebuild
@@ -3,13 +3,15 @@
 
 EAPI="7"
 
-COMMIT="4af69a6d076a467d7f8faa0030e8da53b1de190f"
+inherit toolchain-funcs
+
+COMMIT="c31cb283fe9d38ae0367fcd9a8aef6be14bcb927"
 
 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
+LICENSE="GPL-3+ Apache-2.0 GPL-2 LGPL-2 GPL-2+ LGPL-3+ MIT" #TODO: investigate all the licenses
 SLOT="0"
 IUSE="examples +plugins templates tools"
 RDEPEND="net-analyzer/munin"
@@ -20,6 +22,7 @@ README_PLUGINS=(
 	plugins/apache/apache_byprojects/README.md
 	plugins/apache/apache_vhosts/README.txt
 	plugins/apt/deb_packages/README.md
+	plugins/jmx/readme.txt
 	plugins/kamailio/README.md
 	plugins/network/linux_if/README.md
 	plugins/nfs-freebsd/README.rst
@@ -42,6 +45,7 @@ README_TOOLS=(
 
 src_prepare() {
 	default
+	rm "plugins/nginx/nginx_byprojects/LICENSE.txt" || die
 }
 
 src_configure() {
@@ -49,7 +53,20 @@ src_configure() {
 }
 
 src_compile() {
-	return
+	export CC=$(tc-getCC)
+
+	pushd plugins/cpu || die
+		${CC} ${CFLAGS} -o multicpu1sec-c multicpu1sec-c.c || die
+		rm multicpu1sec-c.c || die
+	popd
+	pushd plugins/disk/smart-c || die
+		emake
+		rm *.h *.o *.c Makefile || die
+	popd
+	pushd plugins/network || die
+		${CC} ${CFLAGS} -o if1sec-c if1sec-c.c || die
+		rm if1sec-c.c || die
+	popd
 }
 
 src_install() {
@@ -65,7 +82,7 @@ src_install() {
 
 	if use plugins; then
 		#install documentation in subfolders
-		for i in plugins/{apt,}/*/example-graphs ; do
+		for i in plugins/{apt,network,}/*/example-graphs ; do
 			p="${ED}/usr/share/doc/${PF}/${i}"
 			mkdir -p "${p}" || die
 			mv "${i}" "${p}" || die


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-analyzer/munin-contrib/
@ 2024-03-06  0:48 Julien Roy
  0 siblings, 0 replies; 11+ messages in thread
From: Julien Roy @ 2024-03-06  0:48 UTC (permalink / raw
  To: gentoo-commits

commit:     9f599b78e04e14a74a1fa1343ed0631fb559066c
Author:     Philippe Chaintreuil <gentoo_bugs_peep <AT> parallaxshift <DOT> com>
AuthorDate: Mon Mar  4 22:57:13 2024 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Tue Mar  5 15:30:23 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9f599b78

bump to latest as of 2024-03-04

Signed-off-by: Philippe Chaintreuil <gentoo_bugs_peep <AT> parallaxshift.com>

 net-analyzer/munin-contrib/Manifest                |   1 +
 .../munin-contrib-0.2024.03.04.ebuild              | 115 +++++++++++++++++++++
 2 files changed, 116 insertions(+)

diff --git a/net-analyzer/munin-contrib/Manifest b/net-analyzer/munin-contrib/Manifest
index b91a3e99b5..3b0cb179f1 100644
--- a/net-analyzer/munin-contrib/Manifest
+++ b/net-analyzer/munin-contrib/Manifest
@@ -1 +1,2 @@
 DIST munin-contrib-0.2021.04.27.tar.gz 6782163 BLAKE2B 6977d16a84a37bc15bbcae6295d52a087f9d6b694069cb384a8c79d1b2d0233052fc3057ae5bd14da305de78e9f0614b18768e51d5c49bee12f0ee6c3ccadeaa SHA512 2f7aca7a51b34a600e7d27cb5b4beebf6d8ddd1d4edfbb8a9ca6e4c4912acd38e0213efe9bef028b674c54ec91ecdc66b4782c00987e6dfd833cf86191c8dbfb
+DIST munin-contrib-0.2024.03.04.tar.gz 8897446 BLAKE2B ceb713774f3af106f7373643e83200616d75499bdb0f89ac12bf0b8e8f211b060886f406e4308ac8f58480a467e946f7aa4ba662d6599de3ed0fba85284fc28b SHA512 a095964f3709745d8dcc178f1f1014cdf136da5dbc466a5d195a5ed252f08b69b71732011e9c4a7037556354b83b9b04af53a725ce4339651ac1b239ecfaa177

diff --git a/net-analyzer/munin-contrib/munin-contrib-0.2024.03.04.ebuild b/net-analyzer/munin-contrib/munin-contrib-0.2024.03.04.ebuild
new file mode 100644
index 0000000000..30f4601514
--- /dev/null
+++ b/net-analyzer/munin-contrib/munin-contrib-0.2024.03.04.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+COMMIT="83f4e970c4a7378540057318a5083653ee2f138b"
+
+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+ MIT" #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/jmx/readme.txt
+	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
+	rm "plugins/nginx/nginx_byprojects/LICENSE.txt" || die
+}
+
+src_configure() {
+	return
+}
+
+src_compile() {
+	export CC=$(tc-getCC)
+
+	pushd plugins/cpu || die
+		emake multicpu1sec-c || die
+		rm multicpu1sec-c.c || die
+	popd
+	pushd plugins/disk/smart-c || die
+		emake
+		rm *.h *.o *.c Makefile || die
+	popd
+	pushd plugins/network || die
+		emake if1sec-c || die
+		rm if1sec-c.c || die
+	popd
+}
+
+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,network,}/*/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
+
+		elog "2023 Feb 1, the network/transmission file was replaced "
+		elog "by a directory of the same name.  You may get a file collision "
+		elog "warning because of it.  As long as you haven't made manual "
+		elog "edits to the file, you can remove the transmission.backup.#### "
+		elog "file if one is made."
+		elog
+		elog "See https://github.com/munin-monitoring/contrib/commit/2a12025ee5a22dad41be8f1c05052c2a93e3d3bd"
+	fi
+
+	insinto "/etc/munin/templates"
+	use templates && doins -r templates/munstrap
+
+	use examples && dodoc -r samples/munin.conf
+
+	dodoc README.md
+}


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-analyzer/munin-contrib/
  2024-03-07 13:20 [gentoo-commits] repo/proj/guru:dev " Viorel Munteanu
@ 2024-03-07 13:24 ` Viorel Munteanu
  0 siblings, 0 replies; 11+ messages in thread
From: Viorel Munteanu @ 2024-03-07 13:24 UTC (permalink / raw
  To: gentoo-commits

commit:     9bcbef732f8194554bba33bf24c160da2f5c57e3
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  7 13:19:55 2024 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Thu Mar  7 13:19:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9bcbef73

net-analyzer/munin-contrib: add back plugins USE flag

Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 net-analyzer/munin-contrib/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-analyzer/munin-contrib/metadata.xml b/net-analyzer/munin-contrib/metadata.xml
index e9e0aeb120..e724564c0d 100644
--- a/net-analyzer/munin-contrib/metadata.xml
+++ b/net-analyzer/munin-contrib/metadata.xml
@@ -13,6 +13,7 @@
     <remote-id type="github">munin-monitoring/contrib</remote-id>
   </upstream>
   <use>
+    <flag name="plugins">contrib munin plugins</flag>
     <flag name="templates">contrib munin tools</flag>
     <flag name="tools">munin contrib tools</flag>
   </use>


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-analyzer/munin-contrib/
  2024-03-07 13:13 [gentoo-commits] repo/proj/guru:dev " Viorel Munteanu
@ 2024-03-07 13:24 ` Viorel Munteanu
  0 siblings, 0 replies; 11+ messages in thread
From: Viorel Munteanu @ 2024-03-07 13:24 UTC (permalink / raw
  To: gentoo-commits

commit:     782d7a15837abdc2acb8ad3c9fd8e0f9093445e0
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  7 13:07:15 2024 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Thu Mar  7 13:08:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=782d7a15

net-analyzer/munin-contrib: reorder global variables

Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 .../munin-contrib/munin-contrib-0.2024.03.04-r1.ebuild         | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/net-analyzer/munin-contrib/munin-contrib-0.2024.03.04-r1.ebuild b/net-analyzer/munin-contrib/munin-contrib-0.2024.03.04-r1.ebuild
index aeca64064e..4adfc47bcc 100644
--- a/net-analyzer/munin-contrib/munin-contrib-0.2024.03.04-r1.ebuild
+++ b/net-analyzer/munin-contrib/munin-contrib-0.2024.03.04-r1.ebuild
@@ -7,16 +7,18 @@ inherit toolchain-funcs
 
 COMMIT="83f4e970c4a7378540057318a5083653ee2f138b"
 
-SRC_URI="https://github.com/munin-monitoring/contrib/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-DESCRIPTION="user contributed stuff related to munin"
+DESCRIPTION="User contributed stuff related to munin"
 HOMEPAGE="https://github.com/munin-monitoring/contrib"
+SRC_URI="https://github.com/munin-monitoring/contrib/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/contrib-${COMMIT}"
+
 LICENSE="GPL-3+ Apache-2.0 GPL-2 LGPL-2 GPL-2+ LGPL-3+ MIT" #TODO: investigate all the licenses
 SLOT="0"
+KEYWORDS="~amd64"
 IUSE="examples templates tools"
+
 RDEPEND="net-analyzer/munin"
 
-S="${WORKDIR}/contrib-${COMMIT}"
 README_PLUGINS=(
 	plugins/README.md
 	plugins/apache/apache_byprojects/README.md


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-analyzer/munin-contrib/
@ 2024-03-07 13:24 Viorel Munteanu
  0 siblings, 0 replies; 11+ messages in thread
From: Viorel Munteanu @ 2024-03-07 13:24 UTC (permalink / raw
  To: gentoo-commits

commit:     f39aedd0bca7d90cffb397f45d2deff3b2020e38
Author:     Philippe Chaintreuil <gentoo_bugs_peep <AT> parallaxshift <DOT> com>
AuthorDate: Wed Mar  6 22:49:12 2024 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Thu Mar  7 12:00:27 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f39aedd0

net-analyzer/munin-contrib: EAPI=8 and other tweaks

Implement various suggestions per
https://github.com/gentoo/guru/commit/9f599b78e04e14a74a1fa1343ed0631fb559066c

Signed-off-by: Philippe Chaintreuil <gentoo_bugs_peep <AT> parallaxshift.com>

 net-analyzer/munin-contrib/metadata.xml            |   1 -
 .../munin-contrib-0.2024.03.04-r1.ebuild           | 109 +++++++++++++++++++++
 2 files changed, 109 insertions(+), 1 deletion(-)

diff --git a/net-analyzer/munin-contrib/metadata.xml b/net-analyzer/munin-contrib/metadata.xml
index e724564c0d..e9e0aeb120 100644
--- a/net-analyzer/munin-contrib/metadata.xml
+++ b/net-analyzer/munin-contrib/metadata.xml
@@ -13,7 +13,6 @@
     <remote-id type="github">munin-monitoring/contrib</remote-id>
   </upstream>
   <use>
-    <flag name="plugins">contrib munin plugins</flag>
     <flag name="templates">contrib munin tools</flag>
     <flag name="tools">munin contrib tools</flag>
   </use>

diff --git a/net-analyzer/munin-contrib/munin-contrib-0.2024.03.04-r1.ebuild b/net-analyzer/munin-contrib/munin-contrib-0.2024.03.04-r1.ebuild
new file mode 100644
index 0000000000..aeca64064e
--- /dev/null
+++ b/net-analyzer/munin-contrib/munin-contrib-0.2024.03.04-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit toolchain-funcs
+
+COMMIT="83f4e970c4a7378540057318a5083653ee2f138b"
+
+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+ MIT" #TODO: investigate all the licenses
+SLOT="0"
+IUSE="examples 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/jmx/readme.txt
+	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
+	rm "plugins/nginx/nginx_byprojects/LICENSE.txt" || die
+}
+
+src_compile() {
+	export CC=$(tc-getCC)
+
+	pushd plugins/cpu || die
+		emake multicpu1sec-c
+		rm multicpu1sec-c.c || die
+	popd
+	pushd plugins/disk/smart-c || die
+		emake
+		rm *.h *.o *.c Makefile || die
+	popd
+	pushd plugins/network || die
+		emake if1sec-c
+		rm if1sec-c.c || die
+	popd
+}
+
+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
+
+	#install documentation in subfolders
+	for i in plugins/{apt,network,}/*/example-graphs ; do
+		p="${ED}/usr/share/doc/${PF}/${i}"x
+		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
+
+	elog "2023 Feb 1, the network/transmission file was replaced "
+	elog "by a directory of the same name.  You may get a file collision "
+	elog "warning because of it.  As long as you haven't made manual "
+	elog "edits to the file, you can remove the transmission.backup.#### "
+	elog "file if one is made."
+	elog
+	elog "See https://github.com/munin-monitoring/contrib/commit/2a12025ee5a22dad41be8f1c05052c2a93e3d3bd"
+
+	insinto "/etc/munin/templates"
+	use templates && doins -r templates/munstrap
+
+	use examples && dodoc -r samples/munin.conf
+
+	dodoc README.md
+}


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-analyzer/munin-contrib/
@ 2024-03-07 13:44 Viorel Munteanu
  0 siblings, 0 replies; 11+ messages in thread
From: Viorel Munteanu @ 2024-03-07 13:44 UTC (permalink / raw
  To: gentoo-commits

commit:     67b649eedbdc39e4862bfc94d58036a73f92e784
Author:     Philippe Chaintreuil <gentoo_bugs_peep <AT> parallaxshift <DOT> com>
AuthorDate: Thu Mar  7 13:29:42 2024 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Thu Mar  7 13:29:42 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=67b649ee

net-analyzer/munin-contrib: Remove accidental trailing x char

Signed-off-by: Philippe Chaintreuil <gentoo_bugs_peep <AT> parallaxshift.com>

 net-analyzer/munin-contrib/munin-contrib-0.2024.03.04-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/munin-contrib/munin-contrib-0.2024.03.04-r1.ebuild b/net-analyzer/munin-contrib/munin-contrib-0.2024.03.04-r1.ebuild
index 4adfc47bcc..3305c7dcd3 100644
--- a/net-analyzer/munin-contrib/munin-contrib-0.2024.03.04-r1.ebuild
+++ b/net-analyzer/munin-contrib/munin-contrib-0.2024.03.04-r1.ebuild
@@ -80,7 +80,7 @@ src_install() {
 
 	#install documentation in subfolders
 	for i in plugins/{apt,network,}/*/example-graphs ; do
-		p="${ED}/usr/share/doc/${PF}/${i}"x
+		p="${ED}/usr/share/doc/${PF}/${i}"
 		mkdir -p "${p}" || die
 		mv "${i}" "${p}" || die
 	done


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-analyzer/munin-contrib/
  2024-05-14 20:38 [gentoo-commits] repo/proj/guru:dev " Julien Roy
@ 2024-05-14 20:42 ` Julien Roy
  0 siblings, 0 replies; 11+ messages in thread
From: Julien Roy @ 2024-05-14 20:42 UTC (permalink / raw
  To: gentoo-commits

commit:     667a8ba2a7647ea75956870ae8dc2978cfcc7f0a
Author:     Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
AuthorDate: Mon May 13 20:36:31 2024 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Tue May 14 20:37:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=667a8ba2

net-analyzer/munin-contrib: fix variable order

Signed-off-by: Lucio Sauer <watermanpaint <AT> posteo.net>
Signed-off-by: Julien Roy <julien <AT> jroy.ca>

 net-analyzer/munin-contrib/munin-contrib-0.2021.04.27.ebuild | 6 +++---
 net-analyzer/munin-contrib/munin-contrib-0.2024.03.04.ebuild | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/net-analyzer/munin-contrib/munin-contrib-0.2021.04.27.ebuild b/net-analyzer/munin-contrib/munin-contrib-0.2021.04.27.ebuild
index 11e3b63e06..16c46b236f 100644
--- a/net-analyzer/munin-contrib/munin-contrib-0.2021.04.27.ebuild
+++ b/net-analyzer/munin-contrib/munin-contrib-0.2021.04.27.ebuild
@@ -7,16 +7,16 @@ inherit toolchain-funcs
 
 COMMIT="c31cb283fe9d38ae0367fcd9a8aef6be14bcb927"
 
-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"
+SRC_URI="https://github.com/munin-monitoring/contrib/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/contrib-${COMMIT}"
 LICENSE="GPL-3+ Apache-2.0 GPL-2 LGPL-2 GPL-2+ LGPL-3+ MIT" #TODO: investigate all the licenses
 SLOT="0"
+KEYWORDS="~amd64"
 IUSE="examples +plugins templates tools"
 RDEPEND="net-analyzer/munin"
 
-S="${WORKDIR}/contrib-${COMMIT}"
 README_PLUGINS=(
 	plugins/README.md
 	plugins/apache/apache_byprojects/README.md

diff --git a/net-analyzer/munin-contrib/munin-contrib-0.2024.03.04.ebuild b/net-analyzer/munin-contrib/munin-contrib-0.2024.03.04.ebuild
index 30f4601514..fec941412a 100644
--- a/net-analyzer/munin-contrib/munin-contrib-0.2024.03.04.ebuild
+++ b/net-analyzer/munin-contrib/munin-contrib-0.2024.03.04.ebuild
@@ -7,16 +7,16 @@ inherit toolchain-funcs
 
 COMMIT="83f4e970c4a7378540057318a5083653ee2f138b"
 
-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"
+SRC_URI="https://github.com/munin-monitoring/contrib/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/contrib-${COMMIT}"
 LICENSE="GPL-3+ Apache-2.0 GPL-2 LGPL-2 GPL-2+ LGPL-3+ MIT" #TODO: investigate all the licenses
 SLOT="0"
+KEYWORDS="~amd64"
 IUSE="examples +plugins templates tools"
 RDEPEND="net-analyzer/munin"
 
-S="${WORKDIR}/contrib-${COMMIT}"
 README_PLUGINS=(
 	plugins/README.md
 	plugins/apache/apache_byprojects/README.md


^ permalink raw reply related	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2024-05-14 20:42 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-02 10:51 [gentoo-commits] repo/proj/guru:master commit in: net-analyzer/munin-contrib/ Theo Anderson
  -- strict thread matches above, loose matches on Subject: below --
2024-05-14 20:38 [gentoo-commits] repo/proj/guru:dev " Julien Roy
2024-05-14 20:42 ` [gentoo-commits] repo/proj/guru:master " Julien Roy
2024-03-07 13:44 Viorel Munteanu
2024-03-07 13:24 Viorel Munteanu
2024-03-07 13:20 [gentoo-commits] repo/proj/guru:dev " Viorel Munteanu
2024-03-07 13:24 ` [gentoo-commits] repo/proj/guru:master " Viorel Munteanu
2024-03-07 13:13 [gentoo-commits] repo/proj/guru:dev " Viorel Munteanu
2024-03-07 13:24 ` [gentoo-commits] repo/proj/guru:master " Viorel Munteanu
2024-03-06  0:48 Julien Roy
2021-05-02 10:51 Theo Anderson
2021-03-27 15:38 Andrew Ammerlaan
2021-03-25 14:08 Andrew Ammerlaan
2021-03-25 14:08 Andrew Ammerlaan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox