EAPI bump. Convert sed scripts to patch. Fix an off-by-one in the ${P}-script-whitespace.patch.

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

5 files changed, 77 insertions, 15 deletions

diff --git a/net-analyzer/nbtscan/ChangeLog b/net-analyzer/nbtscan/ChangeLog
index 9d2a02c5953f..70950df93691 100644
--- a/net-analyzer/nbtscan/ChangeLog
+++ b/net-analyzer/nbtscan/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/nbtscan
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nbtscan/ChangeLog,v 1.31 2010/09/15 01:24:39 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nbtscan/ChangeLog,v 1.32 2014/07/14 12:37:45 jer Exp $
+
+*nbtscan-1.5.1-r3 (14 Jul 2014)
+
+  14 Jul 2014; Jeroen Roovers <jer@gentoo.org> +nbtscan-1.5.1-r3.ebuild,
+  +files/nbtscan-1.5.1-gentoo.patch,
+  files/nbtscan-1.5.1-script-whitespace.patch:
+  EAPI bump. Convert sed scripts to patch. Fix an off-by-one in the
+  ${P}-script-whitespace.patch.
 
   15 Sep 2010; Jeroen Roovers <jer@gentoo.org> nbtscan-1.5.1-r1.ebuild,
   nbtscan-1.5.1-r2.ebuild:
diff --git a/net-analyzer/nbtscan/Manifest b/net-analyzer/nbtscan/Manifest
index 394e5337684a..b93eea7094b3 100644
--- a/net-analyzer/nbtscan/Manifest
+++ b/net-analyzer/nbtscan/Manifest
@@ -1,7 +1,19 @@
-AUX nbtscan-1.5.1-includes-declarations.patch 954 RMD160 09bab83ff4c9c54dd9f4dbf2474d8832b319c4ef SHA1 a95f2174e0f2233a06de14466e2969761db5b757 SHA256 71628668cb76191302e0e1fb9b8c96532b6190bd135332a755683c0c6fab3181
-AUX nbtscan-1.5.1-script-whitespace.patch 4023 RMD160 4123c615835c25b431aa2194dcc7ddd274d7363a SHA1 fb1285ded3b2519fb14251d6ad6e0096e3123be9 SHA256 9c0ba92f422c97e6203b1806bc04e02ad4000e3a914d121557912e15a86d6317
-DIST nbtscan-1.5.1.tar.gz 82107 RMD160 5130d9e6decd3346859281f45f8a179aa0286a42 SHA1 4041d8f6b592fa310b8d3c79c56a2d3263dba82f SHA256 f9f95d5555356c8d467a576e69d9d348bf2a821ded9a85f895b5e6d21e2aa7eb
-EBUILD nbtscan-1.5.1-r1.ebuild 800 RMD160 a092d7534f849854218495d65944e4abc349d10f SHA1 63d0e51382914f4d501c8a1b19c8763f8e69c13d SHA256 87f0c07545430cb7947c658ad4687744603ee701388ab57940ad5397a438a4dd
-EBUILD nbtscan-1.5.1-r2.ebuild 980 RMD160 9327fe724d45d3334abad9cda227afe66eb4f8f6 SHA1 820d98076f75f9c749fa1ff7fe72b9ed5d2189ad SHA256 72b1b4b02cae00b604bdba7a47bfab2ce19b3efad9eada5d0ef2e5711249f8e2
-MISC ChangeLog 3936 RMD160 5e22f8072e0bb5183f1b1cba15c4610377ccd166 SHA1 2c34e7ba8e5f71738a2745435805b420e4967154 SHA256 1186f2ec35af9a193284246b806cf4873c9b7f674351885cf8ab4490786af34e
-MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX nbtscan-1.5.1-gentoo.patch 407 SHA256 e593b36df5c01d091633f31b665c7a47cfcb536bb86b01002f7395771e6f76f9 SHA512 3bdfb90ac71eb599ec2eb3a8f83c3ba7d821da8cff9b5692aa03047f8212a88a9730c6ef3f20eb9aa250500aed5b49d287859be1d5b3fd4542a1cdb90c796d9b WHIRLPOOL 6871d1cf94c8a579baab3292fe6558485f7d78d4de817e00d9c0d184b56cb685c625542edc114c68de54cff3903078722a0ec4da3e5aadfa5e4ed71d98a55a33
+AUX nbtscan-1.5.1-includes-declarations.patch 954 SHA256 71628668cb76191302e0e1fb9b8c96532b6190bd135332a755683c0c6fab3181 SHA512 793499744b91621462802a6c53c1ba3e53de0537549b1f48047b81f7b34aeb1d1fa4b6dbe3c99048139061b05c2b5db19d9bbd9cb4a74c735a756dfb52843cc3 WHIRLPOOL 74c7d68af93d197254d76c18a0532fef7119ded618177e13b94e59aa4b82207c46727a5adf3f77861b127865802155afee91ccf324928d5727b81ef6c7e65d4e
+AUX nbtscan-1.5.1-script-whitespace.patch 3784 SHA256 e2b0cfce5ec77b44012971fc9762290c9938a172451c861e5d26e5f12c1a1070 SHA512 38c7450809d876f347b17e3b60809ae408168766c2e8898f56495b33e158168e98b5d2f74208f2927af1dea68bf9956bde4bf3a0cbbceb21bae9dd8cee6ec3f6 WHIRLPOOL 368c0e360a1235693880ea9f535a1d6c851cee39cefaa4f666365f54fe83cccc1ad5c012a0f501c9c750d274daf964a73badbcc06ba506f524059e3bc7d08fd4
+DIST nbtscan-1.5.1.tar.gz 82107 SHA256 f9f95d5555356c8d467a576e69d9d348bf2a821ded9a85f895b5e6d21e2aa7eb SHA512 2e2ac6a3ce7b188552c4f5f82b1e2bb99049bd0cd6f69361c59066c0b262d9311186aabc0c03c3096b7d2c48276052b1ddf230eba43051e221019c9bf223ae3e WHIRLPOOL 21c41ed7f21bc60d1949b814eb3e38d45971c9eff67b2dfc6054b3b9f16310733252ae5e75a15b6c698a194dc5c4f4fab0fc754ffddbe36957662d6c109e1b1c
+EBUILD nbtscan-1.5.1-r1.ebuild 800 SHA256 87f0c07545430cb7947c658ad4687744603ee701388ab57940ad5397a438a4dd SHA512 848490b8e792ef0c86618fc9f53c0e0588030f71cbf86f1da4794bcfbf47bf71db6ad1909166a2751912400f8732d135bb05504a586fe3c50a1b052cd2cd00bc WHIRLPOOL b86adef4e446e3cdf79350cad8f45379b5f6cd03fe9a61c9d538b3585ca4c3e494b270f7f395a06967ff7251a7af3933490545709c480e137fc1aa4f00e640a5
+EBUILD nbtscan-1.5.1-r2.ebuild 980 SHA256 72b1b4b02cae00b604bdba7a47bfab2ce19b3efad9eada5d0ef2e5711249f8e2 SHA512 1191244414768ecd036552bc5b6926613eec3546470b0a2556ea30b815a53e0746072d5daf04c129bc29b84c1e1eb17fea4793b221ebec00165164b100bf449c WHIRLPOOL a155019e3505146dcc67aecd7de4a0a36af2912dd8fc0932fa4d732e0830d0e8e06a7dd9ef85ba1658eda52761316f0157ae66d4a81a3e6c8571db29f4798a58
+EBUILD nbtscan-1.5.1-r3.ebuild 862 SHA256 82284c72f1678f838b55457d48344cde1c15c4415bdc9897f8ce04ac9bb178ca SHA512 38a4515234c4b51a1e51026ec1239c32d6a8b30f26e1761b7fac74d1a0764ccae874908240ba2169f73eb7f08d986d7db5a3e1ccf8cf4b9017dc31f5ac45597f WHIRLPOOL 056ee9ce5458429daef85d8578dd708afc0b4d01c6cd9d96aa9e3a03c75ce71430a5a2e65596cd7091e8077d26d29bc5bc41cc5532d7a7bc313475dbd8f64a72
+MISC ChangeLog 4227 SHA256 077027484c5e0be4eb489cd464f872b79077d776ea279c06ff0e6cb4145e0c81 SHA512 8d35be6af01bde2f58553f1595b2b6cf1ba13e7753553d7032349edfae2f4aa9bba544e90205a18e2772aff5c03905262448a14557d547f137f342c29e0cefd7 WHIRLPOOL 7d85489c6136e42ab9e17fef12445d2ee98115beac277d16981d3f330054d3019bc1ad01c5d96f7db28c096762b689ea40da8fa9e0dd66b393b9657293175398
+MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlPDzxoACgkQVWmRsqeSphOu0wCfY5tqD3d/4qLIqY6a754H+ME5
+2AgAn0roFQQKYF6ByK5BuFqOcETiBum/
+=sMVF
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/nbtscan/files/nbtscan-1.5.1-gentoo.patch b/net-analyzer/nbtscan/files/nbtscan-1.5.1-gentoo.patch
new file mode 100644
index 000000000000..dbf2457bc29f
--- /dev/null
+++ b/net-analyzer/nbtscan/files/nbtscan-1.5.1-gentoo.patch
@@ -0,0 +1,15 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -11,10 +11,10 @@
+ BINDIR      = @bindir@
+ 
+ nbtscan: $(OBJECTS)
+-	$(CC) $(CFLAGS) -o nbtscan $(OBJECTS) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o nbtscan $(OBJECTS) $(LIBS)
+ 
+ install:
+-	$(INSTALL) $(TARGET) $(BINDIR)/$(TARGET)
++	$(INSTALL) $(TARGET) $(DESTDIR)/$(BINDIR)/$(TARGET)
+ 
+ nbtscan.o: nbtscan.c statusq.h range.h list.h
+ 	$(CC) $(CFLAGS) $(DEFS) -c nbtscan.c
diff --git a/net-analyzer/nbtscan/files/nbtscan-1.5.1-script-whitespace.patch b/net-analyzer/nbtscan/files/nbtscan-1.5.1-script-whitespace.patch
index 51c823882576..4aca976dcd38 100644
--- a/net-analyzer/nbtscan/files/nbtscan-1.5.1-script-whitespace.patch
+++ b/net-analyzer/nbtscan/files/nbtscan-1.5.1-script-whitespace.patch
@@ -1,8 +1,5 @@
-Only in nbtscan-1.5.1a: config.log
-Only in nbtscan-1.5.1a: config.status
-diff -u nbtscan-1.5.1a/nbtscan.c nbtscan-1.5.1a-work/nbtscan.c
---- nbtscan-1.5.1a/nbtscan.c	2003-06-06 08:14:00.000000000 -0400
-+++ nbtscan-1.5.1a-work/nbtscan.c	2003-06-30 13:20:22.000000000 -0400
+--- a/nbtscan.c
++++ b/nbtscan.c
 @@ -86,7 +86,7 @@
  int d_print_hostinfo(struct in_addr addr, const struct nb_host_info* hostinfo) {
    int i;
@@ -20,7 +17,7 @@ diff -u nbtscan-1.5.1a/nbtscan.c nbtscan-1.5.1a-work/nbtscan.c
 -      name[16]=0; 
 -      printf("%-17s Service: 0x%02x Flags: 0x%04x\n", name, service, hostinfo->names[i].rr_flags);
 +      strncpy(comp_name, hostinfo->names[i].ascii_name, 15);
-+      comp_name[16]=0; 
++      comp_name[15]=0; 
 +      printf("%-17s Service: 0x%02x Flags: 0x%04x\n", comp_name, service, hostinfo->names[i].rr_flags);
      }
    };
diff --git a/net-analyzer/nbtscan/nbtscan-1.5.1-r3.ebuild b/net-analyzer/nbtscan/nbtscan-1.5.1-r3.ebuild
new file mode 100644
index 000000000000..08c1025909e9
--- /dev/null
+++ b/net-analyzer/nbtscan/nbtscan-1.5.1-r3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nbtscan/nbtscan-1.5.1-r3.ebuild,v 1.1 2014/07/14 12:37:44 jer Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="NBTscan is a program for scanning IP networks for NetBIOS name information"
+HOMEPAGE="http://www.inetcat.net/software/nbtscan.html"
+SRC_URI="http://www.sourcefiles.org/Networking/Tools/Miscellanenous/${P}.tar.gz"
+SRC_URI="http://www.inetcat.net/software/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+S=${WORKDIR}/${P}a
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-includes-declarations.patch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-script-whitespace.patch
+}
+
+src_install () {
+	dobin ${PN}
+	dodoc ChangeLog README
+}