media-gfx/imagemagick: fix eapi7-ver usage

The version check to decide if we want to show a notice regarding
the new installed policy.xml file was still using old versionator
function.

Package-Manager: Portage-2.3.48, Repoman-2.3.10

diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.10-r1.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.10-r1.ebuild
index 660eaf7502036deae1d7b2ea441f57aabc05c0f9..dae568f6693b10954d8809e3c8d0daa6cc0a91f6 100644 (file)
--- a/media-gfx/imagemagick/imagemagick-6.9.10.10-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.10-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver
+inherit eapi7-ver eutils flag-o-matic libtool multilib toolchain-funcs
 
 MY_P=ImageMagick-$(ver_rs 3 '-')
 
@@ -203,7 +203,7 @@ pkg_postinst() {
        else
                local v
                for v in ${REPLACING_VERSIONS}; do
-                       if ! version_is_at_least "6.9.10.10-r1" ${v}; then
+                       if ! ver_test "${v}" -gt "6.9.10.10-r1"; then
                                # This is an upgrade
                                _show_policy_xml_notice=yes
 

diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.10-r1.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.10-r1.ebuild
index 48cf34160eaca9dfc1a2a71f3684917b4ad3ed78..2c348ed3d6d140a3f30de2e95fb4af22e7327cbe 100644 (file)
--- a/media-gfx/imagemagick/imagemagick-7.0.8.10-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.10-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit eutils flag-o-matic libtool multilib toolchain-funcs
+inherit eapi7-ver eutils flag-o-matic libtool multilib toolchain-funcs
 
 PATCHES=( "${FILESDIR}"/policy-hardening.patch )
 
@@ -12,7 +12,6 @@ if [[ ${PV} == "9999" ]] ; then
        inherit git-r3
        MY_P="imagemagick-9999"
 else
-       inherit eapi7-ver
        MY_P=ImageMagick-$(ver_rs 3 '-')
        SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
        KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
@@ -212,7 +211,7 @@ pkg_postinst() {
        else
                local v
                for v in ${REPLACING_VERSIONS}; do
-                       if ! version_is_at_least "7.0.8.10-r1" ${v}; then
+                       if ! ver_test "${v}" -gt "7.0.8.10-r1"; then
                                # This is an upgrade
                                _show_policy_xml_notice=yes
 

diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild
index 7b3cfc9af8aa5b23d227059769744441b1c0214e..c088f2a808b934ace429dab432edd156dd6780e8 100644 (file)
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit eutils flag-o-matic libtool multilib toolchain-funcs
+inherit eapi7-ver eutils flag-o-matic libtool multilib toolchain-funcs
 
 PATCHES=( "${FILESDIR}"/policy-hardening.patch )
 
@@ -12,7 +12,6 @@ if [[ ${PV} == "9999" ]] ; then
        inherit git-r3
        MY_P="imagemagick-9999"
 else
-       inherit eapi7-ver
        MY_P=ImageMagick-$(ver_rs 3 '-')
        SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
@@ -210,7 +209,7 @@ pkg_postinst() {
        else
                local v
                for v in ${REPLACING_VERSIONS}; do
-                       if ! version_is_at_least "7.0.8.10-r1" ${v}; then
+                       if ! ver_test "${v}" -gt "7.0.8.10-r1"; then
                                # This is an upgrade
                                _show_policy_xml_notice=yes