sys-devel/binutils: update live ebuild to EAPI=7

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>

diff --git a/sys-devel/binutils/binutils-2.33.1.ebuild b/sys-devel/binutils/binutils-2.33.1.ebuild
index e4e5fd60e8224f7a188e65df021ae48c535ceb01..e7f493b2b0e20e981b8214fdb6d174165b7b52f2 100644 (file)
--- a/sys-devel/binutils/binutils-2.33.1.ebuild
+++ b/sys-devel/binutils/binutils-2.33.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils libtool flag-o-matic gnuconfig multilib versionator
+inherit eutils libtool flag-o-matic gnuconfig multilib
 
 DESCRIPTION="Tools necessary to build programs"
 HOMEPAGE="https://sourceware.org/binutils/"
@@ -36,13 +36,13 @@ case ${PV} in
                inherit git-r3
                S=${WORKDIR}/binutils
                EGIT_CHECKOUT_DIR=${S}
-               EGIT_BRANCH=$(get_version_component_range 1-2)
+               EGIT_BRANCH=$(ver_cut 1-2)
                EGIT_BRANCH="binutils-${EGIT_BRANCH/./_}-branch"
-               SLOT=$(get_version_component_range 1-2)
+               SLOT=$(ver_cut 1-2)
                ;;
        *)
                SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
-               SLOT=$(get_version_component_range 1-2)
+               SLOT=$(ver_cut 1-2)
                ;;
 esac
 

diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild
index ac40bd24d645bde509285bf5e066803ff73a4f41..ef0da89a59f5c0fe3e97a8795658f3ece08fa89a 100644 (file)
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils libtool flag-o-matic gnuconfig multilib versionator
+inherit eutils libtool flag-o-matic gnuconfig multilib
 
 DESCRIPTION="Tools necessary to build programs"
 HOMEPAGE="https://sourceware.org/binutils/"
@@ -35,13 +35,13 @@ case ${PV} in
                inherit git-r3
                S=${WORKDIR}/binutils
                EGIT_CHECKOUT_DIR=${S}
-               EGIT_BRANCH=$(get_version_component_range 1-2)
+               EGIT_BRANCH=$(ver_cut 1-2)
                EGIT_BRANCH="binutils-${EGIT_BRANCH/./_}-branch"
-               SLOT=$(get_version_component_range 1-2)
+               SLOT=$(ver_cut 1-2)
                ;;
        *)
                SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
-               SLOT=$(get_version_component_range 1-2)
+               SLOT=$(ver_cut 1-2)
                ;;
 esac