Merge updates from master

This commit is contained in:
Repository mirror & CI
2021-05-02 11:05:03 +00:00
9 changed files with 78 additions and 87 deletions

View File

@@ -19,21 +19,12 @@ IUSE="examples"
DEPEND=""
RDEPEND="${DEPEND}"
#BDEPEND="
# doc? ( app-text/pandoc )
#"
#TODO: explore the various cmake options (if any)
#TODO: tests, doc
#TODO: tests
src_compile() {
cmake_src_compile
#waiting for https://github.com/greg7mdp/parallel-hashmap/issues/91
# if use doc ; then
# cd html || die
# emake all
# fi
}
src_install() {

View File

@@ -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

View File

@@ -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
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() {
@@ -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

View File

@@ -0,0 +1 @@
DIST munin-plugins-mendix-23.tar.gz 27443 BLAKE2B ff15f47ae8f540ad0080f76ee7e04451a5f6e5fa046444f5eac7994f3bd8aee4342b0c435951b370a7e14d1e25f5007d66aa8904be43c54e8b9cae4157494ebb SHA512 5ede0c389dec7ddc2148138643e020bbc2fb8ffcdbafb5cd959e3e0c1db2ad3d909b10608a26c34f6a3bc798c97e876f9175284d83266df72647a5c632960845

View File

@@ -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>
<maintainer>
<email>pim.van.den.berg@mendix.com</email>
<name>Pim van den Berg</name>
</maintainer>
<bugs-to>https://github.com/mendix/munin-plugins-mendix/issues</bugs-to>
<remote-id type="github">mendix/munin-plugins-mendix</remote-id>
</upstream>
</pkgmetadata>

View File

@@ -0,0 +1,33 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
DESCRIPTION="This package provides various plugins for Munin"
HOMEPAGE="https://github.com/mendix/munin-plugins-mendix"
SRC_URI="https://github.com/mendix/munin-plugins-mendix/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
LICENSE="all-rights-reserved" #https://github.com/mendix/munin-plugins-mendix/issues/10
SLOT="0"
RDEPEND="net-analyzer/munin"
src_prepare() {
default
}
src_configure() {
return
}
src_compile() {
return
}
src_install() {
#install plugins without getting mad at preserving exec bit
mkdir -p "${ED}/usr/libexec/munin/plugins/mendix" || die
mv plugins/* "${ED}/usr/libexec/munin/plugins/mendix" || die
insinto "/etc/munin/plugin-conf.d/"
doins -r plugin-conf/*
}

View File

@@ -1,69 +0,0 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
inherit flag-o-matic fortran-2 toolchain-funcs
DESCRIPTION="Jacobi-Davidson type method for the generalized standard eigenvalue problem."
HOMEPAGE="https://www.win.tue.nl/~hochsten/jd/"
SRC_URI="https://www.win.tue.nl/~hochsten/jd/${PN}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
IUSE="doc"
# vvirtual/lapack does not pull in [deprecated] so we have to deal with this mess like this until it does
DEPEND="
virtual/blas
virtual/lapack
|| ( sci-libs/openblas sci-libs/lapack[deprecated(-)] )
"
RDEPEND="${DEPEND}"
BDEPEND="doc? ( dev-texlive/texlive-latex )"
S="${WORKDIR}/${PN}"
src_prepare() {
libs="$($(tc-getPKG_CONFIG) --libs blas)"
libs+=" $($(tc-getPKG_CONFIG) --libs lapack)"
export libs
sed -i 's/f77/${F77}/g' jdtest/Makefile || die
sed -i '/FFLAGS/d' jdtest/Makefile || die
sed -i 's/-u -O/-u ${FFLAGS}/g' jdtest/Makefile || die
sed -i "s/-llapack -lblas/${libs}/" jdtest/Makefile || die
default
}
src_compile() {
if use doc; then
pdflatex manual.tex || die
fi
cd "jdlib" || die
echo "$(fc-getFC)" *.f "${FFLAGS} -shared -fPIC -Wl,-soname,libjdqz.so.0 -lm ${libs} ${LDFLAGS} -o libjdqz.so.0" > make.sh || die
bash make.sh || die
ln -s libjdqz.so.0 libjdqz.so || die
}
src_test() {
cd "jdtest" || die
emake
cd ".." || die
LD_LIBRARY_PATH="./jdlib" ./jdtest/example || die
}
src_install() {
dolib.so jdlib/libjdqz.so
dolib.so jdlib/libjdqz.so.0
use doc && dodoc manual.pdf
}

View File

@@ -45,9 +45,9 @@ src_compile() {
}
src_test() {
cd "jdtest" || die
pushd "jdtest" || die
emake
cd ".." || die
popd || die
LD_LIBRARY_PATH="./jdlib" ./jdtest/example || die
}

View File

@@ -21,6 +21,7 @@ DEPEND="
x11-libs/libXrandr
dev-libs/libevdev
x11-libs/gtk+:3
virtual/udev
|| ( dev-dotnet/dotnet-sdk-bin dev-dotnet/dotnet-runtime-bin )
"
@@ -50,7 +51,8 @@ src_install() {
insinto "/usr/share/${MY_PN}"
doins -r "Configurations"
doins "${S}/99-${LP}.rules" "/usr/lib/udev/rules.d"
insinto "/lib/udev/rules.d"
doins -r "${S}/99-${LP}.rules"
#install -Dm 644 -o root "${S}/99-${LP}.rules" -t "${D}/usr/lib/udev/rules.d"
udevadm control --reload || die