Version bump; this version includes most of the previously applied patches, but gets rid of freeipmi_ as a separate plugin (now it takes the place of ipmi_ itself).

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

4 files changed, 23 insertions, 276 deletions

diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog
index eee4c90270de..7e17ff89fa9f 100644
--- a/net-analyzer/munin/ChangeLog
+++ b/net-analyzer/munin/ChangeLog
@@ -1,6 +1,14 @@
 # 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.86 2012/07/29 03:53:20 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.87 2012/07/30 15:16:43 flameeyes Exp $
+
+*munin-2.0.4 (30 Jul 2012)
+
+  30 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> +munin-2.0.4.ebuild,
+  -munin-2.0.3-r1.ebuild, -munin-2.0.3.ebuild:
+  Version bump; this version includes most of the previously applied patches,
+  but gets rid of freeipmi_ as a separate plugin (now it takes the place of
+  ipmi_ itself).
 
 *munin-2.0.3-r1 (29 Jul 2012)
 
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 2f8c2a63c956..4a41e2da1e71 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -18,23 +18,21 @@ AUX munin-node_init.d_2.0.2 946 SHA256 56873af410a42f27b8e69230f0b0f6bf55e714e92
 DIST munin-1.4.6.tar.gz 1238782 SHA256 1795812d9ad60e60f81c7f08c8be455ce44e1d4f966f7dd6be620e4c356de9c6 SHA512 f1ec1b79b4c90d899fc661656426b4cf7fdcc7f896d6de0938310b49b66e009cd1a85570005fd1a85a8168ce3568ea55c255c3511174cdf1d72bd88f162be5e0 WHIRLPOOL 43d2296bbbd476ffc0cf356fc5a191d723993735769e6f88f3581c0804b82781be38f78bfe34337e2b4e9680ade8c569a6006c0ea107e4a5c60a82b879e08404
 DIST munin-1.4.7-patches-1.tar.xz 10208 SHA256 7429c949ebfe3fbeaf50f54401a3119915cf4f3c520e7925d5118fbf576f8d61 SHA512 7588df8eb4528f56e34bdf925a534d8b46f1fee09a2a7ec5ccb411b2a15353f8a769664347019a2fe490611aee52f6b878518662a6965b840f667a7d460da185 WHIRLPOOL 3b14f5ba9c5c86539b1dfcd363df655e3bd7b6be8e873c1243d527aad58d68a83dff4f53ff58b0177e7c94b64f900a556a67e0dda8a82bbb83d13f9a403daccf
 DIST munin-1.4.7.tar.gz 1236273 SHA256 9a87356b1f8662f444a7a2a86ff36809124ffe787c442de0ea35850194d602af SHA512 5a01c04a291f53e750b170e715c9f0d5e2cca5fa2a11f725ba6a81bbe7b34c34ef6459ea60177d13d1c38e9e91d374c1e227b2d4d7ba8c094353320a51f40b30 WHIRLPOOL f16ad8331b48136ec9cdd21fdab0efd2bca7800954f0160e7a09192c22f2d7f88cbba1df81a5750f5e4577ca1a93e41643e9ad1445b645f76becfa5db28a8088
-DIST munin-2.0.3-patches-4.tar.xz 5376 SHA256 fdbf38d25234ea551d50961d4a7d1c374808c519b1684d063b4f9977a25d20db SHA512 5466db652302f04e6a999e1086913ca6f8a0d25a22c8a7a1d7337aaf35fd97723751d891ead5051405ae5ebf9b5f8fdbbc07d2d881d2ac4dfc5e7fcab182c7df WHIRLPOOL 31812d47f63f90968e6d8939ee3a891502ad99d313d5d5fa345a817733a7da868b3ce70f1c492f958463773e72fa6c1d7505140c02f432b80a6c80218c43f7c6
-DIST munin-2.0.3-patches-6.tar.xz 6408 SHA256 6497e6eed4c94246ac1dacffda99adf2b5e0b3414a70c479db0bae4cf92fcd8e SHA512 98739634478033f72af8289940ddfd778d8b92c57c46f330d9d68ea48c7744909c72baadf297475858eddb07d5486bde6b93d52e07c3e94fafe377fc01ae51e5 WHIRLPOOL d960424917907dc6a553dcef4cbcc76f295d11d9c976e1e5b70abf17c2b4de7dcc27adabb7bec9237f5ca5b151e13cbb666a6b19779268a56d34421c5176cf26
-DIST munin-2.0.3.tar.gz 1318352 SHA256 ed22871f03a3c65b8a0324af686fddaac8cc94a95a959e753ef211752429e7db SHA512 ea182846ff5399c22e625b2bb021507138ce97d460edc499ca4322a132a9ac25dacb5b142766a54eb569f73f77d0ca6b12a088986729d548f89f812ec3c12ab1 WHIRLPOOL 9dbb442b332de495f8876d7f7a4ec81cd55e6cf7bb3e0509904d4c96d5334e0362cc98e4e253633d8e7b29197168cd237578fbd0dbe9f43548c5c1230cf895cc
+DIST munin-2.0.4-patches-3.tar.xz 6816 SHA256 272658e9155f1973c6baa840bcb2345bb862d47eee4b222bf5fd221cd35c7034 SHA512 ed238b541a251b5f4775bf04360f70792ae4dc0f32511a1ae2261f2e214b3eff9ede9de53312d69f5b7e9531c7ddb256964b7082fdc08a31f63e2d9e6e5ff4e8 WHIRLPOOL 450e12734565102b136b6fe43c9de4629527f42cae2aefed0d996c5fb08c9f8133c23d1f5a336bb56f0de390aee5d492a702c7f2dfe8e10a3f24caf1b8821311
+DIST munin-2.0.4.tar.gz 1318808 SHA256 309388e3528b41d727cea01233f0d4f60714e2de443576e1c472e8a1dc81722c SHA512 4f20eaa6b427439135ee6b8203044a055b37b6fadcdd05b57b2e0198764ca0487d3fa79e5cdc6c663e3809879efd4bc4a13df705f096b72eec3188051dd84a35 WHIRLPOOL 84afa3ae217625161a4e3ebc7dd8213f55fd97d515a904c35dc9f1f06c143c4921907a019bff2d79f9df0ae305dee84075445aa7be610f78eaa7977dbdaf8a06
 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.3-r1.ebuild 7385 SHA256 6067f9668b743357eac72bd865deffda78e6e3c2cb048910b5cc18c60d2ef213 SHA512 5cc24a83f2adf0f5db108883d04aa434539fe04b25404d92f666c055dca9859acfe1ef23a72901b45fdef5b870239874902bfe2b8db623225f6cb1c561bd9afb WHIRLPOOL c467fc59f20c313073e501f4d2cae2a778c32eb64185d118111b4689f349f3e050c4f5e576f437c4f7ada107ae76e1dd4ad16c7106a8e15d15741b6afc1258fd
-EBUILD munin-2.0.3.ebuild 7523 SHA256 8efb147e0e8618c2f123377115c27973510cb063fcc550f2641dee58b9cacdcf SHA512 f3f14cfc4188411c05e2625fefda472eb26080dab18818bf03a533ca52627ec57c81a1d261285d8bd4ca6b917567c4df300883a3a5e666807f2a926bf54df678 WHIRLPOOL 268cc13b4d5b454e0f8bf554e4276ff957c8f7a53d91560ae903ad05f5359899eba33f9157204b04f04c8350fb9c0c5ac560cd537d9194473bb058c42ff2b203
-MISC ChangeLog 18436 SHA256 b1e40fe550bc7cc416e847809e405a503f7fbc94e6bc7112180df52ce7b19fd8 SHA512 b3d6a5ef3d7d579fa9867fbdef906f65304f75d487ef6ba22bdac67113d38fa5aa7b8e4a24c93756e2fbb414b7cce54210ffcfc454bbf8067b2d12817aaaed83 WHIRLPOOL bfe85526e6721315e21e910681aa82d0ed0092a1eb75d60a953d0b2708f78f26d8c02d9e0cb9d94908624a66bc7bafe0d846f82a627ac5962ade55ead53777ca
+EBUILD munin-2.0.4.ebuild 7278 SHA256 3b505ec464378e583aa04d9b9def4f257e9597015c6c01ec0215275af298489e SHA512 f2b8624d3254ef9d82fabc70f2280ba74963d8bdaa76282a18a453b39daf80b611a6e7f93ad44857239e9f660297a4ed0343f8fe00803f682c8d8eafe8b2d9ef WHIRLPOOL 14825a122825c706ce9db74e2a302b43e60e69e9aaecf570ffdaf3773a6d6fe7106788f4894516fd10ca319b92cd529ef027532ded9d2b07aae1911dc49339bb
+MISC ChangeLog 18760 SHA256 03f8fa10c3b461824dd661d2f57a211d30ad164a80d57d79b96eb68cb8ba1d88 SHA512 49edb0ee9eeef01d5cea7185264fd7cd5a22a6fab3f69c914c91049ee356a9b1df0d4b28db7f7107de3ed2978dfd0e47285c5a52955f786f9dc7beb690df4428 WHIRLPOOL 9918d2102ae8b9af75d48ac86df6698cea5c353e98d49d112ddaaf5726547fbc9b961f31bd7e31c2d5c7cb3706000a3ea7b727a856e07653672528e50ef0e12c
 MISC metadata.xml 3286 SHA256 42296aea0f20a9d1e4736941c8cab0d5ea30a8a6b63485714483056d3f5d670c SHA512 ed8881e77486d5c50ae2577aecf6ebeac3cfab09d75ca284f67436ac35337bbaa00374af4f2829ca9d65e283d506460fcbb3e58bf8751cbf1bd2f1432db21cab WHIRLPOOL eba5c5ead917e8983d15dcb13745067f786d5a933426553702309850285ac380a3c88a7a60625d6bcd16f8ae692f9bcc1638f4c8610aa20c8d3e1ecff12dfff1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQFLQQAAoJEBzRPIrUMBNC6psIAIKKUHNwTrXjEpRgOnYP2LIT
-GTwXioAAl9EvJ3xDthtyDP9iW1n911n1v4jbPzAmnYKVpfnzSgyeISVbMX5nRqiE
-Z5Yk8qDbtql7dXNAA/UvlkBr344lm/enSVoHH9FJwLCjIpNPxt3uuq9w2XIiv/FQ
-wOKPYBTTibaOakDiggZ8ru54Ac6n6ir/pFy7RmtELIRhg0SWYn1wChtNlAjMwqQK
-7B2jWnWUvBhUCL8eupuqQ+kEHVIJxUXWloNHfCfob0U0I6YSSxKO76Rkernyp3zw
-i1Ep3/RSO8/oAeAM/ovdbfHOn04C5fgokqDI/jfmg6o0HY5TkHWLfJHFEV/Ddd8=
-=s59o
+iQEcBAEBCAAGBQJQFqVmAAoJEBzRPIrUMBNCqQQH/icZHIMH84e++ExXsMQXWUiO
+1ESq+2gyPdyCQTYENBmXBKoRmvckR5rZXA10cAyi/ThFbSxZIWwFf6X4KDoicLdC
+Opd0rwL/Y4xyrCWxLFxe3CYL6rvv3ZCRQylgs27ByPn6naaV6xS4jrrdVA2yQPEm
+XPq6e3Z696Gf9/TXxyz1kURBCDONDH8ycBZVkrG6/TBnTkg+e4zh+KGwK39CXH3V
+L6VIlr7opfvZlOvcgmrF8FmbErmEsm0arSlja0e+OsNvXo6c3EViROEhjVbgX1AI
+FhGWvBtgcTY0HJBO1VL5YGdf1CpqU6UNqvbGqG+gMud0IJDIaFD6p93LghL9Wcc=
+=6Oxq
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/munin/munin-2.0.3.ebuild b/net-analyzer/munin/munin-2.0.3.ebuild
deleted file mode 100644
index be7db5967178..000000000000
--- a/net-analyzer/munin/munin-2.0.3.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# 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.3.ebuild,v 1.5 2012/07/28 00:44:43 flameeyes Exp $
-
-EAPI=4
-
-PATCHSET=4
-
-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.
-# There are three ipmi plugins: two original ones using ipmitool (and
-# python or gawk) and one using freeipmi that Flameeyes wrote (which works fine with
-# any awk provider). Once freeipmi_ is feature-par with ipmi_, we'll drop the former.
-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-apps/ipmitool sys-apps/gawk
-				>=sys-libs/freeipmi-1 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
-
-	# this is to work around git diff output
-	if [[ -d b ]]; then
-		cd b
-		find . -type f -exec mv {} ../{} \; || die
-	fi
-}
-
-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
-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/
-		/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
-
-	# make sure we've got everything in the correct directory
-	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
-
-	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"
-}
diff --git a/net-analyzer/munin/munin-2.0.3-r1.ebuild b/net-analyzer/munin/munin-2.0.4.ebuild
index f91dbc863877..c56844d57440 100644
--- a/net-analyzer/munin/munin-2.0.3-r1.ebuild
+++ b/net-analyzer/munin/munin-2.0.4.ebuild
@@ -1,10 +1,10 @@
 # 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.3-r1.ebuild,v 1.1 2012/07/29 03:53:20 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.4.ebuild,v 1.1 2012/07/30 15:16:43 flameeyes Exp $
 
 EAPI=4
 
-PATCHSET=6
+PATCHSET=3
 
 inherit eutils user java-pkg-opt-2
 
@@ -91,7 +91,6 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${WORKDIR}"/patches/*.patch
-	mv b/plugins/node.d/freeipmi_.in plugins/node.d/
 
 	java-pkg-opt-2_src_prepare
 }
@@ -154,8 +153,7 @@ src_install() {
 	insinto /etc/logrotate.d/
 	newins "${FILESDIR}"/logrotate.d-munin munin
 
-	dosym freeipmi_ /usr/libexec/munin/plugins/ipmi_
-	dosym freeipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
+	dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
 
 	if use syslog; then
 		sed -i -e '/log_file/s| .*| Sys::Syslog|' \