Fix broken autotools handling.

Package-Manager: portage-2.1.2_rc4-r5

3 files changed, 29 insertions, 20 deletions

diff --git a/net-analyzer/nagios-plugins/ChangeLog b/net-analyzer/nagios-plugins/ChangeLog
index d6593352caf8..9bd5728c952d 100644
--- a/net-analyzer/nagios-plugins/ChangeLog
+++ b/net-analyzer/nagios-plugins/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nagios-plugins
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.55 2006/11/29 21:25:16 cedk Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.56 2007/01/04 15:39:32 flameeyes Exp $
+
+  04 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  nagios-plugins-1.4.3-r1.ebuild:
+  Fix broken autotools handling.
 
   29 Nov 2006; Cedric Krier <cedk@gentoo.org> nagios-plugins-1.4.2.ebuild,
   nagios-plugins-1.4.2-r1.ebuild, nagios-plugins-1.4.3-r1.ebuild:
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index 884a7c7aaee2..46a9dfd92483 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX check_swap.c.patch 2212 RMD160 ef5e3c1af55ec0b3acb31ec75c530664ee84e428 SHA1 1e74bf575a8c70943f6d8b73089b91258121a1a0 SHA256 2409f9dfe74a4b527b4c3f4c47c4cd6c40361f64104f420e3893402b731ab785
 MD5 c8c25561d4871462ea03dc0490ced91b files/check_swap.c.patch 2212
 RMD160 ef5e3c1af55ec0b3acb31ec75c530664ee84e428 files/check_swap.c.patch 2212
@@ -43,18 +46,18 @@ EBUILD nagios-plugins-1.4.2.ebuild 3429 RMD160 087d0c79cb5298e0c3752b1d0be9f4e89
 MD5 a92d1d76e5c10463ea234814b2e7515d nagios-plugins-1.4.2.ebuild 3429
 RMD160 087d0c79cb5298e0c3752b1d0be9f4e891c4e7c5 nagios-plugins-1.4.2.ebuild 3429
 SHA256 94ebe7b0f8dbb046eae07ce488701f10dd7b736d0958fa452f3d171e3f5ea7bb nagios-plugins-1.4.2.ebuild 3429
-EBUILD nagios-plugins-1.4.3-r1.ebuild 3779 RMD160 3f2e0f9a951f3adec25d1b4b4b7711c618e7c15f SHA1 5fdd246a5089eca02df9f610931f73da54c6f387 SHA256 3f201c7173fd1b80a7c24e682a7a0f23c21841d7fc5f378a0812e9354b749134
-MD5 aa72a9a18426d1d4c740227f8f1e7eea nagios-plugins-1.4.3-r1.ebuild 3779
-RMD160 3f2e0f9a951f3adec25d1b4b4b7711c618e7c15f nagios-plugins-1.4.3-r1.ebuild 3779
-SHA256 3f201c7173fd1b80a7c24e682a7a0f23c21841d7fc5f378a0812e9354b749134 nagios-plugins-1.4.3-r1.ebuild 3779
+EBUILD nagios-plugins-1.4.3-r1.ebuild 3622 RMD160 237edd14c05be0c3bd62028d6de36471d01da705 SHA1 9e1614a8036e84566ab849cc460c1b45fdfe45f4 SHA256 283d41ed5f0555b608cd28845714df8b1fe2dec0a7414167b2a91e2faeaebfbd
+MD5 9b284b1ed1adc745b0ab8c2dc0a2db4e nagios-plugins-1.4.3-r1.ebuild 3622
+RMD160 237edd14c05be0c3bd62028d6de36471d01da705 nagios-plugins-1.4.3-r1.ebuild 3622
+SHA256 283d41ed5f0555b608cd28845714df8b1fe2dec0a7414167b2a91e2faeaebfbd nagios-plugins-1.4.3-r1.ebuild 3622
 EBUILD nagios-plugins-1.4.ebuild 3265 RMD160 7b88c39fe2ebcb7bcc7d2c414a8af45432d727e3 SHA1 caf1d4410161e68975c8f5a0a56c4661d7b1e751 SHA256 c447467b9bda54363959f00cecb27ef744d0cb32e19aa19f8b1840b3a3190e89
 MD5 b4ca28fcda59f2322f2ec8d96d189ebe nagios-plugins-1.4.ebuild 3265
 RMD160 7b88c39fe2ebcb7bcc7d2c414a8af45432d727e3 nagios-plugins-1.4.ebuild 3265
 SHA256 c447467b9bda54363959f00cecb27ef744d0cb32e19aa19f8b1840b3a3190e89 nagios-plugins-1.4.ebuild 3265
-MISC ChangeLog 9869 RMD160 aacce3836284299076503dbc07819afb4601d8a2 SHA1 bf5430af7c6f251fcaceaff2a9a4ad3951b29de3 SHA256 aac1c0b8a12a5db3e7ee9f1b83ac80f13edb6307b92488e2674d1ade86d85158
-MD5 7756628288e38e2d2b97db07a9fb7e4c ChangeLog 9869
-RMD160 aacce3836284299076503dbc07819afb4601d8a2 ChangeLog 9869
-SHA256 aac1c0b8a12a5db3e7ee9f1b83ac80f13edb6307b92488e2674d1ade86d85158 ChangeLog 9869
+MISC ChangeLog 9995 RMD160 601b493cfb5e8ab94fae611379a451acd2c626b0 SHA1 4a0cd801fb7d4070409361d0b16644d5fa23aad2 SHA256 e8bca51c0f2cbc1db60e251255b96e56df1de65e8edcf2241149bbfbe3db8051
+MD5 56d791a50d466c31de22c9e0f651115a ChangeLog 9995
+RMD160 601b493cfb5e8ab94fae611379a451acd2c626b0 ChangeLog 9995
+SHA256 e8bca51c0f2cbc1db60e251255b96e56df1de65e8edcf2241149bbfbe3db8051 ChangeLog 9995
 MISC metadata.xml 371 RMD160 8cd19aa36cd4f4615a30bbcdb0429b7dc0b7430f SHA1 32ad1225f75741bdb533609eef9004f5941dd839 SHA256 af0d4f06a9c915ebb24d136adae1ab0d3525db2a2ccd247aff558b1358bf43a1
 MD5 5db356dad10986a73f73a0335265ad92 metadata.xml 371
 RMD160 8cd19aa36cd4f4615a30bbcdb0429b7dc0b7430f metadata.xml 371
@@ -77,3 +80,10 @@ SHA256 36a8c29ac7a540fbed42806003285c59585c88e3d994eba8f065788d84b51062 files/di
 MD5 14609c0043bbaa5758ec7e0d8b493852 files/digest-nagios-plugins-1.4.3-r1 265
 RMD160 99dbce32bafd79a2ac02e52eb46ddcc1d4cdb278 files/digest-nagios-plugins-1.4.3-r1 265
 SHA256 af133333dcdd11e4751e725017e70417f8a3b6201a675abe7a471695f6030601 files/digest-nagios-plugins-1.4.3-r1 265
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFnR+7AiZjviIA2XgRAnfNAJ9kdF4uREZVda7srMELaC5YWXDgngCeI5wf
+c/SRxTpmb3I5Hmw47pmahHA=
+=vUuy
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.3-r1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.3-r1.ebuild
index 523e5497c524..f1f3b582d298 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.3-r1.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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.3-r1.ebuild,v 1.5 2006/11/29 21:25:16 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.3-r1.ebuild,v 1.6 2007/01/04 15:39:32 flameeyes Exp $
 
-WANT_AUTOCONF=2.58
-WANT_AUTOMAKE=1.8
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
 
 inherit eutils autotools
 
@@ -58,12 +58,7 @@ src_unpack() {
 	EPATCH_OPTS="-d ${S}" epatch \
 	${FILESDIR}/nagios-plugins-1.4.3-check_disk-fix.patch
 
-	if ! use radius; then
-		eaclocal -I m4 || die "eaclocal failed"
-		eautoconf || die "eautoconf failed"
-		automake || die "automake failed"
-		libtoolize --copy --force || die "libtoolize failed"
-	fi
+	AT_M4DIR="m4" eautoreconf
 }
 
 src_compile() {