gentoo resync : 29.05.2018

3 files changed, 2 insertions, 55 deletions

diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index d9dbd00eb749..630d47c472bf 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -1,5 +1,3 @@
-DIST bcc-0.5.0.tar.gz 1764775 BLAKE2B e1e059b83846115347f225e968edd2823408c26f4f25a89e26c663147ca9c379222c4f1d97578f7cf981fbbb23307deab408bcb278cb26fde5399afbbceb1e39 SHA512 12de5ef04185dccd0847fc97ae855b386e0c81b545ae497af797667925ebedf97164c17fb99468abae3f87fb3ddfdba5200070f80b3bbcad63c2355497012f0e
 DIST bcc-0.5.0_p20171230.tar.gz 1773522 BLAKE2B bc5ec32570cf230f071c10d2925a8c8a777c60c22d31bbf72f3cad1718e59dacd604e45a326ff2a941aa519a2b3544bc7376dd40ceafe154c497b488e0ec1b9b SHA512 d8e810768b5801c0beef98a13ee23eb8aa756f7f8a3e35f6a391958e30affc5a8622a9b75c785f66d86761105045cb2b1c7ce284f3ac3b482a4605987bea9f30
-EBUILD bcc-0.5.0.ebuild 1094 BLAKE2B fd1c7b5e5fc687b69dbd94c4402ffc810d9296b935cf04acaea509570c059ab072b9260614308fd7430b5912e0b2d369a823b806e5fcce0a2dd0050f4ed3a838 SHA512 c670c31428c55d670c7a2af790e10c143fbc02fc2d6a60056018e89d1fcea7d1bac35d855e4bbef6a8961ab2852e1b6e7823ec249d25dc3be711a7dea3b5888a
-EBUILD bcc-0.5.0_p20171230.ebuild 1128 BLAKE2B 2b43727b4b2008ef6e3480f5cc2b94a3ec8947ab23bd14c0ae67a9c6a9877300b451950aec402f0a5dc593610b909f7c831bc1994947c5d0ac5313cfb7671c2a SHA512 c50cd6a6bd11d05636c47621ce154af4ec2ef146b509fd772e717eac506744ecf7c93a3a827825eff92100647affe3320af48b77828462a21e062da3afd37090
+EBUILD bcc-0.5.0_p20171230.ebuild 1171 BLAKE2B 5d895b41e7608473e636fae524091fad9da737394216b71077cd364c5cf5f044b1409fcf6e90afb56de0a4fa852ad479491ec1d84be3c65dcd3727cab6e45be5 SHA512 d1b25d2299af9430a5814109c9be17b9047b18e84d57feb92f3d3efbc82e665afc849624384ff21812cf342c8cf3b9378ba164943e54d6702b365cccc4a71f83
 MISC metadata.xml 302 BLAKE2B 1c06a0a2737ee7f574578ffa657d131a6c296e7f21dbf79f77f47f77814779b82fa6d2d7e21aa6700e11ce3c11daec48595db4a82d06e11eddeaacd377cf8fe4 SHA512 56eecad64a95bef18df26d32d87911e46c8222079387c946b086c38be9b22ec07dbd715344f373ca486758dadf65d84f1ec289af065f964adcff8b2e8906b6ad
diff --git a/dev-util/bcc/bcc-0.5.0.ebuild b/dev-util/bcc/bcc-0.5.0.ebuild
deleted file mode 100644
index 0e8e32826953..000000000000
--- a/dev-util/bcc/bcc-0.5.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit cmake-utils linux-info python-single-r1 python-utils-r1
-
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
-HOMEPAGE="https://iovisor.github.io/bcc/"
-EGIT_COMMIT="v${PV}"
-SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-RESTRICT="test"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=dev-libs/elfutils-0.166:=
-	sys-devel/clang:=
-	>=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-S=${WORKDIR}/${PN}-${EGIT_COMMIT#v}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~BPF_JIT ~BPF_EVENTS"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DREVISION=${PV%%_*}
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${ED}"
-}
diff --git a/dev-util/bcc/bcc-0.5.0_p20171230.ebuild b/dev-util/bcc/bcc-0.5.0_p20171230.ebuild
index 5062f45dfd85..a37a5992ad07 100644
--- a/dev-util/bcc/bcc-0.5.0_p20171230.ebuild
+++ b/dev-util/bcc/bcc-0.5.0_p20171230.ebuild
@@ -28,7 +28,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT#v}
 
 pkg_pretend() {
 	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~BPF_JIT ~BPF_EVENTS"
+		~BPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL"
 
 	check_extra_config
 }