gentoo resync : 03.11.2019

6 files changed, 5 insertions, 159 deletions

diff --git a/net-analyzer/netselect/Manifest b/net-analyzer/netselect/Manifest
index cf204c83b5da..bc0209fa1c9d 100644
--- a/net-analyzer/netselect/Manifest
+++ b/net-analyzer/netselect/Manifest
@@ -1,11 +1,6 @@
-AUX netselect-0.3-bsd.patch 1621 BLAKE2B 9b9cfcbc13d08f8cbed95252ff2fe9919470b049af97301a9903420b59470680475cdf441cc0e1da67b714886a959fb0640e74b8b20adae0ee56a00fcdd3b6a3 SHA512 723be6cae82060d862bfd5afac674c701cc6c3b37fc74b7e020e347a584b31cfad1c7e1c87fe84ccf16384996ebb46da3b9b7bcfd7aa8dd323009f73b5edb966
-AUX netselect-0.3-glibc.patch 264 BLAKE2B 6f03d2cb2409edbed3d719d1356c8a767e5b019d1d21dc7258c0bac5640089dfede126a64d7d4ded2c48517b7576ae7bb9837d428b4045ccff5e6cdb2334cd9d SHA512 bcccfdb458b27903e204043c3ce5faeb0024c0f7e3c0dc4c6eff69b7168544adfe8802625daca50a0c5304e26cc2f252279aeec2013460f2a0bc6892c0df88ad
 AUX netselect-0.4-bsd.patch 1573 BLAKE2B 62405aa2962ffe74fce014341433d114f6785fd6372eaedb13f02a50bf0d8cb91889098b75a65361461580aa4340ce0cb91b43bdd1840c727891c2d728252859 SHA512 01dfb03b8e77def3d6742e827662316003ad807af41ea1ce236c4e216de3cca3678efc6405676c8022dab5f61e6ee7395aaa82b8b800e96eb0ac718b5f7b4f52
 AUX netselect-0.4-flags.patch 172 BLAKE2B 17acc10b64404c9d8525147f5ca526f661a2b2c2b7e7ae31b19186784ef4b4714b14e43ccb77d318016b60c6ff80e381acf9b006487f0d9ebed06e70cb026a3a SHA512 3f665743859e243126de95340da5b9dd42ff671d82f3809e294b752a568b7ede96b13f6a63e18cc522ce19d1537b137d5c05e0e49ce533e8fc337922e18ea74a
-DIST netselect-0.3.tar.gz 22047 BLAKE2B b0039ee21382f541446c49b3a536e400e70120513217969ffb7168c906c5938d099e5e072f05f68a95829410fd013da386527ee1280938714c00a006ae6a248d SHA512 04a4b79c357a0110dcf377ad04ac729ed7854bec4b064ad16da632367ce1870379546fffc8396ea770bfa580618d7c0495c16b0ba30f736419511b890ce5dca5
 DIST netselect-0.4-ipv6.patch.xz 18272 BLAKE2B 6197057085e892c156a9fb3a82ac0030a2ff1b4276dde48405de2d2bcfdcef066c4f3eeff174f766af23d2807085f97e459dbffc87b2a2950a472e7964f2e3fc SHA512 422b54df5be45379fe7d6776b6e653a8e49df6fb77421527f2eb6c687597f36cccc7ab5cc5206e9823c318f6facd84fb4e8c0dbffbf9641cee593401cb73abea
 DIST netselect-0.4.tar.gz 22095 BLAKE2B 1dd83c4dcd38ab7b987ead76f4e7e727980bbad91b59c56948e13540307e685984cc11ea94292d38959c8253f1f6ec2e6e6e044302f26b09153717d6e29e96be SHA512 eee9639122b7cc89218c610794d090582aecb3df138bcef41472c8d40c0f7e998b2c4b04aace13795fda5c710ee28cc2c0784a680ad6d1aa6a14eb441a408bfa
-EBUILD netselect-0.3-r3.ebuild 954 BLAKE2B 6bc146a9198f60858c154539e33f78edf9dbafde99971cf4485d4ad35fdd37ce9755bfe942f32e555a3882abfd260808f293bc56f82b5d31dafc9ddf8668369b SHA512 b9ce39804bce1901285325e2224f1fdd96e00d9ad8663cfd1968505652745925204f7411c744ce0def8e53ccaa261de4be1b9aa1b3fccf914f5d4a4e40286de5
-EBUILD netselect-0.3-r4.ebuild 972 BLAKE2B 9b7516f2fa8fc90591202d47361fa6020eb2deb2ec8c4d2ebd0a5785b62f3bb005545e1e97ab70df17a2d1ff7a9d337d26f5d4db218dbd0284b1b8108a129aee SHA512 acdde16df8966c55842fb71a17078ade15df6b3e93900d0970835e0482bb1d4a5935832329ff1e909834d5e19e0d96f88f7a524ca32f4d89a237286c9b644c46
-EBUILD netselect-0.4.ebuild 925 BLAKE2B 3a629fb5bb2b8cbf83758b696d29b1c3d8942fb0c0e82f4977f95c06eb4cb7104703d7ab08b5046e3c8be484358e7745cd94fc19f91ddd403241a83d64e7ab08 SHA512 47f89b2f4bd41569ab23ad76fc8d42abd4f60cc40f22841b95abe5cd1b46984da0e2f6b0bb1ac8f5ffb0feeba6b952b54e8bc0f0e6494aa3e382bd74b8963625
+EBUILD netselect-0.4-r1.ebuild 971 BLAKE2B 763fdcf48e8117f6aee40abae77518e1368ef14cff7b11aac8d635b018dc5b88a99500963e41291618e2968a38123298ab78fd4a99f4f53814bd121ab1404653 SHA512 c827f560baefb52e52775043e610eb4baac9872dd323e0cc7a2bf0347c198fe554f5b1991eead44bdf8c4b100df7fa9fe9ae986bc3bd7a8f49d55975c5ad6de0
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/netselect/files/netselect-0.3-bsd.patch b/net-analyzer/netselect/files/netselect-0.3-bsd.patch
deleted file mode 100644
index e9624d87215a..000000000000
--- a/net-analyzer/netselect/files/netselect-0.3-bsd.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/netselect.c
-+++ b/netselect.c
-@@ -39,14 +39,14 @@
-  * hey, great!  Let me know. -- apenwarr
-  */
- 
--#ifdef __EMX__
--# include <io.h>
--# include <fcntl.h>
--# include <sys/types.h>
--# include <sys/select.h>
--# include <machine/endian.h>
--#else
--# 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>
-+#endif
-+#include <machine/endian.h>
- #endif
- 
- #include <sys/param.h>
-@@ -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;
-+    int on = 1;
-     struct timeval now;
-     struct timezone tz;
-     OPacket outpacket;          /* last output (udp) packet */
-@@ -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");
--    
-+   
-+   if (setsockopt(sndsock, IPPROTO_IP, IP_HDRINCL, &on, sizeof(on)) < 0) {
-+        perror("IP_HDRINCL");
-+	_exit(EXIT_FAILURE);
-+   }
-+
-     /* keep going until most of the hosts have been finished */
-     must_continue = numhosts;
-     while (must_continue && must_continue >= numhosts/2)
-@@ -712,7 +718,7 @@
-     ip->ip_off = 0;
-     ip->ip_hl = sizeof(*ip) >> 2;
-     ip->ip_p = IPPROTO_UDP;
--    ip->ip_len = 0; /* kernel fills this in */
-+    ip->ip_len = sizeof(OPacket);
-     ip->ip_ttl = ttl;
-     ip->ip_v = IPVERSION;
-     ip->ip_id = htons(ident + seq);
diff --git a/net-analyzer/netselect/files/netselect-0.3-glibc.patch b/net-analyzer/netselect/files/netselect-0.3-glibc.patch
deleted file mode 100644
index 053e5865b341..000000000000
--- a/net-analyzer/netselect/files/netselect-0.3-glibc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/netselect.c
-+++ b/netselect.c
-@@ -780,7 +780,7 @@
- #if !defined(__GLIBC__)
-     int fromlen = sizeof(from);
- #else				/* __GLIBC__ */
--    size_t fromlen = sizeof(from);
-+    socklen_t fromlen = sizeof(from);
- #endif				/* __GLIBC__ */
- 
-     FD_ZERO(&fds);
diff --git a/net-analyzer/netselect/netselect-0.3-r3.ebuild b/net-analyzer/netselect/netselect-0.3-r3.ebuild
deleted file mode 100644
index 5709db974bbc..000000000000
--- a/net-analyzer/netselect/netselect-0.3-r3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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-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*
-}
diff --git a/net-analyzer/netselect/netselect-0.3-r4.ebuild b/net-analyzer/netselect/netselect-0.3-r4.ebuild
deleted file mode 100644
index 59c62667dfa8..000000000000
--- a/net-analyzer/netselect/netselect-0.3-r4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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*
-}
diff --git a/net-analyzer/netselect/netselect-0.4.ebuild b/net-analyzer/netselect/netselect-0.4-r1.ebuild
index 18559af3f1e5..f4159861bdb5 100644
--- a/net-analyzer/netselect/netselect-0.4.ebuild
+++ b/net-analyzer/netselect/netselect-0.4-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils flag-o-matic toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Ultrafast implementation of ping"
 HOMEPAGE="http://apenwarr.ca/netselect/"
@@ -26,8 +26,10 @@ src_prepare() {
 	use ipv6 && eapply "${WORKDIR}"/${PN}-0.4-ipv6.patch
 
 	default
+}
 
-	tc-export CC
+src_compile() {
+	emake CC="$(tc-getCC)" LDFLAGS="${CFLAGS} ${LDFLAGS}"
 }
 
 src_install () {