media-gfx/imagemagick: Replaced versionator with eapi7-ver eclass.

Package-Manager: Portage-2.3.41, Repoman-2.3.9

diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.3.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.3.ebuild
index 297fddbc5340a9ffb2f5980ac211a339304fad03..1d46b538e85ccdf79fe3e288bac9e3a057129720 100644 (file)
--- a/media-gfx/imagemagick/imagemagick-6.9.10.3.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.3.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=6
 
-inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
+inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver
 
-MY_P=ImageMagick-$(replace_version_separator 3 '-')
+MY_P=ImageMagick-$(ver_rs 3 '-')
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
 HOMEPAGE="https://www.imagemagick.org/"
@@ -64,7 +64,7 @@ DEPEND="${RDEPEND}
 REQUIRED_USE="corefonts? ( truetype )
        test? ( corefonts )"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
        local mesa_cards ati_cards nvidia_cards render_cards
@@ -162,7 +162,7 @@ src_install() {
                DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
                install
 
-       rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+       rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
        dodoc {AUTHORS,README}.txt ChangeLog
 
        if use perl; then

diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.3.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.3.ebuild
index 9a2a929c515c79a049a82a1c08a3511f162d6bfb..49b5b2b7bbd779d871af82ee55a654b47c58197a 100644 (file)
--- a/media-gfx/imagemagick/imagemagick-7.0.8.3.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.3.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=6
 
-inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
+inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver
 
-MY_P=ImageMagick-$(replace_version_separator 3 '-')
+MY_P=ImageMagick-$(ver_rs 3 '-')
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
 HOMEPAGE="https://www.imagemagick.org/"
@@ -64,7 +64,7 @@ DEPEND="${RDEPEND}
 REQUIRED_USE="corefonts? ( truetype )
        test? ( corefonts )"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
        local ati_cards mesa_cards nvidia_cards render_cards
@@ -162,7 +162,7 @@ src_install() {
                DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
                install
 
-       rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+       rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
        dodoc {AUTHORS,README}.txt ChangeLog
 
        if use perl; then