commit:     c40560cdb0583fe0628e623012abf62635fa07fd
Author:     Rob Walker <bob.mt.wya <AT> gmail <DOT> com>
AuthorDate: Sun Oct 21 13:17:43 2018 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Mon Oct 22 23:28:08 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=c40560cd

app-emulation/wine-staging: migrate to new eapi7-ver eclass

Signed-off-by: Rob Walker <bob.mt.wya <AT> gmail.com>

 app-emulation/wine-staging/wine-staging-2.0-r1.ebuild  | 4 ++--
 app-emulation/wine-staging/wine-staging-2.1-r1.ebuild  | 4 ++--
 app-emulation/wine-staging/wine-staging-2.10-r1.ebuild | 4 ++--
 app-emulation/wine-staging/wine-staging-2.11-r1.ebuild | 4 ++--
 app-emulation/wine-staging/wine-staging-2.12-r1.ebuild | 4 ++--
 app-emulation/wine-staging/wine-staging-2.13-r1.ebuild | 4 ++--
 app-emulation/wine-staging/wine-staging-2.14-r1.ebuild | 4 ++--
 app-emulation/wine-staging/wine-staging-2.15-r1.ebuild | 4 ++--
 app-emulation/wine-staging/wine-staging-2.16-r1.ebuild | 4 ++--
 app-emulation/wine-staging/wine-staging-2.17-r1.ebuild | 4 ++--
 app-emulation/wine-staging/wine-staging-2.18.ebuild    | 4 ++--
 app-emulation/wine-staging/wine-staging-2.19.ebuild    | 4 ++--
 app-emulation/wine-staging/wine-staging-2.2-r1.ebuild  | 4 ++--
 app-emulation/wine-staging/wine-staging-2.20.ebuild    | 4 ++--
 app-emulation/wine-staging/wine-staging-2.21.ebuild    | 4 ++--
 app-emulation/wine-staging/wine-staging-2.3-r1.ebuild  | 4 ++--
 app-emulation/wine-staging/wine-staging-2.4-r1.ebuild  | 4 ++--
 app-emulation/wine-staging/wine-staging-2.5-r1.ebuild  | 4 ++--
 app-emulation/wine-staging/wine-staging-2.6-r1.ebuild  | 4 ++--
 app-emulation/wine-staging/wine-staging-2.7-r1.ebuild  | 4 ++--
 app-emulation/wine-staging/wine-staging-2.8-r1.ebuild  | 4 ++--
 app-emulation/wine-staging/wine-staging-2.9-r1.ebuild  | 4 ++--
 app-emulation/wine-staging/wine-staging-3.10.ebuild    | 4 ++--
 app-emulation/wine-staging/wine-staging-3.11.ebuild    | 4 ++--
 app-emulation/wine-staging/wine-staging-3.12.ebuild    | 4 ++--
 app-emulation/wine-staging/wine-staging-3.13-r1.ebuild | 4 ++--
 app-emulation/wine-staging/wine-staging-3.13.ebuild    | 4 ++--
 app-emulation/wine-staging/wine-staging-3.14.ebuild    | 4 ++--
 app-emulation/wine-staging/wine-staging-3.15.ebuild    | 4 ++--
 app-emulation/wine-staging/wine-staging-3.16.ebuild    | 4 ++--
 app-emulation/wine-staging/wine-staging-3.17.ebuild    | 4 ++--
 app-emulation/wine-staging/wine-staging-3.18.ebuild    | 4 ++--
 app-emulation/wine-staging/wine-staging-3.3.ebuild     | 4 ++--
 app-emulation/wine-staging/wine-staging-3.4.ebuild     | 4 ++--
 app-emulation/wine-staging/wine-staging-3.5.ebuild     | 4 ++--
 app-emulation/wine-staging/wine-staging-3.6.ebuild     | 4 ++--
 app-emulation/wine-staging/wine-staging-3.7.ebuild     | 4 ++--
 app-emulation/wine-staging/wine-staging-3.8.ebuild     | 4 ++--
 app-emulation/wine-staging/wine-staging-3.9.ebuild     | 4 ++--
 app-emulation/wine-staging/wine-staging-9999.ebuild    | 4 ++--
 40 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild
index e71203b..55f43c3 100644
--- a/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.bz2";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-2.1-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-2.1-r1.ebuild
index 6ffcc82..f3421ea 100644
--- a/app-emulation/wine-staging/wine-staging-2.1-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.1-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-2.10-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-2.10-r1.ebuild
index 7330e98..2badf87 100644
--- a/app-emulation/wine-staging/wine-staging-2.10-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.10-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-2.11-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-2.11-r1.ebuild
index 7330e98..2badf87 100644
--- a/app-emulation/wine-staging/wine-staging-2.11-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.11-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-2.12-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-2.12-r1.ebuild
index 7330e98..2badf87 100644
--- a/app-emulation/wine-staging/wine-staging-2.12-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.12-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-2.13-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-2.13-r1.ebuild
index 7330e98..2badf87 100644
--- a/app-emulation/wine-staging/wine-staging-2.13-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.13-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-2.14-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-2.14-r1.ebuild
index 0091e24..a40013c 100644
--- a/app-emulation/wine-staging/wine-staging-2.14-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.14-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-2.15-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-2.15-r1.ebuild
index 0091e24..a40013c 100644
--- a/app-emulation/wine-staging/wine-staging-2.15-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.15-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-2.16-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-2.16-r1.ebuild
index 0091e24..a40013c 100644
--- a/app-emulation/wine-staging/wine-staging-2.16-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.16-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-2.17-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-2.17-r1.ebuild
index 0091e24..a40013c 100644
--- a/app-emulation/wine-staging/wine-staging-2.17-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.17-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-2.18.ebuild 
b/app-emulation/wine-staging/wine-staging-2.18.ebuild
index e52f5f1..98b1e99 100644
--- a/app-emulation/wine-staging/wine-staging-2.18.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.18.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-2.19.ebuild 
b/app-emulation/wine-staging/wine-staging-2.19.ebuild
index e52f5f1..98b1e99 100644
--- a/app-emulation/wine-staging/wine-staging-2.19.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.19.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-2.2-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-2.2-r1.ebuild
index 6ffcc82..f3421ea 100644
--- a/app-emulation/wine-staging/wine-staging-2.2-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-2.20.ebuild 
b/app-emulation/wine-staging/wine-staging-2.20.ebuild
index 9f331b3..bbb15a7 100644
--- a/app-emulation/wine-staging/wine-staging-2.20.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.20.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-2.21.ebuild 
b/app-emulation/wine-staging/wine-staging-2.21.ebuild
index 9f331b3..bbb15a7 100644
--- a/app-emulation/wine-staging/wine-staging-2.21.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.21.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-2.3-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-2.3-r1.ebuild
index 6ffcc82..f3421ea 100644
--- a/app-emulation/wine-staging/wine-staging-2.3-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.3-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-2.4-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-2.4-r1.ebuild
index 5a05653..6f9a40f 100644
--- a/app-emulation/wine-staging/wine-staging-2.4-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.4-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-2.5-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-2.5-r1.ebuild
index 5a05653..6f9a40f 100644
--- a/app-emulation/wine-staging/wine-staging-2.5-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.5-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-2.6-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-2.6-r1.ebuild
index 5a05653..6f9a40f 100644
--- a/app-emulation/wine-staging/wine-staging-2.6-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.6-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-2.7-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-2.7-r1.ebuild
index 5a05653..6f9a40f 100644
--- a/app-emulation/wine-staging/wine-staging-2.7-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.7-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-2.8-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-2.8-r1.ebuild
index 5a05653..6f9a40f 100644
--- a/app-emulation/wine-staging/wine-staging-2.8-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.8-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-2.9-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-2.9-r1.ebuild
index 7330e98..2badf87 100644
--- a/app-emulation/wine-staging/wine-staging-2.9-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.9-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-3.10.ebuild 
b/app-emulation/wine-staging/wine-staging-3.10.ebuild
index e2001b7..3b24897 100644
--- a/app-emulation/wine-staging/wine-staging-3.10.ebuild
+++ b/app-emulation/wine-staging/wine-staging-3.10.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-3.11.ebuild 
b/app-emulation/wine-staging/wine-staging-3.11.ebuild
index 4733f23..df1f689 100644
--- a/app-emulation/wine-staging/wine-staging-3.11.ebuild
+++ b/app-emulation/wine-staging/wine-staging-3.11.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-3.12.ebuild 
b/app-emulation/wine-staging/wine-staging-3.12.ebuild
index e170148..b9fb222 100644
--- a/app-emulation/wine-staging/wine-staging-3.12.ebuild
+++ b/app-emulation/wine-staging/wine-staging-3.12.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-3.13-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-3.13-r1.ebuild
index 3972957..e0618a3 100644
--- a/app-emulation/wine-staging/wine-staging-3.13-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-3.13-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-3.13.ebuild 
b/app-emulation/wine-staging/wine-staging-3.13.ebuild
index 3972957..e0618a3 100644
--- a/app-emulation/wine-staging/wine-staging-3.13.ebuild
+++ b/app-emulation/wine-staging/wine-staging-3.13.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-3.14.ebuild 
b/app-emulation/wine-staging/wine-staging-3.14.ebuild
index 3972957..e0618a3 100644
--- a/app-emulation/wine-staging/wine-staging-3.14.ebuild
+++ b/app-emulation/wine-staging/wine-staging-3.14.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-3.15.ebuild 
b/app-emulation/wine-staging/wine-staging-3.15.ebuild
index 3972957..e0618a3 100644
--- a/app-emulation/wine-staging/wine-staging-3.15.ebuild
+++ b/app-emulation/wine-staging/wine-staging-3.15.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-3.16.ebuild 
b/app-emulation/wine-staging/wine-staging-3.16.ebuild
index 3972957..e0618a3 100644
--- a/app-emulation/wine-staging/wine-staging-3.16.ebuild
+++ b/app-emulation/wine-staging/wine-staging-3.16.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-3.17.ebuild 
b/app-emulation/wine-staging/wine-staging-3.17.ebuild
index d14f02c..17d7b7d 100644
--- a/app-emulation/wine-staging/wine-staging-3.17.ebuild
+++ b/app-emulation/wine-staging/wine-staging-3.17.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-3.18.ebuild 
b/app-emulation/wine-staging/wine-staging-3.18.ebuild
index d14f02c..17d7b7d 100644
--- a/app-emulation/wine-staging/wine-staging-3.18.ebuild
+++ b/app-emulation/wine-staging/wine-staging-3.18.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-3.3.ebuild 
b/app-emulation/wine-staging/wine-staging-3.3.ebuild
index 27d7435..84899af 100644
--- a/app-emulation/wine-staging/wine-staging-3.3.ebuild
+++ b/app-emulation/wine-staging/wine-staging-3.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-3.4.ebuild 
b/app-emulation/wine-staging/wine-staging-3.4.ebuild
index 27d7435..84899af 100644
--- a/app-emulation/wine-staging/wine-staging-3.4.ebuild
+++ b/app-emulation/wine-staging/wine-staging-3.4.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-3.5.ebuild 
b/app-emulation/wine-staging/wine-staging-3.5.ebuild
index 27d7435..84899af 100644
--- a/app-emulation/wine-staging/wine-staging-3.5.ebuild
+++ b/app-emulation/wine-staging/wine-staging-3.5.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-3.6.ebuild 
b/app-emulation/wine-staging/wine-staging-3.6.ebuild
index 27d7435..84899af 100644
--- a/app-emulation/wine-staging/wine-staging-3.6.ebuild
+++ b/app-emulation/wine-staging/wine-staging-3.6.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-3.7.ebuild 
b/app-emulation/wine-staging/wine-staging-3.7.ebuild
index 27d7435..84899af 100644
--- a/app-emulation/wine-staging/wine-staging-3.7.ebuild
+++ b/app-emulation/wine-staging/wine-staging-3.7.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-3.8.ebuild 
b/app-emulation/wine-staging/wine-staging-3.8.ebuild
index 27d7435..84899af 100644
--- a/app-emulation/wine-staging/wine-staging-3.8.ebuild
+++ b/app-emulation/wine-staging/wine-staging-3.8.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-3.9.ebuild 
b/app-emulation/wine-staging/wine-staging-3.9.ebuild
index e2001b7..3b24897 100644
--- a/app-emulation/wine-staging/wine-staging-3.9.ebuild
+++ b/app-emulation/wine-staging/wine-staging-3.9.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild 
b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 3972957..e0618a3 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi

Reply via email to