Clean up.

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

3 files changed, 43 insertions, 28 deletions

diff --git a/net-analyzer/nsat/ChangeLog b/net-analyzer/nsat/ChangeLog
index b60ed72c3e94..23d4954810e9 100644
--- a/net-analyzer/nsat/ChangeLog
+++ b/net-analyzer/nsat/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/nsat
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsat/ChangeLog,v 1.21 2012/10/06 19:00:44 pinkbyte Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsat/ChangeLog,v 1.22 2014/06/09 03:18:36 jer Exp $
+
+  09 Jun 2014; Jeroen Roovers <jer@gentoo.org> nsat-1.5-r1.ebuild:
+  Clean up.
 
   06 Oct 2012; Sergey Popov <pinkbyte@gentoo.org> nsat-1.5-r1.ebuild:
   Respect LDFLAGS wrt bug #335951
diff --git a/net-analyzer/nsat/Manifest b/net-analyzer/nsat/Manifest
index 52721412f5d9..48dae5891dac 100644
--- a/net-analyzer/nsat/Manifest
+++ b/net-analyzer/nsat/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX nsat-1.5-amd64-compat.patch 1306 SHA256 d65998dd9f46c80ab4c6a8ec7a2600285407e5281987d857c777ddd19639b2a7 SHA512 fa4780ada0cc941d9a51c81aeb44b24e5bba98a8bd338202cbfe72a002a2dee049cf473da3b7901d10304ca9985ca258d669ff8396b25f2e82d521229ff5c69d WHIRLPOOL b60845ad539d4560bee5cb0ff6cc5b1280fab5073318892ec82330d4193bc798daf1bbf93bc9ecdfd9d50e42212ae905bd4e56bc3d86f170264c696b824861b9
 AUX nsat-1.5-configure.patch 824 SHA256 9bd4ba910c49c41fe40e9ccb91a07f43ef3f49064ee3a1778c46b7c1f4d4c4cd SHA512 a8c75771d77e1478fef150bc5cfd343b96d21f3731935deb755498f4b587d8c0b4def1a596c605e4cf0dd214c3e6226ab957bfd3ce693403877e2c652a4f44be WHIRLPOOL 312957cc0b6885fe2484f5bc00b44444fa6701ed4385c96bdfd7875fc9952bb3153a427eb9e1f9918c2ee8fdf24f89ffc7561106b70921437bc1421f460f1ef8
 AUX nsat-1.5-lvalue-gcc4.patch 516 SHA256 0fa797a68bacc8d47790236b103d59fe58a0ef7f752d708f5980b7283c9b6f8a SHA512 4e509d4e51164d7650c1c380c40f372fb878442e0735ea1b1113854fd0978ae5b3d34264a05f06cdb833282bfde16590e88ac9889cab698c59b8f9bce6589a25 WHIRLPOOL 162f46228ddd465d7fd777952433a1a2bbe87b3992df2d30e72e9f6de16c6cdff41ed6665846c0fc10f16390b4f96eed44b17ea1cdf936478e4b17ef39f2839d
 AUX nsat-1.5-strip.patch 288 SHA256 1e476a63a8d07bd0a4fad8f0cb9e0ddf5f8e09e1fbcf90bf27454149e5cface0 SHA512 dbf7dc7c2a021a1966685d05e834867887842b8092e27440fe7f5dfd56d2e1de3f661b3ffabc1d7196264c26135e6e9f8ccac1028baf6a62054c89975739f768 WHIRLPOOL 05201dcabd933e6067c65a0feb684279450dd2e7d1b3c6a50ef23d77b3190e7f8a9c788d23023915d7a81416ac6ee63b998170d2b3c682979d2cf31f928e46bd
 DIST nsat-1.5.tgz 410603 SHA256 2ece807b3240a6e91ea88fd84c470a87de711c33554b231e071549388cb65114 SHA512 1a5b8e88f7bcacdbe1144a719a2e446c0ea025ad4e5f8c79ccb939083308cd2c1b2c1f3d7ab3b791924d5855994cbc3fded95aa36df23c12fd76fc20341a87d0 WHIRLPOOL 52cd94b75668bb3b7342090ec1ec9949b1e9324aabff4a0b03b251c0933829cd63eeb53877c463b282806896099ccbacaa01c390ef61c4b24e8c6d8e356fb5ff
-EBUILD nsat-1.5-r1.ebuild 1954 SHA256 f43537e00ed9122262384a37e4a323c0782a9c360133f51dd927a71991fcb410 SHA512 513f29e1671892af49cffc274158dbd7c35b1d3ae9c765dd0252a40f8d389e575b7413d7615b05c328eab34df3659284081e7bb95905f6d2c3adf4c47c4663df WHIRLPOOL 0aa4543e0a355cf13ea789526d5d661b17300bc0bc04edd47b3f43ee83ed59b1d64c8dab9292248fb791926eee0397574f7a6a2cc100011e79db36dfbb70fcee
+EBUILD nsat-1.5-r1.ebuild 1705 SHA256 5406361f1a73d2d6eda02e05a5a7d2f129ae8b1b2a456a65745edd0896f4bbec SHA512 8af6d825b71b1d9cf6846f315c6f808141a92f081e0a3334adf1fd301583f4194d84a76aca754e3d491585a38dd06b738b05877652c9ff2a4bffb03f8913134f WHIRLPOOL 389caf7ec15285bb4276e3d659b04e23a00d67ce914f586b71c16dcf64c4187192da7b5feeff35536dd578f87f03d1e958ba5a6ba52cf25724c78fca87c32bf6
 EBUILD nsat-1.5.ebuild 1471 SHA256 2fc2a22b69866f233cec5002a2c69b27773164348c9fe88094b2d49f56870fc7 SHA512 5317dd199ad86bf9ec4966627522793a18a9072fdc2f30945c3d257b4ddd37f39b22ec5d1878f2545fc5f3d2f8f6b5409f3648530c69b7725a570532d884209a WHIRLPOOL d2045786bc1b222cb76404d446f3b5ad49ef883aaf8d8979f107f7a5f0ad20bb89c2d5b0a5b070e1b376909619300e49d30eff618b41a6d9e4982435e3dfa45c
-MISC ChangeLog 2803 SHA256 98dce5c54150f9c0ee432d6d03b674c3fb3e8c3c7343b2e0fdc3c898d31ec653 SHA512 d7ac20e6424796d4161f655e7aafa036610e8e7b0f6b8378c0e090ecc721cf0b89f3b77113d037237628d4bd3a7fb1808f16d7a3521386d81027195f8dd7bf16 WHIRLPOOL a3331b28a0ae6bdef568f99184391030130ffb4c5eaadac4d28fb9adf0957792ff5f1ac2c10b5870c2277e5b75e198270f5026e542722f53aa7baaaa6d0cc856
+MISC ChangeLog 2878 SHA256 3ed87d873eb4f8cde96c1f7adb1d6570f6e35e67674c4b110115ae77bff31022 SHA512 2fbec212b490ce4ac795547255d2f6b699ec01f89318a3da258c84ceb514741cb2e8c2228a8835bd0bb80cb3cf2a4a0b12c2ff72bf49af16d9fade9ad734b32d WHIRLPOOL 28486b465be2dcc47b3fe710197c353bea77e5f49dac75a44ce9e797bc61d98c9847944ad94e12c7a91b4fd961af81219181534d2073f64cbf6535501e730671
 MISC metadata.xml 272 SHA256 d01676e6efa217e197952e025cc5b2d4b381fb307786977966a4509b002fe461 SHA512 e5247d2d8835a1891300e530d2bbd87342e49937b8e18d39be9453dc2df84ddea44aa4868d0a9a36b3ed38d7f2af90296a9749343caa0ba2c2bc269af307b12a WHIRLPOOL 50d4e2d731f39255036c4b2222fd47c4bce512d65b965c4584e57f78149d954c7df883a96862e438c6c7d20b99a2125691c50485403c68cd3e258fb30693dd38
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iEYEAREIAAYFAlOVJ44ACgkQVWmRsqeSphMh6gCfeKzuqKXwOfvQAMjnPMVXVs8a
+EwAAn3/OKjJhB7gGypuYRGi73PIM72cF
+=0e4s
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/nsat/nsat-1.5-r1.ebuild b/net-analyzer/nsat/nsat-1.5-r1.ebuild
index 34e57469b89a..dbc405307fff 100644
--- a/net-analyzer/nsat/nsat-1.5-r1.ebuild
+++ b/net-analyzer/nsat/nsat-1.5-r1.ebuild
@@ -1,9 +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/nsat/nsat-1.5-r1.ebuild,v 1.4 2012/10/06 19:00:44 pinkbyte Exp $
-
-EAPI=2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsat/nsat-1.5-r1.ebuild,v 1.5 2014/06/09 03:18:36 jer Exp $
 
+EAPI=5
 inherit eutils autotools
 
 DESCRIPTION="Network Security Analysis Tool, an application-level network security scanner"
@@ -15,11 +14,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="X"
 
-RDEPEND="X? ( x11-libs/libX11
-		dev-lang/tk )
-	net-libs/libpcap"
-
-DEPEND="$RDEPEND >=sys-devel/autoconf-2.58"
+RDEPEND="
+	X? (
+		x11-libs/libX11
+		dev-lang/tk
+	)
+	net-libs/libpcap
+"
+DEPEND="$RDEPEND"
 
 S="${WORKDIR}/${PN}"
 
@@ -32,28 +34,28 @@ src_prepare() {
 	use amd64 && epatch "${FILESDIR}"/${P}-amd64-compat.patch
 
 	# Respect LDFLAGS
-	sed -i -e '/..\/nsat/,+1s/${CFLAGS}/${CFLAGS} ${LDFLAGS}/' \
-		src/Makefile.in  || die 'first sed for respecting LDFLAGS failed'
-	sed -i -e '/@$(CC)/s/$(CFLAGS)/$(CFLAGS) $(LDFLAGS)/' \
-		src/smb/Makefile.in || die 'second sed for respecting LDFLAGS failed'
-
-	sed -i "s:^#CGIFile /usr/local/share/nsat/nsat.cgi$:#CGIFile /usr/share/nsat/nsat.cgi:g" \
+	sed -i \
+		-e '/..\/nsat/,+1s/${CFLAGS}/${CFLAGS} ${LDFLAGS}/' \
+		src/Makefile.in  || die
+	sed -i \
+		-e '/@$(CC)/s/$(CFLAGS)/$(CFLAGS) $(LDFLAGS)/' \
+		src/smb/Makefile.in || die
+
+	sed -i \
+		-e "s:^#CGIFile /usr/local/share/nsat/nsat.cgi$:#CGIFile /usr/share/nsat/nsat.cgi:g" \
 		nsat.conf || die "sed on nsat.conf failed"
-	sed -i "s:/usr/local:/usr:g" Makefile.in || die "sed on Makefile.in failed"
-	sed -i "s:/usr/local:/usr:g" tools/xnsat || die "sed on tools/xnsat failed"
-	sed -i -e "s:/usr/local/share/nsat/nsat.conf:/etc/nsat/nsat.conf:g" \
+	sed -i -e "s:/usr/local:/usr:g" Makefile.in || die
+	sed -i -e "s:/usr/local:/usr:g" tools/xnsat || die
+	sed -i \
+		-e "s:/usr/local/share/nsat/nsat.conf:/etc/nsat/nsat.conf:g" \
 		-e "s:/usr/local/share/nsat/nsat.cgi:/usr/share/nsat/nsat.cgi:g" \
-		src/lang.h || die "sed on src/lang.h failed"
+		src/lang.h || die
 
 	eautoreconf
 }
 
 src_configure() {
-	econf $(use_with X x) || die "configuration failed"
-}
-
-src_compile() {
-	make|| die "compile problem"
+	econf $(use_with X x)
 }
 
 src_install () {