cleanup and drop old

(Portage version: 2.1.2.9)

6 files changed, 6 insertions, 189 deletions

diff --git a/net-analyzer/cnet/ChangeLog b/net-analyzer/cnet/ChangeLog
index 5adf77cfff90..0fc8ce54249c 100644
--- a/net-analyzer/cnet/ChangeLog
+++ b/net-analyzer/cnet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/cnet
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cnet/ChangeLog,v 1.14 2007/04/07 04:21:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cnet/ChangeLog,v 1.15 2007/06/02 22:42:58 jokey Exp $
+
+  02 Jun 2007; Markus Ullmann <jokey@gentoo.org>
+  -files/cnet-2.0.5-gentoo.patch, -files/cnet-2.0.9-gentoo.patch,
+  -files/cnet-2.0.9-parser.patch, -cnet-2.0.9.ebuild:
+  cleanup and drop old
 
   07 Apr 2007; Mike Frysinger <vapier@gentoo.org> cnet-2.0.9.ebuild,
   cnet-2.0.10.ebuild:
diff --git a/net-analyzer/cnet/cnet-2.0.9.ebuild b/net-analyzer/cnet/cnet-2.0.9.ebuild
deleted file mode 100644
index 80e17babd005..000000000000
--- a/net-analyzer/cnet/cnet-2.0.9.ebuild
+++ /dev/null
@@ -1,44 +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/cnet/cnet-2.0.9.ebuild,v 1.4 2007/04/07 04:21:08 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="Network simulation tool"
-SRC_URI="http://www.csse.uwa.edu.au/cnet/${P}.tgz"
-HOMEPAGE="http://www.csse.uwa.edu.au/cnet"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-# cnet will NOT work against elfutils (but it will compile!) Bug #67375. (21 Nov 2004 eldad)
-DEPEND=">=dev-lang/tk-8.3.4
-	dev-libs/libelf"
-
-#RDEPEND=""
-
-# unpacking the source
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-gentoo.patch
-	sed -i.orig -e "s/^CFLAGS.*/CFLAGS=${CFLAGS}/" ${S}/src/Makefile.linux
-	epatch "${FILESDIR}/${P}-parser.patch"
-}
-
-src_install() {
-	# these directories aren't created during the make install
-	# process, so we'll need to make them beforehand, or else
-	# we'll have nowhere to put the files
-	mkdir -p ${D}/usr/{bin,lib,share}
-	mkdir -p ${D}/usr/share/man/man1
-	# install with make now
-	emake PREFIX=${D}/usr install || die
-
-	#install examples
-	docinto EXAMPLES
-	dodoc EXAMPLES/*
-}
diff --git a/net-analyzer/cnet/files/cnet-2.0.5-gentoo.patch b/net-analyzer/cnet/files/cnet-2.0.5-gentoo.patch
deleted file mode 100644
index 311bb0fc3ea5..000000000000
--- a/net-analyzer/cnet/files/cnet-2.0.5-gentoo.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- Makefile	2003-03-30 21:13:05.000000000 -0600
-+++ Makefile	2003-08-01 14:26:04.000000000 -0500
-@@ -7,14 +7,14 @@
- # It is presumed that BINDIR and MANDIR exist, so you may need
- # to create them, and set their permissions, if necessary.
- #
--PREFIX		= /usr/local
-+PREFIX		= /usr
- #
- BINDIR		= $(PREFIX)/bin
--CNETDIR		= $(PREFIX)/cnetlib
--MANDIR		= $(PREFIX)/man/man1
-+CNETDIR		= $(PREFIX)/lib/cnetlib
-+MANDIR		= $(PREFIX)/share/man/man1
- MANEXT		= 1
- MANFILE		= $(MANDIR)/$(NAME).$(MANEXT)
--WEBDIR		= /home/httpd/html/cnet
-+WEBDIR		= $(CNETDIR)/html
- 
- # ---------------------------------------------------------------------
- 
---- src/Makefile.linux	2003-04-04 16:26:31.000000000 -0600
-+++ src/Makefile.linux	2003-08-01 14:26:04.000000000 -0500
-@@ -29,7 +29,7 @@
- ANSICC		= gcc -ansi
- INCLUDES	= $(LIBELFINC)
- 
--CFLAGS		= -O -Wall -fPIC $(INCLUDES) $(XINCLUDES)
-+CFLAGS		= -march=pentium3 -O3 -pipe -fPIC $(INCLUDES) $(XINCLUDES)
- 
- LD		= gcc -rdynamic
- LIBDIRS		= -L/usr/X11R6/lib $(XLIBDIRS) $(LIBELFDIR)
---- src/config.h	2003-04-25 01:08:23.000000000 -0500
-+++ src/config.h	2003-08-01 14:26:04.000000000 -0500
-@@ -169,7 +169,7 @@
- #if	defined(USE_FREEBSD)
- #define	CNETPATH	"%%PREFIX%%/share/cnet:%%PREFIX%%/include"
- #else
--#define	CNETPATH	"/usr/local/cnetlib:/usr/lib/cnet:/cslinux/cnetlib"
-+#define	CNETPATH	"/usr/lib/cnetlib:/usr/lib/cnet:"
- #endif
- 
- 
diff --git a/net-analyzer/cnet/files/cnet-2.0.9-gentoo.patch b/net-analyzer/cnet/files/cnet-2.0.9-gentoo.patch
deleted file mode 100644
index 9817db77c684..000000000000
--- a/net-analyzer/cnet/files/cnet-2.0.9-gentoo.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- Makefile	2003-03-31 11:13:05.000000000 +0800
-+++ Makefile	2004-10-04 10:41:10.292769416 +0800
-@@ -1,5 +1,5 @@
- NAME		= cnet
--VERSION		= 2.0.4
-+VERSION		= 2.0.9
- SHELL		= /bin/sh
- #
- # Change the following 5 constants to suit your local site.
-@@ -7,14 +7,14 @@
- # It is presumed that BINDIR and MANDIR exist, so you may need
- # to create them, and set their permissions, if necessary.
- #
--PREFIX		= /usr/local
-+PREFIX		= /usr/
- #
- BINDIR		= $(PREFIX)/bin
--CNETDIR		= $(PREFIX)/cnetlib
--MANDIR		= $(PREFIX)/man/man1
-+CNETDIR		= $(PREFIX)/lib/cnetlib
-+MANDIR		= $(PREFIX)/share/man/man1
- MANEXT		= 1
- MANFILE		= $(MANDIR)/$(NAME).$(MANEXT)
--WEBDIR		= /home/httpd/html/cnet
-+WEBDIR		= $(CNETDIR)/html
- 
- # ---------------------------------------------------------------------
- 
---- src/Makefile.linux	2004-05-11 03:27:19.000000000 +0800
-+++ src/Makefile.linux	2004-10-04 10:24:10.000000000 +0800
-@@ -29,7 +29,7 @@
- ANSICC		= gcc -ansi
- INCLUDES	= $(LIBELFINC)
- 
--CFLAGS		= -O -Wall -fPIC $(INCLUDES) $(XINCLUDES)
-+CFLAGS		= -march=pentium3 -O3 -pipe -fPIC $(INCLUDES) $(XINCLUDES)
- 
- LD		= gcc -rdynamic
- LIBDIRS		= -L/usr/X11R6/lib $(XLIBDIRS) $(LIBELFDIR)
---- src/config.h	2004-05-13 02:13:43.000000000 +0800
-+++ src/config.h	2004-10-04 10:39:39.000000000 +0800
-@@ -169,7 +169,7 @@
- #if	defined(USE_FREEBSD)
- #define	CNETPATH	"/usr/local/share/cnet:/usr/local/include:/usr/local/cnetlib"
- #else
--#define	CNETPATH	"/usr/local/cnetlib:/usr/lib/cnet:/cslinux/cnetlib"
-+#define	CNETPATH	"/usr/lib/cnetlib:/usr/lib/cnet:"
- #endif
- 
- 
diff --git a/net-analyzer/cnet/files/cnet-2.0.9-parser.patch b/net-analyzer/cnet/files/cnet-2.0.9-parser.patch
deleted file mode 100644
index 9b8adbefbbda..000000000000
--- a/net-analyzer/cnet/files/cnet-2.0.9-parser.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Only in cnet-2.0.9/src: applicationlayer.o
-Only in cnet-2.0.9/src: checksums.o
-Only in cnet-2.0.9/src: cnet64bits.o
-Only in cnet-2.0.9/src: cnetmain.o
-Only in cnet-2.0.9/src: compile.o
-Only in cnet-2.0.9/src: drawframes.o
-Only in cnet-2.0.9/src: error.o
-Only in cnet-2.0.9/src: ethernet.o
-Only in cnet-2.0.9/src: events.o
-Only in cnet-2.0.9/src: exit.o
-Only in cnet-2.0.9/src: globals.o
-Only in cnet-2.0.9/src: images.o
-Only in cnet-2.0.9/src: lexical.o
-Only in cnet-2.0.9/src: link_menu.o
-Only in cnet-2.0.9/src: link_windows.o
-Only in cnet-2.0.9/src: load.o
-Only in cnet-2.0.9/src: main_window.o
-Only in cnet-2.0.9/src: motd.o
-Only in cnet-2.0.9/src: node_menu.o
-Only in cnet-2.0.9/src: node_windows.o
-diff -ru cnet-2.0.9~/src/parser.c cnet-2.0.9/src/parser.c
---- cnet-2.0.9~/src/parser.c	2006-11-24 23:23:01.000000000 +0100
-+++ cnet-2.0.9/src/parser.c	2006-11-24 23:32:16.000000000 +0100
-@@ -26,6 +26,8 @@
-     59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-  */
- 
-+extern	void init_reboot_args(NODEATTR *na, int argc, char **argv);
-+
- #define expect(t,msg)	if(token == t) gettoken(); \
- 			else compile_error("%s expected\n", msg)
- 
-@@ -224,7 +226,6 @@
- 	check_string(&(na->outputfile));
- 	break;
-     case T_ATTR_NODE_REBOOTARGS : {
--	extern	void init_reboot_args(NODEATTR *na, int argc, char **argv);
- 
- 	int	argc;
- 	char	**argv;
-@@ -420,7 +421,6 @@
- static int node_defn(CnetNodetype nodetype)
- {
-     extern int	add_node(CnetNodetype, char *, int, int *);
--    extern void	init_reboot_args(int n, int argc, char **argv);
- 
-     int		thisnode, wasnew;
- 
diff --git a/net-analyzer/cnet/files/digest-cnet-2.0.9 b/net-analyzer/cnet/files/digest-cnet-2.0.9
deleted file mode 100644
index c06ba8373464..000000000000
--- a/net-analyzer/cnet/files/digest-cnet-2.0.9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 593b63c809773a284bc3d655dc609298 cnet-2.0.9.tgz 1165028
-RMD160 d8a5d6f997d525e0e146aadee849b8601e08d652 cnet-2.0.9.tgz 1165028
-SHA256 e7895a09a04cf02f694ff9f4a272a3e9bb1d4723a6c0a8415b0d03442e4f6c76 cnet-2.0.9.tgz 1165028