gentoo resync : 28.04.2021

3 files changed, 51 insertions, 22 deletions

diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index a461f8e8245a..525607261840 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -1,7 +1,8 @@
 AUX libpcap-1.10.0-usbmon.patch 620 BLAKE2B 463f446051bd6df5afd679ee95c13792ab4ce1962cd8cd1de7acfc1c40c887741ee0a8a5725566781833711e4c8286942ba6e0fb2ee262e2177df82f2175942d SHA512 77fc6eb400bbf265ed1290bead8c317bdcdbeaf5a73aacfd95c3a1e77dfe8d5a33dfe49043462051552e3550273219b10939fc2cf4eda7298317c7b4490428ea
 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.10.0.tar.gz 920263 BLAKE2B 40b9f3562161dbdd30065757ae045bc3b6447a954dd3019e932cdc9c794e0f47e8eb0480144bfd7765122a3efa750caa0c77abbb98ce29ad79a84ceaedcb9e3f SHA512 d77f05aff76aefbd280e5e24eb4a23b6f3b31c9aacff77d556259325273083f185c451b7ad40b57ac63c9114510e8f768fb99907b1ee54fa95b80f21d7d6500f
-EBUILD libpcap-1.10.0.ebuild 1941 BLAKE2B 80cfa66cd7b10758d36518de9f0ebd262c3a5a610e20a591b7e133dbb7f2461e100d5510223194b95252e777b46d3c108c216768cf27d9c1e63fd9591b87018e SHA512 c844e8cfd6d14cf9e8a8e0bc9ec23e232d1bbdd51ea26e3723acd259fe0a57cc9f518de09061a44e4f049118a231c8a44a9f346a3cc190b4146c0789d5f3988e
-EBUILD libpcap-9999.ebuild 1722 BLAKE2B 23bf6d429b4010ef74e9db6be8512a9ae5b7cd013836ceefcdf88ad6d680a8000a39953b0d259679a826e99bc2af7d04a1e87db06d30aa10d6c06e1c99fe8a8a SHA512 b3f929fc29f5d2f96fffe31554d65ecdee1523b7bf4fb8b4bc911999223816bdc376254a208cf142c1e8d9ba36177a4a19909c18e95ca7bb72b93652d0c96b3d
+DIST libpcap-1.10.0-upstream.tar.gz 934559 BLAKE2B 54e809af242b18d600b88f29bbe31b01784b5160366242f313908b58dfb1e6ee2ceae8d359f730881e15c1b26ed90c553869dffb25a74eb3cea9f597dd490b1d SHA512 007710386ff3435ef97fc99293076eae3c39b424e986141184c712b0285f8589357a1b25085f7eba28730de04312042c724d193934a399797e95a56f5301da7f
+DIST libpcap-1.10.0-upstream.tar.gz.sig 442 BLAKE2B f19ca45bbeee39ef1b3f8a8e8d8d9f24ad43e503430a3fa969a8ce668cb7926e1d19adb7e7cf11fff9dafa09b04507052ccc98f7b2a81f053ff01ec6c7ec8f87 SHA512 8a13aef00120080793da800f038d13124d412dfcfae6c0a952bcab544b50c8b69f6a672438bbe5bcdbfeda2e0d541bccefefbfc69f94e1635c0e9eaf77f19902
+EBUILD libpcap-1.10.0.ebuild 2418 BLAKE2B 3675c881d73801eee1e38818e7e0fa954bdcbdf162bc10c93c9d9fb68b8b75d2b670104e4147a89bb3174f23d7daaeb3720272c76ec75d357d0171816e2b2aa6 SHA512 41e504348a2d39382a78647954c7f79dd1e1fd7a4898b4c8697b76c34350bf28ed2a9bbe90182003b0cbcd72cbb40ca48d6d2ad6cbf10e5e05910c84a16f9d6b
+EBUILD libpcap-9999.ebuild 2309 BLAKE2B 24a952820fa0260ab8d69058e9095dadb8a4f8e65507d9d81339334db3c203d14f2153e6e9c0eef2da7d188c6eafd69fcd23c64abf53f79e8b517d1f0dda343b SHA512 e3a07417a2a4ef534480f63e7fe574f6b293efb5ff9da1ecf94b139af9caa56c615c2878845915e9cb29a20be6e4c8b18e624489c5e94a0f0e3ca1cf31705ded
 MISC metadata.xml 918 BLAKE2B 634ea0c95e68eeed1bab1a2e41d6bde245eb4f432fcda4ffb5cc509317d25e1a2c0ebc56a78d478913ee3c281458743b11327328a712fa509baef8654698e150 SHA512 2a81d02fdca06a6cca8afb80d013f4677ad8bd8de07191801bd73270b0140992674050a6fd883945ca1b6aba08a6ba7dee7e38a9eebf3825dda338d11cd5e14f
diff --git a/net-libs/libpcap/libpcap-1.10.0.ebuild b/net-libs/libpcap/libpcap-1.10.0.ebuild
index 84b0f8780fd2..e17ca9253266 100644
--- a/net-libs/libpcap/libpcap-1.10.0.ebuild
+++ b/net-libs/libpcap/libpcap-1.10.0.ebuild
@@ -6,16 +6,25 @@ 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/_pre/-bp}.tar.gz"
-S="${WORKDIR}/${PN}-${P/_pre/-bp}"
+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=/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 )"
+
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="bluetooth dbus netlink rdma -remote static-libs usb -yydebug"
 
 RDEPEND="
@@ -32,6 +41,10 @@ BDEPEND="
 	dbus? ( virtual/pkgconfig )
 "
 
+if [[ ${PV} != *9999* ]] ; then
+	BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-tcpdump )"
+fi
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.9.1-pcap-config.patch
 	"${FILESDIR}"/${PN}-1.10.0-usbmon.patch
diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild
index b716f8505940..b0505e64ff65 100644
--- a/net-libs/libpcap/libpcap-9999.ebuild
+++ b/net-libs/libpcap/libpcap-9999.ebuild
@@ -1,20 +1,29 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools git-r3 multilib-minimal
+
+inherit autotools multilib-minimal
 
 DESCRIPTION="A system-independent library for user-level network packet capture"
-EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap"
-HOMEPAGE="
-	https://www.tcpdump.org/
-	https://github.com/the-tcpdump-group/libpcap
-"
+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=/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 ~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 usb -yydebug"
-KEYWORDS=""
 
 RDEPEND="
 	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
@@ -23,15 +32,17 @@ RDEPEND="
 	rdma? ( sys-cluster/rdma-core )
 	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
 "
-DEPEND="
-	${RDEPEND}
-"
+DEPEND="${RDEPEND}"
 BDEPEND="
 	sys-devel/flex
 	virtual/yacc
 	dbus? ( virtual/pkgconfig )
 "
 
+if [[ ${PV} != *9999* ]] ; then
+	BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-tcpdump )"
+fi
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.9.1-pcap-config.patch
 	"${FILESDIR}"/${PN}-1.10.0-usbmon.patch
@@ -41,6 +52,10 @@ PATCHES=(
 src_prepare() {
 	default
 
+	if ! [[ -f VERSION ]]; then
+		echo ${PV} > VERSION || die
+	fi
+
 	eautoreconf
 }
 
@@ -62,7 +77,7 @@ multilib_src_compile() {
 }
 
 multilib_src_install_all() {
-	dodoc CREDITS CHANGES VERSION TODO README*
+	dodoc CREDITS CHANGES VERSION TODO README.* doc/README.*
 
 	# remove static libraries (--disable-static does not work)
 	if ! use static-libs; then