| 1 |
commit: b9fb307b2c082f70555cb8ba0d530aef070b25d9 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 18 14:06:26 2018 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 18 14:11:38 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9fb307b |
| 7 |
|
| 8 |
dev-db/percona-server: Drop versionator for eapi7-ver |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
| 11 |
|
| 12 |
dev-db/percona-server/percona-server-5.6.40.84.0.ebuild | 12 ++++++------ |
| 13 |
dev-db/percona-server/percona-server-5.6.41.84.1.ebuild | 12 ++++++------ |
| 14 |
2 files changed, 12 insertions(+), 12 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-db/percona-server/percona-server-5.6.40.84.0.ebuild b/dev-db/percona-server/percona-server-5.6.40.84.0.ebuild |
| 17 |
index c56c135cbbb..e9264582226 100644 |
| 18 |
--- a/dev-db/percona-server/percona-server-5.6.40.84.0.ebuild |
| 19 |
+++ b/dev-db/percona-server/percona-server-5.6.40.84.0.ebuild |
| 20 |
@@ -9,11 +9,11 @@ CMAKE_MAKEFILE_GENERATOR=emake |
| 21 |
# Keeping eutils in EAPI=6 for emktemp in pkg_config |
| 22 |
|
| 23 |
inherit linux-info python-any-r1 eutils flag-o-matic prefix toolchain-funcs \ |
| 24 |
- versionator user cmake-utils multilib-minimal |
| 25 |
+ eapi7-ver user cmake-utils multilib-minimal |
| 26 |
|
| 27 |
-MY_PV=$(replace_version_separator 3 '-') |
| 28 |
+MY_PV=$(ver_rs 3 '-') |
| 29 |
MY_PN="Percona-Server" |
| 30 |
-MY_MAJOR_PV=$(get_version_component_range 1-2) |
| 31 |
+MY_MAJOR_PV=$(ver_cut 1-2) |
| 32 |
MY_RELEASE_NOTES_URI="https://www.percona.com/doc/percona-server/5.6/release-notes/release-notes_index.html" |
| 33 |
SRC_URI="https://www.percona.com/downloads/${MY_PN}-${MY_MAJOR_PV}/${MY_PN}-${MY_PV}/source/tarball/${PN}-${MY_PV}.tar.gz" |
| 34 |
|
| 35 |
@@ -680,12 +680,12 @@ pkg_postinst() { |
| 36 |
einfo |
| 37 |
else |
| 38 |
local _replacing_version= |
| 39 |
+ local _new_version_branch=$(ver_cut 1-3 "${PV}") |
| 40 |
for _replacing_version in ${REPLACING_VERSIONS}; do |
| 41 |
- local _new_version_branch=$(get_version_component_range 1-3 "${PV}") |
| 42 |
- local _replacing_version_branch=$(get_version_component_range 1-3 "${_replacing_version}") |
| 43 |
+ local _replacing_version_branch=$(ver_cut 1-3 "${_replacing_version}") |
| 44 |
debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..." |
| 45 |
|
| 46 |
- if ! version_is_at_least "${_new_version_branch}" "${_replacing_version_branch}"; then |
| 47 |
+ if ver_test "${_new_version_branch}" -gt "${_replacing_version_branch}"; then |
| 48 |
debug-print "Upgrading from v${_replacing_version_branch} to v${_new_version_branch} ..." |
| 49 |
# https://www.percona.com/blog/2014/09/19/mysql-upgrade-best-practices/ |
| 50 |
|
| 51 |
|
| 52 |
diff --git a/dev-db/percona-server/percona-server-5.6.41.84.1.ebuild b/dev-db/percona-server/percona-server-5.6.41.84.1.ebuild |
| 53 |
index 0f90f84fff8..52760d63376 100644 |
| 54 |
--- a/dev-db/percona-server/percona-server-5.6.41.84.1.ebuild |
| 55 |
+++ b/dev-db/percona-server/percona-server-5.6.41.84.1.ebuild |
| 56 |
@@ -9,11 +9,11 @@ CMAKE_MAKEFILE_GENERATOR=emake |
| 57 |
# Keeping eutils in EAPI=6 for emktemp in pkg_config |
| 58 |
|
| 59 |
inherit linux-info python-any-r1 eutils flag-o-matic prefix toolchain-funcs \ |
| 60 |
- versionator user cmake-utils multilib-minimal |
| 61 |
+ eapi7-ver user cmake-utils multilib-minimal |
| 62 |
|
| 63 |
-MY_PV=$(replace_version_separator 3 '-') |
| 64 |
+MY_PV=$(ver_rs 3 '-') |
| 65 |
MY_PN="Percona-Server" |
| 66 |
-MY_MAJOR_PV=$(get_version_component_range 1-2) |
| 67 |
+MY_MAJOR_PV=$(ver_cut 1-2) |
| 68 |
MY_RELEASE_NOTES_URI="https://www.percona.com/doc/percona-server/5.6/release-notes/release-notes_index.html" |
| 69 |
SRC_URI="https://www.percona.com/downloads/${MY_PN}-${MY_MAJOR_PV}/${MY_PN}-${MY_PV}/source/tarball/${PN}-${MY_PV}.tar.gz" |
| 70 |
|
| 71 |
@@ -680,12 +680,12 @@ pkg_postinst() { |
| 72 |
einfo |
| 73 |
else |
| 74 |
local _replacing_version= |
| 75 |
+ local _new_version_branch=$(ver_cut 1-3 "${PV}") |
| 76 |
for _replacing_version in ${REPLACING_VERSIONS}; do |
| 77 |
- local _new_version_branch=$(get_version_component_range 1-3 "${PV}") |
| 78 |
- local _replacing_version_branch=$(get_version_component_range 1-3 "${_replacing_version}") |
| 79 |
+ local _replacing_version_branch=$(ver_cut 1-3 "${_replacing_version}") |
| 80 |
debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..." |
| 81 |
|
| 82 |
- if ! version_is_at_least "${_new_version_branch}" "${_replacing_version_branch}"; then |
| 83 |
+ if ver_test "${_new_version_branch}" -gt "${_replacing_version_branch}"; then |
| 84 |
debug-print "Upgrading from v${_replacing_version_branch} to v${_new_version_branch} ..." |
| 85 |
# https://www.percona.com/blog/2014/09/19/mysql-upgrade-best-practices/ |
Archives