From 121ed4eec41fbf03e1998d09eede1bf449da63b9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 19 Jul 2019 22:05:27 +0100 Subject: gentoo resync : 19.07.2019 --- net-analyzer/munin/Manifest | 5 +- net-analyzer/munin/metadata.xml | 5 - net-analyzer/munin/munin-2.0.49.ebuild | 2 +- net-analyzer/munin/munin-2.1.9999.ebuild | 381 ------------------------------- 4 files changed, 3 insertions(+), 390 deletions(-) delete mode 100644 net-analyzer/munin/munin-2.1.9999.ebuild (limited to 'net-analyzer/munin') diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest index 3b6df1a1cef1..415e437d61bf 100644 --- a/net-analyzer/munin/Manifest +++ b/net-analyzer/munin/Manifest @@ -20,6 +20,5 @@ DIST munin-2.0.49-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051 DIST munin-2.0.49.tar.gz 2257501 BLAKE2B f2852357e3aa0c1ca3e217b66c3e2d1c0d9c70bf1f8487517ee913e2223ca1c5ae9b922c07f83754522c51fddd0f72f87f5ceea9b7e9642a44aab04ead44538f SHA512 e8bf652000ab76f16bc3b18a16c5231ffb5523fe9f78a90bec97ca31e46ff73566e1cbbf0a3616931d0b46ceb6f5a2b5d4fdc68c797539419a2217dccf643762 EBUILD munin-2.0.38.ebuild 12317 BLAKE2B b6ff588ee1677a7c4224f7c9bc11701fd3b6c4c1384644254ca75a9e30a885222eaae96344415b773311d70e17443043e573ef7fa1f38fd16358acd452dee614 SHA512 a536fd709bf2bec938551eeba84054b9a8b7a12e82ec9c2abc75f81463871c8809e6d97cfe5dd0e265d2bcd3faf25c1dc438d6fb7ded527cd2ad4437733bc7eb EBUILD munin-2.0.47.ebuild 12243 BLAKE2B dea9c3a348864d433d2ea6eb9d855aa8304d4e37f0821e827bc02b6540119afc1984839500bae78e542830ad21fed41cb905cf4c1fff0ab8e2872d1774cf75f2 SHA512 9e2dc7f379d7d99d486fe7f298e36dd9b21129526afe63eee2c3fd148fce4fade486e056edea616decc5d4e38dd530ab6c72d2d495adc9df2083ddb75a3a1dc9 -EBUILD munin-2.0.49.ebuild 12278 BLAKE2B f0718f2ef584bd6ff3af292889cd054e6db60785b6fb25a20704fc8a48def5707db089c98dcb31e7a86bea28830452317b6401a5b0b4d3020d958937025b2780 SHA512 b153bcf01e52eff5312c8df9b457ba784d99d3861ca2c61f9044c9b942e9b0a4b1b3cf91093e354c97c50f54cf4f466f6767f7ebf5c13b52fd0709f336487842 -EBUILD munin-2.1.9999.ebuild 11520 BLAKE2B 7f55a4e139ddb37419299ff65fbda91e22a3e890c86c23bc7d83f902fdc81f36ad665d3f0c6d7bbfdb60684740e1ae86ec9ec9f34dbf15f49e5385c72156fa55 SHA512 6069e6d31b9385885e98e815d4bf33227689fa8e74c48f4aa7b6af673be76d25ef26e777ef819563a8978a3cd73bc518b0ad3e5807c58a5b0e575aeb712f5ce5 -MISC metadata.xml 4116 BLAKE2B 652f8bb067b024f91b3f2fb9d885c93405ccd3e4fdfa141ae5e2996f9898e757d7be93d7e74d027a82403d2b9b472f7c6fec95815b18a0b2975e20e328fb7862 SHA512 ecfa257040277d815c05693724e9ff454b5ddefc1134b6afb38d66783a5e415aae78bdb35aeb0e80882a7b8ff19499f2b3b3646cc2a139e7797a0a718c2389f3 +EBUILD munin-2.0.49.ebuild 12275 BLAKE2B 01ec8f4ff21fdeae4a9479f3386b05cd6450acde550fee53830e032f7b6b0369b7814748185c4970b1ae417abd54624946df376694686aa75514433dd0f837f3 SHA512 762bc414c30ac62a73bce6f276c096120ba181d0085b8036fae5a8774bc8d977caab97c1e576f588c3229f085f4e5d4363eb909bfc64942beb1eeac487be7788 +MISC metadata.xml 3920 BLAKE2B cb28e1a3e95ffcc305975d7edc26a5cf852a2a29f8c56376c9bbc90fd2b2850bfeb614d750e7700870aa0c10c8dcfcd2b845c210a5518f591ccfbb7571971cda SHA512 9d12c61750f5ee42cfcb6672facf3b46a024872d918c7acb26631c1b9bab29802a6ac9f4d895b9f4ef18a6f283ad64d4bd6e313df0489a6ed82185c660c42083 diff --git a/net-analyzer/munin/metadata.xml b/net-analyzer/munin/metadata.xml index df14a4c78fe6..591d8ce60e47 100644 --- a/net-analyzer/munin/metadata.xml +++ b/net-analyzer/munin/metadata.xml @@ -71,11 +71,6 @@ web pages and graphs. This is only meaningful if the minimal USE flag is disabled. - - Set up the configuration of the CGI generation of HTML and - graphs to work with Apache. This also install an include-able - configuration file. - Add support for IPv6 in munin-node. IPv6 support for the master is always enabled, but the node requires a newer version of diff --git a/net-analyzer/munin/munin-2.0.49.ebuild b/net-analyzer/munin/munin-2.0.49.ebuild index caf8f3564d6e..42bf360e6029 100644 --- a/net-analyzer/munin/munin-2.0.49.ebuild +++ b/net-analyzer/munin/munin-2.0.49.ebuild @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86" +KEYWORDS="amd64 ~arm ppc x86" IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2" REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )" diff --git a/net-analyzer/munin/munin-2.1.9999.ebuild b/net-analyzer/munin/munin-2.1.9999.ebuild deleted file mode 100644 index d041ec7f4195..000000000000 --- a/net-analyzer/munin/munin-2.1.9999.ebuild +++ /dev/null @@ -1,381 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils user java-pkg-opt-2 git-2 - -EGIT_REPO_URI="https://github.com/munin-monitoring/${PN}.git" - -DESCRIPTION="Munin Server Monitoring Tool" -HOMEPAGE="http://munin-monitoring.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="irc java memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache" -REQUIRED_USE="cgi? ( !minimal ) apache? ( cgi )" - -# Upstream's listing of required modules is NOT correct! -# Some of the postgres plugins use DBD::Pg, while others call psql directly. -# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly. -# We replace the original ipmi plugins with the freeipmi_ plugin which at least works. -DEPEND_COM="dev-lang/perl:=[berkdb] - sys-process/procps - doc? ( dev-python/sphinx ) - irc? ( dev-perl/Net-IRC ) - mysql? ( virtual/mysql - dev-perl/Cache-Cache - dev-perl/DBD-mysql ) - ssl? ( dev-perl/Net-SSLeay ) - postgres? ( dev-perl/DBD-Pg dev-db/postgresql ) - memcached? ( dev-perl/Cache-Memcached ) - cgi? ( dev-perl/FCGI ) - apache? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) - syslog? ( virtual/perl-Sys-Syslog ) - http? ( dev-perl/libwww-perl ) - dhcpd? ( - >=net-misc/dhcp-3[server] - dev-perl/Net-IP - dev-perl/HTTP-Date - ) - dev-perl/DBI - dev-perl/Date-Manip - dev-perl/File-Copy-Recursive - dev-perl/List-MoreUtils - dev-perl/Log-Log4perl - dev-perl/Net-CIDR - dev-perl/Net-Netmask - dev-perl/Net-SNMP - dev-perl/Net-Server[ipv6(-)?] - virtual/perl-Digest-MD5 - virtual/perl-Getopt-Long - virtual/perl-MIME-Base64 - virtual/perl-Storable - virtual/perl-Text-Balanced - virtual/perl-Time-HiRes - !minimal? ( - dev-perl/HTML-Template - dev-perl/IO-Socket-INET6 - dev-perl/URI - >=net-analyzer/rrdtool-1.3[graph,perl] - virtual/ssh - )" - -# Keep this seperate, as previous versions have had other deps here -DEPEND="${DEPEND_COM} - dev-perl/Module-Build - java? ( >=virtual/jdk-1.5 ) - test? ( - dev-perl/Test-Deep - dev-perl/Test-LongString - dev-perl/Test-Differences - dev-perl/Test-MockModule - dev-perl/Test-MockObject - dev-perl/File-Slurp - dev-perl/IO-stringy - dev-perl/IO-Socket-INET6 - )" -RDEPEND="${DEPEND_COM} - virtual/awk - ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) - java? ( - >=virtual/jre-1.5 - || ( net-analyzer/netcat6 net-analyzer/netcat ) - ) - !minimal? ( - virtual/cron - media-fonts/dejavu - ) - selinux? ( sec-policy/selinux-munin ) - !> "${S}"/Makefile.config <> "${T}"/munin.env < "${D}"/etc/logrotate.d/munin - - dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_ - - if use syslog; then - sed -i -e '/log_file/s| .*| Sys::Syslog|' \ - "${D}"/etc/munin/munin-node.conf || die - fi - - # Use a simpler pid file to avoid trouble with /run in tmpfs. The - # munin-node service is ran as user root, and only later drops - # privileges. - sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \ - "${D}"/etc/munin/munin-node.conf || die - - keepdir /var/spool/munin-async/.ssh - touch "${D}"/var/spool/munin-async/.ssh/authorized_keys - fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}} - fperms 0750 /var/spool/munin-async{,/.ssh} - fperms 0600 /var/spool/munin-async/.ssh/authorized_keys - - if use minimal; then - # This requires the presence of munin-update, which is part of - # the non-minimal install... - rm "${D}"/usr/libexec/munin/plugins/munin_stats - else - dodir /usr/lib/tmpfiles.d - cat - > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <> "${D}"/var/lib/munin/.ssh/config <> "${D}"/usr/share/${PN}/crontab <> "${D}"/usr/share/${PN}/fcrontab <