Fix file collisions of nmon and cmon (bug #364685). Fix quoting issues. Do not install COPYING.

(Portage version: 2.2.0_alpha80/cvs/Linux x86_64)

4 files changed, 54 insertions, 12 deletions

diff --git a/net-analyzer/nstats/ChangeLog b/net-analyzer/nstats/ChangeLog
index ac2209cd108a..5aee1620a228 100644
--- a/net-analyzer/nstats/ChangeLog
+++ b/net-analyzer/nstats/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/nstats
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nstats/ChangeLog,v 1.16 2007/09/06 17:46:03 jokey Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nstats/ChangeLog,v 1.17 2011/12/13 19:02:17 jer Exp $
+
+*nstats-0.4-r2 (13 Dec 2011)
+
+  13 Dec 2011; Jeroen Roovers <jer@gentoo.org> nstats-0.4-r1.ebuild,
+  +nstats-0.4-r2.ebuild, files/nstats-0.4-makefile.patch:
+  Fix file collisions of nmon and cmon (bug #364685). Fix quoting issues. Do
+  not install COPYING.
 
   06 Sep 2007; Markus Ullmann <jokey@gentoo.org> -nstats-0.4.ebuild:
   Cleanup
diff --git a/net-analyzer/nstats/files/nstats-0.4-makefile.patch b/net-analyzer/nstats/files/nstats-0.4-makefile.patch
index 31e034d1e012..23139966fae6 100644
--- a/net-analyzer/nstats/files/nstats-0.4-makefile.patch
+++ b/net-analyzer/nstats/files/nstats-0.4-makefile.patch
@@ -1,11 +1,17 @@
---- nstats-0.4.orig/Makefile	2005-04-17 13:53:43.000000000 -0300
-+++ nstats-0.4/Makefile	2005-04-17 13:53:24.000000000 -0300
+# rename *mon to *mon.nstats to avoid conflict with
+# net-analyzer/bmon, sys-cluster/ceph and sys-process/nmon
+# bug #364685
+
+--- a/nstats-0.4/Makefile
++++ b/nstats-0.4/Makefile
 @@ -53,7 +53,7 @@
  	mkdir -p $(DESTDIR)$(prefix)/bin/
  	mkdir -p $(DESTDIR)$(mandir)/man8/
  	install nstats $(DESTDIR)$(prefix)/bin/
 -	install bmon $(DESTDIR)$(prefix)/bin/
+-	install cmon $(DESTDIR)$(prefix)/bin/
+-	install nmon $(DESTDIR)$(prefix)/bin/
 +	install bmon $(DESTDIR)$(prefix)/bin/bmon.nstats
- 	install cmon $(DESTDIR)$(prefix)/bin/
- 	install nmon $(DESTDIR)$(prefix)/bin/
++	install cmon $(DESTDIR)$(prefix)/bin/cmon.nstats
++	install nmon $(DESTDIR)$(prefix)/bin/nmon.nstats
  	install man/nstats.8 $(DESTDIR)$(mandir)/man8/
diff --git a/net-analyzer/nstats/nstats-0.4-r1.ebuild b/net-analyzer/nstats/nstats-0.4-r1.ebuild
index 9ac1945d8068..d2ad12809deb 100644
--- a/net-analyzer/nstats/nstats-0.4-r1.ebuild
+++ b/net-analyzer/nstats/nstats-0.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nstats/nstats-0.4-r1.ebuild,v 1.2 2006/08/16 00:58:03 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nstats/nstats-0.4-r1.ebuild,v 1.3 2011/12/13 19:02:17 jer Exp $
 
 inherit eutils
 
@@ -18,13 +18,13 @@ DEPEND="net-libs/libpcap"
 src_unpack(){
 	unpack ${A}
 	#rename bmon to bmon.nstats to avoid conflict with net-analyzer/bmon
-	epatch ${FILESDIR}/${P}-makefile.patch
+	epatch "${FILESDIR}"/${P}-makefile.patch
 	if has_version '>=sys-libs/glibc-2.4' ; then
-		epatch ${FILESDIR}/${P}-glibc24.patch
+		epatch "${FILESDIR}"/${P}-glibc24.patch
 	fi
 }
 
 src_install () {
-	make DESTDIR=${D} install || die
-	dodoc BUGS COPYING doc/TODO doc/ChangeLog
+	make DESTDIR="${D}" install || die
+	dodoc BUGS doc/TODO doc/ChangeLog
 }
diff --git a/net-analyzer/nstats/nstats-0.4-r2.ebuild b/net-analyzer/nstats/nstats-0.4-r2.ebuild
new file mode 100644
index 000000000000..68ac1ccc3dd4
--- /dev/null
+++ b/net-analyzer/nstats/nstats-0.4-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nstats/nstats-0.4-r2.ebuild,v 1.1 2011/12/13 19:02:17 jer Exp $
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="Displays statistics about ethernet traffic including protocol breakdown"
+SRC_URI="http://trash.net/~reeler/nstats/files/${P}.tar.gz"
+HOMEPAGE="http://trash.net/~reeler/nstats/"
+
+SLOT="0"
+LICENSE="Artistic"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+DOCS=( BUGS doc/TODO doc/ChangeLog )
+
+src_prepare(){
+	epatch "${FILESDIR}"/${P}-makefile.patch
+
+	if has_version '>=sys-libs/glibc-2.4' ; then
+		epatch "${FILESDIR}"/${P}-glibc24.patch
+	fi
+}