1 |
commit: ca95a3840dc9836db5884204b1faea9f99ef3292 |
2 |
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun May 2 09:26:49 2021 +0000 |
4 |
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
5 |
CommitDate: Sun May 2 09:26:49 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ca95a384 |
7 |
|
8 |
net-analyzer/munin-contrib: add 0.2021.04.27, drop 0_p20210325 |
9 |
|
10 |
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> |
11 |
|
12 |
net-analyzer/munin-contrib/Manifest | 2 +- |
13 |
...25.ebuild => munin-contrib-0.2021.04.27.ebuild} | 25 ++++++++++++++++++---- |
14 |
2 files changed, 22 insertions(+), 5 deletions(-) |
15 |
|
16 |
diff --git a/net-analyzer/munin-contrib/Manifest b/net-analyzer/munin-contrib/Manifest |
17 |
index de5354f6c..b91a3e99b 100644 |
18 |
--- a/net-analyzer/munin-contrib/Manifest |
19 |
+++ b/net-analyzer/munin-contrib/Manifest |
20 |
@@ -1 +1 @@ |
21 |
-DIST munin-contrib-0_p20210325.tar.gz 6776895 BLAKE2B 15e9bb49b07e42f2e63a73367b162fbb8d87155d9fbfaa9aeda40b98468133ed03dc1e36d1c1a1184a0d1542dbfbd8ed76d3e371fd77987dea56bed08ee2acca SHA512 d972d2e965169a666861328e19744d7ea43b66f4852d86690c7d5d531ff2e3524e53259a09a29a364af91b492d15fa406f77c41fd1e99975c8e623bcbbf47911 |
22 |
+DIST munin-contrib-0.2021.04.27.tar.gz 6782163 BLAKE2B 6977d16a84a37bc15bbcae6295d52a087f9d6b694069cb384a8c79d1b2d0233052fc3057ae5bd14da305de78e9f0614b18768e51d5c49bee12f0ee6c3ccadeaa SHA512 2f7aca7a51b34a600e7d27cb5b4beebf6d8ddd1d4edfbb8a9ca6e4c4912acd38e0213efe9bef028b674c54ec91ecdc66b4782c00987e6dfd833cf86191c8dbfb |
23 |
|
24 |
diff --git a/net-analyzer/munin-contrib/munin-contrib-0_p20210325.ebuild b/net-analyzer/munin-contrib/munin-contrib-0.2021.04.27.ebuild |
25 |
similarity index 76% |
26 |
rename from net-analyzer/munin-contrib/munin-contrib-0_p20210325.ebuild |
27 |
rename to net-analyzer/munin-contrib/munin-contrib-0.2021.04.27.ebuild |
28 |
index 665f36e50..448d54ea0 100644 |
29 |
--- a/net-analyzer/munin-contrib/munin-contrib-0_p20210325.ebuild |
30 |
+++ b/net-analyzer/munin-contrib/munin-contrib-0.2021.04.27.ebuild |
31 |
@@ -3,13 +3,15 @@ |
32 |
|
33 |
EAPI="7" |
34 |
|
35 |
-COMMIT="4af69a6d076a467d7f8faa0030e8da53b1de190f" |
36 |
+inherit toolchain-funcs |
37 |
+ |
38 |
+COMMIT="c31cb283fe9d38ae0367fcd9a8aef6be14bcb927" |
39 |
|
40 |
SRC_URI="https://github.com/munin-monitoring/contrib/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" |
41 |
KEYWORDS="~amd64" |
42 |
DESCRIPTION="user contributed stuff related to munin" |
43 |
HOMEPAGE="https://github.com/munin-monitoring/contrib" |
44 |
-LICENSE="GPL-3+ Apache-2.0 GPL-2 LGPL-2 GPL-2+ LGPL-3+" #TODO: investigate all the licenses |
45 |
+LICENSE="GPL-3+ Apache-2.0 GPL-2 LGPL-2 GPL-2+ LGPL-3+ MIT" #TODO: investigate all the licenses |
46 |
SLOT="0" |
47 |
IUSE="examples +plugins templates tools" |
48 |
RDEPEND="net-analyzer/munin" |
49 |
@@ -20,6 +22,7 @@ README_PLUGINS=( |
50 |
plugins/apache/apache_byprojects/README.md |
51 |
plugins/apache/apache_vhosts/README.txt |
52 |
plugins/apt/deb_packages/README.md |
53 |
+ plugins/jmx/readme.txt |
54 |
plugins/kamailio/README.md |
55 |
plugins/network/linux_if/README.md |
56 |
plugins/nfs-freebsd/README.rst |
57 |
@@ -42,6 +45,7 @@ README_TOOLS=( |
58 |
|
59 |
src_prepare() { |
60 |
default |
61 |
+ rm "plugins/nginx/nginx_byprojects/LICENSE.txt" || die |
62 |
} |
63 |
|
64 |
src_configure() { |
65 |
@@ -49,7 +53,20 @@ src_configure() { |
66 |
} |
67 |
|
68 |
src_compile() { |
69 |
- return |
70 |
+ export CC=$(tc-getCC) |
71 |
+ |
72 |
+ pushd plugins/cpu || die |
73 |
+ ${CC} ${CFLAGS} -o multicpu1sec-c multicpu1sec-c.c || die |
74 |
+ rm multicpu1sec-c.c || die |
75 |
+ popd |
76 |
+ pushd plugins/disk/smart-c || die |
77 |
+ emake |
78 |
+ rm *.h *.o *.c Makefile || die |
79 |
+ popd |
80 |
+ pushd plugins/network || die |
81 |
+ ${CC} ${CFLAGS} -o if1sec-c if1sec-c.c || die |
82 |
+ rm if1sec-c.c || die |
83 |
+ popd |
84 |
} |
85 |
|
86 |
src_install() { |
87 |
@@ -65,7 +82,7 @@ src_install() { |
88 |
|
89 |
if use plugins; then |
90 |
#install documentation in subfolders |
91 |
- for i in plugins/{apt,}/*/example-graphs ; do |
92 |
+ for i in plugins/{apt,network,}/*/example-graphs ; do |
93 |
p="${ED}/usr/share/doc/${PF}/${i}" |
94 |
mkdir -p "${p}" || die |
95 |
mv "${i}" "${p}" || die |