From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1049594-garchives=archives.gentoo.org@lists.gentoo.org>
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 03468138335
for <garchives@archives.gentoo.org>; Sun, 30 Sep 2018 20:45:22 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 14510E0882;
Sun, 30 Sep 2018 20:45:21 +0000 (UTC)
Received: from smtp.gentoo.org (unknown [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 C4E67E0882
for <gentoo-commits@lists.gentoo.org>; Sun, 30 Sep 2018 20:45:20 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 3435D335C7F
for <gentoo-commits@lists.gentoo.org>; Sun, 30 Sep 2018 20:44:59 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 5351B3AB
for <gentoo-commits@lists.gentoo.org>; Sun, 30 Sep 2018 20:44:57 +0000 (UTC)
From: "Thomas Deutschmann" <whissi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" <whissi@gentoo.org>
Message-ID: <1538340270.80c6836737de4d7e52889e44a80ffcfd7e0b7f01.whissi@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.10.11.ebuild media-gfx/imagemagick/imagemagick-6.9.10.12.ebuild media-gfx/imagemagick/imagemagick-7.0.8.12.ebuild
X-VCS-Directories: media-gfx/imagemagick/
X-VCS-Committer: whissi
X-VCS-Committer-Name: Thomas Deutschmann
X-VCS-Revision: 80c6836737de4d7e52889e44a80ffcfd7e0b7f01
X-VCS-Branch: master
Date: Sun, 30 Sep 2018 20:44:57 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 276872da-a51b-4c61-abee-194da5238ac9
X-Archives-Hash: 2c1f686f887bc3923e28734421ae3141
commit: 80c6836737de4d7e52889e44a80ffcfd7e0b7f01
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 30 20:32:46 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Sep 30 20:44:30 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80c68367
media-gfx/imagemagick: bump to v6.9.10-12 & 7.0.8-12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
media-gfx/imagemagick/Manifest | 2 ++
media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild | 4 +--
...9.10.11.ebuild => imagemagick-6.9.10.12.ebuild} | 4 +--
....9.10.11.ebuild => imagemagick-7.0.8.12.ebuild} | 32 ++++++++++++++--------
4 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index da08b453cb7..9de8834b988 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,2 +1,4 @@
DIST ImageMagick-6.9.10-11.tar.xz 8918436 BLAKE2B f7846b21a68d0e8e462cc7a86322f73ec0df7cfd10fb35e97f6adb375c9291b9571c07da901636bbc933330ec0f4c2ee27b3af673c6af28d30090e78a81b2bbc SHA512 b272eee7c74c3d2e6cdc7b5ba088bf87d7fad87c8828c9d2660986acb05c0ee06566c4b2b82913be9086a51e9b7c64ceb9ecc2bf28691d183b8e478a15384ead
+DIST ImageMagick-6.9.10-12.tar.xz 8928804 BLAKE2B 061a1a855040fb861b200f3b1968c6f976048a09ae94e8881d81cb9b8618404b6c69aab62718285482a7f15826a946af6365af8e731a50bc2812f45396f6241c SHA512 f9f663c399afa3b86c9302607155ca62dd7d519573f61735916147be23ca27dd8bb29dffbdcb542f3433f367cb1cc97af879d18d72dda0d9a18d4c82f1b0f134
DIST ImageMagick-7.0.8-11.tar.xz 8638236 BLAKE2B 927b9d467635f80d65b53e4d4d5c55e2ca4f8073b110881950d6bd9205a6da3b6ead91c624d1cccabb6c37f5bb841f9584c7c6d65714736898d17a22d9075a50 SHA512 b6f7493095097d3c551c70acd2181fb8e252750916534602646c7c765d756b5483c1bdd08b00d59f8b0bc3963729a2b64bf8cb467e3f23e26a4d35515b6d3b18
+DIST ImageMagick-7.0.8-12.tar.xz 8630340 BLAKE2B f2a568ed5c4cb1143a05d0d917969d9e60c1a967369523a0defcc2782e635f867dd49234bc445ceceae5bbabf826eb923e789ae0b4c7e6a6345cea6758a083b0 SHA512 b4b9d252e12fe60cb046e64558465eea5e635fd133053732810f0cbc7e68efb2d2b4a336b28b3e7e985e659bb07eabc4709ed437f0f20e57bcc5a9a13fa3cc31
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild
index 7c00fe4af0d..73431db9bc1 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
LICENSE="imagemagick"
SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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 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="perl? ( userpriv )"
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.12.ebuild
similarity index 96%
copy from media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild
copy to media-gfx/imagemagick/imagemagick-6.9.10.12.ebuild
index 7c00fe4af0d..73431db9bc1 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
LICENSE="imagemagick"
SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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 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="perl? ( userpriv )"
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.12.ebuild
similarity index 85%
copy from media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild
copy to media-gfx/imagemagick/imagemagick-7.0.8.12.ebuild
index 7c00fe4af0d..428e6d1e211 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.12.ebuild
@@ -1,22 +1,26 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
-inherit eapi7-ver eutils flag-o-matic libtool multilib toolchain-funcs
+inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
-MY_P=ImageMagick-$(ver_rs 3 '-')
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
+ inherit git-r3
+ MY_P="imagemagick-9999"
+else
+ MY_P=ImageMagick-$(ver_rs 3 '-')
+ SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
DESCRIPTION="A collection of tools and libraries for many image formats"
HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
LICENSE="imagemagick"
SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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 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="perl? ( userpriv )"
+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"
RDEPEND="
dev-libs/libltdl:0
@@ -27,6 +31,7 @@ RDEPEND="
fontconfig? ( media-libs/fontconfig )
fpx? ( >=media-libs/libfpx-1.3.0-r1 )
graphviz? ( media-gfx/graphviz )
+ heif? ( media-libs/libheif:= )
jbig? ( >=media-libs/jbigkit-2:= )
jpeg? ( virtual/jpeg:0 )
jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
@@ -89,7 +94,7 @@ src_prepare() {
elibtoolize # for Darwin modules
# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
- local mesa_cards ati_cards nvidia_cards render_cards
+ local ati_cards mesa_cards nvidia_cards render_cards
shopt -s nullglob
ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
if test -n "${ati_cards}"; then
@@ -99,7 +104,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
@@ -119,6 +124,8 @@ src_configure() {
local openmp=disable
use openmp && { tc-has-openmp && openmp=enable; }
+ use perl && perl_check_env
+
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
local myeconfargs=(
@@ -145,6 +152,7 @@ src_configure() {
$(use_with truetype freetype)
$(use_with postscript gslib)
$(use_with graphviz gvc)
+ $(use_with heif heic)
$(use_with jbig)
$(use_with jpeg)
$(use_with jpeg2k openjp2)
@@ -211,7 +219,7 @@ pkg_postinst() {
else
local v
for v in ${REPLACING_VERSIONS}; do
- if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
+ if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
# This is an upgrade
_show_policy_xml_notice=yes
@@ -222,7 +230,7 @@ pkg_postinst() {
fi
if [[ -n "${_show_policy_xml_notice}" ]]; then
- elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
+ elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
elog "which will prevent the usage of the following coders by default:"
elog ""
elog " - PS"