cleanup and change libgd to gd

7 files changed, 41 insertions, 35 deletions

diff --git a/net-analyzer/rrdtool/rrdtool-1.0.40-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.0.40-r1.ebuild
index 9dfe76ac3ee8..7bb9942b6b8e 100644
--- a/net-analyzer/rrdtool/rrdtool-1.0.40-r1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.0.40-r1.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.0.40-r1.ebuild,v 1.6 2004/06/24 22:16:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.0.40-r1.ebuild,v 1.7 2004/06/30 18:01:16 vapier Exp $
 
 inherit perl-module
 
 DESCRIPTION="A system to store and display time-series data"
-SRC_URI="http://people.ee.ethz.ch/%7Eoetiker/webtools/rrdtool/pub/${P}.tar.gz"
 HOMEPAGE="http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/"
+SRC_URI="http://people.ee.ethz.ch/%7Eoetiker/webtools/rrdtool/pub/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc"
 IUSE="tcltk perl"
 
 DEPEND="perl? ( dev-lang/perl )
 	sys-apps/gawk
-	>=media-libs/libgd-1.8.3"
+	>=media-libs/gd-1.8.3"
 RDEPEND="tcltk? ( dev-lang/tcl )"
 
 TCLVER=""
diff --git a/net-analyzer/rrdtool/rrdtool-1.0.42-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.0.42-r1.ebuild
index aa3beaf8c84e..60e86fb16847 100644
--- a/net-analyzer/rrdtool/rrdtool-1.0.42-r1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.0.42-r1.ebuild
@@ -1,25 +1,23 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.0.42-r1.ebuild,v 1.7 2004/06/24 22:16:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.0.42-r1.ebuild,v 1.8 2004/06/30 18:01:16 vapier Exp $
 
 inherit perl-module flag-o-matic
 
 DESCRIPTION="A system to store and display time-series data"
-SRC_URI="http://people.ee.ethz.ch/%7Eoetiker/webtools/${PN}/pub/${P}.tar.gz"
 HOMEPAGE="http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/"
+SRC_URI="http://people.ee.ethz.ch/%7Eoetiker/webtools/${PN}/pub/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc"
 IUSE="tcltk perl"
 
-filter-mfpmath "sse"
-filter-flags "-ffast-math"
-
 DEPEND="perl? ( dev-lang/perl )
 	sys-apps/gawk
-	>=media-libs/libgd-1.8.3"
+	>=media-libs/gd-1.8.3"
 RDEPEND="tcltk? ( dev-lang/tcl )"
+
 TCLVER=""
 
 pkg_setup() {
@@ -33,6 +31,9 @@ pkg_setup() {
 }
 
 src_compile() {
+	filter-mfpmath "sse"
+	filter-flags "-ffast-math"
+
 	local myconf
 	use tcltk \
 		&& myconf="${myconf} --with-tcllib=/usr/lib" \
diff --git a/net-analyzer/rrdtool/rrdtool-1.0.45-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.0.45-r1.ebuild
index 19dddd8cb76a..aaf2fe80eabc 100644
--- a/net-analyzer/rrdtool/rrdtool-1.0.45-r1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.0.45-r1.ebuild
@@ -1,25 +1,23 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.0.45-r1.ebuild,v 1.4 2004/06/24 22:16:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.0.45-r1.ebuild,v 1.5 2004/06/30 18:01:16 vapier Exp $
 
 inherit perl-module flag-o-matic gnuconfig
 
 DESCRIPTION="A system to store and display time-series data"
-SRC_URI="http://people.ee.ethz.ch/%7Eoetiker/webtools/${PN}/pub/${P}.tar.gz"
 HOMEPAGE="http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/"
+SRC_URI="http://people.ee.ethz.ch/%7Eoetiker/webtools/${PN}/pub/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc ~amd64 ~alpha"
+SLOT="0"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~amd64"
 IUSE="tcltk perl"
 
-filter-mfpmath "sse"
-filter-flags "-ffast-math"
-
 DEPEND="perl? ( dev-lang/perl )
 	sys-apps/gawk
-	>=media-libs/libgd-1.8.3"
+	>=media-libs/gd-1.8.3"
 RDEPEND="tcltk? ( dev-lang/tcl )"
+
 TCLVER=""
 
 pkg_setup() {
@@ -33,6 +31,9 @@ pkg_setup() {
 }
 
 src_compile() {
+	filter-mfpmath "sse"
+	filter-flags "-ffast-math"
+
 	local myconf
 	use tcltk \
 		&& myconf="${myconf} --with-tcllib=/usr/lib" \
diff --git a/net-analyzer/rrdtool/rrdtool-1.0.45-r2.ebuild b/net-analyzer/rrdtool/rrdtool-1.0.45-r2.ebuild
index deb4518d4a63..124272144567 100644
--- a/net-analyzer/rrdtool/rrdtool-1.0.45-r2.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.0.45-r2.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-analyzer/rrdtool/rrdtool-1.0.45-r2.ebuild,v 1.7 2004/06/24 22:16:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.0.45-r2.ebuild,v 1.8 2004/06/30 18:01:16 vapier Exp $
 
 inherit perl-module flag-o-matic gnuconfig
 
@@ -15,8 +15,9 @@ IUSE="tcltk perl"
 
 DEPEND="perl? ( dev-lang/perl )
 	sys-apps/gawk
-	>=media-libs/libgd-1.8.3"
+	>=media-libs/gd-1.8.3"
 RDEPEND="tcltk? ( dev-lang/tcl )"
+
 TCLVER=""
 
 pkg_setup() {
diff --git a/net-analyzer/rrdtool/rrdtool-1.0.45.ebuild b/net-analyzer/rrdtool/rrdtool-1.0.45.ebuild
index b2dc5a612229..09d5c1ec4f1b 100644
--- a/net-analyzer/rrdtool/rrdtool-1.0.45.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.0.45.ebuild
@@ -1,25 +1,23 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.0.45.ebuild,v 1.9 2004/06/24 22:16:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.0.45.ebuild,v 1.10 2004/06/30 18:01:16 vapier Exp $
 
 inherit perl-module flag-o-matic gnuconfig
 
 DESCRIPTION="A system to store and display time-series data"
-SRC_URI="http://people.ee.ethz.ch/%7Eoetiker/webtools/${PN}/pub/${P}.tar.gz"
 HOMEPAGE="http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/"
+SRC_URI="http://people.ee.ethz.ch/%7Eoetiker/webtools/${PN}/pub/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc ~amd64 ~alpha"
+SLOT="0"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~amd64"
 IUSE="tcltk perl"
 
-filter-mfpmath "sse"
-filter-flags "-ffast-math"
-
 DEPEND="perl? ( dev-lang/perl )
 	sys-apps/gawk
-	>=media-libs/libgd-1.8.3"
+	>=media-libs/gd-1.8.3"
 RDEPEND="tcltk? ( dev-lang/tcl )"
+
 TCLVER=""
 
 pkg_setup() {
@@ -33,6 +31,9 @@ pkg_setup() {
 }
 
 src_compile() {
+	filter-mfpmath "sse"
+	filter-flags "-ffast-math"
+
 	local myconf
 	use tcltk \
 		&& myconf="${myconf} --with-tcllib=/usr/lib" \
diff --git a/net-analyzer/rrdtool/rrdtool-1.0.46.ebuild b/net-analyzer/rrdtool/rrdtool-1.0.46.ebuild
index d8c90e2e8415..b247ec5b878a 100644
--- a/net-analyzer/rrdtool/rrdtool-1.0.46.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.0.46.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-analyzer/rrdtool/rrdtool-1.0.46.ebuild,v 1.4 2004/06/24 22:16:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.0.46.ebuild,v 1.5 2004/06/30 18:01:16 vapier Exp $
 
 inherit perl-module flag-o-matic gnuconfig eutils
 
@@ -10,13 +10,14 @@ SRC_URI="http://people.ee.ethz.ch/%7Eoetiker/webtools/${PN}/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha ~ia64 ~hppa"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
 IUSE="tcltk perl"
 
 DEPEND="perl? ( dev-lang/perl )
 	sys-apps/gawk
-	>=media-libs/libgd-1.8.3"
+	>=media-libs/gd-1.8.3"
 RDEPEND="tcltk? ( dev-lang/tcl )"
+
 TCLVER=""
 
 pkg_setup() {
diff --git a/net-analyzer/rrdtool/rrdtool-1.0.47.ebuild b/net-analyzer/rrdtool/rrdtool-1.0.47.ebuild
index 951ef41a0524..e4c224f91e72 100644
--- a/net-analyzer/rrdtool/rrdtool-1.0.47.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.0.47.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-analyzer/rrdtool/rrdtool-1.0.47.ebuild,v 1.3 2004/06/24 22:16:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.0.47.ebuild,v 1.4 2004/06/30 18:01:16 vapier Exp $
 
 inherit perl-module flag-o-matic gnuconfig eutils
 
@@ -10,13 +10,14 @@ SRC_URI="http://people.ee.ethz.ch/%7Eoetiker/webtools/${PN}/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha ~ia64 ~hppa"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
 IUSE="tcltk perl"
 
 DEPEND="perl? ( dev-lang/perl )
 	sys-apps/gawk
-	>=media-libs/libgd-1.8.3"
+	>=media-libs/gd-1.8.3"
 RDEPEND="tcltk? ( dev-lang/tcl )"
+
 TCLVER=""
 
 pkg_setup() {