gentoo resync : 03.11.2019

5 files changed, 2 insertions, 276 deletions

diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index e2186a80a2d8..5c41072df43e 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -1,8 +1,4 @@
-AUX tcpdump-4.9.2-includedir.patch 2027 BLAKE2B b9fc28ec180095f9b6e47e9a1ccd75d479029cfb19d6f1ff53595a25cab4c68d1ca55df0f702dfae86e264e4b7d3f645f3fac1b548bb6d62cec58306ae19e88a SHA512 054af892c4948926d23b6b7a4f93ac00ab8f258181784598a4097dd8f8b641ddeaedf3c9924b940b860929e086810037d3a672fabd03427b4bb41d3020013c27
-DIST tcpdump-4.9.2.tar.gz 2298386 BLAKE2B b7e90d1091affa6f4734a622f23565976b0cb5be8c0afa12656f52acea29384306f2875477dc180b5dc60110a57e0f30f5654ba27dac9f03ff610ca0548de0a7 SHA512 e1bc19a5867d6e3628f3941bdf3ec831bf13784f1233ca1bccc46aac1702f47ee9357d7ff0ca62cddf211b3c8884488c21144cabddd92c861e32398cd8f7c44b
 DIST tcpdump-4.9.3.tar.gz 2333119 BLAKE2B 21e13fc40d98cfac0bbd5513580cf98313df1f8fea24c48f045f70d494aea3e75230b8481049660c109f9179015c3164f3e3b31acc76c0bfb1f2da5039f1834e SHA512 3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22
-EBUILD tcpdump-4.9.2-r1.ebuild 2188 BLAKE2B c0c4a55475be8412eec59fdc0f32c8008144d1e355b28d064c4ab379882b60e1d45f6463a6cdab600ac8476267dc363e1a85810a506f6c2101b5b90427a11dc7 SHA512 a4a54a5554afa51e1305a8de0fbd2559685070036cee416fb3bc02133123b4e438ec41f1c7ed8afb124fd12acd2df538113bdfd937777c12724e4b41737b00e1
-EBUILD tcpdump-4.9.2.ebuild 2063 BLAKE2B 724f8b73ac79e4d25ad27e8530f289edbabc0f9606c2d2f195b0084e0701d9d37ea039652f9c0f46099fe6b21f2dabe55f9a613be7ce08b8b0c6f5294226f930 SHA512 4f792631df6effa11a6e09a286e612bfbaca812530bbb05deb6b0b468b164d70974eb69d021f4ca4539bcd994cb8c00de09a95cee750563d6a1665875cfff3a2
-EBUILD tcpdump-4.9.3.ebuild 1947 BLAKE2B c773686b1362f6b6c4e6e988dab7e90eede28f039c8b785a27b7484b00534f15b3c25d994600f58ee5e37e780b2251e3c542554b7c2921853b081e8c61da1653 SHA512 227eca309c750e4bb3761d395b733e85163f9c4bdf13aea19034f2236ea3c44f300eaa1455b11958c42cc8bbe2bdcc4e32894a936f13a3cc01759322a765d0d5
+EBUILD tcpdump-4.9.3.ebuild 1944 BLAKE2B 6a28589740cb8797b91bd210db7dfbf4827f8d653cfa15df03d5bcaee66ccc839f1086428f6d8d6326a1d3c7916945f91cd6c4c0419236d9433bc119017e195f SHA512 fec1c620cb96c1d76c66b05086ff2a604cfc2155998989e6ce797821db0734443f0a873f021a2c7b058fc8cb2678c1c7363ae731ac30b1f6543374b1193052d8
 EBUILD tcpdump-9999.ebuild 2190 BLAKE2B 29650a330e482a82589b8472b62cba24bc3ddfc931465557ef7695938a8d208ceef862d09f9f4a5aaf9d917c58396451f071909c5ab3c808f5185b9b49ddb0f1 SHA512 974ff9bed610720376d46f54316e7aa25cba88255d40327f7325ae3101ddee62210d9eb70f32336eeb507bfd267258f072e299a149c16a4a1218ccea0262c13c
 MISC metadata.xml 639 BLAKE2B 2bbc5e38a9e172b7aa6dc69d211311d263007bb0da6e268cb9de953f0f862de3562b12e2ba3be267963ed2ef78254e7622951ab997550d78eb56fb057621e3ab SHA512 b765372f84fc597e257acf7d7e7daa5d9b220831ceb041851a9ef08da0fd419f36b12244cae9da0c3ef2b1b5c3fae9e4d234818ab4d58caf209c2c22604de392
diff --git a/net-analyzer/tcpdump/files/tcpdump-4.9.2-includedir.patch b/net-analyzer/tcpdump/files/tcpdump-4.9.2-includedir.patch
deleted file mode 100644
index 0f74fa9a8a3f..000000000000
--- a/net-analyzer/tcpdump/files/tcpdump-4.9.2-includedir.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -534,40 +534,6 @@
- 		if test $libpcap = FAIL ; then
- 		    AC_MSG_ERROR(see the INSTALL doc for more info)
- 		fi
--		dnl
--		dnl Some versions of Red Hat Linux put "pcap.h" in
--		dnl "/usr/include/pcap"; had the LBL folks done so,
--		dnl that would have been a good idea, but for
--		dnl the Red Hat folks to do so just breaks source
--		dnl compatibility with other systems.
--		dnl
--		dnl We work around this by assuming that, as we didn't
--		dnl find a local libpcap, libpcap is in /usr/lib or
--		dnl /usr/local/lib and that the corresponding header
--		dnl file is under one of those directories; if we don't
--		dnl find it in either of those directories, we check to
--		dnl see if it's in a "pcap" subdirectory of them and,
--		dnl if so, add that subdirectory to the "-I" list.
--		dnl
--		dnl (We now also put pcap.h in /usr/include/pcap, but we
--		dnl leave behind a /usr/include/pcap.h that includes it,
--		dnl so you can still just include <pcap.h>.)
--		dnl
--		AC_MSG_CHECKING(for extraneous pcap header directories)
--		if test \( ! -r /usr/local/include/pcap.h \) -a \
--			\( ! -r /usr/include/pcap.h \); then
--		    if test -r /usr/local/include/pcap/pcap.h; then
--			d="/usr/local/include/pcap"
--		    elif test -r /usr/include/pcap/pcap.h; then
--			d="/usr/include/pcap"
--		    fi
--		fi
--		if test -z "$d" ; then
--		    AC_MSG_RESULT(not found)
--		else
--		    $2="-I$d $$2"
--		    AC_MSG_RESULT(found -- -I$d added)
--		fi
- 	    fi
-     else
- 	    $1=$libpcap
-@@ -1351,11 +1351,4 @@
- 			  	    -f "$1/$tmplib/libcrypto.dylib" \); then
- 		ac_cv_ssleay_path="$1"
- 	fi
--
--	#
--	# Make sure we have the headers as well.
--	#
--	if test -d "$1/include/openssl" -a -f "$1/include/openssl/des.h"; then
--		incdir="-I$1/include"
--	fi
- ])
---- a/configure.in
-+++ b/configure.in
-@@ -908,7 +908,6 @@
- 		# Put the subdirectories of the libcrypto root directory
- 		# at the front of the header and library search path.
- 		#
--		CFLAGS="-I$withval/include $CFLAGS"
- 		LIBS="-L$withval/lib $LIBS"
- 	fi
- ],[
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.2-r1.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.2-r1.ebuild
deleted file mode 100644
index 193cb91dd2e7..000000000000
--- a/net-analyzer/tcpdump/tcpdump-4.9.2-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic toolchain-funcs user
-
-DESCRIPTION="A Tool for network monitoring and data acquisition"
-HOMEPAGE="
-	https://www.tcpdump.org/
-	https://github.com/the-tcpdump-group/tcpdump
-"
-SRC_URI="
-	https://www.tcpdump.org/release/${P}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+drop-root libressl smi ssl samba suid test"
-
-RDEPEND="
-	drop-root? ( sys-libs/libcap-ng )
-	net-libs/libpcap
-	smi? ( net-libs/libsmi )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6m:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-DEPEND="
-	${RDEPEND}
-	drop-root? ( virtual/pkgconfig )
-	test? (
-		|| ( app-arch/sharutils sys-freebsd/freebsd-ubin )
-		dev-lang/perl
-	)
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.9.2-includedir.patch
-)
-
-pkg_setup() {
-	if use drop-root || use suid; then
-		enewgroup tcpdump
-		enewuser tcpdump -1 -1 -1 tcpdump
-	fi
-}
-
-src_prepare() {
-	default
-
-	mv aclocal.m4 acinclude.m4 || die
-
-	eautoreconf
-
-	sed -i -e '/^eapon1/d;' tests/TESTLIST || die
-
-	# bug 630394
-	sed -i -e '/^nbns-valgrind/d' tests/TESTLIST || die
-}
-
-src_configure() {
-	if use drop-root; then
-		append-cppflags -DHAVE_CAP_NG_H
-		export LIBS=$( $(tc-getPKG_CONFIG) --libs libcap-ng )
-	fi
-
-	econf \
-		$(use_enable samba smb) \
-		$(use_with drop-root chroot '') \
-		$(use_with smi) \
-		$(use_with ssl crypto "${EPREFIX}/usr") \
-		$(usex drop-root "--with-user=tcpdump" "")
-}
-
-src_test() {
-	if [[ ${EUID} -ne 0 ]] || ! use drop-root; then
-		emake check
-	else
-		ewarn "If you want to run the test suite, make sure you either"
-		ewarn "set FEATURES=userpriv or set USE=-drop-root"
-	fi
-}
-
-src_install() {
-	dosbin tcpdump
-	doman tcpdump.1
-	dodoc *.awk
-	dodoc CHANGES CREDITS README.md
-
-	if use suid; then
-		fowners root:tcpdump /usr/sbin/tcpdump
-		fperms 4110 /usr/sbin/tcpdump
-	fi
-}
-
-pkg_preinst() {
-	if use drop-root || use suid; then
-		enewgroup tcpdump
-		enewuser tcpdump -1 -1 -1 tcpdump
-	fi
-}
-
-pkg_postinst() {
-	use suid && elog "To let normal users run tcpdump add them into tcpdump group."
-}
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild
deleted file mode 100644
index 632d82283d9c..000000000000
--- a/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic toolchain-funcs user
-
-DESCRIPTION="A Tool for network monitoring and data acquisition"
-HOMEPAGE="
-	https://www.tcpdump.org/
-	https://github.com/the-tcpdump-group/tcpdump
-"
-SRC_URI="
-	https://www.tcpdump.org/release/${P}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+drop-root libressl smi ssl samba suid test"
-
-RDEPEND="
-	drop-root? ( sys-libs/libcap-ng )
-	net-libs/libpcap
-	smi? ( net-libs/libsmi )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6m:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-DEPEND="
-	${RDEPEND}
-	drop-root? ( virtual/pkgconfig )
-	test? (
-		|| ( app-arch/sharutils sys-freebsd/freebsd-ubin )
-		dev-lang/perl
-	)
-"
-
-pkg_setup() {
-	if use drop-root || use suid; then
-		enewgroup tcpdump
-		enewuser tcpdump -1 -1 -1 tcpdump
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i -e '/^eapon1/d;' tests/TESTLIST || die
-
-	# bug 630394
-	sed -i -e '/^nbns-valgrind/d' tests/TESTLIST || die
-}
-
-src_configure() {
-	if use drop-root; then
-		append-cppflags -DHAVE_CAP_NG_H
-		export LIBS=$( $(tc-getPKG_CONFIG) --libs libcap-ng )
-	fi
-
-	econf \
-		$(use_enable samba smb) \
-		$(use_with drop-root chroot '') \
-		$(use_with smi) \
-		$(use_with ssl crypto "${EPREFIX}/usr") \
-		$(usex drop-root "--with-user=tcpdump" "")
-}
-
-src_test() {
-	if [[ ${EUID} -ne 0 ]] || ! use drop-root; then
-		emake check
-	else
-		ewarn "If you want to run the test suite, make sure you either"
-		ewarn "set FEATURES=userpriv or set USE=-drop-root"
-	fi
-}
-
-src_install() {
-	dosbin tcpdump
-	doman tcpdump.1
-	dodoc *.awk
-	dodoc CHANGES CREDITS README.md
-
-	if use suid; then
-		fowners root:tcpdump /usr/sbin/tcpdump
-		fperms 4110 /usr/sbin/tcpdump
-	fi
-}
-
-pkg_preinst() {
-	if use drop-root || use suid; then
-		enewgroup tcpdump
-		enewuser tcpdump -1 -1 -1 tcpdump
-	fi
-}
-
-pkg_postinst() {
-	use suid && elog "To let normal users run tcpdump add them into tcpdump group."
-}
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild
index b299f9098c09..1a4eeea68b81 100644
--- a/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+drop-root libressl smi ssl samba suid test"
 
 RDEPEND="