sys-cluster/glusterfs-{4.1.5,9999}: bump EAPI to 7

Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>

diff --git a/sys-cluster/glusterfs/glusterfs-4.1.5.ebuild b/sys-cluster/glusterfs/glusterfs-4.1.5.ebuild
index 6cf392f726b0c1a0c9263d86eb167c0509fe9311..94f9a7800207fe4c7f07f063eea24e47c78932f4 100644 (file)
--- a/sys-cluster/glusterfs/glusterfs-4.1.5.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-4.1.5.ebuild
@@ -1,17 +1,21 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit autotools elisp-common python-single-r1 systemd user versionator
+inherit autotools
+inherit elisp-common
+inherit python-single-r1
+inherit systemd
+inherit user
 
 if [[ ${PV#9999} != ${PV} ]]; then
        inherit git-r3
        EGIT_REPO_URI="https://github.com/gluster/glusterfs.git"
 else
-       SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
+       SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut '1-2')/${PV}/${P}.tar.gz"
        KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
@@ -237,7 +241,7 @@ pkg_postinst() {
        ewarn "run GlusterFS."
        echo
        elog "If you are upgrading from a previous version of ${PN}, please read:"
-       elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(get_version_component_range '1-2')/"
+       elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/"
 
        use emacs && elisp-site-regen
 }

diff --git a/sys-cluster/glusterfs/glusterfs-9999.ebuild b/sys-cluster/glusterfs/glusterfs-9999.ebuild
index 6cf392f726b0c1a0c9263d86eb167c0509fe9311..94f9a7800207fe4c7f07f063eea24e47c78932f4 100644 (file)
--- a/sys-cluster/glusterfs/glusterfs-9999.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-9999.ebuild
@@ -1,17 +1,21 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit autotools elisp-common python-single-r1 systemd user versionator
+inherit autotools
+inherit elisp-common
+inherit python-single-r1
+inherit systemd
+inherit user
 
 if [[ ${PV#9999} != ${PV} ]]; then
        inherit git-r3
        EGIT_REPO_URI="https://github.com/gluster/glusterfs.git"
 else
-       SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
+       SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut '1-2')/${PV}/${P}.tar.gz"
        KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
@@ -237,7 +241,7 @@ pkg_postinst() {
        ewarn "run GlusterFS."
        echo
        elog "If you are upgrading from a previous version of ${PN}, please read:"
-       elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(get_version_component_range '1-2')/"
+       elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/"
 
        use emacs && elisp-site-regen
 }