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 36AC41382C5 for ; Sat, 23 Jan 2021 15:28:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 431BEE0BD9; Sat, 23 Jan 2021 15:28:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 1A4FDE0BD9 for ; Sat, 23 Jan 2021 15:28:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 01F99340F75 for ; Sat, 23 Jan 2021 15:28:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8A37832B for ; Sat, 23 Jan 2021 15:28:07 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1611415684.cabc71e350affd59fcbbaec8235faa0ef106c8b6.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/imagemagick/imagemagick-6.9.11.52.ebuild media-gfx/imagemagick/imagemagick-6.9.11.58.ebuild media-gfx/imagemagick/imagemagick-7.0.10.52.ebuild media-gfx/imagemagick/imagemagick-7.0.10.58.ebuild media-gfx/imagemagick/imagemagick-9999.ebuild X-VCS-Directories: media-gfx/imagemagick/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: cabc71e350affd59fcbbaec8235faa0ef106c8b6 X-VCS-Branch: master Date: Sat, 23 Jan 2021 15:28:07 +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: f6d2c60c-ffc1-4fad-8d98-57d6bfe887d2 X-Archives-Hash: 70f9386cb46cc83ed4a46d105408d01e commit: cabc71e350affd59fcbbaec8235faa0ef106c8b6 Author: Lars Wendler gentoo org> AuthorDate: Sat Jan 23 15:26:46 2021 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sat Jan 23 15:28:04 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cabc71e3 media-gfx/imagemagick: Fixed build with sys-devel/slibtool Bug: https://bugs.gentoo.org/766683 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Lars Wendler gentoo.org> media-gfx/imagemagick/imagemagick-6.9.11.52.ebuild | 2 +- media-gfx/imagemagick/imagemagick-6.9.11.58.ebuild | 2 +- media-gfx/imagemagick/imagemagick-7.0.10.52.ebuild | 2 +- media-gfx/imagemagick/imagemagick-7.0.10.58.ebuild | 2 +- media-gfx/imagemagick/imagemagick-9999.ebuild | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.52.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.52.ebuild index 203c905e1c6..8b0ce8fdad5 100644 --- a/media-gfx/imagemagick/imagemagick-6.9.11.52.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.9.11.52.ebuild @@ -206,7 +206,7 @@ src_install() { find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + # .la files in parent are not needed, keep plugin .la files - rm "${ED}"/usr/$(get_libdir)/*.la || die + find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die if use opencl; then cat <<-EOF > "${T}"/99${PN} diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.58.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.58.ebuild index 1ad14695c63..d80bdfa74e8 100644 --- a/media-gfx/imagemagick/imagemagick-6.9.11.58.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.9.11.58.ebuild @@ -206,7 +206,7 @@ src_install() { find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + # .la files in parent are not needed, keep plugin .la files - rm "${ED}"/usr/$(get_libdir)/*.la || die + find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die if use opencl; then cat <<-EOF > "${T}"/99${PN} diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.52.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.52.ebuild index 88889b42904..5d7a1d8dc05 100644 --- a/media-gfx/imagemagick/imagemagick-7.0.10.52.ebuild +++ b/media-gfx/imagemagick/imagemagick-7.0.10.52.ebuild @@ -220,7 +220,7 @@ src_install() { find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + # .la files in parent are not needed, keep plugin .la files - rm "${ED}"/usr/$(get_libdir)/*.la || die + find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die if use opencl; then cat <<-EOF > "${T}"/99${PN} diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.58.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.58.ebuild index e5a1d02609e..67687ea276c 100644 --- a/media-gfx/imagemagick/imagemagick-7.0.10.58.ebuild +++ b/media-gfx/imagemagick/imagemagick-7.0.10.58.ebuild @@ -220,7 +220,7 @@ src_install() { find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + # .la files in parent are not needed, keep plugin .la files - rm "${ED}"/usr/$(get_libdir)/*.la || die + find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die if use opencl; then cat <<-EOF > "${T}"/99${PN} diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild index e5a1d02609e..67687ea276c 100644 --- a/media-gfx/imagemagick/imagemagick-9999.ebuild +++ b/media-gfx/imagemagick/imagemagick-9999.ebuild @@ -220,7 +220,7 @@ src_install() { find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + # .la files in parent are not needed, keep plugin .la files - rm "${ED}"/usr/$(get_libdir)/*.la || die + find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die if use opencl; then cat <<-EOF > "${T}"/99${PN}