Bug #179321, previous DESTDIR patching missed a single case for the munin-node.conf file.

Package-Manager: portage-2.1.2.5

5 files changed, 146 insertions, 10 deletions

diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog
index 1980ed96f810..18863107a81e 100644
--- a/net-analyzer/munin/ChangeLog
+++ b/net-analyzer/munin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/munin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.9 2007/05/13 06:09:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.10 2007/05/24 05:48:24 robbat2 Exp $
+
+*munin-1.3.3-r2 (22 May 2007)
+
+  22 May 2007; Robin H. Johnson <robbat2@gentoo.org>
+  files/munin-1.3.3-Makefile.patch, +munin-1.3.3-r2.ebuild:
+  Bug #179321, previous DESTDIR patching missed a single case for the
+  munin-node.conf file.
 
   13 May 2007; Robin H. Johnson <robbat2@gentoo.org> munin-1.3.3.ebuild:
   Forgot IUSE=doc.
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index d37402c19a6e..414f524ad77b 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -22,10 +22,10 @@ AUX munin-1.3.2-rrdtool-comments.patch 4002 RMD160 2a0697f5b1f6e66f94b857248f346
 MD5 d838d13be7814a89be4f3df5cb8be61a files/munin-1.3.2-rrdtool-comments.patch 4002
 RMD160 2a0697f5b1f6e66f94b857248f346cc2e706b36f files/munin-1.3.2-rrdtool-comments.patch 4002
 SHA256 e4c0a50189ddb54c603c6e83973c58ed7e78af4e6933c2dd2fe1d4699a0945e2 files/munin-1.3.2-rrdtool-comments.patch 4002
-AUX munin-1.3.3-Makefile.patch 15018 RMD160 bb0dc9e5373e26a397f67e439ea745d58306907a SHA1 7f8a1e1d0c60b726ad1f3cebbaad92765dad56df SHA256 a8564f0ff86d3712d33ee5b29dff28c37f5e6de076d07ada5e52f2051053b098
-MD5 21ce17db6d24a5ccf213932320102555 files/munin-1.3.3-Makefile.patch 15018
-RMD160 bb0dc9e5373e26a397f67e439ea745d58306907a files/munin-1.3.3-Makefile.patch 15018
-SHA256 a8564f0ff86d3712d33ee5b29dff28c37f5e6de076d07ada5e52f2051053b098 files/munin-1.3.3-Makefile.patch 15018
+AUX munin-1.3.3-Makefile.patch 15028 RMD160 f1e06ca3c837bfff9951afe71495d79d2dec9522 SHA1 32392770a379fc8537d698b727ffe5a6121f95ea SHA256 eef3e6e6aed9579d8bd4ba35ee0be53a1696f6895d1d7b6995b460c1e39140f3
+MD5 3aeb07cd9abc1661151eca5797d36bcc files/munin-1.3.3-Makefile.patch 15028
+RMD160 f1e06ca3c837bfff9951afe71495d79d2dec9522 files/munin-1.3.3-Makefile.patch 15028
+SHA256 eef3e6e6aed9579d8bd4ba35ee0be53a1696f6895d1d7b6995b460c1e39140f3 files/munin-1.3.3-Makefile.patch 15028
 AUX munin-1.3.3-crontab 994 RMD160 ab7cc5acaeaf478413e1eb6d1dafe561d79448b0 SHA1 7a372182c407be60895a4817f9bb74f3a63fda49 SHA256 a5d9a160fc15d152a9cbdbf817a44c9c3450c60d61eeead647bf167fbe55fb89
 MD5 7cc5d293cf203fa9202c283358b81371 files/munin-1.3.3-crontab 994
 RMD160 ab7cc5acaeaf478413e1eb6d1dafe561d79448b0 files/munin-1.3.3-crontab 994
@@ -64,14 +64,18 @@ EBUILD munin-1.3.3-r1.ebuild 3895 RMD160 f8545fc8ccddc921273a008a7c50ed63cedfc88
 MD5 6d8a1efdaef942e18c5612e9eb9f2c80 munin-1.3.3-r1.ebuild 3895
 RMD160 f8545fc8ccddc921273a008a7c50ed63cedfc88f munin-1.3.3-r1.ebuild 3895
 SHA256 7bab6cd197015b9817f96d2d0141fbb0ea99cb06ab6481d15f7e74bc2ea15274 munin-1.3.3-r1.ebuild 3895
+EBUILD munin-1.3.3-r2.ebuild 3895 RMD160 463b59d9400ec834fee32a9349975490844e76d1 SHA1 042876da4ff292cd39b0ea174fd488f4113f5c95 SHA256 60d7f272f6460b32010bddb7028c65b3c06b1e55a4a06f62beb863dabe757760
+MD5 294d80b0b5abd0f5c3939f984022e3ee munin-1.3.3-r2.ebuild 3895
+RMD160 463b59d9400ec834fee32a9349975490844e76d1 munin-1.3.3-r2.ebuild 3895
+SHA256 60d7f272f6460b32010bddb7028c65b3c06b1e55a4a06f62beb863dabe757760 munin-1.3.3-r2.ebuild 3895
 EBUILD munin-1.3.3.ebuild 3848 RMD160 7c28208bb9d72c7c101a2564978a8e66e11678b1 SHA1 b11e5fb9a5eb369594c81e2f286ddf7ca1aaf75b SHA256 4811486d38a10cff59d98e3877d3547ad5f57ee2deff71f426389a082d44db0b
 MD5 6ea54ae1a741c077fd0a055f6e344cd8 munin-1.3.3.ebuild 3848
 RMD160 7c28208bb9d72c7c101a2564978a8e66e11678b1 munin-1.3.3.ebuild 3848
 SHA256 4811486d38a10cff59d98e3877d3547ad5f57ee2deff71f426389a082d44db0b munin-1.3.3.ebuild 3848
-MISC ChangeLog 2041 RMD160 3a255250d91ad5424f643d7fc9cdca0399704931 SHA1 5d209e2adf1e14fc5372fd6d87dd43e0a283cfa1 SHA256 6183d4efda7cd83b4698f1211075204dfb2f6d44d5707c8876c5cade6f501523
-MD5 71d51e54033a17522ec5e179bec696b1 ChangeLog 2041
-RMD160 3a255250d91ad5424f643d7fc9cdca0399704931 ChangeLog 2041
-SHA256 6183d4efda7cd83b4698f1211075204dfb2f6d44d5707c8876c5cade6f501523 ChangeLog 2041
+MISC ChangeLog 2281 RMD160 e2ae00e563db286157a118beee576d445f6248b7 SHA1 bb898a20b12b277d5dd29c739001100b48fb8baa SHA256 16fc57a0ff95ba8ac7ca64e35556e9257dd1740d8e7d863ca7ee4c56164bd214
+MD5 c9522005dec70d6cc28bf007c1fa4628 ChangeLog 2281
+RMD160 e2ae00e563db286157a118beee576d445f6248b7 ChangeLog 2281
+SHA256 16fc57a0ff95ba8ac7ca64e35556e9257dd1740d8e7d863ca7ee4c56164bd214 ChangeLog 2281
 MISC metadata.xml 914 RMD160 0076c2be4c5a72a26639eb531925b4585d905060 SHA1 3b92ce6a0b1aefa369262ca69b485c280dac068b SHA256 16e3a247509483b481b8c8a038bd13f872ad48b91aade8795158a9c304749ff7
 MD5 9299a4cbbf52bdd70903df755a77f0cd metadata.xml 914
 RMD160 0076c2be4c5a72a26639eb531925b4585d905060 metadata.xml 914
@@ -94,3 +98,6 @@ SHA256 630b2ccf3b4ea311439be411b4dff4edc3ff338e70e6a997d47ce69f31af0072 files/di
 MD5 3c467ec04f3153b713bd8c408a072f38 files/digest-munin-1.3.3-r1 235
 RMD160 4e890099a15fb155b20b23f8730a0d606c11d3b0 files/digest-munin-1.3.3-r1 235
 SHA256 630b2ccf3b4ea311439be411b4dff4edc3ff338e70e6a997d47ce69f31af0072 files/digest-munin-1.3.3-r1 235
+MD5 3c467ec04f3153b713bd8c408a072f38 files/digest-munin-1.3.3-r2 235
+RMD160 4e890099a15fb155b20b23f8730a0d606c11d3b0 files/digest-munin-1.3.3-r2 235
+SHA256 630b2ccf3b4ea311439be411b4dff4edc3ff338e70e6a997d47ce69f31af0072 files/digest-munin-1.3.3-r2 235
diff --git a/net-analyzer/munin/files/digest-munin-1.3.3-r2 b/net-analyzer/munin/files/digest-munin-1.3.3-r2
new file mode 100644
index 000000000000..505377a42102
--- /dev/null
+++ b/net-analyzer/munin/files/digest-munin-1.3.3-r2
@@ -0,0 +1,3 @@
+MD5 1e0f72f2092764b72d453f3faf298689 munin_1.3.3.tar.gz 386976
+RMD160 6fbae6ddd237332c6d28d3827a4b163259d054ea munin_1.3.3.tar.gz 386976
+SHA256 8f9bec688084cb37b573a70ecf3617d0ce7389f42f22c48b3fa4c53a68a9d7f8 munin_1.3.3.tar.gz 386976
diff --git a/net-analyzer/munin/files/munin-1.3.3-Makefile.patch b/net-analyzer/munin/files/munin-1.3.3-Makefile.patch
index e845c27887b3..80564482a32c 100644
--- a/net-analyzer/munin/files/munin-1.3.3-Makefile.patch
+++ b/net-analyzer/munin/files/munin-1.3.3-Makefile.patch
@@ -177,7 +177,7 @@
 +
 +	$(INSTALL) -m 0755 build/node/munin-node $(DESTDIR)$(SBINDIR)/
 +	$(INSTALL) -m 0755 build/node/munin-node-configure $(DESTDIR)$(SBINDIR)/
-+	test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(DESTDIR)$(CONFDIR)/
++	test -f "$(DESTDIR)$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(DESTDIR)$(CONFDIR)/
 +	$(INSTALL) -m 0755 build/node/munin-run $(DESTDIR)$(SBINDIR)/
  
  uninstall-node-non-snmp: build
diff --git a/net-analyzer/munin/munin-1.3.3-r2.ebuild b/net-analyzer/munin/munin-1.3.3-r2.ebuild
new file mode 100644
index 000000000000..100e3fc26e91
--- /dev/null
+++ b/net-analyzer/munin/munin-1.3.3-r2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.3.3-r2.ebuild,v 1.1 2007/05/24 05:48:24 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="~amd64 ~ppc ~sparc ~x86"
+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 )
+
+# Keep this seperate, as previous versions have had other deps here
+DEPEND="${DEPEND_COM}"
+RDEPEND="${DEPEND_COM}
+		!minimal? ( 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}/${PN}-1.3.3-Makefile.patch
+	# Fix noise in the plugins
+	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-1.3.2-plugin-cleanup.patch
+}
+
+src_compile() {
+	emake build build-man || die "build/build-man failed"
+	if use doc; then
+		emake build-doc || die "build-doc failed"
+	fi
+
+	#Ensure TLS is disabled if built without SSL
+	if ! use ssl; then
+		echo "tls disabled" >> ${S}/build/node/munin-node.conf \
+			|| die "Fixing munin-node.conf Failed!"
+		echo "tls disabled" >> ${S}/build/server/munin.conf \
+			|| die "Fixing munin.conf 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/"
+	dirs="${dirs} /etc/munin/plugin-conf.d/"
+	dirs="${dirs} /etc/munin/plugins/"
+	keepdir ${dirs}
+
+	emake DESTDIR="${D}" install-main install-man install-node install-node-plugins || die "install failed"
+	fowners munin:munin ${dirs}
+
+	emake DESTDIR="${D}" install-man || die "install manpages failed"
+
+	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}/${P}-crontab crontab
+	newinitd ${FILESDIR}/munin-node_init.d_1.3.3-r1 munin-node
+	newconfd ${FILESDIR}/munin-node_conf.d_1.3.3-r1 munin-node
+	dodoc README ChangeLog INSTALL logo.eps logo.svg build/resources/apache*
+}
+
+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
+	crontab -u munin /var/lib/munin/crontab
+}
+
+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."
+	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"
+	elog ""
+	elog "Please note that the crontab has undergone some modifications"
+	elog "since 1.3.2, and you should update to it!"
+}