Fix building in parallel (tested on 32-way system).

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

4 files changed, 217 insertions, 16 deletions

diff --git a/net-analyzer/nagios-plugins/ChangeLog b/net-analyzer/nagios-plugins/ChangeLog
index 068f601a781f..3f7f8933cece 100644
--- a/net-analyzer/nagios-plugins/ChangeLog
+++ b/net-analyzer/nagios-plugins/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nagios-plugins
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.146 2012/08/15 16:38:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.147 2012/08/15 18:29:21 flameeyes Exp $
+
+  15 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/nagios-plugins-1.4.16-parallelmake.patch, nagios-plugins-1.4.16.ebuild:
+  Fix building in parallel (tested on 32-way system).
 
   15 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
   nagios-plugins-1.4.16.ebuild:
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index 529c62c89df8..74e45701391a 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -9,23 +9,24 @@ AUX nagios-plugins-1.4.14-vserver.patch 3509 SHA256 7302c26729d02b00c5b5ac485713
 AUX nagios-plugins-1.4.15-openldap.patch 2062 SHA256 dafa89ba112f3d6438c66fc2c10ec8cfffbc4965ad5da63eddea14811eabd319 SHA512 5ca2d39e0cf8afa531363ef9f0b2348017ec1d7035ed212e2d94dedc9a042b3991ff25e81e88ed64861599b454fe66553543fa778c915ee62ddafa3b75cdb7db WHIRLPOOL df3e54ee619b539e8b215a3876a2f8938c0602d6b56699c71d9d3abd37af481aa9257b2be5ac5975131d716265dbd2f12c2e22d9459c7c66a54425c2f36f7ab9
 AUX nagios-plugins-1.4.15-vserver.patch 3492 SHA256 06d34d4a5f75757782ece8074c366eb630b25be01428e8337ea6874cd3636d85 SHA512 e99f38ff12d99f655d11a3ca3924686f75c2c8ce7103f6296ea5c55e554bd222ad12150d774bbd55dbf4a0194086b26fd90a360f1f9b22c44727a5df425ccc91 WHIRLPOOL 3beb94cf088c721b6eb13c7363c43ec3c2a61df4d6e47d494aba525ef8cc0d9332f9cc3cecd46ce4e62269d067ec0bac29e195ff8ddff5fb00afd84a492a0dfd
 AUX nagios-plugins-1.4.16-contrib.patch 12044 SHA256 7cceca9d9670a37cf6eb1597b6438146218c9118ce3e3f9252b714145476c803 SHA512 3d002a8dc8eed5f61b20a2c6e886eb0dc47f95d43f832250fc1377e1ea0528fbbed4a563d1a5bbb42cf5ab1ce2f6106217340f75ab13ae4d2ebe454a82f40138 WHIRLPOOL e527d195de10486983ccacc527504fff79923a6bf93054e8af6c0b6a2b4669f1a60625fd00b757cf9e921a6964e909dea4aee36587046f0677c9bd2334c2c878
+AUX nagios-plugins-1.4.16-parallelmake.patch 8478 SHA256 4fc535a5d6489212297b7d60eb2d3bd9cc98798caf5d49970c93533349f9b427 SHA512 aefc58bbbbd6f029cda54e43cedbdd8fa532bc2502f30f68ea554b86438ac0c7dd6d2a59b0feb96420ecd8837bf0026d4df72b994898ad79cd762361af258263 WHIRLPOOL cfa8b69931504645c52d998c18f6feda0368b7e20d9ef1126e74a9f83b23a779f2077d2509cc60d6fef22edc2a3a54cb6e37ccb8c27ebdf6ffd133ff66ef418f
 DIST nagios-plugins-1.4.14.tar.gz 1950729 SHA256 b1f0f2c01bab2a320cc7c041106500acfd6a5262ff811a2c31b62608ac6c3352 SHA512 f6eeddce03187e613f840aa453bca33b42153163dfaae78ecadacef1ea61417ce72962f4a4595afa7d5a3b804d439e0362874da826c2876bec1fd0bc0837c42b WHIRLPOOL 1e891edf5479300af9e06742e822809660972430f7166813ec4a17e00512868f478cdd81cf8808159b54bfe160c593b92aa1ca6a1cdbfe8ed5e894120b9e98cd
 DIST nagios-plugins-1.4.15.tar.gz 2095419 SHA256 51136e5210e3664e1351550de3aff4a766d9d9fea9a24d09e37b3428ef96fa5b SHA512 46b1bb382f46ee45f97758dfa7038c5a3a77ae79281708e7cfe728cc65f5afba9597e93cf1c2f4a13e4e7be6f83fede3e4979b9b58f56e9e646779866b629226 WHIRLPOOL b16272a5bc52175b211b10fc3453f8f5a5520a0bf4950f16edfc84ee0d2230fb8eaf6c8692af4426491bb3882bd315fc65c25d9565c8385d5bd4927ef14f8745
 DIST nagios-plugins-1.4.16.tar.gz 2087089 SHA256 b0caf07e0084e9b7f10fdd71cbd3ebabcd85ad78df64da360b51233b0e73b2bd SHA512 7a1401964b881c3db3e1e3f2a49dcf517ff7214724cc05c3ad629651b7e3eeb823b02abe0c6379d29996ac1e8a1208d918fd12e36cca46c7d36d9b1ebacdb2b3 WHIRLPOOL 3cb3b5d5f7f18e7eb5babde6f7bdd82ba167de4b875825c195d3abf7a14926102940616278769a8127a5c3269d475325145799c1414e6cc22eb208319fd2e879
 EBUILD nagios-plugins-1.4.14-r2.ebuild 4591 SHA256 8a04b25dfc465f055ea4088d6a3a4d9d8b9fdf8197ae08400035160ad685382a SHA512 50dacda94ad549c777d6188ff819cbd8128e9bc6dcd1a310b5bad0786a1c54591d79c88c968cbd0f6bc9c96dce7368fb5ed853621d7c3cb2f5cd3de526659d25 WHIRLPOOL ed7b88b08e48b3c745edf45a25178e911a4ebb74f8709b172886cde565e2f86c3e6ae02e94c73c99656e6c99ec9944b9266d68f2766386fad06239c155c9577a
 EBUILD nagios-plugins-1.4.14.ebuild 4278 SHA256 13873acc220d5cf475ec18f279e06bb4b03e2f86cfa04a4998f7327431ec069f SHA512 0fa9aa5f153af198329c09a3189ff33dcfd44d09b9cfeea84dd2256d52fd9e227d8ce62e75183e8647a6b639fb75ef07dea791b0fa7e2528170daa65179dfc23 WHIRLPOOL 94a5d47c722005afdc5e4757ba708f98dae1610938e2a4bb2f3e31647903d8aa35beb51b4b4113be9bf21693a46e66ca14a4c508fbb0eb4da89a726d68f1d4eb
 EBUILD nagios-plugins-1.4.15.ebuild 4525 SHA256 17297cf4b8914792a711e5fd10cec978fc0547fa3f965a6d4d9e9232188c3a5b SHA512 cf37d5f55c832072c3069119373eb59fd76fdfe2b0bb9ab3583ca90d764d3f5584838633eabeda8cb88f87e82009811372b2d1fe56d694d12ad6a41447519fb5 WHIRLPOOL fe0c08347a41690accc504629e534beec0da460a38f9cd46d6d9c09ca6196a8d66bd8a9a9e69285a7b614ea6c12627b751558a05b2e7c87fa21f752b81154b9c
-EBUILD nagios-plugins-1.4.16.ebuild 4572 SHA256 68d3e1d9ab416f1acaa78d6978e43824ce39d3b836cb7825dd855c6085ecb912 SHA512 360aa5726bd4ad2764f5b8c6a66a4a9b1e896cbb7b8c089b52a51eb21c0187db9ad593ec74b586b02911b0dc339068b7c2df67cd437c5f0896569d5ed15b15f3 WHIRLPOOL edfec5243b8deec722787017f297ae4ccaba8aff19239c7d2b6a7a43ae7e42bda606bf6151da16b36a7634919faa55a160f64e93c8370572a4ca94b5a298e855
-MISC ChangeLog 10005 SHA256 e9230f54a7d52be84bd908e1f7df8f1c0c8e48675be195c236c7af61f11f1dd2 SHA512 f12b058a62b425f5bf8b57732767c5e5b42762f54f7f8aea29475e5dd901c787923791a86509516adcef9d77f9ebc55bf3b48c0a2c491f73290265f93f42eab1 WHIRLPOOL 482a23f283985d6209abc41df6ca37d42bc585fcba7cb26bae0bc9b59ac62dcbff1f572e8dc0f606d82be47ba848a0cce33a93656eb5b3687b19908b58ff62f9
+EBUILD nagios-plugins-1.4.16.ebuild 4544 SHA256 353ff2627bf44940d559076e61c88bfdae5a5911ba79d21b6409de17ae3d6b1f SHA512 5b0e1d3e0b41488a14febe6b7c7070625164dba6dcab01b5bb41efb95e741d51e4720279372e263da23519596b3483e02619a536fbd0f39c967f5f1867795bf0 WHIRLPOOL 43e84243c34357de6d49051000efd800c225ba5249be8145c40d9338fd3eb66caf06e80edefc0e8c546ee224dffc85b97632dd8e3ecc0acdb665483668325807
+MISC ChangeLog 10197 SHA256 e3e05a8b97da4b055c2e02732152fd8f1a89d154159e1a8a747b89c383c3d586 SHA512 d5ae6853dc76f24031cd764f475afee8a23f512ee8df076dfe6b6e13a7221a3e363396dfe93e00b105099db25b7716fa03bb982596035c71f5dc145eb639491b WHIRLPOOL 899d0f3c7488725e397a8f39b1580b324eae039665d3ca5b19234fe15cafad0320afc5c55c1b1cabbed4d39ed9c2489360575b9cbcc624090675307edaade796
 MISC metadata.xml 746 SHA256 32e87d29dcc23e72360dcbd2d52ed1aaab6e6987478cb13bfc3f36495122f18e SHA512 1870a1aa1480bafe801ef61c0d2356e5483fbbe5afdef8f7e1150813f849ac0b802115880f2cdce1b52288cf6da05e48bff5425c14f0f79f353388d38f36411c WHIRLPOOL cc04b91162205e5622613b11608d56c6b98190e6182a4d47bef7b0212e1ebcd11f4c9d771b06b0225fe33d0b247c50c65ed393a1990609c62889460bf7ac5b6d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQK+K1AAoJEBzRPIrUMBNCZ/sH/0kr607pTsOOn8R6ks9ze6LD
-WRPt1Q4/5/JRNy8CRhclOYJ30t9jkbRQmneYMulH+6HkGWoYF6qZZBLpip6mqc/U
-xwteAPAiN1tH+PBgYJyhrTQg1/rHfsW+0hNCwwFk+PEN1Ph/4VShqHP4FefuvSZP
-F3IbPpAF1RxC7MtISPxDKoTeVuNxjiLhJtUBYMlfC8LSFX4EnTQw8JL3pjnVgJBw
-nEZXblJJ1EamLetQeY20Kqe8FoZyMxSKnKMFP1ZKbd8lbJrn/OzpKJcW2NIE9U5I
-IT388+Z55pmIUzymjOh0JrRKDHlcYi3RqTlytpzv+HvVj7V/eOk8XB0/ySfkXhI=
-=CQeX
+iQEcBAEBCAAGBQJQK+qNAAoJEBzRPIrUMBNCaOgIAKONqlvlDpvkI2pUOxMvazxL
+is5yKA2hk2oAoBdFxjg3vpYh4sP4efE0ZVXtX/8D7f2ESXyqltn8SMyrcBf3kAhu
+qoZd/uPEPwU4Ebpmkm6swtvJMwzP//69If+om1oB3MFs/BinQ0IkbWHXsqz0vGn6
+34h66YfHrD4ks6QCVqIyRC0HTS2vPgk9Iu9raVJd5dO6xXFixsYfvoeCSsOv1NHD
+oY8kX0lOADfM4CxnQwVQxwUJ3NR/kAyuYEab5mqO90TXgIawlvYdyDCTVDNbMzvV
+Va768wUlxwr/hHiCdJZYiggVn1LYzHefnvMmxWwsxe+WRFfIJi8VeXaQQOqYArc=
+=pxnZ
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.16-parallelmake.patch b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.16-parallelmake.patch
new file mode 100644
index 000000000000..da87556fc7fa
--- /dev/null
+++ b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.16-parallelmake.patch
@@ -0,0 +1,200 @@
+Index: nagios-plugins-1.4.16/plugins/Makefile.am
+===================================================================
+--- nagios-plugins-1.4.16.orig/plugins/Makefile.am
++++ nagios-plugins-1.4.16/plugins/Makefile.am
+@@ -39,15 +39,19 @@ EXTRA_PROGRAMS = check_mysql check_radiu
+ 	check_nagios check_by_ssh check_dns check_nt check_ide_smart	\
+ 	check_procs check_mysql_query check_apt
+ 
+-EXTRA_DIST = t tests utils.c netutils.c sslutils.c popen.c utils.h netutils.h \
+-	popen.h common.h runcmd.c runcmd.h
++EXTRA_DIST = t tests 
+ 
+ PLUGINHDRS = common.h
+ 
+-BASEOBJS = utils.o ../lib/libnagiosplug.a ../gl/libgnu.a
+-NETOBJS = netutils.o $(BASEOBJS) $(EXTRA_NETOBJS)
+-SSLOBJS = sslutils.o
++noinst_LIBRARIES = libnpcommon.a
++
++libnpcommon_a_SOURCES = utils.c netutils.c sslutils.c runcmd.c	\
++	popen.c utils.h netutils.h popen.h common.h runcmd.c runcmd.h
++
++BASEOBJS = libnpcommon.a ../lib/libnagiosplug.a ../gl/libgnu.a
++NETOBJS = $(BASEOBJS) $(EXTRA_NETOBLS)
+ NETLIBS = $(NETOBJS) $(SOCKETLIBS)
++SSLOBJS = $(BASEOBJS) $(NETLIBS) $(SSLLIBS)
+ 
+ TESTS_ENVIRONMENT = perl -I $(top_builddir) -I $(top_srcdir)
+ 
+@@ -62,18 +66,18 @@ test-debug:
+ ##############################################################################
+ # the actual targets
+ 
+-check_apt_LDADD = $(BASEOBJS) runcmd.o
++check_apt_LDADD = $(BASEOBJS)
+ check_cluster_LDADD = $(BASEOBJS)
+-check_dig_LDADD = $(NETLIBS) runcmd.o 
+-check_disk_LDADD = $(BASEOBJS) popen.o
+-check_dns_LDADD = $(NETLIBS) runcmd.o
++check_dig_LDADD = $(NETLIBS) 
++check_disk_LDADD = $(BASEOBJS)
++check_dns_LDADD = $(NETLIBS)
+ check_dummy_LDADD = $(BASEOBJS)
+-check_fping_LDADD = $(NETLIBS) popen.o
+-check_game_LDADD = $(BASEOBJS) runcmd.o
+-check_http_LDADD = $(SSLOBJS) $(NETLIBS) $(SSLLIBS)
+-check_hpjd_LDADD = $(NETLIBS) popen.o
++check_fping_LDADD = $(NETLIBS)
++check_game_LDADD = $(BASEOBJS)
++check_http_LDADD = $(SSLOBJS)
++check_hpjd_LDADD = $(NETLIBS)
+ check_ldap_LDADD = $(NETLIBS) $(LDAPLIBS)
+-check_load_LDADD = $(BASEOBJS) popen.o
++check_load_LDADD = $(BASEOBJS)
+ check_mrtg_LDADD = $(BASEOBJS)
+ check_mrtgtraf_LDADD = $(BASEOBJS)
+ check_mysql_CFLAGS = $(MYSQLCFLAGS) -DNP_VERSION='"$(NP_VERSION)"'
+@@ -82,22 +86,22 @@ check_mysql_LDADD = $(NETLIBS) $(MYSQLLI
+ check_mysql_query_CFLAGS = $(MYSQLCFLAGS) -DNP_VERSION='"$(NP_VERSION)"'
+ check_mysql_query_CPPFLAGS = $(MYSQLINCLUDE)
+ check_mysql_query_LDADD = $(NETLIBS) $(MYSQLLIBS)
+-check_nagios_LDADD = $(BASEOBJS) runcmd.o
++check_nagios_LDADD = $(BASEOBJS)
+ check_nt_LDADD = $(NETLIBS) 
+ check_ntp_LDADD = $(NETLIBS) $(MATHLIBS)
+ check_ntp_peer_LDADD = $(NETLIBS) $(MATHLIBS)
+ check_nwstat_LDADD = $(NETLIBS)
+ check_overcr_LDADD = $(NETLIBS)
+ check_pgsql_LDADD = $(NETLIBS) $(PGLIBS)
+-check_ping_LDADD = $(NETLIBS) popen.o
++check_ping_LDADD = $(NETLIBS)
+ check_procs_LDADD = $(BASEOBJS)
+ check_radius_LDADD = $(NETLIBS) $(RADIUSLIBS)
+ check_real_LDADD = $(NETLIBS)
+ check_snmp_LDADD = $(BASEOBJS)
+-check_smtp_LDADD = $(SSLOBJS) $(NETLIBS) $(SSLLIBS)
++check_smtp_LDADD = $(SSLOBJS)
+ check_ssh_LDADD = $(NETLIBS)
+-check_swap_LDADD = $(MATHLIBS) $(BASEOBJS) popen.o
+-check_tcp_LDADD = $(SSLOBJS) $(NETLIBS) $(SSLLIBS)
++check_swap_LDADD = $(MATHLIBS) $(BASEOBJS)
++check_tcp_LDADD = $(SSLOBJS)
+ check_time_LDADD = $(NETLIBS)
+ check_ntp_time_LDADD = $(NETLIBS) $(MATHLIBS)
+ check_ups_LDADD = $(NETLIBS)
+@@ -105,61 +109,11 @@ check_users_LDADD = $(BASEOBJS)
+ check_by_ssh_LDADD = $(NETLIBS)
+ check_ide_smart_LDADD = $(BASEOBJS)
+ negate_LDADD = $(BASEOBJS)
+-urlize_LDADD = $(BASEOBJS) popen.o
+-
+-check_apt_DEPENDENCIES = check_apt.c $(BASEOBJS) runcmd.o $(DEPLIBS)
+-check_cluster_DEPENDENCIES = check_cluster.c $(BASEOBJS) $(DEPLIBS)
+-check_dig_DEPENDENCIES = check_dig.c $(NETOBJS) runcmd.o $(DEPLIBS)
+-check_disk_DEPENDENCIES = check_disk.c $(BASEOBJS) popen.o $(DEPLIBS) 
+-check_dns_DEPENDENCIES = check_dns.c $(NETOBJS) runcmd.o $(DEPLIBS)
+-check_dummy_DEPENDENCIES = check_dummy.c $(DEPLIBS)
+-check_fping_DEPENDENCIES = check_fping.c $(NETOBJS) popen.o $(DEPLIBS)
+-check_game_DEPENDENCIES = check_game.c  $(DEPLIBS) runcmd.o
+-check_http_DEPENDENCIES = check_http.c $(SSLOBJS) $(NETOBJS) $(DEPLIBS)
+-check_hpjd_DEPENDENCIES = check_hpjd.c $(NETOBJS) popen.o $(DEPLIBS)
+-check_ide_smart_DEPENDENCIES = check_ide_smart.c $(BASEOBJS) $(DEPLIBS)
+-check_ldap_DEPENDENCIES = check_ldap.c $(NETOBJS) $(DEPLIBS)
+-check_load_DEPENDENCIES = check_load.c $(BASEOBJS) popen.o $(DEPLIBS)
+-check_mrtg_DEPENDENCIES = check_mrtg.c $(DEPLIBS)
+-check_mrtgtraf_DEPENDENCIES = check_mrtgtraf.c $(DEPLIBS)
+-check_mysql_DEPENDENCIES = check_mysql.c $(NETOBJS) $(DEPLIBS)
+-check_mysql_query_DEPENDENCIES = check_mysql_query.c $(NETOBJS) $(DEPLIBS)
+-check_nagios_DEPENDENCIES = check_nagios.c $(BASEOBJS) runcmd.o $(DEPLIBS)
+-check_nt_DEPENDENCIES = check_nt.c $(NETOBJS) $(DEPLIBS)
+-check_ntp_DEPENDENCIES = check_ntp.c $(NETOBJS) $(DEPLIBS)
+-check_ntp_peer_DEPENDENCIES = check_ntp_peer.c $(NETOBJS) $(DEPLIBS)
+-check_nwstat_DEPENDENCIES = check_nwstat.c $(NETOBJS) $(DEPLIBS)
+-check_overcr_DEPENDENCIES = check_overcr.c $(NETOBJS) $(DEPLIBS)
+-check_pgsql_DEPENDENCIES = check_pgsql.c $(NETOBJS)  $(DEPLIBS)
+-check_ping_DEPENDENCIES = check_ping.c $(NETOBJS) popen.o $(DEPLIBS)
+-check_procs_DEPENDENCIES = check_procs.c $(BASEOBJS) popen.o $(DEPLIBS)
+-check_radius_DEPENDENCIES = check_radius.c $(NETOBJS)  $(DEPLIBS)
+-check_real_DEPENDENCIES = check_real.c $(NETOBJS) $(DEPLIBS)
+-check_snmp_DEPENDENCIES = check_snmp.c $(BASEOBJS) $(DEPLIBS)
+-check_smtp_DEPENDENCIES = check_smtp.c $(SSLOBJS) $(NETOBJS) $(DEPLIBS)
+-check_ssh_DEPENDENCIES = check_ssh.c $(NETOBJS) $(DEPLIBS)
+-check_swap_DEPENDENCIES = check_swap.c $(BASEOBJS) popen.o $(DEPLIBS)
+-check_tcp_DEPENDENCIES = check_tcp.c $(SSLOBJS) $(NETOBJS) $(DEPLIBS)
+-check_time_DEPENDENCIES = check_time.c $(NETOBJS) $(DEPLIBS)
+-check_ntp_time_DEPENDENCIES = check_ntp_time.c $(NETOBJS) $(DEPLIBS)
+-check_ups_DEPENDENCIES = check_ups.c $(NETOBJS) $(DEPLIBS)
+-check_users_DEPENDENCIES = check_users.c $(BASEOBJS) popen.o $(DEPLIBS)
+-check_by_ssh_DEPENDENCIES = check_by_ssh.c $(NETOBJS) $(DEPLIBS)
+-negate_DEPENDENCIES = negate.c $(BASEOBJS) $(DEPLIBS)
+-urlize_DEPENDENCIES = urlize.c $(BASEOBJS) popen.o $(DEPLIBS)
++urlize_LDADD = $(BASEOBJS)
+ 
+ ##############################################################################
+ # secondary dependencies
+ 
+-popen.o: popen.c popen.h $(PLUGINHDRS)
+-
+-runcmd.o: runcmd.c runcmd.h $(PLUGINHDRS)
+-
+-utils.o: utils.c utils.h $(PLUGINHDRS)
+-
+-netutils.o: netutils.c netutils.h $(PLUGINHDRS)
+-sslutils.o: sslutils.c netutils.h $(PLUGINHDRS)
+-
+ all-local: $(check_tcp_programs)
+ 
+ $(check_tcp_programs): check_tcp
+Index: nagios-plugins-1.4.16/plugins/check_dig.c
+===================================================================
+--- nagios-plugins-1.4.16.orig/plugins/check_dig.c
++++ nagios-plugins-1.4.16/plugins/check_dig.c
+@@ -77,7 +77,7 @@ main (int argc, char **argv)
+   textdomain (PACKAGE);
+ 
+   /* Set signal handling and alarm */
+-  if (signal (SIGALRM, popen_timeout_alarm_handler) == SIG_ERR)
++  if (signal (SIGALRM, runcmd_timeout_alarm_handler) == SIG_ERR)
+     usage_va(_("Cannot catch SIGALRM"));
+ 
+   /* Parse extra opts if any */
+Index: nagios-plugins-1.4.16/plugins/check_dns.c
+===================================================================
+--- nagios-plugins-1.4.16.orig/plugins/check_dns.c
++++ nagios-plugins-1.4.16/plugins/check_dns.c
+@@ -91,7 +91,7 @@ main (int argc, char **argv)
+   textdomain (PACKAGE);
+ 
+   /* Set signal handling and alarm */
+-  if (signal (SIGALRM, popen_timeout_alarm_handler) == SIG_ERR) {
++  if (signal (SIGALRM, runcmd_timeout_alarm_handler) == SIG_ERR) {
+     usage_va(_("Cannot catch SIGALRM"));
+   }
+ 
+Index: nagios-plugins-1.4.16/plugins/runcmd.c
+===================================================================
+--- nagios-plugins-1.4.16.orig/plugins/runcmd.c
++++ nagios-plugins-1.4.16/plugins/runcmd.c
+@@ -256,7 +256,7 @@ np_runcmd_close(int fd)
+ 
+ 
+ void
+-popen_timeout_alarm_handler (int signo)
++runcmd_timeout_alarm_handler (int signo)
+ {
+ 	size_t i;
+ 
+Index: nagios-plugins-1.4.16/plugins/runcmd.h
+===================================================================
+--- nagios-plugins-1.4.16.orig/plugins/runcmd.h
++++ nagios-plugins-1.4.16/plugins/runcmd.h
+@@ -39,7 +39,7 @@ typedef struct output output;
+ 
+ /** prototypes **/
+ int np_runcmd(const char *, output *, output *, int);
+-void popen_timeout_alarm_handler(int)
++void runcmd_timeout_alarm_handler(int)
+ 	__attribute__((__noreturn__));
+ 
+ /* only multi-threaded plugins need to bother with this */
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.16.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.16.ebuild
index 6728b193868d..ef011d9a3e90 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.16.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.16.ebuild,v 1.2 2012/08/15 16:38:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.16.ebuild,v 1.3 2012/08/15 18:29:21 flameeyes Exp $
 
 EAPI=4
 
@@ -56,6 +56,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.4.12-pgsqlconfigure.patch
 	epatch "${FILESDIR}"/${PN}-1.4.15-vserver.patch
 	epatch "${FILESDIR}"/${PN}-1.4.15-openldap.patch
+	epatch "${FILESDIR}"/${P}-parallelmake.patch
 
 	eautoreconf
 }
@@ -86,11 +87,6 @@ src_configure() {
 	sed -i -e 's:/bin/ps -axwo:/bin/ps axwo:g' config.h || die "sed failed"
 }
 
-src_compile() {
-	# fails parallel build, fix is non-trivial
-	emake -j1
-}
-
 src_install() {
 	mv "${S}"/contrib/check_compaq_insight.pl "${S}"/contrib/check_compaq_insight.pl.msg
 	chmod +x "${S}"/contrib/*.pl