| 1 |
commit: a57a129a649c4822f254b0fe9d9c9be232c7aa61 |
| 2 |
Author: Eugene Bright <eugene <AT> bright <DOT> gdn> |
| 3 |
AuthorDate: Thu Oct 25 20:56:12 2018 +0000 |
| 4 |
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 25 20:28:26 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a57a129a |
| 7 |
|
| 8 |
sys-cluster/glusterfs-{4.1.5,9999}: bump EAPI to 7 |
| 9 |
|
| 10 |
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-cluster/glusterfs/glusterfs-4.1.5.ebuild | 12 ++++++++---- |
| 13 |
sys-cluster/glusterfs/glusterfs-9999.ebuild | 12 ++++++++---- |
| 14 |
2 files changed, 16 insertions(+), 8 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-cluster/glusterfs/glusterfs-4.1.5.ebuild b/sys-cluster/glusterfs/glusterfs-4.1.5.ebuild |
| 17 |
index 6cf392f726b..94f9a780020 100644 |
| 18 |
--- a/sys-cluster/glusterfs/glusterfs-4.1.5.ebuild |
| 19 |
+++ b/sys-cluster/glusterfs/glusterfs-4.1.5.ebuild |
| 20 |
@@ -1,17 +1,21 @@ |
| 21 |
# Copyright 1999-2018 Gentoo Foundation |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
|
| 24 |
-EAPI=6 |
| 25 |
+EAPI=7 |
| 26 |
|
| 27 |
PYTHON_COMPAT=( python2_7 ) |
| 28 |
|
| 29 |
-inherit autotools elisp-common python-single-r1 systemd user versionator |
| 30 |
+inherit autotools |
| 31 |
+inherit elisp-common |
| 32 |
+inherit python-single-r1 |
| 33 |
+inherit systemd |
| 34 |
+inherit user |
| 35 |
|
| 36 |
if [[ ${PV#9999} != ${PV} ]]; then |
| 37 |
inherit git-r3 |
| 38 |
EGIT_REPO_URI="https://github.com/gluster/glusterfs.git" |
| 39 |
else |
| 40 |
- SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz" |
| 41 |
+ SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut '1-2')/${PV}/${P}.tar.gz" |
| 42 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" |
| 43 |
fi |
| 44 |
|
| 45 |
@@ -237,7 +241,7 @@ pkg_postinst() { |
| 46 |
ewarn "run GlusterFS." |
| 47 |
echo |
| 48 |
elog "If you are upgrading from a previous version of ${PN}, please read:" |
| 49 |
- elog " http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(get_version_component_range '1-2')/" |
| 50 |
+ elog " http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/" |
| 51 |
|
| 52 |
use emacs && elisp-site-regen |
| 53 |
} |
| 54 |
|
| 55 |
diff --git a/sys-cluster/glusterfs/glusterfs-9999.ebuild b/sys-cluster/glusterfs/glusterfs-9999.ebuild |
| 56 |
index 6cf392f726b..94f9a780020 100644 |
| 57 |
--- a/sys-cluster/glusterfs/glusterfs-9999.ebuild |
| 58 |
+++ b/sys-cluster/glusterfs/glusterfs-9999.ebuild |
| 59 |
@@ -1,17 +1,21 @@ |
| 60 |
# Copyright 1999-2018 Gentoo Foundation |
| 61 |
# Distributed under the terms of the GNU General Public License v2 |
| 62 |
|
| 63 |
-EAPI=6 |
| 64 |
+EAPI=7 |
| 65 |
|
| 66 |
PYTHON_COMPAT=( python2_7 ) |
| 67 |
|
| 68 |
-inherit autotools elisp-common python-single-r1 systemd user versionator |
| 69 |
+inherit autotools |
| 70 |
+inherit elisp-common |
| 71 |
+inherit python-single-r1 |
| 72 |
+inherit systemd |
| 73 |
+inherit user |
| 74 |
|
| 75 |
if [[ ${PV#9999} != ${PV} ]]; then |
| 76 |
inherit git-r3 |
| 77 |
EGIT_REPO_URI="https://github.com/gluster/glusterfs.git" |
| 78 |
else |
| 79 |
- SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz" |
| 80 |
+ SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut '1-2')/${PV}/${P}.tar.gz" |
| 81 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" |
| 82 |
fi |
| 83 |
|
| 84 |
@@ -237,7 +241,7 @@ pkg_postinst() { |
| 85 |
ewarn "run GlusterFS." |
| 86 |
echo |
| 87 |
elog "If you are upgrading from a previous version of ${PN}, please read:" |
| 88 |
- elog " http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(get_version_component_range '1-2')/" |
| 89 |
+ elog " http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/" |
| 90 |
|
| 91 |
use emacs && elisp-site-regen |
| 92 |
} |
Archives