gentoo resync : 31.05.2021

3 files changed, 66 insertions, 2 deletions

diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index b3478d0972aa..2898407bbf4b 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -11,6 +11,7 @@ DIST libbpf-0.1.0.tar.gz 666896 BLAKE2B 5923b4c8fb915722f8cc2015ab8f07773a83c425
 DIST libbpf-0.1.1.tar.gz 666908 BLAKE2B 0efb044b1dc02230d14a6e92c40d66f7cb28c7efbecc3d97d084a52dde581dbd02b02fb7fbbe8b4ca051f2f64497c6240c5dd9c992e6fe4629a1332311b7833c SHA512 b9f68323a8f53b0fb0bf418b8a37685e7d74b6f5ad7aa2f266f65cd57199b3b9b5865bc4579758e5adcfbb027ced83e12ee87f3ff3bf159c7b54cbdcd50fd62f
 DIST libbpf-0.2.tar.gz 699136 BLAKE2B d3c7005e5c27f805a33b444267ee28c3fb143c809a8a3ac733d51c56e7ee310e089964844cd4f1f7519b20dea1f4e4d6b0e6acd7bbdd173c99af54fad3635771 SHA512 22fed87cd4da1765465d812979b39ee3126b444fd6b460472a0a7e2f4fb496d278c9d7d672c3fb15005a58d361fd87c5173c18dcf55664dfbb8e6cadb2eed33a
 DIST libbpf-0.3.tar.gz 979131 BLAKE2B 523040600cb08ed1ad301899f85fd7af8bc498ff8d1fd41783aeab223feb795d074072aba048d7e38af045bb3fbfe478bb2cb0ac34f4c22e4dea4ac5f0d34a4c SHA512 91c3368626e731b5868fd1bb6d16bd049b2ed0d5cbf966647fa1069cf8c912d91f3d734f05353a0c16c8ff03790ca8e1e6515fff66e4a76d70ffdf2dbac6d8e3
+DIST libbpf-0.4.0.tar.gz 1015782 BLAKE2B f3bb1a5b1808d30612d9d3852400b71cb5d2ba4c31a177dd72b1f6060bc1d97f8d4ea7bb071a1ae2c5e94e3a4745593a0cc6b8ab6e56288e6cfb046d6de43717 SHA512 5d247f724f0dd3b2dadcc1ac10026ac57d3029b9dd7eb2831e282c58a4143042ef024170781139d89d85c4e9a3849b9ec0d3604a00bb3433be7622682b6dabc1
 EBUILD libbpf-0.0.6.ebuild 1000 BLAKE2B 160f3b9d575fd2553735b2f26ec0ab8b681a002964ae31eba4e9599f541c867f350d55fe4c6e1dfbe6077790bcf3fe9089166538b02973040b51c7bb37d7ce04 SHA512 95785c36fb8ad5130ba55c1c8b996d5e5c1bafd5eb80879494902f7f1fd3c3760c7604d51f36423e121898955b4879b88bb68bdaade76d0c90a2e0f51d27a269
 EBUILD libbpf-0.0.7.ebuild 1005 BLAKE2B b74c9b8a780943160237a87ae3833c996ec5a51685afa4c416ad5ba45f7a932785fd602b51758d2abb9df30e6d5e0b8b44f2ff44c647f473883e696c3eeaadef SHA512 6bf1a72e9bd4e531e35d8914ebac32ce6bac68462dfb5d181b51933108874c65ec50e1de8b31579b5db31d6eb3527159a087bfa730bb2c534dc8bbaed62b9daf
 EBUILD libbpf-0.0.8.ebuild 1005 BLAKE2B b74c9b8a780943160237a87ae3833c996ec5a51685afa4c416ad5ba45f7a932785fd602b51758d2abb9df30e6d5e0b8b44f2ff44c647f473883e696c3eeaadef SHA512 6bf1a72e9bd4e531e35d8914ebac32ce6bac68462dfb5d181b51933108874c65ec50e1de8b31579b5db31d6eb3527159a087bfa730bb2c534dc8bbaed62b9daf
@@ -18,6 +19,7 @@ EBUILD libbpf-0.0.9-r1.ebuild 1059 BLAKE2B 0605fbeaa1da1de10e51ee0bcaa0b355bcff8
 EBUILD libbpf-0.1.0-r1.ebuild 1157 BLAKE2B 876830f71d9f39683088881e1d3f37fe314a2b3057c3cfce1677a82e6f4bfddc2244499ed50c247c1e7221536242ccd06de1aa343406a47479c94935bf03a871 SHA512 bd206fb3c86cd3dca235afc909224219bad0bbcf636b6f690d90460443162710577ad4736ccca2e77376b1668271bdb12c7ad98d5e7e73fa30cae48caf79acdd
 EBUILD libbpf-0.1.1.ebuild 1157 BLAKE2B 876830f71d9f39683088881e1d3f37fe314a2b3057c3cfce1677a82e6f4bfddc2244499ed50c247c1e7221536242ccd06de1aa343406a47479c94935bf03a871 SHA512 bd206fb3c86cd3dca235afc909224219bad0bbcf636b6f690d90460443162710577ad4736ccca2e77376b1668271bdb12c7ad98d5e7e73fa30cae48caf79acdd
 EBUILD libbpf-0.2.ebuild 1157 BLAKE2B 876830f71d9f39683088881e1d3f37fe314a2b3057c3cfce1677a82e6f4bfddc2244499ed50c247c1e7221536242ccd06de1aa343406a47479c94935bf03a871 SHA512 bd206fb3c86cd3dca235afc909224219bad0bbcf636b6f690d90460443162710577ad4736ccca2e77376b1668271bdb12c7ad98d5e7e73fa30cae48caf79acdd
-EBUILD libbpf-0.3.ebuild 1235 BLAKE2B 8e2dc29916632b53101aa81a6981addb3f472809ef65b320d9551d4d4925b05de919b5d0587b59d7d45260ba6e5bfe536f8588443ca686c5e0fdd188a72afcf7 SHA512 1f80a3a91e36d1333b96d37c151065ea155e1647e9b40022f54f993ef800f813623cd642e91062df6e2aaa4075605240a1fdb8a2d38411f1c56537bd6eca499d
+EBUILD libbpf-0.3.ebuild 1241 BLAKE2B db815a22ebf51f56beeb8a3925f9a36cec7f0d412c110f4011e7efa40c7004ee49d4c80831628ca6db8cd97566ce16c0fa10cf20b2fde92e69aa5a769e0da85e SHA512 257b06cb0de2834d4cd09490607a2184416685ea5f4a4df57c5dc406af49cbf1d0841dff6d764aacf64e1c64c4069179ff4d6870a4145f6136086fe32c0975cc
+EBUILD libbpf-0.4.0.ebuild 1213 BLAKE2B d0911afd8e9f32e3511d8066a15fc7da4b3745038f9fe9cada2b974e2400503265e01161ff59247042fe98285b6cde48922f4cbce95dbddca44a4be985fdff49 SHA512 d81d45b3232cf398aab72ce1650797d9d08fa677bfef67a6de068a691d7298a0546a3c99a2ae605c8023974f05ca9bb70484dd70ad2dd26aa21c2de4bd712b10
 EBUILD libbpf-9999.ebuild 1185 BLAKE2B aa1fc95895f35b93f6786514095c05bdf49504aa13ebef41f2fdcd4c929826ccbb87ec2aaeff1ee0ca2c7022fa8c43bc50a396bddf7dd32e6b61275c4649a8e8 SHA512 ebbef537d0dbe3a66172bc10e6c9c7fea2c6b4e295feddbde3570b88a2e43af33258f747d6556f3f77a259a15711990bc2024900665e36f275556cf5712186d8
 MISC metadata.xml 305 BLAKE2B d5a605019f99aa1bb75e405bface00e9006038c60d280bdab31ac9a42e3bcf75e2884b3efc8be4e2a88f7e35769b610f0480ccfba291444e8d4ddaecf73a57f9 SHA512 38df62cf50255dcd59c3ab6961643379e549eb568f2c0d010cd8bf73a93fceb0dbdbb32af7b07f21475b4146f99e684aad6928963e56ea8d6777b8f63f8d8a41
diff --git a/dev-libs/libbpf/libbpf-0.3.ebuild b/dev-libs/libbpf/libbpf-0.3.ebuild
index f97946618eae..f80ac671a49d 100644
--- a/dev-libs/libbpf/libbpf-0.3.ebuild
+++ b/dev-libs/libbpf/libbpf-0.3.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="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~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.4.0.ebuild
new file mode 100644
index 000000000000..542fa1ac8cb0
--- /dev/null
+++ b/dev-libs/libbpf/libbpf-0.4.0.ebuild
@@ -0,0 +1,62 @@
+# 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/libbpf/libbpf/archive/refs/tags/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
+"
+DEPEND="
+	${COMMON_DEPEND}
+	sys-kernel/linux-headers
+"
+RDEPEND="
+	${COMMON_DEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}/libbpf-0.3.0-paths.patch"
+)
+
+src_compile() {
+	append-cflags -fPIC
+	emake \
+		BUILD_SHARED=y \
+		LIBSUBDIR="$(get_libdir)" \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		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
+	fi
+}