gentoo resync : 31.05.2021

3 files changed, 7 insertions, 50 deletions

diff --git a/dev-util/uftrace/Manifest b/dev-util/uftrace/Manifest
index 4feaabc1e235..9c830c414d9d 100644
--- a/dev-util/uftrace/Manifest
+++ b/dev-util/uftrace/Manifest
@@ -1,4 +1,3 @@
-DIST uftrace-0.9.4.tar.gz 1068091 BLAKE2B cbf9ead0e2c0e8d59be379e65617cfa310fd4134cfbbc8091c489913f108e8a7a0b81e33d46032f3717a5bb8127cbeeeb246e3be0c37da03981dac4bacc07119 SHA512 f73ad4461051b9c61668161e077897d118ac556d234ff204e32bf14ecdc2c0df148da30ea5d5054641e79ea20b29261d6f637908f5047f5669207ef244865358
-EBUILD uftrace-0.9.4-r100.ebuild 1137 BLAKE2B 78c1fe9945a099d538963d188ebf91f83018620659567b713a0c0b169ed7aa9c5687ae126d534b0d060f95c4f8897413baebff50acceea6b31f45060136bf815 SHA512 2a111b38989d73bfb15af823ad98417946200a71fa6851e22828d7fbc5ce4ff30157bb4908c41f993290e9b9e4a7558816bdc02eba45bb6737cc53e9a1ee7a7b
-EBUILD uftrace-0.9.4.ebuild 906 BLAKE2B 1dac005c9729ba654a2fb47bb9f62ea3133980bc13b15082a0f456ac11916e405eb68a0b82f2fb4aee8fb08195cc02036dd3a642be920e1d7815b26faef9c709 SHA512 6d2efb66d03e8f0aa828167d7803da3582e43e87c885ce5ed70d59b150d41b3db2206dc50358603f9ab98b418e6ef299d4d6b3161760ae24264f57723ed9ce31
+DIST uftrace-0.10.tar.gz 1111530 BLAKE2B 29388523e1009276ba4609d85e5979e823d028ff647239aa02ec2cac5ae21c7812c7699d47c09c0b9289a0debb39a2f502615547c8e658a821d5078e3b12c6fe SHA512 788234e4156974a70f06d02527e56e5fac821e8b66363dc5fc55d68797c374043c0b66b18b4ab1488b9647e08969e8dc94a64d6bb1a38ccad4cf98eaecc6e919
+EBUILD uftrace-0.10.ebuild 1240 BLAKE2B ba99f53ac6b6b7e05f827a7d19efc507c31a0adbb9a3891083e823bedf4f5c19be48423dc4f35a41870f736239264736562842f5b681d1df8f2f18e56171d1af SHA512 cda749f52dadbe3a501dabae3b9a9a777183312b8c014b20700dfd73afcf9d82cf2191f22ce41aa8f18e611d1bb0e9a9a6119e737f840809128aa7a00aa9def8
 MISC metadata.xml 438 BLAKE2B a270f82a149c32758b8d0054b5f1204add5dabd8812ce01e6c9ed9e0a71aa38bfef9def386f8a2c6f67cae59c63e58fbff8b3f00a3cea5a334ee41434f3c6fa1 SHA512 774d0ec195987c0b98467e03a18c1eb4e2880d5c5d63e3864b5aee84981e0539197d74530a64068399dac7c0eb28e7570a0b8242e0ecf049f79d995eab884a8d
diff --git a/dev-util/uftrace/uftrace-0.9.4-r100.ebuild b/dev-util/uftrace/uftrace-0.10.ebuild
index 87ccea5aec88..92c30228011d 100644
--- a/dev-util/uftrace/uftrace-0.9.4-r100.ebuild
+++ b/dev-util/uftrace/uftrace-0.10.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 LUA_COMPAT=( luajit )
 
-inherit bash-completion-r1 lua-single
+inherit bash-completion-r1 lua-single toolchain-funcs
 
 DESCRIPTION="Function (graph) tracer for user-space"
 HOMEPAGE="https://github.com/namhyung/uftrace"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/namhyung/uftrace/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="bash-completion capstone lua"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
@@ -35,6 +35,7 @@ src_prepare() {
 
 src_configure() {
 	local myconf=(
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/uftrace
 		$(use_with capstone)
 		--without-libpython
 	)
@@ -47,7 +48,7 @@ src_configure() {
 			--without-libluajit
 		)
 	fi
-	econf "${myconf[@]}"
+	CC=$(tc-getCC) LD=$(tc-getLD) econf "${myconf[@]}"
 }
 
 src_compile() {
diff --git a/dev-util/uftrace/uftrace-0.9.4.ebuild b/dev-util/uftrace/uftrace-0.9.4.ebuild
deleted file mode 100644
index 51506dbff692..000000000000
--- a/dev-util/uftrace/uftrace-0.9.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1
-
-DESCRIPTION="Function (graph) tracer for user-space"
-HOMEPAGE="https://github.com/namhyung/uftrace"
-SRC_URI="https://github.com/namhyung/uftrace/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="bash-completion capstone luajit"
-
-RESTRICT="test"
-
-RDEPEND="
-	sys-libs/ncurses:=
-	virtual/libelf:=
-	capstone? ( dev-libs/capstone:0= )
-	luajit? ( dev-lang/luajit )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -i -e "s/ARCH/MYARCH/g" -e "/ldconfig/d" -e "/bash.completion/d" Makefile || die
-}
-
-src_configure() {
-	econf \
-		$(use_with capstone) \
-		$(use_with luajit libluajit) \
-		--without-libpython
-}
-
-src_install() {
-	default
-	dodoc doc/*.{md,gif,png}
-	use bash-completion && newbashcomp misc/bash-completion.sh uftrace
-}