* [gentoo-commits] gentoo-x86 commit in net-analyzer/munin: munin-2.0.2.ebuild ChangeLog
@ 2012-07-17 11:21 Diego Petteno (flameeyes)
0 siblings, 0 replies; 4+ messages in thread
From: Diego Petteno (flameeyes) @ 2012-07-17 11:21 UTC (permalink / raw
To: gentoo-commits
flameeyes 12/07/17 11:21:10
Modified: munin-2.0.2.ebuild ChangeLog
Log:
Move patches to a patchset tarball; use the configuration to disable Java support; install the old crontab (as munin-graph is no longer deprecated); install a local.start file to recreate /var/run/munin if using /run.
(Portage version: 2.2.0_alpha118/cvs/Linux x86_64)
Revision Changes Path
1.2 net-analyzer/munin/munin-2.0.2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/munin-2.0.2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/munin-2.0.2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/munin-2.0.2.ebuild?r1=1.1&r2=1.2
Index: munin-2.0.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- munin-2.0.2.ebuild 16 Jul 2012 16:15:11 -0000 1.1
+++ munin-2.0.2.ebuild 17 Jul 2012 11:21:10 -0000 1.2
@@ -1,16 +1,19 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.2.ebuild,v 1.1 2012/07/16 16:15:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.2.ebuild,v 1.2 2012/07/17 11:21:10 flameeyes Exp $
EAPI=4
+PATCHSET=2
+
inherit eutils user versionator
MY_P=${P/_/-}
DESCRIPTION="Munin Server Monitoring Tool"
HOMEPAGE="http://munin-monitoring.org/"
-SRC_URI="mirror://sourceforge/munin/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/munin/${MY_P}.tar.gz
+ http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
@@ -24,7 +27,6 @@
sys-process/procps
asterisk? ( dev-perl/Net-Telnet )
irc? ( dev-perl/Net-IRC )
- java? ( >=virtual/jdk-1.5 )
mysql? ( virtual/mysql
dev-perl/Cache-Cache
dev-perl/DBD-mysql )
@@ -54,6 +56,7 @@
# Keep this seperate, as previous versions have had other deps here
DEPEND="${DEPEND_COM}
virtual/perl-Module-Build
+ java? ( >=virtual/jdk-1.5 )
test? (
dev-perl/Test-LongString
dev-perl/Test-Differences
@@ -62,6 +65,7 @@
dev-perl/IO-stringy
)"
RDEPEND="${DEPEND_COM}
+ java? ( >=virtual/jre-1.5 )
!minimal? ( virtual/cron )"
S="${WORKDIR}/${MY_P}"
@@ -72,20 +76,7 @@
}
src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.4.7-munin-version-identifier.patch
-
- # Don't build java plugins if not requested via USE.
- if ! use java; then
- sed -i -e 's: build-plugins-java : :' \
- -e 's: install-plugins-java : :' Makefile || die
- fi
-
- # Bug 304447, fix for gentoo PS location
- sed -i -e 's,/usr/bin/ps,/bin/ps,g' \
- "${S}"/plugins/node.d/ifx_concurrent_sessions_.in || die
-
- # bug 367785, cleanup make output by disabling HP-UX cruft
- sed -i "/plugins\/\*\.adv/d" Makefile || die
+ epatch "${WORKDIR}"/patches/*.patch
}
src_configure() {
@@ -103,6 +94,7 @@
DBDIR=\$(DESTDIR)/var/lib/munin
LOGDIR=\$(DESTDIR)/var/log/munin
PERLSITELIB=$(perl -V:vendorlib | cut -d"'" -f2)
+JCVALID=$(usex java yes no)
EOF
}
@@ -130,14 +122,17 @@
# make sure we've got everything in the correct directory
insinto /var/lib/munin
- newins "${FILESDIR}"/${PN}-2.0_rc-crontab crontab
+ newins "${FILESDIR}"/${PN}-1.3.3-crontab crontab
newinitd "${FILESDIR}"/munin-node_init.d_2.0.2 munin-node
newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
dodoc README ChangeLog INSTALL build/resources/apache*
# bug 254968
insinto /etc/logrotate.d/
- newins "${FILESDIR}"/logrotate.d-munin munin || die
+ newins "${FILESDIR}"/logrotate.d-munin munin
+
+ exeinto /etc/local.d/
+ newexe "${FILESDIR}"/localstart-munin 50munin.start
}
pkg_config() {
1.73 net-analyzer/munin/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/ChangeLog?rev=1.73&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/ChangeLog?rev=1.73&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/ChangeLog?r1=1.72&r2=1.73
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- ChangeLog 16 Jul 2012 16:15:11 -0000 1.72
+++ ChangeLog 17 Jul 2012 11:21:10 -0000 1.73
@@ -1,6 +1,12 @@
# ChangeLog for net-analyzer/munin
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.72 2012/07/16 16:15:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.73 2012/07/17 11:21:10 flameeyes Exp $
+
+ 17 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> +files/localstart-munin,
+ -files/munin-2.0_rc-crontab, munin-2.0.2.ebuild:
+ Move patches to a patchset tarball; use the configuration to disable Java
+ support; install the old crontab (as munin-graph is no longer deprecated);
+ install a local.start file to recreate /var/run/munin if using /run.
*munin-2.0.2 (16 Jul 2012)
^ permalink raw reply [flat|nested] 4+ messages in thread* [gentoo-commits] gentoo-x86 commit in net-analyzer/munin: munin-2.0.2.ebuild ChangeLog
@ 2012-07-20 18:10 Diego Petteno (flameeyes)
0 siblings, 0 replies; 4+ messages in thread
From: Diego Petteno (flameeyes) @ 2012-07-20 18:10 UTC (permalink / raw
To: gentoo-commits
flameeyes 12/07/20 18:10:54
Modified: munin-2.0.2.ebuild ChangeLog
Log:
Log-Log4perl is used by the node, so depend on it even with USE=-minimal; only remove the ttf file with USE=minimal.
(Portage version: 2.2.0_alpha118/cvs/Linux x86_64)
Revision Changes Path
1.5 net-analyzer/munin/munin-2.0.2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/munin-2.0.2.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/munin-2.0.2.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/munin-2.0.2.ebuild?r1=1.4&r2=1.5
Index: munin-2.0.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.2.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- munin-2.0.2.ebuild 17 Jul 2012 15:27:05 -0000 1.4
+++ munin-2.0.2.ebuild 20 Jul 2012 18:10:54 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.2.ebuild,v 1.4 2012/07/17 15:27:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.2.ebuild,v 1.5 2012/07/20 18:10:54 flameeyes Exp $
EAPI=4
@@ -44,6 +44,7 @@
dev-perl/libwww-perl
dev-perl/net-server
dev-perl/DBI
+ dev-perl/Log-Log4perl
virtual/perl-Digest-MD5
virtual/perl-Getopt-Long
virtual/perl-MIME-Base64
@@ -51,8 +52,7 @@
virtual/perl-Text-Balanced
virtual/perl-Time-HiRes
!minimal? ( dev-perl/HTML-Template
- >=net-analyzer/rrdtool-1.3[perl]
- dev-perl/Log-Log4perl )"
+ >=net-analyzer/rrdtool-1.3[perl] )"
# Keep this seperate, as previous versions have had other deps here
DEPEND="${DEPEND_COM}
@@ -121,9 +121,6 @@
emake -j1 DESTDIR="${D}" ${install_targets}
fowners munin:munin ${dirs}
- # remove font files so that we don't have to keep them around
- rm "${D}"/usr/libexec/${PN}/*.ttf || die
-
insinto /etc/munin/plugin-conf.d/
newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
@@ -141,6 +138,9 @@
if ! use minimal; then
exeinto /etc/local.d/
newexe "${FILESDIR}"/localstart-munin 50munin.start
+
+ # remove font files so that we don't have to keep them around
+ rm "${D}"/usr/libexec/${PN}/*.ttf || die
fi
}
1.76 net-analyzer/munin/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/ChangeLog?rev=1.76&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/ChangeLog?rev=1.76&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/ChangeLog?r1=1.75&r2=1.76
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- ChangeLog 17 Jul 2012 15:27:05 -0000 1.75
+++ ChangeLog 20 Jul 2012 18:10:54 -0000 1.76
@@ -1,6 +1,10 @@
# ChangeLog for net-analyzer/munin
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.75 2012/07/17 15:27:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.76 2012/07/20 18:10:54 flameeyes Exp $
+
+ 20 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> munin-2.0.2.ebuild:
+ Log-Log4perl is used by the node, so depend on it even with USE=-minimal; only
+ remove the ttf file with USE=minimal.
17 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml,
munin-2.0.2.ebuild:
^ permalink raw reply [flat|nested] 4+ messages in thread* [gentoo-commits] gentoo-x86 commit in net-analyzer/munin: munin-2.0.2.ebuild ChangeLog
@ 2012-07-17 13:59 Diego Petteno (flameeyes)
0 siblings, 0 replies; 4+ messages in thread
From: Diego Petteno (flameeyes) @ 2012-07-17 13:59 UTC (permalink / raw
To: gentoo-commits
flameeyes 12/07/17 13:59:48
Modified: munin-2.0.2.ebuild ChangeLog
Log:
Unbundle DejaVu fonts by depending on them and using a newer rrdtool as a minimum; properly wire in installation of the Java library.
(Portage version: 2.2.0_alpha118/cvs/Linux x86_64)
Revision Changes Path
1.3 net-analyzer/munin/munin-2.0.2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/munin-2.0.2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/munin-2.0.2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/munin-2.0.2.ebuild?r1=1.2&r2=1.3
Index: munin-2.0.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- munin-2.0.2.ebuild 17 Jul 2012 11:21:10 -0000 1.2
+++ munin-2.0.2.ebuild 17 Jul 2012 13:59:48 -0000 1.3
@@ -1,12 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.2.ebuild,v 1.2 2012/07/17 11:21:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.2.ebuild,v 1.3 2012/07/17 13:59:48 flameeyes Exp $
EAPI=4
-PATCHSET=2
+PATCHSET=3
-inherit eutils user versionator
+inherit eutils user versionator java-pkg-opt-2
MY_P=${P/_/-}
@@ -50,7 +50,7 @@
virtual/perl-Text-Balanced
virtual/perl-Time-HiRes
!minimal? ( dev-perl/HTML-Template
- net-analyzer/rrdtool[perl]
+ >=net-analyzer/rrdtool-1.3[perl]
dev-perl/Log-Log4perl )"
# Keep this seperate, as previous versions have had other deps here
@@ -66,17 +66,22 @@
)"
RDEPEND="${DEPEND_COM}
java? ( >=virtual/jre-1.5 )
- !minimal? ( virtual/cron )"
+ !minimal? (
+ virtual/cron
+ media-fonts/dejavu
+ )"
S="${WORKDIR}/${MY_P}"
pkg_setup() {
enewgroup munin
enewuser munin 177 -1 /var/lib/munin munin
+ java-pkg-opt-2_pkg_setup
}
src_prepare() {
epatch "${WORKDIR}"/patches/*.patch
+ java-pkg-opt-2_src_prepare
}
src_configure() {
@@ -95,6 +100,7 @@
LOGDIR=\$(DESTDIR)/var/log/munin
PERLSITELIB=$(perl -V:vendorlib | cut -d"'" -f2)
JCVALID=$(usex java yes no)
+JAVALIBDIR=${T}/java
EOF
}
@@ -117,6 +123,9 @@
emake DESTDIR="${D}" ${install_targets}
fowners munin:munin ${dirs}
+ # remove font files so that we don't have to keep them around
+ rm "${D}"/usr/libexec/${PN}/*.ttf || die
+
insinto /etc/munin/plugin-conf.d/
newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
@@ -133,6 +142,10 @@
exeinto /etc/local.d/
newexe "${FILESDIR}"/localstart-munin 50munin.start
+
+ if use java; then
+ java-pkg_dojar "${T}"/java/*.jar
+ fi
}
pkg_config() {
1.74 net-analyzer/munin/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/ChangeLog?rev=1.74&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/ChangeLog?rev=1.74&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/ChangeLog?r1=1.73&r2=1.74
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- ChangeLog 17 Jul 2012 11:21:10 -0000 1.73
+++ ChangeLog 17 Jul 2012 13:59:48 -0000 1.74
@@ -1,6 +1,10 @@
# ChangeLog for net-analyzer/munin
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.73 2012/07/17 11:21:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.74 2012/07/17 13:59:48 flameeyes Exp $
+
+ 17 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> munin-2.0.2.ebuild:
+ Unbundle DejaVu fonts by depending on them and using a newer rrdtool as a
+ minimum; properly wire in installation of the Java library.
17 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> +files/localstart-munin,
-files/munin-2.0_rc-crontab, munin-2.0.2.ebuild:
^ permalink raw reply [flat|nested] 4+ messages in thread* [gentoo-commits] gentoo-x86 commit in net-analyzer/munin: munin-2.0.2.ebuild ChangeLog
@ 2012-07-16 16:15 Diego Petteno (flameeyes)
0 siblings, 0 replies; 4+ messages in thread
From: Diego Petteno (flameeyes) @ 2012-07-16 16:15 UTC (permalink / raw
To: gentoo-commits
flameeyes 12/07/16 16:15:11
Modified: ChangeLog
Added: munin-2.0.2.ebuild
Log:
Initial try to package munin-2. More work is to be expected before unmask.
(Portage version: 2.2.0_alpha118/cvs/Linux x86_64)
Revision Changes Path
1.72 net-analyzer/munin/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/ChangeLog?rev=1.72&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/ChangeLog?rev=1.72&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/ChangeLog?r1=1.71&r2=1.72
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- ChangeLog 7 Jul 2012 07:21:50 -0000 1.71
+++ ChangeLog 16 Jul 2012 16:15:11 -0000 1.72
@@ -1,6 +1,13 @@
# ChangeLog for net-analyzer/munin
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.71 2012/07/07 07:21:50 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.72 2012/07/16 16:15:11 flameeyes Exp $
+
+*munin-2.0.2 (16 Jul 2012)
+
+ 16 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+ +files/munin-2.0_rc-crontab, +files/munin-node_init.d_2.0.2,
+ +munin-2.0.2.ebuild:
+ Initial try to package munin-2. More work is to be expected before unmask.
*munin-1.4.7-r1 (07 Jul 2012)
1.1 net-analyzer/munin/munin-2.0.2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/munin-2.0.2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/munin-2.0.2.ebuild?rev=1.1&content-type=text/plain
Index: munin-2.0.2.ebuild
===================================================================
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.2.ebuild,v 1.1 2012/07/16 16:15:11 flameeyes Exp $
EAPI=4
inherit eutils user versionator
MY_P=${P/_/-}
DESCRIPTION="Munin Server Monitoring Tool"
HOMEPAGE="http://munin-monitoring.org/"
SRC_URI="mirror://sourceforge/munin/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~mips ~ppc ~x86"
IUSE="asterisk doc irc java memcached minimal mysql postgres ssl test 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.
DEPEND_COM="dev-lang/perl
sys-process/procps
asterisk? ( dev-perl/Net-Telnet )
irc? ( dev-perl/Net-IRC )
java? ( >=virtual/jdk-1.5 )
mysql? ( virtual/mysql
dev-perl/Cache-Cache
dev-perl/DBD-mysql )
ssl? ( dev-perl/Net-SSLeay )
postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base )
memcached? ( dev-perl/Cache-Memcached )
cgi? ( dev-perl/FCGI )
dev-perl/DateManip
dev-perl/File-Copy-Recursive
dev-perl/IO-Socket-INET6
dev-perl/Net-CIDR
dev-perl/Net-Netmask
dev-perl/Net-SNMP
dev-perl/libwww-perl
dev-perl/net-server
dev-perl/DBI
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
net-analyzer/rrdtool[perl]
dev-perl/Log-Log4perl )"
# Keep this seperate, as previous versions have had other deps here
DEPEND="${DEPEND_COM}
virtual/perl-Module-Build
test? (
dev-perl/Test-LongString
dev-perl/Test-Differences
dev-perl/Test-MockModule
dev-perl/File-Slurp
dev-perl/IO-stringy
)"
RDEPEND="${DEPEND_COM}
!minimal? ( virtual/cron )"
S="${WORKDIR}/${MY_P}"
pkg_setup() {
enewgroup munin
enewuser munin 177 -1 /var/lib/munin munin
}
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.4.7-munin-version-identifier.patch
# Don't build java plugins if not requested via USE.
if ! use java; then
sed -i -e 's: build-plugins-java : :' \
-e 's: install-plugins-java : :' Makefile || die
fi
# Bug 304447, fix for gentoo PS location
sed -i -e 's,/usr/bin/ps,/bin/ps,g' \
"${S}"/plugins/node.d/ifx_concurrent_sessions_.in || die
# bug 367785, cleanup make output by disabling HP-UX cruft
sed -i "/plugins\/\*\.adv/d" Makefile || die
}
src_configure() {
local cgidir='$(DESTDIR)/var/www/localhost/cgi-bin'
use cgi || cgidir="${T}/useless/cgi-bin"
cat - >> "${S}"/Makefile.config <<EOF
PREFIX=\$(DESTDIR)/usr
CONFDIR=\$(DESTDIR)/etc/munin
DOCDIR=\$(DESTDIR)/usr/share/doc/${PF}
MANDIR=\$(PREFIX)/share/man
LIBDIR=\$(PREFIX)/libexec/munin
HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
CGIDIR=${cgidir}
DBDIR=\$(DESTDIR)/var/lib/munin
LOGDIR=\$(DESTDIR)/var/log/munin
PERLSITELIB=$(perl -V:vendorlib | cut -d"'" -f2)
EOF
}
src_compile() {
emake default $(use doc && echo build-doc)
}
src_install() {
local dirs
dirs="/var/log/munin/ /var/lib/munin/"
dirs="${dirs} /var/lib/munin/plugin-state/"
dirs="${dirs} /etc/munin/plugin-conf.d/"
dirs="${dirs} /etc/munin/munin-conf.d/"
dirs="${dirs} /etc/munin/plugins/"
keepdir ${dirs}
local install_targets="install-common-prime install-node-prime install-plugins-prime"
use minimal || install_targets=install
emake DESTDIR="${D}" ${install_targets}
fowners munin:munin ${dirs}
insinto /etc/munin/plugin-conf.d/
newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
# make sure we've got everything in the correct directory
insinto /var/lib/munin
newins "${FILESDIR}"/${PN}-2.0_rc-crontab crontab
newinitd "${FILESDIR}"/munin-node_init.d_2.0.2 munin-node
newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
dodoc README ChangeLog INSTALL build/resources/apache*
# bug 254968
insinto /etc/logrotate.d/
newins "${FILESDIR}"/logrotate.d-munin munin || die
}
pkg_config() {
einfo "Press enter to install the default crontab for the munin master"
einfo "installation from /var/lib/munin/crontab"
einfo "If you have a large site, you may wish to customize it."
read
# dcron is very fussy about syntax
# the following is the only form that works in BOTH dcron and vixie-cron
crontab - -u munin </var/lib/munin/crontab
}
pkg_postinst() {
elog
if ! use minimal; then
elog "To have munin's cronjob automatically configured for you if this is"
elog "your munin master installation, please:"
elog "emerge --config net-analyzer/munin"
fi
}
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-07-20 18:11 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-17 11:21 [gentoo-commits] gentoo-x86 commit in net-analyzer/munin: munin-2.0.2.ebuild ChangeLog Diego Petteno (flameeyes)
-- strict thread matches above, loose matches on Subject: below --
2012-07-20 18:10 Diego Petteno (flameeyes)
2012-07-17 13:59 Diego Petteno (flameeyes)
2012-07-16 16:15 Diego Petteno (flameeyes)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox