| 1 |
commit: e86671052a10f25884e0d3bfa997e243faed0c64 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 23 11:05:11 2018 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 23 11:05:11 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8667105 |
| 7 |
|
| 8 |
media-gfx/imagemagick: fix eapi7-ver usage |
| 9 |
|
| 10 |
The version check to decide if we want to show a notice regarding |
| 11 |
the new installed policy.xml file was still using old versionator |
| 12 |
function. |
| 13 |
|
| 14 |
Package-Manager: Portage-2.3.48, Repoman-2.3.10 |
| 15 |
|
| 16 |
media-gfx/imagemagick/imagemagick-6.9.10.10-r1.ebuild | 4 ++-- |
| 17 |
media-gfx/imagemagick/imagemagick-7.0.8.10-r1.ebuild | 5 ++--- |
| 18 |
media-gfx/imagemagick/imagemagick-9999.ebuild | 5 ++--- |
| 19 |
3 files changed, 6 insertions(+), 8 deletions(-) |
| 20 |
|
| 21 |
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.10-r1.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.10-r1.ebuild |
| 22 |
index 660eaf75020..dae568f6693 100644 |
| 23 |
--- a/media-gfx/imagemagick/imagemagick-6.9.10.10-r1.ebuild |
| 24 |
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.10-r1.ebuild |
| 25 |
@@ -3,7 +3,7 @@ |
| 26 |
|
| 27 |
EAPI=6 |
| 28 |
|
| 29 |
-inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver |
| 30 |
+inherit eapi7-ver eutils flag-o-matic libtool multilib toolchain-funcs |
| 31 |
|
| 32 |
MY_P=ImageMagick-$(ver_rs 3 '-') |
| 33 |
|
| 34 |
@@ -203,7 +203,7 @@ pkg_postinst() { |
| 35 |
else |
| 36 |
local v |
| 37 |
for v in ${REPLACING_VERSIONS}; do |
| 38 |
- if ! version_is_at_least "6.9.10.10-r1" ${v}; then |
| 39 |
+ if ! ver_test "${v}" -gt "6.9.10.10-r1"; then |
| 40 |
# This is an upgrade |
| 41 |
_show_policy_xml_notice=yes |
| 42 |
|
| 43 |
|
| 44 |
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.10-r1.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.10-r1.ebuild |
| 45 |
index 48cf34160ea..2c348ed3d6d 100644 |
| 46 |
--- a/media-gfx/imagemagick/imagemagick-7.0.8.10-r1.ebuild |
| 47 |
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.10-r1.ebuild |
| 48 |
@@ -3,7 +3,7 @@ |
| 49 |
|
| 50 |
EAPI="6" |
| 51 |
|
| 52 |
-inherit eutils flag-o-matic libtool multilib toolchain-funcs |
| 53 |
+inherit eapi7-ver eutils flag-o-matic libtool multilib toolchain-funcs |
| 54 |
|
| 55 |
PATCHES=( "${FILESDIR}"/policy-hardening.patch ) |
| 56 |
|
| 57 |
@@ -12,7 +12,6 @@ if [[ ${PV} == "9999" ]] ; then |
| 58 |
inherit git-r3 |
| 59 |
MY_P="imagemagick-9999" |
| 60 |
else |
| 61 |
- inherit eapi7-ver |
| 62 |
MY_P=ImageMagick-$(ver_rs 3 '-') |
| 63 |
SRC_URI="mirror://${PN}/${MY_P}.tar.xz" |
| 64 |
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" |
| 65 |
@@ -212,7 +211,7 @@ pkg_postinst() { |
| 66 |
else |
| 67 |
local v |
| 68 |
for v in ${REPLACING_VERSIONS}; do |
| 69 |
- if ! version_is_at_least "7.0.8.10-r1" ${v}; then |
| 70 |
+ if ! ver_test "${v}" -gt "7.0.8.10-r1"; then |
| 71 |
# This is an upgrade |
| 72 |
_show_policy_xml_notice=yes |
| 73 |
|
| 74 |
|
| 75 |
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild |
| 76 |
index 7b3cfc9af8a..c088f2a808b 100644 |
| 77 |
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild |
| 78 |
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild |
| 79 |
@@ -3,7 +3,7 @@ |
| 80 |
|
| 81 |
EAPI="6" |
| 82 |
|
| 83 |
-inherit eutils flag-o-matic libtool multilib toolchain-funcs |
| 84 |
+inherit eapi7-ver eutils flag-o-matic libtool multilib toolchain-funcs |
| 85 |
|
| 86 |
PATCHES=( "${FILESDIR}"/policy-hardening.patch ) |
| 87 |
|
| 88 |
@@ -12,7 +12,6 @@ if [[ ${PV} == "9999" ]] ; then |
| 89 |
inherit git-r3 |
| 90 |
MY_P="imagemagick-9999" |
| 91 |
else |
| 92 |
- inherit eapi7-ver |
| 93 |
MY_P=ImageMagick-$(ver_rs 3 '-') |
| 94 |
SRC_URI="mirror://${PN}/${MY_P}.tar.xz" |
| 95 |
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" |
| 96 |
@@ -210,7 +209,7 @@ pkg_postinst() { |
| 97 |
else |
| 98 |
local v |
| 99 |
for v in ${REPLACING_VERSIONS}; do |
| 100 |
- if ! version_is_at_least "7.0.8.10-r1" ${v}; then |
| 101 |
+ if ! ver_test "${v}" -gt "7.0.8.10-r1"; then |
| 102 |
# This is an upgrade |
| 103 |
_show_policy_xml_notice=yes |
Archives