Version bump.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

3 files changed, 272 insertions, 9 deletions

diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog
index 791faa3bc4b7..ee1983ded375 100644
--- a/net-analyzer/munin/ChangeLog
+++ b/net-analyzer/munin/ChangeLog
@@ -1,6 +1,11 @@
 # 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.90 2012/08/07 01:19:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.91 2012/08/14 16:15:05 flameeyes Exp $
+
+*munin-2.0.5 (14 Aug 2012)
+
+  14 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> +munin-2.0.5.ebuild:
+  Version bump.
 
 *munin-2.0.4-r2 (07 Aug 2012)
 
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 344a2a603cc3..1f9570c635a9 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -21,19 +21,22 @@ DIST munin-1.4.7-patches-1.tar.xz 10208 SHA256 7429c949ebfe3fbeaf50f54401a311991
 DIST munin-1.4.7.tar.gz 1236273 SHA256 9a87356b1f8662f444a7a2a86ff36809124ffe787c442de0ea35850194d602af SHA512 5a01c04a291f53e750b170e715c9f0d5e2cca5fa2a11f725ba6a81bbe7b34c34ef6459ea60177d13d1c38e9e91d374c1e227b2d4d7ba8c094353320a51f40b30 WHIRLPOOL f16ad8331b48136ec9cdd21fdab0efd2bca7800954f0160e7a09192c22f2d7f88cbba1df81a5750f5e4577ca1a93e41643e9ad1445b645f76becfa5db28a8088
 DIST munin-2.0.4-patches-6.tar.xz 10428 SHA256 2e060e3a0c11824db40cedfa1b7514ce67514e0d4e6b44d6595e3ab49bac7493 SHA512 fa506f3766b3e776931f4ab9cc013905f154c18dd7f2d9cde7ab61d3b60b12af6fed87ae9b62dff58f21581b61e71ce620826b63024c0ab44f8d195e5859fa91 WHIRLPOOL e3120a9fb9dd474db870b2e7238e29b6b787a533b7748853cef63a3d442d407a83b628c99724e4d7bfe80e6bc8ffd9266b31a5fb52ba4e10e903996c11fd70d4
 DIST munin-2.0.4.tar.gz 1318808 SHA256 309388e3528b41d727cea01233f0d4f60714e2de443576e1c472e8a1dc81722c SHA512 4f20eaa6b427439135ee6b8203044a055b37b6fadcdd05b57b2e0198764ca0487d3fa79e5cdc6c663e3809879efd4bc4a13df705f096b72eec3188051dd84a35 WHIRLPOOL 84afa3ae217625161a4e3ebc7dd8213f55fd97d515a904c35dc9f1f06c143c4921907a019bff2d79f9df0ae305dee84075445aa7be610f78eaa7977dbdaf8a06
+DIST munin-2.0.5-patches-1.tar.xz 7704 SHA256 04ba9bb56d9b39cf34c03cf957ac76252c6897a8d933871078e1ab603cdbd14e SHA512 3f1c1acb0a6b2c7989937f82a631c84c7e394da27192a6edb554742dba02cba3a3ca1625a2d433cbd53bb8305491d657c2688636338a9224b3b9ad74c688daad WHIRLPOOL 17ee7a565fb409aa316dff90927dd3e7662610416a45e2a543fad35ebfbb8b709470f793ba7c6a8547e1ea49b8515c199c301e14a35aaae1bbd4afdd5790aeca
+DIST munin-2.0.5.tar.gz 1319398 SHA256 927b9b557343ad031b55b401eb1542db03d78a48a64797f5fed6ad58fc2c8785 SHA512 e52ce2f44a4322000dc38d0b8ae6e5f406211b7a081e1f4300938dfe10bff1559d9e84f454885c70bae9aabfa4b7fde8c3b3d8b239d35596f678baaba6d7d7bc WHIRLPOOL 7751eee653a0b80a9a3283a8940a270db0c5ece7de67f1b253004901db2fd06f6d8c104497ced6d3659ac6a45f4d8e37bbb362f6dec6f7181cb2d30ca115f495
 EBUILD munin-1.4.6-r4.ebuild 5033 SHA256 032e77091eb5e3776b79fd6857965ae8de3050b8fae6622bd311cc073b9882a9 SHA512 aa041a841d3e86686e4cb2137ce1237ac9d656f67ff4d97a75651345392ca5566b5ca46dd2d76d54a8228c5c4634d1a1205da3f7458598b337cdeb0af62d09f3 WHIRLPOOL 4118ebdff6f61ce32d1d273d71125cb71e994eceb78c8fd89987aa0bba8906d1c825fd03721d84ac61930758a401353f788b069f739a54c44888c1876aba6e2d
 EBUILD munin-1.4.7-r2.ebuild 5641 SHA256 95617a67832cb43f739112e95656476ff3d6822ceffd6ba15315237e7355fe20 SHA512 3c943a4d2dc46f69b4cd78919ab3285619d6ea16270e1a053b1f47551f8a0a175693e53a6877d74926715ac7a627a1572e7e0c12dc7bb59feec944f1edaf16e7 WHIRLPOOL 68599e60247d47310a7a1dacd7d474d241f31d8bc80a8c35f4383d3a19df48cc68938cf702a9033131516e2382df1c697f3a92f0794d2f3806463cbf26d576ef
 EBUILD munin-2.0.4-r2.ebuild 7336 SHA256 28982de935ed0233e9c93705807e02440224c55ebe1bc38cf41035fadd893171 SHA512 90f466a515d114c92426a2c978e8355d279b5c0dc2a8cc2e406bece1f0c64164652e6c086570b5e27f56547f685b6d9f3a7d7c4fa0d18a669532decca4c99b98 WHIRLPOOL e3980c844675135c44e9a75836143921bc2562f63b64310699d0685c6403dffd3080a55a3787d8103453e702d62d6bd9be7011ca93016a9b7d2591ddddaa8c71
-MISC ChangeLog 19618 SHA256 f587c25d4c2a04b4874d2266f9d306fb7e84fcb1de348abf226d01b52c6ba5e9 SHA512 8fb7f225c9cb99b4cf54f83699f42f0b8f9c10960d3a38fa933daaf5bcb00960de0cd4644b9c54fb4aff4bc9e8dbab9e7910f7e5e3caf2d651e33b9f9da94f6a WHIRLPOOL edfe5ca70aab21b5914bd4af2ead785815e2d9c3545d98918d19ce7a5b70d973ef731481bebfb0fea7a75951c90cffb8dfed5d0c5b8f8c9f2992c5a1a139b560
+EBUILD munin-2.0.5.ebuild 7333 SHA256 d3edf6b5de0aaa00b4de760617ade99b1a1a9e67cd74356ca3ce1a52a8b6f682 SHA512 c0b1272f79868829d4de32f7533650ff716df536d45e1ae80dba222623fc061672d6939fb0214212909a0f2dccf82a55ea38ba5b4059c9988ec18ad141162cc2 WHIRLPOOL 54ade06f5a0a9ff78c68054406eb9f02d40ad53bcf77126f04d9e15b18f07f2b679042b6f1d2071eac55be0627fe1a871d786b34278c102ab07e250f862db10e
+MISC ChangeLog 19740 SHA256 7d5eb3388793b35c9f7df46bf070f9a244f02c9654cfff466f0cf61a58661c93 SHA512 941b11753fc693947780cc94d8dc7cb8351fc4c8987edc6f02e2e59fe08183b8c112f1bc9855f1e0ef3ae8c89cb5042b503f046c31f2e59588892ea5d49d3600 WHIRLPOOL 0108b0465451df4a2860fe51df19825325e29ec112f0c83d82482ebe9f4d51af28edf9c315854430d2f0e16efec2768a199664be474c739688a92864e4390734
 MISC metadata.xml 3286 SHA256 42296aea0f20a9d1e4736941c8cab0d5ea30a8a6b63485714483056d3f5d670c SHA512 ed8881e77486d5c50ae2577aecf6ebeac3cfab09d75ca284f67436ac35337bbaa00374af4f2829ca9d65e283d506460fcbb3e58bf8751cbf1bd2f1432db21cab WHIRLPOOL eba5c5ead917e8983d15dcb13745067f786d5a933426553702309850285ac380a3c88a7a60625d6bcd16f8ae692f9bcc1638f4c8610aa20c8d3e1ecff12dfff1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQIG0/AAoJEBzRPIrUMBNCMH0H+wYCDvE4eW4KrOQek6mqm1MU
-t/KB4aDDYGxaa2gpXFqkIhksR1oERGoUClw03ZFoE6M3hE/p+gGG34KX5wqfdr1M
-J8hXYu2ioikMoBEZE5veVy2phNwE2bmmjHhJAJA7FWPf59/bHNxr+aDaYZ4/wIEr
-8F4M1dh3K+OEGAGmdhqFuak3w/Sv/t3dXf6FkuJov7SpMeRiFu1Krg82hDY34gMT
-P71gxG2Am+I9k1+CGSGOEoQ0o/6HNEgEqnPbgLRXqGY9E2+U/mTCsGvpyC8/k/A2
-UZuo+Au6sGshJ7JrpmZydRHByBf6Gxbdk+jfYYJoAML7U0tLsxuYtob7wCLN3nk=
-=cFwL
+iQEcBAEBCAAGBQJQKnmlAAoJEBzRPIrUMBNCrlcIAJk5b23SLlfPyQ73JaY3clEf
+mZBvKW05mvR5CuKuE8ww1cg83tpK+nksTlVbjwtZDCk9XPVJXT6sICyw5eNWKOzd
+TdngAYWmomsrYo2zl/TP7zcIJK6uzU4F/HfwgaWaV26XFAKT9b20qqFmOsIzkHT5
+mJBd5PRF30e0x1hYlGbAQcqHJCuNjuVQS1qs68WOlFoh/IauetaAB0EPCN2m83mG
+SyUak9f2wIIS/ia2AD5w7uMYy7RaO+ZfQDSKbak02L6W9FFnlQC4LOJdUNglsruM
+q1bYNAWD1lkr53YvbwqhHCc642CAULuDnc7LBDOf1o2kvo841vT+u2sMUOoDm9M=
+=8wg0
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/munin/munin-2.0.5.ebuild b/net-analyzer/munin/munin-2.0.5.ebuild
new file mode 100644
index 000000000000..f8266fae0348
--- /dev/null
+++ b/net-analyzer/munin/munin-2.0.5.ebuild
@@ -0,0 +1,255 @@
+# 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.5.ebuild,v 1.1 2012/08/14 16:15:05 flameeyes Exp $
+
+EAPI=4
+
+PATCHSET=1
+
+inherit eutils user java-pkg-opt-2
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Munin Server Monitoring Tool"
+HOMEPAGE="http://munin-monitoring.org/"
+SRC_URI="mirror://sourceforge/munin/${MY_P}.tar.gz
+	http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE="asterisk irc java memcached minimal mysql postgres ssl test +cgi ipv6 syslog ipmi http"
+REQUIRED_USE="cgi? ( !minimal )"
+
+# 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
+			sys-process/procps
+			asterisk? ( dev-perl/Net-Telnet )
+			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-base )
+			memcached? ( dev-perl/Cache-Memcached )
+			cgi? ( dev-perl/FCGI )
+			syslog? ( virtual/perl-Sys-Syslog )
+			ipmi? (
+				>=sys-libs/freeipmi-1.1.6-r1
+				virtual/awk
+			)
+			http? ( dev-perl/libwww-perl )
+			dev-perl/DBI
+			dev-perl/DateManip
+			dev-perl/File-Copy-Recursive
+			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
+				>=net-analyzer/rrdtool-1.3[perl]
+			)"
+
+# 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
+		dev-perl/Test-MockModule
+		dev-perl/File-Slurp
+		dev-perl/IO-stringy
+		dev-perl/IO-Socket-INET6
+	)"
+RDEPEND="${DEPEND_COM}
+		java? ( >=virtual/jre-1.5 )
+		!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() {
+	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=${T}/useless/doc
+MANDIR=\$(PREFIX)/share/man
+LIBDIR=\$(PREFIX)/libexec/munin
+HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
+CGIDIR=${cgidir}
+DBDIR=\$(DESTDIR)/var/lib/munin
+SPOOLDIR=\$(DESTDIR)/var/spool/munin
+LOGDIR=\$(DESTDIR)/var/log/munin
+PERLSITELIB=$(perl -V:vendorlib | cut -d"'" -f2)
+JCVALID=$(usex java yes no)
+EOF
+}
+
+# parallel make and install need to be fixed before, and I haven't
+# gotten around to do so yet.
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	local dirs="
+		/var/log/munin/
+		/var/lib/munin/plugin-state/
+		/var/spool/munin/
+		/etc/munin/plugin-conf.d/
+		/etc/munin/plugins/"
+	keepdir ${dirs}
+	fowners munin:munin ${dirs}
+	use minimal || dirs+=" /etc/munin/munin-conf.d/"
+
+	local install_targets="install-common-prime install-node-prime install-plugins-prime"
+	use java && install_targets+=" install-plugins-java"
+	use minimal || install_targets=install
+
+	# parallel install doesn't work and it's also pointless to have this
+	# run in parallel for now (because it uses internal loops).
+	emake -j1 DESTDIR="${D}" ${install_targets}
+
+	# remove the plugins for non-Gentoo package managers
+	rm "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
+
+	insinto /etc/munin/plugin-conf.d/
+	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
+
+	newinitd "${FILESDIR}"/munin-node_init.d_2.0.2 munin-node
+	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
+
+	newinitd "${FILESDIR}"/munin-asyncd.init munin-asyncd
+
+	dodoc README ChangeLog INSTALL build/resources/apache*
+
+	# bug 254968
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/logrotate.d-munin 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
+
+	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
+
+		if use cgi; then
+			sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
+		else
+			sed -i -e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' "${D}"/etc/munin/munin.conf || die
+		fi
+
+		dodir /usr/share/${PN}
+		cat - >> "${D}"/usr/share/${PN}/crontab <<EOF
+# Force the shell to bash
+SHELL=/bin/bash
+# Mail reports to root@, not munin@
+MAILTO=root
+
+# This runs the munin task every 5 minutes.
+*/5	* * * *		/usr/bin/munin-cron
+
+# Alternatively, this route works differently
+# Update once a minute (for busy sites)
+#*/1 * * * *		/usr/libexec/munin/munin-update
+## Check for limit excess every 2 minutes
+#*/2 * * * *		/usr/libexec/munin/munin-limits
+## Update graphs every 5 minutes
+#*/5 * * * *		nice /usr/libexec/munin/munin-graph
+## Update HTML pages every 15 minutes
+#*/15 * * * *		nice /usr/libexec/munin/munin-html
+EOF
+
+		cat - >> "${D}"/usr/share/${PN}/fcrontab <<EOF
+# Mail reports to root@, not munin@, only execute one at a time
+!mailto(root),serial(true)
+
+# This runs the munin task every 5 minutes.
+@ 5		/usr/bin/munin-cron
+
+# Alternatively, this route works differently
+# Update once a minute (for busy sites)
+#@ 1	/usr/libexec/munin/munin-update
+## Check for limit excess every 2 minutes
+#@ 2	/usr/libexec/munin/munin-limits
+## Update graphs every 5 minutes
+#@ 5	nice /usr/libexec/munin/munin-graph
+## Update HTML pages every 15 minutes
+#@ 15	nice /usr/libexec/munin/munin-html
+EOF
+
+		# remove .htaccess file
+		find "${D}" -name .htaccess -delete || die
+	fi
+}
+
+pkg_config() {
+	if use minimal; then
+		einfo "Nothing to do."
+		return 0
+	fi
+
+	einfo "Press enter to install the default crontab for the munin master"
+	einfo "installation from /usr/share/${PN}/f?crontab"
+	einfo "If you have a large site, you may wish to customize it."
+	read
+
+	if has_version sys-process/fcron; then
+		fcrontab - -u munin < /usr/share/${PN}/fcrontab
+	else
+		# dcron is very fussy about syntax
+		# the following is the only form that works in BOTH dcron and vixie-cron
+		crontab - -u munin < /usr/share/${PN}/crontab
+	fi
+}
+
+pkg_postinst() {
+	elog "Please follow the munin documentation to set up the plugins you"
+	elog "need, afterwards start munin-node via /etc/init.d/munin-node."
+	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
+	elog ""
+	elog "Further information about setting up Munin in Gentoo can be found"
+	elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin"
+}