EAPI bump. Clean up patches. Remove weird ewarn about vague distcc breakage. Use econf.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 26 insertions, 31 deletions

diff --git a/net-analyzer/nettop/ChangeLog b/net-analyzer/nettop/ChangeLog
index e33cb6c59a1f..f3ce5e7a502d 100644
--- a/net-analyzer/nettop/ChangeLog
+++ b/net-analyzer/nettop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/nettop
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nettop/ChangeLog,v 1.26 2012/07/29 23:36:15 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nettop/ChangeLog,v 1.27 2014/07/14 22:52:20 jer Exp $
+
+  14 Jul 2014; Jeroen Roovers <jer@gentoo.org> nettop-0.2.3-r2.ebuild,
+  files/nettop-0.2.3-gcc411.patch, files/nettop-0.2.3-offbyone.patch:
+  EAPI bump. Clean up patches. Remove weird ewarn about vague distcc breakage.
+  Use econf.
 
   29 Jul 2012; Jeroen Roovers <jer@gentoo.org> -nettop-0.2.3-r1.ebuild:
   Old.
diff --git a/net-analyzer/nettop/Manifest b/net-analyzer/nettop/Manifest
index 15181668dd8c..aa459c81c65c 100644
--- a/net-analyzer/nettop/Manifest
+++ b/net-analyzer/nettop/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX nettop-0.2.3-gcc411.patch 1093 SHA256 0f99b910fd27312b1e482845d05c190bb09928aad40f7173f160ca9ebd434299 SHA512 b285f21a83fdb3c935c961f84b26df2f3774ea3b4692fecb1d2a3acaf8625f1715ddebee2f4c631ca250fa529e9f55a8c392eb2f5cedd71fd3759578041feb26 WHIRLPOOL 2ecccb9256f355b33c30364db753f3e041b892966dcda5c800f0ad666ee8aef23868fbc3ab9d49a1de366703accf87dcd1a5a94c6c3e0b0ea37e498e64386693
-AUX nettop-0.2.3-offbyone.patch 777 SHA256 8b3767bce47ef8b7fb2d8eeae2a47e34a05d75037004f723d955da47861f4048 SHA512 25cc5340727fd2312e98b334d4c562cc9827aebb3060b73a7d4447b011fbd00f385899f750e5a56b59cce1d16c9287ba66343da07544bfdaeeeb00523d4a9538 WHIRLPOOL 26086047dc0b4b53e485fd10432e0c019fd3ddb31d267646f20b81a524c8e6f6431fd4b7ebc3f5ae85b66a7879530d9e9f3e09275d3180eafbe0eb33c1fee931
+AUX nettop-0.2.3-gcc411.patch 1020 SHA256 15a257422b81bc5d6f48fbb4362b79431e4f05f898ff2eb14a6fd25f339d72c1 SHA512 e661519449e707260645a6890206dbfb7ebed0134bc87bf58517b913257003b55ad9c2e44a2e96d8313efc5138b7a5a815b2437bfb56ce44ae5cbff50579f48e WHIRLPOOL 01a99bdb0c38a8b182f7c6a5630b26aa8a2c3d79e22d411836502ae943625e15e16b9bcefe4508ec633f788ff742470d8b09aceba1dc1331d3232e5a8e1cde0f
+AUX nettop-0.2.3-offbyone.patch 705 SHA256 c2a379e334ec178f2f5fab4c390911aee97f900e6a1c2582a6ed3b254624eaf0 SHA512 4c5c13dfb1eb96639c6e8fcd9236f4fd295424a856e1885a0fe1cce9bbad9fca7c77b291d5cada99aa23eda0ad02f2cc62d67220a410d3a42b8326efa92c648e WHIRLPOOL b544982186402fb7f878a1e70c2e788a77302802c432a91000e460770f092daeb2389e8c69fabd5809d9d20032991668304fc35d73eb6498fabba2097f94bf7f
 DIST nettop-0.2.3.tar.gz 22797 SHA256 4dbb2bdb506c4a5a49d67fbd7bcc860008a881abe55271cf3651316620143556 SHA512 96e0bff2b0c317636a303c5eb1e27b5ee862e94dad507ce756ef24e2cad7bbe2ebb5fcb46294b790c32b5fd6189381d1c1d0835a522a06b02522d093c15c6ece WHIRLPOOL 1deca1671dfe173a4fc95b0bb66359883d7fd510bb4abeba51e9341098cfb9094de6c88c768902f657e04e5ee9cb709bb3d96d64ce075621c82d2384efe02354
-EBUILD nettop-0.2.3-r2.ebuild 930 SHA256 063763adcb4a60ac45ac49cba5eb984fd90b23ca59295d52683e8fb052fc0aa7 SHA512 c94ddb9956f47bb62729dd313966f0bea189dd0589dbb70addaca6ca8d3afa84a7fed48b6c02a3387e4f6feb5b1f81a5950de48143bebc056a0cce89017c1b2c WHIRLPOOL 588f0957e975bb194eb5e2ddc15593f261e19b88ad52c7e021c113381c9dfb429db64a4b40f8790ffed4377da69d8169783775f09ec6b81b14fcc3ee185a4e9d
-MISC ChangeLog 3326 SHA256 5a73adccda220b0618c3ce7f7dcbc310283397467dd155e93cd2d6b67270c20b SHA512 2e79ce80dd1593a6369ea9988083aa3db890e1a1023874b8200d3e9cbba269a7688057eac604557b2daf73ca74cc8c14788fdf12eb179c2191d23507ec004080 WHIRLPOOL 98d18ecf7eb32dfc0750ba93e9d9d432caeba63b8e9b83d6e2294438bc642fa55474f3f22bc6a3c813c585bf27948cdaac94ba1ffd9f7874750befd8302bd86f
+EBUILD nettop-0.2.3-r2.ebuild 705 SHA256 c5163fa9bc494b88cc86ccb6aeb68fb63ff02d4332886c27324c79b16e58e44d SHA512 8486f50384190efb5284f2b0184e3030335f836a9ffcee8951415e7115333da2ebdafd6f970d9cbac6797a1e9348c55556af6169ac8d8dfac534f1edf339f4de WHIRLPOOL 40d060e3bc13b33ec98ae5970595cfe43c99895e7939b235041c6ac1b09b209183a3225237dc591e30de554aa2218a6d98d5b987c2e3b343f7e9007df9d5dd3f
+MISC ChangeLog 3560 SHA256 390208c8f26631e99437606abd4a9a4ea54453ab57d9700dfea3559e1397648d SHA512 947fcdc75a65f3ca3b749f1b70d2d737510163ac74a25363bf81207b24b6c08a73bca62cd1b950c52466c06b610c3b4bed41524e4390a1f02a8e7e36b5a23289 WHIRLPOOL 9b10da4fa4dd4709f27f88b94de3f39db121d9c6d2a42f9db926bbef1003abd6bcc85c461904dc38748e259270d82f639ed689194853f348436a702fc999f513
 MISC metadata.xml 232 SHA256 76dc0e7af177a747308be4f49e5c99ee80d9a667ba50f53e53093481209dc063 SHA512 c03c7a7c3803acb48c11951ec0bc85d0da0ec3eae27884e9ac60b4de1341682da291208e8ff769b1d9970a1c73c41cd053f5b9386313d647b42b6394c593b129 WHIRLPOOL 00a2850fdcb4aa1a4375cce1ac0353a60e674042cfe10a55e14aac2b6ce6470c1614fc8a06f335ef386bd1847120f5ad33723670c77965f10d037626edcf7351
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlAVyPUACgkQVWmRsqeSphPffwCeJDIg5d65EqJJO4+yWng35/Ld
-8SMAnRiYdpEVWO9p/ZMxFYUmPmeA+uE0
-=s37r
+iEYEAREIAAYFAlPEXyYACgkQVWmRsqeSphOfGgCdFHZl+sY9apjCipUxoQC64bew
+sGUAn0LX7rdp6BKGMA68JmdpZbMM9rnj
+=/dms
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nettop/files/nettop-0.2.3-gcc411.patch b/net-analyzer/nettop/files/nettop-0.2.3-gcc411.patch
index 227611c4ceb4..5e516eab0907 100644
--- a/net-analyzer/nettop/files/nettop-0.2.3-gcc411.patch
+++ b/net-analyzer/nettop/files/nettop-0.2.3-gcc411.patch
@@ -1,5 +1,5 @@
---- nettop.c.orig	2006-07-08 23:20:56.000000000 +1000
-+++ nettop.c	2006-07-08 23:25:09.000000000 +1000
+--- a/nettop.c
++++ b/nettop.c
 @@ -70,6 +70,7 @@
  #include <time.h>
  #include <stdlib.h>
diff --git a/net-analyzer/nettop/files/nettop-0.2.3-offbyone.patch b/net-analyzer/nettop/files/nettop-0.2.3-offbyone.patch
index 0903ebaa7e01..32ab3d64ad4c 100644
--- a/net-analyzer/nettop/files/nettop-0.2.3-offbyone.patch
+++ b/net-analyzer/nettop/files/nettop-0.2.3-offbyone.patch
@@ -1,5 +1,5 @@
---- nettop.c.old	2006-07-08 13:24:40.000000000 +0000
-+++ nettop.c	2006-07-08 14:03:42.000000000 +0000
+--- a/nettop.c
++++ b/nettop.c
 @@ -384,7 +385,7 @@
  void
  screen_update()
diff --git a/net-analyzer/nettop/nettop-0.2.3-r2.ebuild b/net-analyzer/nettop/nettop-0.2.3-r2.ebuild
index 9b7370a8c96a..7c766bf54c86 100644
--- a/net-analyzer/nettop/nettop-0.2.3-r2.ebuild
+++ b/net-analyzer/nettop/nettop-0.2.3-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nettop/nettop-0.2.3-r2.ebuild,v 1.5 2012/07/29 17:21:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nettop/nettop-0.2.3-r2.ebuild,v 1.6 2014/07/14 22:52:20 jer Exp $
 
-EAPI="3"
+EAPI=5
 
 inherit eutils toolchain-funcs
 
@@ -13,17 +13,13 @@ HOMEPAGE="http://srparish.net/software/"
 SLOT="0"
 LICENSE="BSD"
 KEYWORDS="amd64 ~arm ppc x86"
-IUSE=""
 
 DEPEND="
 	sys-libs/slang
-	net-libs/libpcap"
+	net-libs/libpcap
+"
 RDEPEND="${DEPEND}"
 
-pkg_setup() {
-	ewarn "This is known to break with distcc, see bug #169245 for details"
-}
-
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-gcc411.patch \
@@ -31,13 +27,7 @@ src_prepare() {
 	tc-export CC
 }
 
-src_configure() {
-	local myconf
-	myconf="--prefix=/usr"
-	./configure ${myconf} || die "configure failed"
-}
-
 src_install() {
-	dosbin nettop || die
-	dodoc ChangeLog README THANKS || die
+	dosbin nettop
+	dodoc ChangeLog README THANKS
 }