Version bump for many small bug fixes. http://www.munin-monitoring.org/browser/tags/1.4.5/ChangeLog

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 26 insertions, 28 deletions

diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog
index 765a0e0990db..663b842061f7 100644
--- a/net-analyzer/munin/ChangeLog
+++ b/net-analyzer/munin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/munin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.38 2010/05/24 18:57:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.39 2010/06/11 15:41:56 darkside Exp $
+
+*munin-1.4.5 (11 Jun 2010)
+
+  11 Jun 2010; Jeremy Olexa <darkside@gentoo.org> -munin-1.4.3.ebuild,
+  +munin-1.4.5.ebuild:
+  Version bump for many small bug fixes.
+  http://www.munin-monitoring.org/browser/tags/1.4.5/ChangeLog
 
   24 May 2010; Pacho Ramos <pacho@gentoo.org> munin-1.4.4.ebuild:
   stable amd64, bug 317631
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 5dc4ee120acb..0949304229af 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX logrotate.d-munin 386 RMD160 527eb49f80c70dfb6f3207df449147000f4e8a0f SHA1 84d5b125973f68076b361b92576453dc064ac7ea SHA256 42bcc50a21e72d9b68df4fad2f1016587f7b033301de754cf956a4d5789ffbea
 AUX munin-1.3.2-plugins.conf 1622 RMD160 00bc90347f8c989c82cf0fecb3e9ca53b8e2b79e SHA1 8968590e5353a523aaced45fe3423d0bbf9a91a1 SHA256 a3f2337a4eccf6b9f0d63218dcddab226cd8c9b2728facac468739395c7b4cdf
 AUX munin-1.3.3-crontab 994 RMD160 ab7cc5acaeaf478413e1eb6d1dafe561d79448b0 SHA1 7a372182c407be60895a4817f9bb74f3a63fda49 SHA256 a5d9a160fc15d152a9cbdbf817a44c9c3450c60d61eeead647bf167fbe55fb89
@@ -20,18 +17,11 @@ AUX munin-1.4.4-Makefile.patch 2531 RMD160 f0a492267fd1078139a9f80997173cd1d4823
 AUX munin-init.d 581 RMD160 366649a8ac7ec0b2ce4c48913a7cecb65ca69ea6 SHA1 60c0cccd84678692911b43f7f5800fff115b42ab SHA256 a4332d7ac415e4cfda94189947e0c1bdd87d1029845bbea91799ee7e1a8ebb1f
 AUX munin-node_conf.d_1.3.3-r1 315 RMD160 e33754bafcfb7b9a737ff282157e2201a9a5bbdd SHA1 fc247c9c369543e00faf28e8ce166814a1079e36 SHA256 4a895da9eba3e7ab4b3ce48c6dc9e29297a32ef5ec33be73581867afc4c5e961
 AUX munin-node_init.d_1.3.3-r1 651 RMD160 80bb9d847eb14425fa5bd6092dfec0328f2f2626 SHA1 77dcab26eaf48e515e2f187b1a5324b507d19eae SHA256 04f1bfa5d97a451bb9aa3bb81caceb269411c55151c78dffeae1b8696fea937d
-DIST munin-1.4.3.tar.gz 1205698 RMD160 1fdc805950085d14fc71dbf5774d0c2eed0cd554 SHA1 b31a1ddd04007f6f3e80cf35cfd997427fc1fafa SHA256 c5f1c8e5e71e9ffd5c74037ec3eec4da362fd2aecea3c788abb7d92b461834d0
 DIST munin-1.4.4.tar.gz 1218498 RMD160 45a84ebc5e58379da7526c5909bb260ef7a4b444 SHA1 b771065081c699ceb34d28b185c42f42d83cec90 SHA256 c3e6589b73d7362fd29b36e41d4dba6439fa08da9d7aec0cd23681f9519754f2
+DIST munin-1.4.5.tar.gz 1231622 RMD160 883aa4baacfa5be1ec6a83737d5d241c40ad6912 SHA1 bd1e8ad1fe1cfade1de9c28f3ad69bf35ca495ca SHA256 4f8632713c5267e282b091cf7ef5163c5de321536e76dbaab2204aa23c957138
 DIST munin_1.3.4.tar.gz 451802 RMD160 2580fbf6e78236db182976e8f22c555417e5a2a3 SHA1 9ab7beb3589916c42c24046105f3a898e3293758 SHA256 fdd9dcba0b90373a4ba61da8fd65ac0b8365949a32032d514fc0fd541ab84d12
 EBUILD munin-1.3.4-r2.ebuild 4901 RMD160 806beec2b168ea867b0756dbfec3ed73d109c72e SHA1 309df9596e5c2be5b2a643da64db938d6d208866 SHA256 14b2cc60f2ca9c2ce760e51f0881ceded9beb03b6a891d920b87797169e5048f
-EBUILD munin-1.4.3.ebuild 4250 RMD160 3052c36d4543ac5158e3433ad2ac5a0f3ed353cd SHA1 7426cc9d0b7413484823b72c2b58c19a2d93a4eb SHA256 7b1a396cc7e286a9de7cb0c91a80ddc1eab2f414b39ad58ba171893c79654ded
 EBUILD munin-1.4.4.ebuild 4270 RMD160 19408eb0f04081726f5c84ffae8bba7251e0c3cc SHA1 86a862a565d5d38665db421de6edf51cee778ced SHA256 f06bc18c08021c36cb9b93c81d01ee59e61706a3948e01332e09be76ef964ef1
-MISC ChangeLog 7200 RMD160 6fedc712bf11eab6d1ae2b5bbea90b3f0529fb25 SHA1 82414d39079ea234b7c4093c6f0d317f776d78d3 SHA256 0d8c62664f8eb3b1035323edec343a9fc706e720e7de120162ab39b97ee902a9
+EBUILD munin-1.4.5.ebuild 4282 RMD160 d0db5546072b5af894a22d0d64b4142453438962 SHA1 c48d788fb280c428828213c5bd8f5499992f86fb SHA256 69cd7d8bedfaab813243982cfc1859988ab970fe789403ae58d89f69ede25d0d
+MISC ChangeLog 7430 RMD160 a28d0a682d83d7ce2a1c4f57f4cdaebbaf3fb461 SHA1 c09b74a3110737e6f10575a6d8b52fea97268e7b SHA256 dbf6aa5d3f088f4489b82efbe1f572431fb788b0a74fee6201c89aeef794114f
 MISC metadata.xml 988 RMD160 646117caea61c4ff8ca69049e007bbabdbc9470d SHA1 2269fd6852a97ca6bd00c1f6d6410d574ffd6dfd SHA256 010cc66c6c4d8d5f7e1e85be7dda996a43acb5616d4f067da595d7042d1d968f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkv6zC8ACgkQCaWpQKGI+9TMZwCZAS+hakiigH+XHm7uqqh4SNY7
-Lc4AoILp6I/SD+udcrzcGY8+V6t5Y0Zc
-=ahsN
------END PGP SIGNATURE-----
diff --git a/net-analyzer/munin/munin-1.4.3.ebuild b/net-analyzer/munin/munin-1.4.5.ebuild
index 0c99f9150709..935fdedf875d 100644
--- a/net-analyzer/munin/munin-1.4.3.ebuild
+++ b/net-analyzer/munin/munin-1.4.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.4.3.ebuild,v 1.4 2010/05/02 22:33:29 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.4.5.ebuild,v 1.1 2010/06/11 15:41:56 darkside Exp $
 
-EAPI="2"
+EAPI=2
 
 inherit eutils
 
@@ -13,17 +13,18 @@ SRC_URI="mirror://sourceforge/munin/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
-IUSE="doc minimal irc mysql postgres ssl"
+IUSE="doc irc java minimal mysql postgres ssl"
 
 # Upstream's listing of required modules is NOT correct!
 # Some of the postgres plugins use DBD::Pg, while others call psql directly.
 # The mysql plugins use mysqladmin directly.
 DEPEND_COM="dev-lang/perl
 			sys-process/procps
+			irc? ( dev-perl/Net-IRC )
+			java? ( >=virtual/jdk-1.5 )
+			mysql? ( virtual/mysql dev-perl/Cache-Cache )
 			ssl? ( dev-perl/Net-SSLeay )
-			mysql? ( virtual/mysql )
 			postgres? ( dev-perl/DBD-Pg virtual/postgresql-base )
-			irc? ( dev-perl/Net-IRC )
 			dev-perl/DateManip
 			dev-perl/Log-Log4perl
 			dev-perl/Net-CIDR
@@ -44,7 +45,8 @@ DEPEND_COM="dev-lang/perl
 			#munin-sybase? (	 dev-perl/DBD-Sybase )
 
 # Keep this seperate, as previous versions have had other deps here
-DEPEND="${DEPEND_COM}"
+DEPEND="${DEPEND_COM}
+	virtual/perl-Module-Build"
 RDEPEND="${DEPEND_COM}
 		!minimal? ( virtual/cron )"
 
@@ -56,15 +58,14 @@ pkg_setup() {
 src_prepare() {
 	# upstream needs a lot of DESTDIR loving
 	# and Gentoo location support
-	epatch "${FILESDIR}"/${PN}-1.4.3-Makefile.patch
-	# Fix noise in the plugins
-	epatch "${FILESDIR}"/${PN}-1.4.3-plugin-cleanup.patch
+	epatch "${FILESDIR}"/${PN}-1.4.4-Makefile.patch
 
-	# Bug #195964, fix up conntrack
-	# Patch modified as it has only been partially taken up by upstream
-	epatch "${FILESDIR}"/${PN}-1.4.3-fw_conntrack_plugins.patch
-
-	epatch "${FILESDIR}"/${P}-ping6_fix.patch
+	# Don't build java plugins if not requested via USE.
+	if ! use java; then
+		# sed is needed so the java plugins aren't automagically built.
+		sed -i -e 's: build-plugins-java : :' \
+			-e 's: install-plugins-java : :' Makefile || die
+	fi
 }
 
 src_compile() {