From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 19A42138336 for ; Mon, 22 Jul 2019 18:57:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CBA5EE0835; Mon, 22 Jul 2019 16:58:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9D5CAE0835 for ; Mon, 22 Jul 2019 16:58:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3E6B3348953 for ; Mon, 22 Jul 2019 16:58:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 515AB734 for ; Mon, 22 Jul 2019 16:58:49 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1563814721.f32d4987f16fc90e9a1619a6fed7075f04a9658c.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/imagemagick/Manifest media-gfx/imagemagick/imagemagick-6.9.10.56.ebuild media-gfx/imagemagick/imagemagick-7.0.8.51.ebuild media-gfx/imagemagick/imagemagick-7.0.8.56.ebuild X-VCS-Directories: media-gfx/imagemagick/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: f32d4987f16fc90e9a1619a6fed7075f04a9658c X-VCS-Branch: master Date: Mon, 22 Jul 2019 16:58:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9c6d2f4e-4694-40c9-9dd0-3b2c2cdf2ba1 X-Archives-Hash: be550db68f115d0c562a63e2ff93953e commit: f32d4987f16fc90e9a1619a6fed7075f04a9658c Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Jul 22 16:56:23 2019 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Mon Jul 22 16:58:41 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f32d4987 media-gfx/imagemagick: bump to v6.9.10-56 & v7.0.8-56 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Thomas Deutschmann gentoo.org> media-gfx/imagemagick/Manifest | 3 +- ....0.8.51.ebuild => imagemagick-6.9.10.56.ebuild} | 32 ++++++++-------------- ...7.0.8.51.ebuild => imagemagick-7.0.8.56.ebuild} | 0 3 files changed, 14 insertions(+), 21 deletions(-) diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest index ed424661b8a..27020cf934e 100644 --- a/media-gfx/imagemagick/Manifest +++ b/media-gfx/imagemagick/Manifest @@ -1,3 +1,4 @@ DIST ImageMagick-6.9.10-50.tar.xz 8941584 BLAKE2B dcbbe4b0c25c281168088dd5b62a9d882088b9b57fc4127c6d233b049011ae3ede43e2629734fbd1ae2b21cd13f64690e6f6a3ea81a1e08736fbc1a29a5bccf9 SHA512 f288eb8ce40aafb3d099ae5ec10403902934d02440256ed2012f0b13456b237c3a903f92764b02378c27005fd65ad1251ff1663fce825890721fa93b18ad515d +DIST ImageMagick-6.9.10-56.tar.xz 8950748 BLAKE2B 5d1b4ad20ec3aa6f89aedf08ac91266be218464cd998ca950623c1a23954968f84b21bfc140c1a1dfdcd68c8420ddcd39f76cd31d3872d43bf631b5782980665 SHA512 e5d1dd4da8b361858ff2d7a4c7956280bd55053022c7b0ad27fac4a70e9d2cafb75299e7970e1b2091b83b3bedd2355d5752e9bff6999f9272619a92a8892c0f DIST ImageMagick-7.0.8-50.tar.xz 9453076 BLAKE2B a137fb353d32ce6914b5033ea4c02bc81cb1eb82c1dbb6d449f20e19b23ec1eeef628e27c497cb9eb5e7a23f9d4f9f2152e3c6e64dfb5c6f793358c174286e27 SHA512 78cee7463610b256b899cc9474924cefe2dc36ab238025c54688563c3e1aa4b86ebc739f22fb349ab8914b7ac0dc6c5073cca168b9cfc371fb4bbd7e3f51cfbc -DIST ImageMagick-7.0.8-51.tar.xz 9460120 BLAKE2B 4d1e3cc750c8d336a8af3949b0e8f725529d20fafe27f9786be872c7f98e50ef4a8701e1aa2aa84811ea9669e7b9fb7d09d2d86de90ad807f740049698d5f625 SHA512 a60171e9841667ceb82187fae9b4044f77d01fbd67eca7cc27d80dc9d1388a53718c52b25f0b339236d744ba4c23736778b56f5ec0d4b06982fb95bf7977d9ae +DIST ImageMagick-7.0.8-56.tar.xz 9465124 BLAKE2B c31c66ae84e9bb91fc744673c07d12300a5e5a07729eaee9654e988efc46cc9d5321e6906325fe9fcfbeb81785a74a52e6059d2983c280b86d0ad305c0818b9d SHA512 22651b0f5b0b0821b7ae74a10671590d8ecfddcc95b60bf056ef7a7cbeab37beedaf49d0bcf97cb0ac2f1ec564192c15c7820c9593db965b4b192338abdaf5dc diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.51.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.56.ebuild similarity index 86% copy from media-gfx/imagemagick/imagemagick-7.0.8.51.ebuild copy to media-gfx/imagemagick/imagemagick-6.9.10.56.ebuild index 69c412db11b..b09291336cc 100644 --- a/media-gfx/imagemagick/imagemagick-7.0.8.51.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.9.10.56.ebuild @@ -5,24 +5,20 @@ EAPI="6" inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git" - inherit git-r3 - MY_P="imagemagick-9999" -else - MY_PV="$(ver_rs 3 '-')" - MY_P="ImageMagick-${MY_PV}" - SRC_URI="mirror://${PN}/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -fi +MY_PV="$(ver_rs 3 '-')" +MY_P="ImageMagick-${MY_PV}" DESCRIPTION="A collection of tools and libraries for many image formats" HOMEPAGE="https://www.imagemagick.org/" +SRC_URI="mirror://${PN}/${MY_P}.tar.xz" LICENSE="imagemagick" SLOT="0/${PV}" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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="perl? ( userpriv )" + RDEPEND=" dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) @@ -88,7 +84,7 @@ src_prepare() { elibtoolize # for Darwin modules # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - local ati_cards mesa_cards nvidia_cards render_cards + local mesa_cards ati_cards nvidia_cards render_cards shopt -s nullglob ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') if test -n "${ati_cards}"; then @@ -98,7 +94,7 @@ src_prepare() { if test -n "${mesa_cards}"; then addpredict "${mesa_cards}" fi - nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') + nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g') if test -n "${nvidia_cards}"; then addpredict "${nvidia_cards}" fi @@ -178,12 +174,8 @@ src_test() { die "Failed to install default blank policy.xml in '${_im_local_config_home}'" local im_command= IM_COMMANDS=() - if [[ ${PV} == "9999" ]] ; then - IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild - else - IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built - fi - IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used + IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built + IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used IM_COMMANDS+=( "emake check" ) # Run tests for im_command in "${IM_COMMANDS[@]}"; do @@ -232,7 +224,7 @@ pkg_postinst() { else local v for v in ${REPLACING_VERSIONS}; do - if ! ver_test "${v}" -gt "7.0.8.10-r2"; then + if ! ver_test "${v}" -gt "6.9.10.10-r2"; then # This is an upgrade _show_policy_xml_notice=yes @@ -243,7 +235,7 @@ pkg_postinst() { fi if [[ -n "${_show_policy_xml_notice}" ]]; then - elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7" + elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6" elog "which will prevent the usage of the following coders by default:" elog "" elog " - PS" diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.51.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.56.ebuild similarity index 100% rename from media-gfx/imagemagick/imagemagick-7.0.8.51.ebuild rename to media-gfx/imagemagick/imagemagick-7.0.8.56.ebuild