Address QA complaints. Clean up patches.

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

5 files changed, 24 insertions, 24 deletions

diff --git a/net-analyzer/egressor/ChangeLog b/net-analyzer/egressor/ChangeLog
index 218d6a242e62..c816e1d5a3e7 100644
--- a/net-analyzer/egressor/ChangeLog
+++ b/net-analyzer/egressor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/egressor
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/egressor/ChangeLog,v 1.18 2014/12/29 07:28:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/egressor/ChangeLog,v 1.19 2014/12/29 07:33:39 jer Exp $
+
+  29 Dec 2014; Jeroen Roovers <jer@gentoo.org> egressor-1.0-r2.ebuild,
+  files/1.0-flags.patch, files/1.0-libnet-1.0.patch:
+  Address QA complaints. Clean up patches.
 
   29 Dec 2014; Jeroen Roovers <jer@gentoo.org> -egressor-1.0-r1.ebuild:
   Old.
diff --git a/net-analyzer/egressor/Manifest b/net-analyzer/egressor/Manifest
index 59920653ddf7..0de70bf369f3 100644
--- a/net-analyzer/egressor/Manifest
+++ b/net-analyzer/egressor/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 1.0-flags.patch 697 SHA256 61d7c8972e584718a6f926b70935189eed8cb0575773fac7d59587ac19f8f61b SHA512 4a03fa5cf87073e8dad7fd078bd0ee73310164fba05db6382e2914d8c25d640191b1ac26ab161566684986325770db542caef71039d983d1a3a891304880c0fa WHIRLPOOL 10e2bafb886fbf4ab4be722373fc11b95e8cab84281a3b67b6c16d498e0bcdf107cf090de85e62b2cee15b2db15cf8389f0d34169204aa3306c5c411e692cae8
-AUX 1.0-libnet-1.0.patch 396 SHA256 1684cfce2e593616ee19b90b718f9ba057cf0aab1b9c7fbd04ce811b74e74b6d SHA512 d4332b774e55ef3a84b8796cacedc3041bcfa1d3f9705a940c6fa034ee204f3476f3763d2d08e35f1ed878d89cea80a3eaab9c19fc6f5e185260a599b1d0c7bf WHIRLPOOL ed0f8a83dc0752bbd15330c0b50e1c79ea4c304acc6a9bc885dc32c003a5883b9552e5f81a19c0fedf1c0103457478ee6265d19f7c4e7b842cb7f60e5c5a5ec7
+AUX 1.0-flags.patch 578 SHA256 6e59c00d844e8516ff6a78e05ed83baa93af7b72796a23e5f4f1e985ba9c77a7 SHA512 aecc7970d9a9e877adf750e29813ad6a685370dc9ea72f34b86a5ddbafcf616db0636b4173e4ba445ac9c3d6a21e2aae26cce1889ba901ac9dea6af79243657a WHIRLPOOL 614866709ccd5aed8f80a5f013e25c4c3bd6fa6c9e4382e92abb1dd061e1ef238fa3f57e2474b59e4f14d6cc2bce7603274d98a3964f011646b96f48654a5bed
+AUX 1.0-libnet-1.0.patch 250 SHA256 ea009e63b6d418d16d172118f0d7fd12f6513c66077bb799527110749151d36b SHA512 eff978e5c4a9a99073b1280aa5369ecbb6100364332cb810bacb3bc4ddd316638ff6a8968923b51e4f72a79ddd994646d03000b3fa3f576ad8d898eea493e089 WHIRLPOOL 90e2fd7e3b0d65e5b44c5f454e08116e91787df6ff6afe3b1fa9904d551de62deaeb3b504a7752c1134e26066d124507fc641f6ecbc2fc998cb90d389474bfc2
 DIST egressor_release1.0.tar.gz 28746 SHA256 3608ae0d76f76513318ce57fe986936ec890650cb311762b374f463ffd898fba SHA512 dfb1ee553ccfb92429fe68df06db031e5cbca41fe4fda36961ba8121d79de03a7dc36febc5a58561c3de9b1412cc90811f5ddc8b156aab8282b0dc3c14cd7aec WHIRLPOOL e2307f897e6b0c0f813577f6c367285b61ee8204acc51db4bccf3f4133bdc0044c27e6b3057cdc9d7f93d271c22d0251e3fdd1dd780d9811c344dbde75320fe6
-EBUILD egressor-1.0-r2.ebuild 910 SHA256 e62a5b465bb03795e438a19e6e0e7c61546280581b810d0e9a21368675de6cae SHA512 c2d58cf373125e95b4096386dec8ab287eaec9e66730a15fbc5b1fb32f176712474c6777ecd06f949ec45ded7506565b938dd3019b941a768d838cffdc65db32 WHIRLPOOL 1dee3f3308100ab341dcc868341abb4dfb3a7a5680676a37e67832b77cea0a157a79e7bf47c5902056caf561f20ece851663621ce0775da705c8ef49306c28e0
-MISC ChangeLog 2217 SHA256 8384a8989b23b27d2c65bb017b6fabef6bd645ac54403cacc8ce0523b597937d SHA512 a1d41994d3a470aeb463e06e68d9b98ac7a7a49c4f0f45586c0910e42131b1a061dbc02013e89aa4be027c6ef6adba1e8d44ca378c0fe972780db8f064b1f105 WHIRLPOOL ac8d8636cc20dd54862d99447b2a9d66f6302b939069c1c76286ae505776dedbb7fa8d0c8a4c5d683b991b0298c634f19119e0fe5384cc50d58b825b9b93e4fe
+EBUILD egressor-1.0-r2.ebuild 895 SHA256 89dd8292eb5f274327b3f764604d371abf841f0dbc239acabb387308b06fc187 SHA512 44ae31e94189d380c1fb3c4cfd2ac711b04b46be8b67bb4871e8519c4e163579a37222749378fba765d02b10e5e98d20674d2cb58633e2afd90568d02fbcf798 WHIRLPOOL 69240ba8a4d0bd6cb625ef879be7a4e72ada6a220f76c3f973f252be365123d71b326b6616930df6df4d209968ecb90504d1bd64c226cba4f16b769cdef92bd1
+MISC ChangeLog 2385 SHA256 c7a378b69fc0a39a4f492cef900541469ec32ea38f0e75f2f4caf4d2d6e8b22f SHA512 c9744a66f1439873380f8a84008a9bcf86caf5041617bd2fc11357b2ec9fe517278acb2a4b29a0688e82513545c20a0cf1ec85ebc89bb5c2d8eaec77f97cd361 WHIRLPOOL b651b751ebb65356b08f7f5dec18ad281fa8bfb9cb2f6a32ee0f9995e38cdfa310d3ce2fd31ff34b5bc019053f8ace6c32b40b6a88ea51381cb9fb2cae847d88
 MISC metadata.xml 233 SHA256 be1005eebb90c718afecf326087424d26cd6f6f74fce48c9ea0b354cac1fb92d SHA512 e7ee7b3ce8009922a5d2b99ef55f7d12e6d77f1d70a196c14ec9e64072bdcb85771cc7d3b2372080b203e073218091b544eb36415ac2387f44a3b1210a4623da WHIRLPOOL 88e42c34723711610bcf36e12581d4467a45283ada97a947e30eb78ee10382d17d7a239e2914edba98574b224b29afbac72abc7099d72570d67dc0c83842e294
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlShArAACgkQVWmRsqeSphO4nwCaAke0medcvkEtR0RlQpp2xJbu
-nmgAn3pnCQarZ3z/dpfscl9M1WWgg+Fn
-=iCB4
+iEYEAREIAAYFAlShA9UACgkQVWmRsqeSphMnKACeIuhE0PLU6anSI4IMFwwfziaT
+4EYAniMYRGOoJgPl0likQifJ6Zt3NKYe
+=Jn+P
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/egressor/egressor-1.0-r2.ebuild b/net-analyzer/egressor/egressor-1.0-r2.ebuild
index a67608b5af2f..fdcd30d09bea 100644
--- a/net-analyzer/egressor/egressor-1.0-r2.ebuild
+++ b/net-analyzer/egressor/egressor-1.0-r2.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2013 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/egressor/egressor-1.0-r2.ebuild,v 1.5 2013/04/23 08:40:09 ago Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/egressor/egressor-1.0-r2.ebuild,v 1.6 2014/12/29 07:33:39 jer Exp $
 
+EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="tool for checking router configuration"
@@ -12,7 +11,6 @@ SRC_URI="${HOMEPAGE}${PN}_release${PV}.tar.gz"
 
 LICENSE="egressor"
 SLOT="0"
-IUSE=""
 KEYWORDS="amd64 ppc x86"
 
 DEPEND="<net-libs/libnet-1.1
@@ -25,14 +23,13 @@ S=${WORKDIR}
 
 src_prepare() {
 	epatch \
-		${FILESDIR}/${PV}-libnet-1.0.patch \
-		${FILESDIR}/${PV}-flags.patch
+		"${FILESDIR}"/${PV}-libnet-1.0.patch \
+		"${FILESDIR}"/${PV}-flags.patch
 }
 
 src_compile() {
 	tc-export CC
-	cd client
-	emake || die
+	emake -C client
 }
 
 src_install() {
diff --git a/net-analyzer/egressor/files/1.0-flags.patch b/net-analyzer/egressor/files/1.0-flags.patch
index 2de1c04094be..03368b05dbaa 100644
--- a/net-analyzer/egressor/files/1.0-flags.patch
+++ b/net-analyzer/egressor/files/1.0-flags.patch
@@ -1,6 +1,5 @@
-diff -Naur a/client/Makefile b/client/Makefile
---- a/client/Makefile	2010-09-15 03:38:45.000000000 +0200
-+++ b/client/Makefile	2010-09-15 03:43:57.000000000 +0200
+--- a/client/Makefile
++++ b/client/Makefile
 @@ -5,8 +5,8 @@
  #----------------------------------------------------------------------
  
diff --git a/net-analyzer/egressor/files/1.0-libnet-1.0.patch b/net-analyzer/egressor/files/1.0-libnet-1.0.patch
index f70ab965acce..be7cb4f15c6f 100644
--- a/net-analyzer/egressor/files/1.0-libnet-1.0.patch
+++ b/net-analyzer/egressor/files/1.0-libnet-1.0.patch
@@ -1,10 +1,10 @@
---- client/Makefile.orig	2003-08-19 01:20:45.295721728 -0400
-+++ client/Makefile	2003-08-19 01:20:45.303720512 -0400
+--- a/client/Makefile
++++ b/client/Makefile
 @@ -15 +15 @@
 -LIBS        =   -L../../lib/ -lnet 
 +LIBS        =   -L../../lib/ -lnet-1.0 
---- client/libnet_test.h.orig	2003-08-19 01:20:45.299721120 -0400
-+++ client/libnet_test.h	2003-08-19 01:20:45.307719904 -0400
+--- a/client/libnet_test.h
++++ b/client/libnet_test.h
 @@ -36 +36 @@
 -#include <libnet.h>
 +#include <libnet-1.0.h>