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

11 files changed, 37 insertions, 23 deletions

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}"