summaryrefslogtreecommitdiff
path: root/media-gfx/imagemagick
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-11-18 10:15:03 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-11-18 10:15:03 +0000
commitb284a3168fa91a038925d2ecf5e4791011ea5e7d (patch)
tree16fe44748708acacd909d4e2e160a09a7f6d936a /media-gfx/imagemagick
parent77398e424e45d9e98c1cef3c43bdadb9d56e81ef (diff)
gentoo resync : 18.11.2019
Diffstat (limited to 'media-gfx/imagemagick')
-rw-r--r--media-gfx/imagemagick/Manifest10
-rw-r--r--media-gfx/imagemagick/imagemagick-6.9.10.73.ebuild (renamed from media-gfx/imagemagick/imagemagick-6.9.10.67.ebuild)9
-rw-r--r--media-gfx/imagemagick/imagemagick-7.0.9.4.ebuild (renamed from media-gfx/imagemagick/imagemagick-7.0.8.67.ebuild)22
-rw-r--r--media-gfx/imagemagick/imagemagick-9999.ebuild24
4 files changed, 39 insertions, 26 deletions
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index d4ad4ca4474c..f572e70d227f 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,8 +1,8 @@
AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
-DIST ImageMagick-6.9.10-67.tar.xz 9068120 BLAKE2B ce7b3b37a65acb5433459bca242e6fdd3a35d8d5f10b8f21395cd085aed0c1b588835919cf43e8abb2f2d86a035fa5e663660b652029a07a7cf83006bd052320 SHA512 d413c4b7dfb7db5c7d61977d7444774ea7445b254746266261a5a91e47aa89ae566241e84135915102ea9a09d77cd89beeaed7a2f5974f6c9b0f4b505c5bfc42
-DIST ImageMagick-7.0.8-67.tar.xz 9470768 BLAKE2B c14f5536ab80720698a6d8df37724d2b0107a6f378a23f2f8f891be585dde59378ffed4fcb601794a5db4cf1d0008db40f33697b1c04ab3b0185a6a71a331a26 SHA512 ad4325df57769f9c4edf8ac71370cb9bb19e090e588d47eb0311e3f4895abd7a7edcbd2e7a495f21acd1daca97fa224bdf1fd978577588e45c11a7799c3d67f4
-EBUILD imagemagick-6.9.10.67.ebuild 6867 BLAKE2B 1cb8781a336ef0322df8e35d5bc6e6a3f6e70c3930e95f518160c677900d1aa51bb6d2ba4d2822f83f3aea40e57cfdda39bd808c1443cd874080492a003aef11 SHA512 b39325d583ea67a2b9e7a75e76dca7d29584f53c0e458249c44fc23007628f168b923d92aab6ee1329d6c13a804491c835664f5a5329ea05474b8cc72454a744
-EBUILD imagemagick-7.0.8.67.ebuild 7134 BLAKE2B aa5e04ab76be0e47eeabfa67852bb3907907f49844996f2d5bc875d880eda49506657758753ada9f5bfe9da159cc8d6f3b012d9aa061ea6bc5ae9d64f9caf91f SHA512 d5c4939be2fc6bca2b0e96b6dc02f35bbec8d9574495b0389155febee4fcf0e94fc41666860c1792eb2fadb77a9cd846d3bccc1df0f330c146efc95237dd67c1
-EBUILD imagemagick-9999.ebuild 7144 BLAKE2B 45892ff417e8a153ffcbc958d9ee0e594bb478bab88f24e207317c788b14b32c7ad0ad8c7bfc01a74c3ae70df2775f0187aa0ede2774873427194c134e4374e8 SHA512 b415fd35ad72b70c7985a798bc868291a78ac7d22769c8b1ff9b244473d8439a15cc624e06025854abe6c41b5dffda13290ed3aee7d60475b9829147ce4cdb7e
+DIST ImageMagick-6.9.10-73.tar.xz 9065360 BLAKE2B 7d29c08d9bb0b93b5ea214307203530cb8822cc7f8bc7fb39016b6eac2fc2ad6be40e3a71af7fe09d6bb0b05d669701b05949a7f20df2dcc014fbf8983c8dc36 SHA512 b05d8b4334f054c1b0ee9ef106d70c7bcbe3671ccd097320f648084d9b5ef9c4fc0b9d68267a62e69b64313e64a97343630feadf20e672e64ab2deac518b84b7
+DIST ImageMagick-7.0.9-4.tar.xz 9479288 BLAKE2B 2638f193fb14f3f10f2b3927275777916f5234cd6aa515cae778471169ad74fab447b5dc620b5b630282cd00e4218922baf5fca066778d517c92de41216bcf9f SHA512 75c34a9aad62f7a102873e2b3fcda7c032bc40bfa0c0d5b524001f4c45a93943072009b717e2a90ca1637bc7df3806408a3a3c2c1356de835e3a8bbce20cddb0
+EBUILD imagemagick-6.9.10.73.ebuild 6884 BLAKE2B 24b1413689469e54ed6c4bbd3bac31ae6df01aeb325880fe9a6345d8055bad2432a33bc447f113b9abccc9fff107f93fde9e1bc7401d29d6ea54eafe49de1536 SHA512 9c446953e81687e0b14614ce615ef2292a5a16cfe662852f8cb708899f9e85d9532d66b9fa57d83770f38b6d723ca20a8dbd31ce7830b75942a23c10927db080
+EBUILD imagemagick-7.0.9.4.ebuild 7197 BLAKE2B 64c354e2595638045ee19576ae55065283a7ccb1a19268ecddeeeb04e4c777403d815f53a4cc0dee849ad9262a2861e697fbb1eea8aa86af33fd926a945e1924 SHA512 61305f69a4841e10fd4f715ce51611604beb926f765480839a391bbfabe79cb0824428165c519ee938bce306414970bbd621665015c72c4d0c50ac8d79b37e8e
+EBUILD imagemagick-9999.ebuild 7207 BLAKE2B 4fc6e4d61f5e851d55546614830dbc3d9a23003033f55ac521bbe990d845aa2b7b7623c66da431f896df16ee71d6539bac7fdf0204c61f00d010c9013b92fef5 SHA512 97ebbef19227007aa32140de833e25d49c9a8f648fda30a9a0abe8073329b0df5a79a74968d5056b3d342e87d435072d64d360ec4270aca53491938c4cfb7f42
MISC metadata.xml 1111 BLAKE2B 3592f2d81f67d91239152d723c736437a5e8056f8dba1fc5c97e2ead08efd4e913400b441eb6d6b90f26cccf3b89f115c18a5551bc070d1fd81e68dd218493c9 SHA512 33bd68bc4f88cd6029528b0feab9cc9fde0d60475ba5fad8c4f92ff6d373666628e6525d54268735e99182abd2658aa32c7c72ff22106c65f81ed8af5e4f7ea2
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.67.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.73.ebuild
index 319fce98db62..104ec59adc77 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.67.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.73.ebuild
@@ -17,7 +17,11 @@ SLOT="0/${PV}"
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="perl? ( userpriv )"
+REQUIRED_USE="corefonts? ( truetype )
+ test? ( corefonts )"
+
+RESTRICT="perl? ( userpriv )
+ !test? ( test )"
RDEPEND="
dev-libs/libltdl:0
@@ -63,9 +67,6 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
X? ( x11-base/xorg-proto )"
-REQUIRED_USE="corefonts? ( truetype )
- test? ( corefonts )"
-
S="${WORKDIR}/${MY_P}"
src_prepare() {
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.67.ebuild b/media-gfx/imagemagick/imagemagick-7.0.9.4.ebuild
index 1fa89f6961ba..8287ed2ffd50 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.8.67.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.9.4.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
-inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
+inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
@@ -20,8 +20,16 @@ DESCRIPTION="A collection of tools and libraries for many image formats"
HOMEPAGE="https://www.imagemagick.org/"
LICENSE="imagemagick"
-SLOT="0/${PV}"
+SLOT="0/7.0.9"
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"
RDEPEND="
dev-libs/libltdl:0
@@ -62,14 +70,11 @@ 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 )"
-REQUIRED_USE="corefonts? ( truetype )
- test? ( corefonts )"
-
S="${WORKDIR}/${MY_P}"
src_prepare() {
@@ -150,6 +155,7 @@ src_configure() {
$(use_with jbig)
$(use_with jpeg)
$(use_with jpeg2k openjp2)
+ --without-jxl
$(use_with lcms)
$(use_with lqr)
$(use_with lzma)
@@ -200,7 +206,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
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild
index 1d5c3d2d7d7c..8d8ee8a769b2 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
-inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
+inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
@@ -20,8 +20,16 @@ DESCRIPTION="A collection of tools and libraries for many image formats"
HOMEPAGE="https://www.imagemagick.org/"
LICENSE="imagemagick"
-SLOT="0/${PV}"
+SLOT="0/7.0.9"
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"
RDEPEND="
dev-libs/libltdl:0
@@ -62,14 +70,11 @@ 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 )"
-REQUIRED_USE="corefonts? ( truetype )
- test? ( corefonts )"
-
S="${WORKDIR}/${MY_P}"
src_prepare() {
@@ -150,6 +155,7 @@ src_configure() {
$(use_with jbig)
$(use_with jpeg)
$(use_with jpeg2k openjp2)
+ --without-jxl
$(use_with lcms)
$(use_with lqr)
$(use_with lzma)
@@ -200,7 +206,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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 11:59:59 +0000