dev-db/percona-server: Drop versionator for eapi7-ver

Package-Manager: Portage-2.3.49, Repoman-2.3.10

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
index c56c135cbbb40122c4f6dcf9d15360d97a842a79..e9264582226d31cb9810e96815907145b2c61edf 100644 (file)
--- 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
@@ -9,11 +9,11 @@ CMAKE_MAKEFILE_GENERATOR=emake
 # Keeping eutils in EAPI=6 for emktemp in pkg_config
 
 inherit linux-info python-any-r1 eutils flag-o-matic prefix toolchain-funcs \
-       versionator user cmake-utils multilib-minimal
+       eapi7-ver user cmake-utils multilib-minimal
 
-MY_PV=$(replace_version_separator 3 '-')
+MY_PV=$(ver_rs 3 '-')
 MY_PN="Percona-Server"
-MY_MAJOR_PV=$(get_version_component_range 1-2)
+MY_MAJOR_PV=$(ver_cut 1-2)
 MY_RELEASE_NOTES_URI="https://www.percona.com/doc/percona-server/5.6/release-notes/release-notes_index.html"
 SRC_URI="https://www.percona.com/downloads/${MY_PN}-${MY_MAJOR_PV}/${MY_PN}-${MY_PV}/source/tarball/${PN}-${MY_PV}.tar.gz"
 
@@ -680,12 +680,12 @@ pkg_postinst() {
                        einfo
                else
                        local _replacing_version=
+                       local _new_version_branch=$(ver_cut 1-3 "${PV}")
                        for _replacing_version in ${REPLACING_VERSIONS}; do
-                               local _new_version_branch=$(get_version_component_range 1-3 "${PV}")
-                               local _replacing_version_branch=$(get_version_component_range 1-3 "${_replacing_version}")
+                               local _replacing_version_branch=$(ver_cut 1-3 "${_replacing_version}")
                                debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..."
 
-                               if ! version_is_at_least "${_new_version_branch}" "${_replacing_version_branch}"; then
+                               if ver_test "${_new_version_branch}" -gt "${_replacing_version_branch}"; then
                                        debug-print "Upgrading from v${_replacing_version_branch} to v${_new_version_branch} ..."
                                        # https://www.percona.com/blog/2014/09/19/mysql-upgrade-best-practices/
 

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
index 0f90f84fff87325ece0b3df9d26fc10dbf1319f1..52760d63376a3a7974fe531cf8f187f59a11dc47 100644 (file)
--- 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
@@ -9,11 +9,11 @@ CMAKE_MAKEFILE_GENERATOR=emake
 # Keeping eutils in EAPI=6 for emktemp in pkg_config
 
 inherit linux-info python-any-r1 eutils flag-o-matic prefix toolchain-funcs \
-       versionator user cmake-utils multilib-minimal
+       eapi7-ver user cmake-utils multilib-minimal
 
-MY_PV=$(replace_version_separator 3 '-')
+MY_PV=$(ver_rs 3 '-')
 MY_PN="Percona-Server"
-MY_MAJOR_PV=$(get_version_component_range 1-2)
+MY_MAJOR_PV=$(ver_cut 1-2)
 MY_RELEASE_NOTES_URI="https://www.percona.com/doc/percona-server/5.6/release-notes/release-notes_index.html"
 SRC_URI="https://www.percona.com/downloads/${MY_PN}-${MY_MAJOR_PV}/${MY_PN}-${MY_PV}/source/tarball/${PN}-${MY_PV}.tar.gz"
 
@@ -680,12 +680,12 @@ pkg_postinst() {
                        einfo
                else
                        local _replacing_version=
+                       local _new_version_branch=$(ver_cut 1-3 "${PV}")
                        for _replacing_version in ${REPLACING_VERSIONS}; do
-                               local _new_version_branch=$(get_version_component_range 1-3 "${PV}")
-                               local _replacing_version_branch=$(get_version_component_range 1-3 "${_replacing_version}")
+                               local _replacing_version_branch=$(ver_cut 1-3 "${_replacing_version}")
                                debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..."
 
-                               if ! version_is_at_least "${_new_version_branch}" "${_replacing_version_branch}"; then
+                               if ver_test "${_new_version_branch}" -gt "${_replacing_version_branch}"; then
                                        debug-print "Upgrading from v${_replacing_version_branch} to v${_new_version_branch} ..."
                                        # https://www.percona.com/blog/2014/09/19/mysql-upgrade-best-practices/