summaryrefslogtreecommitdiff
path: root/media-gfx
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/Manifest.gzbin38649 -> 38635 bytes
-rw-r--r--media-gfx/alembic/Manifest2
-rw-r--r--media-gfx/alembic/alembic-1.7.16.ebuild2
-rw-r--r--media-gfx/asymptote/Manifest4
-rw-r--r--media-gfx/asymptote/asymptote-2.69-r1.ebuild (renamed from media-gfx/asymptote/asymptote-2.69.ebuild)105
-rw-r--r--media-gfx/asymptote/metadata.xml1
-rw-r--r--media-gfx/blender/Manifest2
-rw-r--r--media-gfx/blender/blender-2.91.2.ebuild2
-rw-r--r--media-gfx/cairosvg/Manifest2
-rw-r--r--media-gfx/cairosvg/cairosvg-2.5.2.ebuild46
-rw-r--r--media-gfx/eog-plugins/Manifest2
-rw-r--r--media-gfx/eog-plugins/eog-plugins-3.26.6.ebuild2
-rw-r--r--media-gfx/eog/Manifest2
-rw-r--r--media-gfx/eog/eog-3.38.1.ebuild2
-rw-r--r--media-gfx/feh/Manifest2
-rw-r--r--media-gfx/feh/feh-3.6.2.ebuild71
-rw-r--r--media-gfx/gif2png/Manifest2
-rw-r--r--media-gfx/gif2png/gif2png-2.5.14.ebuild2
-rw-r--r--media-gfx/gmic/Manifest2
-rw-r--r--media-gfx/gmic/gmic-2.9.5.ebuild2
-rw-r--r--media-gfx/gnome-screenshot/Manifest2
-rw-r--r--media-gfx/gnome-screenshot/gnome-screenshot-3.38.0.ebuild2
-rw-r--r--media-gfx/gphoto2/Manifest2
-rw-r--r--media-gfx/gphoto2/gphoto2-2.5.26.ebuild4
-rw-r--r--media-gfx/gpicview/Manifest2
-rw-r--r--media-gfx/gpicview/gpicview-0.2.5-r1.ebuild4
-rw-r--r--media-gfx/gscan2pdf/Manifest2
-rw-r--r--media-gfx/gscan2pdf/gscan2pdf-2.9.1.ebuild4
-rw-r--r--media-gfx/imagemagick/Manifest18
-rw-r--r--media-gfx/imagemagick/imagemagick-6.9.11.61-r1.ebuild254
-rw-r--r--media-gfx/imagemagick/imagemagick-6.9.12.2.ebuild2
-rw-r--r--media-gfx/imagemagick/imagemagick-6.9.12.3.ebuild (renamed from media-gfx/imagemagick/imagemagick-6.9.11.62.ebuild)0
-rw-r--r--media-gfx/imagemagick/imagemagick-7.0.10.61-r1.ebuild268
-rw-r--r--media-gfx/imagemagick/imagemagick-7.0.11.1.ebuild268
-rw-r--r--media-gfx/imagemagick/imagemagick-7.0.11.2.ebuild2
-rw-r--r--media-gfx/imagemagick/imagemagick-7.0.11.3.ebuild (renamed from media-gfx/imagemagick/imagemagick-7.0.11.0.ebuild)0
-rw-r--r--media-gfx/meshlab/Manifest2
-rw-r--r--media-gfx/meshlab/meshlab-2020.12-r1.ebuild (renamed from media-gfx/meshlab/meshlab-2020.12.ebuild)1
-rw-r--r--media-gfx/openscad/Manifest12
-rw-r--r--media-gfx/openscad/files/openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch32
-rw-r--r--media-gfx/openscad/files/openscad-2021.01-0002-fix-to-find-lib3mf-2.patch43
-rw-r--r--media-gfx/openscad/files/openscad-9999-0001-fix-to-find-lib3mf-2.patch36
-rw-r--r--media-gfx/openscad/files/openscad-9999-0002-Gentoo-specific-Disable-ccache-building.patch35
-rw-r--r--media-gfx/openscad/metadata.xml10
-rw-r--r--media-gfx/openscad/openscad-2019.05-r5.ebuild (renamed from media-gfx/openscad/openscad-2019.05-r4.ebuild)2
-rw-r--r--media-gfx/openscad/openscad-2021.01.ebuild110
-rw-r--r--media-gfx/openscad/openscad-9999.ebuild101
-rw-r--r--media-gfx/openvdb/Manifest2
-rw-r--r--media-gfx/openvdb/openvdb-7.0.0-r1.ebuild2
-rw-r--r--media-gfx/pngcrush/Manifest5
-rw-r--r--media-gfx/pngcrush/metadata.xml3
-rw-r--r--media-gfx/pngcrush/pngcrush-1.8.13.ebuild20
-rw-r--r--media-gfx/shotwell/Manifest2
-rw-r--r--media-gfx/shotwell/shotwell-0.30.11.ebuild4
-rw-r--r--media-gfx/simple-scan/Manifest2
-rw-r--r--media-gfx/simple-scan/simple-scan-3.36.7.ebuild4
-rw-r--r--media-gfx/svg2rlg/Manifest4
-rw-r--r--media-gfx/svg2rlg/metadata.xml3
-rw-r--r--media-gfx/svg2rlg/svg2rlg-0.4.0.ebuild1
-rw-r--r--media-gfx/viewnior/Manifest2
-rw-r--r--media-gfx/viewnior/viewnior-1.7-r2.ebuild4
-rw-r--r--media-gfx/yafaray/Manifest4
-rw-r--r--media-gfx/yafaray/metadata.xml20
-rw-r--r--media-gfx/yafaray/yafaray-3.5.1.ebuild112
64 files changed, 685 insertions, 982 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index df476ecd77c2..182669cae4c8 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
Binary files differ
diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index 962a61746d12..6c2acdb8b370 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -1,4 +1,4 @@
AUX alembic-1.7.11-0005-Fix-install-locations.patch 8305 BLAKE2B 25688ca368f4d58a32d5c7afbbd4b1a738d3a69644034d18d487f2d48348ca4de32e3e691a8c5ec137c4829079cb0fedbdd9c5cfc98ff38144097845f07e0065 SHA512 b025cc77c21c57b43d9536e488ac5d68037cfa186c561399409ba863c722fca20f75b939aa7d5166d302b92e636deba05e0db4747d614f3420b4e76d30a8cbb2
DIST alembic-1.7.16.tar.gz 855709 BLAKE2B 8009ed199b7dca190e40f56969d7c446e65bd78f58cee75dda4883ecf02b6c7ee422db76c4f523a76a4b2d42ef1547ededf5de0055cdb5d801c5cd4918a0b5f4 SHA512 bd4777dc4abf15bfb8307b00fd2d67671e89944d0dd8a74a657f4aee49e6a1cd0ab1fe5bb7f9afc63abcce2123466bb8a9a3886d41724ed2c242bc61d7d5b3a1
-EBUILD alembic-1.7.16.ebuild 1245 BLAKE2B dec813d4d26e5081808847f46ddbe4a3d3081b61022132830cf58e9571e50df2390ac39b252da76cda9c55d8040e5a006d012c643d3b5cc1d3728fc06ea3400a SHA512 b41804f85516492347321bc4cb5ac1b885cb9c2acda074bafb43e3b5a24b42414e3cdf3850cf3e3723ddbdbe0e228ea5f4ae03ced0a31cbe37af14ee0137a760
+EBUILD alembic-1.7.16.ebuild 1252 BLAKE2B e05bd0776543434d0375db0574660f939b9e8a30da1066b4399775554dadce0e9cfe06abc571357c373bb3176b6d07dd8d0566ab2558fc9456686e7e678fbf58 SHA512 4c24d13e574f8ff4572e61bf6de62eccdf07a3cfa7f5887b18a170c55fde542a9dac3dea9bdab733ca0ddd1f53961e971c18a2d4e52e5ed30c7f5472b6597c0a
MISC metadata.xml 865 BLAKE2B a70a3ad887cc4a8247ac1c275c6a3dfd8db13371473c7f5548d629983ac521b53df0fb0fccebeb6505ef424f5c6080682552bbf825b8b2457731e91ad223b5ed SHA512 be0126102a7a6321349b5a680ba600dbef3f8bd757fcf35518672c39525633c3862bf4d795dddbf5d2ffbbc4ae639e20162656a482e916a808ff5af970e7aaaa
diff --git a/media-gfx/alembic/alembic-1.7.16.ebuild b/media-gfx/alembic/alembic-1.7.16.ebuild
index ed542a1b220c..674a8240cfd0 100644
--- a/media-gfx/alembic/alembic-1.7.16.ebuild
+++ b/media-gfx/alembic/alembic-1.7.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
IUSE="hdf5 test zlib"
RESTRICT="!test? ( test )"
diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index 444ebb8a561b..538aa384b011 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -6,5 +6,5 @@ AUX asymptote-2.69-xdg-utils.patch 791 BLAKE2B 126fbc6a5b253e536c6daf479d5b422b5
DIST asymptote-2.68.src.tgz 4672007 BLAKE2B 96c1a99815cf04180ea2fe01528615390faf8d1e5853d4e2e5f4fcdf48f0ec7e774ab0facdb86ad427e6ac11f5ce684902997f7d1e4855460ad450f6d6c64cfd SHA512 20aa3ae5116b93f266020a1d45178d7120cf39980634108b86a0bc8a4202e28b2cf0a1ac6fa5e921506db150e9077a1e3d7b8ad04869bc9bd22bae447f45fd46
DIST asymptote-2.69.src.tgz 4673601 BLAKE2B 9734ffec10c9c0b8053598402a4eb81a3ed8a48f8ce8e58d1720442be26e25fe7778d6d47cd2d29dae61183d15aaa456bca430ab98e951844c8210484226e67f SHA512 a1b746600b4e6880350e57adeb3a3228d10b1b0c1db11ee0e750545cf8023716eec92253c0cd0980747f72c16fd0097f25ee688657168f24a0def106260e0791
EBUILD asymptote-2.68.ebuild 4806 BLAKE2B d024e46c7c697e624c27f938f96afc1f65403d36995d62050bc3ec8313d2b81aeb2516ae1c5c7442db4345863fca106e7182da4f22d7d601f766366d816f4e2d SHA512 3bb36ddf4578fafba5644e29b98e743ae71c1484e2d7dc7845d8f96fc8315fd9f8e28b7368f5893de217e87cad60960a99cde5e33a39265cc5b17281b6873c5d
-EBUILD asymptote-2.69.ebuild 4573 BLAKE2B b47fb58c4182a71e30b40761284fb9c1c5b0dc42ab68c4be13e1dccdf96627b92fe094ae678eee077f8cd856abd4ffeb5fe56aa62d770ce6014517d56b5d2ee3 SHA512 c800a7fc586711e62b6f5b187078086a877df89215d1a39124a4d1a698e65958cb370a9fe4840bca003dcd80ba2cfd3923b96517649bb9dfa8277cd1f7d9fd6f
-MISC metadata.xml 1257 BLAKE2B 93f3f42b625d44d9340a224ad8bb4c605044b008b56bca48e3b6e0ed7e8be58b2b50fc8a0899731373251490d62c0e6b3d56129786a27a57d8fe9b5d903b60fd SHA512 b74ba76e922f253bf9a2e44d50152a700e9725a4a899392c7ab0074a3716ab4bd6330d3acb87b09eb59fd48f904684a2339a87d4db965c74bc833487011dbb56
+EBUILD asymptote-2.69-r1.ebuild 5394 BLAKE2B a27ece88ae76bfd52f81536a569040f377617419bcc28771121908e1658c0ad1547eefb4370a0846b9b52b0be1e38d4245345a34f6b148d8869732504d4776f7 SHA512 a6d9ac4a6a69aca723938c2fdd6128b3312bc3c612573864ea479bf5f8c38bda65440e9c14c99d7f17bb531f769c8dc9010fc756c11439ba1e4df6ed4fef450d
+MISC metadata.xml 1363 BLAKE2B d1ff4a713593a568879201c3d7165a633af6446844bc2128396a8f2cfc4ebc0764aef67b61bd0b0c2bcc9cad5ae442dd35b4c1610239f047f4baf3de225cda3f SHA512 e3c7c10ca9c129e0f988235a2f4ad7c8d306517e7a1966e1f4cb734d1c4d30bb143f9178bc744a85012ccc031fa453177d18452ed7991c8ae18a86bbb88283fc
diff --git a/media-gfx/asymptote/asymptote-2.69.ebuild b/media-gfx/asymptote/asymptote-2.69-r1.ebuild
index b7b0b25d2885..11723a29a480 100644
--- a/media-gfx/asymptote/asymptote-2.69.ebuild
+++ b/media-gfx/asymptote/asymptote-2.69-r1.ebuild
@@ -14,8 +14,7 @@ SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="+boehm-gc curl doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax"
-# FIXME: xasy is currently broken
+IUSE="+boehm-gc context curl doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X"
RESTRICT="!test? ( test )"
REQUIRED_USE="
@@ -28,7 +27,7 @@ RDEPEND="
>=sys-libs/readline-4.3-r5:0=
net-libs/libtirpc
imagemagick? ( media-gfx/imagemagick[png] )
- opengl? ( media-libs/mesa media-libs/freeglut media-libs/glew:0 media-libs/glm )
+ opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm )
offscreen? ( media-libs/mesa[osmesa] )
svg? ( app-text/dvisvgm )
sigsegv? ( dev-libs/libsigsegv )
@@ -37,15 +36,23 @@ RDEPEND="
gsl? ( sci-libs/gsl )
python? ( ${PYTHON_DEPS} )
curl? ( net-misc/curl )
+ X? (
+ ${PYTHON_DEPS}
+ dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,svg]
+ dev-python/numpy
+ dev-python/pycson
+ >=gnome-base/librsvg-2.40
+ )
latex? (
virtual/latex-base
>=dev-texlive/texlive-latexextra-2013
)
+ context? ( dev-texlive/texlive-context )
emacs? ( >=app-editors/emacs-23.1:* )
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
DEPEND="${RDEPEND}
+ dev-lang/perl
doc? (
- dev-lang/perl
media-gfx/imagemagick[png]
virtual/texi2dvi
virtual/latex-base
@@ -78,6 +85,9 @@ src_configure() {
CPPFLAGS=-DHAVE_SYS_TYPES_H \
CFLAGS="${CXXFLAGS}" \
--disable-gc-debug \
+ --disable-gc-full-debug \
+ --with-latex=/usr/share/texmf-site/tex/latex \
+ --with-context=/usr/share/texmf-site/tex/context \
$(use_enable boehm-gc gc system) \
$(use_enable curl) \
$(use_enable fftw) \
@@ -92,10 +102,11 @@ src_compile() {
cd doc || die
emake asy.1
+ einfo "Making info"
+ cd png || die
+ emake ${PN}.info
+ cd .. || die
if use doc; then
- # info
- einfo "Making info"
- emake ${PN}.info
cd FAQ || die
emake
cd .. || die
@@ -104,7 +115,7 @@ src_compile() {
export VARTEXFONTS="${T}"/fonts
# see bug #260606
emake -j1 asymptote.pdf
- emake CAD.pdf
+ emake CAD.pdf asy-latex.pdf asyRefCard.pdf
fi
cd .. || die
@@ -120,48 +131,80 @@ src_install() {
# .asy files
insinto /usr/share/${PN}
- doins -r base/*.asy base/shaders base/webgl
+ doins -r base/*.asy base/*.js base/*.sh base/*.ps base/shaders base/webgl
+ chmod 755 "${D}"/usr/share/${PN}/shaders/*
# documentation
- dodoc BUGS ChangeLog README ReleaseNotes TODO
- doman doc/asy.1
+ dodoc README ReleaseNotes ChangeLog
+ cd doc || die
+ doman asy.1
+ doinfo png/${PN}.info
+ if use doc; then
+ dodoc FAQ/asy-faq.ascii
+ dodoc CAD.pdf asy-latex.pdf asyRefCard.pdf asymptote.pdf
+ fi
+ cd .. || die
+
+ # asymptote.py
+ if use python; then
+ python_moduleinto ${PN}
+ python_foreach_impl python_domodule aspy.py
+ python_foreach_impl python_domodule base/${PN}.py
+ fi
+
+ # X GUI
+ if use X; then
+ cd GUI || die
+ python_setup
+ sed -e 1d -i xasy.py
+ echo "#!/usr/bin/env ${EPYTHON}" > xasy1
+ cat xasy1 xasy.py > xasy
+ rm xasy1 xasy.py
+ mv xasy xasy.py
+ cd .. || die
+ python_domodule GUI
+ chmod 755 "${D}/$(python_get_sitedir)/${PN}/GUI/xasy.py"
+ dosym "$(python_get_sitedir)/${PN}/GUI/xasy.py" /usr/bin/xasy
+ doman doc/xasy.1x
+ fi
# examples
if use examples; then
- insinto /usr/share/${PN}/examples
- doins \
+ docinto examples
+ dodoc \
examples/*.asy \
examples/*.views \
examples/*.dat \
examples/*.bib \
- examples/piicon.png \
- examples/100d.pdb1 \
+ examples/*.png \
+ examples/*.pdb1 \
doc/*.asy \
doc/*.csv \
doc/*.dat \
doc/pixel.pdf \
doc/extra/*.asy
- insinto /usr/share/${PN}/examples/animations
- doins examples/animations/*.asy
+ docinto examples/animations
+ dodoc examples/animations/*.asy
fi
# LaTeX style
if use latex; then
cd doc || die
insinto "${TEXMF}"/tex/latex/${PN}
- doins ${PN}.sty asycolors.sty
+ doins *.sty latexmkrc
if use examples; then
- insinto /usr/share/${PN}/examples
- doins latexusage.tex externalprc.tex
- insinto /usr/share/${PN}/examples/animations
- doins ../examples/animations/*.tex
+ docinto examples
+ dodoc latexusage.tex externalprc.tex
+ docinto examples/animations
+ dodoc ../examples/animations/*.tex
fi
cd .. || die
fi
- # asymptote.py
- if use python; then
- python_foreach_impl python_domodule base/${PN}.py
+ # ConTeXt
+ if use context; then
+ insinto /usr/share/texmf-site/tex/context
+ doins doc/colo-asy.tex
fi
# emacs mode
@@ -177,18 +220,6 @@ src_install() {
insinto /usr/share/vim/vimfiles/ftdetect
doins base/asy_filetype.vim
fi
-
- # extra documentation
- if use doc; then
- cd doc || die
- doinfo ${PN}.info*
- dodoc ${PN}.pdf CAD.pdf
- cd FAQ || die
- dodoc asy-faq.ascii
- doinfo asy-faq.info
- docinto html/FAQ
- dodoc asy-faq.html/*
- fi
}
pkg_postinst() {
diff --git a/media-gfx/asymptote/metadata.xml b/media-gfx/asymptote/metadata.xml
index 0f12983bc2ff..9a6acb07f784 100644
--- a/media-gfx/asymptote/metadata.xml
+++ b/media-gfx/asymptote/metadata.xml
@@ -20,6 +20,7 @@
</longdescription>
<use>
<flag name="boehm-gc">Enables using the Boehm-Demers-Weiser conservative garbage collector</flag>
+ <flag name="context">Enables support for ConTeXt format (<pkg>dev-texlive/texlive-context</pkg>)</flag>
<flag name="curl">Enables running remote programs via <pkg>net-misc/curl</pkg></flag>
<flag name="sigsegv">Enables using <pkg>dev-libs/libsigsegv</pkg></flag>
<flag name="offscreen">Enables off-screen rendering</flag>
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 4ea5e554fa69..fe3caa775187 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -9,5 +9,5 @@ EBUILD blender-2.83.12.ebuild 8904 BLAKE2B 0522ea1f695ce84a6f9c56f47d4e4df524a2f
EBUILD blender-2.83.4-r1.ebuild 8590 BLAKE2B d1f5765922114878d629e653248491878f1ae7003f0ad8dad49713e083d28b5133b2e1a0b1ba6b9a2600a7f9512c9a98aa0a551e9e368aa2cfe46346ed5c7914 SHA512 36f33f65151a8c98a42a2f014209d2bf0552779c8b5e52513fc8063c5202ba77c1cf3c744e3e818387ada59a3ec88805f35f96bcefcc3c000da331b73a756780
EBUILD blender-2.90.1-r1.ebuild 8628 BLAKE2B 6f432315a7bf13dc3635ab915e9c72668aef526358f74b324067ebe4d5a34c5fa6daa207fdb753adaa756be9d53617896ec5545071755459ed0799a56618d18b SHA512 1b4bc3de4447577cd062283fde8ef091c0800968a0129a833b4d3c9acf8992e143a204bbc32b887254cdf4977ea083cb262e47242b5b2f1d581cf183339374a7
EBUILD blender-2.91.0.ebuild 9056 BLAKE2B 8d797eebeba043fe2b1d8d74b6d5aa7ef8483efc9b9ea748766d95ddb89e805daa129b2c0515945b4ee89648119812bd2b7dec4a86398c905d2f085ddcbed8f8 SHA512 84ff05f097fdeaa37c795ac11aaf01ecca1063f126b08ada97063a15f5de1f14e9823dc6431c94a4497e09eab7b2932fcdbf661f0a1866fac2fafd24a8a0bd83
-EBUILD blender-2.91.2.ebuild 9055 BLAKE2B fe430c906eed6ef6863b53c81f604738ae1090711da802246c453fa5d4c31cc2918e50b821062ca6db4d61ef5e5ae878e3eac186de061f368b71a45250c3e4e5 SHA512 ca61dfb6e868aa259ae039008357cd4ff43c2a3010b74891a2f21d626e9f5ace0607c75adea0d7cc8cfb0a997658254f0edd36746c0c9795eeae9f98bf83a5d5
+EBUILD blender-2.91.2.ebuild 9062 BLAKE2B bd6a1673c0530c363808b102b53cc66266cdfba9d35897ecf1e2a43368f3428d3244cfa12c6f8006d8a59c1b7bed03b138fee29f2c7ca8da8278ff3651a18b5f SHA512 53e707329532bb29acd6436a1096f7dc65d9315cdd562c78fb05da171eedb087e09a8cc4c92849de30a9b834cd4b2393f1271789dc6bae2c8bc49e851268fca7
MISC metadata.xml 2733 BLAKE2B bd7234217670288e926c4c71dac113fe478dbaf3f13a5e75ba1147a72b636baa8a7f6ccaaac6cc40e5710342dba4d49e35af8e0ebc439528cf3335cbf7f2560a SHA512 c955e7ffacb639e9bc5d5582bce129bc282f3838a113a5ead9ee2db13448b608b38e77c112036bcb57932302da15a537e2d1f9f82a8393444113340fdb7c8e51
diff --git a/media-gfx/blender/blender-2.91.2.ebuild b/media-gfx/blender/blender-2.91.2.ebuild
index 652671fd7a04..069fa30267f2 100644
--- a/media-gfx/blender/blender-2.91.2.ebuild
+++ b/media-gfx/blender/blender-2.91.2.ebuild
@@ -18,7 +18,7 @@ MY_PV="$(ver_cut 1-2)"
SLOT="0"
LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb \
abi6-compat abi7-compat alembic collada color-management cuda cycles \
debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm \
diff --git a/media-gfx/cairosvg/Manifest b/media-gfx/cairosvg/Manifest
index 17208db80125..5fad24d3f6fa 100644
--- a/media-gfx/cairosvg/Manifest
+++ b/media-gfx/cairosvg/Manifest
@@ -1,4 +1,6 @@
AUX cairosvg-2.5.1-no-ref.patch 923 BLAKE2B 4a14bdd5f19f9abbb9415c19cb15aecc6dee8bf34feef0cb551f4185c16e4a93ac29d6e46f81dab03f479b2e982c9d0a85a622c1292cfe6d52c6acc1c896aa7f SHA512 f1a45ba47fc3f1f4b91799d6d45b2388a2ac6b0be08695f2507b4bf34818b6a7e8c23cbfbb270c3d603d81acbe3c9bc0a867e5864b684f67540b449d684e6f0e
DIST CairoSVG-2.5.1.tar.gz 8397716 BLAKE2B f5d307f3019df3b8e19a86c4f185bb6c95ff5f450705a06506f03447f7a4e97091fed4dbbdad7220da0b04c6bed3eb252f3f3e8d91bff55ab6432d0df7f62d70 SHA512 5f6732758ed8024b58173bc920a44fcafa65a2daf301ee07e088d542f1e82d0093bd853e58da2484c392d1b625fd27c0634d07ad58cf00e674741aa413013605
+DIST CairoSVG-2.5.2.tar.gz 8397659 BLAKE2B f2f45aa01015f5ccebe3dede303b6a701c0183b7b53f0d69c8756d5f0e6c0898826939f0b5bcc9e00e4185c83ff507d6fa886a020ad0b63c80a565a181807f58 SHA512 070fbb549614401a7d8290497b0eb7702330ee264c5f625cd1e7aac4aea7d71ee7d2d8899297212e1a3c11c93903b191c0c699336d9000796318b11f4e075576
EBUILD cairosvg-2.5.1.ebuild 1086 BLAKE2B 343f56a5999d6567deecc1a462aa13330ed2d7d9aa089cfc29e825eb5ec806a27b4b681d0fafed62c3b7dd86374fd95fa47aa49c32ff4d656cee0d2660c3e783 SHA512 25df198004cc80c2ecd41fc2a904b8b9c492308833832a97bb345483381aca6e3ebfff4e0bcae78a5a3667d791abac4db640d81951e08a9c9f750e0665342d27
+EBUILD cairosvg-2.5.2.ebuild 1098 BLAKE2B cc0b4fea4184021846498ecb52545ffe675a605440b3d977cb6afd379d576c899c5a058a9da04424cab7760e7f0872d7e667b90388a657c824d784180ac9f913 SHA512 2602ae41f31468840005417188cf5d3a50beb12309ca94230f00ed27646db53e3f5fe078b2ce0796c02123665feb3c7beb9d6f14923536007c057f80e927eb1d
MISC metadata.xml 328 BLAKE2B 168e60e4dbd12e2b99ba4ad8a6f8f42ef5a4de12f8f1edc68ba4d1d4252b24995da5d0e4ef9e1db09b3934ba42b042685db625439425a6e98cde2f52050c4af1 SHA512 ebb7d9d27e014fd083d0abe9508040730f980ba8a0bc89670ee5418af2c3af036d0ec16b5607a8805944d3b7eeb835e8806ab059fed68c52268df1cd10d7bbb0
diff --git a/media-gfx/cairosvg/cairosvg-2.5.2.ebuild b/media-gfx/cairosvg/cairosvg-2.5.2.ebuild
new file mode 100644
index 000000000000..0ca94523db8b
--- /dev/null
+++ b/media-gfx/cairosvg/cairosvg-2.5.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+MY_PN="CairoSVG"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="CLI and library to export SVG to PDF, PostScript, and PNG"
+HOMEPAGE="https://cairosvg.org/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-python/cairocffi[${PYTHON_USEDEP}]
+ dev-python/cssselect2[${PYTHON_USEDEP}]
+ dev-python/defusedxml[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/tinycss2[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ # junk deps
+ sed -e '/pytest-runner/d' \
+ -e '/--flake8/d' \
+ -e '/--isort/d' \
+ -i setup.cfg || die
+
+ # this test compares output against old version; this makes little
+ # sense for us and requires both distfiles around
+ rm test_non_regression/test_non_regression.py || die
+ eapply "${FILESDIR}"/cairosvg-2.5.1-no-ref.patch
+
+ distutils-r1_src_prepare
+}
diff --git a/media-gfx/eog-plugins/Manifest b/media-gfx/eog-plugins/Manifest
index 33a01708595b..360123d9442d 100644
--- a/media-gfx/eog-plugins/Manifest
+++ b/media-gfx/eog-plugins/Manifest
@@ -1,5 +1,5 @@
DIST eog-plugins-3.26.5.tar.xz 478188 BLAKE2B 655eb9860435775862ba44bd26530edff778a3c8c574e9bf592800b4d57b4e5b0e52d36b7d71d6a6d615d47c320542105dcee9de89250901fcbfa6c255dcfddc SHA512 3b7979d241c2c0b522ffb6c30a6b8c90fed9e899cda8a73fb9d9a9392f474516f8c24fc75f3f35f920c8a6cf04b8bda611a8669839588936c48467813a6227a7
DIST eog-plugins-3.26.6.tar.xz 482004 BLAKE2B a70a7d1b69b7d5e6e4d44e79a4305c08ab95c06596512bf458628a65b1a8b5f7fc6c3caf39385ce722de7fdabcf0cc5e620f9dfbc53dfc377fe29252fb21a23c SHA512 67b3cfcc071ef5a196f87041039f65c9ef8e7ba2ef1cdc8dd9ea4d67f64c8b1ee0990446c5cec4fe229aabb35d106a4c0804ba6e8cbd2edfe5a91ddc3765527a
EBUILD eog-plugins-3.26.5.ebuild 1686 BLAKE2B a9fa071d24c2cf70ca1f1ab1ea6a375aa3579fa600443484c557b58a1d7a29ad81d4867833e479af6a8a5893690db04780329993ceaa35db4444918e7f937cf2 SHA512 a519eda4f08e1ec4e3d11bd051edfff427225f8e33805106d4387612c5a94a8f884be6a7f6087dd7f676c9eb25c2457a4320c7156295b37e630222c54d4f060b
-EBUILD eog-plugins-3.26.6.ebuild 1613 BLAKE2B a6bf74161310df5bc1fe524cd1f167b9a54db896dcc5860be543c0576acc45d0c6d2a88545e2968ececcceedadb4939b11963ee13641444ec3334000f5eb6f3c SHA512 472590fbf3938e3c989603328eceb37df62ca7ff1e76e0659e48b76638e9c744f0b3183597e1954ef970c2a88622706ddcc203846fb16e79d1dc44f252f72962
+EBUILD eog-plugins-3.26.6.ebuild 1612 BLAKE2B a8bab614f4923e33eae731575cdce3040a5e90b78f1ac7483a89ad735c7b73a74e5a7bbe25888eb2455d04abcec22ec2d83bff902ddfdb538977aea9c3f4443b SHA512 8d4ae707feafdc35ddaf122ab88a12ab5a5165c28167ed063482f4b31dd9e1c6babd694a42fe70dd1511d4281ae98d90789ee7c2271c044cb7eda6d70d56a0ed
MISC metadata.xml 428 BLAKE2B b10706bb7638538d5ce63c9787e7a1730e01c8383f2d2a093e38184b031933d2b3749241aa2f3254be4c84fac104bb8ec72940cdf8cd5a9f7bc0944541b015c6 SHA512 9684f07846ce7e49ad82843c2b8b7ac5c9d7124bddb07778292d6810162e89a3d41e7ca426f331e4bae6ecfbe53f71409b35418affba6382e874c78b64ed102f
diff --git a/media-gfx/eog-plugins/eog-plugins-3.26.6.ebuild b/media-gfx/eog-plugins/eog-plugins-3.26.6.ebuild
index cbe89d34fbb8..53de08824e3a 100644
--- a/media-gfx/eog-plugins/eog-plugins-3.26.6.ebuild
+++ b/media-gfx/eog-plugins/eog-plugins-3.26.6.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="+exif map picasa +python"
REQUIRED_USE="
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 3e92db686a3f..e0843179de12 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -3,5 +3,5 @@ DIST eog-3.36.4.tar.xz 3651632 BLAKE2B f971ab236422a875ea8d91a661c6c653ba2ef4834
DIST eog-3.38.1.tar.xz 3655616 BLAKE2B 1e0265dc798413e9b2588c36879a526069bc3d8788339e97470d8d0b738e01cd2fc00bc3db118721fd45a40e5829e225d9451d4cf868e0c9a7bfd74cdc90c06d SHA512 26317413271001b4edcd30438e81a2bb1d2e10edd639c054ffdc08743a5274b27afb51186a660e29022be5e9ecf10043b94e7d409194589d2bba6906ede2cff9
EBUILD eog-3.36.3.ebuild 1556 BLAKE2B 6ba5e5184a6916dcc56b4879ca3abf4e5eff4711fcdc97c3a56a415f3564d1b02ec74dbf270b0586e9496ba421b9bae052591a40aeebb789e22867b1d6443dba SHA512 c59d6e36cec5e04be93567fe493f62885effd1a828240aed0e4d5afe04d31a1615d237294814eef7c774ac009cccf0cadea8c86881908df08a1a312a774f9e06
EBUILD eog-3.36.4.ebuild 1558 BLAKE2B fc7954cbc8763a3d4037bfc445576b8a1e0b7f5db72e59e5d5f35879a59c12a0ce96d1ae68fd2af8eeb4218082c0af2bd9f9d47f8ea68a8080ee1b317de636f9 SHA512 f2527c036b67ff6cd1d9047014117f65b6497ecf4fe09398301d32ae97b9ff8ae21665138e4565cec2d747e83815f9312ca08a50546dcf7ca3144f9321c37dfd
-EBUILD eog-3.38.1.ebuild 1593 BLAKE2B e40e84edd2b76c87e8fa42b84fa255d470c13fed651263c0237a8c645df7affd497b72394f79c143ceb1067c7aa871855a3331e1a2f1800904e2092356938907 SHA512 ff4b3988b9d508c1df713d2f720b36084c23dc50f57f20ddba970f543ac3ae45831553e46a2586c073d6af1cd4fde0816c40efffd67904f6546a5bc75e2c1d64
+EBUILD eog-3.38.1.ebuild 1592 BLAKE2B 948a363a67e2e8996650fe2838cd5aa1d786159a9a7ab7cc6bcd087c98bec57926a99bd65b72fe52c88c1ad55a42e8e670ac823fc3f014aa17331dde8ab4f438 SHA512 e7e942076a528403b3b3419bd1f0855276cf5509bf30a5ad63d4f176a44bb58e15ab749f47ddbd865e9e80c4dd2b78c9e1e0f6e1e41316a3fb8cff7000081556
MISC metadata.xml 481 BLAKE2B 2c12b594b9a5b1e4ce3983131d1911f62026c5186d8f5c5af13842cfedfa4d20abdc5ee82e11db3a2e1b45e2b8d4d95fa1a62e668936956e8453b166daff00b4 SHA512 141ec1d6923697f744de806804279b602120ce3d5494257de36b8c8b71185d101692f2e438d7ba0e4a4c946d0aaba068117f16c8344abe891e0ddd4f768ded26
diff --git a/media-gfx/eog/eog-3.38.1.ebuild b/media-gfx/eog/eog-3.38.1.ebuild
index e0fd2241d634..ec0be1b69d8e 100644
--- a/media-gfx/eog/eog-3.38.1.ebuild
+++ b/media-gfx/eog/eog-3.38.1.ebuild
@@ -14,7 +14,7 @@ SLOT="1"
IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
REQUIRED_USE="exif? ( jpeg )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
RDEPEND="
>=dev-libs/glib-2.53.4:2
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index 53319c5cdc71..a6cacd031bf4 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -1,6 +1,8 @@
AUX feh-3.2-debug-cflags.patch 193 BLAKE2B 298f65a8f9142167d1cd2cfce0bc61ad9d7d4a5519ab8e78d1259ea60b5566376f8d9ddba660db65ef5e229bdc0ff254d9aab2284d8929ea0ac171da44f8c44d SHA512 336d23b767c5c3da9b94a1e6759129c242caf70a611b2410816a562d90720e3abab6a3444ce06975d62b4ebbe8e54c70942800516c7575cc6d5e13ce69679884
DIST feh-3.6.1.tar.bz2 2116064 BLAKE2B cae12f9475a2678c2f521baac9deb6668eae07811ae0904bbefef873fd54182b94532bf811394964e725f0e45890f65fcfc3dc988135d388ddcf625adbeca4e0 SHA512 b4350f1c5f66a450b2f088affea973abab9e184df110b693e46e1fc532d213d62a52bf08029f345daf92d45c828ff3bd380dcd7b167f319f1ff3b1d04150cd75
+DIST feh-3.6.2.tar.bz2 2116515 BLAKE2B c813f1bcee2170b509c4579472f2106ed01bcba49a91eaec2f48b2f41b10f43de59ab0d114ee9a04faa9b8d73c13636e49bac4730ff2275bec55cff56379e1fc SHA512 d3a14d7880387575a224bc5cdf1b63bfc5bd793c52fdc07620ddd80e1309a6b9a0c93f3f66ad08a0221f04eabb226372fcb14849a8682c4a2b4691981bb80c40
DIST feh-3.6.tar.bz2 2116101 BLAKE2B 8ad47c6b456746d951728fd8a0ba1a2fed4ceb4a7e15554f68b4de071da7b3f4e9e16a10b1a05e51291b8b4127bab98f2b96231298fd181d8dc544bc089a772f SHA512 1df017adcf0650ff2cdc26556cbea5a6b8c9dad1dd44128cccc79312334d0140ab9e5c9c8bac7249dcfbdd7985ae75d847752eadad14216102d8ab7bcb2c42c7
EBUILD feh-3.6.1.ebuild 1469 BLAKE2B a4e68a319f63055c4997c72abf39c49c0373b47465873539edf872ed282c5012ae40ddc7cac10968d757b6f9e775bd754a069aac2e42945650e50c6d7be968e1 SHA512 3bca9ab073f234d23d2609e755bc6741742150ac3d3df22e3c831b674d79f7d893ce2b3bcf3b86399b051fe754f8de9e349d5884564bed1cd6b7a1cf1c24c1a5
+EBUILD feh-3.6.2.ebuild 1510 BLAKE2B 4f025973871e4f60fd467603e58df078db0cd93ab240a8ce320b3c50034c907cf6729f5c36185c376581236d4bce6913224e842ba711e6c481409e7691a307c4 SHA512 54677a9d00d4135041ed124893bb9fe7e36af5f2afe8d9baca2e52deb8a5bf1a6347a1b597ce938873d2caa54f3ed9c5ef1428760e10fe566ebe65edacc5ccc2
EBUILD feh-3.6.ebuild 1469 BLAKE2B a4e68a319f63055c4997c72abf39c49c0373b47465873539edf872ed282c5012ae40ddc7cac10968d757b6f9e775bd754a069aac2e42945650e50c6d7be968e1 SHA512 3bca9ab073f234d23d2609e755bc6741742150ac3d3df22e3c831b674d79f7d893ce2b3bcf3b86399b051fe754f8de9e349d5884564bed1cd6b7a1cf1c24c1a5
MISC metadata.xml 252 BLAKE2B c64921f238c2751f1f0746df3d109951ebf79c5e1ed5a2fa6d9c33f5420a6ff87c52a5387048a35c148e8cdd29beb406001a9aca3f6cc0f396a78ccb37ae2e3e SHA512 39fbe572d744f1a6f2a23b85a7d62706c478d05f2c74c30e48ccfca5ffd8f26d968fe0869fb9eed4b6494c655f950ab6445346da6eacf85d10da0c1a627cf59b
diff --git a/media-gfx/feh/feh-3.6.2.ebuild b/media-gfx/feh/feh-3.6.2.ebuild
new file mode 100644
index 000000000000..2010a07aeadf
--- /dev/null
+++ b/media-gfx/feh/feh-3.6.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs xdg-utils
+
+DESCRIPTION="A fast, lightweight imageviewer using imlib2"
+HOMEPAGE="https://feh.finalrewind.org/"
+SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
+
+LICENSE="feh"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug curl exif test xinerama inotify"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="media-libs/imlib2[X]
+ >=media-libs/libpng-1.2:0=
+ x11-libs/libX11
+ curl? ( net-misc/curl )
+ exif? ( media-libs/libexif )
+ xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${COMMON_DEPEND}
+ virtual/jpeg:0"
+DEPEND="${COMMON_DEPEND}
+ x11-base/xorg-proto
+ x11-libs/libXt
+ test? (
+ >=dev-lang/perl-5.10
+ dev-perl/Test-Command
+ media-libs/imlib2[gif,jpeg,png]
+ )"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.2-debug-cflags.patch )
+
+pkg_setup() {
+ use_feh() { usex $1 1 0; }
+
+ fehopts=(
+ DESTDIR="${D}"
+ PREFIX="${EPREFIX}"/usr
+ doc_dir='${main_dir}'/share/doc/${PF}
+ example_dir='${main_dir}'/share/doc/${PF}/examples
+ curl=$(use_feh curl)
+ debug=$(use_feh debug)
+ xinerama=$(use_feh xinerama)
+ exif=$(use_feh exif)
+ inotify=$(use_feh inotify)
+ )
+}
+
+src_compile() {
+ tc-export CC
+ emake "${fehopts[@]}"
+}
+
+src_install() {
+ emake "${fehopts[@]}" install
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
diff --git a/media-gfx/gif2png/Manifest b/media-gfx/gif2png/Manifest
index 283f22dc0c16..56566d613ff7 100644
--- a/media-gfx/gif2png/Manifest
+++ b/media-gfx/gif2png/Manifest
@@ -3,6 +3,6 @@ DIST gif2png-2.5.12.tar.gz 31613 BLAKE2B 8614d3e0435bab334465d3f43d8676a80f1041e
DIST gif2png-2.5.14.tar.gz 221609 BLAKE2B de1e66a0880579a2d4d3681ec8cbbe3ef37da1cd05e40336b398266f386d629645f9d45738098c9e3f9528cb5dbdd5c37ed00f5d5c8bcd85e0a31fd375f38a76 SHA512 a1ea3b64da64274a3363089beee748605eb24d3e05bcace29d26618a9ab3580f5ac85da893af16975c91d571866625e0883f0a4b375e82c468754f84f8982f03
DIST gif2png-2.5.9.tar.gz 137750 BLAKE2B a5fb0570f6263c1911a4cad52f1b974f8010a02cf882f2e1e40ed7dbbce4be8b75290e4b0a78b5dde74cc244c9a848dd429a937e696746d3d39b8cec9dd469fd SHA512 0632f1b4b96a1e4b5567101fbac36db55e658503977c8c875d75d9c1db5b374deba5afbda5507585b6b79242781fd70afc477e686458cc124adb8e1b29860c1e
EBUILD gif2png-2.5.12.ebuild 824 BLAKE2B 9102092ff19c7f7c8e2628a1d93699c628202e50f0d587a2c05bf0c6dbe7cbb51f524403435552ca08b3c98a6666822eda153e363514a73a01f99bfdf9702a6e SHA512 22fd274b541e4779a990009a3365a830f85b26835385c1ece11a3cf266474b90bdab477bd73e15a91e32c5c947565c7519bfc3dba00d1fe87639a06f1e740ca1
-EBUILD gif2png-2.5.14.ebuild 673 BLAKE2B 65922e19b9adce9ce07c5f3ecb44806a3093e8b011d08a7dc41ccd6524d41a876f35650a423e5c9205cc178708724e7fb78f9e9a95c453c7e17fbf6f5ef3f5f1 SHA512 ed26ce8204e28aa0b824bd2463aebf7af3269d53be9fadc6fe0636c9932114a9436e7d87b76d23cb0077b8eb248ebae7b1bcc29e4eb6291489fbb43e5893e0d2
+EBUILD gif2png-2.5.14.ebuild 671 BLAKE2B 3a90983d055427448a29149199dccd410939ceb0c8ccc69b9a82557876f32453e06967398f385853b5a76c8e2575a5ea083722a31bebb188e21e1044f7baddda SHA512 02aff990a2e72dfcc2e992a4556ed9798e948297695b95ab6540bac398f28193ab84c21069e5382b023f744f45f57e68b80caaca7b5fe400e8d5c9fd8b5024fd
EBUILD gif2png-2.5.9.ebuild 472 BLAKE2B 7e87e3e7bcc682a9d0642882312fce3c9cd70a47a427be947989cad1fe66f49fbb82404b417c8388c60cc4bd313a4ca6a94062a430ee465403f1ad0031e31734 SHA512 e3fed27af7cd3ccfbe2ee618a547fc3a7a5729cef1fa48798a9f8001de6b08a23ce67a239cf33b96ff8a41a49e2941c1f68e93271de626a7a605813ac6745d8e
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/gif2png/gif2png-2.5.14.ebuild b/media-gfx/gif2png/gif2png-2.5.14.ebuild
index 3e81c042cda4..fe8849158bad 100644
--- a/media-gfx/gif2png/gif2png-2.5.14.ebuild
+++ b/media-gfx/gif2png/gif2png-2.5.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://catb.org/~esr/${PN}/${P}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
RDEPEND=">=media-libs/libpng-1.2:0=
sys-libs/zlib:="
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 5dbca696ec3e..c8dc5d1a9588 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -2,5 +2,5 @@ AUX gmic-2.9.2_ipa-sra.patch 665 BLAKE2B b61fa87ac2da5fd5956c89cb4a6c128f266a175
DIST gmic_2.9.4.tar.gz 7279628 BLAKE2B ca5fc69a2990a86a340c4305dc406d4e9032ba04afa59819dc2c788b4c181d23bd03d3050380802fe1effa2b6389df60734f8b3523fac7b0ff6bc35b64a368a6 SHA512 76bb4798e91a68e76a985d7fbc488f8677facaa1efc4ab3a0b9c7d966aa3f5763d1ae1de80f572636d58f1831d9bdae1651ea0b6a76d49a18bf5ad6e12756d73
DIST gmic_2.9.5.tar.gz 7304367 BLAKE2B 5227aced76cc5ff0a0144f940c71daeeb947e282b6f8c28894ecfda6b863803d0c2227bac869362ba0710fa33fcf81a4c77ea582cbea77ab8a670f65eef9826c SHA512 95d0642cad057eeaa8f7bdd4259719adf6f36189e7851e9e09399bb61f3a52722f0f83f0d2d5991c4e44a692fd3afc735fdb93e6fe45ae092d1e51a139560809
EBUILD gmic-2.9.4.ebuild 4845 BLAKE2B 998961857815fc1d5c993c96dd2ad74bdcde8353cd561bd5306e7808e2d07db73da4dbe1b020d23b85784a0cc4b0dd57e7e05ae9e530328355a32b699a90d2a7 SHA512 2cbb56d2a4433d63983b494cb5c7047054e2d320fca46b6db32c21c8abc4f389287e67f0ed522ca58a2c2e8c78013adf9df4914fb7a85335f4415284cd307d12
-EBUILD gmic-2.9.5.ebuild 4262 BLAKE2B ea9fdfb207a5a28d1d04136a916d806bab9906e0d4495dd37b29ecae0296a57d5c9f2fdfd6485ac7bfda9b7d5f104b976c4fb9232910839256c3727a115532ad SHA512 2402560d48ea661dabcb9b727d3dcb6669f71fe7270bf3986db57aa5a8f51366133d3950d748e0e631dec77c346ca9057bdd8540aef93c4d5d9bf8a20fd33bbd
+EBUILD gmic-2.9.5.ebuild 4260 BLAKE2B 96fd28e34efc81a51e21aad3b89a913e4d4a5a427a6913da38f5bce4d559d995b8cbbdd08701880a61572a6f9e8c5d63ed6538a1af0aff7fb03f6ae86f5b6336 SHA512 4d908e35ad53b771bbd6373b74218480dcdc48ae94dd389e525bfa239d9faedff4ae78b151da44123a5777efad51be81743383e7b57d80412d958f50231e21f4
MISC metadata.xml 605 BLAKE2B f1ed3b46614a3e3273e4bdedfd7b45629eca482a0805ff1bda2161e4d785a478b91f8ccdbab399b184ec93d020211e35e4503fbf4205b1e2e1f04c7e547303bd SHA512 8303e0a301edb88bdb7522baf47e29b39e895ccaa729231d64b6a39af73f0eb1626c39439f1ed70d496d982f3abca4ff9586d20fc5a9d08b0e57a19b60bf088d
diff --git a/media-gfx/gmic/gmic-2.9.5.ebuild b/media-gfx/gmic/gmic-2.9.5.ebuild
index 20cad100504d..cd2efec6e1b2 100644
--- a/media-gfx/gmic/gmic-2.9.5.ebuild
+++ b/media-gfx/gmic/gmic-2.9.5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm64 x86"
fi
DESCRIPTION="GREYC's Magic Image Converter"
diff --git a/media-gfx/gnome-screenshot/Manifest b/media-gfx/gnome-screenshot/Manifest
index 165e86e83c50..d70f151e7c31 100644
--- a/media-gfx/gnome-screenshot/Manifest
+++ b/media-gfx/gnome-screenshot/Manifest
@@ -1,5 +1,5 @@
DIST gnome-screenshot-3.36.0.tar.xz 231420 BLAKE2B ce916d4d221252f47c84ebdec52ddcc2e25c2481df848cb6199842857c7ba537f56c22bdcb2a8e5b988d767fbc242d0c727119bc1ae9d569644eae15688aebf5 SHA512 fda599e7c50b37d8356352085b2f45f3b8c868af897352810998e127bd7333d5a1383369ec1cb980064f7e0aafa0e01bc5cdb31563ea56b1a7e4099fc18cc6b4
DIST gnome-screenshot-3.38.0.tar.xz 356716 BLAKE2B 31f2a0cdf16a9f967c789ec1f698140f78a5c4d66489bc8a47b8b61b5e536e6b67fd60b9cb241221262eef5b3117ce3e1a59fa162a7f193de440f7de9db0afc3 SHA512 183f81b9b481d1afb4a3c8e37b25a78652e599d4c5a4f1a2cc9449cd1efdf3b613018c17de9ab61304ba19ad7152d696aeed475c0184a4728ea1359ca2be2ecf
EBUILD gnome-screenshot-3.36.0.ebuild 1204 BLAKE2B 7e2465f20e33696123deb1156db4e4a1356bb48b8613824be9d418b7f31c2a41ddf4fb25b0c422007e703ec7a68b8872b760f080988538b94c7a8bd2d5c52dc2 SHA512 1115c12624ba4bd0a218347775c8810c916f862e0155471a55e84ae38e214c9de19992d025a52b5ba685a506022a0091a307c8b14c61973f33edb9d8b44ef90a
-EBUILD gnome-screenshot-3.38.0.ebuild 1334 BLAKE2B 21bf86e77105af2d607e1e4e580283fe2ea5c5cc0d3d15b1356dc00b9355c272eb788a0fc4a0083f03e944dbfe5e45c491cb27998d4e77d37d3ce8fae1ff3590 SHA512 ccd7fee789f0158203b893362227b6fe0b3eb743ec74f9b4136229d50dfedc089638d849ead9cbae54886f4c65080ed22799f08d64f7f62f73a5367596863348
+EBUILD gnome-screenshot-3.38.0.ebuild 1333 BLAKE2B 9f34d3dbfa01a050d45966f97b1133bb70482753d04479a9156f48aeb5c90bf9e7dde6bba2310758fbab2900acbfe6b598015c40b512d64d42fc856087f3d888 SHA512 bdc7f9f585b362b3ad8676bd5cc1f4e849af8b6958fea2a131ff66923d109fabedcdb28772efe39c49e4adfe54b10820c7c2e83c1bc6de89b32e8b0ae71069e6
MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.38.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.38.0.ebuild
index 9b96935da73f..540ff2319e52 100644
--- a/media-gfx/gnome-screenshot/gnome-screenshot-3.38.0.ebuild
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-3.38.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-screenshot"
LICENSE="GPL-2+"
SLOT="0"
IUSE="X"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
# libcanberra 0.26-r2 is needed for gtk+:3 fixes
DEPEND="
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index 8953efaba9c1..9f3702d5037c 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -3,5 +3,5 @@ AUX gphoto2-2.5.26-s-cdk-cdk.h-cdk.h.patch 883 BLAKE2B cdbc9626b09610eb98cc32e04
DIST gphoto2-2.5.20.tar.bz2 790065 BLAKE2B 6e10aa468696bc3eff51aaa3e886ad2373997f91597e42b33777ac56bf668f918c2fa0cb8b70eb8f7cb45507e67c9cfc3a46a7408449ad35cc3b743daf74859d SHA512 0350c38c264e5ba858ee14952fbf6ad271e7fef05e3f5f8eb3d45102099ae435fec63b09881efa99af60d4e086a9c2f69be92a7e49617643ab13146a5e4655f3
DIST gphoto2-2.5.26.tar.bz2 804521 BLAKE2B 20ddf39ad8668543864119cb1cf8dd5db4be5a773ccdd73efe434fe790ce001842512acf9a9f3ad08bad43460b42e4de257b2ca5561b5d7727f0703dba8f8098 SHA512 fbfc8d860db830be423271a0f569d51a296e9394884fe1a9e22eafd4ba0b7e4e68d86ba0391df81a64d4a4976b2644b2c39339532bd0e8e01f461b9a89cceb47
EBUILD gphoto2-2.5.20.ebuild 1334 BLAKE2B 0cbad273e56fa22e1612ce973622b44995e1dc98bae1a17c7533a7c8b2df36d51ea61cad8fa4adad201778401f2540de7e7e5728ebfbbba38f7e6bf9c6305398 SHA512 90ec16fdf308d2c92ffa7397bb9789eaa65e1ee30ae853add5993e359ecefebe118a0fac09e2edfe08b4d0ee490b6bb6ef5ec90e01b557d3a92af93df622390a
-EBUILD gphoto2-2.5.26.ebuild 1270 BLAKE2B 534c1e6777dd16ef441e91469080669f7489bc0ef3a3bfe8aafc8fb644ef7bebcb2a5a0c2c67a805a9b5db8792a58f35f17e7e1f163c48d94ac57ff1001bb5ba SHA512 d73ae39d2b0efc236965b8d94ac2d556076c9c07eb293bfd5cdfc95cdc50c3b663fd226a1fc85baf7a7d4a6bb4078d91289e7289ea6389607576d839689d9d3a
+EBUILD gphoto2-2.5.26.ebuild 1269 BLAKE2B 6e365087fec2efbaf88972074ba136174487a138ce77639caca12fc8998a7f22265369818056743b93cd9ffb0b904e8d88d9edda8001e65e8a202dd08807a831 SHA512 f3d4fab65fecb86a4946b41c616810387179ef05d2bce7cf22642d685ff56a0019cc5c0ccc8a1f5de8cc78099ad77df19dfe29d15e9187f5126cb3eea274be47
MISC metadata.xml 329 BLAKE2B aa29f56b9c69aa63e45a1a7b6ba6e7a680f33227521a705f5273689774f4cb22d37cdd345b3aa9c43f254861b7fb1fca34d60ac9e1536d07a0806ab881b9e2e7 SHA512 d4107a001067b831a81094ad13f8ee531b52ac62e5dc0fd8810c3a7d85a069fe352bedb8275a34d3e1cb11c003405035dbfaf9b48270b5dbb02cd25772075ab7
diff --git a/media-gfx/gphoto2/gphoto2-2.5.26.ebuild b/media-gfx/gphoto2/gphoto2-2.5.26.ebuild
index 4e4d43690010..cb6815b02bf1 100644
--- a/media-gfx/gphoto2/gphoto2-2.5.26.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.5.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="aalib exif ncurses nls readline"
# aalib -> needs libjpeg
diff --git a/media-gfx/gpicview/Manifest b/media-gfx/gpicview/Manifest
index 8a983ebf4061..184a7383ebd1 100644
--- a/media-gfx/gpicview/Manifest
+++ b/media-gfx/gpicview/Manifest
@@ -1,4 +1,4 @@
DIST gpicview-0.2.5.tar.xz 349536 BLAKE2B c215e812693a30d55d3e606b9958d308b5d7f564ba0c3fc60e7606c492ec3ddd9997ae63f0865a6bebdf79c0a18e6a8b26a1e2c8d5dd7e2174d211130dbbe817 SHA512 afc7e67c7ae1252f9c1816ee46fe69e96ea7be9a60e03406a539f17b2e4f0e4b93a028c6f3f1c455f5433d6d7d78a58dcee2cb0ac91ea53093a21935bf454afd
-EBUILD gpicview-0.2.5-r1.ebuild 653 BLAKE2B 838de94b135c79ff24790e6b607b9caf962784b3eede113ab839ddb1353f551a2872980e68f59f82b76bfb1e5971d816b690f952c8896995e1691902175d49ff SHA512 ff7ed4054a9c8d5c77b65c4c2ffbde2016fff9da83e942529e601e88119f5b5a6a1931c869e01256bd3168fa9146cfc56803366c13afd3f5595bf8ea78744068
+EBUILD gpicview-0.2.5-r1.ebuild 652 BLAKE2B 543b90065074488e91faa5ae0f310d10a0bcd84913c3a0143f9fce8c367c8a6b1659c69c2b824c012b889163a5afce282d5b49f38fa7c7352ebcda245fb448d8 SHA512 5b7a0856bb9cfa2296c4d588bb4e2232204c50955928a10f6c94507aba495452937b89ba5d49bb32fcbdeb7a92ad938aa70ba638e14ddf41396972f0e47b053c
EBUILD gpicview-0.2.5.ebuild 548 BLAKE2B 7402a49ee6252fdc380528d96b8fb251da0f2f10c21c87867f8376630bceeaf025c26a2cf9b926be879184849c5786d752a4f42570e7f9b1a5de6feffd86ed5d SHA512 c65d2217ad28d00169b53997497ed000d0fd90d42c121071a69e7c7ff5d4305d8169c3b749409afa0aaa1fd3a3bea76a2ab33ad5e92e45940a7f93d24f6e00b0
MISC metadata.xml 326 BLAKE2B dbbd9ecc73f5ec8f23b39346f657c68efd9b673e1faee5930e503a9a5694cc9f8931a97083e282006a931a30bdb577d1b347b6c2a8dd3cc959011e4837dab9be SHA512 0a80530a6a1e3884352fb68ea8e4f0cd0fbf685201ef28de590233fd43b111c23f6f5a2a3eccc450c0bc9f08d58c565c90e80f04418cbf8880b101f93ca1aa3b
diff --git a/media-gfx/gpicview/gpicview-0.2.5-r1.ebuild b/media-gfx/gpicview/gpicview-0.2.5-r1.ebuild
index 7df334a7cd80..03518f32a401 100644
--- a/media-gfx/gpicview/gpicview-0.2.5-r1.ebuild
+++ b/media-gfx/gpicview/gpicview-0.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ppc x86 ~x86-linux"
RDEPEND="virtual/jpeg:0
>=x11-libs/gtk+-2.6:2"
diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest
index bc3cc2447812..4837af683b30 100644
--- a/media-gfx/gscan2pdf/Manifest
+++ b/media-gfx/gscan2pdf/Manifest
@@ -3,5 +3,5 @@ DIST gscan2pdf-2.10.2.tar.xz 489484 BLAKE2B d699b471bcf701a83e87d982b7faebeac4a4
DIST gscan2pdf-2.9.1.tar.xz 484740 BLAKE2B e75ac6a5296ba2f89838ae9c95dc0ceb592ea8ffaf8d89a0635043e07fedbdcf97df26ac810556da7d0e0306eb7aaff76dc18162c6a5f89cb1953bd623a594a3 SHA512 4fc3107c871a7915ebdc023476b1159c0fe03934f1a52a417a5bc285be46f7db0ed38ec4cf015b15953c728ef19d1f4f30207d418b655c950bfb64ddc5d23237
EBUILD gscan2pdf-1.8.11.ebuild 1732 BLAKE2B 6f1e069c628d5d3abbb137c7e248783881122eed602420b0d43461b54fb8c7395cf1f40f30b42bbd8577121305b3405f486666fb76e64bb20fab381037bb079a SHA512 6bc6808d5c18b208a2b1a0ffb8778c2a4db0b99b531ea7e861a9739adaf42d5a1aaa8fd95e95ee2c930e1b435113c247f1ecca143b9fcb7fb98d78d7db10fcc0
EBUILD gscan2pdf-2.10.2.ebuild 2953 BLAKE2B 8d00bdc4e43d93e79702322277b82d951c2ccf63a9a6fa43614c9e3a218af3661f22665ae442e3996a84388df98817084355225642ef5bc5c8b11f44d85cc47f SHA512 0d3e90cc07b9ace473ae6758236ac867a562be3e6092342d8abcc97c61781a7cc1f1ab70ae3f21c1adfacc1925a43342ce2aa8b137e3eaf65bad1736e9bf0c94
-EBUILD gscan2pdf-2.9.1.ebuild 2802 BLAKE2B c6228fbf93f5eed2d18826f774d5430f6bdfb004301ab3fcdc85071fb68fcb014357857acbdfb4eef559e714ed6ed1d4e17d5dcad6bb7d901654d780d4dacb2e SHA512 cd9b67c5830bc94d27732c3508846be536ca16d95626fff5ede74788543b0735f530b4aba09ca8228afb549f9cbfb4d7491fb2640a41e274c607b4d6810b0856
+EBUILD gscan2pdf-2.9.1.ebuild 2801 BLAKE2B 5ec319fceae00a20a15caae9cf019691523680bfa734bae36c8cac7117455438beed4c56fc79a570e87b2d4860b12a62c0fe6fdb49e1e26b24c7a58b493cfa91 SHA512 9f7b98317da72d4abeb6cd64719ddb9de39fa5505d955c6543b7ab76ba0db18c0a7e20261c6c0b7e025272d336c98126bc87c2a32f84a811d6d11649a7dd0aec
MISC metadata.xml 439 BLAKE2B 835480b0d68a079941e94f2646d0136dfb8a8e750e0279f8a5a2e23e6690242582ffe660798f5e80ebfb4378a576aa5715332b53230555866391a99ec28f54ff SHA512 af1cc05ac693899586df81036d2fa11af187edbb3c9449862298ba05efd0dbd0c4c5b008a1a21328c1f9a27a690671bd7a9967d2e457efb31561044e45984401
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.9.1.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.9.1.ebuild
index 0a695a657733..b25b14de3434 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-2.9.1.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-2.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index ecdcd117baeb..9e892e19a2db 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,18 +1,12 @@
AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
-DIST ImageMagick-6.9.11-61.tar.xz 9171260 BLAKE2B 89047378e414a7455baa28d413f49dfce3eb54e462211ba5e61f786111c569b26166217ca7e9f5e12c0602bde64c8e9726a67ee3c6be4366d692c2b6232dbbbf SHA512 742fb0b3ff4da98ff05a7fd48b1c5db038bf276975575c4e549f30d61001384c6b508cff526f621467d38a29a9cf015f0cc8c42801720f1b47d6737afb4bac78
-DIST ImageMagick-6.9.11-62.tar.xz 9172472 BLAKE2B 4be79ca6024f6d8e12fe492e6a541dfc4c6b70bf33dcfa8b3d2bb4d9a774a39bb974683e7444c47ee82349ae21e05fba458bcc45b71656f55084c9354ef7ddf6 SHA512 92987953b01c8ecdc3be0b78ee7bdc9e50e0a581f9682f283fcc2345a66ab2b75d678e2b989f90bcaf6eba95581b6234cb86ae33ee44faf6090760e72f838232
DIST ImageMagick-6.9.12-2.tar.xz 9168640 BLAKE2B b0ce3b8ac5ff27f6d6fd0995d0f214f791fdce6c881e6b58579aaa22a7e87ca8d441185f69ba9d50a9aea501f28f06564ac76f7d1d5b1760206eeaf17560a8a7 SHA512 105d11d23457050c9f94223d524230ab62cdf457fe17630179c92f53a6bb60b8c04fa0f60f388303a90e2106aea6e0f1863a9a49a8fdfefd5d15d13eca58a770
-DIST ImageMagick-7.0.10-61.tar.xz 10143308 BLAKE2B bc343b72567d326f30825637366e5d5614e8d53e5222fce357acf0acc9aceae84fe99d67bc7ff2d593e754b990d1e8449785a04724437b61a35e9282f9af799b SHA512 f90d8847fed7f1a5ca3fa247eb1ea115d6afe6fe379fb48733c539456663ca89426336f7ef8be087c1caa0eeafc7d63285f3c35c400fa94b30459796650421c3
-DIST ImageMagick-7.0.11-0.tar.xz 10147348 BLAKE2B 7237808a9352fd1e5988b3b91245335202e78576beb1ed07362adee4320e27ad2253dc4e2f0afe5a5510a17210488a60d2a6920634475908c75823986ca9ed03 SHA512 484a1f53c0d49359fc41d681ddb3fe5bcd0fa8a9b89db1f6f19df5cba0596ab1d8c035d6e7e8d000370ebdd040c6a50ca3d867cf6e50ac29c03471bc34bb4e0e
-DIST ImageMagick-7.0.11-1.tar.xz 10145440 BLAKE2B 24d4e455825b631db2d8e5c1dac8a4fe3ea2e5432db649cbc71b1486c497a6041e639bb185a4bff5393cecb762de42074fbe480e29b75d52e2fd143b27360cdd SHA512 046d6008f93506b98c064c87b81fee3e1b7bfd02f5aceb84eb01419b3e13ef8d75be9cdbbf2511247c9382f709a93c4ede53befd7a5c4f6e86d4a307cb838cc4
+DIST ImageMagick-6.9.12-3.tar.xz 9174208 BLAKE2B 5ee9ab5196cb2dcbb2d210dfb71fbb63956bdfc33e97fa03a51f6884736dffc1227ec94d44a46c19eeb216a1896c06b0927678410e0171d855b77e13ab10c51e SHA512 c117fd1fe57478f66fb2b3bab1d6d908a643519a0e4b8026f138ba77778f29bb83e15a78a3b58b461a16cf2dcf66db84d6cc9e77532aab14f776dabf2eb8f24a
DIST ImageMagick-7.0.11-2.tar.xz 10145568 BLAKE2B 2edc25dfeda99fee1d4fec4a90fcd48b350c93317082239b243874b0394cefe154ca7553fb1d688971c5352d896ff6327f31ca708a2000427601c53d0ce5c7ea SHA512 29ddf675bde3165d86f786eebfe8443cb4205d6218cb3cfa78be26d18fb30ad13913db32124377030c283156f4aa81cc28acef5cd7c1a873a66d5f563e5152ac
-EBUILD imagemagick-6.9.11.61-r1.ebuild 7059 BLAKE2B 15ee8b4d1965bbae05ff93a7ccbbf2e40aa70f8111984895c85e1e78941f8b8403f94c423ed439e2ff3593f48964a481aa02f96e436f0f4bbc93e197018f3c45 SHA512 a868f2837298bd861abf52e88d1ead03c533a5f68a080ed2367748a409bb90ceb68415f9837be68f8f03d859e31aef34347594a22ba4250196e259a64be82126
-EBUILD imagemagick-6.9.11.62.ebuild 7066 BLAKE2B 1a8c103b4b74ec48f1d1a985e35315043f5e9306ca54183c457935279ad2e54038e65d20ac92b5d0ce3ad94d6a636179fb9b59eae087d1ea351ac12adf68e28b SHA512 443cc02aa96ba19fc040add6f56a099d2deedb72c1c2c074031dde18322c866e764d232de4d73dbf0189dc0a6777970ea5c2471d5b4e25f9bdae827f53431903
-EBUILD imagemagick-6.9.12.2.ebuild 7066 BLAKE2B 1a8c103b4b74ec48f1d1a985e35315043f5e9306ca54183c457935279ad2e54038e65d20ac92b5d0ce3ad94d6a636179fb9b59eae087d1ea351ac12adf68e28b SHA512 443cc02aa96ba19fc040add6f56a099d2deedb72c1c2c074031dde18322c866e764d232de4d73dbf0189dc0a6777970ea5c2471d5b4e25f9bdae827f53431903
-EBUILD imagemagick-7.0.10.61-r1.ebuild 7368 BLAKE2B 399ea3aa93222b7639b2eebae045bb5ba3b6d98d6725c8a5daf6de62c98c8f8ef5a9841c74a29b48c84a61be2b747fa59c4be3c190e3755649254544682f7c29 SHA512 e6b19106e96f8e7350c828d45678a18c352b3097828987bb924842878628404573ac530490c108ee7be2643033de06beff5da0f6e93ce2d71d2f2df93ebc3546
-EBUILD imagemagick-7.0.11.0.ebuild 7375 BLAKE2B 7654a1366679222fc571f074f0c7b5369e5cc9e0f5b10d29283c9ad2bbc43587aeddbad38a83961bff1fe64c69b295f2611324cfea4c09a66bbe45acd0d0366f SHA512 c082496c8c8e08f3d6d4e02cca1b8936ef0573a962f49449967dfd68d3b038405488887cf004627e3748478aa5f7ccfde44d2c93e1defd840baac931ee172c08
-EBUILD imagemagick-7.0.11.1.ebuild 7375 BLAKE2B 7654a1366679222fc571f074f0c7b5369e5cc9e0f5b10d29283c9ad2bbc43587aeddbad38a83961bff1fe64c69b295f2611324cfea4c09a66bbe45acd0d0366f SHA512 c082496c8c8e08f3d6d4e02cca1b8936ef0573a962f49449967dfd68d3b038405488887cf004627e3748478aa5f7ccfde44d2c93e1defd840baac931ee172c08
-EBUILD imagemagick-7.0.11.2.ebuild 7375 BLAKE2B 7654a1366679222fc571f074f0c7b5369e5cc9e0f5b10d29283c9ad2bbc43587aeddbad38a83961bff1fe64c69b295f2611324cfea4c09a66bbe45acd0d0366f SHA512 c082496c8c8e08f3d6d4e02cca1b8936ef0573a962f49449967dfd68d3b038405488887cf004627e3748478aa5f7ccfde44d2c93e1defd840baac931ee172c08
+DIST ImageMagick-7.0.11-3.tar.xz 10151644 BLAKE2B f32234fd1f89dfd4ead816f06984b6f673235f368cebbdc19704e677e2a1802ef2212d489346e7f48239a6aa14e7a089b45259645879b5010773d6565e5b0a1e SHA512 9a5cf4fc2c325d435a04c54bec3502bfa86d8bfa0b91efc53e34f364de039bcea5318ea3ebdb10e0bd49767f29ce44ca209bcefb51c2676a6a55a2e97c6ebf9b
+EBUILD imagemagick-6.9.12.2.ebuild 7059 BLAKE2B 15ee8b4d1965bbae05ff93a7ccbbf2e40aa70f8111984895c85e1e78941f8b8403f94c423ed439e2ff3593f48964a481aa02f96e436f0f4bbc93e197018f3c45 SHA512 a868f2837298bd861abf52e88d1ead03c533a5f68a080ed2367748a409bb90ceb68415f9837be68f8f03d859e31aef34347594a22ba4250196e259a64be82126
+EBUILD imagemagick-6.9.12.3.ebuild 7066 BLAKE2B 1a8c103b4b74ec48f1d1a985e35315043f5e9306ca54183c457935279ad2e54038e65d20ac92b5d0ce3ad94d6a636179fb9b59eae087d1ea351ac12adf68e28b SHA512 443cc02aa96ba19fc040add6f56a099d2deedb72c1c2c074031dde18322c866e764d232de4d73dbf0189dc0a6777970ea5c2471d5b4e25f9bdae827f53431903
+EBUILD imagemagick-7.0.11.2.ebuild 7367 BLAKE2B 574aee956d82d649ff633bece498d743a3edec70f641da61565143572823c124e2cae9250214f8c9058490e52fffbdb2952eb385971134ba576a8f3c1208ac6b SHA512 ffaac421781cec3c38473b2398c57691cb33d0708afd1fb3918ad3007a2ebb9d0e1c48c6e81e2b49374066cc855bfffab3c7945a827a328b044f661eb20682d3
+EBUILD imagemagick-7.0.11.3.ebuild 7375 BLAKE2B 7654a1366679222fc571f074f0c7b5369e5cc9e0f5b10d29283c9ad2bbc43587aeddbad38a83961bff1fe64c69b295f2611324cfea4c09a66bbe45acd0d0366f SHA512 c082496c8c8e08f3d6d4e02cca1b8936ef0573a962f49449967dfd68d3b038405488887cf004627e3748478aa5f7ccfde44d2c93e1defd840baac931ee172c08
EBUILD imagemagick-9999.ebuild 7375 BLAKE2B 7654a1366679222fc571f074f0c7b5369e5cc9e0f5b10d29283c9ad2bbc43587aeddbad38a83961bff1fe64c69b295f2611324cfea4c09a66bbe45acd0d0366f SHA512 c082496c8c8e08f3d6d4e02cca1b8936ef0573a962f49449967dfd68d3b038405488887cf004627e3748478aa5f7ccfde44d2c93e1defd840baac931ee172c08
MISC metadata.xml 1226 BLAKE2B 09876ac633363817b503a307e2cc0a500cfdcc1256cbb3b3e595600a0c913aa7ad252eb4dbe18b911bfcc9f06ec7b8046e0c2e3882eec305e471080bd76de906 SHA512 da1bb41d877614a237ea14379614a509fb58d58f4e93e56500e6aa0007c0515e6d90731c5df9e387f36632a210276a6983784cede64119453c965a9fc7e2ea4d
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.61-r1.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.61-r1.ebuild
deleted file mode 100644
index 923c0a8e8415..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.11.61-r1.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-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/6.9.11-60"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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"
-
-REQUIRED_USE="corefonts? ( truetype )
- test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/libltdl:0
- bzip2? ( app-arch/bzip2 )
- corefonts? ( media-fonts/corefonts )
- djvu? ( app-text/djvu )
- fftw? ( sci-libs/fftw:3.0 )
- 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 )
- lcms? ( media-libs/lcms:2= )
- lqr? ( media-libs/liblqr )
- opencl? ( virtual/opencl )
- openexr? ( media-libs/openexr:0= )
- pango? ( x11-libs/pango )
- perl? ( >=dev-lang/perl-5.8.8:0= )
- png? ( media-libs/libpng:0= )
- postscript? ( app-text/ghostscript-gpl )
- raw? ( media-libs/libraw:= )
- svg? (
- gnome-base/librsvg
- media-gfx/potrace
- )
- tiff? ( media-libs/tiff:0= )
- truetype? (
- media-fonts/urw-fonts
- >=media-libs/freetype-2
- )
- webp? ( media-libs/libwebp:0= )
- wmf? ( media-libs/libwmf )
- X? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libXext
- x11-libs/libXt
- )
- 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
-
- # Apply hardening #664236
- cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
- sed -i -e '/^<policymap>$/ {
- r policy-hardening.snippet
- d
- }' \
- config/policy.xml || \
- die "Failed to apply hardening of policy.xml"
- einfo "policy.xml hardened"
-
- 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
- shopt -s nullglob
- ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
- if test -n "${ati_cards}"; then
- addpredict "${ati_cards}"
- fi
- mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
- if test -n "${mesa_cards}"; then
- addpredict "${mesa_cards}"
- fi
- nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
- if test -n "${nvidia_cards}"; then
- addpredict "${nvidia_cards}"
- fi
- render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
- if test -n "${render_cards}"; then
- addpredict "${render_cards}"
- fi
- shopt -u nullglob
- addpredict /dev/nvidiactl
-}
-
-src_configure() {
- local depth=16
- use q8 && depth=8
- use q32 && depth=32
-
- local openmp=disable
- use openmp && { tc-has-openmp && openmp=enable; }
-
- use perl && perl_check_env
-
- [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
- local myeconfargs=(
- $(use_enable static-libs static)
- $(use_enable hdri)
- $(use_enable opencl)
- --with-threads
- --with-modules
- --with-quantum-depth=${depth}
- $(use_with cxx magick-plus-plus)
- $(use_with perl)
- --with-perl-options='INSTALLDIRS=vendor'
- --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
- $(use_with bzip2 bzlib)
- $(use_with X x)
- $(use_with zlib)
- --without-autotrace
- $(use_with postscript dps)
- $(use_with djvu)
- --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
- $(use_with fftw)
- $(use_with fpx)
- $(use_with fontconfig)
- $(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)
- $(use_with lcms)
- $(use_with lqr)
- $(use_with lzma)
- $(use_with openexr)
- $(use_with pango)
- $(use_with png)
- $(use_with raw)
- $(use_with svg rsvg)
- $(use_with tiff)
- $(use_with webp)
- $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
- $(use_with wmf)
- $(use_with xml)
- --${openmp}-openmp
- --with-gcc-arch=no-automagic
- )
- CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
- # Install default (unrestricted) policy in $HOME for test suite #664238
- local _im_local_config_home="${HOME}/.config/ImageMagick"
- mkdir -p "${_im_local_config_home}" || \
- die "Failed to create IM config dir in '${_im_local_config_home}'"
- cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
- die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
- local im_command= IM_COMMANDS=()
- 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
- eval "${S}"/magick.sh \
- ${im_command} || \
- die "Failed to run \"${im_command}\""
- done
-}
-
-src_install() {
- # Ensure documentation installation files and paths with each release!
- emake \
- DESTDIR="${D}" \
- DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
- install
-
- rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
- dodoc {AUTHORS,README}.txt ChangeLog
-
- 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 {} +
- 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
-
- 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"
- EOF
-
- insinto /etc/sandbox.d
- doins "${T}"/99${PN} #472766
- fi
-
- insinto /usr/share/${PN}
- doins config/*icm
-}
-
-pkg_postinst() {
- local _show_policy_xml_notice=
-
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # This is a new installation
- _show_policy_xml_notice=yes
- else
- local v
- for v in ${REPLACING_VERSIONS}; do
- if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
- # This is an upgrade
- _show_policy_xml_notice=yes
-
- # Show this elog only once
- break
- fi
- done
- fi
-
- if [[ -n "${_show_policy_xml_notice}" ]]; then
- 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"
- elog " - PS2"
- elog " - PS3"
- elog " - EPS"
- elog " - PDF"
- elog " - XPS"
- fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.2.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.2.ebuild
index 7ff90f249dff..923c0a8e8415 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.12.2.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
LICENSE="imagemagick"
SLOT="0/6.9.11-60"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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"
REQUIRED_USE="corefonts? ( truetype )
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.62.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.3.ebuild
index 7ff90f249dff..7ff90f249dff 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.11.62.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.3.ebuild
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.61-r1.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.61-r1.ebuild
deleted file mode 100644
index 2f9f0b5033d8..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.10.61-r1.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/7.0.10-60"
-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 )
- svg? ( xml )
- test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
- dev-libs/libltdl:0
- bzip2? ( app-arch/bzip2 )
- corefonts? ( media-fonts/corefonts )
- djvu? ( app-text/djvu )
- fftw? ( sci-libs/fftw:3.0 )
- 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 )
- lcms? ( media-libs/lcms:2= )
- lqr? ( media-libs/liblqr )
- opencl? ( virtual/opencl )
- openexr? ( media-libs/openexr:0= )
- pango? ( x11-libs/pango )
- perl? ( >=dev-lang/perl-5.8.8:0= )
- png? ( media-libs/libpng:0= )
- postscript? ( app-text/ghostscript-gpl )
- raw? ( media-libs/libraw:= )
- svg? (
- gnome-base/librsvg
- media-gfx/potrace
- )
- tiff? ( media-libs/tiff:0= )
- truetype? (
- media-fonts/urw-fonts
- >=media-libs/freetype-2
- )
- webp? ( media-libs/libwebp:0= )
- wmf? ( media-libs/libwmf )
- X? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libXext
- x11-libs/libXt
- )
- xml? ( dev-libs/libxml2:= )
- lzma? ( app-arch/xz-utils )
- zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
- !media-gfx/graphicsmagick[imagemagick]
- X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
-
- # Apply hardening #664236
- cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
- sed -i -e '/^<policymap>$/ {
- r policy-hardening.snippet
- d
- }' \
- config/policy.xml || \
- die "Failed to apply hardening of policy.xml"
- einfo "policy.xml hardened"
-
- 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
- shopt -s nullglob
- ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
- if test -n "${ati_cards}"; then
- addpredict "${ati_cards}"
- fi
- mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
- if test -n "${mesa_cards}"; then
- addpredict "${mesa_cards}"
- fi
- nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
- if test -n "${nvidia_cards}"; then
- addpredict "${nvidia_cards}"
- fi
- render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
- if test -n "${render_cards}"; then
- addpredict "${render_cards}"
- fi
- shopt -u nullglob
- addpredict /dev/nvidiactl
-}
-
-src_configure() {
- local depth=16
- use q8 && depth=8
- use q32 && depth=32
-
- local openmp=disable
- use openmp && { tc-has-openmp && openmp=enable; }
-
- use perl && perl_check_env
-
- [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
- local myeconfargs=(
- $(use_enable static-libs static)
- $(use_enable hdri)
- $(use_enable opencl)
- --with-threads
- --with-modules
- --with-quantum-depth=${depth}
- $(use_with cxx magick-plus-plus)
- $(use_with perl)
- --with-perl-options='INSTALLDIRS=vendor'
- --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
- $(use_with bzip2 bzlib)
- $(use_with X x)
- $(use_with zlib)
- --without-autotrace
- $(use_with postscript dps)
- $(use_with djvu)
- --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
- $(use_with fftw)
- $(use_with fpx)
- $(use_with fontconfig)
- $(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)
- --without-jxl
- $(use_with lcms)
- $(use_with lqr)
- $(use_with lzma)
- $(use_with openexr)
- $(use_with pango)
- $(use_with png)
- $(use_with raw)
- $(use_with svg rsvg)
- $(use_with tiff)
- $(use_with webp)
- $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
- $(use_with wmf)
- $(use_with xml)
- --${openmp}-openmp
- --with-gcc-arch=no-automagic
- )
- CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
- # Install default (unrestricted) policy in $HOME for test suite #664238
- local _im_local_config_home="${HOME}/.config/ImageMagick"
- mkdir -p "${_im_local_config_home}" || \
- die "Failed to create IM config dir in '${_im_local_config_home}'"
- cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
- 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+=( "emake check" ) # Run tests
-
- for im_command in "${IM_COMMANDS[@]}"; do
- eval "${S}"/magick.sh \
- ${im_command} || \
- die "Failed to run \"${im_command}\""
- done
-}
-
-src_install() {
- # Ensure documentation installation files and paths with each release!
- emake \
- DESTDIR="${D}" \
- DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
- install
-
- rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
- dodoc {AUTHORS,README}.txt ChangeLog
-
- 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 {} +
- 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
-
- 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"
- EOF
-
- insinto /etc/sandbox.d
- doins "${T}"/99${PN} #472766
- fi
-
- insinto /usr/share/${PN}
- doins config/*icm
-}
-
-pkg_postinst() {
- local _show_policy_xml_notice=
-
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # This is a new installation
- _show_policy_xml_notice=yes
- else
- local v
- for v in ${REPLACING_VERSIONS}; do
- if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
- # This is an upgrade
- _show_policy_xml_notice=yes
-
- # Show this elog only once
- break
- fi
- done
- fi
-
- if [[ -n "${_show_policy_xml_notice}" ]]; then
- 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"
- elog " - PS2"
- elog " - PS3"
- elog " - EPS"
- elog " - PDF"
- elog " - XPS"
- fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.11.1.ebuild b/media-gfx/imagemagick/imagemagick-7.0.11.1.ebuild
deleted file mode 100644
index 5256a3f29d2f..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.11.1.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/7.0.11-0"
-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 )
- svg? ( xml )
- test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
- dev-libs/libltdl:0
- bzip2? ( app-arch/bzip2 )
- corefonts? ( media-fonts/corefonts )
- djvu? ( app-text/djvu )
- fftw? ( sci-libs/fftw:3.0 )
- 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 )
- lcms? ( media-libs/lcms:2= )
- lqr? ( media-libs/liblqr )
- opencl? ( virtual/opencl )
- openexr? ( media-libs/openexr:0= )
- pango? ( x11-libs/pango )
- perl? ( >=dev-lang/perl-5.8.8:0= )
- png? ( media-libs/libpng:0= )
- postscript? ( app-text/ghostscript-gpl )
- raw? ( media-libs/libraw:= )
- svg? (
- gnome-base/librsvg
- media-gfx/potrace
- )
- tiff? ( media-libs/tiff:0= )
- truetype? (
- media-fonts/urw-fonts
- >=media-libs/freetype-2
- )
- webp? ( media-libs/libwebp:0= )
- wmf? ( media-libs/libwmf )
- X? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libXext
- x11-libs/libXt
- )
- xml? ( dev-libs/libxml2:= )
- lzma? ( app-arch/xz-utils )
- zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
- !media-gfx/graphicsmagick[imagemagick]
- X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
-
- # Apply hardening #664236
- cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
- sed -i -e '/^<policymap>$/ {
- r policy-hardening.snippet
- d
- }' \
- config/policy.xml || \
- die "Failed to apply hardening of policy.xml"
- einfo "policy.xml hardened"
-
- 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
- shopt -s nullglob
- ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
- if test -n "${ati_cards}"; then
- addpredict "${ati_cards}"
- fi
- mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
- if test -n "${mesa_cards}"; then
- addpredict "${mesa_cards}"
- fi
- nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
- if test -n "${nvidia_cards}"; then
- addpredict "${nvidia_cards}"
- fi
- render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
- if test -n "${render_cards}"; then
- addpredict "${render_cards}"
- fi
- shopt -u nullglob
- addpredict /dev/nvidiactl
-}
-
-src_configure() {
- local depth=16
- use q8 && depth=8
- use q32 && depth=32
-
- local openmp=disable
- use openmp && { tc-has-openmp && openmp=enable; }
-
- use perl && perl_check_env
-
- [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
- local myeconfargs=(
- $(use_enable static-libs static)
- $(use_enable hdri)
- $(use_enable opencl)
- --with-threads
- --with-modules
- --with-quantum-depth=${depth}
- $(use_with cxx magick-plus-plus)
- $(use_with perl)
- --with-perl-options='INSTALLDIRS=vendor'
- --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
- $(use_with bzip2 bzlib)
- $(use_with X x)
- $(use_with zlib)
- --without-autotrace
- $(use_with postscript dps)
- $(use_with djvu)
- --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
- $(use_with fftw)
- $(use_with fpx)
- $(use_with fontconfig)
- $(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)
- --without-jxl
- $(use_with lcms)
- $(use_with lqr)
- $(use_with lzma)
- $(use_with openexr)
- $(use_with pango)
- $(use_with png)
- $(use_with raw)
- $(use_with svg rsvg)
- $(use_with tiff)
- $(use_with webp)
- $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
- $(use_with wmf)
- $(use_with xml)
- --${openmp}-openmp
- --with-gcc-arch=no-automagic
- )
- CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
- # Install default (unrestricted) policy in $HOME for test suite #664238
- local _im_local_config_home="${HOME}/.config/ImageMagick"
- mkdir -p "${_im_local_config_home}" || \
- die "Failed to create IM config dir in '${_im_local_config_home}'"
- cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
- 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+=( "emake check" ) # Run tests
-
- for im_command in "${IM_COMMANDS[@]}"; do
- eval "${S}"/magick.sh \
- ${im_command} || \
- die "Failed to run \"${im_command}\""
- done
-}
-
-src_install() {
- # Ensure documentation installation files and paths with each release!
- emake \
- DESTDIR="${D}" \
- DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
- install
-
- rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
- dodoc {AUTHORS,README}.txt ChangeLog
-
- 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 {} +
- 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
-
- 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"
- EOF
-
- insinto /etc/sandbox.d
- doins "${T}"/99${PN} #472766
- fi
-
- insinto /usr/share/${PN}
- doins config/*icm
-}
-
-pkg_postinst() {
- local _show_policy_xml_notice=
-
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # This is a new installation
- _show_policy_xml_notice=yes
- else
- local v
- for v in ${REPLACING_VERSIONS}; do
- if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
- # This is an upgrade
- _show_policy_xml_notice=yes
-
- # Show this elog only once
- break
- fi
- done
- fi
-
- if [[ -n "${_show_policy_xml_notice}" ]]; then
- 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"
- elog " - PS2"
- elog " - PS3"
- elog " - EPS"
- elog " - PDF"
- elog " - XPS"
- fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.11.2.ebuild b/media-gfx/imagemagick/imagemagick-7.0.11.2.ebuild
index 5256a3f29d2f..8f1725c766d6 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.11.2.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.11.2.ebuild
@@ -13,7 +13,7 @@ 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.11.0.ebuild b/media-gfx/imagemagick/imagemagick-7.0.11.3.ebuild
index 5256a3f29d2f..5256a3f29d2f 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.11.0.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.11.3.ebuild
diff --git a/media-gfx/meshlab/Manifest b/media-gfx/meshlab/Manifest
index e1899abc7efa..cd5dd83bb82e 100644
--- a/media-gfx/meshlab/Manifest
+++ b/media-gfx/meshlab/Manifest
@@ -2,5 +2,5 @@ AUX meshlab-2020.12-disable-updates.patch 1005 BLAKE2B 61fe405555be9a1170f0044ad
AUX meshlab-2020.12-find-plugins.patch 1117 BLAKE2B 0c17b35288543cc3b84040851f5bfb30977677254a60cb3410c2ef65d10febe648541828a1b16ac6ba4db6ac92cc087a6256923d936ffe2f069edbdb29decd14 SHA512 b57ebd412475f22624b1f211000a020dd00628f2d197ba25942874324a34d6ed14ddcbd28f9819adc523657352ac024f23852ba83d4663e4dce794e0be96340f
DIST meshlab-2020.12.tar.gz 111438055 BLAKE2B 4969c1f8f60be6ff55effd710c0bceb290ad6ac01153c233fd6a943f15e86189c04c06aa474ea89899d31b77d6960ffabbda6a12c3107d750469945e0c73c335 SHA512 0a00493f3e622a7bb0b70ddf0e1710376b47bd844aa785782a62f31a46ae1ee4b493c1e4ae0184f51f30be263f84efc0073e266d50748adc10ef229f107e4c87
DIST vcglib-2020.12.tar.gz 6777201 BLAKE2B 9e2e3eb4ae7b930a8a334d58ee4bdadaf43e9a031d523471d17ca39d241c0dd66ec846a360cbcccd53d8728a2c7a6b6fa7d7a3efc04c01515ac3366b10f01aa8 SHA512 d7eec0c9c847e6ade7a3bee9aa1cddbb6855c388b15e2b35889ce998ea9a1c7afb0034ec31c38de3cbc2d867c8d8a474b13e4e2e3218e636926967abe4e54924
-EBUILD meshlab-2020.12.ebuild 1362 BLAKE2B d0d008d4a3b99f2a6313491211e592b2f1ccd4d1d49245ed3d56491b5e2ab8d8018bd28c2ebb505cf35d2fec04f92353965e95ed0c23a9c60e2099e4057274c5 SHA512 2073981431d6defc5017b1670354e843f9f7af7b80806a1af2a9e48190e851a4f5162fc1952e2ed2a80b297149bb41b44919ca2254bc697d5a16373c74c65525
+EBUILD meshlab-2020.12-r1.ebuild 1393 BLAKE2B bce6473c47481ac39834727f9c70a47e183f4e8f59cd3b5f12f56e0f20df57d0420eecd87cc3a7fd1168ea9f245e2185c518a0b0d36cd0ee8a9efdf2f51136dd SHA512 5a94983f67bc81b226d3fe8937b8186b7f8a6dd0e1d463abe6327440fefdaf7bff3290b1e8e55b4bb2a67fd515ff7fee4acea49f115bb4a9474ba41f6f50ca6d
MISC metadata.xml 996 BLAKE2B 87e7bef17518f533f64493c8eed41dc3c5817ea14cd301945e3efee70712cef35267b39d2d7b0fea41e9f848cf3f140f454e474adee6747b366c843fc62e9455 SHA512 0fe24a2782373ff75e17d359c6db5aafc489f6bb6a3ad079a484e7b32177a4b613f4c8b8bee2bf6480271c7ead24cbcbae4052b6f6ccec8713cd87991e042448
diff --git a/media-gfx/meshlab/meshlab-2020.12.ebuild b/media-gfx/meshlab/meshlab-2020.12-r1.ebuild
index 03fbb0d1f0e2..f4ed995d10ca 100644
--- a/media-gfx/meshlab/meshlab-2020.12.ebuild
+++ b/media-gfx/meshlab/meshlab-2020.12-r1.ebuild
@@ -21,6 +21,7 @@ DEPEND="
dev-cpp/muParser
dev-libs/gmp:=
>=dev-qt/qtcore-5.12:5
+ >=dev-qt/qtdeclarative-5.12:5
>=dev-qt/qtopengl-5.12:5
>=dev-qt/qtscript-5.12:5
>=dev-qt/qtxml-5.12:5
diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index 3312307491a8..c1c304faf3e2 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -3,8 +3,12 @@ AUX openscad-2019.05-0001-Fix-build-with-boost-1.73.patch 827 BLAKE2B 3450919d7c
AUX openscad-2019.05-0002-Gentoo-specific-Disable-ccache-building.patch 820 BLAKE2B abfa2f4067dca1bdd2a1169cb3d9e1b4a804fa27bf8ec3a6a98106861713a3273f401a4e51c2fb8afab397b6326960609ae2700d0755b3b819ede749bc202b5e SHA512 87031a2f1b132434b349ead74e1e6d247f51ed48b0f2f8970dc99d9c47a441022ea169728302f680142325888433f07f4888a52727b31fda8e26e28d8b5d2100
AUX openscad-2019.05-0003-change-C-standard-to-c-14.patch 1961 BLAKE2B faa9a935b50b5ae05d79658c236e7662626624cb752637e3643105a8558ff0135435543c2fe0080aaecc702240f7c48ae516b17d7ce20dfda0f98923eb30e8b6 SHA512 aa64ed7eca1c49ffd7e6d0a67206033ea360e6fb3d8ef31a02617393624f6f0eb6021ab5d3b8f6ce147559e49575f99745d7ed6e566c0eb3376af00bc188f5d8
AUX openscad-2019.05_fix-boost-1.72.0-build.patch 689 BLAKE2B b8aea0ab3793b3f3202f7d4154c1aaca235de2450321958819531dd9dd70c1e375c28c9004a9fb348d5116815e99e4190efd2443057991b2e97873c80f52cc80 SHA512 20bc2baf50f23e6b5ccce0d8c22eb3a5004198a0c97c8c955b15a681a64102537be35a12a37692418159de6664a36689a4c3b65b3a520d51ab086aa091a1e48c
-AUX openscad-9999-0002-Gentoo-specific-Disable-ccache-building.patch 822 BLAKE2B ae4c7dc441e5a7391ecd2e704c644877fa7d73f8900fbe6082e070a3d9ecce74f368ead39be3f0321fb47095becf60057fafdee2a5e961106402dffff73687be SHA512 7bae2af4c627cc2f465e75890284bcca8e738dcbe5accf0511fcca2ee845ce9ef5602b752d61ecab7afd92f3a45975287db4e42379ede7875123a8c0a721f2c3
+AUX openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch 790 BLAKE2B b08a024f81a29d7fb4e0860977b814d2ec6ce6dcbf8ab87655f5d36f51ea3bbce6559369363c33ca7593cbc3284de920f71be3c38e3ab7b5efa83d3466132b79 SHA512 2af887d7b085c49203e72ad41cb5c0e32b772a8abd35843485434cb11b263ba8a727a0ebc34c7138bff1e6852245f2bdaf7d91711184a5f16ed22603578a0892
+AUX openscad-2021.01-0002-fix-to-find-lib3mf-2.patch 1396 BLAKE2B a43872dd83427f28a48528fbac534924796db769bd0213ba1b6fca41a65c766aa3355aa9ee3f7d68dcbbf3d578cee984f2ad61f599fdf9551ef55724f460f4db SHA512 ffbf402976054c1e7294a0d661e0648bdb359cf57e676d818cf1140644b7a0d0943f5adf1d2f511ad17ca45a35e31785aae584dc7607f13bfc9d94795fc3812b
+AUX openscad-9999-0001-fix-to-find-lib3mf-2.patch 1317 BLAKE2B f8e42492d2a85fc8ac3c9c6dd985c786051e2e398c875bfff2796229d269947ed7a00306511f02881d15ceb4cad6e45e7cacb43950e25311a8f8a5be0ac89dd2 SHA512 71ef3b68183175796c1bda50e9a65da9770d0fb1fcd6b6ce60e52efede2e11322e487cf363b8af6418bd7e59ddb5add5abfde5c84d09feca7ddca0c84672f017
DIST openscad-2019.05.tar.gz 14604881 BLAKE2B ed7d6088606fab44284363da73643e556f07c0f0a7a223bdf718dcc36a82158bf23e315724ea520d63a3f1331207df0ea7b0ade817f01dd39b67ca6f36529d56 SHA512 073053f625ffa4fea6ed836396b7ff4b87b26cf7500b06c804983afc0f1dfd3d78bfb81b3fd217c3939b0ec915d85b0c7990773eaf968512a150deaa0399df13
-EBUILD openscad-2019.05-r4.ebuild 2367 BLAKE2B 4a9b006bc60734400c5a36eecf6442abbfe7e9c2cc350288512c076e1ae6df57221e6dc276ddc42e09f482760f7f33b8f07c369e42c83c6dfe2aa33579d522a6 SHA512 147a412cf8b13459737d9f296a55d7c59d5ad92075fb5a747b7a05a5914d200a9ab7ff69888ec464b1797871ef0ba63b069f58b980556170624f6d04479c3f57
-EBUILD openscad-9999.ebuild 1900 BLAKE2B b7da0c8a17bcc88faa4c9367b4a664a8f58aafe8177d984001fd23ab0ea39f00f40349963691d4aa667d994761c7f60ee7bf0104c023ab43d85e51bde4349b4d SHA512 6378969e22ca27c2ef80928559b2f122e4b86df35a3858ae70537782b1f9209951fa34c55bd791f10cc23a9f0572a6305ba854f3270e4ea11eb045058e9c5b77
-MISC metadata.xml 1131 BLAKE2B 5ac140803c4f9b522ccb4649a1247323a10d397885c0ae780379483832dc85a6c4d50ee3cf6c85dced42aa0debcaa559039f7c911eda7630cbd11a13c3440c96 SHA512 1f5a48746b34e61dd451ec8bd6fb9b3678ce9901e4ca8784dac19eeaea5e7e1bc636b6d9c528bf06af1aed1fb37a5d1e6b190b465b6170cd713f494874e8a807
+DIST openscad-2021.01.tar.gz 15817555 BLAKE2B 417857d704fa3c14312641ebda983eb85a1e3bc0d517a235fa3bd2523fce6f93c1ea526c330179bc35f03e6c73d3cd7c4c57cd71480088c21bfc99bb020ab7cd SHA512 8deaa26bf4c295c12da38f323d2b2e6f827851337f5bc1cc9c79afc083c9f913c19a263086e6e853bf2c8434c1ccc705ea22ddb02dc99d39bb1e5e03fc58d128
+EBUILD openscad-2019.05-r5.ebuild 2370 BLAKE2B c467ccc9cc544545b780d915611f04e5db32bbd6eb106d140c45400bdc9979ee55459e1fcce1286c3b95b9b043b001fdbb40af24ad97684c1693f4cc7a7fbc46 SHA512 9b525433b12e4d125cb568032fca3d1b8a7ab699b4887e7b84172776973d965861046c6b1fa7c19439118220bd0cb585bf5f6ae81f51700cbe7d8c6aacab7b11
+EBUILD openscad-2021.01.ebuild 2314 BLAKE2B a9b9faf82fa7212da43685b7feec011d7cadf983a4da8141820ab06423d21734c377be62e426f86d090b39092f4976f03aaebcdf2d3669552f897065ef5fb73a SHA512 a9f2d5affe0d715fc22641c71f034383428012f0ec4f77711db20684e7dcce26c26f4609b050402e76a0e7e78a88c7c619bbfebe7036a99375d31fd62c442700
+EBUILD openscad-9999.ebuild 2711 BLAKE2B 8ffeccfc4b473f47f7d787ec8c942d91b483aa9ee73e104a40c117c5bd35304c810b397f46438c879e416739b8586c35ba5af76f6c4fea92e37fdaef47294aac SHA512 c74b01903711779da96d591b11ef346279b3f8958c96d2c71b17fc65094e42a3b1e684666cd30883d5ea5ec6dd50bea59550911f9a1460cb399f9ec101b3a8f4
+MISC metadata.xml 1402 BLAKE2B df38615dd73f29faad439e184a2cb6a85cc3ffddf17e3bc1d1bd82e6cb44c2a65c27ebc351d21dd7bd63448bdb5d9d4013eeb8a357b6d8a9ac7c8cac870e7bcd SHA512 bfe1861a4e2d50805f21eeb2ddec537a623175bb8fb4b782d54b0ec669000cc9ed0627fc1fdb5ecb7550396f3e3328a7c06b0def031d6ee70cb3bcb0b20d6763
diff --git a/media-gfx/openscad/files/openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch b/media-gfx/openscad/files/openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch
new file mode 100644
index 000000000000..6de581078d27
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch
@@ -0,0 +1,32 @@
+From c138881767262b9f5c64a465a0e1e46ffcfc5899 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sun, 28 Feb 2021 16:51:30 +0100
+Subject: [PATCH] [Gentoo specific] Disable ccache building
+
+On Gentoo, we use a USE flag to determine whether ccache
+should be used for building.
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ openscad.pro | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/openscad.pro b/openscad.pro
+index b76ca76..678e08d 100755
+--- a/openscad.pro
++++ b/openscad.pro
+@@ -211,11 +211,6 @@ mdi {
+ DEFINES += ENABLE_MDI
+ }
+
+-system("ccache -V >/dev/null 2>/dev/null") {
+- CONFIG += ccache
+- message("Using ccache")
+-}
+-
+ include(common.pri)
+
+ # mingw has to come after other items so OBJECT_DIRS will work properly
+--
+2.30.1
+
diff --git a/media-gfx/openscad/files/openscad-2021.01-0002-fix-to-find-lib3mf-2.patch b/media-gfx/openscad/files/openscad-2021.01-0002-fix-to-find-lib3mf-2.patch
new file mode 100644
index 000000000000..1995bd6e0ac4
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-2021.01-0002-fix-to-find-lib3mf-2.patch
@@ -0,0 +1,43 @@
+From 16847a70cf05484a668d8f79aba4ccec7e16c025 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sat, 6 Mar 2021 22:59:17 +0100
+Subject: [PATCH] fix to find lib3mf-2
+
+The pkgconfig file for lib3mf has been renamed in case
+for lib3mf-2 versions.
+This patch uses the news names.
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ features/lib3mf.prf | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/features/lib3mf.prf b/features/lib3mf.prf
+index 2c512da..47be364 100644
+--- a/features/lib3mf.prf
++++ b/features/lib3mf.prf
+@@ -15,8 +15,8 @@ isEmpty(LIB3MF_LIBPATH) {
+ }
+
+ isEmpty(LIB3MF_INCLUDEPATH) {
+- LIB3MF_CFLAGS = $$system("$$PKG_CONFIG --cflags lib3MF")
+- LIB3MF_INCLUDEPATH = $$system("$$PKG_CONFIG --variable=includedir lib3MF")
++ LIB3MF_CFLAGS = $$system("$$PKG_CONFIG --cflags lib3mf")
++ LIB3MF_INCLUDEPATH = $$system("$$PKG_CONFIG --variable=includedir lib3mf")
+ !isEmpty(LIB3MF_CFLAGS) {
+ ENABLE_LIB3MF=yes
+ }
+@@ -25,8 +25,8 @@ isEmpty(LIB3MF_INCLUDEPATH) {
+ }
+
+ isEmpty(LIB3MF_LIBPATH) {
+- LIB3MF_LIBS = $$system("$$PKG_CONFIG --libs lib3MF")
+- LIB3MF_LIBPATH = $$system("$$PKG_CONFIG --variable=libdir lib3MF")
++ LIB3MF_LIBS = $$system("$$PKG_CONFIG --libs lib3mf")
++ LIB3MF_LIBPATH = $$system("$$PKG_CONFIG --variable=libdir lib3mf")
+ !isEmpty(LIB3MF_LIBS) {
+ ENABLE_LIB3MF=yes
+ }
+--
+2.30.1
+
diff --git a/media-gfx/openscad/files/openscad-9999-0001-fix-to-find-lib3mf-2.patch b/media-gfx/openscad/files/openscad-9999-0001-fix-to-find-lib3mf-2.patch
new file mode 100644
index 000000000000..0ca19d33646b
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-9999-0001-fix-to-find-lib3mf-2.patch
@@ -0,0 +1,36 @@
+From 15bf93ab04e6fd61507f138bcfc6f9c770d9479b Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Thu, 11 Feb 2021 23:14:31 +0100
+Subject: [PATCH] fix to find lib3mf-2
+
+Lib3mf-2 uses lowercase name for it's pkg-config file.
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ cmake/Modules/FindLib3MF.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/Modules/FindLib3MF.cmake b/cmake/Modules/FindLib3MF.cmake
+index 7a1ee285..b062c09c 100644
+--- a/cmake/Modules/FindLib3MF.cmake
++++ b/cmake/Modules/FindLib3MF.cmake
+@@ -15,14 +15,14 @@ message(STATUS "Searching for lib3mf.")
+ # We still fall back to the rest of detection code here.
+ # Travis CI Ubuntu Trusty environment has some issue with pkg-config
+ # not finding the version.
+-pkg_check_modules(LIB3MF lib3MF)
++pkg_check_modules(LIB3MF lib3mf)
+
+ # default to uppercase for 1.0 library name
+ set(LIB3MF_LIB "3MF")
+
+ # some distribution packages are missing version information for 2.0
+ if (LIB3MF_VERSION STREQUAL "" AND LIB3MF_FOUND)
+- if (EXISTS "/usr/include/lib3mf" AND EXISTS "/usr/include/lib3mf/lib3mf_implicit.hpp")
++ if (EXISTS "/usr/include/lib3mf" AND EXISTS "/usr/include/lib3mf/Bindings/Cpp/lib3mf_implicit.hpp")
+ set(LIB3MF_VERSION "2.0.0")
+ endif()
+ endif()
+--
+2.30.1
+
diff --git a/media-gfx/openscad/files/openscad-9999-0002-Gentoo-specific-Disable-ccache-building.patch b/media-gfx/openscad/files/openscad-9999-0002-Gentoo-specific-Disable-ccache-building.patch
deleted file mode 100644
index ca21b9322e8e..000000000000
--- a/media-gfx/openscad/files/openscad-9999-0002-Gentoo-specific-Disable-ccache-building.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 8d6fd9c0896e513eec2da3c97cfd33a5ec09c148 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Sun, 17 May 2020 21:38:45 +0200
-Subject: [PATCH] [Gentoo-specific] Disable ccache building
-
-On Gentoo we use a USE flag to determine whether to use
-ccache for building or not.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- openscad.pro | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/openscad.pro b/openscad.pro
-index cc7f3569..8fbd3a5b 100755
---- a/openscad.pro
-+++ b/openscad.pro
-@@ -208,10 +208,10 @@ mdi {
- DEFINES += ENABLE_MDI
- }
-
--system("ccache -V >/dev/null 2>/dev/null") {
-- CONFIG += ccache
-- message("Using ccache")
--}
-+#system("ccache -V >/dev/null 2>/dev/null") {
-+# CONFIG += ccache
-+# message("Using ccache")
-+#}
-
- include(common.pri)
-
---
-2.26.2
-
diff --git a/media-gfx/openscad/metadata.xml b/media-gfx/openscad/metadata.xml
index 75aa20b67f16..3ccb815587c6 100644
--- a/media-gfx/openscad/metadata.xml
+++ b/media-gfx/openscad/metadata.xml
@@ -24,6 +24,16 @@
<flag name="ccache">
Use <pkg>dev-util/ccache</pkg> to speed up rebuilds
</flag>
+ <flag name="gamepad">
+ Add support for gamepads through <pkg>dev-qt/qtgamepad</pkg>
+ </flag>
+ <flag name="headless">
+ Build a binary without GUI
+ </flag>
+ <flag name="spacenav">
+ Add support for space navigator devices through
+ <pkg>dev-libs/libspnav</pkg>
+ </flag>
</use>
<upstream>
<remote-id type="github">openscad/openscad</remote-id>
diff --git a/media-gfx/openscad/openscad-2019.05-r4.ebuild b/media-gfx/openscad/openscad-2019.05-r5.ebuild
index 32ad22bf16f5..66fb9b68a87a 100644
--- a/media-gfx/openscad/openscad-2019.05-r4.ebuild
+++ b/media-gfx/openscad/openscad-2019.05-r5.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
media-libs/freetype
>=media-libs/glew-2.0.0:0=
media-libs/harfbuzz:=
- media-libs/lib3mf
+ <media-libs/lib3mf-2
sci-mathematics/cgal:=
>=x11-libs/qscintilla-2.10.3:=
emacs? ( >=app-editors/emacs-23.1:* )
diff --git a/media-gfx/openscad/openscad-2021.01.ebuild b/media-gfx/openscad/openscad-2021.01.ebuild
new file mode 100644
index 000000000000..5a5a5f2805dc
--- /dev/null
+++ b/media-gfx/openscad/openscad-2021.01.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp-common qmake-utils xdg
+
+SITEFILE="50${PN}-gentoo.el"
+
+DESCRIPTION="The Programmers Solid 3D CAD Modeller"
+HOMEPAGE="https://www.openscad.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="emacs"
+# tests are not fully working and need cmake which isn't yet
+# officially supported.
+RESTRICT="test"
+
+RDEPEND="
+ dev-cpp/eigen:3
+ dev-libs/boost:=
+ dev-libs/double-conversion:=
+ dev-libs/glib:2
+ dev-libs/gmp:0=
+ dev-libs/hidapi
+ dev-libs/libspnav
+ dev-libs/libxml2
+ dev-libs/libzip:=
+ dev-libs/mpfr:0=
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5[-gles2-only]
+ dev-qt/qtmultimedia:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtopengl:5
+ dev-qt/qtwidgets:5
+ media-gfx/opencsg
+ media-libs/fontconfig
+ media-libs/freetype
+ >=media-libs/glew-2.0.0:0=
+ media-libs/harfbuzz:=
+ media-libs/lib3mf
+ sci-mathematics/cgal:=
+ x11-libs/cairo
+ >=x11-libs/qscintilla-2.10.3:=
+ emacs? ( >=app-editors/emacs-23.1:* )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/itstool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${P}-0001-Gentoo-specific-Disable-ccache-building.patch )
+
+src_prepare() {
+ default
+ if has_version ">=media-libs/lib3mf-2"; then
+ eapply "${FILESDIR}/${P}-0002-fix-to-find-lib3mf-2.patch"
+ fi
+}
+
+src_configure() {
+ if has ccache ${FEATURES}; then
+ eqmake5 "PREFIX = ${EROOT}/usr" "CONFIG += ccache" "${PN}.pro"
+ else
+ eqmake5 "PREFIX = ${EROOT}/usr" "${PN}.pro"
+ fi
+}
+
+src_compile() {
+ default
+
+ if use emacs ; then
+ elisp-compile contrib/*.el
+ fi
+}
+
+src_install() {
+ emake install INSTALL_ROOT="${D}"
+
+ if use emacs; then
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ elisp-install ${PN} contrib/*.el contrib/*.elc
+ fi
+
+ mv -i "${ED}"/usr/share/openscad/locale "${ED}"/usr/share || die "failed to move locales"
+ ln -sf ../locale "${ED}"/usr/share/openscad/locale || die
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
index a718d9a9a8ac..433200d96c25 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-9999.ebuild
@@ -1,49 +1,58 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit elisp-common git-r3 qmake-utils xdg
+inherit cmake elisp-common git-r3 xdg
SITEFILE="50${PN}-gentoo.el"
DESCRIPTION="The Programmers Solid 3D CAD Modeller"
HOMEPAGE="https://www.openscad.org/"
+SRC_URI=""
EGIT_REPO_URI="https://github.com/openscad/openscad.git"
-LICENSE="GPL-2"
+# Code is GPL-3+, MCAD library is LGPL-2.1
+LICENSE="GPL-3+ LGPL-2.1"
SLOT="0"
KEYWORDS=""
-IUSE="ccache emacs"
-RESTRICT="test"
+IUSE="cairo dbus emacs gamepad headless spacenav"
+RESTRICT="test" # 32 out 1300+ tests fail
+
+REQUIRED_USE="
+ headless? ( !dbus !gamepad !spacenav )
+"
RDEPEND="
dev-cpp/eigen:3
dev-libs/boost:=
dev-libs/double-conversion:=
dev-libs/glib:2
- dev-libs/gmp:0=
- dev-libs/hidapi
- dev-libs/libspnav
+ dev-libs/libxml2
dev-libs/libzip:=
- dev-libs/mpfr:0=
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5[-gles2-only]
- dev-qt/qtmultimedia:5
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtwidgets:5
media-gfx/opencsg
media-libs/fontconfig
media-libs/freetype
- >=media-libs/glew-2.0.0:0=
+ media-libs/glew:0=
media-libs/harfbuzz:=
media-libs/lib3mf
sci-mathematics/cgal:=
- >=x11-libs/qscintilla-2.10.3:=
- emacs? ( >=app-editors/emacs-23.1:* )
+ virtual/opengl
+ cairo? ( x11-libs/cairo )
+ emacs? ( app-editors/emacs:* )
+ !headless? (
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5[-gles2-only]
+ dev-qt/qtmultimedia:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtopengl:5
+ dev-qt/qtwidgets:5
+ x11-libs/qscintilla:=
+ dbus? ( dev-qt/qtdbus:5 )
+ gamepad? ( dev-qt/qtgamepad:5 )
+ )
+ spacenav? ( dev-libs/libspnav )
"
DEPEND="${RDEPEND}"
BDEPEND="
@@ -52,27 +61,45 @@ BDEPEND="
sys-devel/flex
sys-devel/gettext
virtual/pkgconfig
- ccache? ( dev-util/ccache )
"
-src_prepare() {
- default
+DOCS=(
+ RELEASE_NOTES.md
+ doc/TODO.txt
+ doc/contributor_copyright.txt
+ doc/hacking.md
+ doc/testing.txt
+)
- # fix path prefix
- sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
-
- # disable ccache
- if ! use ccache; then
- eapply "${FILESDIR}/${P}-0002-Gentoo-specific-Disable-ccache-building.patch"
+src_prepare() {
+ if has_version ">=media-libs/lib3mf-2"; then
+ eapply "${FILESDIR}/${P}-0001-fix-to-find-lib3mf-2.patch"
fi
+ cmake_src_prepare
}
src_configure() {
- eqmake5 "${PN}.pro"
+ local mycmakeargs=(
+ -DCLANG_TIDY=OFF
+ -DENABLE_CAIRO=$(usex cairo)
+ -DENABLE_SPNAV=$(usex spacenav)
+ -DENABLE_TESTS=OFF
+ -DHEADLESS=$(usex headless)
+ -DUSE_CCACHE=OFF
+ )
+
+ if use !headless; then
+ mycmakeargs+=(
+ -DENABLE_GAMEPAD=$(usex gamepad)
+ -DENABLE_QTDBUS=$(usex dbus)
+ )
+ fi
+
+ cmake_src_configure
}
src_compile() {
- default
+ cmake_src_compile
if use emacs ; then
elisp-compile contrib/*.el
@@ -80,24 +107,30 @@ src_compile() {
}
src_install() {
- emake install INSTALL_ROOT="${D}"
+ DOCS+=( doc/*.pdf )
+ cmake_src_install
+
+ mv -i "${ED}"/usr/share/openscad/locale "${ED}"/usr/share || die "failed to move locales"
+ ln -sf ../locale "${ED}"/usr/share/openscad/locale || die
+
+ rm -r "${ED}"/usr/share/openscad/libraries/MCAD/.{git,gitignore} || die
if use emacs; then
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
elisp-install ${PN} contrib/*.el contrib/*.elc
fi
-
- einstalldocs
}
pkg_postinst() {
use emacs && elisp-site-regen
xdg_desktop_database_update
+ xdg_icon_cache_update
xdg_mimeinfo_database_update
}
pkg_postrm() {
use emacs && elisp-site-regen
xdg_desktop_database_update
+ xdg_icon_cache_update
xdg_mimeinfo_database_update
}
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index d92748d2f34d..bc57e8b465d4 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -16,6 +16,6 @@ DIST openvdb-7.1.0.tar.gz 1956052 BLAKE2B 7778d67bcc65ecb17b86f6e67a9e5f2d6574de
EBUILD openvdb-4.0.2-r4.ebuild 2619 BLAKE2B 33f31d97f1597c29d1186193ed501c07ed265770d191226abc6d2670fae8878ff8d4314b2b33788b9e638dc6a495aeb25304da2775179981a7916b03df68db47 SHA512 5af992b65fff0ecd20b38f1858b26252bf24c7595236cd9dd0434cc50af6994a88250d103c2708d80422a9a2b5435552a8a1d73c73a3772d2d4b94a058d844ca
EBUILD openvdb-5.2.0-r2.ebuild 2417 BLAKE2B eeaa6be3d881283150098057b3f994b5380b64a51f99ed1aecde37c7e3c159e55089dce55eaad0eee735a29ca2206f1888977d4db667141311261ee0e1e5920d SHA512 0b7496c770dc053750d720e18cab541dca4f01171adbd4a6d47877645ea26195ac8cfca9816cede88c2c1187010541648a0333def582c31d4654ed5101834745
EBUILD openvdb-6.2.1-r1.ebuild 2293 BLAKE2B 80218e96b43e30642a1cd47f11663ffb81d4383532a84f81c642ea5a6573bae1fce38d3a018c17d8b9a832dc0697e2d63ee1352e7030f09232149aa159b8c49c SHA512 40dc6ed45e3801eea4324da01828b7ea119e4e27888e5376cc249727a7fb07c03e1db90aeeca23964cfb39f47b098ac4b39941a1be20774dcde521e8d7d97ef3
-EBUILD openvdb-7.0.0-r1.ebuild 2798 BLAKE2B a4b1e250d372b316c290c6d43f28a71818f359aee6032aef9490a67734696e1b95ed536121959c8e168407a2a070996985887cc80a4e0b576c7830316c3979dd SHA512 f7afc00343187dbd734cfd06a8ebc1fd094dbb81ef07593b49e4215adc3ea4c9ea51cf8b74254a418c6bf841c32b006ffa109119bc701f63bf61f62fe5165743
+EBUILD openvdb-7.0.0-r1.ebuild 2805 BLAKE2B 077df7ddf81711bafc1021cd9255fa7e8413fd2d97c3a824f11145b1faafa5f6d2bb2c1e3731a6ed993b1a0b0603feed02a4d801c9d162a2fb2e53942549f3eb SHA512 a8917f92a8cd316a3dc49c784707ba63692251141aad32821465e5d46b8033c00906e426a54adba9402a56d946ebe8cbb5522625239c35cc16e0d2d7cde3338f
EBUILD openvdb-7.1.0-r1.ebuild 2735 BLAKE2B 0e9347c59b0f1404db23e63635a4c3fdda3be0d34bda329de8b65507a3037692206a3d0573984bee7a9f937d5c9f425decd94b00214001e8792317af45f39b1b SHA512 2ce5ea094c66437efdd17279a3a2740cfab364775cede0986e9a65e35871cf90cb443c354b6590f82153b2d4acaadb0bfb44f8b2a72b632be64640e5094d7a15
MISC metadata.xml 1660 BLAKE2B 56a7113ef4e645a3a508d025f36129c78be342117583f9cc8ba3ffda2518b04bba3d928ad1fa9e78a601a0f1d216bc1744795c170a6cd3421f22c8754f192a98 SHA512 f5e21ebf80b7179b6bd041bcdf5cc53c4aab3cf99f829d9e26e56f3eea40a9d67edf8ec09d63a39b5e1a231df9d2e57b40e008786d25ee00e8ff2ca0ab0c399d
diff --git a/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild b/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild
index 4fd0ea08306b..21735fd515a3 100644
--- a/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild
+++ b/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.g
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 doc numpy python static-libs test utils abi5-compat abi6-compat +abi7-compat"
RESTRICT="!test? ( test )"
diff --git a/media-gfx/pngcrush/Manifest b/media-gfx/pngcrush/Manifest
index fb5c976065a0..b0554c681a9e 100644
--- a/media-gfx/pngcrush/Manifest
+++ b/media-gfx/pngcrush/Manifest
@@ -1,4 +1,3 @@
DIST pngcrush-1.8.13-nolib.tar.xz 66104 BLAKE2B dad0bce2e8f2a135d085343da98ebecfb78a6b05019d43be1b0b1f940ce23ffa980bcb08e8948b6b8cc3efc04bc6ae92a0b9cf8ea8183e27eebfae4c6c48e31e SHA512 c073d573e9b13b72fa39b178271ce65d1a19fef35943ef0a9e6121a5c66d9db212aaad38ab777c5b44e20a107eb677003acbdb4a354bcb2dc40f535a97d9df0e
-DIST pngcrush-1.8.13.tar.xz 404564 BLAKE2B 6e3e9556b40f5616a488cd4d0fbbe788b31d965b748222383741e9dc0c8fe7c12880b2d2a39ef35aa41adbab1fa9f49e7272dadfbe74cc712a7b810a9787d9af SHA512 5fdb7913ec8c90af63d68477f4031c9008dac0d7f4bfd7bd47e971d218e3ef8b0e1a8bf6ba0f5d2cc4c2682c9297efb4f738b11538ad306eee5d01277ce3f628
-EBUILD pngcrush-1.8.13.ebuild 841 BLAKE2B ce17d0b700d15988c1fb6ca53a0ae0243cc12e2395d25f0886b7f7cf602e1b47d7fbe3e5d118caddfdb3d77e34ff920fc9942bd16a0dbba9d18f3523fbcf90a3 SHA512 8e2e674d1341462d4cdc3fc3c19de79a09319d5b7bda36b7c5b6ee730f71b27ae8694e295879ec9e50189e82d2d2682333afc1efa0d15f0e27e4fe6bdddc4cbb
-MISC metadata.xml 584 BLAKE2B c72f94d85607da1692a3cbde638df27677ed0e5a6ed3db8ac8df0254625e888ccb3bd5a4d412e83388f4be904dad5aeb950acfcc783ec7c18efbcb81080b9ab6 SHA512 d688f54bfe67a570b86fa61bca6ca93330a2cace31dddf619aabbbd72ec5d81fe3303c9837f01e79ed9bdf3e4f8a2bbc997ae968c33df7cf0a0985914cee2de1
+EBUILD pngcrush-1.8.13.ebuild 735 BLAKE2B d967fe468e6b852ee6982221bf42ff34a7494fee31677bacf585d30a4e33a05bb087a46607061fc9b0638e70b3c4c059e75e64db1c04fe7aab6b2d81b6d00c9b SHA512 28efe8f74e071ec5b6dce77114d4b2fc0d55e29ef0ffa3f3519a4722bb84e607baaa7de958c9f4746d9b0fb6d839d8a388a33bb38c2a4c895e9ac48556973d28
+MISC metadata.xml 496 BLAKE2B 82f643a07a4a3e7e3dd7e1cd52e36c66f0b945fdcfb6ec423220cce5286f76fe3ccce7c2d20e33259c7688320ba252914bf7b29dae0b59fcc0e9e4cd1c204745 SHA512 6991a3d0f64d838920ab4828f762f7304efdea7df088f87e57dca0315708813d223af9fe831f0c8eddde6462f4f3b6dada6e4b1903bf2d772352bf1ec7ce78ec
diff --git a/media-gfx/pngcrush/metadata.xml b/media-gfx/pngcrush/metadata.xml
index 5081ca62df6c..fd6dd7f9aac7 100644
--- a/media-gfx/pngcrush/metadata.xml
+++ b/media-gfx/pngcrush/metadata.xml
@@ -13,7 +13,4 @@
<bugs-to>https://sourceforge.net/p/pmt/bugs/</bugs-to>
<remote-id type="sourceforge">pmt</remote-id>
</upstream>
- <use>
- <flag name="system-libs">Use libpng and libz provided by system</flag>
- </use>
</pkgmetadata>
diff --git a/media-gfx/pngcrush/pngcrush-1.8.13.ebuild b/media-gfx/pngcrush/pngcrush-1.8.13.ebuild
index 0d7eb8c3b769..5f8886dfc50a 100644
--- a/media-gfx/pngcrush/pngcrush-1.8.13.ebuild
+++ b/media-gfx/pngcrush/pngcrush-1.8.13.ebuild
@@ -2,29 +2,23 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
+
inherit toolchain-funcs
DESCRIPTION="Portable Network Graphics (PNG) optimizing utility"
HOMEPAGE="https://pmt.sourceforge.io/pngcrush/"
-SRC_URI="system-libs? ( mirror://sourceforge/pmt/${P}-nolib.tar.xz )
- !system-libs? ( mirror://sourceforge/pmt/${P}.tar.xz )"
+SRC_URI="mirror://sourceforge/pmt/${P}-nolib.tar.xz"
LICENSE="pngcrush"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="+system-libs"
-
-RDEPEND="
- system-libs? (
- media-libs/libpng:0=
- sys-libs/zlib:=
- )"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="media-libs/libpng:0=
+ sys-libs/zlib:="
DEPEND="${RDEPEND}
app-arch/xz-utils"
-pkg_setup() {
- use system-libs && S+="-nolib"
-}
+S="${WORKDIR}"/${P}-nolib
src_compile() {
emake \
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index efd5c74587ab..ded96e431af4 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,5 +1,5 @@
DIST shotwell-0.30.10.tar.xz 6465992 BLAKE2B d6be2a2b34cf4adbae4ac1f2bce5a29bfe059c546b8ab76f35b3ac9159a9233f231ee1ac4b3f81e8016278fcdec6b222af3ba7a62b2eb8d15dd82ef2cfb544c1 SHA512 4c84b5702476f264bd475fa93eff2e58f2876b076f186fc19b3dbddaae76b80485793b887f668788ac3c7f7230eb0c6a61fef2c0c70d52c665d0e49f6deb0b11
DIST shotwell-0.30.11.tar.xz 6499416 BLAKE2B 8b63b2ff64ae41560221d9bcca2c88d0dff8c40416278d3344dbdbf50e4352e999e3ae52ea9fbcc871d5023ffeeb6ee954ee91a2d7eddc1a8f1df45dc4e12cf8 SHA512 71a057aa1ae2b432f385e174429e29f46ca29055aa6003b6017f3da54551027536c70e9f8ca605719e8e008233bdb6f17981462a54495d91e94aebdbe5718c9f
EBUILD shotwell-0.30.10.ebuild 1768 BLAKE2B 0330351fb22d25299ffeffbfd1d202d2fad725619157fe0ebfae5859f5a6ddcb5fea9c845d7c41d990d8f1205dbf36c99600a1f707a2ac1c202a38de3742ab01 SHA512 46dac08f76651649c187833065dd1ce7829f42f4ddb84e829bacaa25eb7ab5d9f22397f392ca1e60e796940490b396e461c93c08e1289f1085725d842643f29e
-EBUILD shotwell-0.30.11.ebuild 1771 BLAKE2B 547d2bf462331d8b50eb2df2eaaf71bd1fab2ec7816d8e3e4b01317c0c6617b136f6ffcbfdd66235b85fe1924e6a59f9a93cbb6cff12b3bea1a243fefccf8d1f SHA512 4c0cc1fd43a65f197a906398a7022efb76811c417ca0eabe84de48771da6a2eb235aaaef5b678dc98638a958945996ec44e68ad95d56a2ea7fbbbea5058fd882
+EBUILD shotwell-0.30.11.ebuild 1770 BLAKE2B e303b726fe6ecc295eaabcc65efe9d044dac4a51e0d51de54145d02aac7a9d2f790552b20549d76b1fe4bb5b22eaf008c7c5801ca4cd5767219f022ad520cb34 SHA512 e26e678c2cdd099df62e9e0782dde73883eea688a32a633871bd1c416b2b9a8f21fe51bec6eab482039392de678ba03ee90e4a63a4c4b9737e8aed286d9de03d
MISC metadata.xml 795 BLAKE2B 4b5da2cc205b128a0cb9d10a50c3743b8d12302d266e37d5e0479915824af75af8c22b7b12ffca57146aa0a999e2bff3d7c4969af9e19f317a70b9195b02333f SHA512 d3ceceeed90fd4cadd5e212d047b3d6f7882860d145cb80521a4db8e9baaf461910ff70cb5bb2c1cda991939bf2c8917bb7f252bf68c7487d40271b0419c6322
diff --git a/media-gfx/shotwell/shotwell-0.30.11.ebuild b/media-gfx/shotwell/shotwell-0.30.11.ebuild
index b65b5be27d2a..5d0a000fcb6b 100644
--- a/media-gfx/shotwell/shotwell-0.30.11.ebuild
+++ b/media-gfx/shotwell/shotwell-0.30.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
IUSE="opencv udev"
DEPEND="
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 224530d69c5c..5aee0fa28219 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -2,5 +2,5 @@ AUX 3.26-add-control-optional-deps.patch 2773 BLAKE2B e6c3faa98ecda13c926752defe
DIST simple-scan-3.36.4.tar.xz 914688 BLAKE2B ae972cf6b5085d0e79fdfa9250aed655051b97239988b410e175b3058dda3ed5dc19b6574c015dd9a7afcbefd4d05cce6120b3648c061ff1e52043f866769a62 SHA512 780eeabd9593f14b2b04b9474bb1faebe3a32a7fd7e6b067c144fe44ad9b880f307bf80a8a925fb2549ca0b8172357c9a393146dfabd4b68bfc4396c32de4fa8
DIST simple-scan-3.36.7.tar.xz 914572 BLAKE2B dee363c08b0454bc6a4990fc14831069162f74365549a081421c286658cce130957b91030558d1232c979601be00e955996f702e8bafeeeb30710b89ee3e42c0 SHA512 ff0dd82d0db30dbfacfd8b04d7bcbc0599c1b1b47f845e1176ec7ffce0aa44253735431c2c531ef428dae0cee80818acfbba4fb2514f501623c0c0242aa8a7a2
EBUILD simple-scan-3.36.4.ebuild 1325 BLAKE2B d7a8eb204425d66cd2fb1aaad25a91a8d8c2ae153066f1a828bdd416c37d204f747119cb252e7f778d05be51fef3ea290e737bfcbc1f7c78e994ac9b933890d9 SHA512 6d211475e250bcaa86eb452669062a5727cfcc6285927b6ba61cba7c68e07a0c9d1dd826c5b2b9b43cc7861e21af090750641aaf53a8f97b4298fbad19a00e62
-EBUILD simple-scan-3.36.7.ebuild 1329 BLAKE2B 21944ee06e8464b55a1ff8240f6e0c8816fb736093614b698ba7a964e013214aec8c3c010867dc7c3d5ac6688d8a21cb2d0a457dcbfd033d0e41bc203551d908 SHA512 accbc4335878c4c83b2e9dd98821fd5594683456750f3f169d38c261f6c4410f9b09856cd2c78d84df50787f1aa70446704f5ef567a145a252569b2d7af19362
+EBUILD simple-scan-3.36.7.ebuild 1328 BLAKE2B 48f73d77aec818cd87b713512bca9e8bccf13a4eadc785f0bba38e0c975de6084d936d2a9dd371c62061cc6ce8f5b9c728b892767481cd27587ea77a27ce7390 SHA512 72ae614c26f849c5ad16e470ec1d4188fb3988786db9956d26d9339afd8f8fbd69531fd3763268d5d56c2a8ae353ab0fc5dee94407a56a8069cd5d0a3bb34400
MISC metadata.xml 616 BLAKE2B 576d986402f8cc708eae60f661640808751747c764d5fe729dd014f33758e0b484a2b80a214d9a3d1ed4bce7e455e34803a62048240e5de8e203184446cdc0df SHA512 6377cb9c20b1ce2db22ba959d386e4389939b72503d87da956d659144b8a6f8b521abdd19dd4c82ac0cb32e260ce6633b75136a353f63b86593f5e1f12394d47
diff --git a/media-gfx/simple-scan/simple-scan-3.36.7.ebuild b/media-gfx/simple-scan/simple-scan-3.36.7.ebuild
index a7a3d720bbeb..e1a51a707fde 100644
--- a/media-gfx/simple-scan/simple-scan-3.36.7.ebuild
+++ b/media-gfx/simple-scan/simple-scan-3.36.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
IUSE="colord webp"
DEPEND="
diff --git a/media-gfx/svg2rlg/Manifest b/media-gfx/svg2rlg/Manifest
index 76e4916e6283..f95d9142dd06 100644
--- a/media-gfx/svg2rlg/Manifest
+++ b/media-gfx/svg2rlg/Manifest
@@ -1,3 +1,3 @@
DIST svg2rlg-0.4.0.tar.gz 504861 BLAKE2B bfd147d824d5a49f8621e705f6bdeefdaa571918db94afea8e839d048d2089a8c8ebf8e2763caa9866f55a7142e1bb3522b01f53eaf5b8343164a08ee0983ef3 SHA512 e3813a22784c2199a1df69574c64093347a153fa2b7a40e2f38f52e5d46d7ca8d6e8e3bbe54ab59381f6c7246352c016ff3e19b1278c6f2c8dcfbe8bd7017b12
-EBUILD svg2rlg-0.4.0.ebuild 935 BLAKE2B 11635d0debe0fe4827612f9f7fb6c3e9b9974079eb69cd1f0cc55e74b7d5cc1cb2c65ae6992b0b5cb3f5ed0193b81a709e3ae2a89b8f68fd667d975a2b8a8170 SHA512 dcc6deb2b431162666ad6bbdcfd6d40503d86930f9ab9032ca62d14acbe84ef0fd023a9d9b2a8d73905fb8e6b8a966eefc593b1c08216a4b000154cef32fcd8a
-MISC metadata.xml 435 BLAKE2B 959a42ebbe8dcec9cb5617c869387268b1fbac950540fd47b2e0121a36dcd763c269ea26d09d617843aa2d665412fd677d1833a42d98cf3e33d6c9cdc82c2e55 SHA512 8b83221cf8e9bc87dc62da2f4a18b85afca886b62cd3cc742ef258d7e6e462a9abd23cbd497ca6236100302d0b483cf07e0a2b98d45c8687fcb10ef615a18846
+EBUILD svg2rlg-0.4.0.ebuild 936 BLAKE2B 2e0aebff38e5ab9c797c26f160d1ddf7d1cab3521d496d5b8c6cb87c9b9ffcf6c09b094fd242f9530a1c1fddd164d232be121a7addba7ffa0ea1b43e549ab734 SHA512 6023cae7de3ef7faa5755a763cb5c51b2d7e0664b873cd9091cb0532101e2dee3a297d286316b3b6b688e8a6dad4f13758e57fc2d7852db458a2269647afb423
+MISC metadata.xml 326 BLAKE2B d96665aae9ade2c5c20694df4c2b415d4d2932d5c00ae1eccb1282d29bab978e84a04ed8e55e1afe48b5880b6bc4d77553501e32251236b94201bb127b16f8d6 SHA512 e8eea3a85411a27856a2b6e5cf6386cc12cb452783c9efb707be3a7b801dfe2fe7d1a1081c61dc24980186551cc50a21f161a7202ff7d9f1f052c8310730ab1b
diff --git a/media-gfx/svg2rlg/metadata.xml b/media-gfx/svg2rlg/metadata.xml
index 3e0a25ba5a56..fd173a687384 100644
--- a/media-gfx/svg2rlg/metadata.xml
+++ b/media-gfx/svg2rlg/metadata.xml
@@ -5,9 +5,6 @@
<email>nerdboy@gentoo.org</email>
<name>Steve Arnold</name>
</maintainer>
- <longdescription lang="en">
- A tool to convert from SVG to reportlab graphics objects.
- </longdescription>
<upstream>
<remote-id type="github">sarnold/svg2rlg</remote-id>
</upstream>
diff --git a/media-gfx/svg2rlg/svg2rlg-0.4.0.ebuild b/media-gfx/svg2rlg/svg2rlg-0.4.0.ebuild
index 4e172fabb657..c3ccccf45533 100644
--- a/media-gfx/svg2rlg/svg2rlg-0.4.0.ebuild
+++ b/media-gfx/svg2rlg/svg2rlg-0.4.0.ebuild
@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
PYTHON_COMPAT=( python3_{7,8,9} )
DISTUTILS_USE_SETUPTOOLS=rdepend
diff --git a/media-gfx/viewnior/Manifest b/media-gfx/viewnior/Manifest
index 2f8eb58b90c5..89d649e091e4 100644
--- a/media-gfx/viewnior/Manifest
+++ b/media-gfx/viewnior/Manifest
@@ -4,5 +4,5 @@ DIST viewnior-1.6.tar.gz 168966 BLAKE2B 1a04ec6ee4e05da8d0721115826d2550c7d24b42
DIST viewnior-1.7.tar.gz 165719 BLAKE2B 906ab0b632fcc102ac62dd77d6742c2121c46cd92adc0dfe9ba772bf697eff356519dbb6219016a6470903c855aa4c9081f0d61ca1607d8d1b6d8e03236a19bc SHA512 5ba17d7b5ceeffa65b04213f179c1439b09ac44e412e0750dde159b118a714f28d3a290509a402b234e4e7ba5b185fc73eef65d418598f344911e4e2c1373fe5
EBUILD viewnior-1.6.ebuild 932 BLAKE2B 421cec0425ef6008090cdea7df88f90c45641f0a26355fcedaaf86c9f11f797cdcdcded489c233ca128ed87dd0863f1965013899c6421584f44d6d7e1dbb5d18 SHA512 847f9cd4e8c24460e77df21e99899507f2adf634fdc605bf3884ba0ba317b84e468218ce5f0b46a6d96b8b6c94966c0dd0b170d330cd22ba2c4069bcd4529303
EBUILD viewnior-1.7-r1.ebuild 1279 BLAKE2B 4302bd5b94b27ff3e5b0f8db78a3f5e7fc092a7f861c3edec053f050368b136b44d19ae151331c4f4a7c915d56c5609fda2099c075fb2e3a944e7ecd598b7a35 SHA512 c974ab91c7110447b9d51a2e6a0481730452bfd8d3d0090ea6b631df0e890a3e0fbfb280e6836a28e01c1f26ecaf36b67ee848d9842bd1268e8f9e9949f3f2c9
-EBUILD viewnior-1.7-r2.ebuild 1169 BLAKE2B 242cbb29e603adc30d320265849cc5b48d75e174b7e1949c98d160aa9e75537afd48c86882208b2b6326dfb1c27c49b4b3b943f1261c76c221d2497f427e7ff6 SHA512 aabf358b22d8258791f7f60ce062070bc9fe72f1c5f9cd8b2bb5281194b3bb5b2a21d38f8f1dcbe07e157366e62e3594fc2c3a9952c41b45fb96b6d0bf9d6f67
+EBUILD viewnior-1.7-r2.ebuild 1167 BLAKE2B 138ed55bfa3439f8030218cb981459eeb4c5347e159f6628e7b22ec5a275892a1aafc85c8d19e34cafb0764284bb4001d7c25c22cdc53a3dc762b8e63a72051e SHA512 520c347b2388a4d31adbb90492ef32577223fa24bc4df6e3c05e316f9bc482ad424894054cf3424fd80d1fa17eef601211387cb70a460905eaba9a6405f08aef
MISC metadata.xml 522 BLAKE2B 3f08e8b96d95c32bc0c2265afa2b580b92258060f4964c9f595da738fe96814406f8d8cc67965b985b714abded06d848df43bbd9fb72641b1123bbe1fd6f348a SHA512 94a9310a1eb358b2468caf0c21a5d799b81049483443b87e0fd4abe644295390f1703ec1b7a58562db89b353632f682f555cec64f41969e3a3e90017cb5913da
diff --git a/media-gfx/viewnior/viewnior-1.7-r2.ebuild b/media-gfx/viewnior/viewnior-1.7-r2.ebuild
index 1c67cf68d566..10cdce44775a 100644
--- a/media-gfx/viewnior/viewnior-1.7-r2.ebuild
+++ b/media-gfx/viewnior/viewnior-1.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hellosiyan/${PN^}/archive/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE=""
RDEPEND="
diff --git a/media-gfx/yafaray/Manifest b/media-gfx/yafaray/Manifest
index cd7414fb4ce6..82b7081f1d17 100644
--- a/media-gfx/yafaray/Manifest
+++ b/media-gfx/yafaray/Manifest
@@ -1,4 +1,6 @@
AUX yafaray-3.4.1-0001-Respect-user-pre-defined-CXXFLAGS.patch 1160 BLAKE2B 2145d744a269b25dad27b78afb52baec14b23c7a90041263b907020145b51482165ccd4dd833c537dadd4ca0074cdd90fefb642d8fb3bb5853d37164f5e3f2eb SHA512 d6b327c887badb28685277487fcb76917206781aa5e1d6ebd0f6832a28d573945bca2cce5a0e856a1b573c103a696cf7b7b10a91bb6135649249e8ca143ff8fc
+DIST yafaray-3.5.1.tar.gz 1136455 BLAKE2B 6002f3b96f3626b83f57015eaf3ddd53dcb6b6fd863277912f7fec06e4f176ec81dc48b889a068e6259edf17727dd04d4b1bbc51b571bfe6aad5e48148201e2e SHA512 3ead4d8becd2d524aa5bb4bbde4b9d98b56f8a38d872e7aa49ba19081094406336def02e9bf1503e424ca8e6cade0db4b042214cea8f9345bd4fc542c9346dbe
DIST yafaray-core-3.4.1.tar.gz 1136077 BLAKE2B a2ce3945f52315084ee744ff4a6733255018196f0000ca6b1786fbd2ec49ade64cb62e98dfba95dca4dec361f47235d59a8c9bd95ee7d095214fc0afbdcb1ee4 SHA512 a9116273fbc2aaaadbc38a65b1eaaa502070ff06f8a2929e880714a9db57188e65cf319c20a3f96e08146af36a67aea139709a633eb024be65319a64330e6f68
EBUILD yafaray-3.4.1.ebuild 3072 BLAKE2B 99207e9b3c330cc717af5649b951db81cedc259f27a18de0dd1092c9f895aa0ff1feec2cfc8eab2b24c32836b642fa2a0e5c85597f787ff2a35228f556189f23 SHA512 c3164f5fe95c9488a3dbd71bf81e724394dbc71a209153a89fbebff7345fe9102f5c2d8a316145b8359b868ebfd53120fd42de13b835dbac61421dd71d218cc0
-MISC metadata.xml 1048 BLAKE2B f05a3c07c3f5e1f9a11112c4053ff0685a5cdb72f242d3127cb0e20ede25e1076e22f326619c2a782441b66bdf12d48fb841049ef99e6cf1a7cbb68cd4e3a7c9 SHA512 640b4568d7d15b043747e644d0e75864f02934c93d99399086ff5afb1a0a01d6396de31207f9902afc5015065ee06618a87570cc53d6dd9f0c0611a027897c12
+EBUILD yafaray-3.5.1.ebuild 3033 BLAKE2B 30c47e083bb1b15226142ac35265d73745d1e6bcfd8b1b03f8d6834e6b1f6ce7230fe3f610b45e0360b905c9c23d86bd5c3536ba85fba41b44985cabe9905cf1 SHA512 a72113718e7cf63bdf5bb4116be027cbb61d121c988460754f239a6484ca62e0dab237784e9443856fccd640ba160ed9bc8783dde5b59b65f87d82bf6943aadd
+MISC metadata.xml 1060 BLAKE2B b9000a78998846ab5f48afbed71afe450edcafd0251e2fa1390719d766b74b803732916f943c458c56ec6e50db6a4f17c1bd298dbfd20bedf22307e8aa58bb48 SHA512 f61ba34063cc4bea75398a379a82f666f0b85b5d9f1ade9ec98b358ac7a758809fa4c7fd7f919ae10dc6f491b7b1d20ea062a0a1d77f051ad504925849ea8b69
diff --git a/media-gfx/yafaray/metadata.xml b/media-gfx/yafaray/metadata.xml
index 2c614e94cc33..1200537158aa 100644
--- a/media-gfx/yafaray/metadata.xml
+++ b/media-gfx/yafaray/metadata.xml
@@ -10,13 +10,23 @@
<name>Proxy Maintainers</name>
</maintainer>
<longdescription lang="en">
- YafaRay is a raytracing open source render engine. Raytracing is a rendering technique for generating realistic images by tracing the path of light through a 3D scene.
- An render engine consists of a "faceless" computer program that interacts with a host 3D application to provide very specific raytracing capabilties "on demand". Blender 3D is the host application of YafaRay.
+ YafaRay is a raytracing open source render engine. Raytracing is a
+ rendering technique for generating realistic images by tracing the
+ path of light through a 3D scene.
+ An render engine consists of a "faceless" computer program that
+ interacts with a host 3D application to provide very specific
+ raytracing capabilties "on demand".
</longdescription>
<use>
- <flag name="fastmath">Enable mathematic approximations to make code faster</flag>
- <flag name="fasttrig">Enable trigonometric approximations to make code faster</flag>
- <flag name="opencv">Use <pkg>media-libs/opencv</pkg></flag>
+ <flag name="fastmath">
+ Enable mathematic approximations to make code faster
+ </flag>
+ <flag name="fasttrig">
+ Enable trigonometric approximations to make code faster
+ </flag>
+ <flag name="opencv">
+ Add support for <pkg>media-libs/opencv</pkg> image processing.
+ </flag>
</use>
</pkgmetadata>
diff --git a/media-gfx/yafaray/yafaray-3.5.1.ebuild b/media-gfx/yafaray/yafaray-3.5.1.ebuild
new file mode 100644
index 000000000000..cca93fade785
--- /dev/null
+++ b/media-gfx/yafaray/yafaray-3.5.1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+# doesn't build with ninja when qt5 and python USE flags are both enabled
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake flag-o-matic python-single-r1
+
+DESCRIPTION="A free open-source montecarlo raytracing engine"
+# Regular homepage is currently down. Upstream is working on this.
+HOMEPAGE="https://www.yafaray.org https://github.com/YafaRay/libYafaRay"
+SRC_URI="https://github.com/YafaRay/libYafaRay/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/libYafaRay-${PV}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+fastmath +fasttrig jpeg opencv openexr png python qt5 tiff truetype"
+RESTRICT="test"
+
+REQUIRED_USE="
+ python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+# Note: according to upstream, the blender plugin doesn't work with >=blender-2.8 (yet).
+RDEPEND="
+ dev-libs/libxml2:2
+ sys-libs/zlib
+ jpeg? ( virtual/jpeg )
+ opencv? ( media-libs/opencv:= )
+ openexr? ( media-libs/openexr:= )
+ png? ( media-libs/libpng:= )
+ python? ( ${PYTHON_DEPS} )
+ qt5? ( dev-qt/qtwidgets:5 )
+ tiff? ( media-libs/tiff )
+ truetype? ( media-libs/freetype:2 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="python? (
+ ${PYTHON_DEPS}
+ dev-lang/swig
+ )"
+
+DOCS=( AUTHORS.md CHANGELOG.md CODING.md INSTALL.md README.md )
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ append-flags -pthread
+ append-ldflags -pthread
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ # enabling BLENDER_ADDON doesn't build anything, but set's some wierd
+ # installation paths, so keep it off and install the files manually.
+ -DBLENDER_ADDON=OFF
+ -DFAST_MATH=$(usex fastmath)
+ -DFAST_TRIG=$(usex fasttrig)
+ -DWITH_Freetype=$(usex truetype)
+ -DWITH_JPEG=$(usex jpeg)
+ -DWITH_OpenCV=$(usex opencv)
+ -DWITH_OpenEXR=$(usex openexr)
+ -DWITH_PNG=$(usex png)
+ -DWITH_QT=$(usex qt5)
+ -DWITH_TIFF=$(usex tiff)
+ -DWITH_XML_LOADER=ON
+ -DWITH_XMLImport=ON
+ -DWITH_YAF_PY_BINDINGS=$(usex python)
+ -DWITH_YAF_RUBY_BINDINGS=OFF
+ -DYAF_DOC_DIR=share/doc/${PF}
+ -DYAF_LIB_DIR=$(get_libdir)
+ )
+
+ if use python; then
+ mycmakeargs+=( -DYAF_PY_VERSION=${EPYTHON#python} )
+ fi
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ if use python; then
+ python_domodule "${BUILD_DIR}/src/bindings/yafaray_v3_interface.py"
+ mv "${ED}"/usr/$(get_libdir)/_yafaray_v3_interface.so "${ED}"/$(python_get_sitedir)/ || die
+ rm -v "${ED}"/usr/$(get_libdir)/yafaray_v3_interface.py || die
+
+ if use qt5; then
+ python_domodule "${BUILD_DIR}/src/bindings/yafqt.py"
+ mv "${ED}"/usr/$(get_libdir)/_yafqt.so "${ED}"/$(python_get_sitedir)/ || die
+ rm -v "${ED}"/usr/$(get_libdir)/yafqt.py || die
+ fi
+ fi
+}
+
+pkg_postinst() {
+ einfo "To confirm your installation is working as expected, run"
+ einfo "yafaray-xml with /usr/share/yafaray/tests/test01/test01.xml"
+ einfo "as an input file, then compare the result to"
+ einfo "'/usr/share/yafaray/tests/test01/test01 - expected render result.png'"
+}