cleanup and change libgd to gd

5 files changed, 36 insertions, 23 deletions

diff --git a/net-misc/nut/Manifest b/net-misc/nut/Manifest
index 528fc4e98528..211eaac28582 100644
--- a/net-misc/nut/Manifest
+++ b/net-misc/nut/Manifest
@@ -1,15 +1,25 @@
-MD5 33372469fc2da87f395c524b68ccc931 nut-2.0.0.ebuild 3065
-MD5 241d825e09d4950e1c45ec26d8c605fe nut-1.5.12.ebuild 3299
-MD5 1fe64bf720b0aa7fc35aed3703650d05 nut-1.4.1.ebuild 2317
-MD5 61a830804969d9ffe93eabad7b2e4865 nut-1.2.2.ebuild 3388
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 d970f096e6d10b5bda32fdec691246af ChangeLog 5436
 MD5 91a159b983332d5ed0fb985cc1fe1b80 metadata.xml 330
+MD5 0977e8d4434dbb7846d542dbfc050949 nut-1.2.2.ebuild 3375
+MD5 1ad752545fa2e6e001fc1b9a9ce62d41 nut-1.4.1.ebuild 2312
+MD5 113061fc3ea1847aa7362da120fbe61e nut-1.5.12.ebuild 3293
+MD5 eb9aef30e7ef53228b2e1ad1ebee7ace nut-2.0.0.ebuild 3059
 MD5 ab96c8181bf3780dae5e3377987b05c2 files/digest-nut-1.2.2 61
+MD5 7e8c4aebf3de0a56b058a685f104dfa9 files/upsd-init 586
+MD5 4ebbbc97ea9ab9e6a3ac743148020d84 files/upsd.rc6 595
+MD5 6a3412030571af06d3bef42c99eef2ca files/upsdrv.rc6 486
+MD5 c4b76b8ceaa2c772d9ceb126b180bc37 files/upsmon-init 481
+MD5 a373cd2584d3b851388842d70f2aa4fe files/upsmon.rc6 481
 MD5 af157fac0a88e11c79527d952fce75ec files/digest-nut-1.4.1 61
-MD5 891b50cff5827a4e77573ee8f2f40e48 files/digest-nut-2.0.0 61
-MD5 ffa9209a6b5f2e02460630cb844324f0 files/upsmon-init 480
 MD5 7b76eef352ad93b1369096360bbc3a11 files/digest-nut-1.5.12 62
-MD5 d9f15db2fd0a18b34b2ba4e83f76cb1f files/upsd.rc6 594
-MD5 6e11c5b10da2a5c6d2b01b7caf97fbea files/upsdrv.rc6 485
-MD5 1c346f53bb156dea9b9c60fe1251c788 files/upsmon.rc6 480
-MD5 5e6d1b6932c79a059573a6dbb5fa80bc files/upsd-init 585
+MD5 891b50cff5827a4e77573ee8f2f40e48 files/digest-nut-2.0.0 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.8 (GNU/Linux)
+
+iD8DBQFA4wdOHTu7gpaalycRAs0/AJsHb+axQjI2evLhesH/kTsm5IH3CwCgu+ku
+nRRVHF7NZ86q98LgYJXN0zY=
+=MQxL
+-----END PGP SIGNATURE-----
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"