cleanup and change libgd to gd

4 files changed, 16 insertions, 13 deletions

diff --git a/net-misc/nut/nut-1.2.2.ebuild b/net-misc/nut/nut-1.2.2.ebuild
index 8532fdd668ae..a07a3e9ce571 100644
--- a/net-misc/nut/nut-1.2.2.ebuild
+++ b/net-misc/nut/nut-1.2.2.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2004 Gentoo Foundation
 # 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.9 2004/06/25 00:00:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.2.2.ebuild,v 1.10 2004/06/30 18:31:27 vapier Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Network-UPS Tools"
-SRC_URI="http://www.exploits.org/nut/release/${PV%.*}/${P}.tar.gz"
 HOMEPAGE="http://www.exploits.org/nut/"
-KEYWORDS="x86 sparc"
+SRC_URI="http://www.exploits.org/nut/release/${PV%.*}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86 sparc"
+IUSE=""
 
 DEPEND=""
 RDEPEND=">=sys-apps/baselayout-1.8.2"
@@ -22,7 +23,7 @@ function setapache() {
 }
 
 if [ -n "${APACHE}" ]; then
-	DEPEND="${DEPEND} =sys-libs/zlib-1* =media-libs/libgd-1* =media-libs/libpng-1.2*"
+	DEPEND="${DEPEND} =sys-libs/zlib-1* =media-libs/gd-1* =media-libs/libpng-1.2*"
 	RDEPEND="${RDEPEND} net-www/apache"
 fi
 RDEPEND="${RDEPEND} ${DEPEND}"
diff --git a/net-misc/nut/nut-1.4.1.ebuild b/net-misc/nut/nut-1.4.1.ebuild
index a4ab911637f1..cb12936f3d9e 100644
--- a/net-misc/nut/nut-1.4.1.ebuild
+++ b/net-misc/nut/nut-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.4.1.ebuild,v 1.5 2004/06/25 00:00:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.4.1.ebuild,v 1.6 2004/06/30 18:31:27 vapier Exp $
 
 DESCRIPTION="Network-UPS Tools."
 HOMEPAGE="http://www.networkupstools.org/"
@@ -11,7 +11,7 @@ SLOT="0"
 KEYWORDS="x86 ~sparc"
 IUSE="cgi"
 
-RDEPEND="cgi? ( =media-libs/libgd-1* )"
+RDEPEND="cgi? ( =media-libs/gd-1* )"
 DEPEND="$RDEPEND
 	>=sys-apps/sed-4
 	>=sys-devel/autoconf-2.58"
diff --git a/net-misc/nut/nut-1.5.12.ebuild b/net-misc/nut/nut-1.5.12.ebuild
index f3721b6e21a6..9227c377614f 100644
--- a/net-misc/nut/nut-1.5.12.ebuild
+++ b/net-misc/nut/nut-1.5.12.ebuild
@@ -1,19 +1,20 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.5.12.ebuild,v 1.4 2004/06/25 00:00:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.5.12.ebuild,v 1.5 2004/06/30 18:31:27 vapier Exp $
 
 inherit fixheadtails
 
 DESCRIPTION="Network-UPS Tools"
 HOMEPAGE="http://www.networkupstools.org/"
 SRC_URI="mirror://nut/source/${PV%.*}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~sparc"
 IUSE="cgi"
 
-RDEPEND="cgi? ( =media-libs/libgd-1* )
-		 snmp? ( virtual/snmp )"
+RDEPEND="cgi? ( =media-libs/gd-1* )
+	snmp? ( virtual/snmp )"
 DEPEND="$RDEPEND
 	>=sys-apps/sed-4
 	>=sys-devel/autoconf-2.58"
diff --git a/net-misc/nut/nut-2.0.0.ebuild b/net-misc/nut/nut-2.0.0.ebuild
index c4d90b4d5728..3e7b90326488 100644
--- a/net-misc/nut/nut-2.0.0.ebuild
+++ b/net-misc/nut/nut-2.0.0.ebuild
@@ -1,19 +1,20 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-2.0.0.ebuild,v 1.4 2004/06/25 00:00:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-2.0.0.ebuild,v 1.5 2004/06/30 18:31:27 vapier Exp $
 
 inherit fixheadtails
 
 DESCRIPTION="Network-UPS Tools"
 HOMEPAGE="http://www.networkupstools.org/"
 SRC_URI="mirror://nut/source/${PV%.*}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~sparc"
 IUSE="cgi"
 
-RDEPEND="cgi? ( =media-libs/libgd-1* )
-		 snmp? ( virtual/snmp )"
+RDEPEND="cgi? ( =media-libs/gd-1* )
+	snmp? ( virtual/snmp )"
 DEPEND="$RDEPEND
 	>=sys-apps/sed-4
 	>=sys-devel/autoconf-2.58"