commit: 667bf10e470bff6cdc52847021e5980b5cdd416e Author: Aliaksei Urbanski <aliaksei.urbanski <AT> gmail <DOT> com> AuthorDate: Thu Dec 11 10:31:46 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Dec 12 13:20:37 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=667bf10e
media-gfx/imagemagick: sync 9999 with 7.1.2.10 Signed-off-by: Aliaksei Urbanski <aliaksei.urbanski <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/37716 Closes: https://github.com/gentoo/gentoo/pull/37716 Signed-off-by: Sam James <sam <AT> gentoo.org> media-gfx/imagemagick/imagemagick-9999.ebuild | 30 ++++++++------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild index fcb03069ba68..0c12c21c9855 100644 --- a/media-gfx/imagemagick/imagemagick-9999.ebuild +++ b/media-gfx/imagemagick/imagemagick-9999.ebuild @@ -7,6 +7,9 @@ GENTOO_DEPEND_ON_PERL="no" QA_PKGCONFIG_VERSION=$(ver_cut 1-3) inherit autotools flag-o-matic perl-module toolchain-funcs +DESCRIPTION="A collection of tools and libraries for many image formats" +HOMEPAGE="https://imagemagick.org"; + if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"; inherit git-r3 @@ -20,9 +23,6 @@ fi S="${WORKDIR}/${MY_P}" -DESCRIPTION="A collection of tools and libraries for many image formats" -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 '-'. @@ -114,22 +114,8 @@ src_prepare() { eautoreconf # For testsuite, see bug #500580#c3 - local ati_cards mesa_cards nvidia_cards render_cards shopt -s nullglob - ati_cards=$(echo -n /dev/ati/card*) - for card in ${ati_cards[@]} ; do - addpredict "${card}" - done - mesa_cards=$(echo -n /dev/dri/card*) - for card in ${mesa_cards[@]} ; do - addpredict "${card}" - done - nvidia_cards=$(echo -n /dev/nvidia*) - for card in ${nvidia_cards[@]} ; do - addpredict "${card}" - done - render_cards=$(echo -n /dev/dri/renderD128*) - for card in ${render_cards[@]} ; do + for card in /dev/{{ati,dri}/card,nvidia,dri/renderD128}*; do addpredict "${card}" done shopt -u nullglob @@ -245,14 +231,16 @@ src_install() { einstalldocs if use perl; then - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + + find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die + find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die fi - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + # .la files in parent are not needed, keep plugin .la files find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die + # https://github.com/gentoo/gentoo/pull/37716#discussion_r1696713348 + find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + || die + if use opencl; then cat <<-EOF > "${T}"/99${PN} SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
