From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A5A2C138334 for ; Thu, 23 Aug 2018 11:05:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6C9CBE0AC6; Thu, 23 Aug 2018 11:05:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2BA62E0AC6 for ; Thu, 23 Aug 2018 11:05:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B6AA1335C7F for ; Thu, 23 Aug 2018 11:05:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B423D3B2 for ; Thu, 23 Aug 2018 11:05:21 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1535022311.e86671052a10f25884e0d3bfa997e243faed0c64.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/imagemagick/imagemagick-6.9.10.10-r1.ebuild media-gfx/imagemagick/imagemagick-7.0.8.10-r1.ebuild media-gfx/imagemagick/imagemagick-9999.ebuild X-VCS-Directories: media-gfx/imagemagick/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: e86671052a10f25884e0d3bfa997e243faed0c64 X-VCS-Branch: master Date: Thu, 23 Aug 2018 11:05:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 47200325-f7c7-4839-8453-e5f8340f249e X-Archives-Hash: 9f400c25d2bdbb0a0a731f19998fdf95 commit: e86671052a10f25884e0d3bfa997e243faed0c64 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Aug 23 11:05:11 2018 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Aug 23 11:05:11 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8667105 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 media-gfx/imagemagick/imagemagick-6.9.10.10-r1.ebuild | 4 ++-- media-gfx/imagemagick/imagemagick-7.0.8.10-r1.ebuild | 5 ++--- 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 660eaf75020..dae568f6693 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 48cf34160ea..2c348ed3d6d 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 7b3cfc9af8a..c088f2a808b 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