[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

[Thomas Deutschmann]

commit:     1b31bc1d62ab6c8b4810d8217c2831cc1f153a24
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 10 21:23:49 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 10 21:25:25 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b31bc1d

media-gfx/imagemagick: add missing test restrict

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 media-gfx/imagemagick/imagemagick-6.9.10.71.ebuild | 10 ++++++----
 media-gfx/imagemagick/imagemagick-7.0.9.2.ebuild   |  8 +++++---
 media-gfx/imagemagick/imagemagick-9999.ebuild      |  8 +++++---
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.71.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.10.71.ebuild
index 070e4668a69..104ec59adc7 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.71.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.71.ebuild
@@ -16,7 +16,12 @@ LICENSE="imagemagick"
 SLOT="0/${PV}"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 
~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig 
jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 
q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-RESTRICT="!test? ( test ) perl? ( userpriv )"
+
+REQUIRED_USE="corefonts? ( truetype )
+       test? ( corefonts )"
+
+RESTRICT="perl? ( userpriv )
+       !test? ( test )"
 
 RDEPEND="
        dev-libs/libltdl:0
@@ -62,9 +67,6 @@ DEPEND="${RDEPEND}
        virtual/pkgconfig
        X? ( x11-base/xorg-proto )"
 
-REQUIRED_USE="corefonts? ( truetype )
-       test? ( corefonts )"
-
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {

diff --git a/media-gfx/imagemagick/imagemagick-7.0.9.2.ebuild 
b/media-gfx/imagemagick/imagemagick-7.0.9.2.ebuild
index bbac5a8baac..8d8ee8a769b 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.9.2.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.9.2.ebuild
@@ -24,6 +24,11 @@ SLOT="0/7.0.9"
 IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig 
jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 
q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 RESTRICT="!test? ( test )"
 
+REQUIRED_USE="corefonts? ( truetype )
+       test? ( corefonts )"
+
+RESTRICT="!test? ( test )"
+
 BDEPEND="virtual/pkgconfig"
 
 RDEPEND="
@@ -70,9 +75,6 @@ DEPEND="${RDEPEND}
        !media-gfx/graphicsmagick[imagemagick]
        X? ( x11-base/xorg-proto )"
 
-REQUIRED_USE="corefonts? ( truetype )
-       test? ( corefonts )"
-
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {

diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild 
b/media-gfx/imagemagick/imagemagick-9999.ebuild
index bbac5a8baac..8d8ee8a769b 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild
@@ -24,6 +24,11 @@ SLOT="0/7.0.9"
 IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig 
jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 
q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 RESTRICT="!test? ( test )"
 
+REQUIRED_USE="corefonts? ( truetype )
+       test? ( corefonts )"
+
+RESTRICT="!test? ( test )"
+
 BDEPEND="virtual/pkgconfig"
 
 RDEPEND="
@@ -70,9 +75,6 @@ DEPEND="${RDEPEND}
        !media-gfx/graphicsmagick[imagemagick]
        X? ( x11-base/xorg-proto )"
 
-REQUIRED_USE="corefonts? ( truetype )
-       test? ( corefonts )"
-
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {