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 5C382138350 for ; Sat, 21 Mar 2020 19:20:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8B44DE0AC7; Sat, 21 Mar 2020 19:20:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 5D350E0AC7 for ; Sat, 21 Mar 2020 19:20:28 +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 9746034EF4D for ; Sat, 21 Mar 2020 19:20:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 29B009D for ; Sat, 21 Mar 2020 19:20:14 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1584818328.4875f0b1f4bc043004e026ad79222ac5d20b60d1.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/imagemagick/Manifest media-gfx/imagemagick/imagemagick-6.9.11.1.ebuild media-gfx/imagemagick/imagemagick-7.0.10.1.ebuild media-gfx/imagemagick/imagemagick-9999.ebuild X-VCS-Directories: media-gfx/imagemagick/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: 4875f0b1f4bc043004e026ad79222ac5d20b60d1 X-VCS-Branch: master Date: Sat, 21 Mar 2020 19:20:14 +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: cce0f572-8b81-4a43-a557-620266729068 X-Archives-Hash: acc0941f7c28845fda266c0ed85d5093 commit: 4875f0b1f4bc043004e026ad79222ac5d20b60d1 Author: Pacho Ramos gentoo org> AuthorDate: Sat Mar 21 19:18:48 2020 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Sat Mar 21 19:18:48 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4875f0b1 media-gfx/imagemagick: Bump to 6.9.11.1 and 7.0.10.1 Also: - Drop .la files in parent dir, keeping them for plugins (#593750) - potrace is used at runtime to convert to svg (#712376) Thanks-to: Brian Evans Closes: https://bugs.gentoo.org/712376 Closes: https://bugs.gentoo.org/593750 Package-Manager: Portage-2.3.94, Repoman-2.3.21 Signed-off-by: Pacho Ramos gentoo.org> media-gfx/imagemagick/Manifest | 2 + ...ick-9999.ebuild => imagemagick-6.9.11.1.ebuild} | 55 ++++++++++------------ ...ick-9999.ebuild => imagemagick-7.0.10.1.ebuild} | 7 ++- media-gfx/imagemagick/imagemagick-9999.ebuild | 7 ++- 4 files changed, 38 insertions(+), 33 deletions(-) diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest index 95c18f5d572..7a34d2641f1 100644 --- a/media-gfx/imagemagick/Manifest +++ b/media-gfx/imagemagick/Manifest @@ -1,2 +1,4 @@ DIST ImageMagick-6.9.11-0.tar.xz 9072040 BLAKE2B 8e3df83c5a009e3a03599a20b9bc2d6f1e91add659d8de150a4ebeafb91218bc62aac25c755a6a1010e00c2d14853a0d8a4849e2b55c899587acdf2d28d8b7c5 SHA512 fe6786365dfe8973e4660f4070cb85335f88985ec9e2484fe382d1f5c1f0123476cdf8e976107072b5ed13b05190f906be89e5215e16dc62e5daebe3ede40bf2 +DIST ImageMagick-6.9.11-1.tar.xz 9069980 BLAKE2B fbbe707da57a9b1016e89496112b85f1f8500ff35a23015d708c46369c88255c61ed0dd08b8dc2f1160045d91252bab39e9869f490b833f34bd5b7b65d7133a5 SHA512 d18db31d6d2e506203ac530e3d3032c3dfb776fb693788cf813546128dbcb4255522586d8dd5deb9cf0b56a8d503a42929937ee1ec34c8e14ce64568b552bd05 DIST ImageMagick-7.0.10-0.tar.xz 9532856 BLAKE2B 510e1ac8010b7e2267950e868ce8d0fcd36e37c936c67b1603f4dfdc247cda8dd4aa59fc0d88f5d2a2c0a9a199331cca834797f315814964b68dfad1ab24f355 SHA512 d997429855fa4bc48da32e00ea5c45467a6bd3265c35c0aff8f150346e467451737f276833d4fa867f0e2e52110f532416af1dafdbc8e81d2d11dd0c4c80f011 +DIST ImageMagick-7.0.10-1.tar.xz 9531244 BLAKE2B e0c16627c23e0ae181e52d73f0c5ec91835fe87eb587e73fc8aff58b0e505e8b78b3c62f842be4d80a787d3f3df404e3e3feb58c80282b828ae623f1cd2fb5ed SHA512 086616507c073e1a6c8c1276273fee18e9d5ae5ea3a730ad770347459a975c898517985b5a79798b90922e4954cdf994b78daa1ab164cbb48087da389acf6db5 diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.1.ebuild similarity index 82% copy from media-gfx/imagemagick/imagemagick-9999.ebuild copy to media-gfx/imagemagick/imagemagick-6.9.11.1.ebuild index 6b8545f0e37..54a949aee1f 100644 --- a/media-gfx/imagemagick/imagemagick-9999.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.9.11.1.ebuild @@ -1,35 +1,27 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="6" -inherit flag-o-matic libtool perl-functions toolchain-funcs multilib +inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.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 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -fi +MY_PV="$(ver_rs 3 '-')" +MY_P="ImageMagick-${MY_PV}" DESCRIPTION="A collection of tools and libraries for many image formats" HOMEPAGE="https://www.imagemagick.org/" +SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" LICENSE="imagemagick" -SLOT="0/7.0.10" +SLOT="0/6.9.11" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" 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 zlib" -RESTRICT="!test? ( test )" REQUIRED_USE="corefonts? ( truetype ) test? ( corefonts )" -RESTRICT="!test? ( test )" - -BDEPEND="virtual/pkgconfig" +RESTRICT="perl? ( userpriv ) + !test? ( test )" RDEPEND=" dev-libs/libltdl:0 @@ -53,7 +45,10 @@ RDEPEND=" png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) - svg? ( gnome-base/librsvg ) + svg? ( + gnome-base/librsvg + media-gfx/potrace + ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts @@ -70,12 +65,13 @@ RDEPEND=" xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )" - DEPEND="${RDEPEND} !media-gfx/graphicsmagick[imagemagick] + virtual/pkgconfig X? ( x11-base/xorg-proto )" S="${WORKDIR}/${MY_P}" +#S="${WORKDIR}/ImageMagick6-${MY_PV}" src_prepare() { default @@ -93,7 +89,7 @@ src_prepare() { 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 + local mesa_cards ati_cards nvidia_cards render_cards shopt -s nullglob ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') if test -n "${ati_cards}"; then @@ -103,7 +99,7 @@ src_prepare() { if test -n "${mesa_cards}"; then addpredict "${mesa_cards}" fi - nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') + nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g') if test -n "${nvidia_cards}"; then addpredict "${nvidia_cards}" fi @@ -155,7 +151,6 @@ src_configure() { $(use_with jbig) $(use_with jpeg) $(use_with jpeg2k openjp2) - --without-jxl $(use_with lcms) $(use_with lqr) $(use_with lzma) @@ -184,12 +179,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 @@ -206,7 +197,7 @@ src_install() { DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ install - rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} + rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} dodoc {AUTHORS,README}.txt ChangeLog if use perl; then @@ -215,6 +206,8 @@ src_install() { fi 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 if use opencl; then cat <<-EOF > "${T}"/99${PN} @@ -238,7 +231,7 @@ pkg_postinst() { else local v for v in ${REPLACING_VERSIONS}; do - if ! ver_test "${v}" -gt "7.0.8.10-r2"; then + if ! ver_test "${v}" -gt "6.9.10.10-r2"; then # This is an upgrade _show_policy_xml_notice=yes @@ -249,7 +242,7 @@ pkg_postinst() { fi if [[ -n "${_show_policy_xml_notice}" ]]; then - elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7" + elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6" elog "which will prevent the usage of the following coders by default:" elog "" elog " - PS" diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.1.ebuild similarity index 97% copy from media-gfx/imagemagick/imagemagick-9999.ebuild copy to media-gfx/imagemagick/imagemagick-7.0.10.1.ebuild index 6b8545f0e37..a9e638d3fb7 100644 --- a/media-gfx/imagemagick/imagemagick-9999.ebuild +++ b/media-gfx/imagemagick/imagemagick-7.0.10.1.ebuild @@ -53,7 +53,10 @@ RDEPEND=" png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) - svg? ( gnome-base/librsvg ) + svg? ( + gnome-base/librsvg + media-gfx/potrace + ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts @@ -215,6 +218,8 @@ src_install() { fi 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 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 6b8545f0e37..a9e638d3fb7 100644 --- a/media-gfx/imagemagick/imagemagick-9999.ebuild +++ b/media-gfx/imagemagick/imagemagick-9999.ebuild @@ -53,7 +53,10 @@ RDEPEND=" png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) - svg? ( gnome-base/librsvg ) + svg? ( + gnome-base/librsvg + media-gfx/potrace + ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts @@ -215,6 +218,8 @@ src_install() { fi 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 if use opencl; then cat <<-EOF > "${T}"/99${PN}