gentoo resync : 29.10.2017

3 files changed, 4 insertions, 63 deletions

diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index f7cd51327f96..f41076303d2f 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -1,9 +1,6 @@
-DIST bcc-0.2.0.tar.gz 1195653 SHA256 8bdea41286dda0605e3e52fc76d345356dc637434935a112e6378e2dcb439a70 SHA512 edb696a5382e2f56d06e6b8b65c37b50e719da944fbce43cbad116c773e759fb51837d57ae3d159d83a489dfd0254b9f50b97dab7116465d57f787cf50d58808 WHIRLPOOL ffa4b47dbb16a73699176bd2926763588c6f5ed73052d58ce8f9c51af1eba82c73ac541458b34d6fbd8cd9b698b37bfedc9c9f312967ce639f45daf4789138b2
-DIST bcc-0.3.0-llvm5-76887992d786064213af87694d2a21745e579338.patch 2600 SHA256 e7bf9b9b46a339431bf272a2f8d19c5977db69a36f1f374c73ef2f95a5d1a3a3 SHA512 1b5330a5a8bb8d7152130e5f2acbd5b3f7cad42cc519ff51312792d529a37eae76881eb1fae74c637de4fab35b5a0d33df7ca2bb55e65daac6b54b08c7037286 WHIRLPOOL 841628d3525429f00dc0a767e9a953702bbaf20fd6a8164d9bf3ee909272ca25a700c965fdb0fcb8de99a43b8d8de9eb8414caaf84239e31f55809d120bf7e6e
-DIST bcc-0.3.0.tar.gz 1645152 SHA256 88f54dff96c30c6e7b45f475938eef790b1c9485f794b1ac6791c4e56007f7cc SHA512 e5a0f9ad1b0ba865b5644a5a4a0ad130708aac882239ed545bcfd74a5d80328361bc92287bad5569710849682501841e89279089efc71a97da4e02bfc709b916 WHIRLPOOL fb06e4bd7e5ffbee104b5ad4d6e6a9004fc77dccf9f9cdebfa16741c899ce16c0154d6700f9eb6f8754c90da69eeb17ac9a3e878b5f75965dbccd13f6ad35abb
 DIST bcc-0.3.0_p20170913.tar.gz 1736513 SHA256 9d6357b50f64d2b0ef2ab4d2ae50397b9cd42eaaff766066e42c50b4b9588b29 SHA512 8298d98fcadc95a2f5f27e1f656f392634c0940cf6ea03f432135477790e770f58dc3e3e0b434391eff8d4e3df6671c250252a29a7344c6adf7606251daef4dd WHIRLPOOL e9a6b9a1aac158ea8fa012a88acd2c5027f8cc44305dc1c135326a8f40d21e81db1382a34fb7f8cab6922845bc7d7867a8fa094e21d03bbb5d7985592f8112e2
-EBUILD bcc-0.2.0-r1.ebuild 1092 SHA256 63f42b71e5295204e2d1c12776a9034bd6cc8c2f31ff269d052369f7211e4b43 SHA512 65c436c1e4891bbad89a119ca2f997bb5616fd57b9d9cc3db8978f9584fa2c79c9531bfef26e7d36066ea3863f65f8a90d42c15691ebfbdd0421b698144f98a3 WHIRLPOOL 69c6e162f70434ece867d45add853725b40fb41ea50f016eb4d94c2352cd6b1d0a960d6bca04264087311206ba0da0e8e8372bc62308f5907df7aa83573426e6
-EBUILD bcc-0.3.0.ebuild 1336 SHA256 1c70193216b49a11ae99db1e7b8604fa9f552a114889e20ba964687cb77af78f SHA512 b0aad430a85e42dbb1089e7e6047a4e18f4ab8286788d6c8e844460acef90d827096c40b752d24ce9218af4394fbc043d70e0ce1ccf0819e1882a48042c7c450 WHIRLPOOL 1f89b809d55f530cb3f1a45a497199399e967e1188e3094af322d0e03de8adb456491b5bf3960200add741fbf070d127fc85338ec30a558797cb7ad5a4f3533a
+DIST bcc-0.4.0.tar.gz 1752520 SHA256 f77dd07262e8365e48589bf0475e3248e4e77deae0f90e4fb77af26255bce87d SHA512 d4bca6ab30ed2d398685a5e142bc55ebd70d29b494ce9fa28d85aceb1843111de8f1c61049712d8be9ab827b65866db07b6be27e82bd243e182b7bbe6fb2014f WHIRLPOOL 769621bc8725ff8797431e0580e1051339e97d2cd07b76a86b68f43a162feadddd253f35a76807e64befbe676030377d3ebc486324c2ad41fb3b33a0c546cd24
 EBUILD bcc-0.3.0_p20170913.ebuild 1128 SHA256 3063d732abffbd6fc87c19d21b833ac9ca2dfe167a1f077c4f8daddbf68d06ad SHA512 3d76907e1322f352b52b4152854ab5d6401a8a23431766ab1238483c5835d5085647cdcfd3507d33eff1d6397f641cdb9666901a0bfa974d9af264f0a4c62a8b WHIRLPOOL 26f33b68c512848050c2da88bbb7c8e2dce61b17490d68f18b514493dc4bf7e16fb28acdf10c0954c93853a6d5f849b54b5e999c5d3ed9aadb0fadd5da3d7944
+EBUILD bcc-0.4.0.ebuild 1094 SHA256 3e3299649051aa6b636fc51fb1ecceb79c4042b866ac6174b94cd846a9b908b1 SHA512 c670c31428c55d670c7a2af790e10c143fbc02fc2d6a60056018e89d1fcea7d1bac35d855e4bbef6a8961ab2852e1b6e7823ec249d25dc3be711a7dea3b5888a WHIRLPOOL 8979d86e828a3d7612433f97da05205162ef23084551f4af85be5db836bd9995f2082671f096aab4edc996f42e33540064a33a34a67fe926e84fab75a02cd1b0
 MISC ChangeLog 2234 SHA256 9c06fa32ab1f5f70b46fb9f532a100cf2fc6334a8e56acbe98c36790bd742b05 SHA512 64348b9da78d4eedd466a546963e00137febf79393f7cc994954f6b100113af67135826eb7eb6d435cceb9f30d6b3da1456830eef36759815bc8a9602bc77874 WHIRLPOOL bf4567bfe2873e93bd93b9844b2bf7cf4aa8110797e7e078ee38dbac57d6085a8726a5040a89fbc08ff8f59d07b8f9936648c87abde7673732d72e0a1425c3ae
 MISC metadata.xml 302 SHA256 e3eb82c5af7b22ad9f5286db9672a578297ad2f22d4b772b5ea4cd44c2e4b69a SHA512 56eecad64a95bef18df26d32d87911e46c8222079387c946b086c38be9b22ec07dbd715344f373ca486758dadf65d84f1ec289af065f964adcff8b2e8906b6ad WHIRLPOOL f78bcf5f51b88e732e3844a2ef413ab3ffa3aebefa6d15efb11df441b367999900389925bcc8c4909d96766f589fe9f22176f0e6a1ec8b15ddae0c96ae7b8abb
diff --git a/dev-util/bcc/bcc-0.3.0.ebuild b/dev-util/bcc/bcc-0.3.0.ebuild
deleted file mode 100644
index 4c73ab15df1c..000000000000
--- a/dev-util/bcc/bcc-0.3.0.ebuild
+++ /dev/null
@@ -1,56 +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
-	https://github.com/iovisor/bcc/commit/76887992d786064213af87694d2a21745e579338.patch -> bcc-0.3.0-llvm5-76887992d786064213af87694d2a21745e579338.patch"
-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}
-
-PATCHES=(
-	"${DISTDIR}/bcc-0.3.0-llvm5-76887992d786064213af87694d2a21745e579338.patch"
-)
-
-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.2.0-r1.ebuild b/dev-util/bcc/bcc-0.4.0.ebuild
index 4cd829860f84..0e8e32826953 100644
--- a/dev-util/bcc/bcc-0.2.0-r1.ebuild
+++ b/dev-util/bcc/bcc-0.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# 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} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 inherit cmake-utils linux-info python-single-r1 python-utils-r1