Cleanup

(Portage version: 2.1.3.7)

6 files changed, 6 insertions, 137 deletions

diff --git a/net-analyzer/echoping/ChangeLog b/net-analyzer/echoping/ChangeLog
index c092eb896f44..5fa1d446fe66 100644
--- a/net-analyzer/echoping/ChangeLog
+++ b/net-analyzer/echoping/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/echoping
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/echoping/ChangeLog,v 1.12 2007/09/06 16:25:35 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/echoping/ChangeLog,v 1.13 2007/09/06 16:30:31 jokey Exp $
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org>
+  -files/maxtoread-5.2.0.patch, -echoping-5.2.0.ebuild,
+  -echoping-6.0.1.ebuild:
+  Cleanup
 
   06 Sep 2007; Markus Ullmann <jokey@gentoo.org> echoping-6.0.2.ebuild:
   Stable on x86
diff --git a/net-analyzer/echoping/echoping-5.2.0.ebuild b/net-analyzer/echoping/echoping-5.2.0.ebuild
deleted file mode 100644
index 7eae5be82d05..000000000000
--- a/net-analyzer/echoping/echoping-5.2.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/echoping/echoping-5.2.0.ebuild,v 1.7 2007/02/01 21:44:37 jokey Exp $
-
-inherit eutils
-
-DESCRIPTION="echoping is a small program to test performances of remote hosts with TCP 'echo' packets"
-HOMEPAGE="http://echoping.sourceforge.net/"
-SRC_URI="mirror://sourceforge/echoping/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="x86"
-IUSE="gnutls http icp idn priority smtp ssl tos"
-
-# Add suport to libidn
-DEPEND="gnutls? ( >=net-libs/gnutls-1.0.17 )
-	ssl?	( >=dev-libs/openssl-0.9.7d )
-	idn?	( net-dns/libidn )"
-
-pkg_setup() {
-	# bug 141782 - conflicting USE flags - ssl and gnutls
-	if use ssl && use gnutls ; then
-		eerror "You cannot emerge net-analyzer/echoping with both"
-		eerror "ssl and gnutls USE flags set. Please choose one."
-		eerror
-		eerror "For example, you can add the line"
-		eerror
-		eerror "net-analyzer/echoping -gnutls"
-		eerror "to your /etc/portage/package.use"
-		die "echoping cannot use both ssl and gnutls at once"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if ! use http ; then
-		# This patch defines maxtoread eventhough http is not
-		# enabled. This avoids an error in readline.c:56.
-		epatch "${FILESDIR}"/maxtoread-${PV}.patch
-	fi
-}
-
-src_compile() {
-	econf \
-		--disable-ttcp \
-		`use_with gnutls` \
-		`use_enable http`  \
-		`use_enable icp` \
-		`use_with idn libidn` \
-		`use_enable smtp` \
-		`use_enable tos` \
-		`use_enable priority` \
-		`use_with ssl` || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-
-	# They are not installed by make install
-	dodoc README AUTHORS ChangeLog DETAILS NEWS TODO
-}
diff --git a/net-analyzer/echoping/echoping-6.0.1.ebuild b/net-analyzer/echoping/echoping-6.0.1.ebuild
deleted file mode 100644
index b9f4ac8a1373..000000000000
--- a/net-analyzer/echoping/echoping-6.0.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/echoping/echoping-6.0.1.ebuild,v 1.2 2007/07/09 12:10:52 armin76 Exp $
-
-inherit eutils
-
-DESCRIPTION="echoping is a small program to test performances of remote servers"
-HOMEPAGE="http://echoping.sourceforge.net/"
-SRC_URI="mirror://sourceforge/echoping/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="gnutls http icp idn priority smtp ssl tos postgres ldap"
-
-DEPEND="gnutls? ( >=net-libs/gnutls-1.0.17 )
-	ssl? ( >=dev-libs/openssl-0.9.7d )
-	idn? ( net-dns/libidn )
-	postgres? ( dev-db/postgresql )
-	ldap? ( net-nds/openldap )"
-
-pkg_setup() {
-	# bug 141782 - conflicting USE flags - ssl and gnutls
-	if use ssl && use gnutls ; then
-		eerror "You cannot emerge net-analyzer/echoping with both"
-		eerror "ssl and gnutls USE flags set. Please choose one."
-		die "echoping cannot use both ssl and gnutls at once"
-	fi
-}
-
-src_compile() {
-	econf \
-		--config-cache \
-		--disable-ttcp \
-		$(use_with gnutls) \
-		$(use_enable http)  \
-		$(use_enable icp) \
-		$(use_with idn libidn) \
-		$(use_enable smtp) \
-		$(use_enable tos) \
-		$(use_enable priority) \
-		$(use_with ssl) || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-
-	# They are not installed by make install
-	dodoc README AUTHORS ChangeLog DETAILS NEWS TODO
-}
diff --git a/net-analyzer/echoping/files/digest-echoping-5.2.0 b/net-analyzer/echoping/files/digest-echoping-5.2.0
deleted file mode 100644
index 2128b985f60a..000000000000
--- a/net-analyzer/echoping/files/digest-echoping-5.2.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 aef46a1d09a1083e99eb5e18e9184af2 echoping-5.2.0.tar.gz 120911
-RMD160 dcf65162034ec295a7b7d993d166d8ef70a1be79 echoping-5.2.0.tar.gz 120911
-SHA256 b7c94289f860716e8feb8a53448d4d3a7c19728400755dbc584e731904ac6bbf echoping-5.2.0.tar.gz 120911
diff --git a/net-analyzer/echoping/files/digest-echoping-6.0.1 b/net-analyzer/echoping/files/digest-echoping-6.0.1
deleted file mode 100644
index 7093df24d0c7..000000000000
--- a/net-analyzer/echoping/files/digest-echoping-6.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 eb1da53df8e632446c805ad5962be13d echoping-6.0.1.tar.gz 1814035
-RMD160 28413bb966d0fdee3db4a249543061dc7beeab4c echoping-6.0.1.tar.gz 1814035
-SHA256 b23b7ad6669dc825f830659968591e7c199b9f09862802e94ac564628fad82a4 echoping-6.0.1.tar.gz 1814035
diff --git a/net-analyzer/echoping/files/maxtoread-5.2.0.patch b/net-analyzer/echoping/files/maxtoread-5.2.0.patch
deleted file mode 100644
index 154ceafae848..000000000000
--- a/net-analyzer/echoping/files/maxtoread-5.2.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- echoping.h.orig	2005-01-25 12:57:52.144117296 -0200
-+++ echoping.h	2005-01-25 12:58:11.392191144 -0200
-@@ -11,9 +11,7 @@
- #define DEFLINE 256
- #define MAXLINE 65535
- #define UDPMAX 65535
--#ifdef HTTP
- #define MAXTOREAD 150000
--#endif
- #ifdef SMTP
- #define MAXSMTP 1024
- #define MAXSMTPLINES 30