gentoo Easter resync : 12.04.2020

5 files changed, 96 insertions, 4 deletions

diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index 9b27c0353081..b94bd7885e8c 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -1,7 +1,9 @@
 AUX libbpf-0.0.5-paths.patch 997 BLAKE2B e84f5349131a1ab7f976e60baf74fa030b28214daca198db2a6d6b436bdf536aa89e58f39ab10a2cf9dbbf192a159cd1231b68dc3292396e1164950b1514de3d SHA512 47ccd456abf37cdf7e986633eb5a90c16963e5d99608f0c3dd6b035466a0ffe6769001d2bf448c2da88f6427fdac658f364b960a072949523a964ae01836add0
 AUX libbpf-0.0.7-paths.patch 1020 BLAKE2B 6a194c3ecf8ec2600e50b02d231a282a489d3d283ac3e91d6d6cd788fb30881fe245aec073175a801f2f030bca03733a50bc31ed6cf4531ee5c364d19a19f590 SHA512 d8447688a4ea8cb8604882d6534c96309e407701627559c229b372e773c46ed9fe2b879677ebd70d30865b27debb18193173a8adb6e24305ecadcd8b57630e2d
+AUX libbpf-9999-paths.patch 1020 BLAKE2B 6a194c3ecf8ec2600e50b02d231a282a489d3d283ac3e91d6d6cd788fb30881fe245aec073175a801f2f030bca03733a50bc31ed6cf4531ee5c364d19a19f590 SHA512 d8447688a4ea8cb8604882d6534c96309e407701627559c229b372e773c46ed9fe2b879677ebd70d30865b27debb18193173a8adb6e24305ecadcd8b57630e2d
 DIST libbpf-0.0.6.tar.gz 213791 BLAKE2B 9f0a08cc7bae41f7fa93d5ba2f535f76ce47fe691efb6bac6257b88a5607deb62fa53f59984d83b6070ccd573c902899f7528b376d9acbfd77317659de6ab061 SHA512 1678133d9a2bd1cf13d4d1f9b83bb3f0642de91e3e3c8d785e2993257035573aff39b9a1a457e73d9c4c1c66b6a52544a8ad06ac560766d335428bb3fc421e71
 DIST libbpf-0.0.7.tar.gz 262068 BLAKE2B e77ff25449274881ddb9d32f25cd6ad8988e4524102bd109049ee6cfce3e2753fd99ebe2a080f809a4c5422dbf6b17633e4b0cea156f289bf95b92f8375a273c SHA512 c2cbc869b7e11339deab3152a6e2d0b3bba25da513d18d77fb0a698cbe61d6bd48175a58e7dd7a3695fbf27faf48b4f517ac5d3a3c66c086df2e5d1b73a2595d
-EBUILD libbpf-0.0.6.ebuild 1006 BLAKE2B 76d69d107ffe635ca1d7bb638751a877daec5a61f1243690cd42db639e46099f30f9bb572b63c42ff5bdaa14b02995d3caea4482804e0a1aaf817989ea10277a SHA512 7b9fea9a715d9a5306342b22657539a6b053055832320e004bdfe7b9d2a8528f93e45d6ae18bf2c95bb19e2d6beb1e773180175c0dd796eb179df2828fe1e218
-EBUILD libbpf-0.0.7.ebuild 1011 BLAKE2B 3c6bb6dfe691286dd75ad4644c49308742eba3762961cf620ec2e91086ed5e320fdb0d05186d771bbf95b547469f02d6c896e6e784add7e0f51057bfb12e67a1 SHA512 86ac8b1d5eb4c94cc221abdff5c049822b0dfffa201847a599ba39400ae93ad9944b8ad17f0e6a7d38e6c5f7cf727dd46c303f33f3c83224fac4f9c5af81cab6
+EBUILD libbpf-0.0.6.ebuild 1000 BLAKE2B 160f3b9d575fd2553735b2f26ec0ab8b681a002964ae31eba4e9599f541c867f350d55fe4c6e1dfbe6077790bcf3fe9089166538b02973040b51c7bb37d7ce04 SHA512 95785c36fb8ad5130ba55c1c8b996d5e5c1bafd5eb80879494902f7f1fd3c3760c7604d51f36423e121898955b4879b88bb68bdaade76d0c90a2e0f51d27a269
+EBUILD libbpf-0.0.7.ebuild 1005 BLAKE2B b74c9b8a780943160237a87ae3833c996ec5a51685afa4c416ad5ba45f7a932785fd602b51758d2abb9df30e6d5e0b8b44f2ff44c647f473883e696c3eeaadef SHA512 6bf1a72e9bd4e531e35d8914ebac32ce6bac68462dfb5d181b51933108874c65ec50e1de8b31579b5db31d6eb3527159a087bfa730bb2c534dc8bbaed62b9daf
+EBUILD libbpf-9999.ebuild 1145 BLAKE2B 93059dc3ec391006275503f57b4f5fa2d9813d98cc199d04105eaa2092b507f651b941d3e54c87165d59996bbf7eb3383cf5b4b36d97e7ed73f9fe46e908d683 SHA512 708c2d50c9bbf1cc296bdad90d5e2790ec071684291816bf77267c7f153578bbaaddad494e2c1b9e9f8778692319391339fb24c17dbb935fdd4c98046269d4ca
 MISC metadata.xml 305 BLAKE2B d5a605019f99aa1bb75e405bface00e9006038c60d280bdab31ac9a42e3bcf75e2884b3efc8be4e2a88f7e35769b610f0480ccfba291444e8d4ddaecf73a57f9 SHA512 38df62cf50255dcd59c3ab6961643379e549eb568f2c0d010cd8bf73a93fceb0dbdbb32af7b07f21475b4146f99e684aad6928963e56ea8d6777b8f63f8d8a41
diff --git a/dev-libs/libbpf/files/libbpf-9999-paths.patch b/dev-libs/libbpf/files/libbpf-9999-paths.patch
new file mode 100644
index 000000000000..cbc267b64a38
--- /dev/null
+++ b/dev-libs/libbpf/files/libbpf-9999-paths.patch
@@ -0,0 +1,38 @@
+diff --git a/Makefile b/Makefile
+index bc25aba..e1db3d6 100644
+--- a/Makefile
++++ b/Makefile
+@@ -66,7 +66,7 @@ endif
+ PREFIX ?= /usr
+ LIBDIR ?= $(PREFIX)/$(LIBSUBDIR)
+ INCLUDEDIR ?= $(PREFIX)/include
+-UAPIDIR ?= $(PREFIX)/include
++UAPIDIR ?= $(PREFIX)/include/bpf/uapi
+ 
+ TAGS_PROG := $(if $(shell which etags 2>/dev/null),etags,ctags)
+ 
+@@ -89,6 +89,7 @@ $(OBJDIR)/libbpf.so.$(LIBBPF_VERSION): $(SHARED_OBJS)
+ $(OBJDIR)/libbpf.pc:
+ 	sed -e "s|@PREFIX@|$(PREFIX)|" \
+ 		-e "s|@LIBDIR@|$(LIBDIR)|" \
++		-e "s|@UAPIDIR@|$(UAPIDIR)|" \
+ 		-e "s|@VERSION@|$(LIBBPF_VERSION)|" \
+ 		< libbpf.pc.template > $@
+ 
+diff --git a/libbpf.pc.template b/libbpf.pc.template
+index b45ed53..5ec63c2 100644
+--- a/libbpf.pc.template
++++ b/libbpf.pc.template
+@@ -3,10 +3,11 @@
+ prefix=@PREFIX@
+ libdir=@LIBDIR@
+ includedir=${prefix}/include
++uapidir=@UAPIDIR@
+ 
+ Name: libbpf
+ Description: BPF library
+ Version: @VERSION@
+ Libs: -L${libdir} -lbpf
+ Requires.private: libelf zlib
+-Cflags: -I${includedir}
++Cflags: -I${includedir} -I${uapidir}
diff --git a/dev-libs/libbpf/libbpf-0.0.6.ebuild b/dev-libs/libbpf/libbpf-0.0.6.ebuild
index 7e265723db96..0853d4751e03 100644
--- a/dev-libs/libbpf/libbpf-0.0.6.ebuild
+++ b/dev-libs/libbpf/libbpf-0.0.6.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://github.com/libbpf/libbpf"
 DESCRIPTION="Stand-alone build of libbpf from the Linux kernel"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-2 LGPL-2.1 BSD-2"
+LICENSE="LGPL-2.1 BSD-2"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+static-libs"
diff --git a/dev-libs/libbpf/libbpf-0.0.7.ebuild b/dev-libs/libbpf/libbpf-0.0.7.ebuild
index 6ba1ae96c610..43363c91efae 100644
--- a/dev-libs/libbpf/libbpf-0.0.7.ebuild
+++ b/dev-libs/libbpf/libbpf-0.0.7.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://github.com/libbpf/libbpf"
 DESCRIPTION="Stand-alone build of libbpf from the Linux kernel"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-2 LGPL-2.1 BSD-2"
+LICENSE="LGPL-2.1 BSD-2"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+static-libs"
diff --git a/dev-libs/libbpf/libbpf-9999.ebuild b/dev-libs/libbpf/libbpf-9999.ebuild
new file mode 100644
index 000000000000..08e5746d4bf0
--- /dev/null
+++ b/dev-libs/libbpf/libbpf-9999.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit 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 ~arm64 ~x86"
+fi
+
+HOMEPAGE="https://www.kernel.org/doc/html/latest/bpf/bpf_devel_QA.html"
+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}"
+
+S="${WORKDIR}/${P}/src"
+
+PATCHES=(
+	"${FILESDIR}/libbpf-9999-paths.patch"
+)
+
+src_compile() {
+	emake \
+		BUILD_SHARED=y \
+		LIBSUBDIR="$(get_libdir)" \
+		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
+		CC="$(tc-getCC)"
+}
+
+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
+}