media-gfx/imagemagick: create files in $HOME for src_test in src_test

Bug: https://bugs.gentoo.org/669878
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild
index a2998e1831193c97c8afd449d15a719d8c9fb63a..09a49dc4b9e03e1e13d0fd6fee8147852a6085e0 100644 (file)
--- a/media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild
@@ -79,13 +79,6 @@ src_prepare() {
                die "Failed to apply hardening of policy.xml"
        einfo "policy.xml hardened"
 
-       # Install default (unrestricted) policy in $HOME for test suite #664238
-       local _im_local_config_home="${HOME}/.config/ImageMagick"
-       mkdir -p "${_im_local_config_home}" || \
-               die "Failed to create IM config dir in '${_im_local_config_home}'"
-       cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-               die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
        elibtoolize # for Darwin modules
 
        # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
@@ -168,6 +161,17 @@ src_configure() {
 }
 
 src_test() {
+       # Install default (unrestricted) policy in $HOME for test suite #664238
+       local _im_local_config_home="${HOME}/.config/ImageMagick"
+       mkdir -p "${_im_local_config_home}" || \
+               die "Failed to create IM config dir in '${_im_local_config_home}'"
+       cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+               die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+       # Check that your policy.xml file is taken into account
+       LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
+       "${S}"/utilities/.libs/identify -list policy || die
+
        LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
        emake check
 }

diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.12.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.12.ebuild
index 1895f401aabb5a33a7091d5178834a0202ee1bd4..e20331f737f59d7978005ce29b1ecf39db22821a 100644 (file)
--- a/media-gfx/imagemagick/imagemagick-6.9.10.12.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.12.ebuild
@@ -80,13 +80,6 @@ src_prepare() {
                die "Failed to apply hardening of policy.xml"
        einfo "policy.xml hardened"
 
-       # Install default (unrestricted) policy in $HOME for test suite #664238
-       local _im_local_config_home="${HOME}/.config/ImageMagick"
-       mkdir -p "${_im_local_config_home}" || \
-               die "Failed to create IM config dir in '${_im_local_config_home}'"
-       cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-               die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
        elibtoolize # for Darwin modules
 
        # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
@@ -172,6 +165,17 @@ src_configure() {
 }
 
 src_test() {
+       # Install default (unrestricted) policy in $HOME for test suite #664238
+       local _im_local_config_home="${HOME}/.config/ImageMagick"
+       mkdir -p "${_im_local_config_home}" || \
+               die "Failed to create IM config dir in '${_im_local_config_home}'"
+       cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+               die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+       # Check that your policy.xml file is taken into account
+       LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
+       "${S}"/utilities/.libs/identify -list policy || die
+
        LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
        emake check
 }

diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.11.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.11.ebuild
index 9730724f1a1133c27808a5d5c3bb7e111c30658e..16e65f8e57b9642467c2a18e5750de1f8cfbc6f4 100644 (file)
--- a/media-gfx/imagemagick/imagemagick-7.0.8.11.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -85,13 +85,6 @@ src_prepare() {
                die "Failed to apply hardening of policy.xml"
        einfo "policy.xml hardened"
 
-       # Install default (unrestricted) policy in $HOME for test suite #664238
-       local _im_local_config_home="${HOME}/.config/ImageMagick"
-       mkdir -p "${_im_local_config_home}" || \
-               die "Failed to create IM config dir in '${_im_local_config_home}'"
-       cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-               die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
        elibtoolize # for Darwin modules
 
        # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
@@ -174,6 +167,17 @@ src_configure() {
 }
 
 src_test() {
+       # Install default (unrestricted) policy in $HOME for test suite #664238
+       local _im_local_config_home="${HOME}/.config/ImageMagick"
+       mkdir -p "${_im_local_config_home}" || \
+               die "Failed to create IM config dir in '${_im_local_config_home}'"
+       cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+               die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+       # Check that your policy.xml file is taken into account
+       LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
+       "${S}"/utilities/.libs/magick -list policy || die
+
        LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
        emake check
 }

diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.12.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.12.ebuild
index 428e6d1e2116d497f728af3a40de0682acb4c03d..73a88b3b9d7b87c5b670ee66b4a2bdd1015da15d 100644 (file)
--- a/media-gfx/imagemagick/imagemagick-7.0.8.12.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.12.ebuild
@@ -84,13 +84,6 @@ src_prepare() {
                die "Failed to apply hardening of policy.xml"
        einfo "policy.xml hardened"
 
-       # Install default (unrestricted) policy in $HOME for test suite #664238
-       local _im_local_config_home="${HOME}/.config/ImageMagick"
-       mkdir -p "${_im_local_config_home}" || \
-               die "Failed to create IM config dir in '${_im_local_config_home}'"
-       cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-               die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
        elibtoolize # for Darwin modules
 
        # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
@@ -176,6 +169,17 @@ src_configure() {
 }
 
 src_test() {
+       # Install default (unrestricted) policy in $HOME for test suite #664238
+       local _im_local_config_home="${HOME}/.config/ImageMagick"
+       mkdir -p "${_im_local_config_home}" || \
+               die "Failed to create IM config dir in '${_im_local_config_home}'"
+       cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+               die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+       # Check that your policy.xml file is taken into account
+       LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
+       "${S}"/utilities/.libs/magick -list policy || die
+
        LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
        emake check
 }

diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild
index 6f0dd75e82cd77ea5fe71a0d863372f90d5b93bd..73a88b3b9d7b87c5b670ee66b4a2bdd1015da15d 100644 (file)
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -84,13 +84,6 @@ src_prepare() {
                die "Failed to apply hardening of policy.xml"
        einfo "policy.xml hardened"
 
-       # Install default (unrestricted) policy in $HOME for test suite #664238
-       local _im_local_config_home="${HOME}/.config/ImageMagick"
-       mkdir -p "${_im_local_config_home}" || \
-               die "Failed to create IM config dir in '${_im_local_config_home}'"
-       cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-               die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
        elibtoolize # for Darwin modules
 
        # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
@@ -176,6 +169,17 @@ src_configure() {
 }
 
 src_test() {
+       # Install default (unrestricted) policy in $HOME for test suite #664238
+       local _im_local_config_home="${HOME}/.config/ImageMagick"
+       mkdir -p "${_im_local_config_home}" || \
+               die "Failed to create IM config dir in '${_im_local_config_home}'"
+       cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+               die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+       # Check that your policy.xml file is taken into account
+       LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
+       "${S}"/utilities/.libs/magick -list policy || die
+
        LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
        emake check
 }