Remove old.

Package-Manager: portage-2.2.0_alpha60/cvs/Linux x86_64

13 files changed, 18 insertions, 1133 deletions

diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index 4194cbc77d35..5f2d0cf1c03a 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/rrdtool
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.210 2011/08/07 08:13:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.211 2011/10/01 06:55:15 radhermit Exp $
+
+  01 Oct 2011; Tim Harder <radhermit@gentoo.org> -rrdtool-1.0.50.ebuild,
+  -files/rrdtool-1.2.15-newstyle-resize.patch, -rrdtool-1.2.29.ebuild,
+  -rrdtool-1.2.30.ebuild, -rrdtool-1.3.7.ebuild, -rrdtool-1.3.8-r1.ebuild,
+  -rrdtool-1.3.9.ebuild, -rrdtool-1.4.2.ebuild, -rrdtool-1.4.3.ebuild,
+  -rrdtool-1.4.4.ebuild, -rrdtool-1.4.5.ebuild:
+  Remove old.
 
 *rrdtool-1.4.5-r1 (07 Aug 2011)
 
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index 078aedffc104..d6941c3063d5 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -1,38 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-AUX rrdtool-1.2.15-newstyle-resize.patch 5231 RMD160 acdd68b7a7f422c615cfac824516beaeb782eb5e SHA1 973b40a3954942dd3306d5781f31faf4f88c257d SHA256 e55f1e7f0c4d3649b6790cb56247eaf5518a359ef662a959848805e416239fd1
 AUX rrdtool-1.3.8-configure.ac.patch 410 RMD160 7bc8ae6bf64fbc8602c0e4a4571c74d9afea818b SHA1 b28a7f253ff66d788a29d491ef57f11c6721bb16 SHA256 220d42a1228d015f6bd02124b3f8c878f0b7bda2e277e9e3b15d4f05603328b5
 AUX rrdtool-1.4.3-ruby-ldflags.patch 614 RMD160 dc43e0e459709323ab191005dcfb31b71eabd609 SHA1 ebc5b5140007266ec935b3693e680391ddd58091 SHA256 d51f1e01a5faccc0a83a09a7aca2fa251fdfd662ba19f3670ef6591e46afec09
 AUX rrdtool-1.4.4-dont-link-system-lib.patch 801 RMD160 ae423617f43efbffe00f84e5ad8c9e1c49ee896f SHA1 d4accd6c75027554e729633f296d7c2ddb506132 SHA256 7a726fe8534a9e56d7074af827ef88e96d5176d4f68983ff5514fb137c1f12eb
-DIST rrdtool-1.0.50.tar.gz 1474200 RMD160 96af2ec2831881e167687f65f5fc9bc64c67358b SHA1 399e2bf807e3fbc987eec4c5364dc4cb416ba287 SHA256 42aa7c213dedbd95d33ca84d92f4187880f7e96062c6a3fb05bfb16f77ba2a91
-DIST rrdtool-1.2.29.tar.gz 1092333 RMD160 a54f80cf3eec6d1484e062311a96e5691656288e SHA1 bd6c201eb12ff9007081fda81aa6bd1410a30bf2 SHA256 0e3b2febfc36276fc8e5c4ec98c73830aa2313ba77663e979d4c4859928f64b9
-DIST rrdtool-1.2.30.tar.gz 1092483 RMD160 ee4d492fee4e109da89ca85bd9dd561cb9ddfcec SHA1 c850dc6008bd6580eefa4257e339f78bd3f78fa3 SHA256 3190efea410a6dd035799717948b2df09910f608d72d23ee81adad4cd0184ae9
-DIST rrdtool-1.3.7.tar.gz 1084709 RMD160 ffa30cd01f77f8cbb674c7c22994f34e18f0a8f2 SHA1 802fc03107c5b600548beef0ee6ad6cf153fc1f1 SHA256 ce7c4e732642c3e57e2b60784dfc0e2d83cb561a13d2c43274f6ffa1caa20a55
 DIST rrdtool-1.3.8.tar.gz 1021427 RMD160 e05cada9d1df11ed474536c1f6e11d7cc4c08077 SHA1 1fe71706442ddd78ec8cdbaadd8ce16bb1326b05 SHA256 a7084e07a8c78e91ca7af211af11f777c7a040b93ce21ab1144dd00079da0f38
-DIST rrdtool-1.3.9.tar.gz 1189442 RMD160 2b05c37a713cca3d15d92d1d9c5292c3cc4e0781 SHA1 5c202810bdf5e5dda3f06079c7739993622c7e86 SHA256 9e8757192a56e006d7c593970aca4850a05fa34807a5092d1d132da8f48e0108
-DIST rrdtool-1.4.2.tar.gz 1355269 RMD160 18d28dc0c22f28b6303898cb4555c7ed8df59937 SHA1 d77fbeac37837e64cbe2a377acbf3e7b95b6e86e SHA256 e55ebe13b16515a275185229a93ee1fc266010a9e3c6b05b229a1530695311cb
-DIST rrdtool-1.4.3.tar.gz 1381821 RMD160 fb888d16b8310d5366e65872735c0e41813eae96 SHA1 1e65de0192c149a30ee0d277e758a31ff7d6d6f0 SHA256 1aecfba0cb255aef6ae27534825022b83996abec0b7b94576e3b9d061ddf6d73
-DIST rrdtool-1.4.4.tar.gz 1345477 RMD160 7636c67af3e3b9ce2361cc2c3cab5a90a662a29a SHA1 e4715c13f2a6fd077c54911d396eb573788377b0 SHA256 0778d2f5cb0807b825b11a153eb0c365a847631dba69faca5c887f30797c6c33
 DIST rrdtool-1.4.5.tar.gz 1348713 RMD160 9c45c3be7bcb8e17260055a33e936f307884914f SHA1 56638e8aedd5d5522152e86746e382b75dc48c35 SHA256 1267af420533d846432e55352db89b0f2507c711f80c65e016f7484f3cb0cf1d
-EBUILD rrdtool-1.0.50.ebuild 2693 RMD160 b541b709ee70a0e28023aad30666254cf8007ec1 SHA1 3ff735acf09aea437c131cfc308b8f66bb2271b5 SHA256 ad422d3c48106ffa12c16b0146d6f465cf6d956889a8afae8e143fe2757ff331
-EBUILD rrdtool-1.2.29.ebuild 1941 RMD160 9edd22ded6a83dded4ae8f92d33e31ae8e3b5b24 SHA1 9df27ffab759f26db64097fb7e31d71589eb5643 SHA256 34b93cf0e2dd63da5da2fe45760c85211e9439d03cea36bae17357a097805148
-EBUILD rrdtool-1.2.30.ebuild 1941 RMD160 8849c247f9a83d73715d2a840f7e4e2b6e0db357 SHA1 084192bf23b447f8fb663e20a70be521f3f616e4 SHA256 68ab0689ddd49f9c635678576516fb6b9a28590ad6a7282cf02bb8f9a88bf1ca
-EBUILD rrdtool-1.3.7.ebuild 2498 RMD160 92d3e6f323127b0483babadba5b61eb16bfe01f0 SHA1 c6ec9e40a75fc971a5b6dc686c14d8dcf7d9a138 SHA256 9f83e3935817e71b24e889d8466a2a548dd2b2d6af5167ee486f3443a5dba8e2
-EBUILD rrdtool-1.3.8-r1.ebuild 2791 RMD160 f2773ddce102fddb879420fa1231af599c3491cb SHA1 487e09766df5580edcfa74b894c38c7e9899de19 SHA256 1d30943ce009c0248975f2bee22b0deae9ba7b60c2d781c2c5349917fef0d5d5
 EBUILD rrdtool-1.3.8.ebuild 2674 RMD160 32ab770c5cb9f8caabf7129765527e5c03851fd2 SHA1 d4118a2d8d1390200e6de6f8166b394da037fb27 SHA256 4e87abbe91e3850e7ce1eddd241c2fc1ebe4b7fe128710e5df0a98a120288413
-EBUILD rrdtool-1.3.9.ebuild 2776 RMD160 bb5a72c574c337bfebdadf2f11bb3da594b0ebf3 SHA1 18a3a7b9f8877c9747e4c9cc73d482c5280d7da8 SHA256 58bb63b2b6903945414c85015306561e6be685c9b7b307dc2e88f76d66af7141
-EBUILD rrdtool-1.4.2.ebuild 2773 RMD160 1925709cb77ef0b782dd9af09b21e3ab1f0ac8ed SHA1 a2eb17dcfea2b211e41a64e1fe745a10ddc94676 SHA256 2fc595a30197c34ad3a8f19e300223d1ea9dd503a5fe7582a6e7b97be16af37d
-EBUILD rrdtool-1.4.3.ebuild 2995 RMD160 db6f8d3041175e39fbc1452590090cf8fb0a19ef SHA1 e6beb54c20f9368982ebd30a52494d20f4d74b8d SHA256 742837bcf2d4f13390dbf635b7d0fb36b0fbbdbc2623562379127e421390870f
-EBUILD rrdtool-1.4.4.ebuild 3068 RMD160 5c3fab4259ff2288172c0cb65021346e9f5bef57 SHA1 da82aae94eecdb00759ecdbd879c1db37de56ddb SHA256 11cf898e8bba6c06f4ea9b57c223262bd5e7a62ef5572406da50a666029912a8
 EBUILD rrdtool-1.4.5-r1.ebuild 3155 RMD160 adc9352a01c80b71cb572ec35b9e78a46eb8ba5a SHA1 a909569809597b007aec42136d8969fc2f3bf130 SHA256 663746906cd300571c46fe6bcdd5a70e9d5a26a112d6b6511a773250b6822a69
-EBUILD rrdtool-1.4.5.ebuild 3073 RMD160 3264296ea8f939659f43592e2cef045bea8d0a15 SHA1 d634acff2537a6e4598fd8652a59ddaeedd39fe2 SHA256 e9f9f47a9b932c6e82ecee886289e555e879da6047524b6786165f76639fb70d
-MISC ChangeLog 31877 RMD160 3bf8fb755fec9c214657f3c908f3b2387213e150 SHA1 f0c19c247ab165e08793bde674b9af82018f4d14 SHA256 0f8d9b8756769fb483fe2bcb9a16b705fbf8b95c10b8c37c13ae93f743583937
+MISC ChangeLog 32230 RMD160 02e89944df7d18dfc544cbd1058291d8e55588dc SHA1 6f2c806ffff815e6723c793a72fa393b67313967 SHA256 e6362eb762fa0281092cf6efda441d1066a83c2cbe6f2720e488bd48827e6c79
 MISC metadata.xml 376 RMD160 78da9054230eb8ed5474d75d1a0f7419eb1e45f9 SHA1 b7645e63557b4d5049032390ee07d86c5411fc96 SHA256 ccdb09cfa58f274722a7b61fb666c96c5d1c55d828fff44abc9415e56c056bb7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk4+SIEACgkQXkR9YqOcLPFJKQD/YPiwGQnXRwzpcy9Yc9C0MHmQ
-6JRyOcRt/Gagt0kdPywBAI6K9xHlHadSlwCaSrra+LtpAEf2hX3qBGsy3RfTQlVW
-=/Bvg
+iQEcBAEBCgAGBQJOhrlcAAoJEEqz6FtPBkyjwV4H/1wR0obud6IuAGgrdKF7RWvB
+3pTFw5wJFcyDNsPuFmqKa44yeavN2k1px8Qh9eDkOO1GRZh/ZeqaVSAHlvMJrQrk
+uf27Q3f/kVeqPak5luUZBHmmJDSCkipxlb/xQvPIn6RBluCcYdgQ//hifuUAgfog
+G4mg41bC5MpIiEgfpXNfcVmUjRV9MnWKsCU2na3el/UT3RVkQGyjM9C5bPlwf9+D
+UJUEbOpK6FMHZD3dp9VW+8AnqwIwju3lvVAKL7X5dQBotwUDT9PgXHphmySv+m1H
+EYZ8Hm6cQbNK39tFbjXxIfi8oZCCTstChFjyb7WAq+VKMm9EsWxqNZ+qV3sd3NE=
+=93YI
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.2.15-newstyle-resize.patch b/net-analyzer/rrdtool/files/rrdtool-1.2.15-newstyle-resize.patch
deleted file mode 100644
index 52b8c005a07e..000000000000
--- a/net-analyzer/rrdtool/files/rrdtool-1.2.15-newstyle-resize.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-Add support for a more useful resize method, that allows setting of the number
-of rows, instead of requiring manual calculation.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar --exclude '*~' --exclude '*.txt' --exclude '*.html' --exclude '*.1' --exclude autom4te.cache --exclude bindings /dev/shm/portage/rrdtool-1.2.15/work/rrdtool-1.2.15/doc/rrdresize.pod /dev/shm/portage/rrdtool-1.2.15-r1/work/rrdtool-1.2.15/doc/rrdresize.pod
---- rrdtool-1.2.15.orig/doc/rrdresize.pod	2006-07-14 05:11:26.000000000 -0700
-+++ rrdtool-1.2.15/doc/rrdresize.pod	2006-07-21 01:56:56.333392940 -0700
-@@ -6,6 +6,8 @@
- 
- B<rrdtool> B<resize> I<filename> I<rra-num>  B<GROW>I<|>B<SHRINK> I<rows>
- 
-+B<rrdtool> B<resize> I<filename> I<rra-num>  [B<+>B<->B<=>]I<rows>
-+
- =head1 DESCRIPTION
- 
- The B<resize> function is used to modify the number of rows in
-@@ -23,17 +25,20 @@
- 
- =item B<GROW>
- 
--used if you want to add extra rows to an RRA. The extra rows will be inserted
--as the rows that are oldest.
-+(old style) used if you want to add extra rows to an RRA. The extra rows will
-+be inserted as the rows that are oldest.
- 
- =item B<SHRINK>
- 
--used if you want to remove rows from an RRA. The rows that will be removed
--are the oldest rows.
-+(old style) used if you want to remove rows from an RRA. The rows that will be
-+removed are the oldest rows.
- 
--=item I<rows>
-+=item [B<+>B<->B<=>]I<rows>
- 
--the number of rows you want to add or remove.
-+the number of rows you want to add or remove. when prefixed with any of B<+>,
-+B<-> or B<=>, the B<GROW>I<|>B<SHRINK> argument is not required, and instead
-+the prefix specifies to add (B<+>) I<rows>, remove (B<->) I<rows>, or set to
-+exactly (B<=>) I<rows>.
- 
- =back
- 
-diff -Nuar --exclude '*~' --exclude '*.txt' --exclude '*.html' --exclude '*.1' --exclude autom4te.cache --exclude bindings /dev/shm/portage/rrdtool-1.2.15/work/rrdtool-1.2.15/src/rrd_resize.c /dev/shm/portage/rrdtool-1.2.15-r1/work/rrdtool-1.2.15/src/rrd_resize.c
---- rrdtool-1.2.15.orig/src/rrd_resize.c	2006-07-14 05:11:26.000000000 -0700
-+++ rrdtool-1.2.15/src/rrd_resize.c	2006-07-21 03:09:45.656705610 -0700
-@@ -19,7 +19,7 @@
-     unsigned long	l,rra;
-     long		modify;
-     unsigned long	target_rra;
--    int			grow=0,shrink=0;
-+    int			grow=0,shrink=0,setsize=0,newstyle=0;
-     char		*endptr;
- 
-     infilename=argv[1];
-@@ -27,7 +27,7 @@
-         rrd_set_error("resize.rrd is a reserved name");
-         return(-1);
-     }
--    if (argc!=5) {
-+    if (argc!=5 && argc != 4) {
-         rrd_set_error("wrong number of parameters");
-         return(-1);
-     }
-@@ -36,20 +36,39 @@
- 
-     if (!strcmp(argv[3],"GROW")) grow=1;
-     else if (!strcmp(argv[3],"SHRINK")) shrink=1;
-+	else if (argv[3][0] == '=' || argv[3][0] == '-' || argv[3][0] == '+') newstyle=3;
-     else {
-         rrd_set_error("I can only GROW or SHRINK");
-         return(-1);
-     }
- 
--    modify=strtol(argv[4],&endptr,0);
--
--    if ((modify<1)) {
--        rrd_set_error("Please grow or shrink with at least 1 row");
--        return(-1);
--    }
--
--    if (shrink) modify = -modify;
-+	// if the size starts with a character (=-+) then it's the new style
-+	// instead. This is an extra mode so we can allow
-+	// rrdtool resize FOO.rrd 5 GROW =5
-+	if(argc == 5 && (argv[4][0] == '=' || argv[4][0] == '-' || argv[4][0] == '+')) {
-+		newstyle = 4;
-+	}
-+	if(newstyle > 0) {
-+		setsize = argv[newstyle][0] == '=' ? 1 : 0;
-+		/* If we see a + or a -, then the codepath is simple */
-+		grow = argv[newstyle][0] == '+' ? 1 : 0;
-+		shrink = argv[newstyle][0] == '-' ? 1 : 0;
-+		modify=strtol(argv[newstyle]+1,&endptr,0);
-+		if(modify == 0) {
-+			rrd_set_error("Refusing to add/delete/set with 0 rows");
-+			return(-1);
-+		}
-+	} else {
-+		/* this is the old code branch */
-+		modify=strtol(argv[4],&endptr,0);
-+
-+		if ((modify<1)) {
-+			rrd_set_error("Please grow or shrink with at least 1 row");
-+			return(-1);
-+		}
- 
-+		if (shrink) modify = -modify;
-+	}
- 
-     if (rrd_open(infilename, &infile, &rrdold, RRD_READWRITE)==-1) {
-         rrd_set_error("could not open RRD");
-@@ -68,6 +87,17 @@
-         fclose(infile);
-         return(-1);
-     }
-+	/* if we are in setsize mode, we need to work out what modify factor to use */
-+	if(setsize > 0) {
-+		long oldsize = rrdold.rra_def[target_rra].row_cnt;
-+		long newsize = modify;
-+		// old=5, new=5 => modify = 0
-+		if(newsize == oldsize) {
-+			rrd_set_error("RRA is already set to that size!");
-+			return(-1);
-+		}
-+		modify = newsize-oldsize;
-+	}
- 
-     if (modify < 0)
- 	if ((long)rrdold.rra_def[target_rra].row_cnt <= -modify) {
-diff -Nuar --exclude '*~' --exclude '*.txt' --exclude '*.html' --exclude '*.1' --exclude autom4te.cache --exclude bindings /dev/shm/portage/rrdtool-1.2.15/work/rrdtool-1.2.15/src/rrd_tool.c /dev/shm/portage/rrdtool-1.2.15-r1/work/rrdtool-1.2.15/src/rrd_tool.c
---- rrdtool-1.2.15.orig/src/rrd_tool.c	2006-07-14 05:11:26.000000000 -0700
-+++ rrdtool-1.2.15/src/rrd_tool.c	2006-07-21 03:07:41.862541464 -0700
-@@ -152,6 +152,7 @@
- 
-     char help_resize[] =
- 	   " * resize - alter the length of one of the RRAs in an RRD\n\n"
-+	   "\trrdtool resize filename rranum <+|-|=>rows\n";
- 	   "\trrdtool resize filename rranum GROW|SHRINK rows\n\n";
- 
-     char help_xport[] =
diff --git a/net-analyzer/rrdtool/rrdtool-1.0.50.ebuild b/net-analyzer/rrdtool/rrdtool-1.0.50.ebuild
deleted file mode 100644
index 70a7e2390aa7..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.0.50.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.0.50.ebuild,v 1.5 2008/09/18 11:10:44 pva Exp $
-
-inherit perl-module flag-o-matic eutils
-
-DESCRIPTION="A system to store and display time-series data"
-HOMEPAGE="http://oss.oetiker.ch/rrdtool/"
-SRC_URI="ftp://ftp.bit.nl/mirror/rrdtool/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86"
-IUSE="perl tcl"
-
-DEPEND="perl? ( dev-lang/perl )
-	sys-apps/gawk
-	>=media-libs/gd-1.8.3"
-RDEPEND="tcl? ( dev-lang/tcl )"
-
-TCL_VER=""
-
-pkg_setup() {
-	use perl && perl-module_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -e 's/^LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC)/& -prefer-pic/' -i src/Makefile.in
-
-	if [[ ! $(grep '^LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) -prefer-pic' src/Makefile.in) ]]; then
-		die "Makefile.in sed failed"
-	fi
-}
-
-src_compile() {
-	filter-mfpmath sse
-	filter-flags -ffast-math
-
-	local myconf
-	myconf="${myconf} --datadir=/usr/share --enable-shared"
-
-	if use tcl ; then
-		myconf="${myconf} --with-tcllib=/usr/lib"
-	else
-		myconf="${myconf} --without-tcllib"
-	fi
-
-	if use perl; then
-		econf ${myconf} --with-perl-options='PREFIX=/usr INSTALLDIRS=vendor DESTDIR=${D}' || die "econf failed"
-
-		# libraries without -fPIC? feh!
-		for libdir in cgilib* gd* libpng* zlib*; do
-			sed -i -e 's/^CFLAGS.*/& -fPIC/' ${libdir}/Makefile
-		done
-	else
-		econf ${myconf} || die "econf failed"
-	fi
-
-	make || die "make failed"
-}
-
-src_install() {
-	einstall || die
-
-	# this package completely ignores mandir settings
-
-	doman doc/*.1
-	dohtml doc/*.html
-	dodoc doc/*.pod
-	dodoc doc/*.txt
-
-	rm -rf "${D}"/usr/doc
-	rm -rf "${D}"/usr/html
-	rm -rf "${D}"/usr/man
-	rm -rf "${D}"/usr/contrib
-	rm -rf "${D}"/usr/examples
-
-	insinto /usr/share/doc/${PF}/examples
-	doins examples/*
-	insinto /usr/share/doc/${PF}/contrib
-	doins contrib/*
-
-	if use perl ; then
-		perlinfo
-		mytargets="site-perl-install"
-		perl-module_src_install || die
-
-		# remove duplicate installation into /usr/lib/perl
-		rm -Rf "${D}"/usr/lib/perl
-	fi
-
-	if use tcl ; then
-#		mv ${S}/tcl/tclrrd.so ${S}/tcl/tclrrd${PV}.so
-#		insinto /usr/lib/tcl${TCL_VER}/tclrrd${PV}
-#		doins ${S}/tcl/tclrrd${PV}.so
-		echo "package ifneeded Rrd ${PV} [list load [file join \$$dir .. tclrrd${PV}.so]]" \
-			>> "${D}"/usr/lib/tcl${TCL_VER}/tclrrd${PV}/pkgIndex.tcl
-	fi
-
-	dodoc COPY* CONTR* README TODO
-}
-
-pkg_preinst() {
-	use perl && perl-module_pkg_preinst
-}
-
-pkg_postinst() {
-	use perl && perl-module_pkg_postinst
-}
-
-pkg_prerm() {
-	use perl && perl-module_pkg_prerm
-}
-
-pkg_postrm() {
-	use perl && perl-module_pkg_postrm
-}
diff --git a/net-analyzer/rrdtool/rrdtool-1.2.29.ebuild b/net-analyzer/rrdtool/rrdtool-1.2.29.ebuild
deleted file mode 100644
index 1dc015c4e63b..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.2.29.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.2.29.ebuild,v 1.8 2009/02/14 18:22:15 ranger Exp $
-
-inherit eutils flag-o-matic multilib perl-module
-
-DESCRIPTION="A system to store and display time-series data"
-HOMEPAGE="http://oss.oetiker.ch/rrdtool/"
-SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="doc perl python ruby rrdcgi tcl"
-
-RDEPEND="tcl? ( dev-lang/tcl )
-	>=sys-libs/zlib-1.2.1
-	>=media-libs/freetype-2.1.5
-	>=media-libs/libart_lgpl-2.3.16
-	>=media-libs/libpng-1.2.5
-	rrdcgi? ( >=dev-libs/cgilib-0.5 )
-	ruby? ( !dev-ruby/ruby-rrd )"
-
-DEPEND="${RDEPEND}
-	perl? ( dev-lang/perl )
-	python? ( dev-lang/python )
-	ruby? ( dev-lang/ruby )
-	sys-apps/gawk"
-
-TCLVER=""
-
-HTMLDOC_DIR="${PF}/html"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-1.2.15-newstyle-resize.patch"
-}
-
-pkg_setup() {
-	use perl && perl-module_pkg_setup
-}
-
-src_compile() {
-	filter-mfpmath sse
-	filter-flags -ffast-math
-
-	export RRDDOCDIR=/usr/share/doc/${PF}
-
-	econf $(use_enable rrdcgi) \
-		$(use_enable ruby) \
-		$(use_enable ruby ruby-site-install) \
-		$(use_enable perl) \
-		$(use_enable perl perl-site-install) \
-		$(use_enable tcl) \
-		$(use_with tcl tcllib /usr/$(get_libdir)) \
-		$(use_enable python) || die "econf failed."
-
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	if ! use doc ; then
-		rm -rf "${D}"/usr/share/doc/${PF}/{html,txt}
-	fi
-
-	use perl && fixlocalpod
-
-	dodoc CHANGES CONTRIBUTORS NEWS README THREADS TODO
-}
-
-pkg_preinst() {
-	use perl && perl-module_pkg_preinst
-}
-
-pkg_postinst() {
-	use perl && perl-module_pkg_postinst
-}
-
-pkg_prerm() {
-	use perl && perl-module_pkg_prerm
-}
-
-pkg_postrm() {
-	use perl && perl-module_pkg_postrm
-}
diff --git a/net-analyzer/rrdtool/rrdtool-1.2.30.ebuild b/net-analyzer/rrdtool/rrdtool-1.2.30.ebuild
deleted file mode 100644
index 257c46797e14..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.2.30.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.2.30.ebuild,v 1.8 2009/12/08 19:45:37 ranger Exp $
-
-inherit eutils flag-o-matic multilib perl-module
-
-DESCRIPTION="A system to store and display time-series data"
-HOMEPAGE="http://oss.oetiker.ch/rrdtool/"
-SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="doc perl python ruby rrdcgi tcl"
-
-RDEPEND="tcl? ( dev-lang/tcl )
-	>=sys-libs/zlib-1.2.1
-	>=media-libs/freetype-2.1.5
-	>=media-libs/libart_lgpl-2.3.16
-	>=media-libs/libpng-1.2.5
-	rrdcgi? ( >=dev-libs/cgilib-0.5 )
-	ruby? ( !dev-ruby/ruby-rrd )"
-
-DEPEND="${RDEPEND}
-	perl? ( dev-lang/perl )
-	python? ( dev-lang/python )
-	ruby? ( dev-lang/ruby )
-	sys-apps/gawk"
-
-TCLVER=""
-
-HTMLDOC_DIR="${PF}/html"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-1.2.15-newstyle-resize.patch"
-}
-
-pkg_setup() {
-	use perl && perl-module_pkg_setup
-}
-
-src_compile() {
-	filter-mfpmath sse
-	filter-flags -ffast-math
-
-	export RRDDOCDIR=/usr/share/doc/${PF}
-
-	econf $(use_enable rrdcgi) \
-		$(use_enable ruby) \
-		$(use_enable ruby ruby-site-install) \
-		$(use_enable perl) \
-		$(use_enable perl perl-site-install) \
-		$(use_enable tcl) \
-		$(use_with tcl tcllib /usr/$(get_libdir)) \
-		$(use_enable python) || die "econf failed."
-
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	if ! use doc ; then
-		rm -rf "${D}"/usr/share/doc/${PF}/{html,txt}
-	fi
-
-	use perl && fixlocalpod
-
-	dodoc CHANGES CONTRIBUTORS NEWS README THREADS TODO
-}
-
-pkg_preinst() {
-	use perl && perl-module_pkg_preinst
-}
-
-pkg_postinst() {
-	use perl && perl-module_pkg_postinst
-}
-
-pkg_prerm() {
-	use perl && perl-module_pkg_prerm
-}
-
-pkg_postrm() {
-	use perl && perl-module_pkg_postrm
-}
diff --git a/net-analyzer/rrdtool/rrdtool-1.3.7.ebuild b/net-analyzer/rrdtool/rrdtool-1.3.7.ebuild
deleted file mode 100644
index 6a5b318cecec..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.3.7.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.3.7.ebuild,v 1.4 2009/11/24 17:26:22 jer Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic multilib perl-module
-
-DESCRIPTION="A system to store and display time-series data"
-HOMEPAGE="http://oss.oetiker.ch/rrdtool/"
-SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc perl python ruby rrdcgi tcl"
-
-# This versions are minimal versions upstream tested with.
-RDEPEND="
-	>=media-libs/libpng-1.2.10
-	>=dev-libs/libxml2-2.6.31
-	>=x11-libs/cairo-1.4.6[svg]
-	>=dev-libs/glib-2.12.12
-	>=x11-libs/pango-1.17
-	tcl? ( dev-lang/tcl )
-	perl? ( dev-lang/perl )
-	python? ( dev-lang/python )
-	ruby? ( >=dev-lang/ruby-1.8.6_p287-r13
-			!dev-ruby/ruby-rrd )"
-
-DEPEND="${RDEPEND}
-	sys-apps/gawk"
-
-pkg_setup() {
-	use perl && perl-module_pkg_setup
-}
-
-src_configure() {
-	filter-flags -ffast-math
-
-	export RRDDOCDIR=/usr/share/doc/${PF}
-
-	econf $(use_enable rrdcgi) \
-		$(use_enable ruby) \
-		$(use_enable ruby ruby-site-install) \
-		$(use_enable perl) \
-		$(use_enable perl perl-site-install) \
-		$(use_enable tcl) \
-		$(use_with tcl tcllib /usr/$(get_libdir)) \
-		$(use_enable python)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	if ! use doc ; then
-		rm -rf "${D}"/usr/share/doc/${PF}/{html,txt}
-	fi
-
-	use perl && fixlocalpod
-
-	dodoc CHANGES CONTRIBUTORS NEWS README THREADS TODO
-}
-
-pkg_preinst() {
-	use perl && perl-module_pkg_preinst
-}
-
-pkg_postinst() {
-	use perl && perl-module_pkg_postinst
-	ewarn "rrdtool dump 1.3 does emit completely legal xml. Basically this means that"
-	ewarn "it contains an xml header and a DOCTYPE definition. Unfortunately this"
-	ewarn "causes older versions of rrdtool restore to be unhappy."
-	ewarn
-	ewarn "To restore a new dump with an old rrdtool restore version, either remove"
-	ewarn "the xml header and the doctype by hand (both on the first line of the dump)"
-	ewarn "or use rrdtool dump --no-header."
-	ewarn
-	ewarn "Note: rrdtool-1.3.x doesn't have any default font bundled. Thus if you've"
-	ewarn "upgraded from rrdtool-1.2.x and don't have any font installed to make"
-	ewarn "lables visible, please, install some font, e.g. media-fonts/dejavu."
-}
-
-pkg_prerm() {
-	use perl && perl-module_pkg_prerm
-}
-
-pkg_postrm() {
-	use perl && perl-module_pkg_postrm
-}
diff --git a/net-analyzer/rrdtool/rrdtool-1.3.8-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.3.8-r1.ebuild
deleted file mode 100644
index b047b116e190..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.3.8-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.3.8-r1.ebuild,v 1.4 2009/11/24 17:26:22 jer Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic multilib perl-module autotools
-
-DESCRIPTION="A system to store and display time-series data"
-HOMEPAGE="http://oss.oetiker.ch/rrdtool/"
-SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc nls perl python ruby rrdcgi tcl"
-
-# This versions are minimal versions upstream tested with.
-RDEPEND="
-	>=media-libs/libpng-1.2.10
-	>=dev-libs/libxml2-2.6.31
-	>=x11-libs/cairo-1.4.6[svg]
-	>=dev-libs/glib-2.12.12
-	>=x11-libs/pango-1.17
-	tcl? ( dev-lang/tcl )
-	perl? ( dev-lang/perl )
-	python? ( dev-lang/python )
-	ruby? ( >=dev-lang/ruby-1.8.6_p287-r13
-			!dev-ruby/ruby-rrd )"
-
-DEPEND="${RDEPEND}
-	nls? ( >=dev-util/intltool-0.35
-		sys-devel/gettext )
-	sys-apps/gawk"
-
-pkg_setup() {
-	use perl && perl-module_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/rrdtool-1.3.8-configure.ac.patch"
-	sed -i '/PERLLD/s:same as PERLCC:same-as-PERLCC:' configure.ac #281694
-	mkdir m4
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -ffast-math
-
-	export RRDDOCDIR=/usr/share/doc/${PF}
-
-	econf $(use_enable rrdcgi) \
-		$(use_enable nls) \
-		$(use_enable nls libintl) \
-		$(use_enable ruby) \
-		$(use_enable ruby ruby-site-install) \
-		$(use_enable perl) \
-		$(use_enable perl perl-site-install) \
-		$(use_enable tcl) \
-		$(use_with tcl tcllib /usr/$(get_libdir)) \
-		$(use_enable python)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	if ! use doc ; then
-		rm -rf "${D}"/usr/share/doc/${PF}/{html,txt}
-	fi
-
-	use perl && fixlocalpod
-
-	dodoc CHANGES CONTRIBUTORS NEWS README THREADS TODO
-}
-
-pkg_preinst() {
-	use perl && perl-module_pkg_preinst
-}
-
-pkg_postinst() {
-	use perl && perl-module_pkg_postinst
-	ewarn "rrdtool dump 1.3 does emit completely legal xml. Basically this means that"
-	ewarn "it contains an xml header and a DOCTYPE definition. Unfortunately this"
-	ewarn "causes older versions of rrdtool restore to be unhappy."
-	ewarn
-	ewarn "To restore a new dump with an old rrdtool restore version, either remove"
-	ewarn "the xml header and the doctype by hand (both on the first line of the dump)"
-	ewarn "or use rrdtool dump --no-header."
-	ewarn
-	ewarn "Note: rrdtool-1.3.x doesn't have any default font bundled. Thus if you've"
-	ewarn "upgraded from rrdtool-1.2.x and don't have any font installed to make"
-	ewarn "lables visible, please, install some font, e.g. media-fonts/dejavu."
-}
-
-pkg_prerm() {
-	use perl && perl-module_pkg_prerm
-}
-
-pkg_postrm() {
-	use perl && perl-module_pkg_postrm
-}
diff --git a/net-analyzer/rrdtool/rrdtool-1.3.9.ebuild b/net-analyzer/rrdtool/rrdtool-1.3.9.ebuild
deleted file mode 100644
index 25d5bc1c054c..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.3.9.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.3.9.ebuild,v 1.2 2009/11/24 17:26:22 jer Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic multilib perl-module autotools
-
-DESCRIPTION="A system to store and display time-series data"
-HOMEPAGE="http://oss.oetiker.ch/rrdtool/"
-SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc nls perl python ruby rrdcgi tcl"
-
-# This versions are minimal versions upstream tested with.
-RDEPEND="
-	>=media-libs/libpng-1.2.10
-	>=dev-libs/libxml2-2.6.31
-	>=x11-libs/cairo-1.4.6[svg]
-	>=dev-libs/glib-2.12.12
-	>=x11-libs/pango-1.17
-	tcl? ( dev-lang/tcl )
-	perl? ( dev-lang/perl )
-	python? ( dev-lang/python )
-	ruby? ( >=dev-lang/ruby-1.8.6_p287-r13
-			!dev-ruby/ruby-rrd )"
-
-DEPEND="${RDEPEND}
-	nls? ( >=dev-util/intltool-0.35
-		sys-devel/gettext )
-	sys-apps/gawk"
-
-pkg_setup() {
-	use perl && perl-module_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/rrdtool-1.3.8-configure.ac.patch"
-	sed -i '/PERLLD/s:same as PERLCC:same-as-PERLCC:' configure.ac #281694
-	eautoconf
-}
-
-src_configure() {
-	filter-flags -ffast-math
-
-	export RRDDOCDIR=/usr/share/doc/${PF}
-
-	econf $(use_enable rrdcgi) \
-		$(use_enable nls) \
-		$(use_enable nls libintl) \
-		$(use_enable ruby) \
-		$(use_enable ruby ruby-site-install) \
-		$(use_enable perl) \
-		$(use_enable perl perl-site-install) \
-		$(use_enable tcl) \
-		$(use_with tcl tcllib /usr/$(get_libdir)) \
-		$(use_enable python)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	if ! use doc ; then
-		rm -rf "${D}"/usr/share/doc/${PF}/{html,txt}
-	fi
-
-	use perl && fixlocalpod
-
-	dodoc CHANGES CONTRIBUTORS NEWS README THREADS TODO
-}
-
-pkg_preinst() {
-	use perl && perl-module_pkg_preinst
-}
-
-pkg_postinst() {
-	use perl && perl-module_pkg_postinst
-	ewarn "rrdtool dump 1.3 does emit completely legal xml. Basically this means that"
-	ewarn "it contains an xml header and a DOCTYPE definition. Unfortunately this"
-	ewarn "causes older versions of rrdtool restore to be unhappy."
-	ewarn
-	ewarn "To restore a new dump with an old rrdtool restore version, either remove"
-	ewarn "the xml header and the doctype by hand (both on the first line of the dump)"
-	ewarn "or use rrdtool dump --no-header."
-	ewarn
-	ewarn "Note: rrdtool-1.3.x doesn't have any default font bundled. Thus if you've"
-	ewarn "upgraded from rrdtool-1.2.x and don't have any font installed to make"
-	ewarn "lables visible, please, install some font, e.g. media-fonts/dejavu."
-}
-
-pkg_prerm() {
-	use perl && perl-module_pkg_prerm
-}
-
-pkg_postrm() {
-	use perl && perl-module_pkg_postrm
-}
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.2.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.2.ebuild
deleted file mode 100644
index d42fdbf1a354..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.4.2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.2.ebuild,v 1.6 2010/05/26 20:28:02 tove Exp $
-
-EAPI="3"
-
-GENTOO_DEPEND_ON_PERL="no"
-inherit eutils flag-o-matic multilib perl-module autotools
-
-DESCRIPTION="A system to store and display time-series data"
-HOMEPAGE="http://oss.oetiker.ch/rrdtool/"
-SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-IUSE="doc lua perl python ruby rrdcgi tcl"
-
-# This versions are minimal versions upstream tested with.
-RDEPEND="
-	>=media-libs/libpng-1.2.10
-	>=dev-libs/libxml2-2.6.31
-	>=x11-libs/cairo-1.4.6[svg]
-	>=dev-libs/glib-2.12.12
-	>=x11-libs/pango-1.17
-	lua? ( dev-lang/lua )
-	perl? ( dev-lang/perl )
-	python? ( dev-lang/python )
-	ruby? ( >=dev-lang/ruby-1.8.6_p287-r13 !dev-ruby/ruby-rrd )
-	tcl? ( dev-lang/tcl )"
-
-DEPEND="${RDEPEND}
-	sys-apps/gawk"
-
-src_prepare() {
-	epatch "${FILESDIR}/rrdtool-1.3.8-configure.ac.patch"
-	sed -i '/PERLLD/s:same as PERLCC:same-as-PERLCC:' configure.ac #281694
-	eautoconf
-}
-
-src_configure() {
-	filter-flags -ffast-math
-
-	export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
-
-	# to solve bug #260380
-	[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
-
-	econf $(use_enable rrdcgi) \
-		$(use_enable lua) \
-		$(use_enable lua lua-site-install) \
-		$(use_enable ruby) \
-		$(use_enable ruby ruby-site-install) \
-		$(use_enable perl) \
-		$(use_enable perl perl-site-install) \
-		--with-perl-options=INSTALLDIRS=vendor \
-		$(use_enable tcl) \
-		$(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \
-		$(use_enable python)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	if ! use doc ; then
-		rm -rf "${ED}"usr/share/doc/${PF}/{html,txt}
-	fi
-
-	if use perl ; then
-		perl_delete_localpod
-		perl_delete_packlist
-	fi
-
-	dodoc CHANGES CONTRIBUTORS NEWS README THREADS TODO
-}
-
-pkg_postinst() {
-	ewarn "rrdtool dump 1.3 does emit completely legal xml. Basically this means that"
-	ewarn "it contains an xml header and a DOCTYPE definition. Unfortunately this"
-	ewarn "causes older versions of rrdtool restore to be unhappy."
-	ewarn
-	ewarn "To restore a new dump with an old rrdtool restore version, either remove"
-	ewarn "the xml header and the doctype by hand (both on the first line of the dump)"
-	ewarn "or use rrdtool dump --no-header."
-	ewarn
-	ewarn "Note: rrdtool-1.3.x doesn't have any default font bundled. Thus if you've"
-	ewarn "upgraded from rrdtool-1.2.x and don't have any font installed to make"
-	ewarn "lables visible, please, install some font, e.g. media-fonts/dejavu."
-}
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.3.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.3.ebuild
deleted file mode 100644
index c70983abcbce..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.4.3.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.3.ebuild,v 1.3 2010/06/08 11:55:01 grobian Exp $
-
-EAPI="3"
-
-GENTOO_DEPEND_ON_PERL="no"
-inherit eutils flag-o-matic multilib perl-module autotools
-
-DESCRIPTION="A system to store and display time-series data"
-HOMEPAGE="http://oss.oetiker.ch/rrdtool/"
-SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-IUSE="doc lua perl python ruby rrdcgi tcl"
-
-# This versions are minimal versions upstream tested with.
-RDEPEND="
-	>=media-libs/libpng-1.2.10
-	>=dev-libs/libxml2-2.6.31
-	>=x11-libs/cairo-1.4.6[svg]
-	>=dev-libs/glib-2.12.12
-	>=x11-libs/pango-1.17
-	lua? ( dev-lang/lua )
-	perl? ( dev-lang/perl )
-	python? ( dev-lang/python )
-	ruby? ( >=dev-lang/ruby-1.8.6_p287-r13 !dev-ruby/ruby-rrd )
-	tcl? ( dev-lang/tcl )"
-
-DEPEND="${RDEPEND}
-	sys-apps/gawk"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.3.8-configure.ac.patch"
-	epatch "${FILESDIR}/${P}-ruby-ldflags.patch"
-	sed -i '/PERLLD/s:same as PERLCC:same-as-PERLCC:' configure.ac #281694
-	eautoconf
-}
-
-src_configure() {
-	filter-flags -ffast-math
-
-	export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
-
-	# to solve bug #260380
-	[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
-
-	econf $(use_enable rrdcgi) \
-		$(use_enable lua) \
-		$(use_enable lua lua-site-install) \
-		$(use_enable ruby) \
-		$(use_enable ruby ruby-site-install) \
-		$(use_enable perl) \
-		$(use_enable perl perl-site-install) \
-		--with-perl-options=INSTALLDIRS=vendor \
-		$(use_enable tcl) \
-		$(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \
-		$(use_enable python)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	if ! use doc ; then
-		rm -rf "${ED}"usr/share/doc/${PF}/{html,txt}
-	fi
-
-	if use !rrdcgi ; then
-		# uses rrdcgi, causes invalid shebang error in Prefix, useless
-		# without rrdcgi installed
-		rm -f "${ED}"usr/share/${PN}/examples/cgi-demo.cgi
-	fi
-
-	if use perl ; then
-		perl_delete_localpod
-		perl_delete_packlist
-	fi
-
-	dodoc CHANGES CONTRIBUTORS NEWS README THREADS TODO
-}
-
-pkg_postinst() {
-	ewarn "rrdtool dump 1.3 does emit completely legal xml. Basically this means that"
-	ewarn "it contains an xml header and a DOCTYPE definition. Unfortunately this"
-	ewarn "causes older versions of rrdtool restore to be unhappy."
-	ewarn
-	ewarn "To restore a new dump with an old rrdtool restore version, either remove"
-	ewarn "the xml header and the doctype by hand (both on the first line of the dump)"
-	ewarn "or use rrdtool dump --no-header."
-	ewarn
-	ewarn "Note: rrdtool-1.3.x doesn't have any default font bundled. Thus if you've"
-	ewarn "upgraded from rrdtool-1.2.x and don't have any font installed to make"
-	ewarn "lables visible, please, install some font, e.g. media-fonts/dejavu."
-}
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.4.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.4.ebuild
deleted file mode 100644
index e29b77c697b7..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.4.4.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.4.ebuild,v 1.2 2011/01/10 18:15:48 graaff Exp $
-
-EAPI="3"
-
-GENTOO_DEPEND_ON_PERL="no"
-inherit eutils flag-o-matic multilib perl-module autotools
-
-DESCRIPTION="A system to store and display time-series data"
-HOMEPAGE="http://oss.oetiker.ch/rrdtool/"
-SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="doc lua perl python ruby rrdcgi tcl"
-
-# This versions are minimal versions upstream tested with.
-RDEPEND="
-	>=media-libs/libpng-1.2.10
-	>=dev-libs/libxml2-2.6.31
-	>=x11-libs/cairo-1.4.6[svg]
-	>=dev-libs/glib-2.12.12
-	>=x11-libs/pango-1.17
-	lua? ( dev-lang/lua )
-	perl? ( dev-lang/perl )
-	python? ( dev-lang/python )
-	ruby? ( >=dev-lang/ruby-1.8.6_p287-r13 !dev-ruby/ruby-rrd )
-	tcl? ( dev-lang/tcl )"
-
-DEPEND="${RDEPEND}
-	sys-apps/gawk"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.3.8-configure.ac.patch"
-	epatch "${FILESDIR}/${PN}-1.4.3-ruby-ldflags.patch"
-	epatch "${FILESDIR}/${P}-dont-link-system-lib.patch"
-	sed -i '/PERLLD/s:same as PERLCC:same-as-PERLCC:' configure.ac #281694
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -ffast-math
-
-	export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
-
-	# to solve bug #260380
-	[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
-
-	econf $(use_enable rrdcgi) \
-		$(use_enable lua) \
-		$(use_enable lua lua-site-install) \
-		$(use_enable ruby) \
-		$(use_enable ruby ruby-site-install) \
-		$(use_enable perl) \
-		$(use_enable perl perl-site-install) \
-		--with-perl-options=INSTALLDIRS=vendor \
-		$(use_enable tcl) \
-		$(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \
-		$(use_enable python)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	if ! use doc ; then
-		rm -rf "${ED}"usr/share/doc/${PF}/{html,txt}
-	fi
-
-	if use !rrdcgi ; then
-		# uses rrdcgi, causes invalid shebang error in Prefix, useless
-		# without rrdcgi installed
-		rm -f "${ED}"usr/share/${PN}/examples/cgi-demo.cgi
-	fi
-
-	if use perl ; then
-		perl_delete_localpod
-		perl_delete_packlist
-	fi
-
-	dodoc CHANGES CONTRIBUTORS NEWS README THREADS TODO
-}
-
-pkg_postinst() {
-	ewarn "rrdtool dump 1.3 does emit completely legal xml. Basically this means that"
-	ewarn "it contains an xml header and a DOCTYPE definition. Unfortunately this"
-	ewarn "causes older versions of rrdtool restore to be unhappy."
-	ewarn
-	ewarn "To restore a new dump with an old rrdtool restore version, either remove"
-	ewarn "the xml header and the doctype by hand (both on the first line of the dump)"
-	ewarn "or use rrdtool dump --no-header."
-	ewarn
-	ewarn "Note: rrdtool-1.3.x doesn't have any default font bundled. Thus if you've"
-	ewarn "upgraded from rrdtool-1.2.x and don't have any font installed to make"
-	ewarn "lables visible, please, install some font, e.g. media-fonts/dejavu."
-}
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.5.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.5.ebuild
deleted file mode 100644
index 0ea6be6ccf4b..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.4.5.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.5.ebuild,v 1.1 2011/06/01 02:28:58 jer Exp $
-
-EAPI="3"
-
-GENTOO_DEPEND_ON_PERL="no"
-inherit eutils flag-o-matic multilib perl-module autotools
-
-DESCRIPTION="A system to store and display time-series data"
-HOMEPAGE="http://oss.oetiker.ch/rrdtool/"
-SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="doc lua perl python ruby rrdcgi tcl"
-
-# This versions are minimal versions upstream tested with.
-RDEPEND="
-	>=media-libs/libpng-1.2.10
-	>=dev-libs/libxml2-2.6.31
-	>=x11-libs/cairo-1.4.6[svg]
-	>=dev-libs/glib-2.12.12
-	>=x11-libs/pango-1.17
-	lua? ( dev-lang/lua )
-	perl? ( dev-lang/perl )
-	python? ( dev-lang/python )
-	ruby? ( >=dev-lang/ruby-1.8.6_p287-r13 !dev-ruby/ruby-rrd )
-	tcl? ( dev-lang/tcl )"
-
-DEPEND="${RDEPEND}
-	sys-apps/gawk"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.3.8-configure.ac.patch"
-#	epatch "${FILESDIR}/${PN}-1.4.3-ruby-ldflags.patch"
-	epatch "${FILESDIR}/${PN}-1.4.4-dont-link-system-lib.patch"
-	sed -i '/PERLLD/s:same as PERLCC:same-as-PERLCC:' configure.ac #281694
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -ffast-math
-
-	export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
-
-	# to solve bug #260380
-	[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
-
-	econf $(use_enable rrdcgi) \
-		$(use_enable lua) \
-		$(use_enable lua lua-site-install) \
-		$(use_enable ruby) \
-		$(use_enable ruby ruby-site-install) \
-		$(use_enable perl) \
-		$(use_enable perl perl-site-install) \
-		--with-perl-options=INSTALLDIRS=vendor \
-		$(use_enable tcl) \
-		$(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \
-		$(use_enable python)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	if ! use doc ; then
-		rm -rf "${ED}"usr/share/doc/${PF}/{html,txt}
-	fi
-
-	if use !rrdcgi ; then
-		# uses rrdcgi, causes invalid shebang error in Prefix, useless
-		# without rrdcgi installed
-		rm -f "${ED}"usr/share/${PN}/examples/cgi-demo.cgi
-	fi
-
-	if use perl ; then
-		perl_delete_localpod
-		perl_delete_packlist
-	fi
-
-	dodoc CHANGES CONTRIBUTORS NEWS README THREADS TODO
-}
-
-pkg_postinst() {
-	ewarn "rrdtool dump 1.3 does emit completely legal xml. Basically this means that"
-	ewarn "it contains an xml header and a DOCTYPE definition. Unfortunately this"
-	ewarn "causes older versions of rrdtool restore to be unhappy."
-	ewarn
-	ewarn "To restore a new dump with an old rrdtool restore version, either remove"
-	ewarn "the xml header and the doctype by hand (both on the first line of the dump)"
-	ewarn "or use rrdtool dump --no-header."
-	ewarn
-	ewarn "Note: rrdtool-1.3.x doesn't have any default font bundled. Thus if you've"
-	ewarn "upgraded from rrdtool-1.2.x and don't have any font installed to make"
-	ewarn "lables visible, please, install some font, e.g. media-fonts/dejavu."
-}