dev-libs/libbpf: Remove old patches

- Update 0.3 and 0.4 versions to use 9999 patch since it's the same
  as 0.3 patch

Signed-off-by: Jakov Smolić <jsmolic@gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/22298
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>

6 files changed, 2 insertions, 161 deletions

diff --git a/dev-libs/libbpf/files/libbpf-0.0.5-paths.patch b/dev-libs/libbpf/files/libbpf-0.0.5-paths.patch
deleted file mode 100644
index e9eda9c2dced..000000000000
--- a/dev-libs/libbpf/files/libbpf-0.0.5-paths.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 6992fbf..cefc77a 100644
---- a/Makefile
-+++ b/Makefile
-@@ -64,7 +64,7 @@ endif
- PREFIX ?= /usr
- LIBDIR ?= $(PREFIX)/$(LIBSUBDIR)
- INCLUDEDIR ?= $(PREFIX)/include
--UAPIDIR ?= $(PREFIX)/include
-+UAPIDIR ?= $(PREFIX)/include/bpf/uapi
- 
- all: $(STATIC_LIBS) $(SHARED_LIBS) $(PC_FILE)
- 
-@@ -85,6 +85,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 ac17fce..6d385d9 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
--Cflags: -I${includedir}
-+Cflags: -I${includedir} -I${uapidir}
diff --git a/dev-libs/libbpf/files/libbpf-0.0.7-paths.patch b/dev-libs/libbpf/files/libbpf-0.0.7-paths.patch
deleted file mode 100644
index cbc267b64a38..000000000000
--- a/dev-libs/libbpf/files/libbpf-0.0.7-paths.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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/files/libbpf-0.0.9-fix-hashmap-on-lp32.patch b/dev-libs/libbpf/files/libbpf-0.0.9-fix-hashmap-on-lp32.patch
deleted file mode 100644
index 98baf1cd6051..000000000000
--- a/dev-libs/libbpf/files/libbpf-0.0.9-fix-hashmap-on-lp32.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From cd016d93f7bf280fe6f2dfc723257786dd3ffd00 Mon Sep 17 00:00:00 2001
-From: Jakub Bogusz <qboosh@pld-linux.org>
-Date: Thu, 9 Jul 2020 15:57:23 -0700
-Subject: [PATCH] libbpf: Fix libbpf hashmap on (I)LP32 architectures
-
-On ILP32, 64-bit result was shifted by value calculated for 32-bit long type
-and returned value was much outside hashmap capacity.
-As advised by Andrii Nakryiko, this patch uses different hashing variant for
-architectures with size_t shorter than long long.
-
-Fixes: e3b924224028 ("libbpf: add resizable non-thread safe internal hashmap")
-Signed-off-by: Jakub Bogusz <qboosh@pld-linux.org>
-Signed-off-by: Andrii Nakryiko <andriin@fb.com>
-Signed-off-by: Alexei Starovoitov <ast@kernel.org>
-Link: https://lore.kernel.org/bpf/20200709225723.1069937-1-andriin@fb.com
----
- hashmap.h | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/hashmap.h b/hashmap.h
-index df59fd4..e0af36b 100644
---- a/hashmap.h
-+++ b/hashmap.h
-@@ -11,14 +11,18 @@
- #include <stdbool.h>
- #include <stddef.h>
- #include <limits.h>
--#ifndef __WORDSIZE
--#define __WORDSIZE (__SIZEOF_LONG__ * 8)
--#endif
- 
- static inline size_t hash_bits(size_t h, int bits)
- {
- 	/* shuffle bits and return requested number of upper bits */
--	return (h * 11400714819323198485llu) >> (__WORDSIZE - bits);
-+#if (__SIZEOF_SIZE_T__ == __SIZEOF_LONG_LONG__)
-+	/* LP64 case */
-+	return (h * 11400714819323198485llu) >> (__SIZEOF_LONG_LONG__ * 8 - bits);
-+#elif (__SIZEOF_SIZE_T__ <= __SIZEOF_LONG__)
-+	return (h * 2654435769lu) >> (__SIZEOF_LONG__ * 8 - bits);
-+#else
-+#	error "Unsupported size_t size"
-+#endif
- }
- 
- typedef size_t (*hashmap_hash_fn)(const void *key, void *ctx);
--- 
-2.26.2
-
diff --git a/dev-libs/libbpf/files/libbpf-0.3.0-paths.patch b/dev-libs/libbpf/files/libbpf-0.3.0-paths.patch
deleted file mode 100644
index ff087bb38712..000000000000
--- a/dev-libs/libbpf/files/libbpf-0.3.0-paths.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -76,7 +76,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)
- 
-@@ -101,6 +101,7 @@ $(OBJDIR)/libbpf.so.$(LIBBPF_VERSION): $(SHARED_OBJS)
- $(OBJDIR)/libbpf.pc:
- 	$(Q)sed -e "s|@PREFIX@|$(PREFIX)|" \
- 		-e "s|@LIBDIR@|$(LIBDIR_PC)|" \
-+		-e "s|@UAPIDIR@|$(UAPIDIR)|" \
- 		-e "s|@VERSION@|$(LIBBPF_VERSION)|" \
- 		< libbpf.pc.template > $@
- 
---- 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.3.ebuild b/dev-libs/libbpf/libbpf-0.3.ebuild
index f80ac671a49d..754ab6101584 100644
--- a/dev-libs/libbpf/libbpf-0.3.ebuild
+++ b/dev-libs/libbpf/libbpf-0.3.ebuild
@@ -28,7 +28,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/libbpf-0.3.0-paths.patch"
+	"${FILESDIR}/libbpf-9999-paths.patch"
 )
 
 src_compile() {
diff --git a/dev-libs/libbpf/libbpf-0.4.0.ebuild b/dev-libs/libbpf/libbpf-0.4.0.ebuild
index 0ef44fea2683..438a4a1415ec 100644
--- a/dev-libs/libbpf/libbpf-0.4.0.ebuild
+++ b/dev-libs/libbpf/libbpf-0.4.0.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/libbpf-0.3.0-paths.patch"
+	"${FILESDIR}/libbpf-9999-paths.patch"
 )
 
 src_compile() {