dwarves: upgraded package to upstream
Upgraded dev-util/dwarves to version 1.17 on amd64
This is a pre-requisite for the upgrade to 5.10 kernel
I needed to add python3_6 compatibility for this to work.
BUG=b/173821368
TEST=presubmit
RELEASE_NOTE=None
Change-Id: I1e33407c1d69af79f290874794865edb225e2bb0
Reviewed-on: https://cos-review.googlesource.com/c/third_party/overlays/portage-stable/+/13651
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
Reviewed-by: Vaibhav Rustagi <vaibhavrustagi@google.com>
Reviewed-by: Robert Kolchmeyer <rkolchmeyer@google.com>
Reviewed-by: Roy Yang <royyang@google.com>
diff --git a/dev-util/dwarves/Manifest b/dev-util/dwarves/Manifest
index 8d2f969..d9e3668 100644
--- a/dev-util/dwarves/Manifest
+++ b/dev-util/dwarves/Manifest
@@ -1 +1 @@
-DIST dwarves-1.15.tar.xz 222272 BLAKE2B a33d128ec899da0f0a1e2fc96703f0425fd1a2082675ddf886df55507b29b5fbad1a1cefd6b0a9002f50193b4c70f87a2eeacd50d94388776bb338fe678849e0 SHA512 29a8a15b7190480e79c2f423c7104d0fd275cd4c3df17518a1dd3c63cce1c528fad4b6f580baa397d9aa9323703009009e2d529939b12dd1af2c65cf7120b237
+DIST dwarves-1.17.tar.xz 309028 BLAKE2B 600d095359fa1ef208cc83655761505a07512faf9957144cc5fdd9e69bef98be3afc8b29a4c13aa0246aa43fdc9b4906de95f37c86fc6790ece52a79e3b13695 SHA512 8916ea24316efe1eb322d045fb2d81c230905f2fe33942eac641e9e0311f33a3bcf55be454eac32781799c255303bafacd8f1bd1b3ec08f0dae4d5f38d8186ba
diff --git a/dev-util/dwarves/dwarves-1.15.ebuild b/dev-util/dwarves/dwarves-1.17.ebuild
similarity index 82%
rename from dev-util/dwarves/dwarves-1.15.ebuild
rename to dev-util/dwarves/dwarves-1.17.ebuild
index c85a74d..0d30dea 100644
--- a/dev-util/dwarves/dwarves-1.15.ebuild
+++ b/dev-util/dwarves/dwarves-1.17.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit multilib cmake-utils python-single-r1
DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
@@ -16,19 +16,21 @@
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
- >=dev-libs/elfutils-0.131
+ >=dev-libs/elfutils-0.178
sys-libs/zlib"
DEPEND="${RDEPEND}"
if [[ ${PV//_p} == ${PV} ]]; then
SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.xz"
- S=${WORKDIR}
else
SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
fi
DOCS=( README README.ctracer NEWS )
-PATCHES=( "${FILESDIR}"/${PN}-1.10-python-import.patch )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.10-python-import.patch
+)
src_configure() {
local mycmakeargs=( "-D__LIB=$(get_libdir)" )
diff --git a/metadata/md5-cache/dev-util/dwarves-1.15 b/metadata/md5-cache/dev-util/dwarves-1.15
deleted file mode 100644
index 87b3860..0000000
--- a/metadata/md5-cache/dev-util/dwarves-1.15
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/elfutils-0.131 sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=pahole (Poke-a-Hole) and other DWARF2 utilities
-EAPI=6
-HOMEPAGE=https://git.kernel.org/cgit/devel/pahole/pahole.git/
-IUSE=debug +python_single_target_python3_6
-KEYWORDS=*
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/elfutils-0.131 sys-libs/zlib
-REQUIRED_USE=^^ ( python_single_target_python3_6 )
-SLOT=0
-SRC_URI=http://fedorapeople.org/~acme/dwarves/dwarves-1.15.tar.xz
-_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 5d5921a298e95441da2f85be419894c0 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing e32940a7b2a9992ad217eccddb84d548 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 674c48c926cbb44e91b656e0399d8f54 python-utils-r1 157a6a7a3e99c7dbdf81acc9dd4f57cd toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=1bee38662eb09946e8c383f5e406d9b8
diff --git a/metadata/md5-cache/dev-util/dwarves-1.17 b/metadata/md5-cache/dev-util/dwarves-1.17
new file mode 100644
index 0000000..ae4702e
--- /dev/null
+++ b/metadata/md5-cache/dev-util/dwarves-1.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-libs/elfutils-0.178 sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=pahole (Poke-a-Hole) and other DWARF2 utilities
+EAPI=6
+HOMEPAGE=https://git.kernel.org/cgit/devel/pahole/pahole.git/
+IUSE=debug python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=*
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-libs/elfutils-0.178 sys-libs/zlib
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=http://fedorapeople.org/~acme/dwarves/dwarves-1.17.tar.xz
+_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 5d5921a298e95441da2f85be419894c0 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing e32940a7b2a9992ad217eccddb84d548 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 674c48c926cbb44e91b656e0399d8f54 python-utils-r1 157a6a7a3e99c7dbdf81acc9dd4f57cd toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=3097952cde03b868d8ecf38e21264683
