diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2018-08-23 13:05:11 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2018-08-23 13:05:11 +0200 |
| commit | e86671052a10f25884e0d3bfa997e243faed0c64 (patch) | |
| tree | d4596a390b607fc39ef534ed9ab81bca52e88b46 /media-gfx/imagemagick | |
| parent | dev-libs/libwacom: stable 0.30 for sparc, bug #664244 (diff) | |
| download | gentoo-e86671052a10f25884e0d3bfa997e243faed0c64.tar.gz gentoo-e86671052a10f25884e0d3bfa997e243faed0c64.tar.bz2 gentoo-e86671052a10f25884e0d3bfa997e243faed0c64.zip | |
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
Diffstat (limited to 'media-gfx/imagemagick')
| -rw-r--r-- | media-gfx/imagemagick/imagemagick-6.9.10.10-r1.ebuild | 4 | ||||
| -rw-r--r-- | media-gfx/imagemagick/imagemagick-7.0.8.10-r1.ebuild | 5 | ||||
| -rw-r--r-- | media-gfx/imagemagick/imagemagick-9999.ebuild | 5 |
3 files changed, 6 insertions, 8 deletions
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 660eaf750203..dae568f6693b 100644 --- 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 48cf34160eac..2c348ed3d6d1 100644 --- 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 7b3cfc9af8aa..c088f2a808b9 100644 --- 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 |