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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 12F6A158089 for ; Sun, 24 Sep 2023 01:52:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 366692BC031; Sun, 24 Sep 2023 01:52:23 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 14E392BC014 for ; Sun, 24 Sep 2023 01:52:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 20AE0340871 for ; Sun, 24 Sep 2023 01:52:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 584CF1246 for ; Sun, 24 Sep 2023 01:52:20 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1695520325.88726f96517bbd745a61a952c5b32351fc10f511.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/imagemagick/imagemagick-7.1.1.18.ebuild media-gfx/imagemagick/imagemagick-9999.ebuild X-VCS-Directories: media-gfx/imagemagick/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 88726f96517bbd745a61a952c5b32351fc10f511 X-VCS-Branch: master Date: Sun, 24 Sep 2023 01:52:20 +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: 05bffcab-7949-485c-8927-6dda9b578dfa X-Archives-Hash: 27ef91ec06ace053db2882c436c5dea4 commit: 88726f96517bbd745a61a952c5b32351fc10f511 Author: Sam James gentoo org> AuthorDate: Sun Sep 24 01:51:21 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sun Sep 24 01:52:05 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88726f96 media-gfx/imagemagick: sync live Signed-off-by: Sam James gentoo.org> media-gfx/imagemagick/imagemagick-7.1.1.18.ebuild | 15 ++++++++---- media-gfx/imagemagick/imagemagick-9999.ebuild | 29 ++++++++++++++++------- 2 files changed, 31 insertions(+), 13 deletions(-) diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.18.ebuild b/media-gfx/imagemagick/imagemagick-7.1.1.18.ebuild index 93a5b83426a4..904cbdbc135e 100644 --- a/media-gfx/imagemagick/imagemagick-7.1.1.18.ebuild +++ b/media-gfx/imagemagick/imagemagick-7.1.1.18.ebuild @@ -28,9 +28,11 @@ LICENSE="imagemagick" SLOT="0/$(ver_cut 1-3)-18" IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hardened hdri heif jbig jpeg jpeg2k jpegxl 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 ) +REQUIRED_USE=" + corefonts? ( truetype ) svg? ( xml ) - test? ( corefonts )" + test? ( corefonts ) +" RESTRICT="!test? ( test )" @@ -78,9 +80,12 @@ RDEPEND=" xml? ( dev-libs/libxml2 ) lzma? ( app-arch/xz-utils ) zip? ( dev-libs/libzip:= ) - zlib? ( sys-libs/zlib:= )" -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto )" + zlib? ( sys-libs/zlib:= ) +" +DEPEND=" + ${RDEPEND} + X? ( x11-base/xorg-proto ) +" BDEPEND="virtual/pkgconfig" PATCHES=( diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild index a95c8b48d40c..904cbdbc135e 100644 --- a/media-gfx/imagemagick/imagemagick-9999.ebuild +++ b/media-gfx/imagemagick/imagemagick-9999.ebuild @@ -14,7 +14,7 @@ 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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi S="${WORKDIR}/${MY_P}" @@ -25,12 +25,14 @@ HOMEPAGE="https://www.imagemagick.org/" LICENSE="imagemagick" # Please check this on bumps, SONAME is often not updated! Use abidiff on old/new. # If ABI is broken, change the bit after the '-'. -SLOT="0/$(ver_cut 1-3)-43" -IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k jpegxl 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" +SLOT="0/$(ver_cut 1-3)-18" +IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hardened hdri heif jbig jpeg jpeg2k jpegxl 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 ) +REQUIRED_USE=" + corefonts? ( truetype ) svg? ( xml ) - test? ( corefonts )" + test? ( corefonts ) +" RESTRICT="!test? ( test )" @@ -78,9 +80,12 @@ RDEPEND=" xml? ( dev-libs/libxml2 ) lzma? ( app-arch/xz-utils ) zip? ( dev-libs/libzip:= ) - zlib? ( sys-libs/zlib:= )" -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto )" + zlib? ( sys-libs/zlib:= ) +" +DEPEND=" + ${RDEPEND} + X? ( x11-base/xorg-proto ) +" BDEPEND="virtual/pkgconfig" PATCHES=( @@ -177,6 +182,14 @@ src_configure() { $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) $(use_with wmf) $(use_with xml) + + # Default upstream (as of 6.9.12.96/7.1.1.18 anyway) is open + # For now, let's make USE=hardened do 'limited', and have USE=-hardened + # reflect the upstream default of 'open'. + # + # We might change it to 'secure' and 'limited' at some point. + # See also bug #716674. + --with-security-policy=$(usex hardened limited open) ) CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"