Bug #267801: obscure parallel make fix.

Package-Manager: portage-2.2_rc38/cvs/Linux x86_64

4 files changed, 38 insertions, 16 deletions

diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog
index 045004825657..867d8f1fadad 100644
--- a/net-analyzer/munin/ChangeLog
+++ b/net-analyzer/munin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/munin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.23 2009/08/10 20:55:22 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.24 2009/08/26 23:25:46 robbat2 Exp $
+
+  26 Aug 2009; Robin H. Johnson <robbat2@gentoo.org> munin-1.3.4-r2.ebuild,
+  +files/munin-1.3.4-parallel-make-fix.patch:
+  Bug #267801: obscure parallel make fix.
 
   10 Aug 2009; Hans de Graaff <graaff@gentoo.org> -munin-1.3.2.ebuild,
   -munin-1.3.2-r1.ebuild, -munin-1.3.2-r2.ebuild, -munin-1.3.2-r3.ebuild,
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 6732548264ce..a1fed2ff489c 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX munin-1.3.2-plugin-cleanup.patch 1014 RMD160 55e3af25844ee5ee162e7f0dea850a7b06c8d623 SHA1 3bddfe2ff6e85327b55d5d6548530ca16dd9a31f SHA256 7c44850aa9bd34d6a165acbe094d940a4f89bce436eb28e99688641ace52df8c
 AUX munin-1.3.2-rrdtool-comments.patch 4002 RMD160 2a0697f5b1f6e66f94b857248f346cc2e706b36f SHA1 d75bbbeb54cad301051709728ce281bb538d275c SHA256 e4c0a50189ddb54c603c6e83973c58ed7e78af4e6933c2dd2fe1d4699a0945e2
 AUX munin-1.3.3-Makefile.patch 15028 RMD160 f1e06ca3c837bfff9951afe71495d79d2dec9522 SHA1 32392770a379fc8537d698b727ffe5a6121f95ea SHA256 eef3e6e6aed9579d8bd4ba35ee0be53a1696f6895d1d7b6995b460c1e39140f3
@@ -8,6 +5,7 @@ AUX munin-1.3.3-crontab 994 RMD160 ab7cc5acaeaf478413e1eb6d1dafe561d79448b0 SHA1
 AUX munin-1.3.3-fw_conntrack_plugins.patch 3779 RMD160 b3543e7fb59bdaee59cb665efd575e3ce48cc7aa SHA1 ef7951c42c29d02b4294fce76ece9f1ccfa957b6 SHA256 9e4c998dfeb438796b104c7f873f064a99f9359c32553562517a70c34fabb2d9
 AUX munin-1.3.4-Makefile.patch 2328 RMD160 f3cf47a71f09bd4096cefe0523e78f952b6e7b49 SHA1 2f7aba31f7a5dadbf619e731d0023fec9bee1330 SHA256 f1db53e97bb7fb948691614888943dc3b833e656f8035f5d9d6c70537b2e23c2
 AUX munin-1.3.4-no-html-if-no-input.patch 690 RMD160 ad8f1988f97bbb67be30ce47e843e4a158bd9947 SHA1 9f92ea6bb06d7ea0ef6734c1f5acf9e117e7591c SHA256 057d6c0a914993d28151ce2788e1ed6921d1e491bb672eaeb8f4f297d4f1338a
+AUX munin-1.3.4-parallel-make-fix.patch 841 RMD160 8d570e3cff57b7bba8ef577b19a244f5c02cf543 SHA1 92d34c3b80b9a0226dd8520782f653be1998dac9 SHA256 78e3c66c8a497a3a8c8e8df77d2a4623eac8362ed2e3174f411deaf782d2e933
 AUX munin-1.3.4-plugin-cleanup.patch 947 RMD160 bf3d2e97ac3a651b6b86e8a170d735e64815f26a SHA1 1c657a132a1cd8d94ebb1fb5db99544367cdca9c SHA256 6cd472a4886a04d7c89e5006f223c6b24fd6e91c9263e13663db9157aefd8d0a
 AUX munin-1.3.4-rrdtool-1.3.patch 1389 RMD160 045a12902649bd40f68e1f8ef9c9e784c3f5e5f2 SHA1 741e773575a29f0d8125dfb18c2b6c9240510622 SHA256 f9d31fc55911a50ca61eb954b59c2d0c87dc2e52f969d846f78d2d6ddf1936ac
 AUX munin-1.3.4-samba-plugin.patch 468 RMD160 24e6b3a140f15f3265e6815dac3c1e5e1e3dcc9c SHA1 6bdb1b0a55de8bd33d53d0ad61ae322c538771cb SHA256 e6700fa3492f7efb4db6bcaee75184f1152aef8ef5231aa62c8a799bfe7dffae
@@ -20,14 +18,7 @@ EBUILD munin-1.3.3-r1.ebuild 3895 RMD160 f8545fc8ccddc921273a008a7c50ed63cedfc88
 EBUILD munin-1.3.3-r2.ebuild 3899 RMD160 9d02e45dcb0c0d491608dd7760b60593522dabe2 SHA1 0b4a6bad14fd9658b30444d2696a730b048fb850 SHA256 7d3179c8ce74c516e5be1b18d722b69970dd80f193545ca96cfb33bc64a09140
 EBUILD munin-1.3.3.ebuild 3848 RMD160 7c28208bb9d72c7c101a2564978a8e66e11678b1 SHA1 b11e5fb9a5eb369594c81e2f286ddf7ca1aaf75b SHA256 4811486d38a10cff59d98e3877d3547ad5f57ee2deff71f426389a082d44db0b
 EBUILD munin-1.3.4-r1.ebuild 4201 RMD160 b08b1a0788d7b9609d48f8e8cd9c9a9945ab0314 SHA1 75fcb0fc6c1cf9ca4edfdb82ef2daf377a598345 SHA256 241bb3876cd8242d0b76490508e18d40215de2a6bb2127554456e1e34be6c54b
-EBUILD munin-1.3.4-r2.ebuild 4449 RMD160 f803c1010e151e2403b930d124dff75ade049c69 SHA1 d3837816a335780c1088a50343fa85de360074c3 SHA256 59d8cf568c127a46b3bd76055576166ad24d8d2aa78f36a0e2693b21bb273bf7
+EBUILD munin-1.3.4-r2.ebuild 4671 RMD160 1bc8eb60535237f877fff54dab80d3a347a6ae45 SHA1 c0813f9ac94859e32e480ecaa41cf5963faf8943 SHA256 89fd4d1604ffbd767f427006645785baa2f64de2de207e3f5e3892d1bf0ed0ca
 EBUILD munin-1.3.4.ebuild 4139 RMD160 b289cacd00d3160876278044539d91c279add827 SHA1 5979f56c7e2ab4a024d2bdf82614d9777eaf5aeb SHA256 b8f3e44985fe3d88c61f1a2bb44f303acc50c13e80790abf1de113c7236f293c
-MISC ChangeLog 4527 RMD160 1b00f1084db7dbf687f028124c38161181a5dd38 SHA1 447f414c0772728f974f0b669461701d2bf0f6e7 SHA256 aea23682558992ffee79824039ec9d1f33327050873d5dc71e4312edf90b9d79
+MISC ChangeLog 4693 RMD160 3633a1782d227e05793352b588055d519ca1bf02 SHA1 c5fb4e6b4227d869b22d4efd4c43af5a2a57852c SHA256 35e4fc346c03869f18fee71feb4737280ce367278b5e58f399e8068366e7a17e
 MISC metadata.xml 1358 RMD160 96398baf01ddf52ac92bf9db2978fba43c022b2c SHA1 ccaa230711e1a3af054fae27583d0e3b10645dcc SHA256 2f8f87757cd0151b129a526b7c670f55182b8e22bf0d32236814a236398e539f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqAiT8ACgkQVYU2Ai8K93ciMwCglH+pa14Lk845vAQHawnhoPMs
-ycAAn1G0xDvp+b+vP7dywT4tpMDkmKFh
-=oWAG
------END PGP SIGNATURE-----
diff --git a/net-analyzer/munin/files/munin-1.3.4-parallel-make-fix.patch b/net-analyzer/munin/files/munin-1.3.4-parallel-make-fix.patch
new file mode 100644
index 000000000000..539885fa7bd5
--- /dev/null
+++ b/net-analyzer/munin/files/munin-1.3.4-parallel-make-fix.patch
@@ -0,0 +1,23 @@
+diff -Nuar munin-1.3.4.orig/Makefile munin-1.3.4/Makefile
+--- munin-1.3.4.orig/Makefile	2008-03-08 06:50:16.000000000 +0000
++++ munin-1.3.4/Makefile	2009-08-26 23:22:44.819138158 +0000
+@@ -104,9 +104,11 @@
+ 	echo Undone.
+ 
+ install-node-snmp: build
++	mkdir -p $(SBINDIR)
+ 	$(INSTALL) -m 0755 build/node/munin-node-configure-snmp $(SBINDIR)/
+ 
+ install-munindoc: build
++	mkdir -p $(BINDIR)
+ 	$(INSTALL) -m 0755 build/node/munindoc $(BINDIR)/
+ 
+ uninstall-node-snmp: build
+@@ -149,6 +151,7 @@
+ 
+ # Some HP-UX plugins needs *.adv support files in LIBDIR
+ install-node-plugins: build $(PLUGINS) Makefile Makefile.config
++	mkdir -p $(LIBDIR)/plugins/
+ 	for p in build/node/node.d/* build/node/node.d.$(OSTYPE)/* ; do \
+ 	    if test -f "$$p" ; then                                    \
+ 		family=`sed -n 's/^#%# family=\(.*\)$$/\1/p' $$p`;     \
diff --git a/net-analyzer/munin/munin-1.3.4-r2.ebuild b/net-analyzer/munin/munin-1.3.4-r2.ebuild
index 38a12dcd3d6e..ecc93ea96327 100644
--- a/net-analyzer/munin/munin-1.3.4-r2.ebuild
+++ b/net-analyzer/munin/munin-1.3.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.3.4-r2.ebuild,v 1.1 2009/08/10 20:48:46 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.3.4-r2.ebuild,v 1.2 2009/08/26 23:25:46 robbat2 Exp $
 
 EAPI="2"
 
@@ -63,10 +63,14 @@ src_prepare() {
 	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-1.3.4-no-html-if-no-input.patch
 
 	# Bug #253965, compatibility changes for rrdtool 1.3
-	EPATCH_OPTS="-p0 -d ${S}" epatch "${FILESDIR}/${P}-rrdtool-1.3.patch"
+	EPATCH_OPTS="-p0 -d ${S}" epatch "${FILESDIR}"/${PN}-1.3.4-rrdtool-1.3.patch
 
 	# Bug #248849, samba plugin does not have max values
-	EPATCH_OPTS="-p0 -d ${S}" epatch "${FILESDIR}/${P}-samba-plugin.patch"
+	EPATCH_OPTS="-p0 -d ${S}" epatch "${FILESDIR}"/${PN}-1.3.4-samba-plugin.patch
+
+	# Bug #267801, ensure that directories to install to are created before
+	# trying to populate them for parallel install.
+	EPATCH_OPTS="-p0 -d ${S}" epatch "${FILESDIR}"/${PN}-1.3.4-parallel-make-fix.patch
 }
 
 src_compile() {