Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 300171 | Differences between
and this patch

Collapse All | Expand All

(-)munin-1.3.4-r2.ebuild (-13 / +15 lines)
Lines 7-17 Link Here
7
inherit eutils
7
inherit eutils
8
8
9
DESCRIPTION="Munin Server Monitoring Tool"
9
DESCRIPTION="Munin Server Monitoring Tool"
10
HOMEPAGE="http://munin.sourceforge.net"
10
HOMEPAGE="http://munin.projects.linpro.no/"
11
SRC_URI="mirror://sourceforge/munin/${PN}_${PV}.tar.gz"
11
SRC_URI="mirror://sourceforge/munin/${P}.tar.gz"
12
LICENSE="GPL-2"
12
LICENSE="GPL-2"
13
SLOT="0"
13
SLOT="0"
14
KEYWORDS="amd64 ~mips ppc sparc x86"
14
KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
15
IUSE="doc minimal irc mysql postgres ssl"
15
IUSE="doc minimal irc mysql postgres ssl"
16
16
17
# Upstream's listing of required modules is NOT correct!
17
# Upstream's listing of required modules is NOT correct!
Lines 24-29 Link Here
24
			postgres? ( dev-perl/DBD-Pg virtual/postgresql-base )
24
			postgres? ( dev-perl/DBD-Pg virtual/postgresql-base )
25
			irc? ( dev-perl/Net-IRC )
25
			irc? ( dev-perl/Net-IRC )
26
			dev-perl/DateManip
26
			dev-perl/DateManip
27
			dev-perl/Log-Log4perl
28
			dev-perl/Net-CIDR
27
			dev-perl/Net-Netmask
29
			dev-perl/Net-Netmask
28
			dev-perl/Net-SNMP
30
			dev-perl/Net-SNMP
29
			dev-perl/libwww-perl
31
			dev-perl/libwww-perl
Lines 49-81 Link Here
49
	enewuser munin 177 -1 /var/lib/munin munin
51
	enewuser munin 177 -1 /var/lib/munin munin
50
}
52
}
51
53
52
src_prepare() {
54
#src_prepare() {
53
	# upstream needs a lot of DESTDIR loving
55
	# upstream needs a lot of DESTDIR loving
54
	# and Gentoo location support
56
	# and Gentoo location support
55
	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-1.3.4-Makefile.patch
57
#	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-1.3.4-Makefile.patch
56
	# Fix noise in the plugins
58
	# Fix noise in the plugins
57
	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-1.3.4-plugin-cleanup.patch
59
#	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-1.3.4-plugin-cleanup.patch
58
60
59
	# Bug #195964, fix up conntrack
61
	# Bug #195964, fix up conntrack
60
	EPATCH_OPTS="-p0 -d ${S}" epatch "${FILESDIR}"/${PN}-1.3.3-fw_conntrack_plugins.patch
62
#	EPATCH_OPTS="-p0 -d ${S}" epatch "${FILESDIR}"/${PN}-1.3.3-fw_conntrack_plugins.patch
61
63
62
	# Bug #225671, cannot produce HTML if RRD and graphs have not yet run.
64
	# Bug #225671, cannot produce HTML if RRD and graphs have not yet run.
63
	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-1.3.4-no-html-if-no-input.patch
65
#	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-1.3.4-no-html-if-no-input.patch
64
66
65
	# Bug #253965, compatibility changes for rrdtool 1.3
67
	# Bug #253965, compatibility changes for rrdtool 1.3
66
	EPATCH_OPTS="-p0 -d ${S}" epatch "${FILESDIR}"/${PN}-1.3.4-rrdtool-1.3.patch
68
#	EPATCH_OPTS="-p0 -d ${S}" epatch "${FILESDIR}"/${PN}-1.3.4-rrdtool-1.3.patch
67
69
68
	# Bug #248849, samba plugin does not have max values
70
	# Bug #248849, samba plugin does not have max values
69
	EPATCH_OPTS="-p0 -d ${S}" epatch "${FILESDIR}"/${PN}-1.3.4-samba-plugin.patch
71
#	EPATCH_OPTS="-p0 -d ${S}" epatch "${FILESDIR}"/${PN}-1.3.4-samba-plugin.patch
70
72
71
	# Bug #267801, ensure that directories to install to are created before
73
	# Bug #267801, ensure that directories to install to are created before
72
	# trying to populate them for parallel install.
74
	# trying to populate them for parallel install.
73
	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-1.3.4-parallel-make-fix.patch
75
#	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-1.3.4-parallel-make-fix.patch
74
76
75
	# Bug #276637, make munin-graph be terser. No more debug output unless
77
	# Bug #276637, make munin-graph be terser. No more debug output unless
76
	# --debug is on.
78
	# --debug is on.
77
	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-1.3.4-terser-munin-graph.patch
79
#	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-1.3.4-terser-munin-graph.patch
78
}
80
#}
79
81
80
src_compile() {
82
src_compile() {
81
	emake build build-man || die "build/build-man failed"
83
	emake build build-man || die "build/build-man failed"

Return to bug 300171