gentoo resync : 25.08.2020

4 files changed, 7 insertions, 85 deletions

diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index e66460aa7358..041af64b9c60 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -3,8 +3,7 @@ AUX libpcap-1.9.0-pcap-config-includedir.patch 907 BLAKE2B 7d616edbc6bd129bbe73c
 AUX libpcap-1.9.1-pcap-config.patch 1005 BLAKE2B 27f06af3f6634e25bc7eb017923a174191e13d28658e380baa2d48f828736a0ff176de4b5fdaa7c0bf42c36509dfffd0c6d49cec45669d03201fad8efaf90c75 SHA512 57f51c1f2fc093bacf43a96c7156e82946a3f11025b3afe3c24c2704fb4a9a7750e0526d41a17d52d649f55b44d642d5daa3a76f0ae18aaca582591f20acd1c1
 AUX libpcap-9999-prefix-darwin.patch 358 BLAKE2B cd2d0dc64fa49fa91451fb668a85684770d43cea038cd59d6e6e6b6b59e29fe258741ecb2aa8bca5621a4042b786ac5944700df40d6d52cb25fdb7fff27f713f SHA512 c3b3d90ad0641bec86bbd8a07e4eb35dc49a6b9f99bf5cccdb6b9134b75e9e6b78649073e69291683de581d1b40ba8c3079a86ec7a621a1fcf33f8a1cf818f75
 DIST libpcap-1.9.1.tar.gz 849407 BLAKE2B 700d8b3d25c036033c4f9b652cec6a30d4a45aa418c2ec45698018b3d3fe8d0a61f6759f5734e2c7ff9a8f42cce65fbd8b3e1b1efd44776e53674fbc609da59d SHA512 9ab9da20194e0dfb105daa28c8841118118f5a7f68b5e30e31da6c56eec91430c8ee481f1f9d20aec4d33d7ee9e6fb0b5e08a90a8d7e5ace8e6210e29e7eab0f
-EBUILD libpcap-1.9.1-r2.ebuild 1867 BLAKE2B 32e905fdcb957e8c7687bfb90e3434b02dd65aae3f43d4995ec9b6950cdbc1b60e741ed383423701e6d7081500f2d39f2f170d8a05a3925da9c15e38dceb007f SHA512 27f5ce94122fff4e77b2a5bd74e24952e855e84cdb3e36b3dce1e3585813821ec9cce21d53c28983d5e2765ef118fddbaee2aa57250f6b40b4f792a696627f4d
-EBUILD libpcap-1.9.1-r3.ebuild 1897 BLAKE2B 24d4703df09d11f9458848a734558012d01d954cf4b0f403c08117a7ec96fc5598ff96d3accf1a19f61409ed582b9bcff6b1aa863ba966077d81f8aecb1ae67a SHA512 10a0cf19c9f76e5a421d7360e93e1efe6972a0bf1006b47b3d4ff26bbff92b0be1868eaa62bc8542318c354187c663fa82b05d81c8158c9f87729afed55aa156
+EBUILD libpcap-1.9.1-r3.ebuild 1915 BLAKE2B 07c0a1f8b90631cea3b1feb04a9b1c67cea39e5c994370f652c0e9fbcdb8f778631e74048cfe6dc9d7d1daf726b3d1ea96de6c0e0b767244056a145d7fb3deb0 SHA512 b77569c6ff1a51967507e8f722c40f8ee4473ae294bf80cb6af74e7300dcaff848be08305f77e35627dda12c919b625ccef510b245343cc7a7a71bdbb4c1ac5b
 EBUILD libpcap-1.9.1.ebuild 1740 BLAKE2B fe8f2ffdb8548719fa379514c6deb9753c7f9d49b26fbdd2f54ec3f922c7b2ae166449883bd85695dd1b397bacdf108b3996e20d4c62a3bf336dcbd1c09c6cf0 SHA512 12b202747893fdf2170caf1ef1355046dd388162bec8790fa638e6ecc7f6819bb19b1d41b5246899cb28214ee8cfa50e799d0d51457a857e32f1daaef5022d91
-EBUILD libpcap-9999.ebuild 1669 BLAKE2B 20026176a3a00d3a6aeeff34b8e42d9d3ff2c5309fbec222bafd73d9b8191eef1164a482f1a439c78c3edb255fbc6446ccc41933ea6d905d6c3a36c63d7a131b SHA512 1d26c8816891fbd0031e45a56cb648a6dbd7d675adfebb3225dbe2be58431128d3b72faba7d6883689dfc255aab9ec536ca797642767614350742482c51ecedd
+EBUILD libpcap-9999.ebuild 1681 BLAKE2B 61f14972b19ff6acf3e11fa251b1fb3871537eb562e891ecf28b36446d077e76c2794e26afd802c41496fdcd01daeecee23a0f6991ab783710475d553a58dc70 SHA512 9bd65255fd37e834d05799fcb580c48f104f117e7eeb19e86aa559ee5e9f8235a19c0945c68e7b933d61f92a4c26097eb4638eac0fca596e0f81260971a1645e
 MISC metadata.xml 829 BLAKE2B e5d6efa30353d6468e2900a2e3b5eb9fad0f1037c5757b791a787d7db88d48261b8237cee5b8d8e9b327c2bc24697d2456216e4a2aa76601d540e3203d7e6515 SHA512 0bfc965079e819a9cb84f3d8eebea92e975dbfabb751979b1c64edd61b07e6508fd52ac64abea5d10305864afcc7c581a29d6f4e6fe8cfb77940ea326ba2f4b2
diff --git a/net-libs/libpcap/libpcap-1.9.1-r2.ebuild b/net-libs/libpcap/libpcap-1.9.1-r2.ebuild
deleted file mode 100644
index 89890d0941fb..000000000000
--- a/net-libs/libpcap/libpcap-1.9.1-r2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools multilib-minimal
-
-DESCRIPTION="A system-independent library for user-level network packet capture"
-HOMEPAGE="
-	https://www.tcpdump.org/
-	https://github.com/the-tcpdump-group/libpcap
-"
-SRC_URI="
-	https://github.com/the-tcpdump-group/${PN}/archive/${P/_}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="bluetooth dbus netlink -remote static-libs usb -yydebug"
-
-RDEPEND="
-	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
-	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/flex
-	virtual/yacc
-	dbus? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${PN}-${P/_}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.1-usbmon.patch
-	"${FILESDIR}"/${PN}-1.9.1-pcap-config.patch
-)
-
-src_prepare() {
-	default
-
-	echo ${PV} > VERSION || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(use_enable bluetooth) \
-		$(use_enable dbus) \
-		$(use_enable remote) \
-		$(use_enable usb) \
-		$(use_enable yydebug) \
-		$(use_with netlink libnl) \
-		--disable-rdma \
-		--enable-ipv6
-}
-
-multilib_src_compile() {
-	emake all shared
-}
-
-multilib_src_install_all() {
-	dodoc CREDITS CHANGES VERSION TODO README.* doc/README.*
-
-	# remove static libraries (--disable-static does not work)
-	if ! use static-libs; then
-		find "${ED}" -name '*.a' -exec rm {} + || die
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-
-	# We need this to build pppd on G/FBSD systems
-	if [[ "${USERLAND}" == "BSD" ]]; then
-		insinto /usr/include
-		doins pcap-int.h portability.h
-	fi
-}
diff --git a/net-libs/libpcap/libpcap-1.9.1-r3.ebuild b/net-libs/libpcap/libpcap-1.9.1-r3.ebuild
index 7412b63170a1..2e669584a72c 100644
--- a/net-libs/libpcap/libpcap-1.9.1-r3.ebuild
+++ b/net-libs/libpcap/libpcap-1.9.1-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="bluetooth dbus netlink rdma -remote static-libs usb -yydebug"
 
 RDEPEND="
@@ -27,6 +27,8 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+"
+BDEPEND="
 	sys-devel/flex
 	virtual/yacc
 	dbus? ( virtual/pkgconfig )
diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild
index 5ad21ee77a4e..53f9d5815924 100644
--- a/net-libs/libpcap/libpcap-9999.ebuild
+++ b/net-libs/libpcap/libpcap-9999.ebuild
@@ -25,6 +25,8 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+"
+BDEPEND="
 	sys-devel/flex
 	virtual/yacc
 	dbus? ( virtual/pkgconfig )