gentoo auto-resync : 01:01:2023 - 08:21:34

3 files changed, 105 insertions, 13 deletions

diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 9cb6b9376679..961213a21dbb 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -3,6 +3,9 @@ AUX libpcap-1.10.1-pcap-config-no-hardcoded-lib.patch 3469 BLAKE2B 2a2f0b6080aa1
 AUX libpcap-1.10.1-pcap-config.patch 1000 BLAKE2B f870610ab0260cfcdd0333769744792e431eb36fdd27befb2f88ed001597b690e3776389f6dc03a9b7ae2b732855e8fa997d609d0517427c2a4060793996c889 SHA512 36d1694e09bba04d0417ff906153d43e54b13eca910e5e694e7acd6989c48067164f889a1b540c197331af52fe894e125f7c640418603a6b5a0d2ef543af348d
 DIST libpcap-1.10.1-upstream.tar.gz 935221 BLAKE2B 0ec028e5d026a97b92ba6f23f88daf36b827eee08a752a0162fbabd1b5a2a70141ec403b6ff26dc3eb25ca5c6630c9c2f60f05b33161770da3d5e829c4eecdc6 SHA512 56c314f19c2b857742bf8abcb1e78066986aaa95cec339b75a3c8b70a9fa2b5167da98708352f9ec97a1cea2700cfb4e040bda108d58ac46cec9b7deab88d171
 DIST libpcap-1.10.1-upstream.tar.gz.sig 442 BLAKE2B b76bf3c40a923b6c8fb9a356dff49a90e30dd0b0d785f138ac56bf1a41ad3a6fcfa3d5b3d28c12543857c5616b8938108b06313e35e4474d50991b72d9d371c8 SHA512 f9807efd11d99524b247981e5f4f02e1ffbeaa8468a9a22c66f9931a894071b9182164807b9fd11436883d36e8b0c6cc62302852005d958e34b5236e20caa33d
+DIST libpcap-1.10.2.tar.gz 951063 BLAKE2B f8280c8e12065b4d86e451df8504c834da9c94b25029f0e5c22359d0ce35cf4e3490fa3343d0112209600ea01ffa54249c82c20e2859515884daee759e4a5e9b SHA512 ccacebf367db44ab74e588f88a4fd7cd82c58e478e6c35414ae36df58fb06d85d542597485b1d1393edfaacc2bc5d35578b7b87fee4965f6dfde10a03d2ddd32
+DIST libpcap-1.10.2.tar.gz.sig 442 BLAKE2B c470ff70e58c13dfd1a6d72a00d83883515b9ca63e1561b3acbb75d744b043726df9b8dcb70dfa5ea1c0fa54624a407364d85e83fd3ec4dfd605aa401f5351df SHA512 122bf14c2525a05b2781f6d7bc029d73bcf4584c184220b9f9716def327cc0521ec78d658ad58bdf8a9cd9415ab9ad4d1d24ed1880db25ace6a01a93786bcc5e
 EBUILD libpcap-1.10.1-r2.ebuild 2927 BLAKE2B 1a4024dd0a7109b98e4af91fde9c60eceaa519b7fd23c14f24cf3509b89c6275e33b2681dc795e34604ebfb08f65b389eaf6932e35ad611de0d6419cc9343758 SHA512 3f5d60f071b61dad9f9fa0695f7b8706ee6675a2b8a3e864f6cb511d2caf3ddbc997fbec4f555bfe1703da5bbe879623aab15325639e7ce529e122603dd1857a
-EBUILD libpcap-9999.ebuild 2656 BLAKE2B c9d89c2d9c228805dbfe37fc1c3137a74dd903967cc940646131329a71f60cdb7281fbb80318ecdfb94e14649f53591ad853bb5b7c3164b0531bfe6e3fbe5f61 SHA512 2df002974011580fa3c3b307039a30d80e8a689b08e9deca4473195e202325b1418b31558f9db528234a09df315e40055f059047c8f716d0aaf0833dc5f32acf
+EBUILD libpcap-1.10.2.ebuild 2393 BLAKE2B 25557edcd034e83df4ec0d63636774e52c8c02f10bc88082e218721e9e33541e7609ecf6356c65cd73adc060dbe8ba6b67dd648d5f07f4ef81ca4a82e5d3030d SHA512 813925973f46a57f620018d657666d6e36889a592f31c8d2e61941e5e6b09edb1bf1be256c4bfacebd7d76b46d8d501ee48f58a12e64c24b7377bf710a570d8f
+EBUILD libpcap-9999.ebuild 2393 BLAKE2B 25557edcd034e83df4ec0d63636774e52c8c02f10bc88082e218721e9e33541e7609ecf6356c65cd73adc060dbe8ba6b67dd648d5f07f4ef81ca4a82e5d3030d SHA512 813925973f46a57f620018d657666d6e36889a592f31c8d2e61941e5e6b09edb1bf1be256c4bfacebd7d76b46d8d501ee48f58a12e64c24b7377bf710a570d8f
 MISC metadata.xml 919 BLAKE2B 0d4146081122df26ec1c9ae4f7c66e9f93ef4c25458e0de3489de29bf69a6d428123ab84f4c2fbd0582525ea2197c5cbfc9e2b591459e43eb0e159cf6a684dcc SHA512 0bfdfd1ad64faebc2c122ac029ce5d7b30e84e630ceafd0503f9a659b1781f1c41bf6f0c431ab4f80187ec04506cd32ffc10485d9493cf93e63a466c5db69619
diff --git a/net-libs/libpcap/libpcap-1.10.2.ebuild b/net-libs/libpcap/libpcap-1.10.2.ebuild
new file mode 100644
index 000000000000..9bda8d87fb64
--- /dev/null
+++ b/net-libs/libpcap/libpcap-1.10.2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap"
+	inherit git-r3
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc
+	inherit verify-sig
+
+	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="bluetooth dbus netlink rdma remote static-libs test usb yydebug"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
+	remote? ( virtual/libcrypt:=[${MULTILIB_USEDEP}] )
+	rdma? ( sys-cluster/rdma-core )
+	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-alternatives/yacc
+	sys-devel/flex
+	dbus? ( virtual/pkgconfig )
+"
+
+if [[ ${PV} != *9999* ]] ; then
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )"
+fi
+
+src_prepare() {
+	default
+
+	if ! [[ -f VERSION ]]; then
+		echo ${PV} > VERSION || die
+	fi
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# bug #884275
+	export LEX=flex
+
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable bluetooth) \
+		$(use_enable dbus) \
+		$(use_enable rdma) \
+		$(use_enable remote) \
+		$(use_enable usb) \
+		$(use_enable yydebug) \
+		$(use_with netlink libnl) \
+		--enable-ipv6
+}
+
+multilib_src_compile() {
+	emake all shared
+	use test && emake testprogs
+}
+
+multilib_src_test() {
+	testprogs/findalldevstest || die
+}
+
+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-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild
index 6f83d33095c3..9bda8d87fb64 100644
--- a/net-libs/libpcap/libpcap-9999.ebuild
+++ b/net-libs/libpcap/libpcap-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools multilib-minimal
 
@@ -15,10 +15,8 @@ else
 	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc
 	inherit verify-sig
 
-	# Note: drop -upstream on bump, this is just because we switched to the official
-	# distfiles for verify-sig
-	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz -> ${P}-upstream.tar.gz"
-	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig -> ${P}-upstream.tar.gz.sig )"
+	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )"
 
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 fi
@@ -47,12 +45,6 @@ if [[ ${PV} != *9999* ]] ; then
 	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )"
 fi
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10.0-usbmon.patch
-
-	"${FILESDIR}"/${PN}-1.10.1-pcap-config.patch
-)
-
 src_prepare() {
 	default