commit:     30bf5e5943cd393d43c304bdd88722fb6789122c
Author:     Dave Hughes <davidhughes205 <AT> gmail <DOT> com>
AuthorDate: Sat Mar 13 14:29:01 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 13 21:02:39 2021 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=30bf5e59

dev-util/dwaves: bump 1.17 to EAPI 7

Package-Manager: Portage-3.0.17, Repoman-3.0.2
RepoMan-Options: --force
Manifest-Sign-Key: 0xA1919C830E9498E0
Signed-off-by: Dave Hughes <davidhughes205 <AT> gmail.com>
Closes: https://github.com/gentoo/musl/pull/415
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/dwarves/Manifest                           | 21 +++++++++++++++++++++
 .../{dwarves-1.17.ebuild => dwarves-1.17-r2.ebuild} | 21 +++++++++++++--------
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/dev-util/dwarves/Manifest b/dev-util/dwarves/Manifest
index d9e3668..815929a 100644
--- a/dev-util/dwarves/Manifest
+++ b/dev-util/dwarves/Manifest
@@ -1 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST dwarves-1.17.tar.xz 309028 BLAKE2B 
600d095359fa1ef208cc83655761505a07512faf9957144cc5fdd9e69bef98be3afc8b29a4c13aa0246aa43fdc9b4906de95f37c86fc6790ece52a79e3b13695
 SHA512 
8916ea24316efe1eb322d045fb2d81c230905f2fe33942eac641e9e0311f33a3bcf55be454eac32781799c255303bafacd8f1bd1b3ec08f0dae4d5f38d8186ba
+-----BEGIN PGP SIGNATURE-----
+
+iQKTBAEBCAB9FiEEZdLCSnfk9z83VSkfsaMsEcx8U7oFAmBMzChfFIAAAAAALgAo
+aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY1
+RDJDMjRBNzdFNEY3M0YzNzU1MjkxRkIxQTMyQzExQ0M3QzUzQkEACgkQsaMsEcx8
+U7rBEA//WH5x5HWKRNOOBbZVYpbnozi7OnKe4x6lYO46MArNG6GIeEidAp1sAhLS
+aYD62aUY7DwsQ/3K7JTf4931OF58jQr0b1ew6FWZHTMyy8Wy3rFW4d74m3+Cjkkm
+hMwJKj7ZWOezIEGR9u4djNz5YjUPOdieQMeFhFDzeI8cP8NscVKTxC0FlVVc8BP6
+h3bp9mbEJUbDZBmvYXrfw67spd2v7ww256Q9Is6rEhjbN5vGLuWh9G+/oiZr0VlK
+eqmyYFNW3wreKxkoLHO+orHKg+Z8c8rBL2t4NSHF7Va6QfCO4mlloHFWA5hPXysp
+W0zcJi3J9waUQw/BFLpa/XK7JN6sdlIicJyvVYOq4nv40/6fcC/CphyjIQvj6O84
+ZVfAS9PJc2jMV2gBqX8QF8KIvE5fqNiy1aefoHSW3UcPrqP1TAFUjtDihQIWn6Ra
++V34zNRkKk5F5FN/p5GHu8eC+afYK+nGRs3ylEtIQnQ5sl5gxCLhw6cMebd+H89i
+7cfinL486bCoDy8/sfBop25dToE0OAHzlhjZRWGrI1UlPTE6et2GpgSSNUCSKLZ9
+nIJcvHeQrwl+qXkwFb8A0fP6Jg5mHXeYXRhLXPU6De8XoRC8SITmScpP+fwEe++T
+rAaW5DVPPaDwDEJj7024Cz8rWdgZSnXQmYYQFWRbF29Tv365Wrk=
+=OZ4I
+-----END PGP SIGNATURE-----

diff --git a/dev-util/dwarves/dwarves-1.17.ebuild 
b/dev-util/dwarves/dwarves-1.17-r2.ebuild
similarity index 75%
rename from dev-util/dwarves/dwarves-1.17.ebuild
rename to dev-util/dwarves/dwarves-1.17-r2.ebuild
index 9a0f65b..07a3991 100644
--- a/dev-util/dwarves/dwarves-1.17.ebuild
+++ b/dev-util/dwarves/dwarves-1.17-r2.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8} )
-inherit multilib cmake-utils python-single-r1
+inherit multilib cmake python-single-r1
 
 DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
 HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/";
 
 LICENSE="GPL-2" # only
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~arm64"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="debug"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -30,17 +30,22 @@ DOCS=( README README.ctracer NEWS )
 
 PATCHES=(
        "${FILESDIR}"/${PN}-1.10-python-import.patch
-       "${FILESDIR}"/${PN}-1.17-musl.patch
-
 )
 
+src_prepare() {
+
+       if use elibc_musl ; then
+               eapply "${FILESDIR}"/dwarves-1.17-musl.patch
+       fi
+}
+
 src_configure() {
        local mycmakeargs=( "-D__LIB=$(get_libdir)" )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_test() { :; }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
 }

Reply via email to