gentoo resync : 05.12.2021

3 files changed, 20 insertions, 31 deletions

diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index 7d287c4ab95e..903a32541a23 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -1,7 +1,7 @@
 AUX libbpf-9999-paths.patch 883 BLAKE2B 663e03ae01afd7be73c281e8b83cf5534717c28f5960b4b7ca5530096840568dedf4e5f58f2139ab56c5f57382a80540294cb492f6ad619f174184172b3441af SHA512 de78131baa08874000cc52b0b21db4055246a653503301bd82c2e8f5818c955d63727d957d7834f1aed63abad42607480911fa0c2ea8d07d833ebd1f8b338039
-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.4.0.ebuild 1218 BLAKE2B 744c309ebd4de13663bd1cd6b8eb61a521e4eb27075e7a1811bb152408c1eff00a3b561b811b3d9fc98520712e5c08dcd115741bd9180264ca88f1776ca242c8 SHA512 6d0ca0f36f5cd2c311924dc56e3c2d16cca05e289080244ab301cd62f0e3165238914c00b60af9063e7d46d801668006cb91dc334c296207790d2197d0f7ea75
-EBUILD libbpf-0.5.0.ebuild 1071 BLAKE2B 3426c4e31b1072a847ff7638871325dfc27b0cf7ae16a4fbb38e886151e707de43c1ae33166fdffd592873ca8a1edb0c9a892582512eb06cacf2fc32ffd8edf2 SHA512 fc9d41260430e5e4b7be25f01710438232ac88120f095b03d80a312e388886d9938caa856f7e30366d57bfa916d8da6159e2de6865817b0e2d125b27818ba160
+DIST libbpf-0.6.0.tar.gz 858210 BLAKE2B a6076ae7465eb9c99ff1b2c63a388ef2d15c71882d7de0b5279604ad7b91ef3fce583c88710126a9384d96a810775409daadb0adaea41dd9dfc12af183fa50d7 SHA512 923eac64dca015939cbbd51cb0a7daf609d9873d249d6e621d73776b51c52f6087f2a957976163474d359a471250b27b44ad93179948335e949a82ed9613ed43
+EBUILD libbpf-0.5.0.ebuild 1069 BLAKE2B c9ace876e75903f9bdb7da6db127b90245e66fa668d5080c495acabd37b1b9d967950c5edead15fe7bff9d6b862f11fa4e73c9a8d298666e5faa7b7056b68a55 SHA512 c11e3a7597b88908ad4293e53fe21922d6e8f25b210cfa68526844544b5f3728d47eca34f83e93a47735bccb4304283e9689c5dbbb44d28936b020f683d79918
+EBUILD libbpf-0.6.0.ebuild 1084 BLAKE2B 8cd1f9fd96d088eb8351b667c87178ba028fded8232a77608465e6f4d49d2a34b3c67bba43975cd04a5f81a1a9892383536c505f82898a812a2d15384ec082db SHA512 8c8e57531dba5f6bbfc3577e1436081feec0545263d8d9033900c665ee0a0c7f74014e7c9c42d17b4e8b53aa59d083299613836abefb0264ab19690c8f6d23da
 EBUILD libbpf-9999.ebuild 1076 BLAKE2B d44039d1bfd55ddc95d912ed484d247b1724e426f90cc37cd6dda84a5272f061c83811504d25c2f05c4394e57c3285bf256a3287b2bf320ed1fa0d677de16612 SHA512 15e0913d7eb9f8497c86cb2845662f2986a16ce1f5829ce34054c09e3be3a8165e1e7e91cf453e79d968bf8d9d1f69be539b1136e5fd9b4eb6adbbd0e5d794cb
 MISC metadata.xml 420 BLAKE2B c61b50bd86dd9d110c35d57a9352ca3862790460f0a6f8e4be9e4ac2eb603fe6c1d6bbe8d77e9fdf32d08e7aaf19349516f25a0fdcb29e2671d71d2c230fc1f5 SHA512 131f77e33aa5b3cbc037a297fe0ed9affbcb956b4c7ddc64889eba5f8315f5090ae4fd7a6054f8961461072ca77d13f8bc6674f3ed27372b7b96c4322c487676
diff --git a/dev-libs/libbpf/libbpf-0.5.0.ebuild b/dev-libs/libbpf/libbpf-0.5.0.ebuild
index 75ee4d2ea88d..51d7b76615b5 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/libbpf-0.4.0.ebuild b/dev-libs/libbpf/libbpf-0.6.0.ebuild
index 438a4a1415ec..857dae105061 100644
--- a/dev-libs/libbpf/libbpf-0.4.0.ebuild
+++ b/dev-libs/libbpf/libbpf-0.6.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic toolchain-funcs
 
@@ -9,54 +9,43 @@ if [[ ${PV} =~ [9]{4,} ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/libbpf/libbpf.git"
 else
-	SRC_URI="https://github.com/libbpf/libbpf/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	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"
 fi
 S="${WORKDIR}/${P}/src"
 
-HOMEPAGE="https://github.com/libbpf/libbpf"
 DESCRIPTION="Stand-alone build of libbpf from the Linux kernel"
+HOMEPAGE="https://github.com/libbpf/libbpf"
 
 LICENSE="GPL-2 LGPL-2.1 BSD-2"
-SLOT="0/${PV}"
-IUSE="+static-libs"
+SLOT="0/$(ver_cut 1-2 ${PV})"
+IUSE="static-libs"
 
-COMMON_DEPEND="
-	virtual/libelf
-"
 DEPEND="
-	${COMMON_DEPEND}
 	sys-kernel/linux-headers
+	virtual/libelf
 "
-RDEPEND="
-	${COMMON_DEPEND}
-"
+RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/libbpf-9999-paths.patch"
+	"${FILESDIR}"/libbpf-9999-paths.patch
 )
 
-src_compile() {
+src_configure() {
 	append-cflags -fPIC
-	emake \
-		BUILD_SHARED=y \
-		LIBSUBDIR="$(get_libdir)" \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		V=1
+	tc-export CC AR
+	export LIBSUBDIR="$(get_libdir)" V=1
 }
 
 src_install() {
 	emake \
-		BUILD_SHARED=y \
-		LIBSUBDIR="$(get_libdir)" \
 		DESTDIR="${D}" \
 		install install_uapi_headers
 
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-
 	if ! use static-libs; then
-		find "${D}" -name '*.a' -delete || die
+		find "${ED}" -name '*.a' -delete || die
 	fi
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
 }