[gentoo-commits] repo/gentoo:master commit in: net-libs/libpcap/

["Sam James" <sam@gentoo.org>]

commit:     f7a0467760358bdf4042b0a162dd61f880ff1b90
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  1 02:34:52 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan  1 02:34:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7a04677

net-libs/libpcap: add 1.10.2

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/libpcap/Manifest                                |  2 ++
 .../{libpcap-9999.ebuild => libpcap-1.10.2.ebuild}       | 16 ++++------------
 net-libs/libpcap/libpcap-9999.ebuild                     | 16 ++++------------
 3 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 87ff3b256453..ee7a63215c96 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -1,2 +1,4 @@
 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

diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-1.10.2.ebuild
similarity index 85%
copy from net-libs/libpcap/libpcap-9999.ebuild
copy to net-libs/libpcap/libpcap-1.10.2.ebuild
index 6f83d33095c3..9bda8d87fb64 100644
--- a/net-libs/libpcap/libpcap-9999.ebuild
+++ b/net-libs/libpcap/libpcap-1.10.2.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
 

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