commit:     ca95a3840dc9836db5884204b1faea9f99ef3292
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sun May  2 09:26:49 2021 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
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

Reply via email to