gentoo resync : 13.11.2021

4 files changed, 7 insertions, 60 deletions

diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index 8d83982102cd..7d287c4ab95e 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -1,9 +1,7 @@
 AUX libbpf-9999-paths.patch 883 BLAKE2B 663e03ae01afd7be73c281e8b83cf5534717c28f5960b4b7ca5530096840568dedf4e5f58f2139ab56c5f57382a80540294cb492f6ad619f174184172b3441af SHA512 de78131baa08874000cc52b0b21db4055246a653503301bd82c2e8f5818c955d63727d957d7834f1aed63abad42607480911fa0c2ea8d07d833ebd1f8b338039
-DIST libbpf-0.3.tar.gz 979131 BLAKE2B 523040600cb08ed1ad301899f85fd7af8bc498ff8d1fd41783aeab223feb795d074072aba048d7e38af045bb3fbfe478bb2cb0ac34f4c22e4dea4ac5f0d34a4c SHA512 91c3368626e731b5868fd1bb6d16bd049b2ed0d5cbf966647fa1069cf8c912d91f3d734f05353a0c16c8ff03790ca8e1e6515fff66e4a76d70ffdf2dbac6d8e3
 DIST libbpf-0.4.0.tar.gz 1015782 BLAKE2B f3bb1a5b1808d30612d9d3852400b71cb5d2ba4c31a177dd72b1f6060bc1d97f8d4ea7bb071a1ae2c5e94e3a4745593a0cc6b8ab6e56288e6cfb046d6de43717 SHA512 5d247f724f0dd3b2dadcc1ac10026ac57d3029b9dd7eb2831e282c58a4143042ef024170781139d89d85c4e9a3849b9ec0d3604a00bb3433be7622682b6dabc1
 DIST libbpf-0.5.0.tar.gz 815083 BLAKE2B 9097d808f03cbbe61cd59b24347075e2937603f51350f83f8897123900c911392d7545af8135f39f749132c6518296f1a4d22d37c0c7b4371631f5c63a0dd9ac SHA512 3c578d3e6e93a306a1f182978e54f35fec8acfa51fad5d7de72c5003f10c266d7474e82d6dd045311fcaf8c18aa8cebe64a3336a458a9ea477e5a58e5111dd85
-EBUILD libbpf-0.3.ebuild 1240 BLAKE2B 3f287692b5209625c4178e0e418be4c460dc25e8d62db303cb86214c5253e7f2b65f7d0be405eee169ed541ad05a351b78db8e1f71481b33e816208dd198d569 SHA512 4de801d74e973942ac2d8a00143a6460739caf09cac1e5a0ffce0a2ec8e18211d9a991f560bf53daec305c5aa0c948fc2239e988640065b9499a843e56dad587
 EBUILD libbpf-0.4.0.ebuild 1218 BLAKE2B 744c309ebd4de13663bd1cd6b8eb61a521e4eb27075e7a1811bb152408c1eff00a3b561b811b3d9fc98520712e5c08dcd115741bd9180264ca88f1776ca242c8 SHA512 6d0ca0f36f5cd2c311924dc56e3c2d16cca05e289080244ab301cd62f0e3165238914c00b60af9063e7d46d801668006cb91dc334c296207790d2197d0f7ea75
-EBUILD libbpf-0.5.0.ebuild 1076 BLAKE2B d44039d1bfd55ddc95d912ed484d247b1724e426f90cc37cd6dda84a5272f061c83811504d25c2f05c4394e57c3285bf256a3287b2bf320ed1fa0d677de16612 SHA512 15e0913d7eb9f8497c86cb2845662f2986a16ce1f5829ce34054c09e3be3a8165e1e7e91cf453e79d968bf8d9d1f69be539b1136e5fd9b4eb6adbbd0e5d794cb
+EBUILD libbpf-0.5.0.ebuild 1071 BLAKE2B 3426c4e31b1072a847ff7638871325dfc27b0cf7ae16a4fbb38e886151e707de43c1ae33166fdffd592873ca8a1edb0c9a892582512eb06cacf2fc32ffd8edf2 SHA512 fc9d41260430e5e4b7be25f01710438232ac88120f095b03d80a312e388886d9938caa856f7e30366d57bfa916d8da6159e2de6865817b0e2d125b27818ba160
 EBUILD libbpf-9999.ebuild 1076 BLAKE2B d44039d1bfd55ddc95d912ed484d247b1724e426f90cc37cd6dda84a5272f061c83811504d25c2f05c4394e57c3285bf256a3287b2bf320ed1fa0d677de16612 SHA512 15e0913d7eb9f8497c86cb2845662f2986a16ce1f5829ce34054c09e3be3a8165e1e7e91cf453e79d968bf8d9d1f69be539b1136e5fd9b4eb6adbbd0e5d794cb
-MISC metadata.xml 306 BLAKE2B 6af2288a09cffb8801efe6841d11dae5e8f3659dd75be45f746bab3f48686458916dab796fd9d535e1a6fa0ca78567e8227e29ef06cc22c4a9d0b1cbebd30ab0 SHA512 c027c14965069ece90130984bab710dc19f199a184e834666449f4bc0874de3b5f5d878f3a1fe6f817a85eef2bc45914e640f0140878b7454a32738a7f500032
+MISC metadata.xml 420 BLAKE2B c61b50bd86dd9d110c35d57a9352ca3862790460f0a6f8e4be9e4ac2eb603fe6c1d6bbe8d77e9fdf32d08e7aaf19349516f25a0fdcb29e2671d71d2c230fc1f5 SHA512 131f77e33aa5b3cbc037a297fe0ed9affbcb956b4c7ddc64889eba5f8315f5090ae4fd7a6054f8961461072ca77d13f8bc6674f3ed27372b7b96c4322c487676
diff --git a/dev-libs/libbpf/libbpf-0.3.ebuild b/dev-libs/libbpf/libbpf-0.3.ebuild
deleted file mode 100644
index 754ab6101584..000000000000
--- a/dev-libs/libbpf/libbpf-0.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-if [[ ${PV} =~ [9]{4,} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/libbpf/libbpf.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-S="${WORKDIR}/${P}/src"
-
-HOMEPAGE="https://github.com/libbpf/libbpf"
-DESCRIPTION="Stand-alone build of libbpf from the Linux kernel"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-2"
-SLOT="0/${PV}"
-IUSE="+static-libs"
-
-COMMON_DEPEND="virtual/libelf
-	!<=dev-util/bcc-0.7.0"
-DEPEND="${COMMON_DEPEND}
-	sys-kernel/linux-headers"
-RDEPEND="${COMMON_DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/libbpf-9999-paths.patch"
-)
-
-src_compile() {
-	append-cflags -fPIC
-	emake \
-		BUILD_SHARED=y \
-		LIBSUBDIR="$(get_libdir)" \
-		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		V=1
-}
-
-src_install() {
-	emake \
-		BUILD_SHARED=y \
-		LIBSUBDIR="$(get_libdir)" \
-		DESTDIR="${D}" \
-		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
-		install install_uapi_headers
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-}
diff --git a/dev-libs/libbpf/libbpf-0.5.0.ebuild b/dev-libs/libbpf/libbpf-0.5.0.ebuild
index 2b8fd07a6a92..75ee4d2ea88d 100644
--- a/dev-libs/libbpf/libbpf-0.5.0.ebuild
+++ b/dev-libs/libbpf/libbpf-0.5.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ [9]{4,} ]]; then
 	EGIT_REPO_URI="https://github.com/libbpf/libbpf.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 S="${WORKDIR}/${P}/src"
 
diff --git a/dev-libs/libbpf/metadata.xml b/dev-libs/libbpf/metadata.xml
index 3ce8f10931c3..74bcfa4911ec 100644
--- a/dev-libs/libbpf/metadata.xml
+++ b/dev-libs/libbpf/metadata.xml
@@ -4,6 +4,10 @@
   <maintainer type="person">
     <email>chutzpah@gentoo.org</email>
   </maintainer>
+  <maintainer type="person">
+    <email>jsmolic@gentoo.org</email>
+    <name>Jakov Smolić</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">libbpf/libbpf</remote-id>
   </upstream>