Readd removed include by James Taylor (bug #540032).

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

4 files changed, 61 insertions, 10 deletions

diff --git a/net-analyzer/netselect/ChangeLog b/net-analyzer/netselect/ChangeLog
index aeaef4432b69..9f63e3b43815 100644
--- a/net-analyzer/netselect/ChangeLog
+++ b/net-analyzer/netselect/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/netselect
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netselect/ChangeLog,v 1.58 2015/01/05 08:13:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netselect/ChangeLog,v 1.59 2015/02/14 07:46:06 jer Exp $
+
+*netselect-0.3-r4 (14 Feb 2015)
+
+  14 Feb 2015; Jeroen Roovers <jer@gentoo.org> +netselect-0.3-r4.ebuild,
+  files/netselect-0.3-bsd.patch:
+  Readd removed include by James Taylor (bug #540032).
 
   05 Jan 2015; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Remove short <longdescription>.
diff --git a/net-analyzer/netselect/Manifest b/net-analyzer/netselect/Manifest
index 9dc6608067f6..ed28a7d465de 100644
--- a/net-analyzer/netselect/Manifest
+++ b/net-analyzer/netselect/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX netselect-0.3-bsd.patch 1597 SHA256 7c4324e54c2674cc61a3d407474d413a7550dfc0652f6b7e3bc9f18832620dc1 SHA512 5a8c923396534c78bd68d8911936fb9d5996f76818b2c2d61c4aba06307b9a68410f3d5a81b152a5da55eedfb84c209edd1e0e7c6fc64659ff420431b75406db WHIRLPOOL 1163348cf1d3d26058b6528da2f8af1eb2717738a3dd901ff941047f2f1400397cf7e6e377681d7118dd67efc78bf1cd53fa11bbd664dce110fde58cc28bb86c
+AUX netselect-0.3-bsd.patch 1621 SHA256 fe4b2217f2a3acbf8208f6bdd4092cf6157ad3341f161dffcc399c058582b9c3 SHA512 723be6cae82060d862bfd5afac674c701cc6c3b37fc74b7e020e347a584b31cfad1c7e1c87fe84ccf16384996ebb46da3b9b7bcfd7aa8dd323009f73b5edb966 WHIRLPOOL b1418f59b85b1ffb7f53ea4cbe320b5521181dc44c9d1e3f7db1cf231b7f5615d6b2741a98896ecd3ad6e85aad4b6067ce646c46e3b22237fb9c489b299173fa
 AUX netselect-0.3-glibc.patch 264 SHA256 df8cdd028e4382a1ce3792ea18ac60db439c61b2d763c0a37777d1cb57d7ed62 SHA512 bcccfdb458b27903e204043c3ce5faeb0024c0f7e3c0dc4c6eff69b7168544adfe8802625daca50a0c5304e26cc2f252279aeec2013460f2a0bc6892c0df88ad WHIRLPOOL c4c9a7e34bbda34d70c541783b78493dbb736c4fe2c150d161f87619d6dfc1a4e2148a7ae325393ae498f8c75ef8322c2acb7299b4595f7d6f8e2897440daa9d
 DIST netselect-0.3.tar.gz 22047 SHA256 fe81942589d5219d030e5cecfb12787fb6d3613416cb326dea4952bf53f9c978 SHA512 04a4b79c357a0110dcf377ad04ac729ed7854bec4b064ad16da632367ce1870379546fffc8396ea770bfa580618d7c0495c16b0ba30f736419511b890ce5dca5 WHIRLPOOL 2e49cb22b12c88a1d9f42da19b42284ae98d391739bf7bd1e134661b8780ef733b26f5f4be4ed61dce3a4a9922a6a10d9040698fa3f4910ceacc54df4a42afcc
 EBUILD netselect-0.3-r3.ebuild 1098 SHA256 e7a5c49fb30cc02de9bbf2eb6d50eefbb086fad0cc10ba6beb876318d94a7e2e SHA512 5c9f52303446443fe24d5553c03b5891171170e75c8460d3182c9404c43acfc96a9fa1370de69bd35fbe3017f6dcea953f1c9fa95c1f58fec030cb8756785ce4 WHIRLPOOL 0bb53debf81465d56a8b80ad2c6abf761d98f73ac343ab685832dc0c49326705eea39f01531586f157ba37c657233c4acdcb6bf559af19356e66571885970ec7
+EBUILD netselect-0.3-r4.ebuild 1105 SHA256 add2609cb08b760e5d1172f206603d520a4138912ef4092a42ddb2b1a396c091 SHA512 1ae3a83327b96da6d407656798fea6d260eefc0bdc524c983cf059c7cef00eefc5ef79f0532938d920ba88623bad0233fc85439e56ebe8a56411f6c69f4f0e60 WHIRLPOOL 665d2657eccfb4eadb71a9c2ef1aa351098db8c0792165bc68892557c5840e83638cb2739efc105d75148a3292e487fe1713022b8bbeab79e9ccba65a128fc68
 MISC -.orig 0 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 SHA512 cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e WHIRLPOOL 19fa61d75522a4669b44e39c1d2e1726c530232130d407f89afee0964997f7a73e83be698b288febcf88e3e03c4f0757ea8964e59b63d93708b138cc42a66eb3
 MISC -.rej 1556 SHA256 48b9a389ca589c55b82b5b181f89bcd21ecf278f899fb1a6f573fe4be568aa45 SHA512 b1d3ed28e97143306f332873d4db83056a9e757d39ea17e03d186cba037eec6da52d65daf815ab461adad0fff27a116c5c940e5e4c87b36fe9b03d07eab48357 WHIRLPOOL 3a0ec8948f25d17bef9e309b7da60f3a2822cfe4b10cc909b375e18f586f278fe14def9489f1206d3bc708de01e0a38840fcb6fb01c1c1e15d48fba2f227cca8
-MISC ChangeLog 6741 SHA256 aadaff7dee227284d8129f75d88804ea3b34770ecd33c5a04cc9c9ed8cd010f0 SHA512 29e4f0d8137248763e29ab416027bec2cbca928d43b95f15ca4bc1fe197e565417eab92ea107beb8ec5ed24c45814ec32c2ed8a018af4ea469d6d6ad887896aa WHIRLPOOL 6af8c8d961c2a2e26a0806dd9f41c4670f03f7f2ef765fa784b28adaf54f38f470a5fee754b06aa74b53e546681a8ad1f28e8fc87b3794bf752b55ebd3f232c0
+MISC ChangeLog 6936 SHA256 891047180e6c481142eaca6ee07e7f33e7e63b38afe239b2be3e7618f385ade2 SHA512 735a652989a65c8a36d7fbe0269ee121061c118e5c8126b3b8d1e1070ac54aafe1825988b60e915f9def2d998f240841876bda10ea00cf69795dc9034d57bd3e WHIRLPOOL 3362214f6c083c2d97d28dc0f61137080a35dc17671a10706b6b4c334e4a77970c5c72f1fb9149d76db155650846ef616311d945a6d26a3cf881820845f29d17
 MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSqR7QACgkQVWmRsqeSphOcWQCcCM1vFaasQGPnFvXms/lUeMhC
-gNkAnjudyYGABNvy0NvqKkhMCTwAD5Fg
-=DuAy
+iEYEAREIAAYFAlTe/T8ACgkQVWmRsqeSphPaiACePzDkvxX3f174vny8B5vwjJZZ
+2AEAmgILIEPglTk7MCJsBUs0y96gv4bL
+=tqCp
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/netselect/files/netselect-0.3-bsd.patch b/net-analyzer/netselect/files/netselect-0.3-bsd.patch
index c3fc3696998e..e9624d87215a 100644
--- a/net-analyzer/netselect/files/netselect-0.3-bsd.patch
+++ b/net-analyzer/netselect/files/netselect-0.3-bsd.patch
@@ -1,6 +1,6 @@
 --- a/netselect.c
 +++ b/netselect.c
-@@ -39,14 +39,13 @@
+@@ -39,14 +39,14 @@
   * hey, great!  Let me know. -- apenwarr
   */
  
@@ -14,6 +14,7 @@
 -# include <endian.h>
 +#ifdef __linux__
 +#include <endian.h>
++#include <sys/types.h>
 +#elif defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
 +#if defined(__OpenBSD__)
 +#include <machine/types.h>
@@ -22,7 +23,7 @@
  #endif
  
  #include <sys/param.h>
-@@ -152,6 +151,7 @@
+@@ -152,6 +152,7 @@
      extern int optind;
      int hostcount, startcount, endcount = 0, sent_one, lag, min_lag = 100;
      int ch, seq, ttl, max_ttl = 30, min_tries = 10, num_score = 1;
@@ -30,7 +31,7 @@
      struct timeval now;
      struct timezone tz;
      OPacket outpacket;          /* last output (udp) packet */
-@@ -234,7 +234,12 @@
+@@ -234,7 +235,12 @@
      if (verbose >= 1)
  	fprintf(stderr, "Running netselect to choose %d out of %d address%s.\n",
  		num_score, numhosts, numhosts==1 ? "" : "es");
@@ -44,7 +45,7 @@
      /* keep going until most of the hosts have been finished */
      must_continue = numhosts;
      while (must_continue && must_continue >= numhosts/2)
-@@ -712,7 +717,7 @@
+@@ -712,7 +718,7 @@
      ip->ip_off = 0;
      ip->ip_hl = sizeof(*ip) >> 2;
      ip->ip_p = IPPROTO_UDP;
diff --git a/net-analyzer/netselect/netselect-0.3-r4.ebuild b/net-analyzer/netselect/netselect-0.3-r4.ebuild
new file mode 100644
index 000000000000..7f85c216ccdd
--- /dev/null
+++ b/net-analyzer/netselect/netselect-0.3-r4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netselect/netselect-0.3-r4.ebuild,v 1.1 2015/02/14 07:46:06 jer Exp $
+
+EAPI=5
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Ultrafast implementation of ping"
+HOMEPAGE="http://apenwarr.ca/netselect/"
+SRC_URI="${HOMEPAGE}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${P}-bsd.patch" \
+		"${FILESDIR}/${P}-glibc.patch"
+
+	sed -i \
+		-e "s:PREFIX =.*:PREFIX = ${ED}usr:" \
+		-e "s:CFLAGS =.*:CFLAGS = -Wall -I. ${CFLAGS}:" \
+		-e "s:LDFLAGS =.*:LDFLAGS = ${LDFLAGS}:" \
+		-e '23,27d' \
+		-e '34d' \
+		Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install () {
+	dobin netselect
+	if ! use prefix ; then
+		fowners root:wheel /usr/bin/netselect
+		fperms 4711 /usr/bin/netselect
+	fi
+	dodoc ChangeLog HISTORY README*
+}