From 64d703effaff1cf2d90313d97b0e018b1088d7b5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 4 Oct 2019 10:31:37 +0200
Subject: [PATCH] bcc: update to 0.11.0.

Move to Python 3.
---
 srcpkgs/bcc/patches/musl.patch      | 12 ------------
 srcpkgs/bcc/template                | 21 +++++++++++----------
 srcpkgs/{python-bcc => python3-bcc} |  0
 3 files changed, 11 insertions(+), 22 deletions(-)
 rename srcpkgs/{python-bcc => python3-bcc} (100%)

diff --git a/srcpkgs/bcc/patches/musl.patch b/srcpkgs/bcc/patches/musl.patch
index 20def02c588..bc7ac1e7726 100644
--- a/srcpkgs/bcc/patches/musl.patch
+++ b/srcpkgs/bcc/patches/musl.patch
@@ -48,15 +48,3 @@
  #include <arpa/inet.h>
  #include <errno.h>
  #include <fcntl.h>
---- src/cc/libbpf/src/hashmap.h.orig	2019-05-29 19:27:27.000000000 +0200
-+++ src/cc/libbpf/src/hashmap.h	2019-06-01 23:57:31.458324372 +0200
-@@ -10,6 +10,9 @@
- 
- #include <stdbool.h>
- #include <stddef.h>
-+#if !defined(__GLIBC__)
-+#include <bits/reg.h>	/* for __WORDSIZE */
-+#endif
- #include "libbpf_internal.h"
- 
- static inline size_t hash_bits(size_t h, int bits)
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index 9bb274fb468..a4d32bce7a4 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,20 +1,21 @@
 # Template file for 'bcc'
 pkgname=bcc
-version=0.10.0
-revision=2
+version=0.11.0
+revision=1
 build_style=cmake
 configure_args="-DREVISION=${version}"
 hostmakedepends="flex"
 makedepends="clang elfutils-devel lld-devel llvm ncurses-devel
- python-devel zlib-devel"
+ python3-devel zlib-devel"
+python_version="3"
 short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
 distfiles="https://github.com/iovisor/${pkgname}/archive/v${version}.tar.gz
- https://github.com/libbpf/libbpf/archive/75db50f4a09d9dbac49b1ace9e4b6a722bdf0519.tar.gz"
-checksum="b02a75bc469a33e6781c915361a49a97d4ec7b45d74cfeffb22693247438d4b0
- 22a7ba2343df699a0332015aa54d4a8aeba1756f58308fed120b60a8900e9d55"
+ https://github.com/libbpf/libbpf/archive/1a26b51b1ca0c33ded075e7563ab40fba686ea0f.tar.gz"
+checksum="18ba73ab285d96b806e59764abba5e6a5fa0c39f5571150b31cf651df3a71b48
+ 3c2e5dc538b338353b05f1ed5d5f2aceee394bbd9b69fec2a7b586a4f9c0274d"
 nocross=yes # https://github.com/voidlinux/void-packages/issues/4738
 
 post_extract() {
@@ -25,7 +26,7 @@ post_extract() {
 }
 bcc-tools_package() {
 	short_desc+=" - tools"
-	depends="python-bcc>=${version}_${revision} linux-headers"
+	depends="python3-bcc>=${version}_${revision} linux-headers"
 	pkg_install() {
 		vmove usr/share/bcc/man/man8
 		mv ${PKGDESTDIR}/usr/share/bcc/man ${PKGDESTDIR}/usr/share/man
@@ -55,10 +56,10 @@ bcc-devel_package() {
 		vmove usr/share/bcc/examples
 	}
 }
-python-bcc_package() {
+python3-bcc_package() {
 	lib32disabled=yes
-	depends="python"
-	short_desc+=" - Python 2.7 module"
+	depends="python3"
+	short_desc+=" - Python 3 module"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pycompile_module="bcc"
 	pkg_install() {
diff --git a/srcpkgs/python-bcc b/srcpkgs/python3-bcc
similarity index 100%
rename from srcpkgs/python-bcc
rename to srcpkgs/python3-bcc