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

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

diff --git a/net-analyzer/nstats/ChangeLog b/net-analyzer/nstats/ChangeLog
index ac2209cd108acb4b0c05cd712cd2565cca73b10c..5aee1620a2286ebc3bb713501ef2fb13cd01c98c 100644 (file)
--- 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/Manifest b/net-analyzer/nstats/Manifest
index 0356e5871677b7808fbb4be7c6c3098d7a0ae9d7..0b19e20c391fd689d874b821439a7f01802b86b2 100644 (file)
--- a/net-analyzer/nstats/Manifest
+++ b/net-analyzer/nstats/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX nstats-0.4-glibc24.patch 4942 RMD160 18aa09abdad5e3362e44d6996a052d4b6dfba04c SHA1 4b754f8f438df3a2e7097a8f4bfd04458b67750d SHA256 44cfd1b52bfec1170baaae542b91c85e2ce531e6b7c114365e4b635dfd141256
-AUX nstats-0.4-makefile.patch 478 RMD160 1dfe60fd1d279c41e739f9cc75109b6681780d6f SHA1 effdd4cdfac9dd691d4bdc79c0f229074a54c970 SHA256 9aa20d2b54bb9e5027c20d7c33003bb2ada0cdd9b029890f73608feb2b8599f7
+AUX nstats-0.4-makefile.patch 633 RMD160 b97e6329ebff15cf575af52217d3b70491126fc3 SHA1 f888c5caf5a13ff66840b3230255e4af936d309b SHA256 9266bf5c9dd1a4f0ad2fba757e055293eb01dc34631a6651d823793e31a41ea9
 DIST nstats-0.4.tar.gz 71526 RMD160 af5f7f5b3bc1be052d2b979d890f7b14d959d87b SHA1 3c3bfb878155c99dc3c54f096a106c84f6aa6885 SHA256 ab36626ca06e734800a31ec64f76bf1dc0d9e579f3542155a7ce89030f74aaf4
-EBUILD nstats-0.4-r1.ebuild 855 RMD160 bf6d814bdae82faa058a9b42f6cf04b586b08620 SHA1 895533a121d24bcca0d5de73c576c7903ac3569c SHA256 25fc73388ab1715857621082024554ef2f371d2aadbd790527194d5843f265c5
-MISC ChangeLog 1891 RMD160 5c56e80446e59a7f35a7fa399b48395bdc000b7b SHA1 be32c82ba458b3730c6fdf62224b1452e8e8499b SHA256 809e946dcec6c2d5198fc9a269874aa228b40aed612a6d6d81de2911c337b290
+EBUILD nstats-0.4-r1.ebuild 847 RMD160 65036f2b8457cf755ee7d80c2418607fabe981a6 SHA1 99b40676db345c4aee87222088b6846d15e51363 SHA256 143d79ad7724b4ebea46f4b170532901899ff145be6aaeb5ba5bbe143d851807
+EBUILD nstats-0.4-r2.ebuild 744 RMD160 b99afd434ebbe6c7e2d8ab3a54dc49140a2e1407 SHA1 ae87bf5548a24eed38beea242383ae09e1785bfc SHA256 73717fa1cc55b831810862b5838a31a6e40c8de827aa24cd8b74aa7e3795fb64
+MISC ChangeLog 2147 RMD160 6e7e49f5f7cd73c73c73e3fa7f56b692db4e8f28 SHA1 003b71bb513f49151b2ced55f6dcfda0147e221e SHA256 e740fd5804bb6df33ea62e0488049460f80d60d856fc75be3222dcfa540fa0ac
 MISC metadata.xml 266 RMD160 969673ed0966bf0d1e582411b1cb0785e816cc59 SHA1 003409dc9f914751f14624b5efbaf6bdc8db9b03 SHA256 730f6ab624d9d75e5188f993ab63c993c78f5afe268d50da67c525e4162bbe48
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk7noUAACgkQVWmRsqeSphOJlACeNEqi0hixwCTU4ufC3zmUQuef
+ihQAnAqzF98xKDP3jrcvOZvygQkcjREr
+=cdai
+-----END PGP SIGNATURE-----

diff --git a/net-analyzer/nstats/files/nstats-0.4-makefile.patch b/net-analyzer/nstats/files/nstats-0.4-makefile.patch
index 31e034d1e012a009d91bfda6694179ffb69741d3..23139966fae655fc006806d626747df03127d259 100644 (file)
--- 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 9ac1945d8068fe3b5930e9e0754ac3b0418e0c0a..d2ad12809deb35a5b3b282578edc7a5469d3f2e3 100644 (file)
--- 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 (file)
index 0000000..68ac1cc
--- /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
+}