2.0.10 version bump for bug 130634, thanks to Kesara Rathnayake <kesara at bcs dot org>.

(Portage version: 2.0.54)

6 files changed, 123 insertions, 30 deletions

diff --git a/net-analyzer/cnet/ChangeLog b/net-analyzer/cnet/ChangeLog
index 9f3c94145ec8..2d6081fec680 100644
--- a/net-analyzer/cnet/ChangeLog
+++ b/net-analyzer/cnet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/cnet
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cnet/ChangeLog,v 1.9 2005/01/31 13:55:30 ka0ttic Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cnet/ChangeLog,v 1.10 2006/04/21 01:00:59 vanquirius Exp $
+
+*cnet-2.0.10 (21 Apr 2006)
+
+  21 Apr 2006; Marcelo Goes <vanquirius@gentoo.org>
+  +files/cnet-2.0.10-gentoo.patch, -cnet-2.0.5.ebuild, +cnet-2.0.10.ebuild:
+  2.0.10 version bump for bug 130634, thanks to Kesara Rathnayake <kesara at
+  bcs dot org>.
 
   31 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> cnet-2.0.9.ebuild:
   Marked stable on x86.
diff --git a/net-analyzer/cnet/Manifest b/net-analyzer/cnet/Manifest
index 721174932476..d75c24abc5ab 100644
--- a/net-analyzer/cnet/Manifest
+++ b/net-analyzer/cnet/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d5e52cc47230e288ad40e44b0ffddbf0 cnet-2.0.5.ebuild 1159
-MD5 5242584442a72f5ffd3bba06deccb200 cnet-2.0.9.ebuild 1155
 MD5 f98943e0818d26b862556b4f23cecfc1 ChangeLog 1491
-MD5 b4e1d959ab12c9bb69e0db9f1d66205f metadata.xml 218
-MD5 5fa730e3f767e911187654f6f809257f files/digest-cnet-2.0.5 60
-MD5 1f8197488ef6fbb97976d664d345d1d0 files/digest-cnet-2.0.9 60
-MD5 86dbc35b31d6c43d3ecdfbef24ba7da7 files/cnet-2.0.9-gentoo.patch 1531
+MD5 750dc901eb7a5aa7c62ee4a7c7d16422 cnet-2.0.10.ebuild 1084
+MD5 5242584442a72f5ffd3bba06deccb200 cnet-2.0.9.ebuild 1155
+MD5 8a040b288c26f47b0d116462f5463591 files/cnet-2.0.10-gentoo.patch 3235
 MD5 652fb332fa98e02524b07ee1561c6182 files/cnet-2.0.5-gentoo.patch 1363
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB/jjbEZCkKN40op4RAvjjAKDBwqbOM2wqc8ak5vwvL/S4zjGBZwCgskE8
-SdZTDmRfoWMHlx1a25mV/zc=
-=97Bw
------END PGP SIGNATURE-----
+MD5 86dbc35b31d6c43d3ecdfbef24ba7da7 files/cnet-2.0.9-gentoo.patch 1531
+MD5 8753e1a6b6b3a032dfb413e320385b8c files/digest-cnet-2.0.10 61
+MD5 1f8197488ef6fbb97976d664d345d1d0 files/digest-cnet-2.0.9 60
+MD5 b4e1d959ab12c9bb69e0db9f1d66205f metadata.xml 218
diff --git a/net-analyzer/cnet/cnet-2.0.5.ebuild b/net-analyzer/cnet/cnet-2.0.10.ebuild
index 6c70f96e623a..4f5e5a2463fd 100644
--- a/net-analyzer/cnet/cnet-2.0.5.ebuild
+++ b/net-analyzer/cnet/cnet-2.0.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cnet/cnet-2.0.5.ebuild,v 1.7 2004/11/21 11:41:12 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cnet/cnet-2.0.10.ebuild,v 1.1 2006/04/21 01:00:59 vanquirius Exp $
 
 inherit eutils
 
@@ -10,32 +10,31 @@ HOMEPAGE="http://www.csse.uwa.edu.au/cnet"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+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"
+	dev-libs/elfutils"
 
 #RDEPEND=""
 
 # unpacking the source
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	epatch ${FILESDIR}/cnet-2.0.5-gentoo.patch
-	sed -i.orig -e "s/^CFLAGS.*/CFLAGS=${CFLAGS}/" ${S}/src/Makefile.linux
+	epatch "${FILESDIR}"/${PN}-2.0.10-gentoo.patch
+	sed -i.orig -e "s/^CFLAGS.*/CFLAGS=${CFLAGS}/" "${S}"/src/Makefile.linux
 }
 
 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
+	mkdir -p "${D}"/usr/{bin,lib,share}
+	mkdir -p "${D}"/usr/share/man/man1
 	# install with make now
-	emake PREFIX=${D}/usr install || die
+	make PREFIX="${D}"/usr install || die
 
 	#install examples
 	DOCDESTTREE=EXAMPLES
diff --git a/net-analyzer/cnet/files/cnet-2.0.10-gentoo.patch b/net-analyzer/cnet/files/cnet-2.0.10-gentoo.patch
new file mode 100644
index 000000000000..24c4a51a9731
--- /dev/null
+++ b/net-analyzer/cnet/files/cnet-2.0.10-gentoo.patch
@@ -0,0 +1,96 @@
+diff --exclude='*~' -Naur cnet-2.0.10.orig/Makefile cnet-2.0.10/Makefile
+--- cnet-2.0.10.orig/Makefile	2006-04-20 21:54:40.000000000 -0300
++++ cnet-2.0.10/Makefile	2006-04-20 21:54:54.000000000 -0300
+@@ -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
+ 
+ # ---------------------------------------------------------------------
+ 
+diff --exclude='*~' -Naur cnet-2.0.10.orig/Makefile.orig cnet-2.0.10/Makefile.orig
+--- cnet-2.0.10.orig/Makefile.orig	1969-12-31 21:00:00.000000000 -0300
++++ cnet-2.0.10/Makefile.orig	2006-03-06 16:03:14.000000000 -0300
+@@ -0,0 +1,46 @@
++NAME		= cnet
++VERSION		= 2.0.10
++SHELL		= /bin/sh
++#
++# Change the following 5 constants to suit your local site.
++#
++# It is presumed that BINDIR and MANDIR exist, so you may need
++# to create them, and set their permissions, if necessary.
++#
++PREFIX		= /usr/local
++#
++BINDIR		= $(PREFIX)/bin
++CNETDIR		= $(PREFIX)/cnetlib
++MANDIR		= $(PREFIX)/man/man1
++MANEXT		= 1
++MANFILE		= $(MANDIR)/$(NAME).$(MANEXT)
++WEBDIR		= /home/httpd/html/cnet
++
++# ---------------------------------------------------------------------
++
++it:
++	(cd src && make)
++
++install:
++	(cd src && make)
++	cp $(NAME) $(BINDIR)/$(NAME)  && chmod 755 $(BINDIR)/$(NAME)
++	mkdir -p $(CNETDIR)           && chmod 755 $(CNETDIR)
++	cp cnetlib/* $(CNETDIR)       && chmod 644 $(CNETDIR)/*
++	cp DOC/$(NAME).man $(MANFILE) && chmod 644 $(MANFILE)
++
++web:
++	mkdir -p $(WEBDIR)            && chmod 755 $(WEBDIR)
++	mkdir -p $(WEBDIR)/images     && chmod 755 $(WEBDIR)/images
++	cp DOC/*.* $(WEBDIR)
++	cp DOC/images/* $(WEBDIR)/images
++	chmod 644 $(WEBDIR)/*.* $(WEBDIR)/images/*
++
++# ---------------------------------------------------------------------
++
++clean:
++	(cd src && make clean)
++	(cd DOC		    && make clean)
++	(cd EXAMPLES	    && make clean)
++
++uninstall:
++	rm -rf $(BINDIR)/$(NAME) $(MANFILE) $(CNETDIR) $(WEBDIR)
+diff --exclude='*~' -Naur cnet-2.0.10.orig/src/config.h cnet-2.0.10/src/config.h
+--- cnet-2.0.10.orig/src/config.h	2006-04-20 21:54:40.000000000 -0300
++++ cnet-2.0.10/src/config.h	2006-04-20 21:54:55.000000000 -0300
+@@ -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 --exclude='*~' -Naur cnet-2.0.10.orig/src/Makefile.linux cnet-2.0.10/src/Makefile.linux
+--- cnet-2.0.10.orig/src/Makefile.linux	2006-04-20 21:54:40.000000000 -0300
++++ cnet-2.0.10/src/Makefile.linux	2006-04-20 21:54:55.000000000 -0300
+@@ -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)
diff --git a/net-analyzer/cnet/files/digest-cnet-2.0.10 b/net-analyzer/cnet/files/digest-cnet-2.0.10
new file mode 100644
index 000000000000..345e0228cb04
--- /dev/null
+++ b/net-analyzer/cnet/files/digest-cnet-2.0.10
@@ -0,0 +1 @@
+MD5 c1db7aad3b0379599b3ab0e9b61625d9 cnet-2.0.10.tgz 1158887
diff --git a/net-analyzer/cnet/files/digest-cnet-2.0.5 b/net-analyzer/cnet/files/digest-cnet-2.0.5
deleted file mode 100644
index 0315d4d804c3..000000000000
--- a/net-analyzer/cnet/files/digest-cnet-2.0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 851b6935691fe08e58de40434f782b51 cnet-2.0.5.tgz 1150005