Bug #151928 - make SSL support optional. Bug #150867 - Ensure rrdtool is built with USE=perl if we need it to be.

Package-Manager: portage-2.1.2_pre3-r4

4 files changed, 141 insertions, 5 deletions

diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog
index 543e012dc2ed..e86310c7770e 100644
--- a/net-analyzer/munin/ChangeLog
+++ b/net-analyzer/munin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/munin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.3 2006/10/19 09:48:27 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.4 2006/10/19 10:29:07 robbat2 Exp $
+
+*munin-1.3.2-r2 (19 Oct 2006)
+
+  19 Oct 2006; Robin H. Johnson <robbat2@gentoo.org> +munin-1.3.2-r2.ebuild:
+  Bug #151928 - make SSL support optional. Bug #150867 - Ensure rrdtool is
+  built with USE=perl if we need it to be.
 
   04 Oct 2006; Robin H. Johnson <robbat2@gentoo.org> munin-1.3.2-r1.ebuild:
   Add more instructions for users - bug #150045.
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 06052c802d22..02c7e30d2f98 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -27,14 +27,18 @@ EBUILD munin-1.3.2-r1.ebuild 3568 RMD160 f8897fcb77b264d6ffc5d9e6eeda3cdae93265e
 MD5 efffd8b665e079b39293759f7324190a munin-1.3.2-r1.ebuild 3568
 RMD160 f8897fcb77b264d6ffc5d9e6eeda3cdae93265e1 munin-1.3.2-r1.ebuild 3568
 SHA256 f99176d16d99c53dde24c30280e280e069eb188194fdf3a038ae33ea74068d41 munin-1.3.2-r1.ebuild 3568
+EBUILD munin-1.3.2-r2.ebuild 3851 RMD160 5598a82d8f03582346e5a895e14bc15d54a35f72 SHA1 450eb44073e7ce383153805fe878c7b97b54c6de SHA256 3e452c03a007767cef941e99dcb3f67a04905f173781a0aa55aefa5b0cb67cc0
+MD5 18d292219a6617ee26bdf9dccb13247d munin-1.3.2-r2.ebuild 3851
+RMD160 5598a82d8f03582346e5a895e14bc15d54a35f72 munin-1.3.2-r2.ebuild 3851
+SHA256 3e452c03a007767cef941e99dcb3f67a04905f173781a0aa55aefa5b0cb67cc0 munin-1.3.2-r2.ebuild 3851
 EBUILD munin-1.3.2.ebuild 3485 RMD160 94f2957fcde45418cbf2d7f88b7cc27fadddce38 SHA1 197e46516649331e495b40bd8419034214b7960e SHA256 a4fd76456f2bda0cc8e60f1eb045a42e6edf557c0d963b6b672f599374868b1e
 MD5 ae39f2774e7bf379307670cb0a4f6e67 munin-1.3.2.ebuild 3485
 RMD160 94f2957fcde45418cbf2d7f88b7cc27fadddce38 munin-1.3.2.ebuild 3485
 SHA256 a4fd76456f2bda0cc8e60f1eb045a42e6edf557c0d963b6b672f599374868b1e munin-1.3.2.ebuild 3485
-MISC ChangeLog 1001 RMD160 0b0ec10265e2a4cb413c170e32f5466d4f50a205 SHA1 2a66926950c950dc34d58eece5548754aa09d157 SHA256 4dbb0c31069aeddda5f1b3893a3e55dd43941de223792653728fc800182585bb
-MD5 413ff49c3df6c1aad63cdc62fe4202d2 ChangeLog 1001
-RMD160 0b0ec10265e2a4cb413c170e32f5466d4f50a205 ChangeLog 1001
-SHA256 4dbb0c31069aeddda5f1b3893a3e55dd43941de223792653728fc800182585bb ChangeLog 1001
+MISC ChangeLog 1228 RMD160 616071f4a25cbf308a1c938f00d74256ea25a14e SHA1 a314313bc8d1863d9cdb3405279ab24669d93489 SHA256 b796f4ed45f50eaa7f0cd4270422d32e73f4deb5781c44bd6a78910e8e67b7fc
+MD5 2f3d52c76980b0052ec43d99930e0e9f ChangeLog 1228
+RMD160 616071f4a25cbf308a1c938f00d74256ea25a14e ChangeLog 1228
+SHA256 b796f4ed45f50eaa7f0cd4270422d32e73f4deb5781c44bd6a78910e8e67b7fc ChangeLog 1228
 MISC metadata.xml 914 RMD160 0076c2be4c5a72a26639eb531925b4585d905060 SHA1 3b92ce6a0b1aefa369262ca69b485c280dac068b SHA256 16e3a247509483b481b8c8a038bd13f872ad48b91aade8795158a9c304749ff7
 MD5 9299a4cbbf52bdd70903df755a77f0cd metadata.xml 914
 RMD160 0076c2be4c5a72a26639eb531925b4585d905060 metadata.xml 914
@@ -45,3 +49,6 @@ SHA256 c8f9315ca064bb4486acd4b20b0b0dc914ecae94dd4db7739bee529017d30701 files/di
 MD5 9e54d7960ffe54d8c894151aae3b80f8 files/digest-munin-1.3.2-r1 235
 RMD160 684b4825ee54ec7dd4825ebe63efb012bcde2325 files/digest-munin-1.3.2-r1 235
 SHA256 c8f9315ca064bb4486acd4b20b0b0dc914ecae94dd4db7739bee529017d30701 files/digest-munin-1.3.2-r1 235
+MD5 9e54d7960ffe54d8c894151aae3b80f8 files/digest-munin-1.3.2-r2 235
+RMD160 684b4825ee54ec7dd4825ebe63efb012bcde2325 files/digest-munin-1.3.2-r2 235
+SHA256 c8f9315ca064bb4486acd4b20b0b0dc914ecae94dd4db7739bee529017d30701 files/digest-munin-1.3.2-r2 235
diff --git a/net-analyzer/munin/files/digest-munin-1.3.2-r2 b/net-analyzer/munin/files/digest-munin-1.3.2-r2
new file mode 100644
index 000000000000..3bc37b06a1a9
--- /dev/null
+++ b/net-analyzer/munin/files/digest-munin-1.3.2-r2
@@ -0,0 +1,3 @@
+MD5 9eef4a53626cee0e088391c5deb8bd51 munin_1.3.2.tar.gz 309319
+RMD160 7bcc16d00ad28731041015ef240144ed0c4fdeb4 munin_1.3.2.tar.gz 309319
+SHA256 964887d3af5b5b1fadbabb4c887095820613ea06c768251d6a9c37fa35efcc40 munin_1.3.2.tar.gz 309319
diff --git a/net-analyzer/munin/munin-1.3.2-r2.ebuild b/net-analyzer/munin/munin-1.3.2-r2.ebuild
new file mode 100644
index 000000000000..88a95058231a
--- /dev/null
+++ b/net-analyzer/munin/munin-1.3.2-r2.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.3.2-r2.ebuild,v 1.1 2006/10/19 10:29:07 robbat2 Exp $
+
+inherit eutils
+
+DESCRIPTION="Munin Server Monitoring Tool"
+HOMEPAGE="http://munin.sourceforge.net"
+SRC_URI="mirror://sourceforge/munin/${PN}_${PV}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="doc minimal munin-irc munin-dhcp munin-surfboard munin-apache munin-squid ssl"
+
+# Upstream's listing of required modules is NOT correct!
+DEPEND_COM="dev-lang/perl
+			dev-perl/net-server
+			sys-process/procps
+			ssl? ( dev-perl/Net-SSLeay )
+			dev-perl/Net-SNMP
+			dev-perl/DateManip
+			virtual/perl-Time-HiRes
+			virtual/perl-Digest-MD5
+			virtual/perl-Getopt-Long
+			virtual/perl-Storable
+			virtual/perl-Text-Balanced
+			!minimal? ( dev-perl/HTML-Template
+						net-analyzer/rrdtool )
+			munin-irc? ( dev-perl/Net-IRC )
+			munin-dhcp? ( dev-perl/Net-Netmask dev-perl/libwww-perl )
+			munin-surfboard? ( dev-perl/libwww-perl )
+			munin-apache? ( dev-perl/libwww-perl )
+			munin-squid? ( virtual/perl-MIME-Base64 )"
+			# Sybase isn't supported in Gentoo
+			#munin-sybase? (	 dev-perl/DBD-Sybase )
+
+DEPEND="${DEPEND_COM}
+		doc? ( app-text/htmldoc
+			   app-text/html2text )"
+RDEPEND="${DEPEND_COM}
+		virtual/cron"
+
+pkg_setup() {
+	enewgroup munin
+	enewuser munin 177 -1 /var/lib/munin munin
+}
+
+src_unpack() {
+	if use !minimal; then
+		if ! built_with_use net-analyzer/rrdtool perl ; then
+			die 'Sorry, munin needs net-analyzer/rrdtool built with USE=perl.'
+		fi
+	fi
+	unpack ${A}
+	# upstream needs a lot of DESTDIR loving
+	# and Gentoo location support
+	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${P}-Makefile.patch
+	# Fix noise in the plugins
+	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${P}-plugin-cleanup.patch
+	# Make it work with new versions of Rrdtool where : in COMMENT blocks must
+	# be escaped!
+	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${P}-rrdtool-comments.patch
+}
+
+src_compile() {
+	emake build build-man || die "build/build-man failed"
+	if use doc; then
+		emake build-doc || die "build-doc failed"
+	fi
+}
+
+src_install() {
+	local dirs
+	dirs="/var/log/munin /var/lib/munin"
+	dirs="${dirs} /var/lib/munin/plugin-state"
+	dirs="${dirs} /var/run/munin/plugin-state"
+	keepdir ${dirs}
+
+	emake DESTDIR="${D}" install-main install-man install-node install-node-plugins || die "install failed"
+	fowners munin:munin ${dirs}
+
+	if use doc; then
+		emake DESTDIR="${D}" install-doc install-man || die "install docs failed"
+	fi
+
+	insinto /etc/munin/plugin-conf.d/
+	newins ${FILESDIR}/${P}-plugins.conf munin-node
+
+	# ensure TLS is disabled is built without SSL
+	use ssl || echo "tls disabled" >>${D}/etc/munin/munin-node.conf
+
+	# make sure we've got everything in the correct directory
+	insinto /var/lib/munin
+	newins ${FILESDIR}/${P}-crontab crontab
+	newinitd ${FILESDIR}/munin-init.d munin-node
+	dodoc ChangeLog INSTALL README-apache-cgi.in README.api logo.eps
+	munin-doc-base.html munin-faq-base.html TODO.plugins
+	newdoc server/TODO TODO.server
+	newdoc node/TODO TODO.node
+}
+
+pkg_config() {
+	crontab -l -u munin 2>/dev/null | grep --silent '.*'
+	if [ $? -eq 0 ]; then
+		die "Crontab already install for user munin. Not overwriting."
+	fi
+	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
+	crontab -u munin /var/lib/munin/crontab
+}
+
+pkg_postinst() {
+	einfo "Please follow the munin documentation to set up the plugins you"
+	einfo "need, afterwards start munin-node via /etc/init.d/munin-node."
+	einfo "To have munin's cronjob automatically configured for you if this is"
+	einfo "your munin master installation, please:"
+	einfo "emerge --config net-analyzer/munin"
+}