autoconf and dependency fixes. These ebuilds break lots of rules (apache check, etc.)

12 files changed, 50 insertions, 36 deletions

diff --git a/net-misc/nut/Manifest b/net-misc/nut/Manifest
index 0d82c95bbcbf..368776ea63be 100644
--- a/net-misc/nut/Manifest
+++ b/net-misc/nut/Manifest
@@ -1,6 +1,17 @@
-MD5 f85c87540ce52c373e5842b8898b9006 nut-1.4.0.ebuild 3358
+MD5 21f871db8f71e909d5169587749795cc nut-1.4.0.ebuild 3403
 MD5 6aab9abab0b73d9a5a7a78e644433734 nut-1.0.0.ebuild 2527
-MD5 f21e7177e6406f3628cc88b1df17b791 nut-1.5.8.ebuild 2268
+MD5 799fd2baa38a488eae64dc1faa1a2924 nut-1.5.8.ebuild 2316
+MD5 c40b34bfcfd9e912b798bc149e3dd4b6 nut-1.2.1.ebuild 2966
+MD5 523983ce9b9aefa4cf9ed3a709d184a0 nut-1.3.6.ebuild 3384
+MD5 02b4ad4853ad76108045c70a47000d8c nut-1.5.7.ebuild 2334
+MD5 4c96216e06f67dd363cbb0430d51b21a nut-1.2.2.ebuild 3324
+MD5 6dce3f7061da57df456726c7dbadbbd2 nut-1.5.8-r1.ebuild 2799
+MD5 7b7b13d4f04cf0847215622d5988d490 nut-1.4.0-r3.ebuild 2333
+MD5 352e7a4593deae8d7198d2abb6013315 nut-1.2.1-r1.ebuild 3282
+MD5 6b05719a3bc924d91ea40931db450ac0 ChangeLog 4096
+MD5 1591b9ac69b062b35eba0670b5291fb3 nut-1.5.1.ebuild 3407
+MD5 b93b543b8a5de2aeec4a8d4f5faf4a92 nut-1.5.6-r2.ebuild 2337
+MD5 91a159b983332d5ed0fb985cc1fe1b80 metadata.xml 330
 MD5 53b3c22e90b76d9ed4ac9cbbef393c31 files/digest-nut-1.0.0 61
 MD5 4f6c951306e95660e88086bc591f03d0 files/digest-nut-1.2.1 61
 MD5 ab96c8181bf3780dae5e3377987b05c2 files/digest-nut-1.2.2 61
@@ -18,14 +29,3 @@ MD5 7faa5d7d46a78272384e1c621bb311cb files/upsd.rc6 503
 MD5 012892c09e8265fd790794e13d2f9986 files/upsdrv.rc6 493
 MD5 1e3f785a988685f999291d5b67c38c89 files/upsmon.rc6 502
 MD5 c5fa9d5b07e3724f41bb5fd83bbcc4c7 files/upsd-init 596
-MD5 a0ce7d6018d20764b22343469446f555 nut-1.2.1.ebuild 2921
-MD5 d7cc8952ddc09ac7f5dcb066dd95fb38 nut-1.3.6.ebuild 3358
-MD5 cfe953433f231022ec4589a9db71e58e nut-1.5.7.ebuild 2286
-MD5 c3352f3756d1a74141e54172e35c5f79 nut-1.2.2.ebuild 3279
-MD5 42ca191cf8da6ffa638f515e1d074bb4 nut-1.5.8-r1.ebuild 2751
-MD5 95d959c430f2fef38944bd34ab3a319e nut-1.4.0-r3.ebuild 2285
-MD5 55b9b90013cfe7ccc2610b7113282ac3 nut-1.2.1-r1.ebuild 3237
-MD5 6b05719a3bc924d91ea40931db450ac0 ChangeLog 4096
-MD5 42323d247e2fce5e27f5f53391f14ba0 nut-1.5.1.ebuild 3362
-MD5 473617f43a25bf55e9121b3712214d9b nut-1.5.6-r2.ebuild 2289
-MD5 91a159b983332d5ed0fb985cc1fe1b80 metadata.xml 330
diff --git a/net-misc/nut/nut-1.2.1-r1.ebuild b/net-misc/nut/nut-1.2.1-r1.ebuild
index 5ecab1775454..022e367f9cd0 100644
--- a/net-misc/nut/nut-1.2.1-r1.ebuild
+++ b/net-misc/nut/nut-1.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.2.1-r1.ebuild,v 1.5 2004/01/26 01:01:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.2.1-r1.ebuild,v 1.6 2004/01/30 07:11:04 drobbins Exp $
 
 IUSE="png"
 
@@ -18,6 +18,7 @@ SLOT="0"
 
 DEPEND="png? ( =sys-libs/zlib-1* =media-libs/libgd-1* =media-libs/libpng-1.2* )"
 RDEPEND="${DEPEND} png? ( net-www/apache ) >=sys-apps/baselayout-1.8.2"
+DEPEND="$DEPEND >=sys-devel/autoconf-2.58"
 
 src_unpack() {
 	unpack ${A} || die
diff --git a/net-misc/nut/nut-1.2.1.ebuild b/net-misc/nut/nut-1.2.1.ebuild
index a6725993fd76..7cac3305fef2 100644
--- a/net-misc/nut/nut-1.2.1.ebuild
+++ b/net-misc/nut/nut-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.2.1.ebuild,v 1.5 2004/01/26 01:01:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.2.1.ebuild,v 1.6 2004/01/30 07:11:04 drobbins Exp $
 
 IUSE="png"
 
@@ -18,6 +18,7 @@ SLOT="0"
 
 DEPEND="png? ( =sys-libs/zlib-1* =media-libs/libgd-1* =media-libs/libpng-1.2* )"
 RDEPEND="${DEPEND} png? ( net-www/apache ) >=sys-apps/baselayout-1.8.2"
+DEPEND="$DEPEND >=sys-devel/autoconf-2.58"
 
 src_unpack() {
 	unpack ${A} || die
diff --git a/net-misc/nut/nut-1.2.2.ebuild b/net-misc/nut/nut-1.2.2.ebuild
index 9eac3fa7f3a1..afb69ca543f4 100644
--- a/net-misc/nut/nut-1.2.2.ebuild
+++ b/net-misc/nut/nut-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.2.2.ebuild,v 1.5 2004/01/26 01:01:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.2.2.ebuild,v 1.6 2004/01/30 07:11:04 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Network-UPS Tools"
@@ -23,6 +23,7 @@ if [ -n "${APACHE}" ]; then
 	RDEPEND="${RDEPEND} net-www/apache"
 fi
 RDEPEND="${RDEPEND} ${DEPEND}"
+DEPEND="$DEPEND >=sys-devel/autoconf-2.58"
 
 src_unpack() {
 	unpack ${A} || die
diff --git a/net-misc/nut/nut-1.3.6.ebuild b/net-misc/nut/nut-1.3.6.ebuild
index 5900dff2bdb7..5378ae5dbc66 100644
--- a/net-misc/nut/nut-1.3.6.ebuild
+++ b/net-misc/nut/nut-1.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.3.6.ebuild,v 1.5 2004/01/26 01:01:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.3.6.ebuild,v 1.6 2004/01/30 07:11:04 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Network-UPS Tools"
@@ -10,10 +10,9 @@ KEYWORDS="x86 ~sparc"
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND=""
+DEPEND=">=sys-devel/autoconf-2.58"
 RDEPEND=">=sys-apps/baselayout-1.8.2"
 
-
 if [ "`use apache2`" ]; then
 	APACHEBIN="apache2"
 else
diff --git a/net-misc/nut/nut-1.4.0-r3.ebuild b/net-misc/nut/nut-1.4.0-r3.ebuild
index ea36c975f154..d668d4366c7b 100644
--- a/net-misc/nut/nut-1.4.0-r3.ebuild
+++ b/net-misc/nut/nut-1.4.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.4.0-r3.ebuild,v 1.2 2004/01/26 01:01:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.4.0-r3.ebuild,v 1.3 2004/01/30 07:11:04 drobbins Exp $
 
 DESCRIPTION="Network-UPS Tools."
 SRC_URI="http://www.exploits.org/nut/release/${PV%.*}/${P}.tar.gz"
@@ -11,8 +11,10 @@ SLOT="0"
 KEYWORDS="~x86 ~sparc"
 IUSE="cgi"
 
-DEPEND=">=sys-apps/sed-4
-	cgi? ( =media-libs/libgd-1* )"
+RDEPEND="cgi? ( =media-libs/libgd-1* )"
+DEPEND="$RDEPEND
+	>=sys-apps/sed-4
+	>=sys-devel/autoconf-2.58"
 
 src_unpack() {
 	unpack ${A} && cd "${S}"
diff --git a/net-misc/nut/nut-1.4.0.ebuild b/net-misc/nut/nut-1.4.0.ebuild
index 68b41cc564d9..f7d567c7953a 100644
--- a/net-misc/nut/nut-1.4.0.ebuild
+++ b/net-misc/nut/nut-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.4.0.ebuild,v 1.4 2004/01/26 01:01:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.4.0.ebuild,v 1.5 2004/01/30 07:11:04 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Network-UPS Tools"
@@ -29,6 +29,7 @@ if [ -n "${APACHE}" ]; then
 	RDEPEND="${RDEPEND} net-www/apache"
 fi
 RDEPEND="${RDEPEND} ${DEPEND}"
+DEPEND="$DEPEND >=sys-devel/autoconf-2.58"
 
 src_unpack() {
 	unpack ${A} || die
diff --git a/net-misc/nut/nut-1.5.1.ebuild b/net-misc/nut/nut-1.5.1.ebuild
index 0c65f507d82f..e181675e7377 100644
--- a/net-misc/nut/nut-1.5.1.ebuild
+++ b/net-misc/nut/nut-1.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.5.1.ebuild,v 1.4 2004/01/26 01:01:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.5.1.ebuild,v 1.5 2004/01/30 07:11:04 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Network-UPS Tools"
@@ -29,6 +29,7 @@ if [ -n "${APACHE}" ]; then
 	RDEPEND="${RDEPEND} net-www/apache"
 fi
 RDEPEND="${RDEPEND} ${DEPEND}"
+DEPEND="$DEPEND >=sys-devel/autoconf-2.58"
 
 src_unpack() {
 	unpack ${A} || die
diff --git a/net-misc/nut/nut-1.5.6-r2.ebuild b/net-misc/nut/nut-1.5.6-r2.ebuild
index 6a2c85ddc7b2..676caf96f007 100644
--- a/net-misc/nut/nut-1.5.6-r2.ebuild
+++ b/net-misc/nut/nut-1.5.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.5.6-r2.ebuild,v 1.2 2004/01/26 01:01:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.5.6-r2.ebuild,v 1.3 2004/01/30 07:11:04 drobbins Exp $
 
 DESCRIPTION="Network-UPS Tools."
 SRC_URI="http://www.exploits.org/nut/development/${PV%.*}/${P}.tar.gz"
@@ -11,8 +11,10 @@ SLOT="0"
 KEYWORDS="~x86 ~sparc"
 IUSE="cgi"
 
-DEPEND=">=sys-apps/sed-4
-	cgi? ( =media-libs/libgd-1* )"
+RDEPEND="cgi? ( =media-libs/libgd-1* )"
+DEPEND="$RDEPEND
+	>=sys-apps/sed-4
+	>=sys-devel/autoconf-2.58"
 
 src_unpack() {
 	unpack ${A} && cd "${S}"
diff --git a/net-misc/nut/nut-1.5.7.ebuild b/net-misc/nut/nut-1.5.7.ebuild
index bb4c7dac8a7b..41b21b3bd3ac 100644
--- a/net-misc/nut/nut-1.5.7.ebuild
+++ b/net-misc/nut/nut-1.5.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.5.7.ebuild,v 1.2 2004/01/26 01:01:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.5.7.ebuild,v 1.3 2004/01/30 07:11:04 drobbins Exp $
 
 DESCRIPTION="Network-UPS Tools."
 SRC_URI="http://www.exploits.org/nut/development/${PV%.*}/${P}.tar.gz"
@@ -11,8 +11,10 @@ SLOT="0"
 KEYWORDS="~x86 ~sparc"
 IUSE="cgi"
 
-DEPEND=">=sys-apps/sed-4
-	cgi? ( =media-libs/libgd-1* )"
+RDEPEND="cgi? ( =media-libs/libgd-1* )"
+DEPEND="$RDEPEND
+	>=sys-apps/sed-4
+	>=sys-devel/autoconf-2.58"
 
 src_unpack() {
 	unpack ${A} && cd "${S}"
diff --git a/net-misc/nut/nut-1.5.8-r1.ebuild b/net-misc/nut/nut-1.5.8-r1.ebuild
index 91ff62496e79..a6663e32caa9 100644
--- a/net-misc/nut/nut-1.5.8-r1.ebuild
+++ b/net-misc/nut/nut-1.5.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.5.8-r1.ebuild,v 1.3 2004/01/26 01:01:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.5.8-r1.ebuild,v 1.4 2004/01/30 07:11:04 drobbins Exp $
 
 inherit fixheadtails
 
@@ -13,8 +13,10 @@ SLOT="0"
 KEYWORDS="~x86 ~sparc"
 IUSE="cgi"
 
-DEPEND=">=sys-apps/sed-4
-	cgi? ( =media-libs/libgd-1* )"
+RDEPEND="cgi? ( =media-libs/libgd-1* )"
+DEPEND="$RDEPEND
+	>=sys-apps/sed-4
+	>=sys-devel/autoconf-2.58"
 
 src_unpack() {
 	unpack ${A} && cd "${S}"
diff --git a/net-misc/nut/nut-1.5.8.ebuild b/net-misc/nut/nut-1.5.8.ebuild
index 0ad42537c943..d53975fe9467 100644
--- a/net-misc/nut/nut-1.5.8.ebuild
+++ b/net-misc/nut/nut-1.5.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.5.8.ebuild,v 1.2 2004/01/26 01:01:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.5.8.ebuild,v 1.3 2004/01/30 07:11:04 drobbins Exp $
 
 DESCRIPTION="Network-UPS Tools."
 SRC_URI="http://www.exploits.org/nut/development/${PV%.*}/${P}.tar.gz"
@@ -11,8 +11,10 @@ SLOT="0"
 KEYWORDS="~x86 ~sparc"
 IUSE="cgi"
 
-DEPEND=">=sys-apps/sed-4
-	cgi? ( =media-libs/libgd-1* )"
+RDEPEND="cgi? ( =media-libs/libgd-1* )"
+DEPEND="$RDEPEND
+	>=sys-apps/sed-4
+	>=sys-devel/autoconf-2.58"
 
 src_unpack() {
 	unpack ${A} && cd "${S}"