commit: 8583b906b0155a0cd0764127479a2f0c69e69825
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 3 23:16:18 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 4 00:22:43 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8583b906
media-gfx/imagemagick: use PERL_FEATURES
Signed-off-by: Sam James <sam <AT> gentoo.org>
...9999.ebuild => imagemagick-6.9.13.29-r1.ebuild} | 54 +++++++++++-----------
...k-9999.ebuild => imagemagick-7.1.2.3-r1.ebuild} | 19 ++++++--
media-gfx/imagemagick/imagemagick-9999.ebuild | 18 ++++++--
3 files changed, 59 insertions(+), 32 deletions(-)
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild
b/media-gfx/imagemagick/imagemagick-6.9.13.29-r1.ebuild
similarity index 82%
copy from media-gfx/imagemagick/imagemagick-9999.ebuild
copy to media-gfx/imagemagick/imagemagick-6.9.13.29-r1.ebuild
index c3543f04fc13..b6adee5a9cf0 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.29-r1.ebuild
@@ -3,18 +3,19 @@
EAPI=8
+GENTOO_DEPEND_ON_PERL="no"
QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
-inherit autotools flag-o-matic perl-functions toolchain-funcs
+inherit flag-o-matic libtool perl-module toolchain-funcs
if [[ ${PV} == 9999 ]] ; then
- EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git";
+ EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git";
inherit git-r3
MY_P="imagemagick-9999"
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 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
fi
S="${WORKDIR}/${MY_P}"
@@ -25,8 +26,11 @@ HOMEPAGE="https://imagemagick.org/index.php";
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)-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"
+SLOT="0/$(ver_cut 1-3)-0"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hardened hdri
heif"
+IUSE+=" jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl
${GENTOO_PERL_USESTRING}"
+IUSE+=" +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf"
+IUSE+=" X xml zlib"
REQUIRED_USE="
corefonts? ( truetype )
@@ -50,13 +54,15 @@ RDEPEND="
jbig? ( >=media-libs/jbigkit-2:= )
jpeg? ( media-libs/libjpeg-turbo:= )
jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
- jpegxl? ( >=media-libs/libjxl-0.6:= )
lcms? ( media-libs/lcms:2= )
lqr? ( media-libs/liblqr )
opencl? ( virtual/opencl )
openexr? ( media-libs/openexr:0= )
pango? ( x11-libs/pango )
- perl? ( >=dev-lang/perl-5.8.8:= )
+ perl? (
+ ${GENTOO_PERL_DEPSTRING}
+ >=dev-lang/perl-5.8.8:=
+ )
png? ( media-libs/libpng:= )
postscript? ( app-text/ghostscript-gpl:= )
raw? ( media-libs/libraw:= )
@@ -79,7 +85,6 @@ RDEPEND="
)
xml? ( dev-libs/libxml2:= )
lzma? ( app-arch/xz-utils )
- zip? ( dev-libs/libzip:= )
zlib? ( sys-libs/zlib:= )
"
DEPEND="
@@ -88,10 +93,6 @@ DEPEND="
"
BDEPEND="virtual/pkgconfig"
-PATCHES=(
- "${FILESDIR}/${PN}-9999-nocputuning.patch"
-)
-
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
@@ -103,8 +104,8 @@ pkg_setup() {
src_prepare() {
default
- #elibtoolize # for Darwin modules
- eautoreconf
+ # for Darwin modules
+ elibtoolize
# For testsuite, see bug #500580#c3
local ati_cards mesa_cards nvidia_cards render_cards
@@ -155,10 +156,8 @@ src_configure() {
--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
$(use_with bzip2 bzlib)
$(use_with X x)
- $(use_with zip)
$(use_with zlib)
--without-autotrace
- --with-uhdr
$(use_with postscript dps)
$(use_with djvu)
--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
@@ -172,7 +171,6 @@ src_configure() {
$(use_with jbig)
$(use_with jpeg)
$(use_with jpeg2k openjp2)
- $(use_with jpegxl jxl)
$(use_with lcms)
$(use_with lqr)
$(use_with lzma)
@@ -186,6 +184,7 @@ src_configure() {
$(use_with corefonts windows-font-dir
"${EPREFIX}"/usr/share/fonts/corefonts)
$(use_with wmf)
$(use_with xml)
+ --with-gcc-arch=no-automagic
# 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
@@ -199,8 +198,13 @@ src_configure() {
CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
}
+src_compile() {
+ # Avoid perl-module_src_compile
+ default
+}
+
src_test() {
- # Install default (unrestricted) policy in $HOME for test suite, bug
#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}'"
@@ -208,12 +212,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
@@ -230,7 +230,8 @@ src_install() {
DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
install
- einstalldocs
+ rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+ dodoc {AUTHORS,README}.txt
if use perl; then
find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
@@ -247,7 +248,8 @@ src_install() {
EOF
insinto /etc/sandbox.d
- doins "${T}"/99${PN} #472766
+ # bug #472766
+ doins "${T}"/99${PN}
fi
insinto /usr/share/${PN}
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild
b/media-gfx/imagemagick/imagemagick-7.1.2.3-r1.ebuild
similarity index 93%
copy from media-gfx/imagemagick/imagemagick-9999.ebuild
copy to media-gfx/imagemagick/imagemagick-7.1.2.3-r1.ebuild
index c3543f04fc13..ff19a601e4bd 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.2.3-r1.ebuild
@@ -3,8 +3,9 @@
EAPI=8
+GENTOO_DEPEND_ON_PERL="no"
QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
-inherit autotools flag-o-matic perl-functions toolchain-funcs
+inherit autotools flag-o-matic perl-module toolchain-funcs
if [[ ${PV} == 9999 ]] ; then
EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git";
@@ -26,7 +27,10 @@ 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)-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"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hardened hdri
heif"
+IUSE+=" jbig jpeg jpeg2k jpegxl lcms lqr lzma opencl openexr openmp pango perl
${GENTOO_PERL_USESTRING}"
+IUSE+=" +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf"
+IUSE+=" X xml zip zlib"
REQUIRED_USE="
corefonts? ( truetype )
@@ -56,7 +60,10 @@ RDEPEND="
opencl? ( virtual/opencl )
openexr? ( media-libs/openexr:0= )
pango? ( x11-libs/pango )
- perl? ( >=dev-lang/perl-5.8.8:= )
+ perl? (
+ ${GENTOO_PERL_DEPSTRING}
+ >=dev-lang/perl-5.8.8:=
+ )
png? ( media-libs/libpng:= )
postscript? ( app-text/ghostscript-gpl:= )
raw? ( media-libs/libraw:= )
@@ -90,6 +97,7 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}/${PN}-9999-nocputuning.patch"
+ "${FILESDIR}/${PN}-7.1.2.3-32bit.patch"
)
pkg_pretend() {
@@ -199,6 +207,11 @@ src_configure() {
CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
}
+src_compile() {
+ # Avoid perl-module_src_compile
+ default
+}
+
src_test() {
# Install default (unrestricted) policy in $HOME for test suite, bug
#664238
local _im_local_config_home="${HOME}/.config/ImageMagick"
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild
b/media-gfx/imagemagick/imagemagick-9999.ebuild
index c3543f04fc13..9d1d4bafe279 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild
@@ -3,8 +3,9 @@
EAPI=8
+GENTOO_DEPEND_ON_PERL="no"
QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
-inherit autotools flag-o-matic perl-functions toolchain-funcs
+inherit autotools flag-o-matic perl-module toolchain-funcs
if [[ ${PV} == 9999 ]] ; then
EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git";
@@ -26,7 +27,10 @@ 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)-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"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hardened hdri
heif"
+IUSE+=" jbig jpeg jpeg2k jpegxl lcms lqr lzma opencl openexr openmp pango perl
${GENTOO_PERL_USESTRING}"
+IUSE+=" +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf"
+IUSE+=" X xml zip zlib"
REQUIRED_USE="
corefonts? ( truetype )
@@ -56,7 +60,10 @@ RDEPEND="
opencl? ( virtual/opencl )
openexr? ( media-libs/openexr:0= )
pango? ( x11-libs/pango )
- perl? ( >=dev-lang/perl-5.8.8:= )
+ perl? (
+ ${GENTOO_PERL_DEPSTRING}
+ >=dev-lang/perl-5.8.8:=
+ )
png? ( media-libs/libpng:= )
postscript? ( app-text/ghostscript-gpl:= )
raw? ( media-libs/libraw:= )
@@ -199,6 +206,11 @@ src_configure() {
CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
}
+src_compile() {
+ # Avoid perl-module_src_compile
+ default
+}
+
src_test() {
# Install default (unrestricted) policy in $HOME for test suite, bug
#664238
local _im_local_config_home="${HOME}/.config/ImageMagick"
