commit: 708a031f75d3010bfc6c718a7abf58561f90703a Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Jul 16 17:08:18 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Jul 16 17:11:55 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=708a031f
media-gfx/imagemagick: add 7.1.0.37 Bug: https://bugs.gentoo.org/858305 Signed-off-by: Sam James <sam <AT> gentoo.org> media-gfx/imagemagick/Manifest | 1 + ...ick-9999.ebuild => imagemagick-7.1.0.37.ebuild} | 36 +++++++++++----------- media-gfx/imagemagick/imagemagick-9999.ebuild | 36 +++++++++++----------- 3 files changed, 37 insertions(+), 36 deletions(-) diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest index 745e27c46412..6f1dda8118cf 100644 --- a/media-gfx/imagemagick/Manifest +++ b/media-gfx/imagemagick/Manifest @@ -2,3 +2,4 @@ DIST ImageMagick-6.9.12-28.tar.xz 9181044 BLAKE2B 2efc03da9e4c53b82479badfcc9a25 DIST ImageMagick-6.9.12-35.tar.xz 9178620 BLAKE2B 8bcf8bcc8bee8fe3d996a3b9388fdc20a6bbd45dda35121a9fb84804277286cb17c3b6cf2e6096765aefe20a31f819f8bcf094b0b3b1c68b683b50ddc415b398 SHA512 ba1f49570d1f890bc313d4e58c53c2b7388108c64cd2c5ef7586a7568f72d5655fced1a22085e27858cffcf86b7548376970fc6947fccb36f4cfba48327089e6 DIST ImageMagick-7.1.0-13.tar.xz 10311564 BLAKE2B 7cb3e58f548cbe0b9e1239df47ff4f42af2cd0b6ff4c417a62515ff9bd434ecabed2cc7f7cb7cf8880f20af3f6d7de33d7368f146b9ac7668149959966a463d8 SHA512 dac1fc229599a63703fc3aa1378de313dc94dfbfa71913dc408ef65c88ef33820b5ddab4c9a064a86cc35c0abb0136f0adb626bff9e227b52ed0d90993688044 DIST ImageMagick-7.1.0-20.tar.xz 10339572 BLAKE2B 7e99a8b36089b1258f537dbdf8c674be17677da5450854e0dfe0ed3bd3722ec826099f7c22d615daece6d647e6c22f4d9aa7293fed9b4bebb77c163e3ac54bc3 SHA512 e07d8f8ede8f713f1c0bd571b6042062b154b95ab06b0479ec4162d242beba982bfa88438ac67985d4da6d18074bda4b0ac25a7c2ced44f19b54c21120441991 +DIST ImageMagick-7.1.0-37.tar.xz 10345216 BLAKE2B e07179d55527537c36dd1655d44f93df4ad39cb66667857581e0cae8efc03ec45dc65b0d5b0a2b78fd24ed5371f8ebea6c4965168b328bac7041466f45f40469 SHA512 43f116a3a6bb9794b8c8440c57a537eab29b0dac7b8ace574e3cc1e6d484054557c9e44235eb799b843ef761c6f22d29ef959f6de6b80a45a3898bee4d2f16da diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-7.1.0.37.ebuild similarity index 93% copy from media-gfx/imagemagick/imagemagick-9999.ebuild copy to media-gfx/imagemagick/imagemagick-7.1.0.37.ebuild index 0b6122942f86..6f100c666b56 100644 --- a/media-gfx/imagemagick/imagemagick-9999.ebuild +++ b/media-gfx/imagemagick/imagemagick-7.1.0.37.ebuild @@ -1,11 +1,12 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="8" +EAPI=8 +QA_PKGCONFIG_VERSION=$(ver_cut 1-3) inherit autotools flag-o-matic libtool perl-functions toolchain-funcs -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"; inherit git-r3 MY_P="imagemagick-9999" @@ -13,14 +14,16 @@ else MY_PV="$(ver_rs 3 '-')" MY_P="ImageMagick-${MY_PV}" SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" fi +S="${WORKDIR}/${MY_P}" + DESCRIPTION="A collection of tools and libraries for many image formats" HOMEPAGE="https://www.imagemagick.org/"; LICENSE="imagemagick" -SLOT="0/7.1.0-0" +SLOT="0/7.1.0-37" 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 zip zlib" REQUIRED_USE="corefonts? ( truetype ) @@ -29,10 +32,9 @@ REQUIRED_USE="corefonts? ( truetype ) RESTRICT="!test? ( test )" -BDEPEND="virtual/pkgconfig" - RDEPEND=" - dev-libs/libltdl:0 + !media-gfx/graphicsmagick[imagemagick] + dev-libs/libltdl bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) @@ -74,17 +76,14 @@ RDEPEND=" lzma? ( app-arch/xz-utils ) zip? ( dev-libs/libzip:= ) zlib? ( sys-libs/zlib:= )" - DEPEND="${RDEPEND} - !media-gfx/graphicsmagick[imagemagick] X? ( x11-base/xorg-proto )" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}/${PN}-9999-nocputuning.patch" ) -S="${WORKDIR}/${MY_P}" - pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } @@ -95,9 +94,11 @@ pkg_setup() { src_prepare() { default + + #elibtoolize # for Darwin modules eautoreconf - # Apply hardening #664236 + # Apply hardening, bug #664236 cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die sed -i -e '/^<policymap>$/ { r policy-hardening.snippet @@ -107,8 +108,6 @@ src_prepare() { die "Failed to apply hardening of policy.xml" einfo "policy.xml hardened" - 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 shopt -s nullglob @@ -186,11 +185,12 @@ src_configure() { $(use_with wmf) $(use_with xml) ) - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" + + CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}" } src_test() { - # Install default (unrestricted) policy in $HOME for test suite #664238 + # Install default (unrestricted) policy in $HOME for test suite, bug #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}'" @@ -198,7 +198,7 @@ src_test() { die "Failed to install default blank policy.xml in '${_im_local_config_home}'" local im_command= IM_COMMANDS=() - if [[ ${PV} == "9999" ]] ; then + 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 @@ -221,7 +221,7 @@ src_install() { install rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} - dodoc {AUTHORS,README}.txt ChangeLog + dodoc {AUTHORS,README}.txt if use perl; then find "${ED}" -type f -name perllocal.pod -exec rm -f {} + diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild index 0b6122942f86..6f100c666b56 100644 --- a/media-gfx/imagemagick/imagemagick-9999.ebuild +++ b/media-gfx/imagemagick/imagemagick-9999.ebuild @@ -1,11 +1,12 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="8" +EAPI=8 +QA_PKGCONFIG_VERSION=$(ver_cut 1-3) inherit autotools flag-o-matic libtool perl-functions toolchain-funcs -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"; inherit git-r3 MY_P="imagemagick-9999" @@ -13,14 +14,16 @@ else MY_PV="$(ver_rs 3 '-')" MY_P="ImageMagick-${MY_PV}" SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" fi +S="${WORKDIR}/${MY_P}" + DESCRIPTION="A collection of tools and libraries for many image formats" HOMEPAGE="https://www.imagemagick.org/"; LICENSE="imagemagick" -SLOT="0/7.1.0-0" +SLOT="0/7.1.0-37" 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 zip zlib" REQUIRED_USE="corefonts? ( truetype ) @@ -29,10 +32,9 @@ REQUIRED_USE="corefonts? ( truetype ) RESTRICT="!test? ( test )" -BDEPEND="virtual/pkgconfig" - RDEPEND=" - dev-libs/libltdl:0 + !media-gfx/graphicsmagick[imagemagick] + dev-libs/libltdl bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) @@ -74,17 +76,14 @@ RDEPEND=" lzma? ( app-arch/xz-utils ) zip? ( dev-libs/libzip:= ) zlib? ( sys-libs/zlib:= )" - DEPEND="${RDEPEND} - !media-gfx/graphicsmagick[imagemagick] X? ( x11-base/xorg-proto )" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}/${PN}-9999-nocputuning.patch" ) -S="${WORKDIR}/${MY_P}" - pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } @@ -95,9 +94,11 @@ pkg_setup() { src_prepare() { default + + #elibtoolize # for Darwin modules eautoreconf - # Apply hardening #664236 + # Apply hardening, bug #664236 cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die sed -i -e '/^<policymap>$/ { r policy-hardening.snippet @@ -107,8 +108,6 @@ src_prepare() { die "Failed to apply hardening of policy.xml" einfo "policy.xml hardened" - 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 shopt -s nullglob @@ -186,11 +185,12 @@ src_configure() { $(use_with wmf) $(use_with xml) ) - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" + + CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}" } src_test() { - # Install default (unrestricted) policy in $HOME for test suite #664238 + # Install default (unrestricted) policy in $HOME for test suite, bug #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}'" @@ -198,7 +198,7 @@ src_test() { die "Failed to install default blank policy.xml in '${_im_local_config_home}'" local im_command= IM_COMMANDS=() - if [[ ${PV} == "9999" ]] ; then + 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 @@ -221,7 +221,7 @@ src_install() { install rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} - dodoc {AUTHORS,README}.txt ChangeLog + dodoc {AUTHORS,README}.txt if use perl; then find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
