Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/
Date: Tue, 03 Jul 2018 10:37:07
Message-Id: 1530614215.d5505d44704342219aab2fe7dc6c1d8fb1fb9906.polynomial-c@gentoo
1 commit: d5505d44704342219aab2fe7dc6c1d8fb1fb9906
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 3 10:36:41 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 3 10:36:55 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5505d44
7
8 media-gfx/imagemagick: Replaced versionator with eapi7-ver eclass.
9
10 Package-Manager: Portage-2.3.41, Repoman-2.3.9
11
12 media-gfx/imagemagick/imagemagick-6.9.10.3.ebuild | 8 ++++----
13 media-gfx/imagemagick/imagemagick-7.0.8.3.ebuild | 8 ++++----
14 2 files changed, 8 insertions(+), 8 deletions(-)
15
16 diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.3.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.3.ebuild
17 index 297fddbc534..1d46b538e85 100644
18 --- a/media-gfx/imagemagick/imagemagick-6.9.10.3.ebuild
19 +++ b/media-gfx/imagemagick/imagemagick-6.9.10.3.ebuild
20 @@ -3,9 +3,9 @@
21
22 EAPI=6
23
24 -inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
25 +inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver
26
27 -MY_P=ImageMagick-$(replace_version_separator 3 '-')
28 +MY_P=ImageMagick-$(ver_rs 3 '-')
29
30 DESCRIPTION="A collection of tools and libraries for many image formats"
31 HOMEPAGE="https://www.imagemagick.org/"
32 @@ -64,7 +64,7 @@ DEPEND="${RDEPEND}
33 REQUIRED_USE="corefonts? ( truetype )
34 test? ( corefonts )"
35
36 -S=${WORKDIR}/${MY_P}
37 +S="${WORKDIR}/${MY_P}"
38
39 src_prepare() {
40 local mesa_cards ati_cards nvidia_cards render_cards
41 @@ -162,7 +162,7 @@ src_install() {
42 DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
43 install
44
45 - rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
46 + rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
47 dodoc {AUTHORS,README}.txt ChangeLog
48
49 if use perl; then
50
51 diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.3.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.3.ebuild
52 index 9a2a929c515..49b5b2b7bbd 100644
53 --- a/media-gfx/imagemagick/imagemagick-7.0.8.3.ebuild
54 +++ b/media-gfx/imagemagick/imagemagick-7.0.8.3.ebuild
55 @@ -3,9 +3,9 @@
56
57 EAPI=6
58
59 -inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
60 +inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver
61
62 -MY_P=ImageMagick-$(replace_version_separator 3 '-')
63 +MY_P=ImageMagick-$(ver_rs 3 '-')
64
65 DESCRIPTION="A collection of tools and libraries for many image formats"
66 HOMEPAGE="https://www.imagemagick.org/"
67 @@ -64,7 +64,7 @@ DEPEND="${RDEPEND}
68 REQUIRED_USE="corefonts? ( truetype )
69 test? ( corefonts )"
70
71 -S=${WORKDIR}/${MY_P}
72 +S="${WORKDIR}/${MY_P}"
73
74 src_prepare() {
75 local ati_cards mesa_cards nvidia_cards render_cards
76 @@ -162,7 +162,7 @@ src_install() {
77 DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
78 install
79
80 - rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
81 + rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
82 dodoc {AUTHORS,README}.txt ChangeLog
83
84 if use perl; then