Diff munin-2.0.69-r1 with a munin-2.0.73-r4

/usr/portage/net-analyzer/munin/munin-2.0.73-r4.ebuild 2023-10-09 14:52:33.320368447 +0300
1
# Copyright 1999-2022 Gentoo Authors
1
# Copyright 1999-2023 Gentoo Authors
2 2
# Distributed under the terms of the GNU General Public License v2
3 3

  
4
EAPI=7
4
EAPI=8
5 5

  
6 6
PATCHSET=1
7 7

  
......
13 13
HOMEPAGE="https://munin-monitoring.org/"
14 14
SRC_URI="
15 15
	https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz -> ${P}.tar.gz
16
	https://dev.gentoo.org/~graaff/munin/${P}-gentoo-${PATCHSET}.tar.xz
17
	https://github.com/munin-monitoring/munin/commit/47a2ea75899a6395a80918d043a21d61fe712b44.patch -> munin-remove-Date-Manip-DM5.patch
18 16
	"
19 17

  
20 18
LICENSE="GPL-2"
21 19
SLOT="0"
22
KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
20
KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
23 21
IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
24 22
REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
25 23
RESTRICT="!test? ( test )"
......
34 32
	acct-group/munin
35 33
	dev-lang/perl:=[berkdb]
36 34
	dev-perl/DBI
35
	dev-perl/Date-Manip
37 36
	dev-perl/File-Copy-Recursive
38 37
	dev-perl/List-MoreUtils
39 38
	dev-perl/Log-Log4perl
......
120 119
src_prepare() {
121 120
	echo ${PV} > RELEASE || die
122 121

  
123
	eapply "${WORKDIR}"/patches/*.patch
124
	# Quick hack to make the munin-remove-Date-Manip-DM5.patch apply
125
	sed -i -e '/^BEGIN/,/Date::Manip::Backend/{ /no warnings;/d  }' "${S}"/master/_bin/munin-cgi-graph.in
126
	eapply "${DISTDIR}"/munin-remove-Date-Manip-DM5.patch
122
	eapply "${FILESDIR}"/patches/*.patch
127 123

  
128 124
	eapply_user
129 125

  
......
177 173
}
178 174

  
179 175
src_install() {
176
	local cgiuser=$(usex apache2 apache munin)
177

  
180 178
	local dirs="
181 179
		/var/log/munin
182 180
		/var/lib/munin/plugin-state
......
193 191
	# run in parallel for now (because it uses internal loops).
194 192
	emake -j1 CHOWN=true DESTDIR="${D}" $(usex minimal "install-minimal install-man" install)
195 193

  
196
	# we remove /run from the install, as it's not the package's to deal
197
	# with.
198
	rm -rf "${D}"/run || die
194
	# we remove /run and /var/cache from the install, as it's not the
195
	# package's to deal with.
196
	rm -rf "${D}"/run "${D}"/var/cache || die
199 197

  
200 198
	# remove the plugins for non-Gentoo package managers; use -f so that
201 199
	# it doesn't fail when installing on non-Linux platforms.
......
204 202
	insinto /etc/munin/plugin-conf.d/
205 203
	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
206 204

  
207
	newinitd "${FILESDIR}"/munin-node_init.d_2.0.19 munin-node
205
	newinitd "${FILESDIR}"/munin-node_init.d_2.0.73 munin-node
208 206
	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
209 207

  
210 208
	newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
211 209

  
212 210
	newtmpfiles - ${CATEGORY}:${PN}:${SLOT}.conf <<-EOF || die
213 211
	d /run/munin 0700 munin munin - -
212
	d /var/cache/munin-cgi 0755 ${cgiuser} munin - -
214 213
	EOF
215 214

  
216 215
	systemd_dounit "${FILESDIR}"/munin-async.service
......
271 270

  
272 271
			if use apache2; then
273 272
				insinto /etc/apache2/vhosts.d
274
				newins "${FILESDIR}"/munin.apache.include munin.include
275
				newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include
273
				newins "${FILESDIR}"/munin.apache.include-2.4-r1 munin-2.4.include
276 274
			fi
277 275
		else
278 276
			sed \
......
399 397
			"${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log
400 398

  
401 399
		if use apache2; then
402
			elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include"
403
			elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual"
400
			elog "To use Munin with CGI you should include"
401
			elog "/etc/apache2/vhosts.d/munin-2.4.include from the virtual"
404 402
			elog "host you want it to be served."
405 403
			elog "If you want to enable CGI-based HTML as well, you have to add to"
406 404
			elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI."
Thank you!