From b2dee4fd885048d9a5cf541ec7d8338bc9b28899 Mon Sep 17 00:00:00 2001
From: Jan Ziak <0xe2.0x9a.0x9b@gmail.com>
Date: Fri, 7 Aug 2020 20:51:59 +0200
Subject: [PATCH] dev-util/dwarves: switch to EAPI 7 and cleanup ebuild

As a consequence of EAPI 7, python-single-target
is switched from 3.6 to 3.7.

This patch also removes the unused "debug" USE flag.

Closes: https://bugs.gentoo.org/732924
Signed-off-by: Jan Ziak <0xe2.0x9a.0x9b@gmail.com>
---
 dev-util/dwarves/dwarves-1.17.ebuild |  9 ++++-----
 dev-util/dwarves/dwarves-9999.ebuild | 11 +++++------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/dev-util/dwarves/dwarves-1.17.ebuild b/dev-util/dwarves/dwarves-1.17.ebuild
index eb23c66249d..4c7741670cf 100644
--- a/dev-util/dwarves/dwarves-1.17.ebuild
+++ b/dev-util/dwarves/dwarves-1.17.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit multilib cmake-utils python-single-r1
+inherit cmake python-single-r1
 
 DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
 HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
@@ -12,7 +12,6 @@ HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
 LICENSE="GPL-2" # only
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="debug"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
@@ -34,11 +33,11 @@ PATCHES=(
 
 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
 }
diff --git a/dev-util/dwarves/dwarves-9999.ebuild b/dev-util/dwarves/dwarves-9999.ebuild
index 7eb6207bcb2..2baf1601c37 100644
--- a/dev-util/dwarves/dwarves-9999.ebuild
+++ b/dev-util/dwarves/dwarves-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/pahole/pahole.git"
 
-PYTHON_COMPAT=( python3_6 )
-inherit multilib cmake-utils git-r3 python-single-r1
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit cmake git-r3 python-single-r1
 
 DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
 HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
@@ -14,7 +14,6 @@ HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
 LICENSE="GPL-2" # only
 SLOT="0"
 KEYWORDS=""
-IUSE="debug"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
@@ -30,11 +29,11 @@ PATCHES=(
 
 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
 }
-- 
2.28.0