summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-gfx/imagemagick/imagemagick-6.9.10.3.ebuild8
-rw-r--r--media-gfx/imagemagick/imagemagick-7.0.8.3.ebuild8
2 files changed, 8 insertions, 8 deletions
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.3.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.3.ebuild
index 297fddbc5340..1d46b538e85c 100644
--- 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 9a2a929c515c..49b5b2b7bbd7 100644
--- 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