summaryrefslogtreecommitdiff
path: root/media-gfx
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/Manifest.gzbin40105 -> 39783 bytes
-rw-r--r--media-gfx/ahoviewer/Manifest4
-rw-r--r--media-gfx/ahoviewer/ahoviewer-1.6.5-r1.ebuild (renamed from media-gfx/ahoviewer/ahoviewer-1.6.5.ebuild)8
-rw-r--r--media-gfx/ahoviewer/metadata.xml1
-rw-r--r--media-gfx/argyllcms/Manifest2
-rw-r--r--media-gfx/argyllcms/argyllcms-2.1.2.ebuild2
-rw-r--r--media-gfx/blender/Manifest2
-rw-r--r--media-gfx/blender/blender-2.79b-r2.ebuild7
-rw-r--r--media-gfx/cairosvg/Manifest4
-rw-r--r--media-gfx/cairosvg/cairosvg-2.4.2.ebuild40
-rw-r--r--media-gfx/cairosvg/metadata.xml6
-rw-r--r--media-gfx/chafa/Manifest4
-rw-r--r--media-gfx/chafa/chafa-1.4.0.ebuild (renamed from media-gfx/chafa/chafa-1.0.1.ebuild)6
-rw-r--r--media-gfx/comix/Manifest4
-rw-r--r--media-gfx/comix/comix-4.0.4-r2.ebuild80
-rw-r--r--media-gfx/comix/files/comix-4.0.4-pillow.patch153
-rw-r--r--media-gfx/comix/metadata.xml16
-rw-r--r--media-gfx/cropgui/Manifest11
-rw-r--r--media-gfx/cropgui/cropgui-0.2-r1.ebuild53
-rw-r--r--media-gfx/cropgui/cropgui-0.4.1.ebuild (renamed from media-gfx/cropgui/cropgui-0.3.ebuild)36
-rw-r--r--media-gfx/cropgui/cropgui-9999.ebuild39
-rw-r--r--media-gfx/cropgui/files/cropgui-0.2-PIL.patch26
-rw-r--r--media-gfx/cropgui/files/cropgui-0.2-tobytes.patch40
-rw-r--r--media-gfx/cropgui/metadata.xml4
-rw-r--r--media-gfx/crwinfo/Manifest2
-rw-r--r--media-gfx/crwinfo/crwinfo-0.2.ebuild2
-rw-r--r--media-gfx/darktable/Manifest3
-rw-r--r--media-gfx/darktable/darktable-3.0.1.ebuild145
-rw-r--r--media-gfx/dcraw/Manifest2
-rw-r--r--media-gfx/dcraw/dcraw-9.28.0-r1.ebuild2
-rw-r--r--media-gfx/digikam/Manifest2
-rw-r--r--media-gfx/digikam/digikam-6.4.0-r1.ebuild (renamed from media-gfx/digikam/digikam-6.4.0.ebuild)4
-rw-r--r--media-gfx/displaycal/Manifest2
-rw-r--r--media-gfx/displaycal/displaycal-3.8.9.3-r1.ebuild71
-rw-r--r--media-gfx/ebdftopcf/Manifest2
-rw-r--r--media-gfx/ebdftopcf/ebdftopcf-2.ebuild2
-rw-r--r--media-gfx/entangle/Manifest2
-rw-r--r--media-gfx/entangle/entangle-2.0.ebuild7
-rw-r--r--media-gfx/eom/Manifest10
-rw-r--r--media-gfx/eom/eom-1.22.0.ebuild4
-rw-r--r--media-gfx/eom/eom-1.22.1.ebuild4
-rw-r--r--media-gfx/eom/eom-1.22.2.ebuild62
-rw-r--r--media-gfx/eom/eom-1.24.0.ebuild72
-rw-r--r--media-gfx/eom/metadata.xml4
-rw-r--r--media-gfx/evoluspencil/Manifest4
-rw-r--r--media-gfx/evoluspencil/evoluspencil-3.0.4.ebuild69
-rw-r--r--media-gfx/evoluspencil/evoluspencil-3.1.0-r1.ebuild2
-rw-r--r--media-gfx/exif/Manifest2
-rw-r--r--media-gfx/exif/exif-0.6.21.ebuild2
-rw-r--r--media-gfx/exiv2/Manifest2
-rw-r--r--media-gfx/exiv2/exiv2-0.27.2.ebuild2
-rw-r--r--media-gfx/fbida/Manifest7
-rw-r--r--media-gfx/fbida/fbida-2.12.ebuild2
-rw-r--r--media-gfx/fbida/fbida-2.13-r1.ebuild4
-rw-r--r--media-gfx/fbida/fbida-2.14.ebuild5
-rw-r--r--media-gfx/fbida/files/fbida-2.14-fno-common.patch53
-rw-r--r--media-gfx/fontforge/Manifest13
-rw-r--r--media-gfx/fontforge/files/20190317-gdk_init.patch39
-rw-r--r--media-gfx/fontforge/files/20200314-stylemap.patch30
-rw-r--r--media-gfx/fontforge/files/20200314-tilepath.patch31
-rw-r--r--media-gfx/fontforge/fontforge-20170731-r5.ebuild3
-rw-r--r--media-gfx/fontforge/fontforge-20190317-r3.ebuild116
-rw-r--r--media-gfx/fontforge/fontforge-20190801.ebuild4
-rw-r--r--media-gfx/fontforge/fontforge-20200314.ebuild108
-rw-r--r--media-gfx/fontforge/metadata.xml1
-rw-r--r--media-gfx/gimp/Manifest9
-rw-r--r--media-gfx/gimp/gimp-2.10.14-r1.ebuild2
-rw-r--r--media-gfx/gimp/gimp-2.10.18-r1.ebuild226
-rw-r--r--media-gfx/gimp/gimp-2.10.18.ebuild211
-rw-r--r--media-gfx/gimp/gimp-2.8.22-r2.ebuild2
-rw-r--r--media-gfx/gimp/gimp-9999.ebuild4
-rw-r--r--media-gfx/gmic/Manifest8
-rw-r--r--media-gfx/gmic/files/gmic-2.4.3-curl.patch100
-rw-r--r--media-gfx/gmic/files/gmic-2.7.1-qt-cmake.patch35
-rw-r--r--media-gfx/gmic/gmic-2.8.1.ebuild171
-rw-r--r--media-gfx/gmic/gmic-2.9.0.ebuild (renamed from media-gfx/gmic/gmic-2.8.2.ebuild)0
-rw-r--r--media-gfx/gnome-font-viewer/Manifest4
-rw-r--r--media-gfx/gnome-font-viewer/gnome-font-viewer-3.32.0.ebuild4
-rw-r--r--media-gfx/gnome-font-viewer/gnome-font-viewer-3.34.0.ebuild28
-rw-r--r--media-gfx/gnome-photos/Manifest2
-rw-r--r--media-gfx/gnome-photos/gnome-photos-3.34.1.ebuild94
-rw-r--r--media-gfx/gnome-raw-thumbnailer/Manifest2
-rw-r--r--media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r1.ebuild2
-rw-r--r--media-gfx/gnome-screenshot/Manifest4
-rw-r--r--media-gfx/gnome-screenshot/gnome-screenshot-3.32.0.ebuild4
-rw-r--r--media-gfx/gnome-screenshot/gnome-screenshot-3.36.0.ebuild52
-rw-r--r--media-gfx/gqview/Manifest3
-rw-r--r--media-gfx/gqview/gqview-2.1.5-r1.ebuild44
-rw-r--r--media-gfx/gqview/gqview-2.1.5-r2.ebuild2
-rw-r--r--media-gfx/graphicsmagick/Manifest8
-rw-r--r--media-gfx/graphicsmagick/graphicsmagick-1.3.32.ebuild4
-rw-r--r--media-gfx/graphicsmagick/graphicsmagick-1.3.33.ebuild4
-rw-r--r--media-gfx/graphicsmagick/graphicsmagick-1.3.35.ebuild132
-rw-r--r--media-gfx/graphicsmagick/graphicsmagick-9999.ebuild4
-rw-r--r--media-gfx/graphite2/Manifest4
-rw-r--r--media-gfx/graphite2/graphite2-1.3.13.ebuild2
-rw-r--r--media-gfx/graphite2/graphite2-1.3.14.ebuild115
-rw-r--r--media-gfx/graphviz/Manifest2
-rw-r--r--media-gfx/graphviz/graphviz-2.42.3.ebuild2
-rw-r--r--media-gfx/greycstoration/Manifest5
-rw-r--r--media-gfx/greycstoration/files/greycstoration-2.9-gcc6.patch11
-rw-r--r--media-gfx/greycstoration/files/greycstoration-2.9-libpng14.patch22
-rw-r--r--media-gfx/greycstoration/greycstoration-2.9-r2.ebuild68
-rw-r--r--media-gfx/greycstoration/metadata.xml11
-rw-r--r--media-gfx/gscan2pdf/Manifest8
-rw-r--r--media-gfx/gscan2pdf/gscan2pdf-2.6.5.ebuild (renamed from media-gfx/gscan2pdf/gscan2pdf-2.6.4.ebuild)0
-rw-r--r--media-gfx/gscan2pdf/gscan2pdf-2.6.7.ebuild (renamed from media-gfx/gscan2pdf/gscan2pdf-2.6.3.ebuild)10
-rw-r--r--media-gfx/gtkimageview/Manifest2
-rw-r--r--media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild2
-rw-r--r--media-gfx/icon-slicer/Manifest2
-rw-r--r--media-gfx/icon-slicer/icon-slicer-0.3.ebuild2
-rw-r--r--media-gfx/icoutils/Manifest6
-rw-r--r--media-gfx/icoutils/icoutils-0.32.0.ebuild49
-rw-r--r--media-gfx/icoutils/icoutils-0.32.2.ebuild49
-rw-r--r--media-gfx/icoutils/icoutils-0.32.3.ebuild21
-rw-r--r--media-gfx/imagemagick/Manifest22
-rw-r--r--media-gfx/imagemagick/imagemagick-6.9.11.0.ebuild (renamed from media-gfx/imagemagick/imagemagick-6.9.10.92.ebuild)6
-rw-r--r--media-gfx/imagemagick/imagemagick-6.9.11.1.ebuild (renamed from media-gfx/imagemagick/imagemagick-6.9.10.96.ebuild)13
-rw-r--r--media-gfx/imagemagick/imagemagick-6.9.11.3.ebuild255
-rw-r--r--media-gfx/imagemagick/imagemagick-7.0.10.0.ebuild (renamed from media-gfx/imagemagick/imagemagick-7.0.9.22.ebuild)6
-rw-r--r--media-gfx/imagemagick/imagemagick-7.0.10.1.ebuild (renamed from media-gfx/imagemagick/imagemagick-7.0.9.26.ebuild)13
-rw-r--r--media-gfx/imagemagick/imagemagick-7.0.10.3.ebuild267
-rw-r--r--media-gfx/imagemagick/imagemagick-9999.ebuild15
-rw-r--r--media-gfx/inkscape/Manifest3
-rw-r--r--media-gfx/inkscape/inkscape-0.92.4-r3.ebuild165
-rw-r--r--media-gfx/inkscape/metadata.xml11
-rw-r--r--media-gfx/iscan/Manifest6
-rw-r--r--media-gfx/iscan/iscan-2.30.3.1.ebuild139
-rw-r--r--media-gfx/iscan/iscan-2.30.4.2.ebuild4
-rw-r--r--media-gfx/iscan/iscan-3.61.0.ebuild2
-rw-r--r--media-gfx/jhead/Manifest2
-rw-r--r--media-gfx/jhead/jhead-2.97.ebuild2
-rw-r--r--media-gfx/kphotoalbum/Manifest4
-rw-r--r--media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild62
-rw-r--r--media-gfx/kphotoalbum/kphotoalbum-5.6.1.ebuild2
-rw-r--r--media-gfx/krita/Manifest5
-rw-r--r--media-gfx/krita/files/krita-4.2.9-ecm-findopenexr.patch352
-rw-r--r--media-gfx/krita/krita-4.2.8.2-r3.ebuild (renamed from media-gfx/krita/krita-4.2.8.2-r2.ebuild)4
-rw-r--r--media-gfx/krita/krita-4.2.9.ebuild121
-rw-r--r--media-gfx/mcomix/Manifest4
-rw-r--r--media-gfx/mcomix/mcomix-1.2.1.ebuild69
-rw-r--r--media-gfx/mcomix/mcomix-1.3.0_pre20200206.ebuild2
-rw-r--r--media-gfx/mirage/Manifest4
-rw-r--r--media-gfx/mirage/files/mirage-0.9.3-stop_cleaning_up.patch27
-rw-r--r--media-gfx/mirage/metadata.xml8
-rw-r--r--media-gfx/mirage/mirage-0.9.5.2-r1.ebuild35
-rw-r--r--media-gfx/mypaint-brushes/Manifest2
-rw-r--r--media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild2
-rw-r--r--media-gfx/opencsg/Manifest7
-rw-r--r--media-gfx/opencsg/files/opencsg-1.4.2-includepath.patch4
-rw-r--r--media-gfx/opencsg/metadata.xml9
-rw-r--r--media-gfx/opencsg/opencsg-1.4.2-r1.ebuild40
-rw-r--r--media-gfx/opencsg/opencsg-1.4.2.ebuild42
-rw-r--r--media-gfx/openscad/Manifest6
-rw-r--r--media-gfx/openscad/openscad-2015.03_p3-r2.ebuild (renamed from media-gfx/openscad/openscad-2015.03_p3-r1.ebuild)4
-rw-r--r--media-gfx/openscad/openscad-2019.05-r2.ebuild (renamed from media-gfx/openscad/openscad-2019.05-r1.ebuild)4
-rw-r--r--media-gfx/openscad/openscad-9999.ebuild6
-rw-r--r--media-gfx/openvdb/Manifest4
-rw-r--r--media-gfx/openvdb/openvdb-4.0.2-r3.ebuild9
-rw-r--r--media-gfx/openvdb/openvdb-5.2.0-r1.ebuild9
-rw-r--r--media-gfx/pngquant/Manifest2
-rw-r--r--media-gfx/pngquant/pngquant-2.12.6.ebuild51
-rw-r--r--media-gfx/potrace/Manifest4
-rw-r--r--media-gfx/potrace/potrace-1.15.ebuild2
-rw-r--r--media-gfx/potrace/potrace-1.16.ebuild4
-rw-r--r--media-gfx/povray/Manifest4
-rw-r--r--media-gfx/povray/povray-3.7.0.0-r1.ebuild2
-rw-r--r--media-gfx/povray/povray-3.7.0.0.ebuild2
-rw-r--r--media-gfx/pstoedit/Manifest2
-rw-r--r--media-gfx/pstoedit/pstoedit-3.70-r1.ebuild2
-rw-r--r--media-gfx/qimgv/Manifest2
-rw-r--r--media-gfx/qimgv/qimgv-0.8.5.ebuild56
-rw-r--r--media-gfx/qrencode/Manifest2
-rw-r--r--media-gfx/qrencode/qrencode-4.0.2.ebuild2
-rw-r--r--media-gfx/raw-thumbnailer/Manifest2
-rw-r--r--media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild2
-rw-r--r--media-gfx/sam2p/Manifest2
-rw-r--r--media-gfx/sam2p/sam2p-0.49.3.ebuild2
-rw-r--r--media-gfx/sane-backends/Manifest2
-rw-r--r--media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild2
-rw-r--r--media-gfx/scrot/Manifest4
-rw-r--r--media-gfx/scrot/scrot-0.8_p13-r1.ebuild2
-rw-r--r--media-gfx/scrot/scrot-1.2.ebuild4
-rw-r--r--media-gfx/shotwell/Manifest2
-rw-r--r--media-gfx/shotwell/shotwell-0.30.8.ebuild1
-rw-r--r--media-gfx/simple-scan/Manifest2
-rw-r--r--media-gfx/simple-scan/simple-scan-3.34.4.ebuild70
-rw-r--r--media-gfx/svg2rlg/Manifest2
-rw-r--r--media-gfx/svg2rlg/svg2rlg-0.3.ebuild2
-rw-r--r--media-gfx/transfig/Manifest2
-rw-r--r--media-gfx/transfig/transfig-3.2.5e.ebuild2
-rw-r--r--media-gfx/ufraw/Manifest2
-rw-r--r--media-gfx/ufraw/ufraw-0.22-r3.ebuild4
-rw-r--r--media-gfx/uniconvertor/Manifest4
-rw-r--r--media-gfx/uniconvertor/uniconvertor-2.0_pre379-r1.ebuild4
-rw-r--r--media-gfx/uniconvertor/uniconvertor-2.0_pre379-r2.ebuild4
-rw-r--r--media-gfx/waifu2x-ncnn-vulkan/Manifest3
-rw-r--r--media-gfx/waifu2x-ncnn-vulkan/metadata.xml11
-rw-r--r--media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20200224.ebuild40
-rw-r--r--media-gfx/xdot/Manifest2
-rw-r--r--media-gfx/xdot/xdot-1.1.ebuild2
-rw-r--r--media-gfx/xli/Manifest2
-rw-r--r--media-gfx/xli/xli-1.17.0-r5.ebuild2
-rw-r--r--media-gfx/xloadimage/Manifest2
-rw-r--r--media-gfx/xloadimage/xloadimage-4.1-r12.ebuild2
-rw-r--r--media-gfx/xv/Manifest2
-rw-r--r--media-gfx/xv/xv-3.10a-r19.ebuild2
207 files changed, 3183 insertions, 1934 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 11e4d2cfae16..645d36113a0e 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
Binary files differ
diff --git a/media-gfx/ahoviewer/Manifest b/media-gfx/ahoviewer/Manifest
index 36b72c81ff8b..9d20e37769e8 100644
--- a/media-gfx/ahoviewer/Manifest
+++ b/media-gfx/ahoviewer/Manifest
@@ -1,3 +1,3 @@
DIST ahoviewer-1.6.5.tar.gz 227653 BLAKE2B 691a9eaa62b55d91b2d215d41ce402c39ca7490a44506a489061aaadd97fac2ac84aa1b28a7d1b4c097d69153ffe146fac105e9b086adc6b66b9f459e6b98eb5 SHA512 30309cff22008d444eec113bd5d79bdc0e9ff1bbc1b117bd3ecefabfdef79773fd17347766115bb0a192db76dbb24f30c853b27123f0a333c8625b94dc2a8775
-EBUILD ahoviewer-1.6.5.ebuild 1748 BLAKE2B b2bd89770e6dd99b421f01833a9a2c4adb42fc0dd8f55808237ba748899acd9de1a6b3baa5f54be81979a0543567b841b75064c65475be5bd7dfaebc4e56a2b7 SHA512 5dc5b7d36e745c62517294006ae999e0cc5f7b90f318669b859a35ff8bafd8262a27f0ad82beeb5a9ea0df69df198032a810c69e5a54be8e091b487f9c619bef
-MISC metadata.xml 410 BLAKE2B 1344e377cacd46abde3ab09e9aebd4c35390e6f403dc856cf4f04f4f1d9bff5b51930a89f94060d183853e6c98d2dd9c0d7dc31947e5752fd015e8b2276827f5 SHA512 784da6432d4f8d0f574fe17507cf49dee620a685de39f806d5455baa9e6625629d1aa0ca735706193d4b3cdf03696328a4ebed4bc3692efcf22d899eaa5258dc
+EBUILD ahoviewer-1.6.5-r1.ebuild 1770 BLAKE2B 99821a06b559351260054bc29054a24c82db1fdbe6d4e7cce050f6edb6ed29ec3603991bc59ab6b27ccecca8ac9912d16c6eb8a98ae406e67028cc12e930fd27 SHA512 9d6e3181597f0840147dd73a2a40906c858a9aa694d016f74df0e9718ef2bc84716e3c1cccf2da4d460fdee3d825b979929583ac1bcbd0fe728a2e8d17b2f613
+MISC metadata.xml 335 BLAKE2B ac1be824313f6bf5cd421eb87ee42a1297a5a7f9eccdd6b95b322c6a968644ef7b4a4a3ec2071fa2444f0dfe270d7e3e5f1792e8e6c06cb00016bfb677ee91d2 SHA512 4bee9e8b32da56338c3aba72eaf59fc8c3e769490fb17ac3d6be0e20710e8ea9f4cffe3491170695b68d96d237ffca35a593be2de0aec426030ce9c5ba148f70
diff --git a/media-gfx/ahoviewer/ahoviewer-1.6.5.ebuild b/media-gfx/ahoviewer/ahoviewer-1.6.5-r1.ebuild
index 64f4f1013499..c5d5266e2cad 100644
--- a/media-gfx/ahoviewer/ahoviewer-1.6.5.ebuild
+++ b/media-gfx/ahoviewer/ahoviewer-1.6.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ahodesuka/ahoviewer/archive/${PV}.tar.gz -> ${P}.tar
LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE="gnutls +gstreamer libsecret +rar +ssl +zip"
+IUSE="gnutls gnome-keyring +gstreamer +rar +ssl +zip"
DEPEND="
dev-cpp/glibmm:2
@@ -21,11 +21,11 @@ DEPEND="
dev-libs/libxml2:2
dev-libs/libsigc++:2
net-misc/curl
+ gnome-keyring? ( app-crypt/libsecret )
gstreamer? (
media-libs/gst-plugins-bad:1.0
media-libs/gstreamer:1.0
)
- libsecret? ( app-crypt/libsecret )
rar? ( app-arch/unrar )
ssl? (
gnutls? (
@@ -60,8 +60,8 @@ src_prepare() {
src_configure() {
local myconf=(
+ $(use_enable gnome-keyring libsecret)
$(use_enable gstreamer gst)
- $(use_enable libsecret)
$(use_enable rar)
$(use_enable zip)
)
diff --git a/media-gfx/ahoviewer/metadata.xml b/media-gfx/ahoviewer/metadata.xml
index 4ff39418e751..fa2e59eb745a 100644
--- a/media-gfx/ahoviewer/metadata.xml
+++ b/media-gfx/ahoviewer/metadata.xml
@@ -5,7 +5,6 @@
<email>juippis@gentoo.org</email>
</maintainer>
<use>
- <flag name="libsecret">Support password storing using libsecret</flag>
<flag name="rar">Rar archive support</flag>
<flag name="zip">Zip archive support</flag>
</use>
diff --git a/media-gfx/argyllcms/Manifest b/media-gfx/argyllcms/Manifest
index e06af7f2f687..4627c4bd47b6 100644
--- a/media-gfx/argyllcms/Manifest
+++ b/media-gfx/argyllcms/Manifest
@@ -2,5 +2,5 @@ DIST Argyll_V2.1.1_src.zip 13825860 BLAKE2B c1a748cf8ecd8e04164b0281e5cfb708386b
DIST Argyll_V2.1.2_src.zip 13837056 BLAKE2B cf6181549e37b1deda11bdd4a63b27e101180a1e82b132ea8dca5af6830a74d5e2f940633f5aecf9a8d62fe8c2b0cdce8f2af44124ce7432b33d2a1bdbaa2c21 SHA512 f49b588c5f0a39edcc30a068a8bde8c7b74611d3feb15d07d4a61b205ed1231c288629f65e1a5a60a3921d552a28e075667ada555401a0d9694fd882bddd4b06
EBUILD argyllcms-2.1.1-r1.ebuild 2113 BLAKE2B 7491a7a5fccb9ca0675dced451e2d8c88b804f279e19eb53c0e6afe8a64c415ae0d9b954428f490d1050e86ff01ad8ff74bbc133b6a189951336c65a6c44cbb3 SHA512 f4180c02dcc2997607ffea5e174626609809a08346b6c65c7f51cb79c2e57eff5de83909855a35712b9d5f055d2ece7cfdafc6af2b9ed0c63ab9570f3cd7bd44
EBUILD argyllcms-2.1.1.ebuild 2049 BLAKE2B 366bead11308fb50f97eb8a443eee23677463e8b249300b3544ea9157fbcf19e603fd1bd506c14e3470965717d84916a1456a70282b68b2b970c1885cbae1193 SHA512 a1b1a16d0f1bd9a8ccfa149de5978aeddc5c189a28869c3836dd35c009d016f8dedbf292b6fc73702869e265635a82cf3e44599333130f60ceeb16be23852f1c
-EBUILD argyllcms-2.1.2.ebuild 2113 BLAKE2B de2d523c185232f290c00d821ea682c91d9a777315b5455f4f5f8c5d0518c6aefb85ca07bf8d5c50ad1ca34314e6b6fb2643e947c1c5d7ffe3d0bdb8e6320eaa SHA512 5c93e069641cb39aa89cba96a51a89b03d04622e37ca88586a2df6de5fe2071c493f288f6e315162a28c21d68b37864615d758812fb1767a8494776874b3ee89
+EBUILD argyllcms-2.1.2.ebuild 2111 BLAKE2B cc479d8b6237270ad8b7804672a1f8753c65f0f40d7497c1a343be1e2a06594faa81cafc8311d2a8ff0d5631f060750315e140093f147b2549089f720d7839f5 SHA512 7188bd98d8b477a307c3d2b135d2d2bdf846aaca82b9f390765303d0abbbef858f21bc4819379930cc4171ccdb776c42a6d5aa97b180ea25c154e158c2f20bbf
MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/media-gfx/argyllcms/argyllcms-2.1.2.ebuild b/media-gfx/argyllcms/argyllcms-2.1.2.ebuild
index 8f67157add6b..3b7a00e0fbac 100644
--- a/media-gfx/argyllcms/argyllcms-2.1.2.ebuild
+++ b/media-gfx/argyllcms/argyllcms-2.1.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip"
LICENSE="AGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
+KEYWORDS="amd64 ~arm64 ~hppa x86"
IUSE="doc libressl"
RDEPEND="
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index d13148e73ab5..ef89e342ec69 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -3,5 +3,5 @@ AUX blender-2.79b-fix-for-gcc9-new-openmp-data-sharing.patch 1265 BLAKE2B bff3ae
AUX blender-2.79b-gcc-8.patch 1259 BLAKE2B 7d204a953c71e656fb309e0560e2de03a9316a95e67a76ecdeb303fadeeca14338ba823d6780a50b62bf4686477a962030b42b15ceae12d48ab21034b0358cc1 SHA512 df0a6a0543a7feac22e6082652792e59ce675dcea99a821c480d5c13e42e9df4d7ab43c71d296a22dd195771714e630757b1e220177d3713f409ea21e9251504
AUX blender-fix-install-rules.patch 518 BLAKE2B 178929de7adb1b4a0063134da93248af8c2c42fe0d3e9730833272b4fe8387075ce592ee65668cc9862a1ad10c9857a31b3f1c0614c9e69f937998ccb5c86a17 SHA512 5343f0e9e6bba2d15a38cb5db95a1aeff0a704c0762e558b9b74d88dd58e2fb5077289f0d8f25a61fa092d083f7db916d27c4642dfd7cf84d4c989258c3253ec
DIST blender-2.79b.tar.gz 50204270 BLAKE2B 78bda294df783ee9bcbcf32f9a112737b2947da5146fd4351b8b36d81c6630ed0ea302b2fb539642cfbdcc4b64df35af5c8545a3bbf50b1cf87dcf3a60eb4ac0 SHA512 2db21ace446168dd683cdb5aad9dec001f8888ae4e9603a04ddb44fb78489ded827deb07e83712b0f1118a0e7bf66f2a5d935dc4ebb3a6703d72672ff414367f
-EBUILD blender-2.79b-r2.ebuild 8274 BLAKE2B 3c110299aa516d3ae43ff98e0cdeea86941d0b7a18bd73a954c8205fafe1f0aa989941004bae14a2748c15ac67ef7f0277f4d509984eef2be65e30547aaa2950 SHA512 3452dea9674903b566b4ba941fecf1528a2d71d9e5b1f8cf323e2f1690265d4e4bf970b97f2d23d391ae995aed843cbf1f748086b8d1df93731ee4d8c6215ca4
+EBUILD blender-2.79b-r2.ebuild 8415 BLAKE2B 97a7cc9743a1b004ad89452fe61a19a3739a83e117edda573ce39b9e5de49d80a2d5b85cf0948589b1b84b1331fab877b7f485b6350075072a5b430406dee4dd SHA512 951ef26bde571bd24af905784a1bfdf45f00bdc4c7a6c9e4b8f55ccb9c875faa38db56db4695d11a310865975a7f07d6eeb87df9816314d8a9ec391708e5f936
MISC metadata.xml 2628 BLAKE2B b6ac04e033bd54bf3b6918737289e0a12ece3f87543b033ff85748934b6cecdb0cf8084a3c0e7fd766965b6defa4a402980244bec1a0ed2772ffbd12bfe96a8f SHA512 a47e7a85cc98bf0befad9b5ef5ad75276a6649bb5949367294177f19ae763a3dd0eae1ce8d179463c18c33533c37c283c7beabe08fe27d861bd54eb761675e35
diff --git a/media-gfx/blender/blender-2.79b-r2.ebuild b/media-gfx/blender/blender-2.79b-r2.ebuild
index e71d9db67e3a..00b4f20254a2 100644
--- a/media-gfx/blender/blender-2.79b-r2.ebuild
+++ b/media-gfx/blender/blender-2.79b-r2.ebuild
@@ -92,8 +92,13 @@ DEPEND="${RDEPEND}
>=dev-cpp/eigen-3.2.8:3
virtual/pkgconfig
doc? (
- app-doc/doxygen[-nodot(-),dot(+),latex]
+ app-doc/doxygen[dot]
dev-python/sphinx[latex]
+ dev-texlive/texlive-bibtexextra
+ dev-texlive/texlive-fontsextra
+ dev-texlive/texlive-fontutils
+ dev-texlive/texlive-latex
+ dev-texlive/texlive-latexextra
)
nls? ( sys-devel/gettext )"
diff --git a/media-gfx/cairosvg/Manifest b/media-gfx/cairosvg/Manifest
index 445880814ac9..62262b72b30e 100644
--- a/media-gfx/cairosvg/Manifest
+++ b/media-gfx/cairosvg/Manifest
@@ -1,5 +1,7 @@
DIST CairoSVG-1.0.22.tar.gz 30896 BLAKE2B b1a4950a67159663bbc72189e57ce36bf2506733b4ff63319178540d242aafd29eb7f5c3993119a5034d3eb77df1dfdd8fed9c53966df13510fe910cbcbb8c43 SHA512 5f4ea7b80947092620827e454182af7332082a8c84fddc035f75ed19c09b4a9027d6bfd5c96e5f388150833788a71ab8fb77a1ffdd963b8106f07b1908a0c8f6
DIST CairoSVG-2.0.3.tar.gz 39371 BLAKE2B a04e3e3d311167cef84063fd3eabc4ffa7c206c5c6fc8016283874411c344c686c441a3149631eccb38b610bb86a2ec3c193eec869b8802ddba1dac92c612215 SHA512 b7ad7be9bd06059392f2004e7cd5c1df1667dbae78482c68d681990a8b3a4141a9c4b72aa4af5075a87ac6a1a4ddf8311d991512be98128b21b87d4355c1bd3d
+DIST CairoSVG-2.4.2.tar.gz 38715 BLAKE2B 3c8f77561e13e0fdec371a601f09f0d107f972955c8e8fbc34f5092a7ff5f65b24338c20ae8e21b428eea083925a36b3e5635a9b0010c569d013169d919b7a35 SHA512 0d6dd22d9569fd3849cf7f6594c86bed719169dac1f0f3219e88d82f9d245bf29d51715159085cb26c0340c8f0dcb88412d141ec0ee3710b1477626f5a578441
EBUILD cairosvg-1.0.22.ebuild 708 BLAKE2B 0c4ae60144019c0dcb7230ca9e9c864fce160bc173a9af147329888d0c1b719e5e8b55ca6a6881b35e96063266903c0f280da85572cdf72c481e0a8d613904e5 SHA512 deb1c685e2c91a284ab591bb5ac4f4a00265564cb945d060273c9b8bddcff7d454b0557d33976119465798352ded1996bcdb6fbeb0338d328d46a82a63db26c4
EBUILD cairosvg-2.0.3.ebuild 704 BLAKE2B 0479aad627b2da3bdc0b844d33b16bb809b96c8951b781925e68e35c9963a169a42436cebb0ec7e65479a64502c80b78365d888edff92244f6796e3ea9b8b957 SHA512 5f246219d9e86b2125f72db028904c0d92648fd5b20dc144f500418c78d789cf9ee7a8369af2908d251e37c3795b1b398155b4aeb55d9409cbb1aa2e8ff59ae9
-MISC metadata.xml 340 BLAKE2B 98ccd93460bbb405ae591ba8d5d216fcf57d07247bd2f03698b158eadaabf79d510393b32e7827f2d4a2e859e64f0ff3262ba4b6086baf5a0d893d942d516915 SHA512 48eddade88ce54234da4c04edc349a80d162f88ad6c96ee30b9434e792fe174654990efedabbe3927b78f54400c7aa61dcc8acd1776772d6e5bb31626cd31e4d
+EBUILD cairosvg-2.4.2.ebuild 874 BLAKE2B 3f8bcf0a879209c30961a5cabb89fb0b00de69c42ae6ff800b13d56c963b2fdeb2f64d3e018152174dec0f5c95d1477be0df0d9eb05ddc48c2099d2c2066c833 SHA512 aeba0b58d589545240c6e059ee5d9abaa17af866427efe6d6194278967e0ec22bfab8b21e7ab9d7664fa7b4e98c02cb057777a9d945d6dab2dc2e3994dd7540d
+MISC metadata.xml 328 BLAKE2B 168e60e4dbd12e2b99ba4ad8a6f8f42ef5a4de12f8f1edc68ba4d1d4252b24995da5d0e4ef9e1db09b3934ba42b042685db625439425a6e98cde2f52050c4af1 SHA512 ebb7d9d27e014fd083d0abe9508040730f980ba8a0bc89670ee5418af2c3af036d0ec16b5607a8805944d3b7eeb835e8806ab059fed68c52268df1cd10d7bbb0
diff --git a/media-gfx/cairosvg/cairosvg-2.4.2.ebuild b/media-gfx/cairosvg/cairosvg-2.4.2.ebuild
new file mode 100644
index 000000000000..bd671f1a2cb2
--- /dev/null
+++ b/media-gfx/cairosvg/cairosvg-2.4.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+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
+ distutils-r1_src_prepare
+}
diff --git a/media-gfx/cairosvg/metadata.xml b/media-gfx/cairosvg/metadata.xml
index 3cd703447340..d688975002b3 100644
--- a/media-gfx/cairosvg/metadata.xml
+++ b/media-gfx/cairosvg/metadata.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>graphics@gentoo.org</email>
- <name>Gentoo Graphics Project</name>
+ <maintainer type="person">
+ <email>mgorny@gentoo.org</email>
+ <name>Michał Górny</name>
</maintainer>
<upstream>
<remote-id type="pypi">CairoSVG</remote-id>
diff --git a/media-gfx/chafa/Manifest b/media-gfx/chafa/Manifest
index d6bc84abb0f6..e63b28b3c817 100644
--- a/media-gfx/chafa/Manifest
+++ b/media-gfx/chafa/Manifest
@@ -1,5 +1,5 @@
-DIST chafa-1.0.1.tar.xz 311616 BLAKE2B c7060cf1b20f7c2eaa6eb8265422031dea1b3b80c106b08b11b431336044e154609ad73c7654a0085a8ca0b71bc01e06377ded638081bdfaeb96aac054577ed8 SHA512 fe0dc8ecec77c7b1b4c694d6dd3f4de895a07faf39519f47c2284d76261e2c6298943fa5309cdca6d41ef0a22fe0321a2ef890f319903596bdfaad10394e7ec2
DIST chafa-1.2.1.tar.xz 354784 BLAKE2B a37561506edd1117093ad8d2543e8d8779a5edb346d6277baf31a15dabb1f5279234a36822d7f4225bb75ea6f75ff67966b1be832e90e5da03a02b6f140ab576 SHA512 71aee87618961a5910b9bb7a76b50df6f78df3621adc3ea7c462ba26df0147f0cb32f428fb7f6e5dc26968ee9bd3ee902762a7cb8735d1c51fd0ebd107c4226e
-EBUILD chafa-1.0.1.ebuild 813 BLAKE2B 2cb840de743f45a829c1adae53fd15713a7ec84fe187e068695ddf24c2d3dc316257b0148db87af0b8794eefd5350f46bf611df30c911ec0d706b60975c5db5d SHA512 18e9f8347098a84b0c27cf9bc0091c8ca041048ef745d470b01dd7e6c5494c871daf994e541b11b3b62d29b0d91602b4647a80248770c4b6b8c647b21d44ab71
+DIST chafa-1.4.0.tar.xz 388932 BLAKE2B 0ccaae1495bd410b05d291ebcf2b6266374f013536ec1b953d6127e63c20b11ff78e96772309caeb5c4bbfc40729f60291b0ab3d2395824801aec7763c1ac2b3 SHA512 e464750296db0eca5d718ff70dbb51529abcd4ff3d5bdd15f20f10ff0207f282e8b59799476fc05718efb48b81b331ae1518d450efd6b62b98a41049e1c6e9d5
EBUILD chafa-1.2.1.ebuild 822 BLAKE2B d2e2cfd7873f788eebc36e237f28969e71f14fa2aca89e27cf159f5456a6f26e23062dba56f26409a27b9878b28f092ff41461f4f17d05beb250d27a01dff8dc SHA512 e402d5d7e43ad25ed6d2621cfdd50de25838fc64fd9ec375ffb9062cc5a025f12eaf71b8630a6ea6b0edbdda69f82b8add9e1e4189f189ede29de2c4fef50502
+EBUILD chafa-1.4.0.ebuild 822 BLAKE2B 0910f237b704cc9122c8de1466b09d34eddeb94a7765947d6b2d44deaede9cb79641fcba9e2ec27bcab299696c682069d8647ab139e21774526001b4bd541932 SHA512 71f78174ef520ba23215d300944fbb81a25cfb2d43fde72b344cdb9080244981c5ee7e36ba4b8df66e78a1671ed5ee233f901faf1219d20350fac2726b3b3758
MISC metadata.xml 407 BLAKE2B ac815b6d037374042188d98d563fe87dd98fd052284d42fe594c77d58c97ff3154b0117b982adac9c0831a3b1baf85db7fd721f8dffe7c6b230ba9bb933d2ca9 SHA512 2fbb72618e83f62147fe9ad65115cd979876a461bd8a0601acb990043ce01842ad74e1a1a079759322d97c16295ad321e60fb16361b5b64345be85ebe070b2b8
diff --git a/media-gfx/chafa/chafa-1.0.1.ebuild b/media-gfx/chafa/chafa-1.4.0.ebuild
index 53d1b3126f45..c17b462fcc51 100644
--- a/media-gfx/chafa/chafa-1.0.1.ebuild
+++ b/media-gfx/chafa/chafa-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,8 +16,8 @@ RDEPEND="
dev-libs/glib:2
media-gfx/imagemagick:0=
"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
src_configure() {
local econfargs=(
diff --git a/media-gfx/comix/Manifest b/media-gfx/comix/Manifest
deleted file mode 100644
index 6be2a2492818..000000000000
--- a/media-gfx/comix/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX comix-4.0.4-pillow.patch 3658 BLAKE2B f8cbcb64737654dbbe1e4974680cca163b5788a42121e03691fd41bf564ac1c0d6e1d7ca2ef970b69d51c4e704ae37af1a0a57e65f49d5eaa6f41284a07f49ad SHA512 41a37c7f095b1a10182501f0ddd035d97e0b9b150fc5d34871241c5a512c808e5b59ebf1f340b8c41432f0fd8746de9cdc39e7022a54b2f3194a916afadf1e00
-DIST comix-4.0.4.tar.gz 481687 BLAKE2B adf73f63d260fa4171f4e85fe74e25e52253ea4c78eb3d2be8d9319ddeef537899415a582b8f33db76a8e30acf77c2d5bd1fc5b931302040d967bdd39b45e9ff SHA512 9cbc5b1cc100ee50b48b794ce9a7f08130fc7a79376533f0f55904be0e2e8cfe5f8b1deeff2f76e7038a3f81b0f709ce5eea88a709199e1584b73f5259df5f8e
-EBUILD comix-4.0.4-r2.ebuild 1879 BLAKE2B aedcac4792ed3674954ca679b07311add1eeca248dd6cfe079e6bd3f3fa43150a775b0555358e2ba984ae9d798fc27c51c92a08b5d43775e12cf0c8f0ecf4797 SHA512 d381384fe28a6a9372bd229a30e099342c573015a9691b3f3166237400554f3725f34d1c100c19a5851bd98e701b2e24b99b4acef0f0dd0da9a175683da6f612
-MISC metadata.xml 422 BLAKE2B 82b5a9d0e1e0e159549c4f88a3cd00635c93c972adbb6e2f784f2fbd9bf91d2aedb27264066051e73dcd953099e122b2e4d6dbb2a4f52ee6bee2f988843f6c8d SHA512 8a382830d5c7629ee140934a03d9b5b6f4759deae2a1114d16b70634316ff46aa6ceb823a5acca95de7974c25563f8b6e324f32128f61c6fbdb12eb180ec7b6b
diff --git a/media-gfx/comix/comix-4.0.4-r2.ebuild b/media-gfx/comix/comix-4.0.4-r2.ebuild
deleted file mode 100644
index fa7c18e84d38..000000000000
--- a/media-gfx/comix/comix-4.0.4-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PLOCALES="ca cs es fr hr hu id ja ko pl pt_BR ru sv zh_CN zh_TW"
-
-inherit eutils gnome2-utils l10n python-single-r1 xdg-utils
-
-DESCRIPTION="A GTK image viewer specifically designed to handle comic books"
-HOMEPAGE="http://comix.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="rar"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/pillow[${PYTHON_MULTI_USEDEP}]
- >=dev-python/pygtk-2.12[${PYTHON_MULTI_USEDEP}]
- ')"
-RDEPEND="${DEPEND}
- rar? ( || ( app-arch/unrar app-arch/rar ) )"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- l10n_find_plocales_changes messages "" "/LC_MESSAGES/comix.po"
-
- epatch "${FILESDIR}/${P}-pillow.patch" #471522, https://sourceforge.net/p/comix/patches/50/
-
- # do not install .pyc into /usr/share
- local pythondir="$(python_get_sitedir)/comix"
- pythondir="${pythondir#${EPREFIX}/usr/}"
- sed -i -e "s:share/comix/src:${pythondir}:g" install.py || die
- python_fix_shebang mime/comicthumb src/comix.py
-}
-
-src_install() {
- dodir /usr
- "${PYTHON}" install.py install --no-mime --dir "${D}"usr || die
-
- insinto /usr/share/mime/packages
- doins mime/comix.xml
-
- insinto /etc/gconf/schemas
- doins mime/comicbook.schemas
-
- dobin mime/comicthumb
- dodoc ChangeLog README
-
- remove_locale() {
- rm -r "${ED}/usr/share/locale/"$1 || die
- }
- l10n_for_each_disabled_locale_do remove_locale
-}
-
-pkg_preinst() {
- gnome2_gconf_savelist
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_gconf_install
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
diff --git a/media-gfx/comix/files/comix-4.0.4-pillow.patch b/media-gfx/comix/files/comix-4.0.4-pillow.patch
deleted file mode 100644
index f91bfcd8b821..000000000000
--- a/media-gfx/comix/files/comix-4.0.4-pillow.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-From 9d31aa97c8bcc7828e6d04ec4375a75a9bf06836 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sun, 16 Jun 2013 13:36:08 -0400
-Subject: [PATCH] Update PIL import statements for compatibility with Pillow
- (PIL-2)
-
-https://bugs.gentoo.org/show_bug.cgi?id=471522
----
- install.py | 2 +-
- mime/comicthumb | 2 +-
- src/comix.py | 2 +-
- src/histogram.py | 6 +++---
- src/image.py | 8 ++++----
- src/library.py | 4 ++--
- src/thumbbar.py | 4 ++--
- src/thumbnail.py | 2 +-
- src/thumbremover.py | 2 +-
- 9 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/install.py b/install.py
-index f8be7cb..d72d8d1 100755
---- a/install.py
-+++ b/install.py
-@@ -240,7 +240,7 @@ def check_dependencies():
- print ' !!! PyGTK .................... Not found'
- required_found = False
- try:
-- import Image
-+ from PIL import Image
- assert Image.VERSION >= '1.1.5'
- print ' Python Imaging Library ....... OK'
- except ImportError:
-diff --git a/mime/comicthumb b/mime/comicthumb
-index 1081dac..a3e6a83 100755
---- a/mime/comicthumb
-+++ b/mime/comicthumb
-@@ -22,7 +22,7 @@ import tarfile
- import subprocess
-
- try:
-- import Image
-+ from PIL import Image
- except ImportError:
- print '! Could not import the Image module (PIL).'
- print __doc__
-diff --git a/src/comix.py b/src/comix.py
-index f3f9e1b..ebc73e9 100755
---- a/src/comix.py
-+++ b/src/comix.py
-@@ -51,7 +51,7 @@ except ImportError:
- sys.exit(1)
-
- try:
-- import Image
-+ from PIL import Image
- assert Image.VERSION >= '1.1.5'
- except AssertionError:
- print "You don't have the required version of the Python Imaging",
-diff --git a/src/histogram.py b/src/histogram.py
-index e9fc68d..42ac9b8 100644
---- a/src/histogram.py
-+++ b/src/histogram.py
-@@ -1,9 +1,9 @@
- """histogram.py - Draw histograms (RGB) from pixbufs."""
-
- import gtk
--import Image
--import ImageDraw
--import ImageOps
-+from PIL import Image
-+from PIL import ImageDraw
-+from PIL import ImageOps
-
- import image
-
-diff --git a/src/image.py b/src/image.py
-index 0603f0a..db51525 100644
---- a/src/image.py
-+++ b/src/image.py
-@@ -1,10 +1,10 @@
- """image.py - Various image manipulations."""
-
- import gtk
--import Image
--import ImageEnhance
--import ImageOps
--import ImageStat
-+from PIL import Image
-+from PIL import ImageEnhance
-+from PIL import ImageOps
-+from PIL import ImageStat
-
- from preferences import prefs
-
-diff --git a/src/library.py b/src/library.py
-index a4fc29b..e14a197 100644
---- a/src/library.py
-+++ b/src/library.py
-@@ -8,8 +8,8 @@ from xml.sax.saxutils import escape as xmlescape
- import gtk
- import gobject
- import pango
--import Image
--import ImageDraw
-+from PIL import Image
-+from PIL import ImageDraw
-
- import archive
- import encoding
-diff --git a/src/thumbbar.py b/src/thumbbar.py
-index ba4b94c..0a4c33f 100644
---- a/src/thumbbar.py
-+++ b/src/thumbbar.py
-@@ -4,8 +4,8 @@ import urllib
-
- import gtk
- import gobject
--import Image
--import ImageDraw
-+from PIL import Image
-+from PIL import ImageDraw
-
- import image
- from preferences import prefs
-diff --git a/src/thumbnail.py b/src/thumbnail.py
-index 25f333e..b565162 100644
---- a/src/thumbnail.py
-+++ b/src/thumbnail.py
-@@ -15,7 +15,7 @@ import shutil
- import tempfile
-
- import gtk
--import Image
-+from PIL import Image
-
- import archive
- import constants
-diff --git a/src/thumbremover.py b/src/thumbremover.py
-index fc2fa37..03aa6e6 100644
---- a/src/thumbremover.py
-+++ b/src/thumbremover.py
-@@ -7,7 +7,7 @@ import urllib
-
- import gtk
- import pango
--import Image
-+from PIL import Image
-
- import encoding
- import labels
---
-1.8.2.1
-
diff --git a/media-gfx/comix/metadata.xml b/media-gfx/comix/metadata.xml
deleted file mode 100644
index 590b345bca4e..000000000000
--- a/media-gfx/comix/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>graphics@gentoo.org</email>
- <name>Gentoo Graphics Project</name>
- </maintainer>
- <use>
- <flag name="rar">
- Pulls app-arch/unrar for rar file support
- </flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">comix</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/media-gfx/cropgui/Manifest b/media-gfx/cropgui/Manifest
index 77ec2c08c730..bb732e5e9d55 100644
--- a/media-gfx/cropgui/Manifest
+++ b/media-gfx/cropgui/Manifest
@@ -1,8 +1,3 @@
-AUX cropgui-0.2-PIL.patch 831 BLAKE2B 936d4de690a45d9213f7337c1f2adc72dc39b370a9327bcb23f8d527c02397bb01e8ffe581eed734e4b99e2827c713e97e11bd6449623dade81ead6f4a3ce028 SHA512 b2b4be9f04c26906f998d5c693722d58e2d40270dcf41cb6027206adbbfeed0133858be7fbd44f846a83b23cd4da3f286fbb188b2547103a7320bcee0b35fa15
-AUX cropgui-0.2-tobytes.patch 1590 BLAKE2B e83066d2c80d4351d557d91e4d662515419b68579e07834d95da66a12b20bb891b913224c54bb6d4befba4a5a1c86989fbb0392d0e5e53fffaae1ada82ae3947 SHA512 2824a75de26eb200f991c759235a9da9ba5a61bc5f315e679920f1481b6826230432d91f2b710882463c8d8fb5856d001aa9d209de2a6d31fa027683cd57cd75
-DIST cropgui-0.2.tar.gz 842734 BLAKE2B 4a09fef84634cc07d81580f9652826dd4e388c27d9db33fb63e8f7c9ac2341cb532b81894fcab624df2495865af6f6580b03c871ed7d138bf5c7d2fc02386a7b SHA512 d6a9feea8c5de57455d0f7247465108d5a931f773f4df0c91629400bcc2c958c76559a84b6cde45709bcc8936ff7f5e2b3553897a14fbec14a9f032065ce83ba
-DIST cropgui-0.3.tar.gz 851911 BLAKE2B 57e8a013f1d0e9741e40657fcdd15c029a9cfd193d212389c4a98eb4520c64d7cb8d7d3adca9c727c2a7415ca8eaec8c7b3e621088e2d55747e60a1ab65306dd SHA512 ec8c15d25dd0eac1979a7cc20806cbf412cac9e5279538db0bf27a7c0ec98fc272650bb9f3d798408a96b6c49cd733e3df035f74b3bc6ef79d853c1a47a944ff
-EBUILD cropgui-0.2-r1.ebuild 1327 BLAKE2B 471d9ef156085cf203a0656800760837adf15d7c4d73108460d7a2a664bc1d44ddca22e4a6f4f8ee582e83257554c46e078ddea73d0f9b85a5377608296e5514 SHA512 1391e50029f995d1cddbeddc4c849b806ab0429ecabc50b0f14b953db4a2066a557bc3bbf990907e2400adaea0504fde28d49055e3349cfb626f1ed59bf2bff3
-EBUILD cropgui-0.3.ebuild 1223 BLAKE2B d2a9a6eb165789c1c74f263f6ecb3e211b154489f84f275afda80575375b8b7e52b4e5b07ed899ec90c1765dd348d161b36bf0363fefd054527885aa47ad77dd SHA512 0534383658a587adc17b4c4a517184fe80c21e38ec62f707a40c66075ab68a64ed08fc52e42f9aa15fbdc55dc4ff92387bfc7d3886d460ae0661901c93e9da01
-EBUILD cropgui-9999.ebuild 994 BLAKE2B 03eb7a7f4080709efa0789df9b4f2705b3765ec5859fdd2a79e8c2ad851a6c85b3df8a144720ac3654f60cace962a8bfebcb56366a2c7e9aaf00c51fcfdd4ea0 SHA512 7805c24d280653e05be9cafd97e8f3fc9d9a70538ad9efe473143667fa8ffee080cbd2139e1e5c8155ad4ddc2abc8f2e5ffa98efff3e4f512d29252cc7ae30aa
-MISC metadata.xml 326 BLAKE2B 9de42c9e878245c3e69bb73156b0f3531b2ef232d041d600c47ada3ff614354e37bfdf5ff6d1d11b872ebc73dcd729404ab4fb8caaa845e3cd571e636d0f8efe SHA512 7fa6076e0d39f2c2b5a7290ec75af076fbe2b0f4040861d5c2b428520e9e84447210245a6e66dea2742ddeeaf1534741e4b3dc1f18a411db4f3657fc3ee971a0
+DIST cropgui-0.4.1.tar.gz 852958 BLAKE2B dcc6ba775e49af9a9fe1054fe5246e87e044f47cb7ca20712e5048dd1fa0fda35ee90c38cf733540913d0220eb58ab0a6dcfe93c7b02ebb9e022529b8add6c1c SHA512 85b0c2c57faecdd7db15e417234f2ea50fc5edbdcacaedcfc53cda68c3a070f4ba0201bff9afbaa3de7c51552309df1ac3e87586b4021e68bbb255a2545d92da
+EBUILD cropgui-0.4.1.ebuild 1098 BLAKE2B c70f86c3cc622e43bcea65dbb18bde644191cbc4b5ab3e21c66442726cdb581e9dec2e4839ab4f488915aff4cca249b207346a9edb20e986283b1fd1f14a5546 SHA512 969f1d799d14b182c82660a8fae072a09e07efc85798ac125da18eef9d4e6abe0ce161f6d08b5a9d9fc95acda7973838c7aaf6e51792d6629d0422e01ca21760
+MISC metadata.xml 322 BLAKE2B 90aa45b1eb0991ece5ae99458d976775a725221c0a472dc7f7667ad8b72c322f549aa33099669d5122807d5965348950edfd2c0bfa811435d11149e4577a230c SHA512 05b261ca819100fadde1548385d1632b157bfe6ddf1c7a876703f51d04a8aaa68f2d0aa18b188878c07fa27ed54cd65ec5ec4c4c042788fbbb525271ccda07e3
diff --git a/media-gfx/cropgui/cropgui-0.2-r1.ebuild b/media-gfx/cropgui/cropgui-0.2-r1.ebuild
deleted file mode 100644
index 4843bea19214..000000000000
--- a/media-gfx/cropgui/cropgui-0.2-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-r1
-
-DESCRIPTION="GUI for lossless cropping of jpeg images"
-HOMEPAGE="http://emergent.unpythonic.net/01248401946"
-SRC_URI="https://github.com/jepler/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${PYTHON_DEPS}
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/pygobject:2[${PYTHON_USEDEP}]
- dev-python/pygtk:2[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
- sed -i -e '/Encoding/d' \
- -e '/Version/d' \
- -e '/MimeType/s/$/&;/' \
- -e '/Categories/s/Application;//' \
- cropgui.desktop || die 'sed on cropgui.desktop failed'
- # bug 471530
- eapply "${FILESDIR}/${P}-PIL.patch"
- # bug 616708
- eapply "${FILESDIR}/${P}-tobytes.patch"
-
- eapply_user
-}
-
-install_cropgui_wrapper() {
- python_domodule cropgtk.py cropgui_common.py filechooser.py cropgui.glade
- make_wrapper "${PN}.tmp" "${PYTHON} $(python_get_sitedir)/${PN}/cropgtk.py"
- python_newexe "${ED%/}/usr/bin/${PN}.tmp" "${PN}"
- rm "${ED%/}/usr/bin/${PN}.tmp" || die
-}
-
-src_install() {
- python_moduleinto "${PN}"
- python_foreach_impl install_cropgui_wrapper
-
- domenu "${PN}.desktop"
- doicon "${PN}.png"
-}
diff --git a/media-gfx/cropgui/cropgui-0.3.ebuild b/media-gfx/cropgui/cropgui-0.4.1.ebuild
index e55631898440..867b72d6161a 100644
--- a/media-gfx/cropgui/cropgui-0.3.ebuild
+++ b/media-gfx/cropgui/cropgui-0.4.1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-r1
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit eutils python-r1 desktop xdg-utils
DESCRIPTION="GUI for lossless cropping of jpeg images"
-HOMEPAGE="http://emergent.unpythonic.net/01248401946"
+HOMEPAGE="https://emergent.unpythonic.net/01248401946"
SRC_URI="https://github.com/jepler/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
@@ -19,25 +19,13 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="${PYTHON_DEPS}"
RDEPEND="${PYTHON_DEPS}
dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/pygobject:2[${PYTHON_USEDEP}]
- dev-python/pygtk:2[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
- sed -i -e '/Encoding/d' \
- -e '/Version/d' \
- -e '/MimeType/s/$/&;/' \
- -e '/Categories/s/Application;//' \
- cropgui.desktop || die 'sed on cropgui.desktop failed'
-
- eapply_user
-}
+ dev-python/pygobject:3[${PYTHON_USEDEP}]"
install_cropgui_wrapper() {
python_domodule cropgtk.py cropgui_common.py filechooser.py cropgui.glade
make_wrapper "${PN}.tmp" "${PYTHON} $(python_get_sitedir)/${PN}/cropgtk.py"
- python_newexe "${ED%/}/usr/bin/${PN}.tmp" "${PN}"
- rm "${ED%/}/usr/bin/${PN}.tmp" || die
+ python_newexe "${ED}/usr/bin/${PN}.tmp" "${PN}"
+ rm "${ED}/usr/bin/${PN}.tmp" || die
}
src_install() {
@@ -47,3 +35,11 @@ src_install() {
domenu "${PN}.desktop"
doicon "${PN}.png"
}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
diff --git a/media-gfx/cropgui/cropgui-9999.ebuild b/media-gfx/cropgui/cropgui-9999.ebuild
deleted file mode 100644
index 1d83737474c9..000000000000
--- a/media-gfx/cropgui/cropgui-9999.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://github.com/jepler/cropgui.git"
-PYTHON_COMPAT=( python2_7 )
-inherit eutils git-r3 python-r1
-
-DESCRIPTION="GUI for lossless cropping of jpeg images"
-HOMEPAGE="http://emergent.unpythonic.net/01248401946"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${PYTHON_DEPS}
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/pygobject:2[${PYTHON_USEDEP}]
- dev-python/pygtk:2[${PYTHON_USEDEP}]
-"
-
-install_cropgui_wrapper() {
- python_domodule cropgtk.py cropgui_common.py filechooser.py cropgui.glade
- make_wrapper "${PN}.tmp" "${PYTHON} $(python_get_sitedir)/${PN}/cropgtk.py"
- python_newexe "${ED%/}/usr/bin/${PN}.tmp" "${PN}"
- rm "${ED%/}/usr/bin/${PN}.tmp" || die
-}
-
-src_install() {
- python_moduleinto "${PN}"
- python_foreach_impl install_cropgui_wrapper
-
- domenu "${PN}.desktop"
- doicon "${PN}.png"
-}
diff --git a/media-gfx/cropgui/files/cropgui-0.2-PIL.patch b/media-gfx/cropgui/files/cropgui-0.2-PIL.patch
deleted file mode 100644
index 3c1e91847f8e..000000000000
--- a/media-gfx/cropgui/files/cropgui-0.2-PIL.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- cropgui.orig/cropgui_common.py 2016-01-28 12:54:47.424636620 +0300
-+++ cropgui/cropgui_common.py 2016-01-28 12:55:15.176635735 +0300
-@@ -13,9 +13,9 @@
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
--import Image
--import ImageFilter
--import ImageDraw
-+from PIL import Image
-+from PIL import ImageFilter
-+from PIL import ImageDraw
- import subprocess
- import threading
- import Queue
---- cropgui.orig/filechooser.py 2016-01-28 12:55:26.505635374 +0300
-+++ cropgui/filechooser.py 2016-01-28 12:55:32.649635178 +0300
-@@ -8,7 +8,7 @@
- import gobject
-
- import os
--import Image
-+from PIL import Image
- import cropgui_common
-
- def apply_rotation(rotation, image):
diff --git a/media-gfx/cropgui/files/cropgui-0.2-tobytes.patch b/media-gfx/cropgui/files/cropgui-0.2-tobytes.patch
deleted file mode 100644
index 18405143badf..000000000000
--- a/media-gfx/cropgui/files/cropgui-0.2-tobytes.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-commit b664d1fefd7140ec4ec37b3b90a9007839029d8a
-Author: Tristan Stenner <ttstenner@gmail.com>
-Date: Fri Oct 9 08:40:04 2015 +0200
-
- Try tostring(), fall back to tobytes()
-
-diff --git a/cropgtk.py b/cropgtk.py
-index c1156b0..135b6a8 100755
---- a/cropgtk.py
-+++ b/cropgtk.py
-@@ -170,7 +170,11 @@ class DragManager(DragManagerBase):
- rendered = self.rendered()
- rendered = rendered.convert('RGB')
- i.set_size_request(*rendered.size)
-- pixbuf = gtk.gdk.pixbuf_new_from_data(rendered.tostring(),
-+ try:
-+ image_data = rendered.tostring()
-+ except:
-+ image_data = rendered.tobytes()
-+ pixbuf = gtk.gdk.pixbuf_new_from_data(image_data,
- gtk.gdk.COLORSPACE_RGB, 0, 8,
- rendered.size[0], rendered.size[1], 3*rendered.size[0])
-
-diff --git a/filechooser.py b/filechooser.py
-index f2f8122..a039d74 100644
---- a/filechooser.py
-+++ b/filechooser.py
-@@ -49,7 +49,11 @@ def update_preview_cb(file_chooser, preview):
- i.thumbnail((PREVIEW_SIZE, PREVIEW_SIZE), Image.ANTIALIAS)
- i = i.convert('RGB')
- i = apply_rotation(r, i)
-- pixbuf = gtk.gdk.pixbuf_new_from_data(i.tostring(),
-+ try:
-+ image_data = i.tostring()
-+ except:
-+ image_data = i.tobytes()
-+ pixbuf = gtk.gdk.pixbuf_new_from_data(image_data,
- gtk.gdk.COLORSPACE_RGB, 0, 8, i.size[0], i.size[1],
- i.size[0]*3)
- preview.set_from_pixbuf(pixbuf)
diff --git a/media-gfx/cropgui/metadata.xml b/media-gfx/cropgui/metadata.xml
index 0f64e749a72a..27aa4f80ba4c 100644
--- a/media-gfx/cropgui/metadata.xml
+++ b/media-gfx/cropgui/metadata.xml
@@ -2,8 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>zlogene@gentoo.org</email>
- <name>Mikle Kolyada</name>
+ <email>hanno@gentoo.org</email>
+ <name>Hanno Böck</name>
</maintainer>
<upstream>
<remote-id type="github">jepler/cropgui</remote-id>
diff --git a/media-gfx/crwinfo/Manifest b/media-gfx/crwinfo/Manifest
index 09094f0d3285..07d768d868c3 100644
--- a/media-gfx/crwinfo/Manifest
+++ b/media-gfx/crwinfo/Manifest
@@ -1,4 +1,4 @@
AUX crwinfo-0.2.patch 1009 BLAKE2B 0d4ac95f748b9a0c82d9819a951cefa97c6a1bef06f7495623bc2e3b245ef32e63e8fa9d387d4408c136f58e9606a1b591d802bf3cb76c27ea7079df59d7a711 SHA512 b02efcaf211603b5901b316d286ba0baf7e74776a2f92d6f321b154c8713a7fe653b5652137de8ae25d7a9f9eca6f217a4bab1c6839e7bb144ac5fdd804c001b
DIST CRWInfo-0.2.tar.gz 10717 BLAKE2B fce230c1913cd924b554697bb1a26661671ec2ec274fbb5f8918f2f5bdb8923897dd1f9b3a4a844f8d0f380f39f50ee08418c6d3cfac39fe7a3e50255aa0632d SHA512 54e386266570460dd43f5a6d4b0eea7d6c37d9327dca8ffc1fa10462f97e23fc080404159723ce6558c3dc6c77eccba6ede628097d95f699a47f57a114e1eb0a
-EBUILD crwinfo-0.2.ebuild 594 BLAKE2B 5cfb758c30f4fb51d217b62ffa764f3dc547b8df1662e4320431c946bc6b1ada4e19c2612a54cfa6e1cc09d4128bf2761dbe7acfcf7cf26332d1711c149015d6 SHA512 b3e65197b64fe7e4528e135b8ffcb8c3cca98348f792512dc39d0b1d5fb2ad66958b7adacaf26f216ffba706e7f9bb2a18c2f2b93224c0bd9baaee429ce17329
+EBUILD crwinfo-0.2.ebuild 595 BLAKE2B 7fe6d06ffde199a51c73fa1d3918640fc32691b8af4dedb8ec89b2f35e8b977b651ccdab3329ecb7fcd9a4e8223d04472620302c277fb702375ce7b869d84eb5 SHA512 8167820347e2d825227e089dad7000c866ef2e9ee8d7ea9a54ee3d9025f27f6a2b8fd94a9320d7faa9f4c0850a498eead932364b5a96eec600bba509f2940b5e
MISC metadata.xml 369 BLAKE2B 82f9df6d1668d42aeb01f7632349addc219842853a89150515007bea21d058c9b92a6d38598c2cc35bdf8957ea8e40f0bcab55953443afbbd79e21a2c2921738 SHA512 ee3b3a975b809e4433e7a6242a788f016abd75a969c6898ed07861d38b609d11d5cc1997c19165128760ed3f99022dac64f3f63cd2281ff86bc78023d7c40709
diff --git a/media-gfx/crwinfo/crwinfo-0.2.ebuild b/media-gfx/crwinfo/crwinfo-0.2.ebuild
index 8fbcd90d0766..debdd7e05574 100644
--- a/media-gfx/crwinfo/crwinfo-0.2.ebuild
+++ b/media-gfx/crwinfo/crwinfo-0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://neuemuenze.heim1.tu-clausthal.de/~sven/crwinfo/CRWInfo-${PV}.tar
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
S="${WORKDIR}/CRWInfo-${PV}"
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index b37370a0b089..37652dc9bfdf 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -4,9 +4,12 @@ DIST darktable-2.6.2-gcc9.patch.tar.xz 25864 BLAKE2B 857803d4c46b47b1e06e962533c
DIST darktable-2.6.2.tar.xz 3512572 BLAKE2B ee3070ac0f6b6b1c401865801631fb28397f484f30778065b7f899204813530a47ff6e752504b645f59bc29f868e1498e39f5f4e70f8259d8fecf5abc3f15cd6 SHA512 e7a90535747a8615fa2dbd1eb05f81314cc61c689a8a85fda0e2be40208ab0248e6f6ef296bb0894d3d527ed47c6cf6640538029c0c2d58a38d2d5ce10f6f5c0
DIST darktable-2.6.3.tar.xz 3522292 BLAKE2B 7f631a4e68affa41adf538355bd6d0dc8a79c24003b56f414061f8da95f200346fc8b54274fbc256daf705b300d55a370a6d6f24e3420d6f3ba8f848e59fcb98 SHA512 4672f4f4d5fa57fb0d53d3886cd2773a6036334b85a0df29995f1a67c59d6b57534e06c8bf1666c8e294dd92db1197113bb3d625512671625c14e0abf5e2f14c
DIST darktable-3.0.0.tar.xz 3827412 BLAKE2B c461db8dbbeb1342c2911aae3c9803d7762c10bcca434f2a9617e6b83c838db4cae2846a1e40444ec12dc48e3ea210d4d98d520e7a5731fb457b9c03d5344c5d SHA512 de154cc19281f61316363243db3e531be33ac4c4632d6277ba715884b83a3c35f1d433a0e53f5f1eb7ffe03c6fcba4629612c94f942c196807c876b421faafc6
+DIST darktable-3.0.1.tar.xz 3859720 BLAKE2B 5d3145effaaf8f6f7013575e9ae76a1e33aca3e2144d00748e9bf76057822d9fc4767b0908de923ba803c1c0ebcf83858a6ff72965e465679c2df5742d9da475 SHA512 a01830c5177512fb7b59f07a5ac594b486f854d41e7123faa0252caef52386ef3df4896f2c23a61b57a2b9b7bec33f3fd2f1fce6cea1388e1b74056a159e7ffa
DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B a7a254e49dd57ee03480d52f4506a436210324cc4a2651f3c2fd70ca65cb7aa1735934a5e046ffa662b2aa1f081042d2d1e6ce0f70b6768719c52e2d14c358ce SHA512 e68005ee8706f2342755ce3e4dcd6c2907c1607bc9b750154dceb4b52dcccf50c581ab65212efc8ffb2447f5d828e0fdb61d0471c3d14938e098528e50f32e14
+DIST darktable-usermanual-3.0.0.pdf 16237603 BLAKE2B ff5c24bb038deb37269a84389937740fa0ff77a9fb5bef4c484cdd903e39609588f632f577ce53c690d3abb832ace451d0d9d3f563ebdb6196ae8e2dac008a01 SHA512 2523b48e2baaa71561dc119340aed3bbf2ab4481dceb0c3ca2bbb7b0cacfaab894fa4eef82b667648cd7bb049304dbda09fa1a638f7734219b672b3ea8ee0eac
EBUILD darktable-2.6.2.ebuild 3879 BLAKE2B 58de04e0d0b727c939ece0f11a3fccf30f2cd7e81ef11e6a64a4857d2bdfe77592e2e748dc64f34bd27b20603f1a2270e1af0d78b5d280f5d8c98bc403c38e68 SHA512 176fc9b85a1c4d5c28032e435e92c59299c857731c4c1e01490ca57aca18704187e0b62c5d9b7dcca4ac760cbefdf7a00eb3b66b036902ff7c4a6e3769b27f80
EBUILD darktable-2.6.3.ebuild 3791 BLAKE2B 261a2e330605f1fcfdd4b1bb8aaa37918d98130391e4357f5b37e56587e835a90550918f3b821166204f094180946289326be0131e91441cf465f6d30146eb76 SHA512 02c5232606639bde660acbdab7099074c1d649a65029ac730cf63845c6214dbf110e861dbdfd27a2ca4013be5280fb81372fcf701e0f16aafa042a2e8432bcef
EBUILD darktable-3.0.0.ebuild 3758 BLAKE2B 6443b09c668cf00d481b48eefe766513b7b49d2e72bae760318668fe4cf65c0320e90e1ff903ee5f8bcd34a4157bc26975d67e38d2dfd1dc11d8b41c8ec6c8fd SHA512 13d8437dc3036ee70e4d7c41780e27a67841feed0169fbd4c774508c3a8198373b60d1b7524d470724aa8d5bf842ed49d56ac15a5a7396c9b0f8d22db0c16682
+EBUILD darktable-3.0.1.ebuild 3822 BLAKE2B 981f9d0f4732719a232064a82713150f83d50dc25ee9da208360272f9c7fe5fa4c9dfa6fa6edf2c03936d807af0e0c46ddd80d7e93ad5a8931c01ae611f13f63 SHA512 343b9312d48cc3f018e4c0a2b87be69d68d669ba847d42a2e0dcc077d6d17a3a069584d053497b7c4462c1cc4799702a0953e38494d56429d108184f3f9b11ad
EBUILD darktable-9999.ebuild 3135 BLAKE2B 885443963d545004c2d10d49e65bac9d44c22ed1d0414f57ec2dc76a85760e09f06a78ea70a77c6f36739da0c45cc39a133954bccd5ad8af2e1a4149015b7d16 SHA512 da2ac016c0a15b14417a5ee373f6470630e045485738e39bb596365a0013ae48b1d4e0b197d7825ea17faa02e435ef2cbe95dd5b5ccf672cc99eb4cac60a12a2
MISC metadata.xml 784 BLAKE2B 7e7f55f709fa5d7da777b272232cece75e55e2754701f759630afe0857f971341fa0d4b2b1a6c96391b3de2bd94966ccb0ed6e8fb17089de71f34418ed397cba SHA512 ae9a9f28be76a93c0b5c90892489c0e8397ea84f043fa03787e6ad774b8c79c834059fd5e55d6f46e63bd9a9411218585e99e59acef7e21493ff4543bb0210c4
diff --git a/media-gfx/darktable/darktable-3.0.1.ebuild b/media-gfx/darktable/darktable-3.0.1.ebuild
new file mode 100644
index 000000000000..2c9eb9a00a34
--- /dev/null
+++ b/media-gfx/darktable/darktable-3.0.1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic pax-utils toolchain-funcs xdg
+
+DOC_PV="3.0.0"
+MY_PV="${PV/_/}"
+MY_P="${P/_/.}"
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="https://www.darktable.org/"
+SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+ doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
+
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LANGS=" ca cs da de es fr he hu it ja nb nl pl ru sl"
+# TODO add lua once dev-lang/lua-5.2 is unmasked
+IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
+nls opencl openmp openexr pax_kernel webp
+${LANGS// / l10n_}"
+
+BDEPEND="
+ dev-util/intltool
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+COMMON_DEPEND="
+ dev-db/sqlite:3
+ dev-libs/json-glib
+ dev-libs/libxml2:2
+ >=dev-libs/pugixml-1.8:0=
+ gnome-base/librsvg:2
+ >=media-gfx/exiv2-0.25-r2:0=[xmp]
+ media-libs/lcms:2
+ >=media-libs/lensfun-0.2.3:0=
+ media-libs/libpng:0=
+ media-libs/tiff:0
+ net-libs/libsoup:2.4
+ net-misc/curl
+ sys-libs/zlib:=
+ virtual/jpeg:0
+ x11-libs/cairo
+ >=x11-libs/gtk+-3.22:3
+ x11-libs/pango
+ colord? ( x11-libs/colord-gtk:0= )
+ cups? ( net-print/cups )
+ flickr? ( media-libs/flickcurl )
+ geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+ gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+ gphoto2? ( media-libs/libgphoto2:= )
+ graphicsmagick? ( media-gfx/graphicsmagick )
+ jpeg2k? ( media-libs/openjpeg:2= )
+ opencl? ( virtual/opencl )
+ openexr? ( media-libs/openexr:0= )
+ webp? ( media-libs/libwebp:0= )
+"
+DEPEND="${COMMON_DEPEND}
+ opencl? (
+ >=sys-devel/clang-4
+ >=sys-devel/llvm-4
+ )
+ openmp? ( sys-devel/gcc[openmp,graphite] )
+"
+RDEPEND="${COMMON_DEPEND}
+ kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
+"
+
+PATCHES=(
+ "${FILESDIR}"/"${PN}"-find-opencl-header.patch
+)
+
+S="${WORKDIR}/${P/_/~}"
+
+pkg_pretend() {
+ if use openmp ; then
+ tc-has-openmp || die "Please switch to an openmp compatible compiler"
+ fi
+}
+
+src_prepare() {
+ use cpu_flags_x86_sse3 && append-flags -msse3
+
+ sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_PRINT=$(usex cups)
+ -DCUSTOM_CFLAGS=ON
+ -DUSE_CAMERA_SUPPORT=$(usex gphoto2)
+ -DUSE_COLORD=$(usex colord)
+ -DUSE_FLICKR=$(usex flickr)
+ -DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
+ -DUSE_KWALLET=$(usex kwallet)
+ -DUSE_LIBSECRET=$(usex gnome-keyring)
+ -DUSE_LUA=OFF
+ -DUSE_MAP=$(usex geolocation)
+ -DUSE_NLS=$(usex nls)
+ -DUSE_OPENCL=$(usex opencl)
+ -DUSE_OPENEXR=$(usex openexr)
+ -DUSE_OPENJPEG=$(usex jpeg2k)
+ -DUSE_OPENMP=$(usex openmp)
+ -DUSE_WEBP=$(usex webp)
+ )
+ CMAKE_BUILD_TYPE="RELWITHDEBINFO"
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
+
+ if use nls ; then
+ for lang in ${LANGS} ; do
+ if ! use l10n_${lang}; then
+ rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
+ fi
+ done
+ fi
+
+ if use pax_kernel && use opencl ; then
+ pax-mark Cm "${ED}"/usr/bin/${PN} || die
+ eqawarn "USE=pax_kernel is set meaning that ${PN} will be run"
+ eqawarn "under a PaX enabled kernel. To do so, the ${PN} binary"
+ eqawarn "must be modified and this *may* lead to breakage! If"
+ eqawarn "you suspect that ${PN} is broken by this modification,"
+ eqawarn "please open a bug."
+ fi
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ elog "when updating a major version,"
+ elog "please bear in mind that your edits will be preserved during this process,"
+ elog "but it will not be possible to downgrade any more."
+ echo
+ ewarn "It will not be possible to downgrade!"
+}
diff --git a/media-gfx/dcraw/Manifest b/media-gfx/dcraw/Manifest
index 0a49892875b1..1bdc15b97a0e 100644
--- a/media-gfx/dcraw/Manifest
+++ b/media-gfx/dcraw/Manifest
@@ -4,5 +4,5 @@ AUX dcwrap 437 BLAKE2B ec88784e059ab07990acf3a47517f243502a140b451040c77f9320bd7
DIST dcraw-9.28.0.tar.gz 194193 BLAKE2B d39a2d76dbbe74a2aed21c6b132ac25c9dd17312813e7f640a4a6d4abd4e8f1868ad596296ca9bfe61427b8b4764821e32679128747ff5a9452988814b77c638 SHA512 04609c4ddd5d1c9fa0ee1617d2ef25efdc22451e1fa6cf669d93abb1fa630a18198b30a289400f1814c8dca285547da8b081a1b00b085c00bb9318ad25c48a30
DIST parse-1.73.tar.bz2 8186 BLAKE2B 4d7d69bbaad3fd69caeae24e4dfc77fa580d969f903c925f76cf0a7bdb13ff34c96ab6dc9917609ce886365f6971290b3af63aec9fed43b1876aa44dd951521d SHA512 06ffaf72695dc86bfc2bdd10d4f732bc428b72d427f4c10e93fc58536513477cf297adb56fb9cfc5ba5fd5b6b4cd197c33d8dac957a0a1bbe65b23393b64278c
DIST rawphoto-1.32.tar.bz2 3841 BLAKE2B db7a80af4b06fc3709a9ae69d9f166c3323097821bb561af4e0ac9a1ef677cab6cfd5cd7896d1e1fce85e6fab545ced7d00ce809f97332bec594b94a27f77e23 SHA512 6ee5b6c4e4266c8e04221c894c4e737f8a6d2c6f0cc9c82db73064afd68488bd60de19b86b2d7b82780283bbb9f8156ef3149c1c730f09a00dce632744b44d56
-EBUILD dcraw-9.28.0-r1.ebuild 2942 BLAKE2B e26acb57a9bdecf554ef6b32df6048b335e37857a61556cdd609d6d34d8b70c7a671aa904918f73a0e895bb33b032dfe1943d8eb1c4ef70c0b592c45aadcf018 SHA512 14a6c7a2c183d50662f73652922387bb5f432acadcdfca5996e1eaa84b5224dcc587bba334c2931b57912027dd9da08ab9770fe2b73d5cf1fce4005596cce97f
+EBUILD dcraw-9.28.0-r1.ebuild 2943 BLAKE2B c7d50b8613f9585bf637c98246a9c40d0df3953330e807b90b17a6c3a86542496814847842d661e7d21b0bf19f0db94aea522e650b1784135d3d9a7322dd1912 SHA512 cdb2b035f760e755c16d608249613d2c94ecde91e1715a9f8380250764f6c0dbee6d92a2de2f5f579de87ff894c238137ecb908dee6b24b94e75a815ae5f4967
MISC metadata.xml 701 BLAKE2B ad6e3ac7425a35fb16cfde74a0d540ab47676008f1de56cdf3ca101e3724e3c8147cf76f548f22a38862b09c67f34411f44718359e6467bdf8b94b9d041cf82a SHA512 0758eece42b5007b53e04f0ddb6385fbdea360afc8a4cfd94d3f5234e4a677819cbebdca3a78c7f3765770e6ccb5b2d74f20199b7c167137fd15554cc14d0755
diff --git a/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild b/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild
index 149dbc748f21..ab87022b82a1 100644
--- a/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild
+++ b/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.cybercom.net/~dcoffin/dcraw/archive/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
LANGS=" ca cs de da eo es fr hu it nl pl pt ru sv zh_CN zh_TW"
IUSE="nls gimp jpeg lcms"
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 56301149ec4b..c9062d327557 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,4 +1,4 @@
AUX digikam-6.3.0-cmake.patch 2038 BLAKE2B 73c6c7d008c3b76f9347f4192d435e10aa3607abf62436372ef131ac034ef538c1baa8d0d03e6b587b771fb766fa3286c649a6ffc7640a2f21e292b1e524cab6 SHA512 c8e6d2fd6c18d8c8e8733dffd1e0e2fb66b8bf3496aa6f767a4c633a56733c85bc53bdceaf689e84beca672a5013a02349cfca73d9f1e89a99252c7bac526a4d
DIST digikam-6.4.0.tar.xz 340146992 BLAKE2B ca1bc8b0d165f9774354d8489a11d46d8d7467edd3c1e90fd3a96024c4b7cd23bfd5c813251183bcca6d4beac9bffeb9d921beaa9a3752f75f1918796aacd719 SHA512 b3b5e9903538d110613aa872c9215f5e7c19f7520a2b9060c24e686f20f72075378b447239dd3e17cb8860cdd35c699399994199b848757f0497ad25a7805e42
-EBUILD digikam-6.4.0.ebuild 4353 BLAKE2B 0bd8a3906543c12f68f755d2917cffe42980cf0a1223a2eebe63cce2bf55f0491a517e0a58810d36cbe5d9dc8e895d3e59e0ca9aad9e5fe06508c0021d701049 SHA512 6ab9c8bbcbcee0c7dfc049650d91192670cdedfbc7812149b7e67cffe7e0785eb51be9853a9c3f452e9bb41a28375f350da11f2054417bc2a0f14d58f2ff6c9e
+EBUILD digikam-6.4.0-r1.ebuild 4361 BLAKE2B 2c1c4bb2a47d433b4230a597a1a8bd275c242d0ae069809e3f933a9076d4ba58b00b41bbca196faad98aaf25d344689ffba23613d4027a4196113ef5d2ca0081 SHA512 a586fa2ba60d7227bf49cb5a94571a0d36916c0d64da9e3aad8f63d33cc4bf12c45772fff9262cfe9a364d07a018139a079f5515e262aa3e4189d9995fd5be9b
MISC metadata.xml 1368 BLAKE2B 5dec50abba4f748e1f8eb465807c719f4b81759277241169d9e721749a1ba807425f7d46e9feb1edb4dcf3b4dd00b40bfbb353fe479e29c8a1878ad1fbfb5082 SHA512 4cd1ada9c4274338e49a692095d80b572c309bd34c838e2663a18ec1e7230de87e27087febfedde46a0f6af19f1a3f440335750375117d20eacd0c756db8b2f8
diff --git a/media-gfx/digikam/digikam-6.4.0.ebuild b/media-gfx/digikam/digikam-6.4.0-r1.ebuild
index 5bce62aec098..99983ca35b3b 100644
--- a/media-gfx/digikam/digikam-6.4.0.ebuild
+++ b/media-gfx/digikam/digikam-6.4.0-r1.ebuild
@@ -36,7 +36,7 @@ COMMON_DEPEND="
dev-libs/expat
>=dev-qt/qtconcurrent-${QTMIN}:5
>=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5[-gles2]
+ >=dev-qt/qtgui-${QTMIN}:5[-gles2-only]
>=dev-qt/qtnetwork-${QTMIN}:5
>=dev-qt/qtprintsupport-${QTMIN}:5
>=dev-qt/qtsql-${QTMIN}:5[mysql?]
@@ -103,7 +103,7 @@ DEPEND="${COMMON_DEPEND}
dev-libs/boost[threads]
"
RDEPEND="${COMMON_DEPEND}
- mysql? ( virtual/mysql[server] )
+ mysql? ( virtual/mysql[server(+)] )
panorama? ( media-gfx/hugin )
"
diff --git a/media-gfx/displaycal/Manifest b/media-gfx/displaycal/Manifest
index 3d5ca7c3cb34..162feaf5e613 100644
--- a/media-gfx/displaycal/Manifest
+++ b/media-gfx/displaycal/Manifest
@@ -1,3 +1,5 @@
DIST DisplayCAL-3.8.8.1.tar.gz 10625317 BLAKE2B 3e988221ee7d75d5a34b1cd69ab80737017c7e7a0fa16c3bc1587210b6b1108e623a3ccada3be8b99fae4c0a70f2cf45293222232f87f0ac13fedf2a1f22fcbd SHA512 e16cdc4590274f10fc122e18a5d94a1d326c43bc132e7af97c6f28c5a656f02203cfb7c73b92fa98d3ee2a8bbf560514615bc9b34c881d2758a5a6f2867092b3
+DIST DisplayCAL-3.8.9.3.tar.gz 10639277 BLAKE2B b99d2a39eb707654799b089a8f14891b257a27cb209511ed04ea6e2de7ec4bc3e68db884ebc460e25325495645d1a851b936f91632c571a385e009ea6b9cd6d2 SHA512 cece09605c12be6a154d8d8b088005e527a9e6674a89ec2787b0687a92b7f424749681f149a07bb798df6729c9f4c37e8760abeec115a014c06f94f25fc2f904
EBUILD displaycal-3.8.8.1-r1.ebuild 1652 BLAKE2B 929df5b37144ce00c74285209caefd907fd5bc2f4a908cd96d34d745f570c54b9fa499309a8a3f6a3c68187fa2950df02c690e62f25fdaeec34cda8e832558dc SHA512 cb2ac10df0dac035c0eb97a4bba1e4a2f985c07fd04b18bb4152e922113cfaea0bb6b5be1ae30ceb543713050fbd16064677f654931531073a970c9ef23ff17b
+EBUILD displaycal-3.8.9.3-r1.ebuild 1747 BLAKE2B 49e885a779858fd543adc4be952200d046c91bc51a65652318e75acfbe7322f31ebd5785c70037f9aad3889ad0fc475af6e37f6c73240555d3612768712b39fc SHA512 9a09bd7e3e5287ec0b1ce57eb7e2d9014e024655b6f76966d2d83be8050fbc16919bf830bfe6bb256a530ba2fcb84ca403f86cd28a7da5adb6ebf1799bec7682
MISC metadata.xml 342 BLAKE2B e74a7767c5b6e82bd35776606de555f9d4f26a25727decc6b0216fa3ea27cee8f28a7749e46b842c52e403c5150b24b4e33e0b971bd49077814e7945ee8cc290 SHA512 f9d5979fc8525c40af8d4e64afb8264873b0ae7cda1e9c4f3b3f30957c2a4f7fcbab76002783213a896395e8b5ef78e315441c28872589a91a0035d5f346d317
diff --git a/media-gfx/displaycal/displaycal-3.8.9.3-r1.ebuild b/media-gfx/displaycal/displaycal-3.8.9.3-r1.ebuild
new file mode 100644
index 000000000000..002517155d42
--- /dev/null
+++ b/media-gfx/displaycal/displaycal-3.8.9.3-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 gnome2-utils xdg
+
+MY_PN="DisplayCAL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Display calibration and characterization powered by Argyll CMS"
+HOMEPAGE="https://displaycal.net/"
+SRC_URI="mirror://sourceforge/dispcalgui/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ >=media-gfx/argyllcms-1.1.0
+ dev-python/wxpython:3.0[${PYTHON_USEDEP}]
+ >=x11-libs/libX11-1.3.3
+ >=x11-apps/xrandr-1.3.2
+ >=x11-libs/libXxf86vm-1.1.0
+ >=x11-libs/libXinerama-1.1
+"
+RDEPEND="${DEPEND}
+ dev-python/faulthandler[${PYTHON_USEDEP}]
+ || (
+ dev-python/numpy-python2[${PYTHON_USEDEP}]
+ >=dev-python/numpy-1.2.1[${PYTHON_USEDEP}]
+ )
+ || (
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ )
+"
+
+# Just in case someone renames the ebuild
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ # Do not generate udev/hotplug files
+ sed -e '/if os.path.isdir/s#/etc/udev/rules.d\|/etc/hotplug#\0-non-existant#' \
+ -i DisplayCAL/setup.py || die
+ # Prohibit setup from running xdg-* programs, resulting to sandbox violation
+ sed -e '/if which/s#xdg-icon-resource#\0-non-existant#' \
+ -e '/if which/s#xdg-desktop-menu#\0-non-existant#' \
+ -i DisplayCAL/postinstall.py || die
+
+ # Remove deprecated Encoding key from .desktop file
+ sed -e '/Encoding=UTF-8/d' -i misc/*.desktop || die
+
+ # Remove x-world Media Type
+ sed -e 's/x\-world\/x\-vrml\;//g' \
+ -i misc/displaycal-vrml-to-x3d-converter.desktop || die
+
+ distutils-r1_src_prepare
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_icon_cache_update
+}
diff --git a/media-gfx/ebdftopcf/Manifest b/media-gfx/ebdftopcf/Manifest
index 4b64bba9334a..f4e39a58bd00 100644
--- a/media-gfx/ebdftopcf/Manifest
+++ b/media-gfx/ebdftopcf/Manifest
@@ -1,3 +1,3 @@
DIST ebdftopcf-2.tar.bz2 7774 BLAKE2B 4dc1bde62b796f441332511e1b9206f9eadd216ab66dc1a6858dc467f9dfbbaaeb4a7de494eaae4584d8a57d59a0eb96f69047d1a57bd007cbb8e2f7aaccd1c6 SHA512 4631f1591290e0ddc778d5c557aff1e698d8dd7e5ac7e659fda7752642034fbabb091c840dcfad5695e9fc19909203a7fdc0b7a69d57a162ce6bb8fe710ef0f4
-EBUILD ebdftopcf-2.ebuild 626 BLAKE2B 2fdec10ad10a814fbda7f3f7c83d357e38feb60df254323122e79694a5866dd2fbc4428862e49efda143585b25e41d0f51fd5ff60e31aebc0d95efaf4e296b84 SHA512 f0fe4ce86574b9923565b7aab8f8e094aad857a031070bd3bef8a7f8a1ebc9d14251496ffb9e30abef43a5bdac671ffcc7589337b50b29d2d1f67fcab9b8fc81
+EBUILD ebdftopcf-2.ebuild 624 BLAKE2B 2bf9118d680116aa0882e26be4ff813578d05d29be8120d39aa2016f306be929cc455e8f24841f454548c42cd87dae0df033ba610df26fee493290e971579839 SHA512 ddace27e5fc1686437119aad76de35d4cef7a6c4ef161592cddcb7b3cb9252e4accba647e9858ba033f19eb0717b5f419cace32181f0bdcf31f798e257595048
MISC metadata.xml 310 BLAKE2B d6b0416573d232c5715df5dcb05139b22609ce8ffb46530c2fd7a0cecc87b37ce2ce286310a80244b1911d5750eb29b55eef6b8c01f6d62c8d007ad2a9b5aae2 SHA512 1923349dde66e8078b37566097a21ead2555a73fdfd97b89beb44a714958dc80f4387ceb642d238419ce0ec388c335ba5db1db5f23b380131f0fbbd51ecd8f22
diff --git a/media-gfx/ebdftopcf/ebdftopcf-2.ebuild b/media-gfx/ebdftopcf/ebdftopcf-2.ebuild
index e2cc624b1b2d..0713f1f4e464 100644
--- a/media-gfx/ebdftopcf/ebdftopcf-2.ebuild
+++ b/media-gfx/ebdftopcf/ebdftopcf-2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""
# these apps are used at runtime by ebdftopcf
diff --git a/media-gfx/entangle/Manifest b/media-gfx/entangle/Manifest
index db11534e9c12..b0aea091105e 100644
--- a/media-gfx/entangle/Manifest
+++ b/media-gfx/entangle/Manifest
@@ -1,3 +1,3 @@
DIST entangle-2.0.tar.xz 501912 BLAKE2B b7e1c393dc95d66bf4389c607c0eb6eb70161ceb2c845135c7c99313a1ec13388c6b00fd6ed7f38ad6f9f18d8c97eba0aadab7964d1be8ec03373e5598374796 SHA512 be8b75c5dd0bdd7cd380f35b5d46d7be9f7caa2be257ce954cf9516ebd5601071ac8b50838f9c40470b6e3e5f95083c3671af68ac43eb345a60d674636a0fe86
-EBUILD entangle-2.0.ebuild 1400 BLAKE2B 75268e384d7d12a4521b79032571366c6fb14ba04bcfc10ec0ea2164f5a043936aa2ef727a54d1e80c6e8e4f30171eb2cf886013c0b4ef16655f0269716e79b1 SHA512 ed8528f959d585ee1619eefe1bbcddf100be7508ffbb794e921bd23222ec5f6198ef7a03774f9fea6030752f00c931a7000e642bc83f820251083af18836c38e
+EBUILD entangle-2.0.ebuild 1609 BLAKE2B 37cf9af5ed3a495629b477c8f41129f51030e362c2c18510c363f6f6e3d878f0d47dcd0a98645e8dd8e79e075b07b171fcf5b12885a502d773c8e1014bc5191f SHA512 9ab26a4e189119a59cf65c3c591c44f6f934782a3a8e25b8e9dde4df2055aa83b2c1b380c6acea60e5ca2e3926aa791bc25aa3ef16ad4c2a04dce92b205793d1
MISC metadata.xml 446 BLAKE2B 1c466f17b5df47045169784918723e953945eaad2eb5879cde6f099feec4cb419e867f77879927933fe3daec259184a361f464b968b19bdf3463b01b7371589d SHA512 555966a8638a027288abdc7ba6d625c15c18792c3401d399a12dc256ec75f14882fce3e70596a3f3e2ed6729e471af04b14d520b8e2e70206a172f98b9967dae
diff --git a/media-gfx/entangle/entangle-2.0.ebuild b/media-gfx/entangle/entangle-2.0.ebuild
index a8563923bc55..9094ca377da0 100644
--- a/media-gfx/entangle/entangle-2.0.ebuild
+++ b/media-gfx/entangle/entangle-2.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit gnome2-utils meson python-single-r1 xdg-utils
DESCRIPTION="Tethered Camera Control & Capture"
@@ -48,6 +48,11 @@ src_compile() {
# prevent gst from loading system plugins which causes
# sandbox violations on device access
local -x GST_PLUGIN_SYSTEM_PATH_1_0=
+ # pre-generate enums to resolve race conditions
+ # https://bugs.gentoo.org/709740
+ meson_src_compile \
+ src/backend/entangle-{camera,colour-profile}-enums.h \
+ src/frontend/entangle-image-display-enums.h
meson_src_compile
}
diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest
index c68d05ddb3b7..17985e7cf3e2 100644
--- a/media-gfx/eom/Manifest
+++ b/media-gfx/eom/Manifest
@@ -1,5 +1,9 @@
DIST eom-1.22.0.tar.xz 2171992 BLAKE2B 5fc1dc872dabd6c7e06c3df778ed1616ecd66487a7ffae94744b299d54df840623759fb559727db1e4e6089021f26a21568bf4682c33fdd434bc2e0924c9a698 SHA512 1e086d1e2a0adc02978ffb45a4636e9b614a52d53a7a821af4050029f3fa3a774c29c2d43b5f2e0c58a100311eccc34e9424caf44e7e2139b4fa8d695b77cea0
DIST eom-1.22.1.tar.xz 2142132 BLAKE2B c68f6d6ee4284de7dea3f3d9761f4b67a2edc0a169b3c3ac04ac6efd13e9f1044cf0be023e36891672b31ff73815d7ce765d8db656bbeb69f324e0ee412eb231 SHA512 f510de62b9b6f11d02df067128042d6905484e0509a939b7919405d0c1dd03fe4b6735dcd8ccf780d36c5713f4585b50b2727645a454da148307a74cf542be87
-EBUILD eom-1.22.0.ebuild 1368 BLAKE2B 974c39063c4666a9c6c7a5748d41d5f7f80748423e6941cb120aab9369a52f2f23888013e1bf1519ade27abb540290c607a95357ad48db2899a4ed21be2e8ac4 SHA512 56ef038a5e994fea720703b4cdb5a7b7b9d6f6202a76d2e40f3973899e0b78546e3ac1fce01799225712bd0ead9f91570b05eac4b4943d186688030c99e7ecdd
-EBUILD eom-1.22.1.ebuild 1370 BLAKE2B 93858e4db6e7d57a1441574cf300d40116d9bd17019cd3d2b1df5336c102271a8f7d4d3501cec0ed42c3d572fe3615ef437934c1e19f9c76d010fdf6baa77671 SHA512 39d1518981d77d54232f237d9cce8a63891b4e8872f79a4cf1188f47311e8f002f4d4724b61790c38f81eafc46767f608210ff1445d6e94e0885a910adab5cdc
-MISC metadata.xml 332 BLAKE2B f99f5d545ed10be2869ef90b4b80eeb7a8ffbdc291f5808a121842d7f6faa1de8ebd0b2cbe13db7ae04b6073387a29dcf78fa90dc6ef3b31cab07551f7c02f5d SHA512 e915e0cb254f2e1a431eccd93b45be28d85b33f0d988508031dea48a87be182a54cea01fcffecc202c029b0b6156860471841ed871e00c929fde1fb0dceb4317
+DIST eom-1.22.2.tar.xz 2158376 BLAKE2B 88d8b635af5b37f1ee4a36c08eb6f4a50cada86f605ab5927b031458f7f36191fa76457263ce38a9f8a02b7ba59308655b5df7039a73083192bf89c15fbee32f SHA512 1045c6bb98056ad707b0acf509c12e0400c21238482bf801abc6b69252f2ffe9687f7fda8b7e09c6338bc80794b104cbb42c1ea89ff1f169c45fdc1fcbdbeabe
+DIST eom-1.24.0.tar.xz 2433420 BLAKE2B 58f99ba3cf0df3594c459af691cc6ab281657facb49bc3b6101bec1718b165b72b882aabd9abac3c4981b547157aa64d2f24f174fccae06cdaa685728e49740c SHA512 17d26a9341cde0a86f8d8b65008f554398111d80f5d131441654bd9e907df9c9d696038e678aca8d7f4bd2923ff593f626735a3cc30451118818cdbebceb87ab
+EBUILD eom-1.22.0.ebuild 1390 BLAKE2B 06ef43f493912fb2de7881e22458845a8a1d56862155a32fea3c409eefada91ea7ffaa97bb14baa91be6091276885b00d6ee1abc7b6c0bb6ec02dff182f1918d SHA512 ab19d51c490b8a3259243d3a2f602bfc912fdc78ab84d4af4f9825f75f1874f2fbcc093b35127d724ca9b22e2648de258a7f76f90caa7c1cfb441440eeb1e2dd
+EBUILD eom-1.22.1.ebuild 1392 BLAKE2B 8df9a098bd938c89497822854e017a8d5b5a1a8b0dbccd5070e26986fd3e34f5fc73a056ac1aaf5aa5ad7241cb1944094d2073f8195f37d016c80b012ac435df SHA512 6eca16a5e3601ceeeb9c59a489f2698f995864b8a570e8e4c072eefd9711fb5e7a9a97d21570d82b52956b49ee5322547ef9bcf4ed205fe69c3de35c91f37a3b
+EBUILD eom-1.22.2.ebuild 1392 BLAKE2B f663cf36a2a12cfcc5f6c8865bf64665854f40e5037ae26311a1ef049cbc6a9cb1bbf865bd37fe67870067d75990eb32c99e9c19dea08ebce8cc662f9417ae09 SHA512 22aacfe12a4dc4b04d6db573b36ede53e6f9fe633b52c7c263bab30baacc60b6d606546fb851ba1e25a64dfcb31eec8fa81dcceff574368a0d57669200446283
+EBUILD eom-1.24.0.ebuild 1605 BLAKE2B d3b052ef8c91f55a20a087b5c233b30891c6637e1c9000f3c0a168ed192370dc55f921b553186c3b03d1993dffdde145a9395593529e2b3e66ca3499ce4c79cc SHA512 00860a79f7a18c077306e72534d7f290a902e6c9ad60b96de8b990b0811c6e9dc21e00c87c41d62f31034250a623e593ef592115fcf5d83618cc7bee4b68a0f9
+MISC metadata.xml 467 BLAKE2B 5314ab156ff29533e419e8d6b82d634bd3ffd7898e8125525d2d45460dfa464c8c9a7311f3fb69e33172b523e85816d6ecaba0487087dacafd42e31cb261e3d7 SHA512 d21cd9729f0f8bde3caec98e3a7f75de8075b129651b7c25d386cbd1cf9f4a41972f48a6addb7180ae40a0c2a626a5508dab5736ed71d60b56bdd2132d479854
diff --git a/media-gfx/eom/eom-1.22.0.ebuild b/media-gfx/eom/eom-1.22.0.ebuild
index c0f71f634ca6..9e84c4ed3c3d 100644
--- a/media-gfx/eom/eom-1.22.0.ebuild
+++ b/media-gfx/eom/eom-1.22.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} != 9999 ]]; then
fi
DESCRIPTION="The MATE image viewer"
-LICENSE="GPL-2"
+LICENSE="FDL-1.1+ GPL-2+ IJG LGPL-2+"
SLOT="0"
IUSE="X debug exif +introspection jpeg lcms svg tiff xmp"
diff --git a/media-gfx/eom/eom-1.22.1.ebuild b/media-gfx/eom/eom-1.22.1.ebuild
index e6779fb6b7d2..9732879b8464 100644
--- a/media-gfx/eom/eom-1.22.1.ebuild
+++ b/media-gfx/eom/eom-1.22.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} != 9999 ]]; then
fi
DESCRIPTION="The MATE image viewer"
-LICENSE="GPL-2"
+LICENSE="FDL-1.1+ GPL-2+ IJG LGPL-2+"
SLOT="0"
IUSE="X debug exif +introspection jpeg lcms svg tiff xmp"
diff --git a/media-gfx/eom/eom-1.22.2.ebuild b/media-gfx/eom/eom-1.22.2.ebuild
new file mode 100644
index 000000000000..cd0a1d6937c3
--- /dev/null
+++ b/media-gfx/eom/eom-1.22.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="The MATE image viewer"
+LICENSE="FDL-1.1+ GPL-2+ IJG LGPL-2+"
+SLOT="0"
+
+IUSE="X debug exif +introspection jpeg lcms svg tiff xmp"
+
+RDEPEND="
+ dev-libs/atk
+ >=dev-libs/glib-2.52:2
+ >=dev-libs/libpeas-1.8.0[gtk]
+ >=dev-libs/libxml2-2:2
+ gnome-base/dconf
+ >=mate-base/mate-desktop-1.17.0
+ sys-libs/zlib
+ x11-libs/cairo
+ >=x11-libs/gdk-pixbuf-2.30:2[introspection?,jpeg?,tiff?]
+ >=x11-libs/gtk+-3.22:3[introspection?]
+ x11-libs/libX11
+ >=x11-misc/shared-mime-info-0.20
+ virtual/libintl
+ exif? (
+ >=media-libs/libexif-0.6.14
+ virtual/jpeg:0
+ )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+ jpeg? ( virtual/jpeg:0 )
+ lcms? ( media-libs/lcms:2 )
+ svg? ( >=gnome-base/librsvg-2.36.2:2 )
+ xmp? ( >=media-libs/exempi-1.99.5:2 )
+ !!media-gfx/mate-image-viewer"
+
+DEPEND="${RDEPEND}
+ app-text/yelp-tools
+ dev-util/glib-utils
+ dev-util/gtk-doc
+ dev-util/gtk-doc-am
+ >=dev-util/intltool-0.50.1
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+src_configure() {
+ mate_src_configure \
+ $(use_enable debug) \
+ $(use_enable introspection) \
+ $(use_with X x) \
+ $(use_with exif libexif) \
+ $(use_with jpeg libjpeg) \
+ $(use_with lcms cms) \
+ $(use_with svg librsvg) \
+ $(use_with xmp)
+}
diff --git a/media-gfx/eom/eom-1.24.0.ebuild b/media-gfx/eom/eom-1.24.0.ebuild
new file mode 100644
index 000000000000..c1052d39a53b
--- /dev/null
+++ b/media-gfx/eom/eom-1.24.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="The MATE image viewer"
+LICENSE="FDL-1.1+ GPL-2+ IJG LGPL-2+"
+SLOT="0"
+
+IUSE="X debug exif imagemagick +introspection jpeg lcms svg tiff xmp"
+
+COMMON_DEPEND="
+ dev-libs/atk
+ >=dev-libs/glib-2.52:2
+ >=dev-libs/libpeas-1.8.0[gtk]
+ >=dev-libs/libxml2-2:2
+ gnome-base/dconf
+ >=mate-base/mate-desktop-1.17.0
+ sys-libs/zlib
+ x11-libs/cairo
+ >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?,jpeg?,tiff?]
+ >=x11-libs/gtk+-3.22:3[introspection?]
+ x11-libs/libX11
+ >=x11-misc/shared-mime-info-0.20
+ exif? (
+ >=media-libs/libexif-0.6.14
+ virtual/jpeg:0
+ )
+ imagemagick? ( >=media-gfx/imagemagick-6.2.6 )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+ jpeg? ( virtual/jpeg:0 )
+ lcms? ( media-libs/lcms:2 )
+ svg? ( >=gnome-base/librsvg-2.36.2:2 )
+ xmp? ( >=media-libs/exempi-1.99.5:2 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ virtual/libintl
+ !!media-gfx/mate-image-viewer
+"
+
+DEPEND="${COMMON_DEPEND}
+ app-text/yelp-tools
+ dev-util/glib-utils
+ dev-util/gtk-doc
+ dev-util/gtk-doc-am
+ >=sys-devel/gettext-0.19.8:*
+ virtual/pkgconfig
+"
+
+src_configure() {
+ mate_src_configure \
+ --enable-thumbnailer \
+ $(use_enable debug) \
+ $(use_enable introspection) \
+ $(use_with X x) \
+ $(use_with exif libexif) \
+ $(usex imagemagick \
+ --without-gdk-pixbuf-thumbnailer \
+ --with-gdk-pixbuf-thumbnail \
+ ) \
+ $(use_with jpeg libjpeg) \
+ $(use_with lcms cms) \
+ $(use_with svg librsvg) \
+ $(use_with xmp)
+}
diff --git a/media-gfx/eom/metadata.xml b/media-gfx/eom/metadata.xml
index 10a0fa992482..97d9881c4a8e 100644
--- a/media-gfx/eom/metadata.xml
+++ b/media-gfx/eom/metadata.xml
@@ -5,6 +5,10 @@
<email>mate@gentoo.org</email>
<name>Gentoo MATE Desktop</name>
</maintainer>
+ <use>
+ <flag name="imagemagick">Use <pkg>media-gfx/imagemagick</pkg> as
+ an external backend for the thumbnailer</flag>
+ </use>
<upstream>
<remote-id type="github">mate-desktop/eom</remote-id>
</upstream>
diff --git a/media-gfx/evoluspencil/Manifest b/media-gfx/evoluspencil/Manifest
index 7ab9eb902965..2ad7586b6010 100644
--- a/media-gfx/evoluspencil/Manifest
+++ b/media-gfx/evoluspencil/Manifest
@@ -1,6 +1,4 @@
AUX pencil.desktop 202 BLAKE2B bb588b85ed8e8e9fbed0425f3a6a88dabe77d42a1c6efbe9cfc32017d2373015b8f64899c5ca0f8992278debeeff73ca8c0985038f21342e25198eefa059c251 SHA512 101e4f9a205b71ae3a2ee084b40108a05acf210b78d54dad2d35c6fc215468d8fad10a963aee2a7dffd0406b56a98b61a0e28cf8b9ee563a78f66b9fd20e620c
-DIST evoluspencil-3.0.4-49.rpm 55779457 BLAKE2B 7f74bf4d0ac4dcd6ef2e37d56e6b06eda72a34e6c4bc0e2fbb5b55727bb3ba0ecfe183e64ad5f6abe77d258dca2bfc7acca0d08c934a7700699690ff8d39e335 SHA512 72a17841d214523223d6f35ca8ba69076070baf83248ceb5747a23865ec955f8aafbb799eb01b3a3c99226a7bc1653e55be6f7292941b1a859598e016673f2ec
DIST evoluspencil-3.1.0-1.rpm 88059338 BLAKE2B 905f37968815be8daf37f60197f33636094c1007553d917f4098e09de9943bbd027bb21cf216df64145206ac968b48fff7a91fcb3acbb1b5d01a897375e31e99 SHA512 3a9a451563f499d918b36b48482a13107e18de0f7fcb786b20a88ffd8f487cf07cfdc279bcf6d4db3b8bbde89a424352d7e1fa1d8eeaa4972d830ec22883a15f
-EBUILD evoluspencil-3.0.4.ebuild 1214 BLAKE2B e1f6e703f422d56b9e8c7c88d5c92be1d31fd9f52e7a5693032169030684787066118bf78eee2887f26085cd491e0e1d33f1220bcd7827a4b3181c869251a505 SHA512 5171bedc17afcb591a5321766c676508ddc82525c54cfe036857bf3a9a368e49936042da78c6ffe74dcdbb56d4214f60f4daf7ead62399e6c25a8c468bc8991a
-EBUILD evoluspencil-3.1.0-r1.ebuild 1616 BLAKE2B 8dbec54ba4d1372b3bc990b5da3aa4ff3a46e48c26d39718ede9de1874ee18d5635127f9622f55920f7aab9833ab6694a76851a120274a8590be5aa82d026af2 SHA512 def7c667788ee4d30a6065e1b0f68e70d2de1d1809ebaeb392a60bbe10c93df44b235db0535a4317113716cc3d0ea0b09529aad5d4e421c66d608dc1c1e9a083
+EBUILD evoluspencil-3.1.0-r1.ebuild 1614 BLAKE2B bb6b4b4389b2df7facd1f9e5054227742c1efcc99226e710bc43fc0c8c97fd4f4edbbdc715d88c8998c00d88bdb0ffce170537366f9026c3b18bf15563933e32 SHA512 df1927ff496d88d67306b56931b419b96c62adfef5a704c25dc5a4a9fccb50ef61a260b7b6ec44549240678117938b88348d12d473a26e8065e379aea8dec2c0
MISC metadata.xml 299 BLAKE2B 219ec05cbf4172c1097e96d59b6e6cee44ea19ebe827440b53493c1953bebe7c5a3f017b6d2ef0bb5300a3d9cd957e683461c4f3edc8bc4d17603c7d78ed59d9 SHA512 be27e090213278995ed73b5b85ef663921136f999def3608d1fdf79bd6537ba38d2424f204e228aa498fa85a2e327633c63b6ca01dae330cc37c4f6832ff861b
diff --git a/media-gfx/evoluspencil/evoluspencil-3.0.4.ebuild b/media-gfx/evoluspencil/evoluspencil-3.0.4.ebuild
deleted file mode 100644
index 10668457f52f..000000000000
--- a/media-gfx/evoluspencil/evoluspencil-3.0.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit rpm xdg-utils
-
-MY_PN="${PN/evolus/}"
-
-DESCRIPTION="A simple GUI prototyping tool to create mockups"
-HOMEPAGE="https://pencil.evolus.vn/"
-SRC_URI="https://pencil.evolus.vn/dl/V${PV}/${MY_PN^}-${PV}-49.x86_64.rpm -> ${P}-49.rpm"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
- dev-libs/atk
- dev-libs/expat
- dev-libs/glib
- dev-libs/nspr
- dev-libs/nss
- gnome-base/gconf
- media-libs/alsa-lib
- media-libs/fontconfig
- media-libs/freetype
- net-print/cups
- sys-apps/dbus
- x11-libs/cairo
- x11-libs/gdk-pixbuf
- x11-libs/gtk+:2
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libXtst
- x11-libs/pango
-"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="
- opt/${MY_PN^}/*.so
- opt/${MY_PN^}/pencil
-"
-
-src_install() {
- doins -r usr
- doins -r opt
-
- exeinto /opt/${MY_PN^}
- doexe opt/${MY_PN^}/{pencil,libffmpeg.so,libnode.so}
- dosym ../${MY_PN^}/pencil /opt/bin/pencil
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/media-gfx/evoluspencil/evoluspencil-3.1.0-r1.ebuild b/media-gfx/evoluspencil/evoluspencil-3.1.0-r1.ebuild
index c19f32abf04e..7bc0b978bc5c 100644
--- a/media-gfx/evoluspencil/evoluspencil-3.1.0-r1.ebuild
+++ b/media-gfx/evoluspencil/evoluspencil-3.1.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://pencil.evolus.vn/dl/V${MY_PV}/${MY_PN}-${MY_PV}-1.x86_64.rpm ->
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
app-accessibility/at-spi2-atk
diff --git a/media-gfx/exif/Manifest b/media-gfx/exif/Manifest
index 957f8e11baa2..bdc726a6973b 100644
--- a/media-gfx/exif/Manifest
+++ b/media-gfx/exif/Manifest
@@ -1,3 +1,3 @@
DIST exif-0.6.21.tar.bz2 387531 BLAKE2B 494d4910af2e8f740aeebdeeaf8dec5ae638d3e78339c55d5acc38879ab4837164d2ef407bd07a2e36a00df15d53b132bb027e2e97e79c229c589819af3b7f7b SHA512 73b5b7df08462a6a084a8fb973c39197f5d64ed753a97cb2f94a4acf815fdf0313214c2c8e44a46a24a1f6304fdaa68a579b4a2e246cc095f6e9588e93368cdc
-EBUILD exif-0.6.21.ebuild 578 BLAKE2B f726c2bbfebb9e2b4995ebc34cd32d401a0a842bfb76f47fbbbe978e435d4bc5aba97d43aacd8a6841df1ab752f0355432564c2db8c74e0ed9becea20fe0b0f9 SHA512 004a71575b1dc4903b3da50df53bebfc2f79da43accb18b11e83352021d55d292d0e07588b1f27917d079f813a6bab81089083bda204e3d4dcee544b1ab6c973
+EBUILD exif-0.6.21.ebuild 579 BLAKE2B 101f7246e7433ce0bd236426fe87ce1487c869163fc8371292360bf2dd04dd828ee1f84a95bfa29bc0ba8a66cddd44a3c24a4ed6961f8ece531a424fb744605d SHA512 3f1d1ac107570a81238d834852cc9b15fa98aa8a0e274aeb74ae6fb9a2f5b535e4d44ac382f0c4d9a464e99bb934faa9864e444edfea845b3301ac1677ca7520
MISC metadata.xml 346 BLAKE2B afa06166d278c5157eb097eb2d1c70fb929e86830868eddf353de6d8178f8966fc0ca06b52c95129555c3d0b4e15202f16135352bec3578cacbcaf7a9eceacb1 SHA512 195346710c3ead4bf9c050f5ebe548e0e7bb86bb1f9f61b2c1664cdda094c0523ee3c77769de7819b2d82cc4abd55e3b57c0827fdd0f97cc440f40b7519feec5
diff --git a/media-gfx/exif/exif-0.6.21.ebuild b/media-gfx/exif/exif-0.6.21.ebuild
index 4f5ebc2326df..fe46fdf14145 100644
--- a/media-gfx/exif/exif-0.6.21.ebuild
+++ b/media-gfx/exif/exif-0.6.21.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/libexif/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="nls"
BDEPEND="
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index aeac03b21301..72390be5874d 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,4 +1,4 @@
AUX exiv2-0.27.2-libssh-0.9.2.patch 2035 BLAKE2B aeb9be311217b80a347d76a7df14ec11fc2018626cf7e9a813865dffd76038db10432fc2c898c0c26bdb3f1556cd34c0f8e4a25b189bc32733a3b4e018b241bf SHA512 25b4ca539585ddc2f4a11fc24ba49e799689d361f5f99f5552e99bd81179c95968affc4a42acd9ac0ba56f237f29ec53970a134b4dce44274a6044638d5bd78e
DIST exiv2-0.27.2-Source.tar.gz 27591236 BLAKE2B bd10d71356e4c8a465b71f8ceac07fbf2fd6cfb287cb22774568ad35eb38200be504e297224920af50a15ab4e9da98384ff4da7c33713f5346b33738380698b0 SHA512 39eb7d920dce18b275ac66f4766c7c73f7c72ee10e3e1e43d84c611b24f48ce20a70eac6d53948914e93242a25b8b52cc4bc760ee611ddcd77481306c1f9e721
-EBUILD exiv2-0.27.2.ebuild 2460 BLAKE2B a1005706088ae5aa1eb7ee147779e7b52bf4e9e352e07519cf716a7205bb9c891633e72de697349b24e98d88e00e952d8427ca393713ac94920b3523314e6aa3 SHA512 c043dd22d651f746f52551de91950deb18776e24c1d3a33156b4e7072bed395f6bb70dff8b0bf4d9eec4a2cf6ce76851448d93dd31ce47e4009dd5f48dca4939
+EBUILD exiv2-0.27.2.ebuild 2457 BLAKE2B 5d610e7e21b215a72a31435a305d5f5dfdb0e9ef3499b6d805ca53729273475ef85c783aa269b106d24bc846007479159551a5cd3b10f8ccf226773c3e44f7d1 SHA512 bfea82132bdad7b89a35114ad4154db0044940324adcf65427306c15ddc1cd2a5152706a11f1613150799d6a1d439f1881bfe9f1dd62f8b4accb96eeb6251bb1
MISC metadata.xml 612 BLAKE2B f98a074e9e3a4411baf8255cd8cab5be4257469463634218b664bb9e7f159c98615f0721bb4463c6183cecc8b2be00c34a031e7b99d745b9807634cbaab8d479 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5
diff --git a/media-gfx/exiv2/exiv2-0.27.2.ebuild b/media-gfx/exiv2/exiv2-0.27.2.ebuild
index eb4ea7a0803c..fff1d66eeb26 100644
--- a/media-gfx/exiv2/exiv2-0.27.2.ebuild
+++ b/media-gfx/exiv2/exiv2-0.27.2.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999 ]]; then
inherit git-r3
else
SRC_URI="https://exiv2.org/builds/${P}-Source.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
fi
CMAKE_ECLASS=cmake
diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest
index ddb5d4bf6304..deeb2265be5c 100644
--- a/media-gfx/fbida/Manifest
+++ b/media-gfx/fbida/Manifest
@@ -2,13 +2,14 @@ AUX fbida-2.10-fprintf-format.patch 172 BLAKE2B 1abaa348e1bdd459b9f6458d361bed01
AUX fbida-2.10-giflib-4.2.patch 542 BLAKE2B e41f1cb27860b0fdf99d4e9a3961021e4be64f6ac9e47099e6dd7b784b96599490137f6340e54052216af1692e2d9177d831612248ed7be849e6141ab5eb86b0 SHA512 7610721d965c3640c4524311626ba099501cac1aef6cea62d32158e8a7720cc23bdb0c83422795676de021f88a592c3d2f7d4d26d810dc06d959f7c85e91019e
AUX fbida-2.13-Autoconf.patch 239 BLAKE2B 749fa77fe9f2a5b8b61051dcebfacc6efcf97cd2f9bd7d9d4de737bca89689203dff7a1c3baff620289ddc211419a1b31a3924b7542049db345af5503479e5f0 SHA512 b87ed3f79fe9efea02fc97d6cde0e6d67c2e6baf93ab3a19564090f2806cbfa1b67610a16a4151ba8df31d570f79f8f964dd608ce4fda95e7f7cbcc562902847
AUX fbida-2.14-Autoconf.patch 244 BLAKE2B 52b9fff1bcb3eaae0753842e953566ce7eebb4ff445dc288b2ca84342247ec0744dac9327c53dc863cf564543e791305d5a27ffda059837320cac461f4e222fb SHA512 cb31757e3ca3eabbff4c4ecb27581b39b8fef386412b4f26558a070b6b08891b09a31a06861d965009f5158e03ab227b86873f4b64316cf63bc7b51ce6074221
+AUX fbida-2.14-fno-common.patch 1148 BLAKE2B 108c21e732afaebe6183835732341b814b1def9a77a4faa55742858d2eeb75a8d2ba4c4151505dbaa683b31b49e1ce6d88aef6ab9b3e6b830a59533903e02597 SHA512 4fe7560be0a5cb4f00ebe8a1574f131b6fd83902c6dbe54995f384a250b25b03e5f0022a5c38c306a709de6240f447c53c9af3ba3aca863b08e725567746185e
AUX ida-desktop.patch 384 BLAKE2B 627319b163e62af11acc2c0957254cc671145b9df22f27af8988e5f0bcdf383f7cf2ad4fa7b7c97acfbba3181081ee1c025c4b3c82e99bfd7fe4efe69edd59c0 SHA512 0e14a3b848774d1538e309a9c8a8f0445a870db21723d11d0c39d86760ccb9c6f9a5f08ec75016875b2867c2d2075b59aad0fa810621f2c2afcccd14fef26737
DIST fbida-2.12.tar.gz 294842 BLAKE2B f9de5957f9015e022868d2b14d0269951fccbe8f10b591b3b58758fb67232487aaaf2de23c8ee9b42a7ad9e645e3fed2ac1f05588c039ce9270f418b60b1a3da SHA512 383eb766a98137f7252cd981d0e8c9a7382223705a43332f50990ea26763d4882ed1585e72fe9199528502d7f8f9de2e90718dbce71ee08d2181c74aa3e7e515
DIST fbida-2.13.tar.gz 296020 BLAKE2B 119be4103b53ab7e7d1791a22172e1311ced0db5e9c928faf22ab08dbe1670c91d30f7dafbf8873a9621c16a7902354f5e21e2a86d45c9572b30fe8e205bfc4d SHA512 a316776f381fac6ec6a5d085ece7a42e8e34b2c0f5ae1cc58ad5b5736dc83d8f2e7776779716abfc0ae9c51baacdf911df6a0be610d2b7b2e3ce6d0c81e1fdc3
DIST fbida-2.14.tar.gz 296826 BLAKE2B 0015b426c5deaf72737a52bddb065e7d0cb804ea97157dded522061d8fabb5c632d5e66b1ef1b4e75b355537ef4f4e603f3a877e2ef92d1581eaa4791ab5be99 SHA512 8f3596ad8a22497880ac698d3b324e038ac5ccae7481fe4a902fc6e8bf43ba1bb3a96af8c7a3347bea86c1988f35674e2647901ac256bd4e8261d467a6a343ec
DIST ida.png.bz2 11928 BLAKE2B 8a1c89fc5adfb16c69f9591a299beb62c84d66960b586fbc819e53f904c90beef821ecf3539236563644c28e3ad3c7dbf861b140c820be649305a658b3613433 SHA512 cf3c1bc8d25fe75f10c0a0414b5c082348df2fa94864ec4537c36e0b357cf35b68e2eca205bbf48578a41c27317701aee621c6dd176e0bf3857c52f895d6bfd3
-EBUILD fbida-2.12.ebuild 2417 BLAKE2B 3aa05ed88d79037d361985b70919ca0d711d248484d55659cc307aece06729ff6208d73807ae2ed2ceab55e4195de8207d032db522152b27a6205baab545894c SHA512 edd97cf604f7c8ec8be49ab7fbe987f9007809e84cd279001ac94076864d6d31393aee25bf5932c093ec4058b4afe5f59d57760abb9e783f8052c6536459923b
-EBUILD fbida-2.13-r1.ebuild 2402 BLAKE2B 22a7d44291b990a24e6fe92bf3cf7e210d9854af92c7bae76ac343dd975f41a5e1e790623abce9a29190120123a2d09bc963564f69cef084762e26a513a6c594 SHA512 de8c0bd27773aa0e33f155ed80e16c1cd6387a60cc5260472460e996d636efa58cabf38831f41c45a64c2473b6cfa111b9f47974457a5d0f5da9e57813d03c7f
-EBUILD fbida-2.14.ebuild 2355 BLAKE2B fdae71cabb570115f0898a00f60c6c7edd6913861c7108990dc62d8f3931bbfe621b7776362354dd456e6d5cc58fccd6a2a294a4430f9bf76cd1ebe3cf8c71bf SHA512 1acf426bf24d070b8207a8196871566dab72ebc49464b6a26a6afdb31d1f81b867969a11d53ef2e0bc129565694d0f8662a82233b4e059f731e866e44c0227b3
+EBUILD fbida-2.12.ebuild 2413 BLAKE2B 2fde21f65df975032f3638e2f22ff4aef0ccd81b408e571fe88cc180ae9cc7d11c00f296158abac0c0b891dd46d3bc9c9bbd0a4e4e332e9c53cb074c74e256da SHA512 e2b31fb9cee9204d38060a2269996c8142a981e0179e67ab86bfebb7967bcfae59a45794106e9e741a5a5269b307290885bdfa1b009919550a034d7302390200
+EBUILD fbida-2.13-r1.ebuild 2395 BLAKE2B b3f42d22b78ce8a0fe9158fad16daef4cf0fea76585c0f83035604b48664dd9f8a98adcbe2cb6e47fdd4c2fde8f33ec03087796c656dcc92682954864a54333b SHA512 e1809154631d9a298007bd02fca72914ffe9244fd904bbd6fa322831e944f02887cca4ac8e7dc50411efd0cd9356cb4ae663677cfd2a50eda5357132c082c30d
+EBUILD fbida-2.14.ebuild 2391 BLAKE2B d43531e71d419ade0e6c06bb2fe92bb72523e466af372a94d6291eeb9dbf3ec36ffbb61ea293e7c590c844f846685c96ee7fd7de78009bfb877dc879891f5b5c SHA512 29ea58a36af771231ea4d7cef4004681662440495ae98893bb143bd0e9ec26fb653688eddaa65f667241a868103e2216394b3685f3543f3848c9594d4cf73209
EBUILD fbida-9999.ebuild 1239 BLAKE2B 78ae23ef4d8f11b72f9c426a35bbcb8d10cc4f2b566c7e13855e631c07d3cf05746c33cac3bd5c48028b1710b10f51f3af3db96fe09978906b460bc40ae2be29 SHA512 2c8aaa0ff740002b3b2b8c4f6de05f9e356d9848fbaf03b30cffa1a492580676494ef9aa2f67410d8f6982180b20c69ba9d96a847f4a8229a3a4a00458400db4
MISC metadata.xml 439 BLAKE2B 66a897b749b63e389153a97d84be2d4cf7e9c06c0b967ae715bd8202e038005ee724110d7d62ff99ef6ba21c8a365634f9350fc43e7dce44c81717cdeee85c54 SHA512 078e39413b3d63c3324c1f98e83b1b9747f2653108e34986dfc869cc3b65452d1b85ecefdaab17c0c53bd50cdb879f68c8b55a9da7d0cdee47ca329af10eec58
diff --git a/media-gfx/fbida/fbida-2.12.ebuild b/media-gfx/fbida/fbida-2.12.ebuild
index ab56de804a32..ac6cac234948 100644
--- a/media-gfx/fbida/fbida-2.12.ebuild
+++ b/media-gfx/fbida/fbida-2.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
"
LICENSE="GPL-2 IJG"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86"
IUSE="curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp"
REQUIRED_USE="
ghostscript? ( tiff )
diff --git a/media-gfx/fbida/fbida-2.13-r1.ebuild b/media-gfx/fbida/fbida-2.13-r1.ebuild
index 64860913dbe4..9c67c20e1341 100644
--- a/media-gfx/fbida/fbida-2.13-r1.ebuild
+++ b/media-gfx/fbida/fbida-2.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="
"
LICENSE="GPL-2 IJG"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp"
REQUIRED_USE="
ghostscript? ( tiff )
diff --git a/media-gfx/fbida/fbida-2.14.ebuild b/media-gfx/fbida/fbida-2.14.ebuild
index 7f663d4f3424..9e5d00b136d3 100644
--- a/media-gfx/fbida/fbida-2.14.ebuild
+++ b/media-gfx/fbida/fbida-2.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="
"
LICENSE="GPL-2 IJG"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp"
REQUIRED_USE="
ghostscript? ( tiff )
@@ -60,6 +60,7 @@ PATCHES=(
"${FILESDIR}"/ida-desktop.patch
"${FILESDIR}"/${PN}-2.10-giflib-4.2.patch
"${FILESDIR}"/${PN}-2.14-Autoconf.patch
+ "${FILESDIR}"/${PN}-2.14-fno-common.patch
)
src_configure() {
diff --git a/media-gfx/fbida/files/fbida-2.14-fno-common.patch b/media-gfx/fbida/files/fbida-2.14-fno-common.patch
new file mode 100644
index 000000000000..e2f29f6be7f7
--- /dev/null
+++ b/media-gfx/fbida/files/fbida-2.14-fno-common.patch
@@ -0,0 +1,53 @@
+--- a/fbi.c
++++ b/fbi.c
+@@ -86,7 +86,6 @@ static int img_mem, max_mem_mb;
+
+ /* graphics interface */
+ gfxstate *gfx;
+-int debug;
+
+ /* framebuffer */
+ char *fbdev = NULL;
+--- a/filter.c
++++ b/filter.c
+@@ -6,8 +6,6 @@
+ #include "readers.h"
+ #include "filter.h"
+
+-int debug = 0;
+-
+ /* ----------------------------------------------------------------------- */
+
+ static void
+--- a/idaconfig.h
++++ b/idaconfig.h
+@@ -17,7 +17,7 @@
+
+ /* -------------------------------------------------------------------------- */
+
+-char *ida_lists;
++extern char *ida_lists;
+
+ void ida_init_config(void);
+ void ida_read_config(void);
+--- a/readers.c
++++ b/readers.c
+@@ -7,6 +7,8 @@
+ #include "readers.h"
+ #include "byteorder.h"
+
++int debug=0;
++
+ /* ----------------------------------------------------------------------- */
+
+ void load_bits_lsb(unsigned char *dst, unsigned char *src, int width,
+--- a/viewer.c
++++ b/viewer.c
+@@ -38,7 +38,6 @@
+
+ #define PROCESS_LINES 16
+
+-int debug;
+ Cursor ptrs[POINTER_COUNT];
+
+ /* ----------------------------------------------------------------------- */
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 50b89672093b..075149e62b64 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -2,12 +2,13 @@ AUX 20170731-PyMem_Free.patch 5579 BLAKE2B ffb048f9790ea237f37bedf17ec50087002c6
AUX 20170731-gethex-unaligned.patch 510 BLAKE2B ed943be0d150c8de7c99decf898cc4cfccf4c3990045a92af79b60c7e018a118996aa4f4b7146408b713b4eaf2b867110dc41d6c99ba302cdc522f62d035572a SHA512 ef4df9ac6589615f4ce619d073cb78dc9fcc281f24a01941567a09a9e536d105672856fa3fded436bddefac4de094d017ed51ace9d5bb0454f44dc373c95927b
AUX 20170731-startnoui-FindOrMakeEncoding.patch 751 BLAKE2B c4a0248affa9117c5150aacb40a54bcb6f29d84866e1d193898f49a4fe58735eda2319856b6cfdbce450492871a5fe2255443849dd0f98ee70285614f7e44bb1 SHA512 0135717d9760a0bbf6d35ce21c19fb9019d3da01859882918a5643bbe6011a55eaf57ad07c8063c2c5c20cd6c6907420f8015abf54210ccdd75b2ba473e6b366
AUX 20170731-tilepath.patch 411 BLAKE2B 39ef99a26b85fc25d6c0b778a6b0ddfdb2c366b6456bd8ed47b12ca8681e8970e65e3b69cd06880794832f761c6de801d9e7c51e1edfff5abf434aa7f7dcc7c2 SHA512 026f6765b2db7549f72cd6ccff8d23bdf357ab24035c89cd792fa933f6033445f6cbaf7fa20f1372bdeda2caa242b9f8237f3019292cba0cc551c6de9e5c8341
-AUX 20190317-gdk_init.patch 1391 BLAKE2B 6b4294e24d1bef0300344d2c11ef59d7d3f22d83ba7e8cc3e981db827dde7c30f234be35c017cc8c854ae090aa1f3e177af2c4bc511365fdbdb2e8c40402dda9 SHA512 3976f2a860f6c6aaec8e1532ede9fde7beff3ae98ca8e0cf87b33b7165f158ae676c751a7cb3e7897f1dff3f03c041d4ee6bd06e68904973b5bc5acdee5bede5
+AUX 20200314-stylemap.patch 869 BLAKE2B a5907efaa1357f5b445eadfa951d9558de78eb1f8eb271cac15318a6d1e7d95c4d56918ca41307c9ff74ab05bf3cc373a5189ccaa5c76282b2c0c5d6834bfaba SHA512 1f0e363d42606fb506dd6f747ac250cce6ab4b5bf49400095cab9fd48b68232a8d58325147d2e1f7ca223093d36edf020f70f383bb0bf24f3a2f2fc3b35fb747
+AUX 20200314-tilepath.patch 1142 BLAKE2B 61aa804682a5e486c2f131fd9d81fc5d29ca946f18d9d11a323d4c49cfa8c9404b846e2afb6ac4dbf00af78133f27819f72f678298c3abfaeecd576877ac1ed4 SHA512 2cbd0ac47c211ceda2e2e4d6b62a69432e084ec664d58ff5e259f2d1eee9b70b64610d4a428d5f86305c8427c21dd6a00944a86a995c8cc5f9aed63df4aa5a31
AUX CVE-2020-5395.patch 3073 BLAKE2B 15fa97a633e2c218f512a7d1202555e2465bad9adf0661bcc314a940d691520ba897ed6d76ff2b80111f3c016d71717ec4170196ce2177f3e6478b26f63e76ca SHA512 7dcdd6c4e8eb433de32fe76c2a1832ba9b318c5889ce03325516fa8d3ce63043a89e740758cf75b10626bac43352292e11ba0fdf31725ecff5b9d3065265ac3b
-DIST fontforge-20190317.tar.gz 22762120 BLAKE2B 5cb85d2fb9a2a08fe64548f2667c026e916dd0239d17d8f8d7d2fe8ecb51f2106cf3dc6e6298014c0deadffbfe91925327b483ed4750a171fb621aea8bdee60b SHA512 55f9b0f7cafb1aa5a1461dbf39b52ca6b69a2baa6b761c8c28f86a0bb99e090d9ecc981294f51dadd9297b5ebd3036f01cb4f17b9a97a737eb567b4ae6522f20
DIST fontforge-20190801.tar.gz 20766334 BLAKE2B c3206e77da4a966b9e513c41c90e19522f3d1aad990cd3035d7c8a8cc009239811743c12c02df3b02fd91fa5a7738913dba43df14523a738a2232cd2d1a91700 SHA512 78f3e1e94e38e26dcf52c6a0e038753033dc47052b7492f0ac0aaf1b8962e4e4bbf07c2550ef6014ea7290a6429bf669acb0691735efe0aee368480b4b7e6236
+DIST fontforge-20200314.tar.xz 13850076 BLAKE2B 5e6ae3b7940a5b3b08811abdfc9d151f231e6d457b219eb0c666e1b831db815b696f345eda0d4d423b7e340f56fca67205734ae19903b3815381080d34b5e95c SHA512 09f5dc93f87ca63668d72d108690604489d6b3cec7eedff1c07ad6d1ce5eae442ab60e79e71ae8b99e9808f3551011788025a86ffc3a9738518d99761d849975
DIST fontforge-dist-20170731.tar.xz 13985256 BLAKE2B 7bc49a3b7747de419e4fafb445062873cf9bf56aa73fd7499509b787a1c0fd6c47b0b5d7bfeb2a69d9237f9f66f989af968b0d00e9d5e57030906394f042f29c SHA512 26f7a40714460716a24dd0229fdb027f3766bcc48db64b8993436ddcb6277898f9f3b67ad4fc0be515b2b38e01370d1c7d9ee3c6ece1be862b7d8c9882411f11
-EBUILD fontforge-20170731-r5.ebuild 2846 BLAKE2B b46db1ea40d29dbef84dfc10a12acdfed036c39543ce1175efbff8b4c77af0e0da438b87074447796280ae223a8918f8f83ba3cdb589adaf02a75e15e817c634 SHA512 a17303781657c81bedd15e690c8d39354155fdfe123b082e1d68246ea7bb0ca5ad3b3b6e00be54785870c4c270414e03eef104ce248f56e9bdd91295fcd9e321
-EBUILD fontforge-20190317-r3.ebuild 2767 BLAKE2B 0f9e4a2b3635106ea515cebd1d60574ac855b984be40c9b40c06d1b0f68256fb637582dee980ed6990bbdd7f0cb302d2b2f1e423712f1814e698d731b9a83da8 SHA512 5e2efe3ce7bee1d3f157ad48ac1b716a76ed466b38178e0d3d905901b8c8d4af21647dd8df7c1fb7d8d9d2ff1b61f3718d911fe3c159ac0eaec4189220239934
-EBUILD fontforge-20190801.ebuild 2525 BLAKE2B e7ab0458ad00c279f544bb19de2cdb614e33bccb1b9e65043e70cf7b29bbcab11978ee4c820a2a912cd95a2546b7fbf47d19e15148c4d9021085e80eca071bd0 SHA512 8e6e70aa680eb038c1d502c9915fb9cce31c5c9bc1a4ebc580a53cae1eb9589be93c0d2471db6b48695a14e85262d82363fab7189d20e485b2816457f908bd9c
-MISC metadata.xml 908 BLAKE2B 57e840cbf69ebd2780ecaf5a3009905b782223a16339beae90acf1c087a185944e33fe952b477184244cb3f5f313fcce32a561ce903d751de457b77f4a90cd74 SHA512 973d4967be4eb7aad087ce977a4d94945a8894138604e8d37257dac97f74e98f7fb9a7cad7e7f46abb4c8c39dcb4bd79e9ad26f96838ad39ac1894e154834d28
+EBUILD fontforge-20170731-r5.ebuild 2823 BLAKE2B 496e75f46e8ef562476c1d6a72d76e2068cd797a29f86dd32dabfd4338a594a04b3aa7e94c06b3c02402c21b61ca71a46a2c7f9d2bb803f63f5c35a6709889ee SHA512 6a05758d6d57e2c838a7aa520bb721c112dcdafd2305566e2dc7e8769ce91def379df759db8415c44387afce2ad7496b4e3a868c4b16786a311a2ded15b47234
+EBUILD fontforge-20190801.ebuild 2470 BLAKE2B 316185d2a92b3a9e508ffc5c4fb699d297c90940f1fd3d973fd88f47610e45547276c54abb89f105f1f2dd98c1f4854ae5137acce3871a315ca3f55b5e6efdc3 SHA512 3e98601babb0991fbab2c36292f8cef069b976cbcc82fccff1b01170b77fecb4ccfc09448409f071f7611222f3e2d65f7a60ee35f2cc1cd4be821d6c981a2e78
+EBUILD fontforge-20200314.ebuild 2741 BLAKE2B 0bdc55cb1f078c028e370ad0b22a9f7c4fb234f631be2716824559ce541b61300cbb4e9158bf25a685dd18c23fd5d4ab9186650f2877387aa76c5d407629fcab SHA512 6168fe04e091e528f40bf7394ca349b635e2d25dc663827c188dc810eb332d6ab5ea16cde55903aba4b82df1a9aad1081b3aa4cff88fb3652ca53b94c7c995b6
+MISC metadata.xml 968 BLAKE2B 25c959d8983e879ee629f097471240a284877f9b3881c1530b91ecfee2c1207c57811a9498f92701fabafee2d8756bf75885ffe55021ab8f6194d5ea2b4c52d2 SHA512 1fb9e55e26f8974a5cc3dd421fd644ec55761c2a6767c7c8d32f8f514720e4dfc3509645bce2acc082cfca6f4b4ed4fe633d1bc9d3074cfe8ba53ae5b1b16004
diff --git a/media-gfx/fontforge/files/20190317-gdk_init.patch b/media-gfx/fontforge/files/20190317-gdk_init.patch
deleted file mode 100644
index 060e69577482..000000000000
--- a/media-gfx/fontforge/files/20190317-gdk_init.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 4577ad7205c600c6c8e809e10d51eb2118cb66b5 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sun, 24 Mar 2019 18:12:21 -0400
-Subject: [PATCH] Defer gdk_init() until after CheckIsScript()
-
-This allows fontforge to run without an X server available.
-
-Fixes: https://github.com/fontforge/fontforge/issues/3582
----
- fontforgeexe/startui.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/fontforgeexe/startui.c b/fontforgeexe/startui.c
-index 1bb5fd8ca..ae15afbf2 100644
---- a/fontforgeexe/startui.c
-+++ b/fontforgeexe/startui.c
-@@ -900,9 +900,6 @@ int fontforge_main( int argc, char **argv ) {
- #if !(GLIB_CHECK_VERSION(2, 35, 0))
- g_type_init();
- #endif
--#ifdef FONTFORGE_CAN_USE_GDK
-- gdk_init(&argc, &argv);
--#endif
-
- /* Must be done before we cache the current directory */
- /* Change to HOME dir if specified on the commandline */
-@@ -1093,6 +1090,9 @@ int fontforge_main( int argc, char **argv ) {
- CheckIsScript(argc,argv); /* Will run the script and exit if it is a script */
- /* If there is no UI, there is always a script */
- /* and we will never return from the above */
-+#ifdef FONTFORGE_CAN_USE_GDK
-+ gdk_init(&argc, &argv);
-+#endif
- if ( load_prefs==NULL ||
- (strcasecmp(load_prefs,"Always")!=0 && /* Already loaded */
- strcasecmp(load_prefs,"Never")!=0 ))
---
-2.21.0
-
diff --git a/media-gfx/fontforge/files/20200314-stylemap.patch b/media-gfx/fontforge/files/20200314-stylemap.patch
new file mode 100644
index 000000000000..d3311cab02d2
--- /dev/null
+++ b/media-gfx/fontforge/files/20200314-stylemap.patch
@@ -0,0 +1,30 @@
+From 3b83adc89771000eb95fcd87bb675f771ba85aaf Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sun, 29 Mar 2020 16:36:14 -0400
+Subject: [PATCH] Avoid integer size conflict when setting stylemap
+
+stylemap is a 16-bit integer, but hexmap writes 32-bits.
+
+Bug: https://bugs.gentoo.org/642756
+---
+ fontforge/sfd.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/fontforge/sfd.c b/fontforge/sfd.c
+index 9517d8cb1..b638fe447 100644
+--- a/fontforge/sfd.c
++++ b/fontforge/sfd.c
+@@ -8104,7 +8104,9 @@ bool SFD_GetFontMetaData( FILE *sfd,
+ }
+ else if ( strmatch(tok,"StyleMap:")==0 )
+ {
+- gethex(sfd,(uint32 *)&sf->pfminfo.stylemap);
++ uint32 u;
++ gethex(sfd,&u);
++ sf->pfminfo.stylemap = u;
+ }
+ /* Legacy attribute for StyleMap. Deprecated. */
+ else if ( strmatch(tok,"OS2StyleName:")==0 )
+--
+2.26.0.rc2
+
diff --git a/media-gfx/fontforge/files/20200314-tilepath.patch b/media-gfx/fontforge/files/20200314-tilepath.patch
new file mode 100644
index 000000000000..1e0d077532a4
--- /dev/null
+++ b/media-gfx/fontforge/files/20200314-tilepath.patch
@@ -0,0 +1,31 @@
+From 43e6087ec9bdbb23b8bb61c07efe6490fab23d73 Mon Sep 17 00:00:00 2001
+From: skef <6175836+skef@users.noreply.github.com>
+Date: Thu, 19 Mar 2020 17:16:20 -0700
+Subject: [PATCH] Tilepath fix (#4231)
+
+---
+ fontforgeexe/tilepath.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/fontforgeexe/tilepath.c b/fontforgeexe/tilepath.c
+index b329b54098..2575058eb4 100644
+--- a/fontforgeexe/tilepath.c
++++ b/fontforgeexe/tilepath.c
+@@ -571,7 +571,7 @@ static void AdjustPoint(TD *td,Spline *spline,bigreal t, FitPoint *to) {
+ } else {
+ bigreal s=(dy1*dx2/dy2-dx1);
+ if ( s>-.00001 && s<.00001 ) { /* essentially parallel */
+- to->p.x = x1; to->y = y1;
++ to->p.x = x1; to->p.y = y1;
+ } else {
+ bigreal t1 = (x1-x2- dx2/dy2*(y1-y2))/s;
+ to->p.x = x1 + dx1*t1;
+@@ -610,7 +610,7 @@ static SplinePoint *TDMakePoint(TD *td,Spline *old,real t) {
+
+ AdjustPoint(td,old,t,&fp);
+ new = chunkalloc(sizeof(SplinePoint));
+- new->me.x = tp.p.x; new->me.y = tp.p.y;
++ new->me.x = fp.p.x; new->me.y = fp.p.y;
+ new->nextcp = new->me;
+ new->prevcp = new->me;
+ new->nonextcp = new->noprevcp = true;
diff --git a/media-gfx/fontforge/fontforge-20170731-r5.ebuild b/media-gfx/fontforge/fontforge-20170731-r5.ebuild
index 90a77ef518b6..3717888256a5 100644
--- a/media-gfx/fontforge/fontforge-20170731-r5.ebuild
+++ b/media-gfx/fontforge/fontforge-20170731-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforg
LICENSE="BSD GPL-3+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X"
RESTRICT="!test? ( test )"
@@ -47,7 +47,6 @@ RDEPEND="
x11-libs/libXi:0=
>=x11-libs/pango-1.10:0=[X]
)
- !media-gfx/pfaedit
"
DEPEND="${RDEPEND}
sys-devel/gettext
diff --git a/media-gfx/fontforge/fontforge-20190317-r3.ebuild b/media-gfx/fontforge/fontforge-20190317-r3.ebuild
deleted file mode 100644
index b6d8e0e08cbc..000000000000
--- a/media-gfx/fontforge/fontforge-20190317-r3.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 2004-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit python-single-r1 xdg
-
-DESCRIPTION="postscript font editor and converter"
-HOMEPAGE="http://fontforge.github.io/"
-SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforge-${PV}.tar.gz"
-
-LICENSE="BSD GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- cairo? ( png )
- gtk? ( cairo )
- python? ( ${PYTHON_REQUIRED_USE} )
- test? ( png python )
-"
-
-RDEPEND="
- dev-libs/glib
- dev-libs/libltdl:0
- dev-libs/libxml2:2=
- >=media-libs/freetype-2.3.7:2=
- cairo? (
- >=x11-libs/cairo-1.6:0=
- x11-libs/pango:0=
- )
- gif? ( media-libs/giflib:0= )
- jpeg? ( virtual/jpeg:0 )
- png? ( media-libs/libpng:0= )
- tiff? ( media-libs/tiff:0= )
- truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] )
- gtk? ( >=x11-libs/gtk+-3.10:3 )
- python? ( ${PYTHON_DEPS} )
- readline? ( sys-libs/readline:0= )
- unicode? ( media-libs/libuninameslist:0= )
- X? (
- x11-libs/libX11:0=
- x11-libs/libXi:0=
- >=x11-libs/pango-1.10:0=[X]
- )
- !media-gfx/pfaedit
-"
-DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )
-"
-BDEPEND="
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-# Needs keywording on many arches.
-# zeromq? (
-# >=net-libs/czmq-2.2.0:0=
-# >=net-libs/zeromq-4.0.4:0=
-# )
-
-PATCHES=(
- "${FILESDIR}"/20170731-gethex-unaligned.patch
- "${FILESDIR}"/20190317-gdk_init.patch
- "${FILESDIR}"/CVE-2020-5395.patch
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- local myeconfargs=(
- --disable-static
- $(use_enable truetype-debugger freetype-debugger "${EPREFIX}/usr/include/freetype2/internal4fontforge")
- $(use_enable python python-extension)
- $(use_enable python python-scripting)
- --enable-tile-path
- --enable-gb12345
- $(use_with cairo)
- $(use_with gif giflib)
- $(use_with jpeg libjpeg)
- $(use_with png libpng)
- $(use_with readline libreadline)
- --without-libspiro
- $(use_with tiff libtiff)
- $(use_with unicode libuninameslist)
- #$(use_with zeromq libzmq)
- --without-libzmq
- $(use_with X x)
- )
- if use gtk; then
- # broken AC_ARG_ENABLE usage
- # https://bugs.gentoo.org/681550
- myeconfargs+=( --enable-gdk=gdk3 )
- fi
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # Build system deps are broken
- emake -C plugins HTDOCS_SUBDIR=/html
- emake HTDOCS_SUBDIR=/html
-}
-
-src_install() {
- emake DESTDIR="${D}" HTDOCS_SUBDIR=/html install
- docompress -x /usr/share/doc/${PF}/html
- einstalldocs
- find "${ED}" -name '*.la' -type f -delete || die
-}
diff --git a/media-gfx/fontforge/fontforge-20190801.ebuild b/media-gfx/fontforge/fontforge-20190801.ebuild
index 20cd4600afaa..74590785e86e 100644
--- a/media-gfx/fontforge/fontforge-20190801.ebuild
+++ b/media-gfx/fontforge/fontforge-20190801.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforg
LICENSE="BSD GPL-3+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X"
RESTRICT="!test? ( test )"
@@ -22,7 +22,6 @@ REQUIRED_USE="
cairo? ( png )
gtk? ( cairo )
python? ( ${PYTHON_REQUIRED_USE} )
- test? ( png python )
"
RDEPEND="
@@ -48,7 +47,6 @@ RDEPEND="
x11-libs/libXi:0=
>=x11-libs/pango-1.10:0=[X]
)
- !media-gfx/pfaedit
"
DEPEND="${RDEPEND}
X? ( x11-base/xorg-proto )
diff --git a/media-gfx/fontforge/fontforge-20200314.ebuild b/media-gfx/fontforge/fontforge-20200314.ebuild
new file mode 100644
index 000000000000..5afe1f39c78b
--- /dev/null
+++ b/media-gfx/fontforge/fontforge-20200314.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2004-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit python-single-r1 xdg cmake
+
+DESCRIPTION="postscript font editor and converter"
+HOMEPAGE="https://fontforge.org/"
+SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforge-${PV}.tar.xz"
+
+LICENSE="BSD GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode woff2 X"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ dev-libs/glib:2
+ dev-libs/libltdl:0
+ dev-libs/libxml2:2=
+ >=media-libs/freetype-2.3.7:2=
+ gif? ( media-libs/giflib:0= )
+ jpeg? ( virtual/jpeg:0 )
+ png? ( media-libs/libpng:0= )
+ tiff? ( media-libs/tiff:0= )
+ truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] )
+ gtk? ( >=x11-libs/gtk+-3.10:3 )
+ !gtk? (
+ X? (
+ >=x11-libs/cairo-1.6:0=
+ >=x11-libs/pango-1.10:0=[X]
+ x11-libs/libX11:0=
+ x11-libs/libXi:0=
+ )
+ )
+ python? ( ${PYTHON_DEPS} )
+ readline? ( sys-libs/readline:0= )
+ unicode? ( media-libs/libuninameslist:0= )
+ woff2? ( media-libs/woff2:0= )
+"
+DEPEND="${RDEPEND}
+ !gtk? ( X? ( x11-base/xorg-proto ) )
+"
+BDEPEND="
+ sys-devel/gettext
+ doc? ( dev-python/sphinx )
+ python? ( ${PYTHON_DEPS} )
+ test? ( ${RDEPEND} )
+"
+
+PATCHES=(
+ "${FILESDIR}"/20200314-stylemap.patch
+ "${FILESDIR}"/20200314-tilepath.patch
+)
+
+pkg_setup() {
+ :
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_DOCS=$(usex doc ON OFF)
+ -DENABLE_LIBGIF=$(usex gif ON OFF)
+ -DENABLE_LIBJPEG=$(usex jpeg ON OFF)
+ -DENABLE_LIBPNG=$(usex png ON OFF)
+ -DENABLE_LIBREADLINE=$(usex readline ON OFF)
+ -DENABLE_LIBSPIRO=OFF # No package in Gentoo
+ -DENABLE_LIBTIFF=$(usex tiff ON OFF)
+ -DENABLE_LIBUNINAMESLIST=$(usex unicode ON OFF)
+ -DENABLE_MAINTAINER_TOOLS=OFF
+ -DENABLE_PYTHON_EXTENSION=$(usex python ON OFF)
+ -DENABLE_PYTHON_SCRIPTING=$(usex python ON OFF)
+ -DENABLE_TILE_PATH=ON
+ -DENABLE_WOFF2=$(usex woff2 ON OFF)
+ )
+
+ if use gtk || use X; then
+ mycmakeargs+=(
+ -DENABLE_GUI=ON
+ # Prefer GTK over X11 if both USE flage are enabled
+ -DENABLE_X11=$(usex gtk OFF ON)
+ )
+ else
+ mycmakeargs+=( -DENABLE_GUI=OFF )
+ fi
+
+ if use python; then
+ python_setup
+ mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
+ fi
+
+ if use truetype-debugger ; then
+ mycmakeargs+=( -DENABLE_FREETYPE_DEBUGGER="${EPREFIX}/usr/include/freetype2/internal4fontforge" )
+ fi
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ docompress -x /usr/share/doc/${PF}/html
+ einstalldocs
+ find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/media-gfx/fontforge/metadata.xml b/media-gfx/fontforge/metadata.xml
index f200b938cf15..b37524e7333a 100644
--- a/media-gfx/fontforge/metadata.xml
+++ b/media-gfx/fontforge/metadata.xml
@@ -17,6 +17,7 @@
</longdescription>
<use>
<flag name="truetype-debugger">Enable truetype debugger in fontforge</flag>
+ <flag name="woff2">Enable support for WOFF2 format</flag>
</use>
<upstream>
<remote-id type="github">troydhanson/uthash</remote-id>
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 4a001542504a..7b7410714385 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -11,12 +11,15 @@ AUX gimp-2.8.22-cve-2017-17788.patch 1012 BLAKE2B 90bc17b66dd40426073a2581c20e68
AUX gimp-2.8.22-cve-2017-17789.patch 1245 BLAKE2B 14d519b8b024e51b452806b4acb6f00231e535ba3502875e8e90350e62c2cd0ff634ab1b38f16bb098670dd1e9d21c88aa64e19c3f81600acc7ea448e8f22b90 SHA512 f2f4aff0f0478356513a1f6da0732c5d0986ef1deb7b8e68bd283b7259887cf9a4d4785f00e48f03892cc86aa715b9764302640b2b891ab16617ef595ab779b8
AUX gimp-2.9.8-cve-2017-17784.patch 1087 BLAKE2B 2398e735ccd7b0a5cc393f297b60d4a51038aeb146779268f78fb2f0a24ef912468510de2a0f640c5f905fe9959581686f55bccc022633b6f2a3a93ab3f12848 SHA512 5bc928860b2f2b53cc72c9c3caf6a532cf7e61b02e0716ee99a5166a07b01bdd46edfeae7bf6e333ce14ca11b5fcb963cbd42005e02f914d909431bf201dc6d5
DIST gimp-2.10.14.tar.bz2 32786424 BLAKE2B f1254ab0742cf0190f4e50f001d8120fe655b73d838c3ed56abb0a221c0eaec02e5c838f952d492069d55d89e4c3493c59b38aa2af87df8181f8979213e7659b SHA512 acbd095361d9211a5a23474693dd170ed76bf4ea5b1df69791f1d975ef5cdaba1e5fb9f5be9f592a360db5826d71eaaf464005075397cb6630070fe32833c030
+DIST gimp-2.10.18.tar.bz2 32946467 BLAKE2B eb1c756ca646ee9ddc42aebe214ad3e2dedf125940dc1b9cfd04a4424bd2b6255041f1bafbda3fc214f93d97e7802372234a42e1daa0ee56caaf0f0bedd908f9 SHA512 88990f2d70508b22f4acadeab6b687e20af19b765ebc6f245d0c99b3dd853fcd3d237c3b7607e50133aa95a1d71931069029dfd7ee94441ff419c542c141bc9f
DIST gimp-2.10.8.tar.bz2 31954568 BLAKE2B 11f88b1068fa1fe216a54bed27b26b94c3fdb2cbc67e1e444df74a080d00b678f8c81897a6c5fb5956fa107842b0a853ada44d15d51c2e58db7435ddd0f8e999 SHA512 b458dd710b786152f95a8e48a0727b71cac549fccb31ac9e1e6ac3c617652079773ce7076401f8ade750ed38bdc78dfdec3317423f4c4e9c931f78002bd7454e
DIST gimp-2.8.22.tar.bz2 20873278 BLAKE2B 673246fd2354f1cecc74bf389df698f594b7553cc88a1d2679ae410ad39923abae843dfe9623ec195b4f967b5eccd199769a6300bf028ae04b8df4932df11505 SHA512 84a78d428282538b606b3cd1ff571e52c3d828fceade171b2012bc1cdcb85919fc7734e7e6c45ed3a8683657fa580412b32c1b511b8a512172a8c1df930493e6
DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26423a2b567cd8372258f87b44ae1ad812f2b3ee9a093b919d022e8b71ef518d40b76ab94c616f9916b3d1effec SHA512 897092aa823961e6ed5dac47eaadd3a25c419364d6ca791987d99e495d0d4eba1d75e08c809dfa305e8feec9da606193b608e3470e0ef18fcfaa98ee8aedfe02
-EBUILD gimp-2.10.14-r1.ebuild 6128 BLAKE2B 76a1ce0fe3defafb47cf2f853661e3a5f3ef0be8107fcf52b1df9b4018780a716bc7a6f76dc9a3142583483b7819180b0d9980d8b2b1861238f424a77c3c37ae SHA512 dd91a497d1cf7a4d587a2d7c926c3d1750ff5944c94e64ede97010213975be80893402ac5055be0107b9706ab14a3725652f4b8eb09db6b8ac8da0fd46d5e0ca
+EBUILD gimp-2.10.14-r1.ebuild 6134 BLAKE2B db5b6dc954866203d1aafe9e2050e1fdebf5008a191854f24f1507db881083a6cf67e6d9f8a6f6112958207d3c75e9537b7c51c8d2492e8961147f6981b245a3 SHA512 3342bb7e935077ed7ac83ac9109e873029d0b572f34a4787787aca14d73fe71b5f5ac92648ae0a2d20f06bf6a9e30a8d29823a881312852cb0981740087b935d
+EBUILD gimp-2.10.18-r1.ebuild 6154 BLAKE2B 793d339c64d9f83c504947c7eb2a8e59ea383274dff28b2be787886b2d095697e8466f21a2088afc64f0161c2d30debdea478f3f74dee83bac9eb3b1b82bc893 SHA512 57fe3b99a880e3fd90859a5323cfcd419191ae09b959ff9a60f917010fff49f9228f2f905c99b9d587532e7fd62e3d95574e786344f1eb3abee3d10c92231338
+EBUILD gimp-2.10.18.ebuild 5736 BLAKE2B 438cfe65d53d00b5656010944d4ef47ba748ed1cd2e6415b24836f4f7678623beb691045e0f989a714eaf829bf4332ffd40de1b718a28d0a9a9f1e9d55afe556 SHA512 83298e97c14c70b456ec932b2f1faab7b118a6d69ab77f4fc10869deec4cd43af6891a0bd1e77948439de51cda64a1365a32e01d471a6afb11bf5dc81431ce6e
EBUILD gimp-2.10.8-r2.ebuild 6122 BLAKE2B 7c9920ac058c8943f16bdc96414fc435f19edb14a5d930755aed8f82986682ba6486f64458f8eda6ddd0eafde676b0d1668645f9e06d93d92375c7f8075e77cd SHA512 199885da291857914cc9ece95f3754ea60d323621faab7db2fc06becde6567d849a7161489711d61289ffe6a906c2d4c99d25f90f8fe8bea1da19e3d1fd1e893
-EBUILD gimp-2.8.22-r2.ebuild 5144 BLAKE2B ee9b42725954a93b53c27a06c0902b0fdafef788fb43075a4b2c8f1be42b230f359fef2962b603bbea8e805e85a6059bd6215d766c6f145bc2eff405b65a80c2 SHA512 1fb1267d470d2427706c5d16cd93a324123437e128aea441318534205c365cd7797c78ac79e6adedc70aa1de01cd8fd5e7ae18324695664d7d0c30069c673ed7
+EBUILD gimp-2.8.22-r2.ebuild 5139 BLAKE2B 7e659b356107042884fddaff1622c20f1b1d627840556cdba0293fc80c43832fe02883d65ef6b338847b80d0cc041d95f6cce02ea230d071aa5545d89f55e8f8 SHA512 5b32326f52e21dd544c1f92e0f51612fb8a662ac6fa0addce482d3a3e1e9516a55b0c6a9e679407afee94b77c60a0224719ff37cd5aabcc7936a949629d4f189
EBUILD gimp-2.9.8-r1.ebuild 6068 BLAKE2B 86c853189f8a7aa5e6247d1f973337e3149ea44e13f4adc022b2e6f15eb51ecd4473e862721fd3ee841f5f36108230b2444039e5cb21898c274c97506a285800 SHA512 da7b01a4dafbd9d991ce050b3c8c5d1ce6b1f2d9cc8c4bde6463d5ebfcba2a8399c1f8f61062f1fb564c530acfea5036b6f8d5c3b4b1a291cd575a00df9deb28
-EBUILD gimp-9999.ebuild 6152 BLAKE2B 26ca217a370be419450cf6f9ef66ceed8c8d77bc260de37ab74c5f6706b6c032befe261ada5e9a82fe4c6bc8b4893080e1ee64435fd25c39e829b29a499db581 SHA512 6565b9cbe478c9c311a036897cf3c1f9b3841aea0b3095665e0d482ad85cb22274660b1800dbc50f9225e88d2e262c5995d6763d28ef99caa2021f231924ebd8
+EBUILD gimp-9999.ebuild 6188 BLAKE2B 34635a209811691a453e984a089faf958ac048ddf63adb17b93a22807924021ef134281b824d378e6d57a5ce88b747e6c2a6150d55b04806b14acc592e83a815 SHA512 ed5727af778d9acc7b1c3b2851c4d25329bc706d2054ecbb61e960c2e45b6fc0ea35e4aeddd97c4c1d8a1b0b71598be3ea65b401a0a3345c83ae67ca59a800db
MISC metadata.xml 628 BLAKE2B f1326f51db692d6e64d1bb7b44dfada65799d7ab94279771e6bd729189145a8a4bbe7a83c776bfc46acf682ad9f34c84598d25fb0a3606aabfa30383b35a9694 SHA512 cec60cde9763bdb9012fec754b95018f09da5cf7ff2f577206417651df5c18251dd5c58b1e32fb45e7c2121e06c0a5b7dc86d08b9511da4cf103bcf2fa1b6e52
diff --git a/media-gfx/gimp/gimp-2.10.14-r1.ebuild b/media-gfx/gimp/gimp-2.10.14-r1.ebuild
index e169695de69b..588d8b972367 100644
--- a/media-gfx/gimp/gimp-2.10.14-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.10.14-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gimp.org/"
SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
LICENSE="GPL-3 LGPL-3"
SLOT="2"
-KEYWORDS="amd64 ~ia64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ia64 ~ppc64 x86"
IUSE="aalib alsa altivec aqua debug doc gnome heif jpeg2k mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_x86_mmx cpu_flags_x86_sse"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-gfx/gimp/gimp-2.10.18-r1.ebuild b/media-gfx/gimp/gimp-2.10.18-r1.ebuild
new file mode 100644
index 000000000000..361fd3237c26
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.10.18-r1.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+GNOME2_EAUTORECONF=yes
+WANT_AUTOMAKE=
+
+inherit autotools gnome2 python-single-r1 virtualx
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="https://www.gimp.org/"
+SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
+LICENSE="GPL-3 LGPL-3"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc64 ~x86"
+
+IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ >=app-text/poppler-0.50[cairo]
+ >=app-text/poppler-data-0.4.7
+ >=dev-libs/atk-2.2.0
+ >=dev-libs/glib-2.56.0:2
+ >=dev-libs/json-glib-1.2.6
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+ >=gnome-base/librsvg-2.40.6:2
+ >=media-gfx/mypaint-brushes-1.3.0
+ >=media-libs/babl-0.1.74
+ >=media-libs/fontconfig-2.12.4
+ >=media-libs/freetype-2.1.7
+ >=media-libs/gegl-0.4.22:0.4[cairo]
+ >=media-libs/gexiv2-0.10.6
+ >=media-libs/harfbuzz-0.9.19
+ >=media-libs/lcms-2.8:2
+ >=media-libs/libmypaint-1.3.0:=
+ >=media-libs/libpng-1.6.25:0=
+ >=media-libs/tiff-3.5.7:0
+ net-libs/glib-networking[ssl]
+ sys-libs/zlib
+ virtual/jpeg
+ >=x11-libs/cairo-1.12.2
+ >=x11-libs/gdk-pixbuf-2.31:2
+ >=x11-libs/gtk+-2.24.32:2
+ x11-libs/libXcursor
+ >=x11-libs/pango-1.29.4
+ aalib? ( media-libs/aalib )
+ alsa? ( >=media-libs/alsa-lib-1.0.0 )
+ aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
+ heif? ( >=media-libs/libheif-1.3.2:= )
+ jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
+ mng? ( media-libs/libmng:= )
+ openexr? ( >=media-libs/openexr-1.6.1:= )
+ postscript? ( app-text/ghostscript-gpl )
+ python? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ >=dev-python/pycairo-1.0.2[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
+ udev? ( dev-libs/libgudev:= )
+ unwind? ( >=sys-libs/libunwind-1.1.0:= )
+ webp? ( >=media-libs/libwebp-0.6.0:= )
+ wmf? ( >=media-libs/libwmf-0.2.8 )
+ xpm? ( x11-libs/libXpm )
+"
+
+RDEPEND="
+ ${COMMON_DEPEND}
+ x11-themes/hicolor-icon-theme
+ gnome? ( gnome-base/gvfs )
+"
+
+DEPEND="
+ ${COMMON_DEPEND}
+ >=dev-lang/perl-5.10.0
+ dev-libs/appstream-glib
+ dev-util/gtk-update-icon-cache
+ >=dev-util/intltool-0.40.1
+ sys-apps/findutils
+ >=sys-devel/gettext-0.19
+ >=sys-devel/libtool-2.2
+ virtual/pkgconfig
+"
+
+DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
+
+# Bugs 685210 (and duplicate 691070)
+PATCHES=(
+ "${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # Disable system CFLAGS suppressing on SSE{2,4.1} support tests by addition of {SSE2,SSE4_1}_EXTRA_CFLAGS: bug #702554
+ sed -i -e 's:\$intrinsics_save_CFLAGS \$SSE2_EXTRA_CFLAGS:\$SSE2_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' \
+ -e 's:\$intrinsics_save_CFLAGS \$SSE4_1_EXTRA_CFLAGS:\$SSE4_1_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' configure.ac || die
+
+ sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+ sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
+
+ gnome2_src_prepare # calls eautoreconf
+
+ sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
+ fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
+}
+
+_adjust_sandbox() {
+ # Bugs #569738 and #591214
+ local nv
+ for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
+ # We do not check for existence as they may show up later
+ # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
+ addwrite "${nv}"
+ done
+
+ addwrite /dev/dri/ # bugs #574038 and #684886
+ addwrite /dev/ati/ # bug #589198
+ addwrite /proc/mtrr # bug #589198
+}
+
+src_configure() {
+ _adjust_sandbox
+
+ local myconf=(
+ GEGL="${EPREFIX}"/usr/bin/gegl-0.4
+ GDBUS_CODEGEN="${EPREFIX}"/bin/false
+
+ --enable-default-binary
+
+ --disable-check-update
+ --enable-mp
+ --with-appdata-test
+ --with-bug-report-url=https://bugs.gentoo.org/
+ --with-xmc
+ --without-libbacktrace
+ --without-webkit
+ --without-xvfb-run
+ $(use_enable cpu_flags_ppc_altivec altivec)
+ $(use_enable cpu_flags_x86_mmx mmx)
+ $(use_enable cpu_flags_x86_sse sse)
+ $(use_enable python)
+ $(use_enable vector-icons)
+ $(use_with aalib aa)
+ $(use_with alsa)
+ $(use_with !aqua x)
+ $(use_with heif libheif)
+ $(use_with jpeg2k jpeg2000)
+ $(use_with mng libmng)
+ $(use_with openexr)
+ $(use_with postscript gs)
+ $(use_with udev gudev)
+ $(use_with unwind libunwind)
+ $(use_with webp)
+ $(use_with wmf)
+ $(use_with xpm libxpm)
+ )
+
+ gnome2_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+ export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004
+ gnome2_src_compile
+}
+
+# for https://bugs.gentoo.org/664938
+_rename_plugins() {
+ einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
+ local prepend=gimp-org-
+ (
+ cd "${ED%/}"/usr/$(get_libdir)/gimp/2.0/plug-ins || exit 1
+ for plugin_slash in $(ls -d1 */); do
+ plugin=${plugin_slash%/}
+ if [[ -f ${plugin}/${plugin} ]]; then
+ # NOTE: Folder and file name need to match for Gimp to load that plug-in
+ # so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
+ mv ${plugin}/{,${prepend}}${plugin} || exit 1
+ mv {,${prepend}}${plugin} || exit 1
+ fi
+ done
+ )
+}
+
+src_test() {
+ virtx emake check
+}
+
+src_install() {
+ gnome2_src_install
+
+ use python && python_optimize
+
+ # Workaround for bug #321111 to give GIMP the least
+ # precedence on PDF documents by default
+ mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+ find "${D}" -name '*.la' -type f -delete || die
+
+ # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+ local gimp_app_version=$(get_version_component_range 1-2)
+ mv "${ED%/}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
+
+ # Remove gimp devel-docs html files if user doesn't need it
+ if ! use doc; then
+ rm -r "${ED%/}"/usr/share/gtk-doc || die
+ fi
+
+ _rename_plugins || die
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+}
diff --git a/media-gfx/gimp/gimp-2.10.18.ebuild b/media-gfx/gimp/gimp-2.10.18.ebuild
new file mode 100644
index 000000000000..bf39575cfc10
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.10.18.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_EAUTORECONF=yes
+WANT_AUTOMAKE=
+
+inherit autotools gnome2 virtualx
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="https://www.gimp.org/"
+SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
+LICENSE="GPL-3 LGPL-3"
+SLOT="2"
+KEYWORDS="~amd64 ~ia64 ~ppc64 ~x86"
+
+IUSE="aalib alsa altivec aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_x86_mmx cpu_flags_x86_sse"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ >=app-text/poppler-0.50[cairo]
+ >=app-text/poppler-data-0.4.7
+ >=dev-libs/atk-2.2.0
+ >=dev-libs/glib-2.56.0:2
+ >=dev-libs/json-glib-1.2.6
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+ >=gnome-base/librsvg-2.40.6:2
+ >=media-gfx/mypaint-brushes-1.3.0
+ >=media-libs/babl-0.1.74
+ >=media-libs/fontconfig-2.12.4
+ >=media-libs/freetype-2.1.7
+ >=media-libs/gegl-0.4.22:0.4[cairo]
+ >=media-libs/gexiv2-0.10.6
+ >=media-libs/harfbuzz-0.9.19
+ >=media-libs/lcms-2.8:2
+ >=media-libs/libmypaint-1.3.0:=
+ >=media-libs/libpng-1.6.25:0=
+ >=media-libs/tiff-3.5.7:0
+ net-libs/glib-networking[ssl]
+ sys-libs/zlib
+ virtual/jpeg
+ >=x11-libs/cairo-1.12.2
+ >=x11-libs/gdk-pixbuf-2.31:2
+ >=x11-libs/gtk+-2.24.32:2
+ x11-libs/libXcursor
+ >=x11-libs/pango-1.29.4
+ aalib? ( media-libs/aalib )
+ alsa? ( >=media-libs/alsa-lib-1.0.0 )
+ aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
+ heif? ( >=media-libs/libheif-1.3.2:= )
+ jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
+ mng? ( media-libs/libmng:= )
+ openexr? ( >=media-libs/openexr-1.6.1:= )
+ postscript? ( app-text/ghostscript-gpl )
+ udev? ( dev-libs/libgudev:= )
+ unwind? ( >=sys-libs/libunwind-1.1.0:= )
+ webp? ( >=media-libs/libwebp-0.6.0:= )
+ wmf? ( >=media-libs/libwmf-0.2.8 )
+ xpm? ( x11-libs/libXpm )
+"
+
+RDEPEND="
+ ${COMMON_DEPEND}
+ x11-themes/hicolor-icon-theme
+ gnome? ( gnome-base/gvfs )
+"
+
+DEPEND="
+ ${COMMON_DEPEND}
+ >=dev-lang/perl-5.10.0
+ dev-libs/appstream-glib
+ dev-util/gtk-update-icon-cache
+ >=dev-util/intltool-0.40.1
+ sys-apps/findutils
+ >=sys-devel/gettext-0.19
+ >=sys-devel/libtool-2.2
+ virtual/pkgconfig
+"
+
+DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
+
+# Bugs 685210 (and duplicate 691070)
+PATCHES=(
+ "${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
+)
+
+src_prepare() {
+ # Disable system CFLAGS suppressing on SSE{2,4.1} support tests by addition of {SSE2,SSE4_1}_EXTRA_CFLAGS: bug #702554
+ sed -i -e 's:\$intrinsics_save_CFLAGS \$SSE2_EXTRA_CFLAGS:\$SSE2_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' \
+ -e 's:\$intrinsics_save_CFLAGS \$SSE4_1_EXTRA_CFLAGS:\$SSE4_1_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' configure.ac || die
+
+ sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+ sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
+
+ gnome2_src_prepare # calls eautoreconf
+
+ sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
+ fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
+}
+
+_adjust_sandbox() {
+ # Bugs #569738 and #591214
+ local nv
+ for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
+ # We do not check for existence as they may show up later
+ # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
+ addwrite "${nv}"
+ done
+
+ addwrite /dev/dri/ # bugs #574038 and #684886
+ addwrite /dev/ati/ # bug #589198
+ addwrite /proc/mtrr # bug #589198
+}
+
+src_configure() {
+ _adjust_sandbox
+
+ local myconf=(
+ GEGL="${EPREFIX}"/usr/bin/gegl-0.4
+ GDBUS_CODEGEN="${EPREFIX}"/bin/false
+
+ --enable-default-binary
+
+ --disable-check-update
+ --disable-python
+ --enable-mp
+ --with-appdata-test
+ --with-bug-report-url=https://bugs.gentoo.org/
+ --with-xmc
+ --without-libbacktrace
+ --without-webkit
+ --without-xvfb-run
+ $(use_enable altivec)
+ $(use_enable cpu_flags_x86_mmx mmx)
+ $(use_enable cpu_flags_x86_sse sse)
+ $(use_enable vector-icons)
+ $(use_with aalib aa)
+ $(use_with alsa)
+ $(use_with !aqua x)
+ $(use_with heif libheif)
+ $(use_with jpeg2k jpeg2000)
+ $(use_with mng libmng)
+ $(use_with openexr)
+ $(use_with postscript gs)
+ $(use_with udev gudev)
+ $(use_with unwind libunwind)
+ $(use_with webp)
+ $(use_with wmf)
+ $(use_with xpm libxpm)
+ )
+
+ gnome2_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+ export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004
+ gnome2_src_compile
+}
+
+# for https://bugs.gentoo.org/664938
+_rename_plugins() {
+ einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
+ local prepend=gimp-org-
+ (
+ cd "${ED%/}"/usr/$(get_libdir)/gimp/2.0/plug-ins || exit 1
+ for plugin_slash in $(ls -d1 */); do
+ plugin=${plugin_slash%/}
+ if [[ -f ${plugin}/${plugin} ]]; then
+ # NOTE: Folder and file name need to match for Gimp to load that plug-in
+ # so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
+ mv ${plugin}/{,${prepend}}${plugin} || exit 1
+ mv {,${prepend}}${plugin} || exit 1
+ fi
+ done
+ )
+}
+
+src_test() {
+ virtx emake check
+}
+
+src_install() {
+ gnome2_src_install
+
+ # Workaround for bug #321111 to give GIMP the least
+ # precedence on PDF documents by default
+ mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+ find "${D}" -name '*.la' -type f -delete || die
+
+ # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+ local gimp_app_version=$(get_version_component_range 1-2)
+ mv "${ED%/}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
+
+ # Remove gimp devel-docs html files if user doesn't need it
+ if ! use doc; then
+ rm -r "${ED%/}"/usr/share/gtk-doc || die
+ fi
+
+ _rename_plugins || die
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+}
diff --git a/media-gfx/gimp/gimp-2.8.22-r2.ebuild b/media-gfx/gimp/gimp-2.8.22-r2.ebuild
index aba75474c081..497e8fb7e44b 100644
--- a/media-gfx/gimp/gimp-2.8.22-r2.ebuild
+++ b/media-gfx/gimp/gimp-2.8.22-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gimp.org/"
SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
LICENSE="GPL-3 LGPL-3"
SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm"
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index a8add4680ec1..f73b18199f44 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-3 LGPL-3"
SLOT="2"
KEYWORDS=""
-IUSE="aalib alsa altivec aqua debug doc gnome heif javascript jpeg2k lua mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_x86_mmx cpu_flags_x86_sse"
+IUSE="aalib alsa aqua debug doc gnome heif javascript jpeg2k lua mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RESTRICT="!test? ( test )"
@@ -159,7 +159,7 @@ src_configure() {
--without-libbacktrace
--without-webkit
--without-xvfb-run
- $(use_enable altivec)
+ $(use_enable cpu_flags_ppc_altivec altivec)
$(use_enable cpu_flags_x86_mmx mmx)
$(use_enable cpu_flags_x86_sse sse)
$(use_enable doc gtk_doc)
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 7fd4a405b43d..95af278af26d 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,9 +1,5 @@
-AUX gmic-2.4.3-curl.patch 2527 BLAKE2B 8bb6a9fb4aff5a1ae19437f93ec4336d87ab61f334a56c1d2083b0a8c02c37697795ea82f37d4caaf23edb37111d201db75315169a12f256571ad081f60b9890 SHA512 1c5cef3879749ab9a62e52ae5ac1c26ab60ff4b323352af9e7fb0f55b3ca7804290d03bd63dcaedb68c3d6fe43da332681a1eeb84543a1ac30163169ccee6368
-AUX gmic-2.7.1-qt-cmake.patch 1005 BLAKE2B 2b7e5f60788db611859b803cebd5e6e44ee7fac791d97e37fc22290e813c43b7b5d93e8725da2648c19999234f650399eb5fa7c973932f9bb1407fb88a955f58 SHA512 05fd4675cc1b65e4e504ae4c9913566b59b4c69467775a73734f01f9af842b87696c244203e9be75ef26876c452b34edfdfe1ed201ee6cdc934b2ea786c45a86
-DIST gmic_2.8.1.tar.gz 5995556 BLAKE2B 3f3c35290d18c927745b4b527f5297a9c3beb109a34b7e8b70dcff064f2587e022616e0fe5063d79e94b8fbd0ce3f70b6b5417ebaa0f0cc0f61891d79330afa9 SHA512 0f9ae9454c6f053026cdace43b24e32183f384d79099bc654c3b154647d24ef6541b1fae62cb17e27e527fb51ed8cef03a46490af3ace1551646fc8b3cd64eb9
-DIST gmic_2.8.2.tar.gz 6170087 BLAKE2B 36bea32531fef3694c4bf295603c2327dba2391f8cb868393d01a86dd9dcc52a127584e8eaeeba79425aceb07fd3ee31e0383a182eb0956daa920122463c4a08 SHA512 80fbba0dd1f02fe23986f57190e6e4bb0df31ac8b4084ddcfa088fcf352b44484ada47704b42c9cd27f52a55e42247447c73181c0a84a4f0e54f064e9fc9ca9a
DIST gmic_2.8.3.tar.gz 6172645 BLAKE2B 51a910ca9bb146173863f7f72dafec8ed42334757223055a5e174bebbed9e23372e1fdeb5b522c2120b203f4cbac0f255a9ada58fa62c7f83c745016d11bcabb SHA512 cde0e3fc50a97dae2b6d1dac1e7292a3d0af5e963586ec3e7ab6890721bc9617ea80b3bc86ec4cdc897d8b4ddc0fde552eea8322f8f337c447c603bcbc1403fd
-EBUILD gmic-2.8.1.ebuild 4398 BLAKE2B 5b94640e53922ec0c81b44d2dd2a49f0568a3c64c77a190b9d84ec731d4c0c157442976ec880f565a180a7f5c928f8a2a04c5f8a7f4c18c306b53bf82f01d35b SHA512 82ea10c6dab6fe7710ca84eaf39632827d423d1668ccaf82c5c34cd6417e73100600e54b422f1fede0010446915460f881cb7c1d76e7d2437408d5e8b44f6afc
-EBUILD gmic-2.8.2.ebuild 4280 BLAKE2B d75d51965efd8f73b1b3112b14d640ddc63ee4ea8f0c51aa7deaa06ae16b87259e1d3b50c8513271a1004633246d788862ace4cbf05e341c13a0c6ebee427293 SHA512 99dc7f60578d1b42865e476527e4a2f86622dec59afd182d85c5588ace1764f34f2c92f08a6ffae1cb2f27c66e8b2044cd20d9daaa19aed64b5a03d21a01142b
+DIST gmic_2.9.0.tar.gz 6195597 BLAKE2B 3e1f83aa7e2024c545cab16c15cbd108ecaa33e7b0423c37cbb7e19fc9179280dfb31d819926110f06ff10a8b2b3e22b3c7f6c3e8bdece8b51c7295b8e78a974 SHA512 3b3703520998e5ad547316683158d7b60541a8cea2a7c1e7118f8de88492e0961bf1fe1da360dfb26d0ba7eaf997e7005a864364297db2bb405d532dedc4241d
EBUILD gmic-2.8.3.ebuild 4280 BLAKE2B d75d51965efd8f73b1b3112b14d640ddc63ee4ea8f0c51aa7deaa06ae16b87259e1d3b50c8513271a1004633246d788862ace4cbf05e341c13a0c6ebee427293 SHA512 99dc7f60578d1b42865e476527e4a2f86622dec59afd182d85c5588ace1764f34f2c92f08a6ffae1cb2f27c66e8b2044cd20d9daaa19aed64b5a03d21a01142b
+EBUILD gmic-2.9.0.ebuild 4280 BLAKE2B d75d51965efd8f73b1b3112b14d640ddc63ee4ea8f0c51aa7deaa06ae16b87259e1d3b50c8513271a1004633246d788862ace4cbf05e341c13a0c6ebee427293 SHA512 99dc7f60578d1b42865e476527e4a2f86622dec59afd182d85c5588ace1764f34f2c92f08a6ffae1cb2f27c66e8b2044cd20d9daaa19aed64b5a03d21a01142b
MISC metadata.xml 547 BLAKE2B 0da3088e531217099bf3f690059d3725ba3c62ad9337dfbf3817584f95594a328b647b0a81eb4d58c2cbc030026bf2aa94e01c817b04072aea1caee435f6ef9f SHA512 e58e976f8e80eea8e3620888858d6386e5d922c842e08c39f7ad611a5fc96e5fb85e39864bc0e805dd20a2c19e02b9fb8d1a5eaaa470075ed73759dcdcd4fbee
diff --git a/media-gfx/gmic/files/gmic-2.4.3-curl.patch b/media-gfx/gmic/files/gmic-2.4.3-curl.patch
deleted file mode 100644
index f91f86ff0d48..000000000000
--- a/media-gfx/gmic/files/gmic-2.4.3-curl.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-Add curl support for the cli app and base library and make it truly optional
-for gmic-qt instead of automagic.
-
---- gmic-2.4.3/CMakeLists.txt
-+++ gmic-2.4.3/CMakeLists.txt
-@@ -83,6 +83,7 @@
- option(BUILD_MAN "Build the manpage" ON)
- option(BUILD_BASH_COMPLETION "Build Bash completion" ON)
- option(CUSTOM_CFLAGS "Override default compiler optimization flags" OFF)
-+option(ENABLE_CURL "Add support for curl" ON)
- option(ENABLE_X "Add support for X11" ON)
- option(ENABLE_FFMPEG "Add support for FFMpeg" ON)
- option(ENABLE_FFTW "Add support for FFTW" ON)
-@@ -136,6 +137,16 @@
- link_directories(${ZLIB_LIBRARY_DIRS})
- endif()
-
-+# curl support
-+if(ENABLE_CURL)
-+ find_package(CURL)
-+endif()
-+if(CURL_FOUND)
-+ set(COMPILE_FLAGS "${COMPILE_FLAGS} -Dcimg_use_curl")
-+ include_directories(${CURL_INCLUDE_DIRS})
-+ link_directories(${CURL_LIBRARY_DIRS})
-+endif()
-+
- #X11 support
- if(ENABLE_X)
- find_package(X11)
-@@ -288,6 +299,7 @@
- ${OPENEXR_LIBRARIES}
- ${OPENCV_LIBRARIES}
- ${ZLIB_LIBRARIES}
-+ ${CURL_LIBRARIES}
- ${FFTW3_LIBRARIES}
- ${EXTRA_LIBRARIES}
- )
-@@ -316,6 +328,7 @@
- ${OPENEXR_LIBRARIES}
- ${OPENCV_LIBRARIES}
- ${ZLIB_LIBRARIES}
-+ ${CURL_LIBRARIES}
- ${FFTW3_LIBRARIES}
- ${EXTRA_LIBRARIES}
- )
-@@ -345,6 +358,7 @@
- ${OPENEXR_LIBRARIES}
- ${OPENCV_LIBRARIES}
- ${ZLIB_LIBRARIES}
-+ ${CURL_LIBRARIES}
- ${FFTW3_LIBRARIES}
- ${EXTRA_LIBRARIES}
- )
---- gmic-2.4.3/gmic-qt/CMakeLists.txt
-+++ gmic-2.4.3/gmic-qt/CMakeLists.txt
-@@ -30,6 +30,7 @@
- message("G'MIC path: " ${GMIC_PATH})
-
- option(ENABLE_DYNAMIC_LINKING "Dynamically link the binaries to the GMIC shared library" OFF)
-+option(ENABLE_CURL "Add support for curl" ON)
- set (GMIC_LIB_PATH "${GMIC_PATH}" CACHE STRING "Define the path to the GMIC shared library")
-
- #
-@@ -149,10 +150,12 @@
- #
- # CURL
- #
--find_package(CURL)
--if (CURL_FOUND)
-- add_definitions(-Dcimg_use_curl)
-- include_directories(SYSTEM ${CURL_INCLUDE_DIRS} )
-+if(ENABLE_CURL)
-+ find_package(CURL)
-+ if (CURL_FOUND)
-+ add_definitions(-Dcimg_use_curl)
-+ include_directories(SYSTEM ${CURL_INCLUDE_DIRS} )
-+ endif()
- endif()
-
- #
-@@ -187,11 +190,13 @@
- ${ZLIB_LIBRARIES}
- )
-
--if (CURL_FOUND)
-- set(gmic_qt_LIBRARIES
-- ${gmic_qt_LIBRARIES}
-- ${CURL_LIBRARIES}
-- )
-+if(ENABLE_CURL)
-+ if (CURL_FOUND)
-+ set(gmic_qt_LIBRARIES
-+ ${gmic_qt_LIBRARIES}
-+ ${CURL_LIBRARIES}
-+ )
-+ endif()
- endif()
-
- add_definitions(-Dgmic_build)
diff --git a/media-gfx/gmic/files/gmic-2.7.1-qt-cmake.patch b/media-gfx/gmic/files/gmic-2.7.1-qt-cmake.patch
deleted file mode 100644
index caf22d04ce94..000000000000
--- a/media-gfx/gmic/files/gmic-2.7.1-qt-cmake.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Fix linking with fftw when thread support is enabled.
-
---- gmic-qt/CMakeLists.txt
-+++ gmic-qt/CMakeLists.txt
-@@ -13,6 +13,7 @@
- set(CMAKE_AUTOUIC OFF)
- set(CMAKE_AUTORCC ON)
- set(CMAKE_INCLUDE_CURRENT_DIR ON)
-+set(EXTRA_LIBRARIES)
-
- set (GMIC_QT_HOST "gimp" CACHE STRING "Define for which host qmic-qt will be built: gimp, krita, none, paintdotnet, or digikam.")
- if (${GMIC_QT_HOST} STREQUAL "none")
-@@ -145,8 +146,13 @@
- #
- find_package(FFTW3 REQUIRED)
- add_definitions(-Dcimg_use_fftw3 )
--add_definitions(-Dcimg_use_fftw3_singlethread )
- include_directories(${FFTW3_INCLUDE_DIR})
-+find_library(FFTW3_THREADS_LIB fftw3_threads PATHS ${FFTW3_LIBRARY_DIRS})
-+if(FFTW3_THREADS_LIB STREQUAL "FFTW3_THREADS_LIB-NOTFOUND")
-+ add_definitions(-Dcimg_use_fftw3_singlethread)
-+else()
-+ list(APPEND EXTRA_LIBRARIES "-lfftw3_threads")
-+endif()
-
- #
- # CURL
-@@ -187,6 +193,7 @@
- ${PNG_LIBRARIES}
- ${FFTW3_LIBRARIES}
- ${ZLIB_LIBRARIES}
-+ ${EXTRA_LIBRARIES}
- )
-
- if (CURL_FOUND)
diff --git a/media-gfx/gmic/gmic-2.8.1.ebuild b/media-gfx/gmic/gmic-2.8.1.ebuild
deleted file mode 100644
index a4b190fb3199..000000000000
--- a/media-gfx/gmic/gmic-2.8.1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE=Release
-inherit cmake bash-completion-r1 toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
- inherit git-r3
-else
- SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
-REQUIRED_USE="
- || ( cli gimp krita qt5 )
- gimp? ( png zlib fftw X )
- krita? ( png zlib fftw X )
- qt5? ( png zlib fftw X )
-"
-
-MIN_QT_VER="5.2.0"
-QT_DEPEND="
- >=dev-qt/qtcore-${MIN_QT_VER}:5=
- >=dev-qt/qtgui-${MIN_QT_VER}:5=
- >=dev-qt/qtnetwork-${MIN_QT_VER}:5=
- >=dev-qt/qtwidgets-${MIN_QT_VER}:5=
-"
-COMMON_DEPEND="
- curl? ( net-misc/curl )
- fftw? ( sci-libs/fftw:3.0=[threads] )
- gimp? (
- >=media-gfx/gimp-2.8.0
- ${QT_DEPEND}
- )
- graphicsmagick? ( media-gfx/graphicsmagick:0= )
- jpeg? ( virtual/jpeg:0 )
- krita? ( ${QT_DEPEND} )
- opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
- openexr? (
- media-libs/ilmbase:0=
- media-libs/openexr:0=
- )
- png? ( media-libs/libpng:0= )
- qt5? ( ${QT_DEPEND} )
- tiff? ( media-libs/tiff:0 )
- X? (
- x11-libs/libX11
- x11-libs/libXext
- )
- zlib? ( sys-libs/zlib:0= )"
-RDEPEND="${COMMON_DEPEND}
- ffmpeg? ( media-video/ffmpeg:0= )
-"
-DEPEND="${COMMON_DEPEND}
- gimp? ( dev-qt/linguist-tools )
- krita? ( dev-qt/linguist-tools )
- qt5? ( dev-qt/linguist-tools )
-"
-BDEPEND="virtual/pkgconfig"
-
-pkg_pretend() {
- if use openmp ; then
- tc-has-openmp || die "Please switch to an openmp compatible compiler"
- fi
-
- if ! test-flag-CXX -std=c++11 ; then
- die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
- fi
-}
-
-src_prepare() {
- local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
- cmake_src_prepare
- sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
-
- if use gimp || use krita || use qt5; then
- # respect user flags
- sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
- local S="${S}/gmic-qt"
- # fix linking with fftw when thread support is enabled
- PATCHES=( "${FILESDIR}"/${PN}-2.7.1-qt-cmake.patch )
- cmake_src_prepare
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_LIB=ON
- -DBUILD_LIB_STATIC=$(usex static-libs)
- -DBUILD_CLI=$(usex cli)
- -DBUILD_MAN=$(usex cli)
- -DBUILD_BASH_COMPLETION=$(usex cli)
- -DCUSTOM_CFLAGS=ON
- -DENABLE_CURL=$(usex curl)
- -DENABLE_X=$(usex X)
- -DENABLE_FFMPEG=$(usex ffmpeg)
- -DENABLE_FFTW=$(usex fftw)
- -DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
- -DENABLE_JPEG=$(usex jpeg)
- -DENABLE_OPENCV=$(usex opencv)
- -DENABLE_OPENEXR=$(usex openexr)
- -DENABLE_OPENMP=$(usex openmp)
- -DENABLE_PNG=$(usex png)
- -DENABLE_TIFF=$(usex tiff)
- -DENABLE_ZLIB=$(usex zlib)
- -DENABLE_DYNAMIC_LINKING=ON
- )
-
- cmake_src_configure
-
- # configure gmic-qt frontends
- local CMAKE_USE_DIR="${S}/gmic-qt"
- mycmakeargs=(
- -DENABLE_DYNAMIC_LINKING=ON
- -DENABLE_CURL=$(usex curl)
- -DGMIC_LIB_PATH="${BUILD_DIR}"
- -DGMIC_PATH="${S}/src"
- )
-
- if use gimp; then
- mycmakeargs+=( -DGMIC_QT_HOST=gimp )
- BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
- fi
-
- if use krita; then
- mycmakeargs+=( -DGMIC_QT_HOST=krita )
- BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
- fi
-
- if use qt5; then
- mycmakeargs+=( -DGMIC_QT_HOST=none )
- BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
- fi
-}
-
-src_compile() {
- cmake_src_compile
-
- # build gmic-qt frontends
- local S="${S}/gmic-qt"
- use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
- use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
- use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
-}
-
-src_install() {
- cmake_src_install
- dodoc README
- use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
-
- local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
- insinto "${PLUGINDIR}"
- doins resources/gmic_cluts.gmz
-
- # install gmic-qt frontends
- if use gimp; then
- exeinto "${PLUGINDIR}"
- doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
- fi
- use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
- use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
-}
diff --git a/media-gfx/gmic/gmic-2.8.2.ebuild b/media-gfx/gmic/gmic-2.9.0.ebuild
index 660e4b3ff4dc..660e4b3ff4dc 100644
--- a/media-gfx/gmic/gmic-2.8.2.ebuild
+++ b/media-gfx/gmic/gmic-2.9.0.ebuild
diff --git a/media-gfx/gnome-font-viewer/Manifest b/media-gfx/gnome-font-viewer/Manifest
index ff3819f8effc..125e3f34b3e5 100644
--- a/media-gfx/gnome-font-viewer/Manifest
+++ b/media-gfx/gnome-font-viewer/Manifest
@@ -1,3 +1,5 @@
DIST gnome-font-viewer-3.32.0.tar.xz 153852 BLAKE2B b79279e57b2ce4310acf3d1164da68b9408518456f72d28aae09092c53f9ab5cc6e1754b06c6ed147fdb842f76a3e0e4ad2bd7f5ddad5773091b28eae9811d78 SHA512 16b000b16b3e3e996dd83ef7f2a2f6877f6d367c6fd69f26f385dd13cc87a7690cd85e8895008fc7c5ca32ad4a15b763fe918ddc08aaf042f65087289b126681
-EBUILD gnome-font-viewer-3.32.0.ebuild 665 BLAKE2B c46f27c81e9599e0ce966258779ed13f9195a64debf1aacf2a415639968b09847ef95ad000ea81d4703e54517b6089518fd4d097e66318d5f41421768ca6b8a6 SHA512 d96e5a23228559ab472fece42eeca29e9d548b105e4714e409f88ebebf84bbb5e9c867fb02e3e97d88dc14df50bea908d9f9e7b230beddac1cdb7d13bae51fbe
+DIST gnome-font-viewer-3.34.0.tar.xz 157756 BLAKE2B dabda5516fc5461d382f6ac6ed2ac6177dee137983833e3643d029e2370b76ef586223a41b591ef0f6c21024f1e42fe7b234c8ef9cdbbbf9845c46b9a55222eb SHA512 1be6230da5ff47a129db43b5f5467d3fed8925fad7a6637f24d72c8c99c80d8dd1635eaef1b7c7f650a86132a54cde8326d3418075f5818d0154dc8d503927c7
+EBUILD gnome-font-viewer-3.32.0.ebuild 661 BLAKE2B 8739b88db8eb33fd8e926e6d2332d2709295d9b717e57aba42968b2946777358b052f7ff74c7662c59549b81d186136ef0730830a6d4d9a7b417615026a4e0d4 SHA512 31f4a036e1c791507d655b7dd7e984ffe594eace707539efb797accc11b04b27a8ef00cafb6ea9aeeb630565a3dbb3b6a7452e1ee810bed079c6b72ed02b8d91
+EBUILD gnome-font-viewer-3.34.0.ebuild 663 BLAKE2B 328efca57629fc081b3565af75071bd1c796943417bfb20f89bc120f15c0580fc58a90058d19ff38b23bf92c2ff21449beb61f614c256f30861aed25d987ca81 SHA512 7571ec157bed043443729d81d3e7c85798759b3ca51da7f12e94e1752cf1c2e0d9f60ed4ec5cb4c191ba5e903f08faa977030c354c6e8ccc5fba0754080239ee
MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.32.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.32.0.ebuild
index eb3984b87024..eceff0c61b9a 100644
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.32.0.ebuild
+++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.32.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-font-viewer"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="
>=dev-libs/glib-2.35.1:2
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.34.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.34.0.ebuild
new file mode 100644
index 000000000000..1a0343af9342
--- /dev/null
+++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.34.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome.org meson xdg
+
+DESCRIPTION="Font viewer utility for GNOME"
+HOMEPAGE="https://git.gnome.org/browse/gnome-font-viewer"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+ >=dev-libs/glib-2.35.1:2
+ >=x11-libs/gtk+-3.20:3
+ >=media-libs/harfbuzz-0.9.9
+ media-libs/fontconfig:1.0
+ media-libs/freetype:2
+ gnome-base/gnome-desktop:3=
+"
+DEPEND="${RDEPEND}
+ dev-libs/appstream-glib
+ dev-libs/libxml2:2
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest
index a42fb695c9a0..2b6c7d35005a 100644
--- a/media-gfx/gnome-photos/Manifest
+++ b/media-gfx/gnome-photos/Manifest
@@ -1,3 +1,5 @@
DIST gnome-photos-3.32.1.tar.xz 632688 BLAKE2B 9fa7307d1571f6c4e07d6c9700fd947e4a0ff26f8308f7b1871da817e5d80b19861d3c94a1b8ffe0daa820862ad064075641c8eb42ad66134e7c554696448932 SHA512 31a52b93c27ee603ddb314998d663d02c1cfdbc33214d2d9f977f7b66f4fc131a52cd17b274efcfb80f2fb17d7b469157e99a783cbfe76e0b872a2a75363b208
+DIST gnome-photos-3.34.1.tar.xz 636916 BLAKE2B 3d041f3a8349164e12b8788b028edf23c0db1e671c5da4356dbdc01f5129e8dfabd3ee9df3af82b2794e22c1d8d894b7726068d69a605b0d598ec1dc21754470 SHA512 9ee1bf299f82b4a55d2642e34cfa82e0a3a362cd5e415acd5421d54430da5ea5a9f831ecf5ccf6966eea056c851fde57385f9224441be3d06e086be108d53227
EBUILD gnome-photos-3.32.1.ebuild 2299 BLAKE2B 48d413458167c1804b93de5c5f31a994062c171cc25532adab60bc93dcf8cf9a9e2ce921336574c7c116e1dbcafbdbcb78d12e794e4b3f6f3ae8a3c947284256 SHA512 3b3d34b0a1ddb9e97bd2c57fc53427331edc00621449f134d5b7bd1817305085695b1b4d75dbbd13db50e8ad587f10b3d46aa80de12826a1aef4708d67952b23
+EBUILD gnome-photos-3.34.1.ebuild 2301 BLAKE2B 56467f553137760693353519d4bb7b28d92f9277ceac72703d6543a1a8132144d5dafd1eec73a282a3f31b3beb6b85d30a8fa61a7cfc6579e9281d5b98edd6cd SHA512 191af456569a27f8399e3b3386b91d3dd97ec52bb72de8d95c12aa1f5603c3603aacf84e42ff66abcb9a8845532a168538efc1267b5c81666cab5e2ac17472f3
MISC metadata.xml 992 BLAKE2B beda29ca65d25e5d68c014fbb70fb539cf17b55d64255d6d74305d710f3979b5156eda764d75992f057416f5eb96af899b988633dd8444fcf22c6a5f73fe9b9b SHA512 3c47be6c01072a0b4845dd42b6d3561d340eb703bd9cb5c727ec24b653ab76eee38e35ba63c4cd71b93514ab0cb8bd75663febeed1901cccedfd30f223e870df
diff --git a/media-gfx/gnome-photos/gnome-photos-3.34.1.ebuild b/media-gfx/gnome-photos/gnome-photos-3.34.1.ebuild
new file mode 100644
index 000000000000..7a8e9d539fba
--- /dev/null
+++ b/media-gfx/gnome-photos/gnome-photos-3.34.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 )
+
+inherit gnome.org gnome2-utils meson python-any-r1 virtualx xdg
+
+DESCRIPTION="Access, organize and share your photos on GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
+
+LICENSE="GPL-3+ LGPL-2+ CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="flickr test upnp-av"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ media-libs/babl
+ >=x11-libs/cairo-1.14.0
+ >=x11-libs/gdk-pixbuf-2.36.8:2
+ >=media-libs/gegl-0.4.0:0.4[cairo,raw]
+ sci-geosciences/geocode-glib
+ >=media-libs/gexiv2-0.10.8
+ >=dev-libs/glib-2.57.2:2
+ >=net-libs/gnome-online-accounts-3.8.0:=
+ >=media-libs/grilo-0.3.5:0.3=
+ gnome-base/gsettings-desktop-schemas
+ >=x11-libs/gtk+-3.22.16:3
+ >=dev-libs/libdazzle-3.26.0
+ >=dev-libs/libgdata-0.15.2:0=[gnome-online-accounts]
+ >=net-libs/libgfbgraph-0.2.1:0.2
+ virtual/jpeg:0
+ >=media-libs/libpng-1.6:0=
+ >=app-misc/tracker-2.0:0/2.0
+ sys-apps/dbus
+"
+# gnome-online-miners is also used for google, facebook, DLNA - not only flickr
+# but out of all the grilo-plugins, only upnp-av and flickr get used, which have USE flags here,
+# so don't pull it always, but only if either USE flag is enabled.
+# tracker-miners gschema used at runtime.
+RDEPEND="${DEPEND}
+ net-misc/gnome-online-miners[flickr?]
+ upnp-av? ( media-plugins/grilo-plugins:0.3[upnp-av] )
+ flickr? ( media-plugins/grilo-plugins:0.3[flickr] )
+ >=app-misc/tracker-miners-2
+"
+BDEPEND="
+ dev-libs/appstream-glib
+ dev-util/desktop-file-utils
+ dev-util/gdbus-codegen
+ dev-util/glib-utils
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
+"
+
+DOCS=() # meson installs docs itself
+
+python_check_deps() {
+ use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ xdg_src_prepare
+ sed -i -e "/photos_docdir.*=.*join_paths/s/meson.project_name()/'${PF}'/" meson.build
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use test dogtail)
+ -Dinstalled_tests=false
+ )
+ meson_src_configure
+}
+
+src_test() {
+ virtx meson_src_test
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/media-gfx/gnome-raw-thumbnailer/Manifest b/media-gfx/gnome-raw-thumbnailer/Manifest
index 457632b3a3c6..c1d6e29aed6a 100644
--- a/media-gfx/gnome-raw-thumbnailer/Manifest
+++ b/media-gfx/gnome-raw-thumbnailer/Manifest
@@ -2,5 +2,5 @@ AUX gnome-raw-thumbnailer-3.0.0-deprecation-warning.patch 1715 BLAKE2B 62d10ead9
AUX gnome-raw-thumbnailer-3.0.0-fix-downscale.patch 1030 BLAKE2B 49c4e566963e31f7f6293cc420157e0e33a8cfdd169e65771019fd00acf2d8a760c522ce6f0c2a2c13052804ed726b2eb35e378a43a1110328ea694449cfdf77 SHA512 b4985090dad9a06087d2b598eed03333a80d71343a244db3c08fc0f5ef1fc8baae1969b0cdaad460cdd54106173fdd9aa52086203727e823e20bb830deee1242
AUX gnome-raw-thumbnailer-3.0.0-libopenraw-0.1.patch 696 BLAKE2B c790781d81b5e4b4793c2a2f4aea2893b964e607b5cfc55eb658defb4748c7958558ae85435c0d18986f7267ac58b8c8b41471ce7cdcae7b04100f0c23d560b0 SHA512 ac12cf060a1f40abecb2ff86429766662632e1a448dd84c5205c8def987d7e20c1738402cfd7d6c76b4a5f908872c77ddc046e6379705c1e69277543828bdab7
DIST raw-thumbnailer-3.0.0.tar.bz2 270499 BLAKE2B e08d78ba44f160ba1903b78b5e85d9237610c81ac9a63c25c7b2c308139b8e18c9041e2c35aaf44eb87017be17f7bb3968798e165c28349703a5306a78999bbd SHA512 b6b477af0ec604e100a67829bc9262a3aa54db9beb644e60a9ae95f916fd641ad7ccaa908fc6458be2eee60ecdb47bda9449720bc078f1c4fe0135fabf0bd9eb
-EBUILD gnome-raw-thumbnailer-3.0.0-r1.ebuild 892 BLAKE2B 3fc40eba782dbf20cbbf1c2dd66f177ec4e8b7ca2f97217a8ab8e43599a84e72fe261984dc9627a90af974d03cd84840fe6a70430285c8508ca04401426f2fe5 SHA512 87d926927195488b42ddc6f9e4969d0f7f6dc9181d888060afdbfa7453c25f5cac3a70cdb53d1b808f4b4e7b45aab24891ec6795555fcda7054601f04677eaea
+EBUILD gnome-raw-thumbnailer-3.0.0-r1.ebuild 893 BLAKE2B 8bbb34c43368522a82302860026c567859ff7142cde0957c3aae38a6c2b15d8b9eef50fffda959eee5534b5f8990c5d50428477a5e7d606875164855f601c876 SHA512 473ca69d683faa88e08a602e71897d50d15903d6f036e256ac15218f7975da13571743b29f78ef533c5469226992203fa435eec950ccf16fd2cbd470b4e125e6
MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r1.ebuild b/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r1.ebuild
index d1b31651b20d..74c33fd4f3d6 100644
--- a/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r1.ebuild
+++ b/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://libopenraw.freedesktop.org/download/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
IUSE=""
RDEPEND="
diff --git a/media-gfx/gnome-screenshot/Manifest b/media-gfx/gnome-screenshot/Manifest
index 54b662f907a2..be8fdfd6c61d 100644
--- a/media-gfx/gnome-screenshot/Manifest
+++ b/media-gfx/gnome-screenshot/Manifest
@@ -1,3 +1,5 @@
DIST gnome-screenshot-3.32.0.tar.xz 228876 BLAKE2B a7f742cf67815428da3013db23d36b34f52bf99c3d77002cac9243d2f5c5c5c1828cb92a34e0541d18c57f357d39f876a815d7caa432f92704c749a431faae95 SHA512 2747f3cc6ff6df6db6d64c9c13f7d7e3c0bf738cdace2850869c1158d23d02dd03b55e6704c9540f1e5b789626ea07741a0030ce3b06dd70c09f2fb2afa79c61
-EBUILD gnome-screenshot-3.32.0.ebuild 1208 BLAKE2B f231ccd7901bf917986d1e9ca02e6d47421896bc6ae96a548166a1fcfe91344bdd307f2ab122625d3725c34ac367508dfea098cccd49a570fe90cc62731bb719 SHA512 acff8007646b7d67f69eea78a2037ea71e235288a337930d80f4aa8f886b8b8d5a96634450ddd3e3db8daa47798591f29ca1673b12546ca31d8909476af4ef6a
+DIST gnome-screenshot-3.36.0.tar.xz 231420 BLAKE2B ce916d4d221252f47c84ebdec52ddcc2e25c2481df848cb6199842857c7ba537f56c22bdcb2a8e5b988d767fbc242d0c727119bc1ae9d569644eae15688aebf5 SHA512 fda599e7c50b37d8356352085b2f45f3b8c868af897352810998e127bd7333d5a1383369ec1cb980064f7e0aafa0e01bc5cdb31563ea56b1a7e4099fc18cc6b4
+EBUILD gnome-screenshot-3.32.0.ebuild 1204 BLAKE2B 7e2465f20e33696123deb1156db4e4a1356bb48b8613824be9d418b7f31c2a41ddf4fb25b0c422007e703ec7a68b8872b760f080988538b94c7a8bd2d5c52dc2 SHA512 1115c12624ba4bd0a218347775c8810c916f862e0155471a55e84ae38e214c9de19992d025a52b5ba685a506022a0091a307c8b14c61973f33edb9d8b44ef90a
+EBUILD gnome-screenshot-3.36.0.ebuild 1206 BLAKE2B 2b18df9ff08f8c0c6dab74feec821be5249715e5137284e1a4da2a31d99f47881856f12875f07cff21e04920decea4584894034236d20abd290d81355e065706 SHA512 3d8acd746b51ef035c0524e4ff62c9c82e3687ce723b4d17c0fa9214e5cda1c1518262b00a503c25542a24d7a050f09b5a6607b491580ea93fac798c85f9173f
MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.32.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.32.0.ebuild
index 9d6b6a3b2a0b..521236d8c9cd 100644
--- a/media-gfx/gnome-screenshot/gnome-screenshot-3.32.0.ebuild
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-3.32.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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/gnome-screenshot"
LICENSE="GPL-2+"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~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/gnome-screenshot/gnome-screenshot-3.36.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.36.0.ebuild
new file mode 100644
index 000000000000..9eca7cb14427
--- /dev/null
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-3.36.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson readme.gentoo-r1 xdg
+
+DESCRIPTION="Screenshot utility for GNOME"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-screenshot"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+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="
+ x11-libs/libX11
+ x11-libs/libXext
+ >=dev-libs/glib-2.35.1:2[dbus]
+ >=x11-libs/gtk+-3.12.0:3
+ >=media-libs/libcanberra-0.26-r2[gtk3]
+"
+RDEPEND="${DEPEND}
+ >=gnome-base/gsettings-desktop-schemas-0.1.0
+"
+BDEPEND="
+ dev-libs/appstream-glib
+ dev-libs/libxml2:2
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ x11-base/xorg-proto
+"
+
+DOC_CONTENTS="${P} saves screenshots in ~/Pictures/ and defaults to
+ non-interactive mode when launched from a terminal. If you want to choose
+ where to save the screenshot, run 'gnome-screenshot --interactive'"
+
+src_install() {
+ meson_src_install
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+ readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/media-gfx/gqview/Manifest b/media-gfx/gqview/Manifest
index d08fddb59fe1..f4729b1e8b5f 100644
--- a/media-gfx/gqview/Manifest
+++ b/media-gfx/gqview/Manifest
@@ -5,6 +5,5 @@ AUX gqview-2.1.5-helpdir.patch 823 BLAKE2B 40750550ba6aff8fbdd9af56182ec6b0129bc
AUX gqview-2.1.5-readmedir.patch 257 BLAKE2B 9db86f9542121dd8f0a0c3004b945adae8ae41ef3fe4b421320f8c10a6d97949341f2779aa466972d91eddf7f39c3cb6834fdae3085e1afeda51ec5c50253576 SHA512 816e95ce5999e930aa7488b66575469669842e9ee48bfc979f02a64e7ed9439af30ffee4c4c6e37c97a6a47e28bdbee9761f996b1946f1d9d4330e756a691745
AUX gqview-2.1.5-windows.patch 561 BLAKE2B 142f068e495c2dcd090649f93b8f3a55ca894c76d31deed0403f99b0830750e133ffb1e6ad651454c6ef01e95c35571b3f30f3502a2eef2d3e01174a20251441 SHA512 f4382d81362efca9decd18f93ffcabc5eeb36251b67377d35a6de87eb0672b24e15d82610b64865415fa23f6e26090c557b7f1df8092cf34b38f7106dd7a33c3
DIST gqview-2.1.5.tar.gz 1685061 BLAKE2B f47c0e5937ea87223c2110b148c5a52b912d6c65476e5f2d67377e544bb42cae919796d1714992cda6f0e7e7409a7bd0dd6689ac37d2da41254118b699327b9c SHA512 a9e184f9bfbcb789fa732f490b5b1883aaa4c153fb924e2995f36ddef2d170ad9d0695689221d7a0ccae587f5de07b34ca03fa407f774ed3505d0183bf44b555
-EBUILD gqview-2.1.5-r1.ebuild 969 BLAKE2B 6a2e18f895633b97c3f437a6eda7a0229d6ffcd8853a518198071e6401e23bd181d4a3d3ebb2f319bce2d4bbd2be0ed325d91e0a0d4e52055d3c55657e25fc34 SHA512 a2ad1697208f0f963886e6551ab455cfa002ab2461bac416ea7e53134d0d50e31c5bf7c4b4ef72655c485773b42842d11fc657897f1c8ebf07909cee23a4d1d0
-EBUILD gqview-2.1.5-r2.ebuild 1130 BLAKE2B 81a8185e80bda2b8dc752fdfbb4f5c7d3738f2ad6cc4a5fcdbb5af7b72876b379e19534c6827a4ccb1e00a4901fa31851e68ad3a395eacd13590d80202bf8f75 SHA512 4ad8e2bd540df505047b19d55f8a051c30ba9b0307d5a4215168799499cb69d79ba8b9fe546e0cb25f1a1306508fb886a41a518e3fdce4f91d514d72465170c5
+EBUILD gqview-2.1.5-r2.ebuild 1126 BLAKE2B 2ed44ec0096fe5c38b3b1106b4cd678c36e2465a67bf60b0902c8cbed95c09da2183194e319c4f87bb9dde1ea8b0919d174a41c17b6ffd01d501bec0ef3664f7 SHA512 bab3680014f333becf847f42645793f794a7561b7db6c3d03810e577d9b39f98e41e25e957d8ea27206efee12b9022a103cc798ab78afddc2716343aa5e956fb
MISC metadata.xml 447 BLAKE2B 632ee924036fc4dde09ca3a05043ccd38e4fbc9583ee9498c1fdf87f6d91ac944b1c600f9da68d33a498c137d4133c2a53f8d03677c50f228ef30e5c108a42d3 SHA512 f6a5af4d1e5effb6e9cf58edb237be34d69bd9927ae8f2f9fefe88303bd2936e6f58f09367977bf9c9c814d299465e0acf949c045df9177bcae15598fbd6534f
diff --git a/media-gfx/gqview/gqview-2.1.5-r1.ebuild b/media-gfx/gqview/gqview-2.1.5-r1.ebuild
deleted file mode 100644
index c1d9ad5dcda9..000000000000
--- a/media-gfx/gqview/gqview-2.1.5-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils autotools
-
-DESCRIPTION="A GTK-based image browser"
-HOMEPAGE="http://gqview.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gqview/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.4:2
- virtual/libintl"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- sys-devel/gettext"
-
-src_prepare() {
- epatch \
- "${FILESDIR}/${P}-windows.patch" \
- "${FILESDIR}/${P}-glibc.patch"
- sed -i \
- -e '/^Encoding/d' \
- -e '/^Icon/s/\.png//' \
- -e '/^Categories/s/Application;//' \
- gqview.desktop || die
- mv configure.in configure.ac || die
- eautoreconf
-}
-
-src_configure() {
- econf --without-lcms
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- # leave README uncompressed because the program reads it
- dodoc AUTHORS ChangeLog TODO
- rm -f "${D}/usr/share/doc/${PF}/COPYING"
-}
diff --git a/media-gfx/gqview/gqview-2.1.5-r2.ebuild b/media-gfx/gqview/gqview-2.1.5-r2.ebuild
index a05ba7269432..8cbd809fc3d6 100644
--- a/media-gfx/gqview/gqview-2.1.5-r2.ebuild
+++ b/media-gfx/gqview/gqview-2.1.5-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gqview/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 ~sparc x86"
IUSE=""
RDEPEND=">=x11-libs/gtk+-2.4:2
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 0089cceeac2a..204cf44818eb 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -2,7 +2,9 @@ AUX graphicsmagick-1.3.19-flags.patch 1800 BLAKE2B 50f4f0de0cb3842fb84e136038bc0
AUX graphicsmagick-1.3.19-perl.patch 491 BLAKE2B 6a6465162d9a4d7d09b1edb425cc7114cd4e0fc65e48f15c8c2a854fe835fd1fe94c56611c6d2744d9e26884c57b1f67353bfd32abe2f25a145dd7abbf5479f0 SHA512 da114b891ec923253048d90ee14f136742072bcb70e512e8d2838bbcac57b5fe6ea580cdccfd1bba5156777623c43e946ce2a8661f88612d4c24849bef0fb865
DIST GraphicsMagick-1.3.32.tar.xz 5535224 BLAKE2B 96fd7bfe62b4b1b25f9ffc0ff8e2ac023f0528b9af857fc27a5a9cd1123eeb6533b868c7bad8dca5b58e114a674dda009a62904df64622d7b5f3c0d72156283d SHA512 f84cdb9318962aed1dc25d70db4d0ca102e4f88748f468f8a56b77d228fd315b772afa48e90a396d32e8226eba9105717bcb94166bbe43723afeec58ead53e09
DIST GraphicsMagick-1.3.33.tar.xz 5558348 BLAKE2B 9c3747ee63d94bc6d16c06c04c7fad2ca93e849df7ae4391523b416111b5569c7493226f6b967a5ff80e0ff2ccbe7f6de5a7223e935024fd66a96be401fdf26b SHA512 8afeb461d1a9dab9b88b9bc7c2d50b5c409463b369e6b0ba7ee39b0ece32da9393d7a5a4d18faf8f72a529346a3477bae61b802bac2af81aeae79d95c9d6cd13
-EBUILD graphicsmagick-1.3.32.ebuild 3071 BLAKE2B a06ec92ee372c465555b5358f38e1169d2bb1249a8db6b308f13ae7a7fc673790c2de3aabef621e4456799911184604be82979401836ce4c6d76eb9c8e25bc11 SHA512 fc56850edbf9d1fa7446d784f3ca331ffca7e286a75757bd773c40ec6b973ed46b312917fea6ad8e569004d7c739db11edb702c1004805d2dc4b25d0c203cc61
-EBUILD graphicsmagick-1.3.33.ebuild 3078 BLAKE2B 722f3289f587b875e2483557fd60b55ed3afd7bc43ccf8cfb91479f9ead4c2ab2cf9b6ee8f41c4d2045cf64a0cea5df07c7c2ccf47c2fe31d8d2b0c8f9ebb0a9 SHA512 43ac942e1f3b92f375999ddf9883a23107ec0975aeca11994c9e38110918bcbf86063ac18abe0e9da881406c08bc6c5024ee32ae405d5a8149415733d06224a1
-EBUILD graphicsmagick-9999.ebuild 3078 BLAKE2B 722f3289f587b875e2483557fd60b55ed3afd7bc43ccf8cfb91479f9ead4c2ab2cf9b6ee8f41c4d2045cf64a0cea5df07c7c2ccf47c2fe31d8d2b0c8f9ebb0a9 SHA512 43ac942e1f3b92f375999ddf9883a23107ec0975aeca11994c9e38110918bcbf86063ac18abe0e9da881406c08bc6c5024ee32ae405d5a8149415733d06224a1
+DIST GraphicsMagick-1.3.35.tar.xz 5543224 BLAKE2B 8a284d85341c10939fdece5c565d5b881276afb9b4c5dfb2221b780a01b99f78ee62761722c372baf9155c63f7ef176b67310aeedcab0368f4f26f5b0150bcce SHA512 baae92089d52147ef961f93495abc8a9d8b1a963af61d87a650c1ab105d46816aa38c83f654edcb5a0e1b7f07ccc06eaeaa443b9bde3a63a0b9bfb45f3ae144c
+EBUILD graphicsmagick-1.3.32.ebuild 3073 BLAKE2B 2b5f2568d3369c959b6754677e3806bd0600622bc17c6a92964120dfcee1cb45b75703d0dcacae855771898a08ab65c60ec5c5310fa69997250996753447ff9f SHA512 06ff45495b09e3dfd9f81bf2d6dca0c0bcf84423df38d6a8cbebc86732c2cf5f0fe6bf5678a3e9ad0075f909055bba359b16ad0774243032056635d8aac38d7d
+EBUILD graphicsmagick-1.3.33.ebuild 3079 BLAKE2B 5683335f38a7d90554e705f65bc84ea44643bd6c18b5d7f48f2608d949efc4ecd8f562a6f7f989ee0dbc4e208efbc4a1190154f88baf69c89ad17da1d70ad5ae SHA512 13f6d72eb95a1be93d70d685fc3296885c7084536a951e9158e989169e5e5768c98591af22b0221bcb951ce4b4bbdeb90b21b93f3fa8589026316880d1dbe8cd
+EBUILD graphicsmagick-1.3.35.ebuild 3079 BLAKE2B 5683335f38a7d90554e705f65bc84ea44643bd6c18b5d7f48f2608d949efc4ecd8f562a6f7f989ee0dbc4e208efbc4a1190154f88baf69c89ad17da1d70ad5ae SHA512 13f6d72eb95a1be93d70d685fc3296885c7084536a951e9158e989169e5e5768c98591af22b0221bcb951ce4b4bbdeb90b21b93f3fa8589026316880d1dbe8cd
+EBUILD graphicsmagick-9999.ebuild 3079 BLAKE2B 5683335f38a7d90554e705f65bc84ea44643bd6c18b5d7f48f2608d949efc4ecd8f562a6f7f989ee0dbc4e208efbc4a1190154f88baf69c89ad17da1d70ad5ae SHA512 13f6d72eb95a1be93d70d685fc3296885c7084536a951e9158e989169e5e5768c98591af22b0221bcb951ce4b4bbdeb90b21b93f3fa8589026316880d1dbe8cd
MISC metadata.xml 1154 BLAKE2B f94864df05c239bd37ec05d00068e934e60e8dcbe03e52020df7d830842be94c08dbf339eca919c4e7fe18d5ad62bf3077ac9877b18ef6f09fd2b9f52c31aba0 SHA512 9bdbcace99fd11f192bea183b5d84bc9b2d06979db21d1a9a3e57677a4438f24a5812619c73a0becfc7fb81140414199fde3d0e8811abf1a92322535529f5d2c
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.32.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.32.ebuild
index 3cd7e821789d..38979f24cfd0 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.32.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.32.ebuild
@@ -16,10 +16,10 @@ if [[ ${PV} == "9999" ]] ; then
EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
else
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
- KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+ KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
fi
-IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg lcms lzma modules openmp
+IUSE="bzip2 +cxx debug fpx imagemagick jbig jpeg lcms lzma modules openmp
perl png postscript q16 q32 static-libs svg threads tiff truetype
webp wmf X zlib"
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.33.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.33.ebuild
index 10a8ba42cf2a..6e0e9fc4f818 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.33.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.33.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,7 +19,7 @@ else
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
fi
-IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg lcms lzma modules openmp
+IUSE="bzip2 +cxx debug fpx imagemagick jbig jpeg lcms lzma modules openmp
perl png postscript q16 q32 static-libs svg threads tiff truetype
webp wmf X zlib"
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.35.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.35.ebuild
new file mode 100644
index 000000000000..6e0e9fc4f818
--- /dev/null
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.35.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools toolchain-funcs
+
+MY_P=${P/graphicsm/GraphicsM}
+
+DESCRIPTION="Collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.graphicsmagick.org/"
+LICENSE="MIT"
+SLOT="0/${PV%.*}"
+
+if [[ ${PV} == "9999" ]] ; then
+ inherit mercurial
+ EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
+else
+ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+
+IUSE="bzip2 +cxx debug fpx imagemagick jbig jpeg lcms lzma modules openmp
+ perl png postscript q16 q32 static-libs svg threads tiff truetype
+ webp wmf X zlib"
+
+RDEPEND="dev-libs/libltdl:0
+ bzip2? ( app-arch/bzip2 )
+ fpx? ( media-libs/libfpx )
+ imagemagick? ( !media-gfx/imagemagick )
+ jbig? ( media-libs/jbigkit )
+ jpeg? ( virtual/jpeg:0 )
+ lcms? ( media-libs/lcms:2 )
+ lzma? ( app-arch/xz-utils )
+ perl? ( dev-lang/perl:= )
+ png? ( media-libs/libpng:0= )
+ postscript? ( app-text/ghostscript-gpl )
+ svg? ( dev-libs/libxml2 )
+ tiff? ( media-libs/tiff:0 )
+ truetype? (
+ media-fonts/urw-fonts
+ >=media-libs/freetype-2
+ )
+ webp? ( media-libs/libwebp:= )
+ wmf? ( media-libs/libwmf )
+ X? (
+ x11-libs/libSM
+ x11-libs/libXext
+ )
+ zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.3.19-flags.patch
+ "${FILESDIR}"/${PN}-1.3.19-perl.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local depth=8
+ use q16 && depth=16
+ use q32 && depth=32
+
+ local openmp=disable
+ if use openmp && tc-has-openmp; then
+ openmp=enable
+ fi
+
+ local myeconfargs=(
+ --${openmp}-openmp
+ --enable-largefile
+ --enable-shared
+ $(use_enable static-libs static)
+ $(use_enable debug prof)
+ $(use_enable debug gcov)
+ $(use_enable imagemagick magick-compat)
+ $(use_with threads)
+ $(use_with modules)
+ --with-quantum-depth=${depth}
+ --without-frozenpaths
+ $(use_with cxx magick-plus-plus)
+ $(use_with perl)
+ --with-perl-options=INSTALLDIRS=vendor
+ $(use_with bzip2 bzlib)
+ $(use_with postscript dps)
+ $(use_with fpx)
+ $(use_with jbig)
+ $(use_with webp)
+ $(use_with jpeg)
+ --without-jp2
+ $(use_with lcms lcms2)
+ $(use_with lzma)
+ $(use_with png)
+ $(use_with tiff)
+ $(use_with truetype ttf)
+ $(use_with wmf)
+ --with-fontpath="${EPREFIX}"/usr/share/fonts
+ --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+ --with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts
+ $(use_with svg xml)
+ $(use_with zlib)
+ $(use_with X x)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ default
+ use perl && emake perl-build
+}
+
+src_test() {
+ unset DISPLAY # some perl tests fail when DISPLAY is set
+ default
+}
+
+src_install() {
+ default
+
+ if use perl; then
+ emake -C PerlMagick DESTDIR="${D}" install
+ find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die
+ find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die
+ fi
+
+ find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + || die
+}
diff --git a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
index 10a8ba42cf2a..6e0e9fc4f818 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,7 +19,7 @@ else
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
fi
-IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg lcms lzma modules openmp
+IUSE="bzip2 +cxx debug fpx imagemagick jbig jpeg lcms lzma modules openmp
perl png postscript q16 q32 static-libs svg threads tiff truetype
webp wmf X zlib"
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index cb90f0e44b14..2fafd5651b22 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -1,4 +1,6 @@
AUX graphite2-1.3.5-includes-libs-perl.patch 836 BLAKE2B 0429d214ff7fd9b903e1d3bcaf0af3e6b29a0269581390f64950e42e41280e482fc9cfda9bfe24ef166eb6c24d21377a15fca4264fec69d902d8ba18810bdb01 SHA512 26ab6dda13d758a5e4237c8b5d207d3c5111afbb11b2c3984cd742913c3c7932559b23b5ea9f774f1c6373eb0f761a9400dccc95876740b3cd06c44084a10965
DIST graphite2-1.3.13.tgz 6664757 BLAKE2B 3faad44f7ba5e0729f722fd4589c5f6a4c53cffc2bb93615c8220d03c759dedf05924b1f56cafcf1c28e0a4b50fba0d319da30572fffde4baab6bc240528a0d3 SHA512 44ac2f353c1a795a55c78b4ff72df35a3a5a94700356c0eefe105d66cd499ac93f9cfd5ab7b3ea842b575156cb8df19e0b57ff8b9dbaee8a576319ff5889c131
-EBUILD graphite2-1.3.13.ebuild 2664 BLAKE2B be4e958ce54f6645f36dec95c6919f58c3d7f82ecd9daff55ebf13dfe20054980233f61bbb8c3477e694bd9edcf3d2d80888227a4fd67eec81afefcd2870be5e SHA512 8039a69d6595ab92833e3bd56108744b60f1500daf9b1fa1ca6a62187bfa0edbe47662f61ccb7fea5ab90013b39f1c782a01680917145556fdcdd26cedd8c2aa
+DIST graphite2-1.3.14.tgz 6630061 BLAKE2B 72bf6736aaa8476a89e44ef53c5b6c94f45d815fe1a451ba6b3696bfe023971210975dee4a9c8cb3042f36442e4efecf5baf171ef4230ad2b10694a89865f918 SHA512 14b5eb2ba8158b8b62ffa7fb142100a0af1de0f0c45b2673801b636714a106b46fcd423b05c722d963c9543fafcf10fec811975308211a54f20a3ba322d7b295
+EBUILD graphite2-1.3.13.ebuild 2661 BLAKE2B 22cde90b2406128eef2cb8401471410a0b5a620cffc76f93b30125763aac3012b03f93609a91390190bf21c97dba466d78ac2814f724e5065d28dc817ebe09a6 SHA512 64e799506bc2f08692d377660eb36f09266c6b4f098f8189754a1e844c7ad965fd208a4160552b0850ab6295c6df95b67832ec77be3453acf00a977fd88a4ec3
+EBUILD graphite2-1.3.14.ebuild 2672 BLAKE2B da481afa0cd562a309142dacfedf1a499622e3ed62b1c2e2956da81997b791da67ba0faa4cddc7528e50f95ec124a6899836de2ba9c11eb3428c2f6697c520f0 SHA512 0703a149ac36c3e0987e04912e52c992d559c6b7b72905516bac83a0507db68bb28f0884e95fe2089a140568b053786253c46f726f21e7a15b0d4628ba60d6b0
MISC metadata.xml 336 BLAKE2B 7069f4f7bb9ecd39581528f3f6b072d2ebf2c32b24224b9ca5b69b138490e764b740768334954f5cfc25819cab55a50fbd0933dc77fb3397886aacfd105f0853 SHA512 ac8ae39ab005c1562818a97b64bfef48ab64e2a1993aa3eef4ee4b3066b32d9211787df1273e20cb767839e42364ed72b3e99c51bb65f0c88937564d5dbb5380
diff --git a/media-gfx/graphite2/graphite2-1.3.13.ebuild b/media-gfx/graphite2/graphite2-1.3.13.ebuild
index 3b8abd615a36..8f59b69ddd67 100644
--- a/media-gfx/graphite2/graphite2-1.3.13.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.13.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="perl test"
RESTRICT="!test? ( test )"
diff --git a/media-gfx/graphite2/graphite2-1.3.14.ebuild b/media-gfx/graphite2/graphite2-1.3.14.ebuild
new file mode 100644
index 000000000000..89ce22d2c571
--- /dev/null
+++ b/media-gfx/graphite2/graphite2-1.3.14.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+CMAKE_ECLASS=cmake
+GENTOO_DEPEND_ON_PERL="no"
+inherit perl-module python-any-r1 cmake-multilib
+
+DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems"
+HOMEPAGE="https://scripts.sil.org/cms/scripts/page.php?site_id=projects&item_id=graphite_home"
+SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="perl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ perl? ( dev-lang/perl:= )
+"
+DEPEND="${RDEPEND}
+ perl? (
+ dev-perl/Locale-Maketext-Lexicon
+ dev-perl/Module-Build
+ )
+ test? (
+ ${PYTHON_DEPS}
+ dev-libs/glib:2
+ $(python_gen_any_dep 'dev-python/fonttools[${PYTHON_USEDEP}]')
+ media-libs/fontconfig
+ perl? ( virtual/perl-Test-Simple )
+ )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-1.3.5-includes-libs-perl.patch" )
+
+pkg_setup() {
+ use perl && perl_set_version
+ use test && python-any-r1_pkg_setup
+}
+
+python_check_deps() {
+ has_version "dev-python/fonttools[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ # make tests optional
+ if ! use test; then
+ sed -e '/tests/d' -i CMakeLists.txt || die
+ fi
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ # Renamed VM_MACHINE_TYPE to GRAPHITE2_VM_TYPE
+ -DGRAPHITE2_VM_TYPE=direct
+ )
+ # https://sourceforge.net/p/silgraphite/bugs/49/
+ [[ ${CHOST} == powerpc*-apple* ]] && mycmakeargs+=(
+ -DGRAPHITE2_NSEGCACHE:BOOL=ON
+ )
+
+ cmake_src_configure
+
+ # fix perl linking
+ if multilib_is_native_abi && use perl; then
+ # we rely on the fact that cmake_src_configure sets BUILD_DIR
+ sed -e "s:@BUILD_DIR@:\"${BUILD_DIR}/src\":" \
+ -i "${S}"/contrib/perl/Build.PL || die
+ fi
+}
+
+src_compile() {
+ cmake-multilib_src_compile
+ if use perl; then
+ cd contrib/perl || die
+ perl-module_src_configure
+ perl-module_src_compile
+ fi
+}
+
+multilib_src_test() {
+ if multilib_is_native_abi; then
+ cmake_src_test
+ else
+ einfo "Cannot test since python is not multilib."
+ fi
+}
+
+src_test() {
+ cmake-multilib_src_test
+ if use perl; then
+ # Perl tests fail due to missing POD coverage...
+ perl_rm_files "contrib/perl/t/pod.t" "contrib/perl/t/pod-coverage.t"
+ cd contrib/perl || die
+ perl-module_src_test
+ fi
+}
+
+src_install() {
+ cmake-multilib_src_install
+ if use perl; then
+ cd contrib/perl || die
+ perl-module_src_install
+ perl_delete_localpod
+ fi
+
+ find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+}
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 27a23edb4232..fd5b89c538f3 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,4 +1,4 @@
AUX graphviz-2.34.0-Xaw-configure.patch 2445 BLAKE2B fc1b3820fd72821ac431f5d93d0b4b0c8f596ca9d2c2f516961f5baab9fd54ba870df75434d2ed59fd9034bb7e2ce38c00faef9c12a79c7ec4da2d5e416d7117 SHA512 473d2ed9070329512cbc26929267b25fb8d7726e21ed01d2921d4d8ac13b8ffaf166f07229fa7409192cfa14fabb0cf68b299bb3331b3cc953ae5363274fd15c
DIST graphviz-2.42.3.tar.gz 26246717 BLAKE2B 71c61dcd056c9a2e2655c3be995d1da17b3af0d3374e74400fc38da11ab81849f7b5e528f99fc2046294958a4bab0a411ab204e434360f316a5367403472e8a1 SHA512 e03ca6da0ddb1162bd179d159d7dbb379d55012d63bb922aa800260fce52b65beb1a9b5ca1a5199ad3537201b0b4841efc9facee6e03065c6bd02e840f8a29c9
-EBUILD graphviz-2.42.3.ebuild 7801 BLAKE2B 2c37c5480316b56be87b2e04c696f9bbe8e37acfed73de99a7958f377f9c15ed4573cdc9bcb90055b42fed22cf3a42fdfe2c1dce47ba0c06ce3a994d152dbd81 SHA512 aaae718fadae30ac7afdacb87d02262515f6b7224b5b724cd77ea3c910dc85babdfb36cfff7045b13b8cfa12f3b6fca88627ebf970aba3e5524a3a0d5ec3d7ae
+EBUILD graphviz-2.42.3.ebuild 7798 BLAKE2B 79de7e36c68de4af5d34874b2ede59919b79a8a18c5044043640d87e48dc1d848b9b29ae48a4b0daa66b4a0a8e9f3f054e80d256d9988c0d4b21d975620f2642 SHA512 7946ea0e9866689cc6604612fe2f7eacc454d336366925599d0742fa73c0da5cca6235ab18187bfe4018891b795eca442bd8a9412be1611a1ee15e9ecc408bad
MISC metadata.xml 2211 BLAKE2B 1c39235c1d8c2efce0596cda2d20bf1cf2e81643068f68215f31462b6320f7f31533877630aa3c2b2bc9a7f7856f7b27354a97bb2c61d7e63a6de86f569ed192 SHA512 f7689fe65e46905d48fb2e45c3ad2a1e8f4fcb572515fdd7dfa26cdd21ed1eaf52d8ecaab9c297f5e8df69a205337b8526e0304ddbdb8c4b3e82cb1e428a1e71
diff --git a/media-gfx/graphviz/graphviz-2.42.3.ebuild b/media-gfx/graphviz/graphviz-2.42.3.ebuild
index fd8cee3432be..f27ec198047d 100644
--- a/media-gfx/graphviz/graphviz-2.42.3.ebuild
+++ b/media-gfx/graphviz/graphviz-2.42.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www2.graphviz.org/Packages/stable/portable_source/${P}.tar.gz"
LICENSE="CPL-1.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD"
REQUIRED_USE="
diff --git a/media-gfx/greycstoration/Manifest b/media-gfx/greycstoration/Manifest
deleted file mode 100644
index 23ba17296a62..000000000000
--- a/media-gfx/greycstoration/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX greycstoration-2.9-gcc6.patch 396 BLAKE2B d18a53be921ffe3da15e6523c7881fbc0037c34ee96eb72a220cd28c90ddef50520fd5cd2a6069e97e5e55b7bc8d5ab5896d85932317dc3a14d381d612f74aac SHA512 a7d9b02824790d16548ca83278d57906ee55004f01fed5ae2fef4ca2f4a492971caa83cb8bd7ba3639426f087d0c42c290a6c592712dc6180f43cd69f65bd00d
-AUX greycstoration-2.9-libpng14.patch 843 BLAKE2B 45e3908343f7462538675c4402e96b4f759767858cba74b2a5e19eeaf506aa990ab258e0c71938e33430f7b36c59452544d9b45ac65a01899e6efadcb1f42b10 SHA512 3fead7452c311467ae6a2f91452243f233cd4c45fc58ffc191ad4a6b151080a9df2cf4994f2cc3b2a6b4980e0142076ac3134d3a76b77f8d94b202daafb1c885
-DIST GREYCstoration-2.9.zip 3639412 BLAKE2B ed8b7adb08f11969a4994ad6f784bea49c7a9b9310fff3b7664fab51f349b6ff00af45b21e247e6a8d77964e68147cad2b3f5db10ff08c359c04cf88b371b056 SHA512 f0f90e02087d2670213ed72876105202eab996bb483bed069046c0e01153eb05da91d92f00aa3ed5cc2fecba19f35e20739049c149426453e0e11efd446844ba
-EBUILD greycstoration-2.9-r2.ebuild 1792 BLAKE2B 10d39e1f6ba57d930f19294c62a7a225136461735bffc0e14f938e74679dee58f7f1ae3a446e8f12f269695d696c6410974b04fc7a3ca9350abf74726f7260f1 SHA512 a8c35a0d0528f4a0375726a91adc1acd94d917f9964e6a0024d488a1c8a095e4f4b86cb58561ee3e3309213d521d57be94c6e66fe945e34f179a4c935a3e93b7
-MISC metadata.xml 332 BLAKE2B 7f2ba960282344b95c763b477a5ad56257f74a16eafc5b661582d1c08f3e0332c8d16dc9b30c1d6574a587338b0e807435fee082b6d19343ff7e9729e0cca2e2 SHA512 1e2071791ac7b3c3b911678b83c10fe09b75ecff6c7266b49bb45b115f64df50af33017ce4192df94fa2c3960817bd8e47ecdde6b98e39765e167df3f41ad7b1
diff --git a/media-gfx/greycstoration/files/greycstoration-2.9-gcc6.patch b/media-gfx/greycstoration/files/greycstoration-2.9-gcc6.patch
deleted file mode 100644
index 5b957c6ece9d..000000000000
--- a/media-gfx/greycstoration/files/greycstoration-2.9-gcc6.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/plugins/greycstoration.h 2016-09-22 22:46:42.907946423 -0400
-+++ b/plugins/greycstoration.h 2016-09-22 22:49:56.439530308 -0400
-@@ -454,7 +454,7 @@
- p.temporary = 0;
- p.counter = 0;
- p.tile = p.tile_border = p.thread = p.nb_threads = 0;
-- p.stop_request = false;
-+ p.stop_request = NULL;
- greycstoration_mutex_destroy(p);
- }
- p.is_running = false;
diff --git a/media-gfx/greycstoration/files/greycstoration-2.9-libpng14.patch b/media-gfx/greycstoration/files/greycstoration-2.9-libpng14.patch
deleted file mode 100644
index 087f20fb8756..000000000000
--- a/media-gfx/greycstoration/files/greycstoration-2.9-libpng14.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://repos.archlinux.org/wsvn/community/greycstoration/trunk/libpng14.patch
-
---- a/CImg.h
-+++ b/CImg.h
-@@ -25671,7 +25671,7 @@
- png_read_info(png_ptr,info_ptr);
- png_uint_32 W, H;
- int bit_depth, color_type, interlace_type;
-- png_get_IHDR(png_ptr,info_ptr,&W,&H,&bit_depth,&color_type,&interlace_type,int_p_NULL,int_p_NULL);
-+ png_get_IHDR(png_ptr,info_ptr,&W,&H,&bit_depth,&color_type,&interlace_type,NULL,NULL);
- int new_bit_depth = bit_depth;
- int new_color_type = color_type;
-
-@@ -25682,7 +25682,7 @@
- new_bit_depth = 8;
- }
- if (new_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8){
-- png_set_gray_1_2_4_to_8(png_ptr);
-+ png_set_expand_gray_1_2_4_to_8(png_ptr);
- new_bit_depth = 8;
- }
- if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
diff --git a/media-gfx/greycstoration/greycstoration-2.9-r2.ebuild b/media-gfx/greycstoration/greycstoration-2.9-r2.ebuild
deleted file mode 100644
index 393b930c5b28..000000000000
--- a/media-gfx/greycstoration/greycstoration-2.9-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="Image regularization algorithm for denoising, inpainting and resizing"
-HOMEPAGE="http://www.greyc.ensicaen.fr/~dtschump/greycstoration/"
-SRC_URI="mirror://sourceforge/cimg/GREYCstoration-${PV}.zip"
-
-LICENSE="CeCILL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="fftw imagemagick jpeg lapack png tiff"
-
-RDEPEND="
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrandr
- fftw? ( >=sci-libs/fftw-3:3.0= )
- imagemagick? ( media-gfx/imagemagick:0= )
- jpeg? ( virtual/jpeg:0 )
- lapack? ( virtual/lapack )
- png? ( >=media-libs/libpng-1.4:0= )
- tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${RDEPEND}
- app-arch/unzip
- fftw? ( virtual/pkgconfig )
- lapack? ( virtual/pkgconfig )
- png? ( virtual/pkgconfig )
-"
-
-S="${WORKDIR}/GREYCstoration-${PV}/src"
-
-PATCHES=(
- "${FILESDIR}"/${P}-libpng14.patch
- "${FILESDIR}"/${P}-gcc6.patch
-)
-
-src_prepare() {
- default
- sed -i \
- -e "s:../CImg.h:CImg.h:" \
- greycstoration.cpp || die
-}
-
-src_compile() {
- local myconf="-Dcimg_use_xshm -Dcimg_use_xrandr -lX11 -lXext -lXrandr"
-
- use png && myconf+=" -Dcimg_use_png $($(tc-getPKG_CONFIG) --libs libpng) -lz"
- use jpeg && myconf+=" -Dcimg_use_jpeg -ljpeg"
- use tiff && myconf+=" -Dcimg_use_tiff -ltiff"
- use imagemagick && \
- myconf+=" -Dcimg_use_magick $(Magick++-config --cppflags) $(Magick++-config --libs)"
- use fftw && myconf+=" -Dcimg_use_fftw3 $($(tc-getPKG_CONFIG) --libs fftw3)"
- use lapack && myconf+=" -Dcimg_use_lapack $($(tc-getPKG_CONFIG) --libs lapack)"
-
- _cmd="$(tc-getCXX) ${LDFLAGS} ${CXXFLAGS} -fno-tree-pre \
- -o greycstoration greycstoration.cpp \
- ${myconf} -lm -lpthread"
- einfo "${_cmd}"
- eval ${_cmd} || die
-}
-
-src_install() {
- dobin greycstoration
-}
diff --git a/media-gfx/greycstoration/metadata.xml b/media-gfx/greycstoration/metadata.xml
deleted file mode 100644
index 665279969af4..000000000000
--- a/media-gfx/greycstoration/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>calchan@gentoo.org</email>
- <name>Denis Dupeyron</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">cimg</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest
index fd8bce9575ad..b672d17dd97a 100644
--- a/media-gfx/gscan2pdf/Manifest
+++ b/media-gfx/gscan2pdf/Manifest
@@ -1,7 +1,7 @@
DIST gscan2pdf-1.8.11.tar.xz 409212 BLAKE2B 37cb716f13818eaffc39c210b810b845368cc5e323569e8f9d5603b5b412c4182520798321358e4c21339fdbd5f15026a0acd6421a49e7db79ecca86633c3ab0 SHA512 1ea09b8768771be4a1700cb8a6523d5f74fcbf0ebe459d97796032b56f896fd0c50e5ca1ed4c96aedef7e61f6952a92986153cc70173dd5ad91ccfb72461c565
-DIST gscan2pdf-2.6.3.tar.xz 459276 BLAKE2B 395260a2034e9ac782c4c6104af5dc24561d271b45a359762cef990fce9f8343c6dc3c863ad66fc0ba56991df20945384edb695e3d94fa5fcc58c78ad039d380 SHA512 77478e7d35a90fd737a28f302bac214d3946cd5f0ce93f8d22b3485a6d1150ff2834433d028487fea4433a36a532714b4f47e8fbba3307c178fc161a0adbdbb0
-DIST gscan2pdf-2.6.4.tar.xz 460636 BLAKE2B 80d6123f8849ce305ca9b914da267f5b8898d6b3b660026ba075e5f8e10fc78093bb49d3186ec6a90d32b8c6ae0dade70fc146dcb677540810c06e91186bdbd7 SHA512 10d08b10f3101759757a2d98f2c2b41813a5f67234471f746ecda5ffebe085cb0d435343d05fa9107ed942785f707c7c2d8db6e430b1af335afe30b1d9079f08
+DIST gscan2pdf-2.6.5.tar.xz 462400 BLAKE2B 3098656dd4060e480d90558f4bde3b806e31de7e17bc7fa208469d338a41a7e9fb3fbb2d12828c69e0ea745ea6945d015c35bc0d76b00a0377881aff616fba54 SHA512 5e0bfd358daaf340092a54750df791460e3e234ffd144351232e23dad40b6602d45a54e24b61eb54a11c7b8fc7eb7ca192764f67d323f86799d48096483b09d6
+DIST gscan2pdf-2.6.7.tar.xz 466260 BLAKE2B 311e21c6d024527eb8c281ff3dd99b1abea61d91c7fad88ce22d7e436144a39999c8db89ba1321ebc1d3949f09814ebdfda1b414b5453cb9faca0635cd804d75 SHA512 926df3434cebb8978ff4714b265b4ceff77c177653855c9416a87084ff6601a84a8e536d799f9efa9645336f49ef2c133672863da364145c5a785b43fd5c7c72
EBUILD gscan2pdf-1.8.11.ebuild 1731 BLAKE2B 0b0f7cdfef98e666e20e44882584e0636e490429186e441d87f965e74071f5076693896e17e68184319dfaf3a1fd4487140209ef3b49603c9496cc936516333d SHA512 b94b73d3396208a8c67c2aad407815329501717c364d60189b21d96f652846e554d59a2a36f4b58383d7f49ab728d4fe251bce9ab1944befb667a9e0c09237b3
-EBUILD gscan2pdf-2.6.3.ebuild 2319 BLAKE2B 4c29240a5b5fc984cb4b6b10643c918e696ec6a8564dfaa2a1a0e2a1e1457d2c24a79725c8b70767d59abc9b5fbfcc763fbdf24334f7806a29e54aefa4f81891 SHA512 e8ff79b2a675db017e5af440c5772ab3e1076613213d219da2f68976f8f1631fa8b7c9c3ab08c7d2bce50dba624fcd5f40832b8e4de2f70cf030af5f2429aa4a
-EBUILD gscan2pdf-2.6.4.ebuild 2421 BLAKE2B 0fa711b09f01a9ac476fc921ab6365a785ce4c027f3068a63618d6c7f9a76fb908336e3061fb978a9d76535d60184f475dcc37d5865b1925565ba96d4e7494ac SHA512 cc0d0790aa2dcb1b9faef6ecdee6f14ab0a4f89a0c91099a254695884447dbdc072ba31841aa0d3276ba4e7a43473bf68cfaac2b885e6acd80e1cffb2a146873
+EBUILD gscan2pdf-2.6.5.ebuild 2421 BLAKE2B 0fa711b09f01a9ac476fc921ab6365a785ce4c027f3068a63618d6c7f9a76fb908336e3061fb978a9d76535d60184f475dcc37d5865b1925565ba96d4e7494ac SHA512 cc0d0790aa2dcb1b9faef6ecdee6f14ab0a4f89a0c91099a254695884447dbdc072ba31841aa0d3276ba4e7a43473bf68cfaac2b885e6acd80e1cffb2a146873
+EBUILD gscan2pdf-2.6.7.ebuild 2421 BLAKE2B 0fa711b09f01a9ac476fc921ab6365a785ce4c027f3068a63618d6c7f9a76fb908336e3061fb978a9d76535d60184f475dcc37d5865b1925565ba96d4e7494ac SHA512 cc0d0790aa2dcb1b9faef6ecdee6f14ab0a4f89a0c91099a254695884447dbdc072ba31841aa0d3276ba4e7a43473bf68cfaac2b885e6acd80e1cffb2a146873
MISC metadata.xml 439 BLAKE2B 835480b0d68a079941e94f2646d0136dfb8a8e750e0279f8a5a2e23e6690242582ffe660798f5e80ebfb4378a576aa5715332b53230555866391a99ec28f54ff SHA512 af1cc05ac693899586df81036d2fa11af187edbb3c9449862298ba05efd0dbd0c4c5b008a1a21328c1f9a27a690671bd7a9967d2e457efb31561044e45984401
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.6.4.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.6.5.ebuild
index cda89719399f..cda89719399f 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-2.6.4.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-2.6.5.ebuild
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.6.3.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.6.7.ebuild
index a415292cfd59..cda89719399f 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-2.6.3.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-2.6.7.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DIST_TEST="do"
-inherit eutils perl-module virtualx
+inherit eutils perl-module virtualx xdg-utils
DESCRIPTION="Scan documents, perform OCR, produce PDFs and DjVus"
HOMEPAGE="http://gscan2pdf.sourceforge.net/"
@@ -67,6 +67,8 @@ PERL_RM_FILES=( t/{90_MANIFEST,91_critic,99_pod}.t )
mydoc="History"
pkg_postinst() {
+ xdg_desktop_database_update
+
optfeature "DjVu file support" "app-text/djvu[tiff] media-gfx/imagemagick[djvu]"
optfeature "encrypting PDFs" app-text/pdftk
optfeature "creating PostScript files from PDFs" app-text/poppler[utils]
@@ -77,6 +79,10 @@ pkg_postinst() {
optfeature "sending PDFs as email attachments" x11-misc/xdg-utils
}
+pkg_postrm() {
+ xdg_desktop_database_update
+}
+
src_test() {
local confdir="${HOME}/.config/ImageMagick"
mkdir -p "${confdir}" || die
@@ -86,5 +92,5 @@ src_test() {
<policy domain="coder" rights="read" pattern="PS" />
</policymap>
EOT
- virtx perl-module_src_test
+ NO_AT_BRIDGE=1 virtx perl-module_src_test
}
diff --git a/media-gfx/gtkimageview/Manifest b/media-gfx/gtkimageview/Manifest
index b58571812185..db45251e00de 100644
--- a/media-gfx/gtkimageview/Manifest
+++ b/media-gfx/gtkimageview/Manifest
@@ -1,3 +1,3 @@
DIST gtkimageview-1.6.4.tar.gz 1158138 BLAKE2B b59abcbac71d4bd039bf9f3fc2f25f6590f91c4cc320cea90243a4889e020f1a54a3ca5d8a843f7482551ce8da6fafe6e3ce4fbc5a5e32fd6ceb4367b5abb9db SHA512 6378c640006e73aa1ffbf92eb9d4e42570707bc159f0a657b11f027d328088f5e89fc334de170de5ab1a39bed588b0b76f4633688a894cb7def16f1dea9f8e39
-EBUILD gtkimageview-1.6.4.ebuild 1216 BLAKE2B 0ca91426de4420e01f0fca0703abaf35b556cf778ddd76bc48fa127a96370de4e1be2c8ff2f503dc5caf3d593c1b6cbfd35c4fe1a437c3b416cbb18596fe22ca SHA512 19462e54cafef1ff0547b9f85dd4cb0e52a274ad81d6bb5e1068f117d7c011175c4f38a5305c9b71d3a25947bff406cf576fe9e467862ca33fbafcf01ac0ff14
+EBUILD gtkimageview-1.6.4.ebuild 1214 BLAKE2B 3670654ed740e99716ef8fd930b70de468d5868770ad04ac8d5674640978b5013ff9e26d3db652512746646cd73669417cd2c6d2efea4af2146edbaf32279cb4 SHA512 cf47f073e3ce16b5d2b2d0689c69a2929c96b172b423ebf8dcc63e2f92ffbfe42fdc82abc21e24f2bcd6f3c26930a402b2a7e8242d6c26da9b5c6cd70c722800
MISC metadata.xml 259 BLAKE2B 0a31c91e9ff9700c8a5c77c6eb9ddad55c6b78e7e583213c20adc8e73248c7e8b31c9a11702a0b5a8b665acd2753c145362974d6c5c6aae1979c7845ab4b01d8 SHA512 6744883613ae3b83c57ec9604c5f31717ab714b4f3e7f4f680e4b9e54f622f8e5f753b3cd666862f0e3e6dc4223aee87b89aba472d9f20e1b317595e06aeae30
diff --git a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
index e7f1da0489bc..707ce5975732 100644
--- a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
+++ b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE="examples static-libs"
# tests are severely broken, bug #483952
diff --git a/media-gfx/icon-slicer/Manifest b/media-gfx/icon-slicer/Manifest
index e158ea104cbc..52ed1b45085e 100644
--- a/media-gfx/icon-slicer/Manifest
+++ b/media-gfx/icon-slicer/Manifest
@@ -1,3 +1,3 @@
DIST icon-slicer-0.3.tar.gz 112429 BLAKE2B 4900e7d702bb45a209c165476aab5604f1623ea48081f742ce36115bde0a6a153aa5540c952013841a4853b827d1b718892006827105dd06c04e7fa892e9ee58 SHA512 09e46dca933a7c647b232d2ae8f589526e5f1cb43e07fe7056f0449cfbe812becc3a171c4f7c716bc65c0f95dc4de989a99b4f1b3566ac52e7ad67965f5be4ab
-EBUILD icon-slicer-0.3.ebuild 517 BLAKE2B 7810e7ecfc47d6a71a6352854780c61d0a60eeef2388e66389b793251645579e48a6189093d14738fa4c897a7774c78532451f0634dcb46651dab1cb5a1657d4 SHA512 a4e2760ece13b27982aa655570d6f2c88c0f5831512869f60a452cf1140af4eefbd8dd14a73c0cd783e630b132a19d3d26db8fc6ea043ced8cd9b799a4b09398
+EBUILD icon-slicer-0.3.ebuild 518 BLAKE2B c188697b87679fdbd637b9a4c038c4cc643bdb18a58bf54b7430c238636c27bee1fbcd801d8461173c7e251e578de0df0eedf36deb829e39ac7268cb4f2fbe4d SHA512 437d4cf772f94d3b0c7b0e4ad045cd8594d4452292fae5c470010686764f5ac18674c2c6fcf1554c7746a5b0ea44c162fb14e215c6fa4f426645d730daf7378f
MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/icon-slicer/icon-slicer-0.3.ebuild b/media-gfx/icon-slicer/icon-slicer-0.3.ebuild
index c567ca314e93..53d936443b29 100644
--- a/media-gfx/icon-slicer/icon-slicer-0.3.ebuild
+++ b/media-gfx/icon-slicer/icon-slicer-0.3.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="utility for generating icon themes and libXcursor cursor themes"
HOMEPAGE="https://www.freedesktop.org/software/icon-slicer/"
SRC_URI="https://www.freedesktop.org/software/icon-slicer/releases/${P}.tar.gz"
-KEYWORDS="~alpha amd64 ~hppa ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc sparc x86"
LICENSE="GPL-2"
SLOT="0"
IUSE=""
diff --git a/media-gfx/icoutils/Manifest b/media-gfx/icoutils/Manifest
index b4ada51d081b..023198f495d2 100644
--- a/media-gfx/icoutils/Manifest
+++ b/media-gfx/icoutils/Manifest
@@ -1,9 +1,5 @@
AUX icoutils-0.29.1-gettext.patch 354 BLAKE2B f165b759526678524344a516a0953c028c70941c776f53c780597f17a241c1469b6b6b3ce409153f045470ce4d9d896a44cbcf3b0557950f9138e08bd95ee451 SHA512 d5efb49f9ba8411b682047fc5de3a9605c89c5d8f9a0fa67b7de52719630187f36abf7ffc7cc1e53481c7474c0b7e5d8b3074a81fca02061c4685053c9cb221f
AUX icoutils-0.29.1-locale.patch 831 BLAKE2B c24a99e4c186759f3c40e1635f919a9f802af28971c803b31a67b4e990206b0aaf4f7787204599b45888a6615c4bfd7c777bfbada6d67248c6e8e4cf033bdf07 SHA512 bcb0ef117c7f1434e63e411d270a2cad8e4d0ad214c7bd516494c7718b605234ad5920b9e16c5627c98e8e1065bc2550e55b1e2e8b846a5854999419c999107b
-DIST icoutils-0.32.0.tar.bz2 593699 BLAKE2B 5a2dbe67468c1bc0380b94f4ecf707c5e1019539e959c0692d195599ff402c4e5496f46883cdd898abb319d8545b76afe32b172d3f74f674c008c69de5a93463 SHA512 35fb584611edefe4445784e61e9cc10bdc039fc4106b7dca7faf66ca1a252ad6dc6e3511b4a5aba744ba74b51315a757addce2f8d5b20a1d7e38886e3eecd878
-DIST icoutils-0.32.2.tar.bz2 593980 BLAKE2B 1e9fa8ee3fd8e90b4029990508ce6ef405dd01a4e357a73f72980033dd54df1c6d714351cf1b79ce32840941da06bb0d1154e310191798ae31687dad6e828d6a SHA512 9d1ec7f8de2de35ca502ece953d288dad44143af185706855e8911c5e579153ce515208891783981c04406afc66db1e2a3f246515e888a2b1ccc6aea4b1056b8
DIST icoutils-0.32.3.tar.bz2 609286 BLAKE2B 0d65fbadb08e4f2e7a60b5ffd4bc14dc82e90abf0a56ddb89f9717a479ab45a50b9747c986c954c3a01e4d8a51d8396ec9d8796dc4a1d7430cb3169c13e06e13 SHA512 982a051a5dc4a63bb2a9f23e78e5a88e481e5c7a9c25789253e1c396e40d4c093e5a9b399966d660e4f2da21ce15d539cb9d20bfd8126b1138f148b86baa6726
-EBUILD icoutils-0.32.0.ebuild 1023 BLAKE2B bd59b621178f0a056a360ef55359ffe0e1cb7c85164382333b5527661ea33646536a9a53bc572aa3f5bf7ab58fb197e090286631a08ef2d8fb50be54212b31a6 SHA512 6d61698ff5051941507c585158f03fcf1809f5b98f48be1d3a5b704fb803faf9ae8943bd9ee9a78a0078c4d2641a1faf99be7d339cd601aec4c70fc3568e38d2
-EBUILD icoutils-0.32.2.ebuild 1023 BLAKE2B 872a2aabb86148bf4a36f79f3737bc4c9f4aeb870d4b2e5022d956f1dc05a531322c9a5ed08b305f57c33fadac14549df17b2953756f9b51a80095bf65c1dc50 SHA512 df7917c724a4f6af8f5276310bc34154643b3e804928aab671f9a4186290f523ecdaf4b7f1535c7209e0032347f398bd241a45a553d70c3d1bbb6b6830748dda
-EBUILD icoutils-0.32.3.ebuild 1026 BLAKE2B eeb1768bef791528d2475c422c46fca4f1d6829119e76a2086cf2484335afd49d610c9d87681296526228b4fed905775c746fa435fa3afc95bf5fc6c4f19ba4e SHA512 ce94b5b7ab034f9f21d47bf3a4221f1f376158b88361d21c6ca4787f65a34f1c35125de40f34a8f989397ee26cd113766ec7146421998189005f1fab97612566
+EBUILD icoutils-0.32.3.ebuild 1034 BLAKE2B c45446c3c90ee21719979d1b6b70ffa2c4350f891186e44de902a06d470ee685948e096a389dd4435a4a11e4dff8542950d43ad035d66782e0182952c3c99888 SHA512 292b50796ebb4f83908e4aba0c1613e23fd60ba7b6c93cba6fa38a58c2014935edee5fb70eab8c3908b37ed61ac798920fef84411e5d9c457356ebd88a9942b0
MISC metadata.xml 243 BLAKE2B cf24db59438ad12e7ee962da70fbbae676aa42a24a62e49c915a1ba728c08c74d10bc144ce79b91258c66f5523edb3c15941cb1b20a968bbed2e156a83eebf9b SHA512 3b619672a798fcaa808248ae187a6e6253bf1f693d2d9808ffb5b60d4d909130299512b623f7c9dbe6971ad15af7dbb6dd51e4b80f512abe0966dc46861fb775
diff --git a/media-gfx/icoutils/icoutils-0.32.0.ebuild b/media-gfx/icoutils/icoutils-0.32.0.ebuild
deleted file mode 100644
index ec033fea47a4..000000000000
--- a/media-gfx/icoutils/icoutils-0.32.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit autotools flag-o-matic
-
-DESCRIPTION="Tools to extract and convert images in icon and cursor files (.ico, .cur)"
-HOMEPAGE="http://www.nongnu.org/icoutils/"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="nls"
-
-RDEPEND="
- >=dev-lang/perl-5.6
- >=dev-perl/libwww-perl-5.64
- media-libs/libpng:0
- sys-libs/zlib
- nls? ( virtual/libintl )
-"
-DEPEND="
- ${RDEPEND}
- nls? ( sys-devel/gettext )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.29.1-{locale,gettext}.patch
-)
-
-src_prepare() {
- default
- rm m4/po.m4* || die
- cp /usr/share/aclocal/po.m4 m4/
- AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
- use !elibc_glibc && use !elibc_musl && use nls && append-libs -lintl
- econf $(use_enable nls)
-}
-
-src_install() {
- emake DESTDIR="${D}" mkinstalldirs="mkdir -p" install
- einstalldocs
-}
diff --git a/media-gfx/icoutils/icoutils-0.32.2.ebuild b/media-gfx/icoutils/icoutils-0.32.2.ebuild
deleted file mode 100644
index 433690cbda32..000000000000
--- a/media-gfx/icoutils/icoutils-0.32.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit autotools flag-o-matic
-
-DESCRIPTION="Tools to extract and convert images in icon and cursor files (.ico, .cur)"
-HOMEPAGE="http://www.nongnu.org/icoutils/"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="nls"
-
-RDEPEND="
- >=dev-lang/perl-5.6
- >=dev-perl/libwww-perl-5.64
- media-libs/libpng:0
- sys-libs/zlib
- nls? ( virtual/libintl )
-"
-DEPEND="
- ${RDEPEND}
- nls? ( sys-devel/gettext )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.29.1-{locale,gettext}.patch
-)
-
-src_prepare() {
- default
- rm m4/po.m4* || die
- cp /usr/share/aclocal/po.m4 m4/
- AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
- use !elibc_glibc && use !elibc_musl && use nls && append-libs -lintl
- econf $(use_enable nls)
-}
-
-src_install() {
- emake DESTDIR="${D}" mkinstalldirs="mkdir -p" install
- einstalldocs
-}
diff --git a/media-gfx/icoutils/icoutils-0.32.3.ebuild b/media-gfx/icoutils/icoutils-0.32.3.ebuild
index eb74cde3dc66..94291a78237b 100644
--- a/media-gfx/icoutils/icoutils-0.32.3.ebuild
+++ b/media-gfx/icoutils/icoutils-0.32.3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=7
+
inherit autotools flag-o-matic
DESCRIPTION="Tools to extract and convert images in icon and cursor files (.ico, .cur)"
@@ -10,9 +11,12 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="nls"
+BDEPEND="
+ nls? ( sys-devel/gettext )
+"
RDEPEND="
>=dev-lang/perl-5.6
>=dev-perl/libwww-perl-5.64
@@ -20,21 +24,16 @@ RDEPEND="
sys-libs/zlib
nls? ( virtual/libintl )
"
-DEPEND="
- ${RDEPEND}
- nls? ( sys-devel/gettext )
-"
+DEPEND="${RDEPEND}"
DOCS=( AUTHORS ChangeLog NEWS README TODO )
-PATCHES=(
- "${FILESDIR}"/${PN}-0.29.1-{locale,gettext}.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-0.29.1-{locale,gettext}.patch )
src_prepare() {
default
rm m4/po.m4* || die
- cp /usr/share/aclocal/po.m4 m4/
+ cp /usr/share/aclocal/po.m4 m4/ || die
AT_M4DIR=m4 eautoreconf
}
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index cc5555ca103a..51122e4cafde 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,12 +1,16 @@
AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
-DIST ImageMagick-6.9.10-92.tar.xz 9071556 BLAKE2B 4b50c9c9d84592ee0073f2cb7f0174fd681624188a42a8ce074c0727df72894fd81df19c7c8c6f4ed68c56f709f8d558de4fd729513cf0ce781d5627151231bc SHA512 7fd74c2e59f373e457a8b60b8d2ae84e2511901c3d7d06fd4e715b821e2d4e72b9f64f3f9c1c0c543c2fce7e4855381ec30d8f0d007d4d3249502dd2c408cede
-DIST ImageMagick-6.9.10-96.tar.xz 9071708 BLAKE2B e122275c2b18527ecd1e1086ccb636c5cea7c895b5540fffc39a98a7f0ac44dfddfc706668dd5a5c0bfd0f3d3037efe4576d200391e4f9dee821b82db3b02f75 SHA512 d1502c287bf0d592e4271d84bdbe9b17c8bd0aeff2bcb374d13b482c3c19deade1b96360a58972872a46c0677ebab8b84af6d0e4036a7a271cf615362e6086b9
-DIST ImageMagick-7.0.9-22.tar.xz 9485092 BLAKE2B ab1be450d9566943e8da0de33b47ba1dafe600fd5453d6df30682c7b0f881b78528cc5d97c14d42b3a7ad44a75d9a50b36a5cc1aacf7ec699f8c03e09d2324e3 SHA512 dc6d9c3e480d532efcbc6b0ba6d34985a86d5f280ed635fedd04898225e7002f56543e6ec13a603bda8d9d85861146c0f859f95c4729911c1e330cd158f9cec6
-DIST ImageMagick-7.0.9-26.tar.xz 9493028 BLAKE2B 84d3f0bb59238db3e3a0c0f40b4b4b428dc81168468d4d9e7a0f00c74e46102c9c9444891236b105f293080f9601c7ed63ad4592a8ef622554b3aa0c043bf2fb SHA512 0488c6e0e0315bd5390cea952f7acb217e3c651c325f2cd4cb02475c25f7f721a31b20b53bb8b6dce064cedfbfd51711a34627fbb8a8c515636e7627ceda67ed
-EBUILD imagemagick-6.9.10.92.ebuild 6923 BLAKE2B db33249935f9938e01a1c271fc9f2874ec8a8eef00b2f1f024563d2aa27ca4d73bc80bdb796337b11bf9a496b239771b72a090d6e82669924a141a946051961d SHA512 60b9d3d71a8cb753e48f9edf5159bddb4a2471b439ad2ecae61f3237501220a7ca644889ffa8734676a65b50b5da410232457dde208bfe467cfd0e3d95f0b906
-EBUILD imagemagick-6.9.10.96.ebuild 6931 BLAKE2B 590e91832dbe44c3b3dedf956b0f01d3537251f09e7e2a96ed7b0cfd9b9a054597fc3f664bac68182e94fb5c9931d2d7e1f0c9fe83b711a2703fcb3c9f8df541 SHA512 662f13698db0a5fcbb34d04e8bb85e52f2469f003ca9dc337ce0a2c03dd9a381bbee2d4ef43979ff4f9991f9bab6c3d6701725a1df8135f4b052ae76317a7c42
-EBUILD imagemagick-7.0.9.22.ebuild 7198 BLAKE2B 6cec58bcde0421af89dc9c5049a77652fe46205cf9a391f742703fe8ee121439c5f43373677a39c88217f2017cc6e4aee2033c480af039ac6fdc646777ebb2fe SHA512 fbafdeab636fc3c4918e805efadaa7b1d063dd94b2e7bc8d3763185655f5fc01c801ae33ef3b59718d56ad8c1d082e2b26b6cc21dbacee6adf94ce94ea7bb4da
-EBUILD imagemagick-7.0.9.26.ebuild 7207 BLAKE2B 004df3bd1f94e9e8c082bc82bbdf949d1d981c8517c5f5033f0ed55c3e9d472565ed8a088292b389325922925dc57733c7a39e14d4d987bb20f50ede87789be4 SHA512 e03e1322c70b842799ce7e90984d940007cf75895ba6d35bd7cb32b39599bebf83feefa67704225d845c82c7f789cc1f9cc7a4269c7a49c48b8336aa350e4c58
-EBUILD imagemagick-9999.ebuild 7207 BLAKE2B 4fc6e4d61f5e851d55546614830dbc3d9a23003033f55ac521bbe990d845aa2b7b7623c66da431f896df16ee71d6539bac7fdf0204c61f00d010c9013b92fef5 SHA512 97ebbef19227007aa32140de833e25d49c9a8f648fda30a9a0abe8073329b0df5a79a74968d5056b3d342e87d435072d64d360ec4270aca53491938c4cfb7f42
+DIST ImageMagick-6.9.11-0.tar.xz 9072040 BLAKE2B 8e3df83c5a009e3a03599a20b9bc2d6f1e91add659d8de150a4ebeafb91218bc62aac25c755a6a1010e00c2d14853a0d8a4849e2b55c899587acdf2d28d8b7c5 SHA512 fe6786365dfe8973e4660f4070cb85335f88985ec9e2484fe382d1f5c1f0123476cdf8e976107072b5ed13b05190f906be89e5215e16dc62e5daebe3ede40bf2
+DIST ImageMagick-6.9.11-1.tar.xz 9069980 BLAKE2B fbbe707da57a9b1016e89496112b85f1f8500ff35a23015d708c46369c88255c61ed0dd08b8dc2f1160045d91252bab39e9869f490b833f34bd5b7b65d7133a5 SHA512 d18db31d6d2e506203ac530e3d3032c3dfb776fb693788cf813546128dbcb4255522586d8dd5deb9cf0b56a8d503a42929937ee1ec34c8e14ce64568b552bd05
+DIST ImageMagick-6.9.11-3.tar.xz 9068572 BLAKE2B 15ecc7c598c1cad29f6edbd34a83391b6ad8ae0a9d412431d8cd1dc8874afffa73e10bce28aa11f927ee912274d10e1541fc5de3d62a9e58ec57138adf70a8a2 SHA512 2af5029117077100304c366429e961f97a7d8efac7b824f1fcdfdca79f99a34dea1ac99bf8aef23bf4e828bf958722372a9cf073d74ff5a213cd3f9ecb809e76
+DIST ImageMagick-7.0.10-0.tar.xz 9532856 BLAKE2B 510e1ac8010b7e2267950e868ce8d0fcd36e37c936c67b1603f4dfdc247cda8dd4aa59fc0d88f5d2a2c0a9a199331cca834797f315814964b68dfad1ab24f355 SHA512 d997429855fa4bc48da32e00ea5c45467a6bd3265c35c0aff8f150346e467451737f276833d4fa867f0e2e52110f532416af1dafdbc8e81d2d11dd0c4c80f011
+DIST ImageMagick-7.0.10-1.tar.xz 9531244 BLAKE2B e0c16627c23e0ae181e52d73f0c5ec91835fe87eb587e73fc8aff58b0e505e8b78b3c62f842be4d80a787d3f3df404e3e3feb58c80282b828ae623f1cd2fb5ed SHA512 086616507c073e1a6c8c1276273fee18e9d5ae5ea3a730ad770347459a975c898517985b5a79798b90922e4954cdf994b78daa1ab164cbb48087da389acf6db5
+DIST ImageMagick-7.0.10-3.tar.xz 9699848 BLAKE2B 80aa3d85a3129b9270571bc263eeb66e17010ddbcb82fe5d68257a097ac5ece400d24759a526a72ce9a6a009bf909772aa7f363a56075f45a3c446bc1ac359fe SHA512 680d88097ca85028cd9b2eba082d482335333687480eb1e0a2a98b9b3d1d04458e9a6c0b77a88324fbc188d6db861c05f9b8ae4157411dc59ebd7494ed4d28dd
+EBUILD imagemagick-6.9.11.0.ebuild 6922 BLAKE2B 8c72ebb14d2114501f87e9be29ce76a1aa17e92673c2cc5e57d90ce3bd449fb70216d21d77f257ee98047532e57ee39a9d3f2d421211aca46be190718c8f95b1 SHA512 5201f490b08c680d2b54507e51fee3583d83df7880523489b5f195ec9134d0a5333fce34e3fa1e6d4cb1e5a84b729eca6b68bfbc81f9676cd52e8dfd28c292c5
+EBUILD imagemagick-6.9.11.1.ebuild 7056 BLAKE2B 31393b291f0d6bec7dc70d794b1a84039d54c1a12b7b4417caacea9bb2dc693a91d00273243a6450c1e7b7044e6b4c66a5fa8ccf28d1634d610a767775dd566a SHA512 72e95675a0102e46604bc1161c687465d2b2acf58a7096dd0637e2b9bdbc4a53ce2fb3490e6d32fd00ce5767540abe39b03a93c187f33b0c6c21f5c96a897d49
+EBUILD imagemagick-6.9.11.3.ebuild 7056 BLAKE2B 31393b291f0d6bec7dc70d794b1a84039d54c1a12b7b4417caacea9bb2dc693a91d00273243a6450c1e7b7044e6b4c66a5fa8ccf28d1634d610a767775dd566a SHA512 72e95675a0102e46604bc1161c687465d2b2acf58a7096dd0637e2b9bdbc4a53ce2fb3490e6d32fd00ce5767540abe39b03a93c187f33b0c6c21f5c96a897d49
+EBUILD imagemagick-7.0.10.0.ebuild 7197 BLAKE2B 899419f5de38f2e53b546b9ec6c4c8936cd635e72b10966dcdbf2e592ba69a00d5eaf841584608e63c78cbe98dea44d4269a0e51bc052940114d5ae4347671c0 SHA512 c80bc83f4690b9e9b806df7b5210806cc980e3bb6e9a6d906de649c5a32f479a644b15aa0f507ace746b63834f80d8d53acbdae776c205b28701239050f6af0a
+EBUILD imagemagick-7.0.10.1.ebuild 7332 BLAKE2B 9af4bd9448c7e96550c356a964f988a2c785bb7f6714508a036968c3b229e91af2f2ef247366ac6e012477adada079fef7064fec1d4a29b4d9d0f9ad03d648f8 SHA512 03641bc41782f7de1c9b264697d159ed990c2e1aa18fe836391f1be86df3bb3f9a50c7f327730b6ff9ef50ca997636c72e2e03b21c0fa12a50dd68fb45ce9f00
+EBUILD imagemagick-7.0.10.3.ebuild 7332 BLAKE2B 9af4bd9448c7e96550c356a964f988a2c785bb7f6714508a036968c3b229e91af2f2ef247366ac6e012477adada079fef7064fec1d4a29b4d9d0f9ad03d648f8 SHA512 03641bc41782f7de1c9b264697d159ed990c2e1aa18fe836391f1be86df3bb3f9a50c7f327730b6ff9ef50ca997636c72e2e03b21c0fa12a50dd68fb45ce9f00
+EBUILD imagemagick-9999.ebuild 7332 BLAKE2B 9af4bd9448c7e96550c356a964f988a2c785bb7f6714508a036968c3b229e91af2f2ef247366ac6e012477adada079fef7064fec1d4a29b4d9d0f9ad03d648f8 SHA512 03641bc41782f7de1c9b264697d159ed990c2e1aa18fe836391f1be86df3bb3f9a50c7f327730b6ff9ef50ca997636c72e2e03b21c0fa12a50dd68fb45ce9f00
MISC metadata.xml 1111 BLAKE2B 3592f2d81f67d91239152d723c736437a5e8056f8dba1fc5c97e2ead08efd4e913400b441eb6d6b90f26cccf3b89f115c18a5551bc070d1fd81e68dd218493c9 SHA512 33bd68bc4f88cd6029528b0feab9cc9fde0d60475ba5fad8c4f92ff6d373666628e6525d54268735e99182abd2658aa32c7c72ff22106c65f81ed8af5e4f7ea2
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.92.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.0.ebuild
index ce112a772a73..c2d4023dc3b0 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.92.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.0.ebuild
@@ -13,9 +13,9 @@ HOMEPAGE="https://www.imagemagick.org/"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
LICENSE="imagemagick"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+SLOT="0/6.9.11"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
REQUIRED_USE="corefonts? ( truetype )
test? ( corefonts )"
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.96.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.1.ebuild
index 57ae3d2ccac0..02b0c9655fe7 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.96.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.1.ebuild
@@ -13,9 +13,9 @@ HOMEPAGE="https://www.imagemagick.org/"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
LICENSE="imagemagick"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+SLOT="0/6.9.11"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
REQUIRED_USE="corefonts? ( truetype )
test? ( corefonts )"
@@ -45,7 +45,10 @@ RDEPEND="
png? ( media-libs/libpng:0= )
postscript? ( app-text/ghostscript-gpl )
raw? ( media-libs/libraw:= )
- svg? ( gnome-base/librsvg )
+ svg? (
+ gnome-base/librsvg
+ media-gfx/potrace
+ )
tiff? ( media-libs/tiff:0= )
truetype? (
media-fonts/urw-fonts
@@ -203,6 +206,8 @@ src_install() {
fi
find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+ # .la files in parent are not needed, keep plugin .la files
+ rm "${ED}"/usr/$(get_libdir)/*.la || die
if use opencl; then
cat <<-EOF > "${T}"/99${PN}
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.3.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.3.ebuild
new file mode 100644
index 000000000000..02b0c9655fe7
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.3.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2020 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+REQUIRED_USE="corefonts? ( truetype )
+ test? ( corefonts )"
+
+RESTRICT="perl? ( userpriv )
+ !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
+ rm "${ED}"/usr/$(get_libdir)/*.la || 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/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-7.0.9.22.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.0.ebuild
index 447fb88f37fb..a85c71b04448 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.9.22.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.0.ebuild
@@ -13,15 +13,15 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A collection of tools and libraries for many image formats"
HOMEPAGE="https://www.imagemagick.org/"
LICENSE="imagemagick"
-SLOT="0/7.0.9"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+SLOT="0/7.0.10"
+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 )
diff --git a/media-gfx/imagemagick/imagemagick-7.0.9.26.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.1.ebuild
index db7f1fb9468a..4d2561accf79 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.9.26.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.1.ebuild
@@ -13,15 +13,15 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A collection of tools and libraries for many image formats"
HOMEPAGE="https://www.imagemagick.org/"
LICENSE="imagemagick"
-SLOT="0/7.0.9"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+SLOT="0/7.0.10"
+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 )
@@ -53,7 +53,10 @@ RDEPEND="
png? ( media-libs/libpng:0= )
postscript? ( app-text/ghostscript-gpl )
raw? ( media-libs/libraw:= )
- svg? ( gnome-base/librsvg )
+ svg? (
+ gnome-base/librsvg
+ media-gfx/potrace
+ )
tiff? ( media-libs/tiff:0= )
truetype? (
media-fonts/urw-fonts
@@ -215,6 +218,8 @@ src_install() {
fi
find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+ # .la files in parent are not needed, keep plugin .la files
+ rm "${ED}"/usr/$(get_libdir)/*.la || die
if use opencl; then
cat <<-EOF > "${T}"/99${PN}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.3.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.3.ebuild
new file mode 100644
index 000000000000..4d2561accf79
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.3.ebuild
@@ -0,0 +1,267 @@
+# Copyright 1999-2020 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 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+SLOT="0/7.0.10"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="corefonts? ( truetype )
+ test? ( corefonts )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="
+ dev-libs/libltdl:0
+ 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
+ rm "${ED}"/usr/$(get_libdir)/*.la || 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/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-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild
index 8d8ee8a769b2..4d2561accf79 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -13,15 +13,15 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A collection of tools and libraries for many image formats"
HOMEPAGE="https://www.imagemagick.org/"
LICENSE="imagemagick"
-SLOT="0/7.0.9"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+SLOT="0/7.0.10"
+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 )
@@ -53,7 +53,10 @@ RDEPEND="
png? ( media-libs/libpng:0= )
postscript? ( app-text/ghostscript-gpl )
raw? ( media-libs/libraw:= )
- svg? ( gnome-base/librsvg )
+ svg? (
+ gnome-base/librsvg
+ media-gfx/potrace
+ )
tiff? ( media-libs/tiff:0= )
truetype? (
media-fonts/urw-fonts
@@ -215,6 +218,8 @@ src_install() {
fi
find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+ # .la files in parent are not needed, keep plugin .la files
+ rm "${ED}"/usr/$(get_libdir)/*.la || die
if use opencl; then
cat <<-EOF > "${T}"/99${PN}
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 09bdd6f4b577..bd270bc8fcb0 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -12,6 +12,7 @@ AUX inkscape-1.0_beta1-do-not-compress-man.patch 454 BLAKE2B d680993be80d9069c79
DIST inkscape-0.92.4.tar.bz2 31929728 BLAKE2B 892bf4ed913019b27a9b8897e3ae32c44152163ded0eb345d59915ffdc9818d29f210de3294ef1b05601141185b5e3b10779778551b860f31e7df5c659492c77 SHA512 b9034605a79cd8aea808edf42e284819951ae1ea67778f0922f4c10224e94aca6c844acbc2294625773f0a7047d4e32ccdada876238a792a2c17db172c88e120
DIST inkscape-1.0beta2_2019-12-03_2b71d25d45.tar.xz 39508392 BLAKE2B fd48f22439d1182aff1db5afd74870a6c1d291afb310fc9fa5036fa3c2547ead8c17f6cd67f77a56f655c56af8ffaa7a349b17166c7b18ef3ddf234aa6e57805 SHA512 029508d4867ac0890b2c9c4d274408f849a17e8a7978853df38543d94e7c08d33546a8a40fbcd940da1ba847f11e37ff2bafa285174b65d45ee5de59e907e78f
EBUILD inkscape-0.92.4-r2.ebuild 3836 BLAKE2B 39efa33d21c2ae8054827c76cfe451a60fbca48b12a4eeb106bd0b03895ecf02102df8fd2c28626d7daf4a720eaeb67d4e3642f214d9f4ad68b3c183826a4e47 SHA512 8c2304ac76e116472f726b952ebc3a47478ca78d50686c1594ea55555b7e39d1f1003118ec6572244735f871a18f55ec49391fbde3d327b204d518cf84978f03
+EBUILD inkscape-0.92.4-r3.ebuild 3871 BLAKE2B d0653e907e2586a9f2f2d348b62840a7a64856c1a250ffe61b867252ff01f971b756c2adba7b2f608a7a5de615efb582853f224105067de41f4363b45eeb8a3b SHA512 25d2f80dce93f59073e9b81c74a6c62aacbd335366e22a5d7ca9c63113e0bdd987bcfc11e050ed5a53066583f48bba283b50d0f41d09e6b21866abe85f1b7e55
EBUILD inkscape-1.0_beta2-r1.ebuild 4160 BLAKE2B ff8fe48e09e96ce2ff5b1a9eca34c4fc249ae22a1b057cdf7ef714fbb43878e9bed4e2811a260eb5cb03920b4fd2eeda988fb27f290714fa3e1b6bd2947427e2 SHA512 2363a42f4053c03ab8d02beed5f51054f517d0814780d93f3b68315bc594f1a0d4906af7ab8cf68de965edc12104da726ebb0d70613b9aba988ce4fb22159d59
EBUILD inkscape-9999.ebuild 4056 BLAKE2B a24e811d39011b09d28b5e4d44db85f4d225219d14b80c7b8527dad38fc46e4365471616ae582eb261a518d48827f57cf0e25cb1c3f534ff540162e7a9d95472 SHA512 cdccb07f6f0f6c7c6b6448f1fb1662a9cacc58f52bbbdb1ea9ca2fde52b5170e7ea5640c56ee0909312b8e9a09eec071b9192096bfda46d76baa17fcd51d8e3c
-MISC metadata.xml 951 BLAKE2B 5610cce03a912f378f4bbb997bb9acc028f2f02c1ec40034ed523b7f7cee2cc980f1f24fb8fbd26b40d494a514769b722ca64e93078c82ad75c9db94a9f19ca4 SHA512 f62078fa96c501f4d8e01d4e539b74b91cbf90997392e903e30db9c3a117c2ccc7f2d3e1c2e62c85362cd0a2d504dd565cfd70f92e5b947d416f8a3f2cd88f8e
+MISC metadata.xml 1075 BLAKE2B 86f17c0732921e450d6215ff22e8140006ebfd1f570943086680fa85cb7fffc5d1d4a8876ad26b03d65e2841b70b0337b7fa75ea5fc7cee5a1bb3242363a5d43 SHA512 094db7f9e4bed29b308a95488d849c44a02c1fcd870ffcabb75e6fb08ec3eb028d1adf980a13e3501e2ec043dfed8dda18038e5bd09274d5090317526623165e
diff --git a/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild b/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild
new file mode 100644
index 000000000000..912e7bba247d
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+inherit autotools flag-o-matic gnome2-utils xdg toolchain-funcs python-single-r1
+
+MY_P="${P/_/}"
+
+DESCRIPTION="SVG based generic vector-drawing program"
+HOMEPAGE="https://inkscape.org/"
+SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
+IUSE+=" lcms nls spell static-libs visio wpg uniconvertor"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ >=app-text/poppler-0.26.0:=[cairo]
+ >=dev-cpp/glibmm-2.54.1
+ >=dev-cpp/gtkmm-2.18.0:2.4
+ >=dev-cpp/cairomm-1.9.8
+ >=dev-libs/boehm-gc-7.1:=
+ >=dev-libs/glib-2.28
+ >=dev-libs/libsigc++-2.0.12
+ >=dev-libs/libxml2-2.6.20
+ >=dev-libs/libxslt-1.0.15
+ dev-libs/popt
+ media-gfx/potrace
+ media-libs/fontconfig
+ media-libs/freetype:2
+ media-libs/libpng:0=
+ sci-libs/gsl:=
+ x11-libs/libX11
+ >=x11-libs/gtk+-2.10.7:2
+ >=x11-libs/pango-1.24
+ cdr? (
+ app-text/libwpg:0.3
+ dev-libs/librevenge
+ media-libs/libcdr
+ )
+ dbus? ( dev-libs/dbus-glib )
+ exif? ( media-libs/libexif )
+ gnome? ( >=gnome-base/gnome-vfs-2.0 )
+ imagemagick? ( <media-gfx/imagemagick-7:=[cxx] )
+ jpeg? ( virtual/jpeg:0 )
+ lcms? ( media-libs/lcms:2 )
+ spell? (
+ app-text/aspell
+ app-text/gtkspell:2
+ )
+ visio? (
+ app-text/libwpg:0.3
+ dev-libs/librevenge
+ media-libs/libvisio
+ )
+ wpg? (
+ app-text/libwpg:0.3
+ dev-libs/librevenge
+ )
+"
+# These only use executables provided by these packages
+# See share/extensions for more details. inkscape can tell you to
+# install these so we could of course just not depend on those and rely
+# on that.
+RDEPEND="${COMMON_DEPEND}
+ $(python_gen_cond_dep '
+ || (
+ dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+ )
+ ')
+ uniconvertor? ( media-gfx/uniconvertor )
+ dia? ( app-office/dia )
+ latex? (
+ media-gfx/pstoedit[plotutils]
+ app-text/dvipsk
+ app-text/texlive-core
+ )
+ postscript? ( app-text/ghostscript-gpl )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/boost-1.36
+ dev-util/glib-utils
+ >=dev-util/intltool-0.40
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.92.1-automagic.patch"
+ "${FILESDIR}/${PN}-0.91_pre3-cppflags.patch"
+ "${FILESDIR}/${PN}-0.92.1-desktop.patch"
+ "${FILESDIR}/${PN}-0.91_pre3-exif.patch"
+ "${FILESDIR}/${PN}-0.91_pre3-sk-man.patch"
+ "${FILESDIR}/${PN}-0.48.4-epython.patch"
+ "${FILESDIR}/${PN}-0.92.4-poppler-0.76.0.patch" #684246
+ "${FILESDIR}/${PN}-0.92.4-poppler-0.82.0.patch"
+ "${FILESDIR}/${PN}-0.92.4-poppler-0.83.0.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="test"
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+ tc-has-openmp || die "Please switch to an openmp compatible compiler"
+ fi
+}
+
+src_prepare() {
+ default
+
+ sed -i "s#@EPYTHON@#${EPYTHON}#" \
+ src/extension/implementation/script.cpp || die
+
+ eautoreconf
+
+ # bug 421111
+ python_fix_shebang share/extensions
+}
+
+src_configure() {
+ # aliasing unsafe wrt #310393
+ append-flags -fno-strict-aliasing
+
+ local myeconfargs=(
+ $(use_enable static-libs static)
+ $(use_enable nls)
+ $(use_enable openmp)
+ $(use_enable exif)
+ $(use_enable jpeg)
+ $(use_enable lcms)
+ --enable-poppler-cairo
+ $(use_enable wpg)
+ $(use_enable visio)
+ $(use_enable cdr)
+ $(use_enable dbus dbusapi)
+ $(use_enable imagemagick magick)
+ $(use_with gnome gnome-vfs)
+ $(use_with inkjar)
+ $(use_with spell gtkspell)
+ $(use_with spell aspell)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ emake -C src helper/sp-marshal.h #686304
+ emake AR="$(tc-getAR)"
+}
+
+src_install() {
+ default
+
+ find "${ED}" -name "*.la" -delete || die
+ python_optimize "${ED%/}"/usr/share/${PN}/extensions
+}
diff --git a/media-gfx/inkscape/metadata.xml b/media-gfx/inkscape/metadata.xml
index 49c45680f5fe..8bfffeae53d1 100644
--- a/media-gfx/inkscape/metadata.xml
+++ b/media-gfx/inkscape/metadata.xml
@@ -6,13 +6,14 @@
<name>Gentoo Graphics Project</name>
</maintainer>
<use>
- <flag name="cdr">Enable support for CorelDRAW Diagrams via <pkg>media-libs/libcdr</pkg></flag>
- <flag name="dia">pull in <pkg>app-office/dia</pkg> for dia import extension</flag>
+ <flag name="cdr">Enable support for CorelDRAW files via <pkg>media-libs/libcdr</pkg></flag>
+ <flag name="dia">Enable DIA flow chart import via <pkg>app-office/dia</pkg></flag>
<flag name="inkjar">Enable support for OpenOffice.org SVG jar files</flag>
- <flag name="latex">pull in dependencies for LaTeX formulas</flag>
+ <flag name="latex">Enable rendering of LaTeX formulas</flag>
<flag name="svg2">Enable support for new SVG2 features</flag>
- <flag name="visio">Enable support for Microsoft Visio Diagrams via <pkg>media-libs/libvisio</pkg></flag>
- <flag name="wpg">Enable support for WordPerfect Graphics via <pkg>app-text/libwpg</pkg></flag>
+ <flag name="visio">Enable support for Microsoft Visio diagrams via <pkg>media-libs/libvisio</pkg></flag>
+ <flag name="wpg">Enable support for WordPerfect graphics via <pkg>app-text/libwpg</pkg></flag>
+ <flag name="uniconvertor">Enable conversion of vector graphic files via <pkg>media-gfx/uniconvertor</pkg> (needs Python 2)</flag>
</use>
<upstream>
<remote-id type="gitlab">inkscape/inkscape</remote-id>
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 5f076ca90fc6..e9a1565cc658 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -8,11 +8,9 @@ AUX iscan-2.30.4.2-sscanf.patch 779 BLAKE2B 8e8255c0558e225b3c1bcb5faaf42f0d7941
AUX iscan-3.61.0-ijg-libjpeg.patch 1145 BLAKE2B 781c0c9a40848f9c10ddb3418c55b6c4a145f1590c5ec41e22e371830d3d7d63c4e013d8fa69a1f15f24d4883d569c0645df66b3c6120eb724f3a1f9643e3813 SHA512 b570bc0e6aa73f74750aaab4d3ca84838864c8723b14fbf5a45fe9163be3e7819035a12bd058587a4b4964325ba4af99673e78647b11d2a7b1bcf96039522191
AUX iscan-3.61.0-imagemagick-7.patch 1965 BLAKE2B 14685cc9540ccfda87587b5ff2df7b8c4755dd08bb428f33ce853c32baaf6ab7e6b2d3368df9153fa5f5b39d9ef17b8e468ea59530ac89098107542db2638f05 SHA512 d5545570865370229f2b132aef7131cbbfabd7e929795bee6ce1e0d791c2c623eefabdd0ec265c6cadcc41072049d61e07d5fca46a1f51c621323a38112dc316
DIST imagescan_3.61.0.orig.tar.gz 12649835 BLAKE2B 32c31dcc6bdd9bbff7763e8f671642f586ebc4cb6ce1e3d532b3889b314d39c14253ec7d0547cded0b5bce95d45e8ea1d9586f11cbe101592f6fd73902408cec SHA512 276a3ca69aee7449c9ebc0c1a0364514db3d5f73d4d2cb2c5380b09463e6ba4adf077ca52d403563d68fc4e714ece1ddca1d7310349926e6017a54a371c09612
-DIST iscan_2.30.3-1.tar.gz 1216848 BLAKE2B 8a5f485c1dd814248c46aec6accedd331105c3ccc0f70a582e60dfb62b1cc1f1ebab358f0896b15cbf842ea06f8a35447d91f76391b10bad07df371512856c32 SHA512 5f68b2f7b7c1d1b5d3d65a55c3a80538fda5d2bdf9cd50fbf942e0eb49dcb84983ede66ed2f6354f9591692808df54415400fe02ed47e7373082869612a47872
DIST iscan_2.30.4-2.tar.gz 1236167 BLAKE2B 598e55aa7099f7973b38f5c3227415c8ddfa7e8c645521981b4e8979047ab692427f5c1719fd83fe0635f2d4604f32f0baff8542f3e1a333298799c4cad7b980 SHA512 b12f374ff8ee1e1879fc6dbc579de39d7bcd4777ec7ad6e4345046f77b4ec13ae45ebdc2803d6907bc2747776aa7e32c313866138c7b8c7bcb53110a214154d2
DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1d0914116f7ec4ae002d896853b99488eec71e5f8cb150e6b63d353efb9be11977de26d017701bc051014a SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc
DIST userg_revQ_j.pdf 734920 BLAKE2B ed2cffdc2dbf0a2403dcbd93cef3349b9e35afb305f9b36f92b8f11bd42b5281fc7bfbec108703f327fb538868c530418406d37505e6eb6afa621d2d49d007ba SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90
-EBUILD iscan-2.30.3.1.ebuild 3517 BLAKE2B f2097ee00fab3de458f2c8f4320765844c5a78cf23b85c0b880356695b9d2027ea5df2cf03d7f7829d3d42a9d49adfc22bc062a418131ea8d83ce015088dbdce SHA512 9a058f3d2a604c4a08e6f48d3b98b4eca7fac74ae8807f5fff77c73754a44f6207a6eef051d34fc78e5984a67a009ba51d38f73d3a4c05ecc0bfdda995dc9ef4
-EBUILD iscan-2.30.4.2.ebuild 3960 BLAKE2B 9cb40b7213717045476cd6b4c43039df725721ee18ff79b487d11ca2edd1c9752d8a222ad4cfdd03c83048e87e6a4b6b88e6fb44b3382a0a9e21634ce229fea3 SHA512 c715ad28dd6e44123804f5bfcd0fc92dd4d7fca3a5487a1c16c6c23dd96c37b7211686897263931c9511c0923ba434cebe22acdac65a4213c055d376200f4dfc
-EBUILD iscan-3.61.0.ebuild 1250 BLAKE2B cb63fcc67fd5424f970f5f7100afa29e8ecc532cb45302a52a81b61ece434fdecf3ce719fd7900c7f59703841ac71cdd8f6c62360e534bcb85cb52554ae9c435 SHA512 5d6bf78b213762aa016c8604b81fe31c571682979c452b3bea21604bac538e19e0697c6e7e22b49894067d9ee0ea40b0fd7fbda6e57bf34cf21cd0e59a09fb6e
+EBUILD iscan-2.30.4.2.ebuild 3958 BLAKE2B 3e1284c43d52dd91a6b9e88c2c8d5aef7ee76ed2c7b7a1e0d35781db6f5882efe1ea6c1b1152df86bf0b831941a271bf8c5a9c75fb2fe26646e99d2f73d17da8 SHA512 9b23f93cc94371c33036fec992c96baec8e94b743e732c8579755eec94cfc35ec79c95b879df664783818e03cff648c932e23217b856537a3875bab9c38a228a
+EBUILD iscan-3.61.0.ebuild 1255 BLAKE2B f53c28e464316597f197032e1ec70517f2566524dac2bb83536de90e003c855b5414786c954d10ba7aa66ba4cb55d535ea9221d577dfa8436b722ae795e9be56 SHA512 d9cefb9929b3f04969ca434dbedd075a65e7235d4d2e5b6fbd808acc626e571c422231240b2c8cf00e89b7a51945bb811538fb40f840547ac94f341a80376ec5
MISC metadata.xml 923 BLAKE2B b9035c8d418ac3993d4103cf53657da8bbb829aed4bf010241f4f781984ff9450779ca6aa196f604d52680378761635a2ad868c3dbb7d8b87774f5231d251cd9 SHA512 004b33e1d57943fb6ed8319def74938a98dc323dabbb695ff145adff01d84a026311a44a735bc621be6e68e3c3f4e06c1274449d6e2ad30e37f2952c0bacd6ef
diff --git a/media-gfx/iscan/iscan-2.30.3.1.ebuild b/media-gfx/iscan/iscan-2.30.3.1.ebuild
deleted file mode 100644
index 4421e8e40180..000000000000
--- a/media-gfx/iscan/iscan-2.30.3.1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_DOC="userg_revQ"
-inherit autotools desktop flag-o-matic
-
-# HINTS:
-# -> non-free modules are x86 and amd64 only
-# -> iscan frontend needs non-free modules
-# -> sane-epkowa should be usable on every arch
-# -> ${P}-${SRC_REV}.tar.gz (for gcc 3.2/3.3)
-# -> ${P}-${SRC_REV}.c2.tar.gz (for gcc 3.4 or later)
-
-# FIXME:
-# iscan doesn't compile w/o libusb, this should be fixed somehow.
-
-# TODO:
-# (re)add closed-source binary modules which are needed for some scanners.
-
-DESCRIPTION="EPSON Image Scan! for Linux (including sane-epkowa backend)"
-HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-SRC_URI="http://support.epson.net/linux/src/scanner/iscan/${PN}_$(ver_rs 3 -).tar.gz
- doc? (
- https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_e.pdf
- l10n_ja? ( https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_j.pdf )
- )"
-
-LICENSE="GPL-2 AVASYS"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc gimp l10n_ja X"
-
-REQUIRED_USE="gimp? ( X )"
-
-DEPEND="
- dev-libs/libxml2
- media-gfx/sane-backends
- virtual/libusb:1
- virtual/udev
- gimp? ( media-gfx/gimp )
- X? (
- dev-libs/glib:2
- media-libs/libpng:=
- media-libs/tiff:=
- virtual/jpeg:=
- x11-libs/gtk+:2
- )
-"
-RDEPEND="${DEPEND}
- media-gfx/iscan-data
-"
-BDEPEND="
- virtual/pkgconfig
- X? ( sys-devel/gettext )
-"
-
-# Upstream ships broken sanity test
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
-
-DOCS=( AUTHORS NEWS README )
-
-PATCHES=(
- "${FILESDIR}"/iscan-2.29.1-drop-ltdl.patch
- "${FILESDIR}"/iscan-2.28.1.3+libpng-1.5.patch
- "${FILESDIR}"/iscan-2.29.1-png-libs.patch
- "${FILESDIR}"/iscan-2.30.1-fix-g++-test.patch
- "${FILESDIR}"/iscan-2.30.1.1-gcc6.patch
- "${FILESDIR}"/iscan-2.30.3.1-fix-x86-unknown-types.patch
-)
-
-QA_PRESTRIPPED="usr/lib.*/libesmod.so.*"
-QA_TEXTRELS="${QA_PRESTRIPPED}"
-QA_FLAGS_IGNORED="${QA_PRESTRIPPED}"
-
-src_prepare() {
- default
-
- if ! use X; then
- sed -i -e "s:PKG_CHECK_MODULES(GTK,.*):AC_DEFINE([HAVE_GTK_2], 0):g" \
- -e "s:\(PKG_CHECK_MODULES(GDK_IMLIB,.*)\):#\1:g" configure.ac || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- append-cppflags -D_GNU_SOURCE # needed for 'strndup'
- replace-flags "-O[0-9s]" "-O1" # fix selector box bug 388073
-
- local myeconfargs=(
- --enable-dependency-reduction
- --disable-static
- $(use_enable gimp)
- $(use_enable X frontend)
- $(use_enable X jpeg)
- $(use_enable X png)
- $(use_enable X tiff)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- use l10n_ja && DOCS+=( {NEWS,README}.ja )
- use doc && DOCS+=( "${DISTDIR}/${MY_DOC}_$(usex l10n_ja j e).pdf" )
- default
-
- # install sane config
- insinto /etc/sane.d
- doins backend/epkowa.conf
-
- # link iscan so it is seen as a plugin in gimp
- if use gimp; then
- local plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
- dodir "${plugindir}"
- dosym ../../../../bin/iscan "${plugindir}"/iscan
- fi
-
- use X && make_desktop_entry iscan "Image Scan! for Linux ${PV}" scanner
-}
-
-pkg_postinst() {
- local DLL_CONF="${EPREFIX}/etc/sane.d/dll.conf"
- local EPKOWA_CONF="${EPREFIX}/etc/sane.d/epkowa.conf"
-
- if grep -q "^[ \t]*\<epkowa\>" ${DLL_CONF}; then
- elog "Please edit ${EPKOWA_CONF} to suit your needs."
- elif grep -q "\<epkowa\>" ${DLL_CONF}; then
- elog "Hint: to enable the backend, add 'epkowa' to ${DLL_CONF}"
- elog "Then edit ${EPKOWA_CONF} to suit your needs."
- else
- echo "epkowa" >> ${DLL_CONF} || die
- elog "A new entry 'epkowa' was added to ${DLL_CONF}"
- elog "Please edit ${EPKOWA_CONF} to suit your needs."
- fi
-}
diff --git a/media-gfx/iscan/iscan-2.30.4.2.ebuild b/media-gfx/iscan/iscan-2.30.4.2.ebuild
index 4be72d181288..b4014ba2ccb7 100644
--- a/media-gfx/iscan/iscan-2.30.4.2.ebuild
+++ b/media-gfx/iscan/iscan-2.30.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -29,7 +29,7 @@ SRC_URI="http://support.epson.net/linux/src/scanner/iscan/${PN}_$(ver_rs 3 -).ta
LICENSE="GPL-2 AVASYS"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="doc gimp l10n_ja nls X"
REQUIRED_USE="gimp? ( X )"
diff --git a/media-gfx/iscan/iscan-3.61.0.ebuild b/media-gfx/iscan/iscan-3.61.0.ebuild
index 8d372ec8a73e..7947405c941c 100644
--- a/media-gfx/iscan/iscan-3.61.0.ebuild
+++ b/media-gfx/iscan/iscan-3.61.0.ebuild
@@ -20,7 +20,7 @@ DEPEND="
virtual/jpeg
gui? ( dev-cpp/gtkmm:= )
imagemagick? (
- !graphicsmagick? ( media-gfx/imagemagick:= )
+ !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
graphicsmagick? ( media-gfx/graphicsmagick:= )
)
"
diff --git a/media-gfx/jhead/Manifest b/media-gfx/jhead/Manifest
index c925a40ad631..47a62cd72d51 100644
--- a/media-gfx/jhead/Manifest
+++ b/media-gfx/jhead/Manifest
@@ -2,7 +2,7 @@ AUX Makefile 1095 BLAKE2B 59829280499ade024a4b96852b3a6dac3c25bca26e3131eeb819d4
AUX jhead-2.90-mkstemp_respect_flags.patch 892 BLAKE2B 3a0c4ae7bf32391b32a405541bcd70525e8aa1c6064118b94f08ec8864fc712d50500066f10b2fc417ece0a3d4ec95919eb4751b2bf994ad3461d72b4de7d12a SHA512 14051d7088685dd957d0bdaace752167ebcdac7eb3b01b033918897e8c349e417e662688d7737f916f59d4f1dd7ad9752172791699da0565dd2d5b4f908a4ed8
DIST jhead-2.97.tar.gz 68361 BLAKE2B ed13d637dc491ad1c6ed7f9a5b0b526c80f69b8c521e3618289b16523ebb12690fa53a0a273f3f5793f970f390430d56c8504bed30fb45c5e9e2a9ac248f7667 SHA512 9b33451546e5ad3b82fe6001515fd572925a1e2c11af763ae32d71ad2cb056ffa8d97abe14bd48ae5f6144da9d8322965387537d61e22d22b02624ebf351c230
DIST jhead-3.00.tar.gz 69151 BLAKE2B 23522718f07cd0b52b3d7fbd6d0f69ca5ecd5499174b06c6572be1319b275dc93eacd270f33cd7b3380ef85e6615aa79adf1fa9a1a86404876b35c31cdb0c95e SHA512 daedfe7ea6be051f769e9a1e0946ea0fa741f387bbc5ba55eec394fb3f37b18a66aa8826190c790eb50a5b9d445ee0d5a28a08d181db3be469686b0675540fbe
-EBUILD jhead-2.97.ebuild 743 BLAKE2B 4df5635844b53852f0fbc56a12130d338d99ed6ff19f5c6aec3727df51f89eab5937cc1cc11405ccb56a5dd5bc64f8b55c6155426722f7b386a979ab8b66f94b SHA512 1c95628553d0bd1d8e93b405e95c68bb5890a878a2e49ab8eba67b176626976199db8d224dbb409364120c79c99c7e0626464089b7c02ac9e097a398a3b14483
+EBUILD jhead-2.97.ebuild 744 BLAKE2B 9ccad5df68d98ad6003a3b69a18661fb600de10f7326199ab7784cfb9bfc16b554bef37c5e555083503e09bcfbcc053cf8b018059b3995995ee2fe8d19c3bfd7 SHA512 39f2a2b352dfbdbe74bc4c188a688aa12623e33132a9afe487271e060c0e4eba7063ef28216796f026092449f1e87702becdadc07a7729108f97df6a725e96cf
EBUILD jhead-3.00-r2.ebuild 712 BLAKE2B 5ab22c7fb0d1137d7a18f4020737dd30934eea11c00509288255205ee574e255af1b0de1092f8f3822d0dd7b86e3a9dc8b5b50fb327df7fccb5b83add9353464 SHA512 1c44c47e0a404a8a0aff91f4e0e97e0d0edbc1e120361fb068bdfa2d9a74e31ed3420d82f006d4d86cdc1bf218904d40a13f45d5ddb46ac66f91694a098728df
EBUILD jhead-3.00.ebuild 746 BLAKE2B 576096a432b63a988861a85e05ebb92f1a4346bd012f74269629a2b868254a372699a4ed3be74ae78cb90df792ee61e77842da6da46ec98ae6a570faedf3fb89 SHA512 2f711c62175a02cc968fc698fffff784743a8befe3c315d294e78978357de5df3ee0c665ae70baf64091db4c3744f1c2aa3853fcae87754eb8a67d0a08ebe4a5
MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/jhead/jhead-2.97.ebuild b/media-gfx/jhead/jhead-2.97.ebuild
index 7027fe94c7bc..76ae79ab4249 100644
--- a/media-gfx/jhead/jhead-2.97.ebuild
+++ b/media-gfx/jhead/jhead-2.97.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.sentex.net/~mwandel/${PN}/${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
src_prepare() {
diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 22d787ae8a58..7e943766fcc3 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,5 +1,3 @@
-DIST kphotoalbum-5.5.tar.xz 11661532 BLAKE2B a14900cb7628b86aafa736de4b443f3aad3b4198bc6a04bc67fbc40f1bec9898ebbc33e60d4ca90db3b857871f75c70d6946efa2e756b3c5d7ae769bee6b2723 SHA512 fcca891a94580db2f606c5d077af2651e1dbcd59429823410f9fd2d07ac0c3c625ac441b723d4c8cb3ac7ede26ccf69f955c19fe302fffc9788fc33def9ee3e0
DIST kphotoalbum-5.6.1.tar.xz 11773808 BLAKE2B c69cdc0afb455af64fe0624208b6bff34813a8f0341a4d3f21b7dc0462eb51f01574656028de497527c57a7ed70d1ab9dd6fe451ecec1696f09cfa8531dffe77 SHA512 fa1f4d566cd99e8c434b6e1fe28d8910b3b9c6aa05947ffbfa1b2b8efdab76f243f4b12883586e0c6692bfe54763a285374e16f3ceb23051619fe9b84cd58ea7
-EBUILD kphotoalbum-5.5.ebuild 1496 BLAKE2B c1196e3b012258e8170c3a8c27318c55c4cb4e4129959be04078de5b0c9714af0fcf0e6774356ad518b4d62326a15eae08ee95cd280eadbd6819ed5c41852352 SHA512 9795d6c59b50bd328c7a5556441abbaa108c308398782e9172ab0617025a0769cfbce3ea0e46f5df1eedfd609f8bbb91638a4c964517adf950efaef8408cda2f
-EBUILD kphotoalbum-5.6.1.ebuild 1728 BLAKE2B d928f7e46d1c92eda043d1b850c07d92c35f795713dee9a6e22607c3e116d867872a450281c14f8451cfe5ae32c5277230c04f4cb34745b8db91cac5d69ec900 SHA512 13dcefa8f117c81d4621cca8ab8199fc18f8dd1383e4fd8e5854b3864ca272e96583f8acf1b7e93e402a400623eac45de9e2ace375e580bbb18605ebf5eda03b
+EBUILD kphotoalbum-5.6.1.ebuild 1726 BLAKE2B 3e2a2d490d50f51bc001838ec0413186b2758b520a2194c78ddb967e192fb45f8f94d4d3b78265186fc947964b7bb84e418dd9d183d041304cfd849c61774089 SHA512 85cc82a95bc884ae00139c4a5ddb9aba18a871eccb3e810d4a7a9ca2876fe2c53908b9e32c06a6fe76a9513f449f6a3c5cd65b4d111a3fcc336d7bb85363b372
MISC metadata.xml 524 BLAKE2B 9c5dbf76aa448c13bcd650ca6487650f85aa1b961f2c39555cfe97bb94959d79d1c15f9d2836473c564d35a370b2f36efafe29ca8ebf18d97c02374648af9078 SHA512 b8147da9bc6da4da7d9603be758780f6244aa78979f1e2e7bc8f4b578b16cf798b449221b3603c39186fa84c17227ba3fc4976748285ea04ecaf4e3e71cd8f00
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild
deleted file mode 100644
index 752ae5dc4358..000000000000
--- a/media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Tool for indexing, searching, and viewing images"
-HOMEPAGE="https://www.kphotoalbum.org/"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
- KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2+ FDL-1.2"
-IUSE="+kipi map +raw"
-
-DEPEND="
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kjobwidgets)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep ktextwidgets)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtsql 'sqlite')
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- media-gfx/exiv2:=
- media-libs/phonon[qt5(+)]
- virtual/jpeg:0
- kipi? ( $(add_kdeapps_dep libkipi) )
- map? ( $(add_kdeapps_dep libkgeomap) )
- raw? ( $(add_kdeapps_dep libkdcraw) )
-"
-RDEPEND="${DEPEND}
- media-video/ffmpeg
- kipi? ( kde-apps/kipi-plugins:5 )
-"
-
-DOCS=( ChangeLog README.md )
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package kipi KF5Kipi)
- $(cmake_use_find_package map KF5KGeoMap)
- $(cmake_use_find_package raw KF5KDcraw)
- )
-
- kde5_src_configure
-}
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.6.1.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.6.1.ebuild
index 2e4ae7efba73..61893466aefd 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.6.1.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.6.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.kphotoalbum.org/"
if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
LICENSE="GPL-2+ FDL-1.2"
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 18b3aa14e159..bdb00d6e409a 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,5 +1,8 @@
AUX krita-4.2.4-tests-optional.patch 12292 BLAKE2B a30463dcc6e02e877b308c4add529f0657d96ace7a13ba7424f4cdf260f3b636d03b2bac224d6239253393650163b622ac54d8d81bbdced2fb153bf216b5fb2d SHA512 1d5045b35981822bc16c4b23e573a299a8325353c8be347c56a4e2fc4e3cd9e937e8eb253f9c6cdc0197a3db7989b822fb41274afe3cd506b9c907daf1867df3
+AUX krita-4.2.9-ecm-findopenexr.patch 12617 BLAKE2B 7fcf0b5e8d980e6691a0d079a0fbb57a7da865fa6b2045cd6f6a860d647b9d7311d54cc4ca618092d94039cd23265798941371430a0230f11b49aa1268612c5c SHA512 a6493a105cbd5c68b8164ca13e2c127f301c62f1877fe499e95dc16d8eb3eb7ae1ef102735ae05e10893a91b0d1cd117486ebd57ce0c38968ecbe78d5aa9fcc2
DIST krita-4.2.8.2-patchset.tar.xz 13848 BLAKE2B 86059e08833541b7d4dfda2c36cd1479809452171353b755ab3a264fa41fb99fc7ffacf064af3767aa095fda81aa9a2212b63c7242c72f94ca23a83b34c0502f SHA512 79532700c967f94479af22e2fbd33c0b6d8c4295c872316935800b99258dceaedbac2b1c6314251d4d621c25a328ea602f49d415cc9275095bc3cd2f29756a61
DIST krita-4.2.8.2.tar.xz 169994064 BLAKE2B fc390db9e3aaf3f4355e600a98ea479aa510895c26cb82e8800fbff64031bab7a26e0c37d6d274e6397a38c1bc33cff6b48cb5a7c6e61b56579e92e33279b1c4 SHA512 5482ebd62c530764b43439d6782fa7e1793877657620967ea0f6cdad166e3ff508b36cd04bd99c192d35a237c4a0da08477069e333ebaf2093785e207402dea7
-EBUILD krita-4.2.8.2-r2.ebuild 3230 BLAKE2B e6435fc3caf8dca8889b2a31666cdddb9e59f3a343c7ee63ec2d07426cd287ca1ff6505508cb391ba939119cfa972c85ec7e8765adb49115b0baee05b5ce44a2 SHA512 c61389ddb2442246ed73be81b180e12c6a5a7c12d30553b03bed86b9aa2d0a71eeb75eabb65c4f157c34ae8b3d40b76c520b51da20216053c9ea81ff22e1f152
+DIST krita-4.2.9.tar.xz 170082028 BLAKE2B dafe300a1ef56a743272ce5936a0640949b7cfd37322e30e8a7ef17c4e51bf9dc8175d1443f9943836a229933ecb9a5d28249b8c90155165f3f0ee800e3cfa66 SHA512 66eef3d1b5647e62551276662ef4332f15abc022f1032f27a2ad695a8d2dc5fa758146492a9da2b8cbd4a52e47c576473029d2aa9728dea3bec869b8173f08c0
+EBUILD krita-4.2.8.2-r3.ebuild 3242 BLAKE2B 8ad5bb70d26d718cc9c13ba3b25654bdf85b704a465d4ea8f149916f2d32244d49a03eca45d4663fabbcb9ca6fcf7271706180144c6f30987d22483c0227a34b SHA512 2247dff1ca311cb68bb857bebb7765b961ccca3ac0fe3f3baf8734f216eaa462bb82ce638c252fb19df9cdae7b12630c5191789cf1fcf53ea5694690392a0358
+EBUILD krita-4.2.9.ebuild 3193 BLAKE2B a90356c71a130532acc70e24f5b83364fc414ffa1ff0f2da309e88d67a824df06ca56af617e3c6c2c48390b2956dad67933d52c251867a9416eebb24706d8af7 SHA512 09d8c27a3de0ffd738321bdcdc29643ab1aa2b0c816db721df935dd52fcfaec95f36bb29fb5f385dd6961dc211c8f0a1566b247c6cb8a562d3df38573b05ba48
MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/files/krita-4.2.9-ecm-findopenexr.patch b/media-gfx/krita/files/krita-4.2.9-ecm-findopenexr.patch
new file mode 100644
index 000000000000..0a7c7ca69846
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.2.9-ecm-findopenexr.patch
@@ -0,0 +1,352 @@
+From dae9ddcd45a95fd3b1ec3d42510556a671b08f15 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 31 Mar 2020 19:56:48 +0200
+Subject: [PATCH 1/2] Revert "Revert "Use e-c-m's findopenexr.cmake module""
+
+This reverts commit d978a33acebb724b862c38895788fc459111c364.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 2 +-
+ cmake/modules/FindOpenEXR.cmake | 98 ---------------------------------
+ 2 files changed, 1 insertion(+), 99 deletions(-)
+ delete mode 100644 cmake/modules/FindOpenEXR.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a7d9adaa3f..7a4211da13 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -251,7 +251,7 @@ endif(MINGW)
+ ########################
+
+ find_package(ECM 5.22 REQUIRED NOMODULE)
+-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
++set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${ECM_FIND_MODULE_DIR})
+ include(ECMOptionalAddSubdirectory)
+ include(ECMAddAppIcon)
+ include(ECMSetupVersion)
+diff --git a/cmake/modules/FindOpenEXR.cmake b/cmake/modules/FindOpenEXR.cmake
+deleted file mode 100644
+index bb75a03bf0..0000000000
+--- a/cmake/modules/FindOpenEXR.cmake
++++ /dev/null
+@@ -1,98 +0,0 @@
+-#
+-# Copyright 2016 Pixar
+-#
+-# Licensed under the Apache License, Version 2.0 (the "Apache License")
+-# with the following modification; you may not use this file except in
+-# compliance with the Apache License and the following modification to it:
+-# Section 6. Trademarks. is deleted and replaced with:
+-#
+-# 6. Trademarks. This License does not grant permission to use the trade
+-# names, trademarks, service marks, or product names of the Licensor
+-# and its affiliates, except as required to comply with Section 4(c) of
+-# the License and to reproduce the content of the NOTICE file.
+-#
+-# You may obtain a copy of the Apache License at
+-#
+-# http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the Apache License with the above modification is
+-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-# KIND, either express or implied. See the Apache License for the specific
+-# language governing permissions and limitations under the Apache License.
+-#
+-
+-find_path(OPENEXR_INCLUDE_DIR
+- OpenEXR/half.h
+-HINTS
+- "${OPENEXR_LOCATION}"
+- "$ENV{OPENEXR_LOCATION}"
+-PATH_SUFFIXES
+- include/
+-DOC
+- "OpenEXR headers path"
+-)
+-
+-if(OPENEXR_INCLUDE_DIR)
+- set(openexr_config_file "${OPENEXR_INCLUDE_DIR}/OpenEXR/OpenEXRConfig.h")
+- if(EXISTS ${openexr_config_file})
+- file(STRINGS
+- ${openexr_config_file}
+- TMP
+- REGEX "#define OPENEXR_VERSION_STRING.*$")
+- string(REGEX MATCHALL "[0-9.]+" OPENEXR_VERSION ${TMP})
+-
+- file(STRINGS
+- ${openexr_config_file}
+- TMP
+- REGEX "#define OPENEXR_VERSION_MAJOR.*$")
+- string(REGEX MATCHALL "[0-9]" OPENEXR_MAJOR_VERSION ${TMP})
+-
+- file(STRINGS
+- ${openexr_config_file}
+- TMP
+- REGEX "#define OPENEXR_VERSION_MINOR.*$")
+- string(REGEX MATCHALL "[0-9]" OPENEXR_MINOR_VERSION ${TMP})
+- endif()
+-endif()
+-
+-foreach(OPENEXR_LIB
+- Half
+- Iex
+- Imath
+- IlmImf
+- IlmThread
+- )
+-
+- # OpenEXR libraries may be suffixed with the version number, so we search
+- # using both versioned and unversioned names.
+- find_library(OPENEXR_${OPENEXR_LIB}_LIBRARY
+- NAMES
+- ${OPENEXR_LIB}-${OPENEXR_MAJOR_VERSION}_${OPENEXR_MINOR_VERSION}
+- ${OPENEXR_LIB}
+- HINTS
+- "${OPENEXR_LOCATION}"
+- "$ENV{OPENEXR_LOCATION}"
+- PATH_SUFFIXES
+- lib/
+- DOC
+- "OPENEXR's ${OPENEXR_LIB} library path"
+- )
+-
+- if(OPENEXR_${OPENEXR_LIB}_LIBRARY)
+- list(APPEND OPENEXR_LIBRARIES ${OPENEXR_${OPENEXR_LIB}_LIBRARY})
+- endif()
+-endforeach(OPENEXR_LIB)
+-
+-# So #include <half.h> works
+-list(APPEND OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR})
+-list(APPEND OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR}/OpenEXR)
+-
+-include(FindPackageHandleStandardArgs)
+-find_package_handle_standard_args(OpenEXR
+- REQUIRED_VARS
+- OPENEXR_INCLUDE_DIRS
+- OPENEXR_LIBRARIES
+- VERSION_VAR
+- OPENEXR_VERSION
+-)
+--
+2.26.0
+
+
+From b6e1c9c015989c47688c3cc3efa85e51eb02696f Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 2 Apr 2020 14:49:10 +0200
+Subject: [PATCH 2/2] For ECM FindOpenEXR.cmake, in CMakeLists.txt, do
+ s/OPENEXR/OpenEXR/
+
+---
+ CMakeLists.txt | 8 ++++----
+ libs/image/CMakeLists.txt | 4 ++--
+ libs/pigment/CMakeLists.txt | 6 +++---
+ libs/ui/CMakeLists.txt | 2 +-
+ plugins/color/colorspaceextensions/CMakeLists.txt | 2 +-
+ plugins/color/lcms2engine/CMakeLists.txt | 10 +++++-----
+ plugins/color/lcms2engine/tests/CMakeLists.txt | 4 ++--
+ plugins/dockers/specificcolorselector/CMakeLists.txt | 2 +-
+ plugins/impex/CMakeLists.txt | 2 +-
+ plugins/impex/exr/CMakeLists.txt | 6 +++---
+ plugins/impex/raw/CMakeLists.txt | 4 ++--
+ 11 files changed, 25 insertions(+), 25 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7a4211da13..5ff18bbb17 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -571,11 +571,11 @@ set_package_properties(OpenEXR PROPERTIES
+ URL "http://www.openexr.com"
+ TYPE OPTIONAL
+ PURPOSE "Required by the Krita OpenEXR filter")
+-macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
++macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
+- include_directories(SYSTEM ${OPENEXR_INCLUDE_DIRS})
+- set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
++if(OpenEXR_FOUND)
++ include_directories(SYSTEM ${OpenEXR_INCLUDE_DIRS})
++ set(LINK_OPENEXR_LIB ${OpenEXR_LIBRARIES})
+ add_definitions(${OPENEXR_DEFINITIONS})
+ endif()
+
+diff --git a/libs/image/CMakeLists.txt b/libs/image/CMakeLists.txt
+index 6d7c6a4daa..74d78103ab 100644
+--- a/libs/image/CMakeLists.txt
++++ b/libs/image/CMakeLists.txt
+@@ -349,8 +349,8 @@ if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
+ endif()
+ endif()
+
+-if(OPENEXR_FOUND)
+- target_link_libraries(kritaimage PUBLIC ${OPENEXR_LIBRARIES})
++if(OpenEXR_FOUND)
++ target_link_libraries(kritaimage PUBLIC ${OpenEXR_LIBRARIES})
+ endif()
+
+ if(FFTW3_FOUND)
+diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
+index 2a574a6c77..53e34cc029 100644
+--- a/libs/pigment/CMakeLists.txt
++++ b/libs/pigment/CMakeLists.txt
+@@ -14,9 +14,9 @@ include_directories(
+
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
+- include_directories(SYSTEM ${OPENEXR_INCLUDE_DIRS})
+- set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
++if(OpenEXR_FOUND)
++ include_directories(SYSTEM ${OpenEXR_INCLUDE_DIRS})
++ set(LINK_OPENEXR_LIB ${OpenEXR_LIBRARIES})
+ add_definitions(${OPENEXR_DEFINITIONS})
+ endif()
+
+diff --git a/libs/ui/CMakeLists.txt b/libs/ui/CMakeLists.txt
+index 73f36e4e68..151c46f711 100644
+--- a/libs/ui/CMakeLists.txt
++++ b/libs/ui/CMakeLists.txt
+@@ -576,7 +576,7 @@ if(APPLE)
+ endif ()
+
+
+-target_link_libraries(kritaui ${OPENEXR_LIBRARIES})
++target_link_libraries(kritaui ${OpenEXR_LIBRARIES})
+
+ # Add VSync disable workaround
+ if(NOT WIN32 AND NOT APPLE)
+diff --git a/plugins/color/colorspaceextensions/CMakeLists.txt b/plugins/color/colorspaceextensions/CMakeLists.txt
+index ee8033afed..523e11cfb9 100644
+--- a/plugins/color/colorspaceextensions/CMakeLists.txt
++++ b/plugins/color/colorspaceextensions/CMakeLists.txt
+@@ -12,5 +12,5 @@ set( extensions_plugin_SOURCES
+ )
+
+ add_library(krita_colorspaces_extensions MODULE ${extensions_plugin_SOURCES} )
+-target_link_libraries(krita_colorspaces_extensions kritapigment kritaglobal ${OPENEXR_LIBRARIES} KF5::I18n KF5::CoreAddons)
++target_link_libraries(krita_colorspaces_extensions kritapigment kritaglobal ${OpenEXR_LIBRARIES} KF5::I18n KF5::CoreAddons)
+ install( TARGETS krita_colorspaces_extensions DESTINATION ${KRITA_PLUGIN_INSTALL_DIR} )
+diff --git a/plugins/color/lcms2engine/CMakeLists.txt b/plugins/color/lcms2engine/CMakeLists.txt
+index e14de2ba7c..109a708b2d 100644
+--- a/plugins/color/lcms2engine/CMakeLists.txt
++++ b/plugins/color/lcms2engine/CMakeLists.txt
+@@ -28,7 +28,7 @@ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles
+ )
+
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16
+ ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16
+@@ -38,9 +38,9 @@ endif ()
+
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
+- include_directories(SYSTEM ${OPENEXR_INCLUDE_DIRS})
+- set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
++if(OpenEXR_FOUND)
++ include_directories(SYSTEM ${OpenEXR_INCLUDE_DIRS})
++ set(LINK_OPENEXR_LIB ${OpenEXR_LIBRARIES})
+ add_definitions(${OPENEXR_DEFINITIONS})
+ endif()
+
+@@ -77,7 +77,7 @@ set ( lcmsengine_SRCS
+ LcmsEnginePlugin.cpp
+ )
+
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ set ( lcmsengine_SRCS
+ ${lcmsengine_SRCS}
+ colorspaces/gray_f16/GrayF16ColorSpace.cpp
+diff --git a/plugins/color/lcms2engine/tests/CMakeLists.txt b/plugins/color/lcms2engine/tests/CMakeLists.txt
+index eea9e9e846..87ca907148 100644
+--- a/plugins/color/lcms2engine/tests/CMakeLists.txt
++++ b/plugins/color/lcms2engine/tests/CMakeLists.txt
+@@ -12,8 +12,8 @@ include_directories( ../colorspaces/cmyk_u16
+ ../colorprofiles
+ ..
+ )
+-if(OPENEXR_FOUND)
+- include_directories(SYSTEM ${OPENEXR_INCLUDE_DIRS})
++if(OpenEXR_FOUND)
++ include_directories(SYSTEM ${OpenEXR_INCLUDE_DIRS})
+ endif()
+ include_directories( ${LCMS2_INCLUDE_DIR} )
+
+diff --git a/plugins/dockers/specificcolorselector/CMakeLists.txt b/plugins/dockers/specificcolorselector/CMakeLists.txt
+index 97f7ab2cdd..214a46eaa9 100644
+--- a/plugins/dockers/specificcolorselector/CMakeLists.txt
++++ b/plugins/dockers/specificcolorselector/CMakeLists.txt
+@@ -10,5 +10,5 @@ ki18n_wrap_ui(KRITA_SPECIFICCOLORSELECTOR_SOURCES
+
+
+ add_library(kritaspecificcolorselector MODULE ${KRITA_SPECIFICCOLORSELECTOR_SOURCES})
+-target_link_libraries(kritaspecificcolorselector kritaui ${OPENEXR_LIBRARIES})
++target_link_libraries(kritaspecificcolorselector kritaui ${OpenEXR_LIBRARIES})
+ install(TARGETS kritaspecificcolorselector DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
+diff --git a/plugins/impex/CMakeLists.txt b/plugins/impex/CMakeLists.txt
+index 51056ecf47..838f34b6eb 100644
+--- a/plugins/impex/CMakeLists.txt
++++ b/plugins/impex/CMakeLists.txt
+@@ -19,7 +19,7 @@ if(PNG_FOUND)
+ add_subdirectory(csv)
+ endif()
+
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+ add_subdirectory(exr)
+ endif()
+
+diff --git a/plugins/impex/exr/CMakeLists.txt b/plugins/impex/exr/CMakeLists.txt
+index aa39a91879..cb07f6b01a 100644
+--- a/plugins/impex/exr/CMakeLists.txt
++++ b/plugins/impex/exr/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ add_subdirectory(tests)
+
+-include_directories(SYSTEM ${OPENEXR_INCLUDE_DIRS} )
++include_directories(SYSTEM ${OpenEXR_INCLUDE_DIRS} )
+
+ add_definitions(${OPENEXR_DEFINITIONS})
+
+@@ -17,7 +17,7 @@ set(kritaexrimport_SOURCES
+
+ add_library(kritaexrimport MODULE ${kritaexrimport_SOURCES})
+
+-target_link_libraries(kritaexrimport kritaui kritalibkra ${OPENEXR_LIBRARIES} )
++target_link_libraries(kritaexrimport kritaui kritalibkra ${OpenEXR_LIBRARIES} )
+
+ install(TARGETS kritaexrimport DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
+
+@@ -30,7 +30,7 @@ ki18n_wrap_ui(kritaexrexport_SOURCES exr_export_widget.ui )
+
+ add_library(kritaexrexport MODULE ${kritaexrexport_SOURCES})
+
+-target_link_libraries(kritaexrexport kritaui kritalibkra kritaimpex ${OPENEXR_LIBRARIES} )
++target_link_libraries(kritaexrexport kritaui kritalibkra kritaimpex ${OpenEXR_LIBRARIES} )
+
+ install(TARGETS kritaexrexport DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
+
+diff --git a/plugins/impex/raw/CMakeLists.txt b/plugins/impex/raw/CMakeLists.txt
+index 71cb5b355c..d20cbe63c5 100644
+--- a/plugins/impex/raw/CMakeLists.txt
++++ b/plugins/impex/raw/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ add_subdirectory(tests)
+
+-if(OPENEXR_FOUND)
+- include_directories(${OPENEXR_INCLUDE_DIRS})
++if(OpenEXR_FOUND)
++ include_directories(${OpenEXR_INCLUDE_DIRS})
+ endif()
+ include_directories(${LibRaw_INCLUDE_DIR})
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libkdcraw/src)
+--
+2.26.0
+
diff --git a/media-gfx/krita/krita-4.2.8.2-r2.ebuild b/media-gfx/krita/krita-4.2.8.2-r3.ebuild
index a5a59ceb2b39..e23f6afea053 100644
--- a/media-gfx/krita/krita-4.2.8.2-r2.ebuild
+++ b/media-gfx/krita/krita-4.2.8.2-r3.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org python-single-r1
if [[ ${KDE_BUILD_TYPE} = release ]]; then
SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-3)/${P}.tar.xz
https://dev.gentoo.org/~asturm/distfiles/${P}-patchset.tar.xz"
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="amd64 ~ppc64 ~x86"
fi
DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
@@ -39,7 +39,7 @@ RDEPEND="${PYTHON_DEPS}
>=dev-qt/qtconcurrent-${QTMIN}:5
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5=[-gles2]
+ >=dev-qt/qtgui-${QTMIN}:5=[-gles2-only]
>=dev-qt/qtnetwork-${QTMIN}:5
>=dev-qt/qtprintsupport-${QTMIN}:5
>=dev-qt/qtsvg-${QTMIN}:5
diff --git a/media-gfx/krita/krita-4.2.9.ebuild b/media-gfx/krita/krita-4.2.9.ebuild
new file mode 100644
index 000000000000..91a902cc8054
--- /dev/null
+++ b/media-gfx/krita/krita-4.2.9.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+PYTHON_COMPAT=( python3_{6,7,8} )
+KFMIN=5.60.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-3)/${P}.tar.xz"
+ KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
+HOMEPAGE="https://kde.org/applications/graphics/org.kde.krita https://krita.org/en/"
+
+LICENSE="GPL-3"
+SLOT="5"
+IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+ dev-cpp/eigen:3
+ dev-lang/perl
+ sys-devel/gettext
+"
+RDEPEND="${PYTHON_DEPS}
+ dev-libs/boost:=
+ dev-libs/quazip
+ $(python_gen_cond_dep '
+ dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
+ dev-python/sip[${PYTHON_MULTI_USEDEP}]
+ ')
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5=[-gles2-only]
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/karchive-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kitemmodels-${KFMIN}:5
+ >=kde-frameworks/kitemviews-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ media-gfx/exiv2:=
+ media-libs/lcms
+ media-libs/libpng:0=
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/libX11
+ x11-libs/libXi
+ color-management? ( media-libs/opencolorio )
+ fftw? ( sci-libs/fftw:3.0= )
+ gif? ( media-libs/giflib )
+ gsl? ( sci-libs/gsl:= )
+ jpeg? ( virtual/jpeg:0 )
+ heif? ( media-libs/libheif:= )
+ openexr? (
+ media-libs/ilmbase:=
+ media-libs/openexr
+ )
+ pdf? ( app-text/poppler[qt5] )
+ qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
+ raw? ( media-libs/libraw:= )
+ tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${RDEPEND}
+ vc? ( >=dev-libs/vc-1.1.0 )
+"
+
+# bug 630508
+RESTRICT+=" test"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.2.4-tests-optional.patch
+ "${FILESDIR}"/${P}-ecm-findopenexr.patch
+)
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+ ecm_pkg_setup
+}
+
+src_configure() {
+ # Prevent sandbox violation from FindPyQt5.py module
+ # See Gentoo-bug 655918
+ addpredict /dev/dri
+
+ local mycmakeargs=(
+ $(cmake_use_find_package color-management OCIO)
+ $(cmake_use_find_package fftw FFTW3)
+ $(cmake_use_find_package gif GIF)
+ $(cmake_use_find_package gsl GSL)
+ $(cmake_use_find_package heif HEIF)
+ $(cmake_use_find_package jpeg JPEG)
+ $(cmake_use_find_package openexr OpenEXR)
+ $(cmake_use_find_package pdf Poppler)
+ $(cmake_use_find_package qtmedia Qt5Multimedia)
+ $(cmake_use_find_package raw LibRaw)
+ $(cmake_use_find_package tiff TIFF)
+ $(cmake_use_find_package vc Vc)
+ )
+
+ ecm_src_configure
+}
diff --git a/media-gfx/mcomix/Manifest b/media-gfx/mcomix/Manifest
index 3ff381835e78..0facf13d35fc 100644
--- a/media-gfx/mcomix/Manifest
+++ b/media-gfx/mcomix/Manifest
@@ -1,6 +1,4 @@
-DIST mcomix-1.2.1.tar.bz2 571128 BLAKE2B fa00e55e5cf2ef676a625b97ca467ade6b629fa08bfd920b8c370dc7d33c6602c5614d120d7279df32d063db646da8b635712ba90793175eea2c74c2c1973a8a SHA512 efa4d57edc3a48d9e711767fb3e233ef9b334ff8ba467999e572e60ed747a4ee4aa420c8aa7788b16d7eb6e0901d454d6a405fcec47a8c74098a49491e915cd0
DIST mcomix-1.3.0_pre20200206.tar.gz 3292571 BLAKE2B ad76316020645495042d27bf831588e628da11077efe29b302a57be4e688558b4db8d3f850200bf4a54b84b428a16a52f88ea5e20be85b628ef3630a5f624643 SHA512 c98d4a7022993af3a5c0b5425df52f14b586549472bcd4576a72039c8c6d4fde31df4255df45ab7467acb0280bda02b92d4803b7f92b7c1c818b58df7b52a3ff
-EBUILD mcomix-1.2.1.ebuild 1684 BLAKE2B 593e3bffc8bb970f7839bc4ded48bef0505cfe30982d1432b357e4d4ab5607feb9999898afbafbc3855892249b2c5c18bae1586fd8db89d0b31a6c5bebbf11d2 SHA512 4b799f1e6d4a40f1aa88cbe34c27d787046b65ed05c55e0a5ca9918762b345481b7ed5bd8fbde10508e2f14f68ad16c8029aaf8a56c922e16fb635fc5809a1f1
-EBUILD mcomix-1.3.0_pre20200206.ebuild 1796 BLAKE2B 6059407c351ea46238728e1545cba3be40cb433888f3ac8128d928c07c8eff86ba67b16f01f3218b470340871b7a280227c9e091e2511d84ad6526475442861e SHA512 b6e1e084514ec3fe38faed2e45d2ccb36a7897ca160a8290ecab5a78101f77133fa158a74eb113dc3944af80bbb613fb3d49a9bc6639154c44aaa214a57aca79
+EBUILD mcomix-1.3.0_pre20200206.ebuild 1794 BLAKE2B ee1d2db9785b22c23a6a04f74e372a7424421691f69502910e75a05e27172ab246eea29385315e2433f4d24917d06475d89d8488a7489fafef9fefd04098eeff SHA512 9211f7786603df2d7c7ea21c8179d958849ecd7852e5d79f088c078e522598e4170cbc3b9bd05b873be5a253b5e2d958f07c7c43de83c5f4fa1a590cba306ca1
EBUILD mcomix-9999.ebuild 1646 BLAKE2B 1d3b03cf2a5584f446b8b59501c044be9a7c4a10fd0aa20e8fa2f8fcd71f24c0e4a7b3d24e90e9ad152eccb639daaeba8aecb6e92724e5e6429f5e8fd367434c SHA512 3c5f49c2808abbe48dac1ff1ab6f2d92bf48e8882c972c325c2ab78a6ab4a2120f8c32a32e78bfae73da31fb78aec38e1d854737b8b9032592567fb71ae5e4d6
MISC metadata.xml 523 BLAKE2B adac37e097094bc3704967b0ecd2c1366168e39e2fb86805846e2a9b92c1aabaff6e36e39d3318d45ed4147f9e8a253e561a75645d9672ec4a0d32f78673a3f6 SHA512 d36ee6da57cd276e16a95507ec3982a8a0f481044695185161b1a37bf95f709e972634397dd2aaa635c64b0dbf17406557a47e9e1f1a85ad18799ebe4eb367b1
diff --git a/media-gfx/mcomix/mcomix-1.2.1.ebuild b/media-gfx/mcomix/mcomix-1.2.1.ebuild
deleted file mode 100644
index c34c73cf85a4..000000000000
--- a/media-gfx/mcomix/mcomix-1.2.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-PLOCALES="ca cs de el es fa fr gl he hr hu id it ja ko nl pl pt_BR ru sv uk zh_CN zh_TW"
-
-inherit distutils-r1 eutils l10n xdg-utils
-
-DESCRIPTION="A fork of comix, a GTK image viewer for comic book archives"
-HOMEPAGE="https://sourceforge.net/p/mcomix/wiki/Home/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
- >=dev-python/pygtk-2.14[${PYTHON_USEDEP}]
- virtual/jpeg
- dev-python/pillow[${PYTHON_USEDEP}]
- x11-libs/gdk-pixbuf
- !media-gfx/comix"
-
-DOCS=( ChangeLog README )
-
-src_prepare() {
- local checklocales
- for l in $(find "${S}"/mcomix/messages/* -maxdepth 0 -type d);
- do checklocales+="$(basename $l) "
- done
-
- [[ ${PLOCALES} == ${checklocales% } ]] \
- || eqawarn "Update to PLOCALES=\"${checklocales% }\""
-
- my_rm_loc() {
- rm -rf "${S}/mcomix/messages/${1}/LC_MESSAGES" || die
- rmdir "${S}/mcomix/messages/${1}" || die
- }
-
- l10n_for_each_disabled_locale_do my_rm_loc
-
- distutils-r1_src_prepare
-}
-
-pkg_postinst() {
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
- echo
- elog "Additional packages are required to open the most common comic archives:"
- elog
- elog " cbr: app-arch/unrar"
- elog " cbz: app-arch/unzip"
- elog
- elog "You can also add support for 7z or LHA archives by installing"
- elog "app-arch/p7zip or app-arch/lha. Install app-text/mupdf for"
- elog "pdf support."
- echo
-}
-
-pkg_postrm() {
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
diff --git a/media-gfx/mcomix/mcomix-1.3.0_pre20200206.ebuild b/media-gfx/mcomix/mcomix-1.3.0_pre20200206.ebuild
index dcfc08d61190..dcc3df6bb40d 100644
--- a/media-gfx/mcomix/mcomix-1.3.0_pre20200206.ebuild
+++ b/media-gfx/mcomix/mcomix-1.3.0_pre20200206.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/multiSnow/mcomix3/archive/${GIT_PV}.tar.gz -> ${P}.t
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="${PYTHON_DEPS}"
diff --git a/media-gfx/mirage/Manifest b/media-gfx/mirage/Manifest
deleted file mode 100644
index e1f54b6debc5..000000000000
--- a/media-gfx/mirage/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX mirage-0.9.3-stop_cleaning_up.patch 679 BLAKE2B a13a62d07cc23e2cf9fdac0edfb3a438ab9a3b3dd6d22157a7930a86bc2a3d027de15293621fcd1ef166fdfc279e8b23dcacfd7551d9a18848f0601ec878466a SHA512 3269a11d970b0e21fff211a7d324d5d51054a8dfb547b15345e1fb252f3c311e42f01d59849a9bbd7e19a39cd5f918231e118aa65673d91bd08ca5312db3ec67
-DIST mirage-0.9.5.2.tar.bz2 114991 BLAKE2B 7c2494ed799b0034b81e65d4fffc5c30823ffef5be9e4f5240109d5979b4fbcceae2ed4ca4804406aea33d069ffcbc032018307af7434da6ac1b1ec3bf8fe19e SHA512 c754c7c74523f060cf5c120750de3a5d9935eff2b04a30b4f266939528c1b01f26a27294765dbed47adeef88301cb3d7ff8f7464e6504ba5e8ff734ec0685c76
-EBUILD mirage-0.9.5.2-r1.ebuild 816 BLAKE2B df0f65e0cba852178407b456ef153c8b51e7753d12b45c406ce70c3d3db4f815f8f85f4489b796c16e17fab0957ed4ca0618f9358895bd3235855e6636a7888a SHA512 3decb13ceddec5f84f53e6e139c85ce3d8828b366b7225f7d70ecaa41fabc9dab1787d4a9986c36f26fa4a8902f4de0339d4de4762e7acfc83b1cfb6a963d4fb
-MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-gfx/mirage/files/mirage-0.9.3-stop_cleaning_up.patch b/media-gfx/mirage/files/mirage-0.9.3-stop_cleaning_up.patch
deleted file mode 100644
index 0f315297184b..000000000000
--- a/media-gfx/mirage/files/mirage-0.9.3-stop_cleaning_up.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ur mirage-0.9.3.orig/setup.py mirage-0.9.3/setup.py
---- mirage-0.9.3.orig/setup.py 2008-03-27 06:05:28.000000000 +0200
-+++ mirage-0.9.3/setup.py 2008-11-30 16:34:11.000000000 +0200
-@@ -70,23 +70,3 @@
- ('share/locale/cs/LC_MESSAGES', ['mo/cs/mirage.mo']),
- ('share/locale/it/LC_MESSAGES', ['mo/it/mirage.mo'])],
- )
--
--# Cleanup (remove /build, /mo, and *.pyc files:
--print "Cleaning up..."
--try:
-- removeall("build/")
-- os.rmdir("build/")
--except:
-- pass
--try:
-- removeall("mo/")
-- os.rmdir("mo/")
--except:
-- pass
--try:
-- for f in os.listdir("."):
-- if os.path.isfile(f):
-- if os.path.splitext(os.path.basename(f))[1] == ".pyc":
-- os.remove(f)
--except:
-- pass
diff --git a/media-gfx/mirage/metadata.xml b/media-gfx/mirage/metadata.xml
deleted file mode 100644
index 6ade85e1c642..000000000000
--- a/media-gfx/mirage/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>graphics@gentoo.org</email>
- <name>Gentoo Graphics Project</name>
- </maintainer>
-</pkgmetadata>
diff --git a/media-gfx/mirage/mirage-0.9.5.2-r1.ebuild b/media-gfx/mirage/mirage-0.9.5.2-r1.ebuild
deleted file mode 100644
index 71ed3e1b089d..000000000000
--- a/media-gfx/mirage/mirage-0.9.5.2-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A fast and simple image viewer based on python and GTK+"
-HOMEPAGE="http://mirageiv.berlios.de/"
-#SRC_URI="mirror://berlios/mirageiv/${P}.tar.bz2"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
- >=dev-python/pygtk-2.12:2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- !media-plugins/banshee-mirage"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.9.3-stop_cleaning_up.patch )
-
-src_install() {
- distutils-r1_src_install
- local XDOCS="COPYING CHANGELOG README TODO TRANSLATORS"
- local x
- for x in ${XDOCS}; do
- rm -f "${D}"/usr/share/mirage/${x}
- done
-}
diff --git a/media-gfx/mypaint-brushes/Manifest b/media-gfx/mypaint-brushes/Manifest
index 96d6a1417fd3..3c6863b768dd 100644
--- a/media-gfx/mypaint-brushes/Manifest
+++ b/media-gfx/mypaint-brushes/Manifest
@@ -1,3 +1,3 @@
DIST mypaint-brushes-1.3.0.tar.gz 2447093 BLAKE2B 26fc22ef7669f5d88b1cb2bbc4562baffe257c112baf4a782f5045becd17a0bea577f79f290ae51b38cb3030478ea9d2e251033cc95101caacc823d139fe4ce1 SHA512 f8e0050cd700358d75cd25e40acd73905e2a53f21c6177cf67e8012aa4fbba8dc445109f07601c3846f95532a40feff4441081c0aa4e958049fc0ed8008fb414
-EBUILD mypaint-brushes-1.3.0-r1.ebuild 542 BLAKE2B 46890eee9770d37bef3669eb21923253aa011548653d8517926ac39c53bccdadb7baaa40dcfa6b1d7c5d7056ffd07e0fc3739b70c8ae6f9d85c5f171a1abf7a4 SHA512 199430015a24663e6b29f19860cb20612f16f683e089e07b8a4bc63132a61a4537d7373346df1b5578b05c735861d83b1ba3bcaca98dfdb29b0df531d82f4207
+EBUILD mypaint-brushes-1.3.0-r1.ebuild 549 BLAKE2B 0970a579e79cec885408aa425feb74152faed0f46bcf8cdda2d2f853a6d6b97d932ba6e3f29c120e846232b05b30449fe2229c531e52cd01cba15f0d5c8dd890 SHA512 5439ca90c63bba1886e7956e69d74b579967f3a6114218220888c5251ff67459cd82d7cdd1b8e85705ddedf4d6f40be3bc8728218d0a3bb8e49f1be3aecb6d59
MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
index 81cc30d41ad8..64ae44b0d7f1 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Jehan/mypaint-brushes/archive/v1.3.0.tar.gz -> ${P}.
LICENSE="CC0-1.0"
SLOT="1.0" # due to pkgconfig name "mypaint-brushes-1.0"
-KEYWORDS="amd64 arm64 ~ia64 ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm64 ~ia64 ~ppc64 x86"
IUSE=""
DOCS=( AUTHORS NEWS README.md ) # to exclude README symlink
diff --git a/media-gfx/opencsg/Manifest b/media-gfx/opencsg/Manifest
index 61337ded544c..bb379c91f51d 100644
--- a/media-gfx/opencsg/Manifest
+++ b/media-gfx/opencsg/Manifest
@@ -1,5 +1,4 @@
-AUX opencsg-1.4.2-includepath.patch 529 BLAKE2B 300ed0021302cf3c14ea3039c52ca579473b83672227bff2261b1243e4914237e26649c14bdd3e1014cf5a7e5c43a28b55a4658727ccc41b1d361078106d86ae SHA512 352fc772b678336734ee625b708732560e212162279126a368a6f1adeb4f29b8b29960e7a5cf06a2b6c5d1c6a369c8a9347b050c49d6a301c07b6ed259340e87
+AUX opencsg-1.4.2-includepath.patch 537 BLAKE2B c54c3ff9bc802f34a92a72620fd20277d90174a3d0e69ec7d34987b387da44e37d1a6487f6c6063b555bca8c40a2d827d91b3ab0d9c0b8adbab5648fce90a639 SHA512 7ccc4b75560682ad7c3c340b8d8824d1339a8a1859f459139ad84d9a06e25072eba84a78c6d30aa4dbd72cf82465a176550a7e89b2590ccd85e4129511ad3893
DIST OpenCSG-1.4.2.tar.gz 933135 BLAKE2B 20882afaddf40cc4e0c43c3e70bad334aae3885241a3993ce7083de20f9b10d6e6c4eb3a55abba2b1eca64fdae784c491492543a5012b8b2d67eb63a16dd693b SHA512 fbe6f925982717ecca7bd0eacc4fc5b362c80c7663b1ff0d9a228f2b5e1d3625d3e6d324d9e634665c74e9c0fc37d10290ece293e59a3eba67035b6b700b7778
-EBUILD opencsg-1.4.2-r1.ebuild 775 BLAKE2B d41ff856ec2ee82e6bba5c318b656adf1ca234c97a80f9c565a23fda444d6d1cd7f6cb4aeb3b9c1f7d5b6c368ffa2195f693fd469073b0a86363a181eadae1a1 SHA512 fd959b3c0a5e70b7d89a21747de355b05d6ceb4ce18fc78a5f20beea074869a02585d27415dc4b999cca3dbb62730d1953c9681f3eb827f454ff2a870b91dbef
-EBUILD opencsg-1.4.2.ebuild 754 BLAKE2B 32fb0c21ba6f023852e258035a33339f72d74d0806176d794f46bf9a17a198a8c2e4b22ffa31a866b2a11815dde170907cbe3c6c5b21fdfeb67779eabba8b7e9 SHA512 356eb205e3de711d0bea816a0b284cf31abbeb5ba5de13bafa71231872c31983e3bf28f04ff2daff92c6905347ce6bcff3f7eb86669f5c9fa098e1887f962d92
-MISC metadata.xml 1070 BLAKE2B 1a892821eaa48f008252d7c88ef7dfb90153b148965620c4dc222b36e2cead376a0a210f894bba92e3b0d6b6206fe52d2b50d073d51aac9160e8a7c7919aa715 SHA512 6ec0f9e9f23969068ee01620785c028d3b8c3ddef2614019ed8b9dc263e8507be748bc8a47f69e55084cf5026e814b4cf1feeb119980e3ecb6a16c8e43037133
+EBUILD opencsg-1.4.2-r1.ebuild 1224 BLAKE2B 53f913bc1e75341ac267a20542d079b9254b122dee1e04caf8860ee18aca171d9270de783f9dd9636fa8bad482e0632497594b6622d3aeaf2f807f79ec12d046 SHA512 f819d3953f79fdacd6b966898c82fe358f5bd57420f56735b1f9b7c20f12536022a98e77c992f635ee31b417d2b538fb1d3fcd62807c564abe4adc479f029121
+MISC metadata.xml 1289 BLAKE2B 7b2ca0df1bdec35319472bdc3b5e9e71412406d6c5bedfa4ceda553ab207e0b8c6027d7c2f4fad9b13c3d850aa976fa94c84b336e69b750f8fb71b0967ec50c6 SHA512 df8a5dc7d1a83728d9bba2be8cc843060c4cc34ff4d3c7e04b1aebd5a05b6c93d844a3e6442620a31760f7763946a1aaeda2cc1e5dc5b6902537425748be58e5
diff --git a/media-gfx/opencsg/files/opencsg-1.4.2-includepath.patch b/media-gfx/opencsg/files/opencsg-1.4.2-includepath.patch
index 9b66ae44ed0e..1a623a5629be 100644
--- a/media-gfx/opencsg/files/opencsg-1.4.2-includepath.patch
+++ b/media-gfx/opencsg/files/opencsg-1.4.2-includepath.patch
@@ -3,8 +3,8 @@
Gentoo-bug: 623840
---- a/src.pro
-+++ b/src.pro
+--- a/src/src.pro
++++ b/src/src.pro
@@ -7,14 +7,14 @@
}
diff --git a/media-gfx/opencsg/metadata.xml b/media-gfx/opencsg/metadata.xml
index 9fe432b2d593..a6159b39f26b 100644
--- a/media-gfx/opencsg/metadata.xml
+++ b/media-gfx/opencsg/metadata.xml
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>waebbl@gmail.com</email>
+ <name>Bernd Waibel</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <description>Gentoo Proxy Maintainer Team</description>
+ </maintainer>
<longdescription>
OpenCSG is a library that does image-based CSG rendering using
OpenGL. OpenCSG is written in C++ and supports most modern
diff --git a/media-gfx/opencsg/opencsg-1.4.2-r1.ebuild b/media-gfx/opencsg/opencsg-1.4.2-r1.ebuild
index faa23f4458b3..bf738882fe58 100644
--- a/media-gfx/opencsg/opencsg-1.4.2-r1.ebuild
+++ b/media-gfx/opencsg/opencsg-1.4.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit qmake-utils
@@ -13,15 +13,29 @@ SRC_URI="http://www.opencsg.org/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="doc"
-RDEPEND="media-libs/glew:0="
+RDEPEND="
+ dev-libs/libbsd
+ media-libs/glew:0=
+ virtual/opengl
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libXdmcp
+ x11-libs/libXext
+ x11-libs/libxcb:=
+"
+
+# qtgui is needed for opengles2 feature by
+# /usr/lib64/qt5/mkspecs/feature/unix/opengl.prf
DEPEND="${RDEPEND}
dev-qt/qtcore:5
- media-libs/mesa[gles2]
+ dev-qt/qtgui:5
"
-S="${WORKDIR}/${MY_P}/src"
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( build.txt changelog.txt )
PATCHES=(
"${FILESDIR}/${P}-includepath.patch"
@@ -31,13 +45,21 @@ src_prepare() {
default
# removes duplicated headers
- rm -r ../glew || die "failed to remove bundled glew"
+ rm -r glew || die "failed to remove bundled glew"
}
src_configure() {
- eqmake5 src.pro INSTALLDIR="/usr" LIBDIR="$(get_libdir)"
+ eqmake5 opencsg.pro INSTALLDIR="${EPREFIX}/usr" LIBDIR="$(get_libdir)"
+}
+
+src_compile() {
+ # rebuild Makefiles in subdirs
+ emake INSTALLDIR="${EPREFIX}/usr" LIBDIR="$(get_libdir)" qmake_all
+ emake sub-src
}
src_install() {
- emake INSTALL_ROOT="${D}" install
+ emake -C src INSTALL_ROOT="${ED}" install
+ use doc && local HTML_DOCS=( doc/. )
+ einstalldocs
}
diff --git a/media-gfx/opencsg/opencsg-1.4.2.ebuild b/media-gfx/opencsg/opencsg-1.4.2.ebuild
deleted file mode 100644
index 9f02e2a9c1d1..000000000000
--- a/media-gfx/opencsg/opencsg-1.4.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-MY_P="OpenCSG-${PV}"
-DESCRIPTION="The Constructive Solid Geometry rendering library"
-HOMEPAGE="http://www.opencsg.org"
-SRC_URI="http://www.opencsg.org/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/glew:0="
-DEPEND="${RDEPEND}
- dev-qt/qtcore:5
-"
-
-S="${WORKDIR}/${MY_P}/src"
-
-PATCHES=(
- "${FILESDIR}/${P}-includepath.patch"
-)
-
-src_prepare() {
- default
-
- # removes duplicated headers
- rm -r ../glew || die "failed to remove bundled glew"
-}
-
-src_configure() {
- eqmake5 src.pro INSTALLDIR="/usr" LIBDIR="$(get_libdir)"
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
-}
diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index 17da9c1797b7..609cb6bfb348 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -4,7 +4,7 @@ AUX openscad-2015.03_p3_fix-boost-1.70.0-build.patch 697 BLAKE2B 093b04177e9222e
AUX openscad-2019.05_fix-boost-1.72.0-build.patch 689 BLAKE2B b8aea0ab3793b3f3202f7d4154c1aaca235de2450321958819531dd9dd70c1e375c28c9004a9fb348d5116815e99e4190efd2443057991b2e97873c80f52cc80 SHA512 20bc2baf50f23e6b5ccce0d8c22eb3a5004198a0c97c8c955b15a681a64102537be35a12a37692418159de6664a36689a4c3b65b3a520d51ab086aa091a1e48c
DIST openscad-2015.03-3.src.tar.gz 13309147 BLAKE2B 77f4e934474882e454dad683d9da6a2c9fe699a84c86ed5ebe1755de037f6930870ffb432dedeef3bea7a76cbc98d0f0d0694e5d0f7b469830370ca3548a650c SHA512 b2cee90563bdf2cb9f7b5a0d637b2266f5fcd62add6147c9326b843a5b0975b8ec900d13a2aa86485fce4a5e7e53a08cf4171a3d1d66355e813d01ca9096faee
DIST openscad-2019.05.tar.gz 14604881 BLAKE2B ed7d6088606fab44284363da73643e556f07c0f0a7a223bdf718dcc36a82158bf23e315724ea520d63a3f1331207df0ea7b0ade817f01dd39b67ca6f36529d56 SHA512 073053f625ffa4fea6ed836396b7ff4b87b26cf7500b06c804983afc0f1dfd3d78bfb81b3fd217c3939b0ec915d85b0c7990773eaf968512a150deaa0399df13
-EBUILD openscad-2015.03_p3-r1.ebuild 1627 BLAKE2B 25102ebeffe72b17181f8706aad5dbc2e53ebedcd367887bf69d042a13f9885d847c2770eaf09c785c6ee2108c978c76b624b06518f676e673a7f9ba38f1b707 SHA512 a6a44733e27fe93a96e059a8b097ba6eb9508dfe8688c97c9676f4ed55d80873c11fcbd0408ffd2998aaf647a2b5f2c0f5f9e73cf28062884322e872ca7acf2a
-EBUILD openscad-2019.05-r1.ebuild 1586 BLAKE2B 7424f651a851407daf4d3ccca76b8fb174a317322dcd098b5e2151a383f6648ee0970b154c0b39a2b77d5b354beafc645e59bc2d76f52ce44d19561f9e99c8f8 SHA512 b829c91e60e8db36b1b170e425c6bca20a8340955d294f95b641ca1b86e1d74476fbdd6f97a23844e7b10a383eea18669f92eb0e258b55252002f3f0468bad9e
-EBUILD openscad-9999.ebuild 1378 BLAKE2B 6cbdc07111b125e2ee482a284c97614a9c84071aae288d53a3f5adac8abfb255e0d4734835f00950106de760eccc84baee799f5d6517fcbd6e57ad8cd8b44f1a SHA512 dda6d1407515217996692655c7d3d8fa26472b30795e5003c58cfb9eea1eec6f32040c3e819a2a392c612e18b5cd32c2a2d49dedee23a34dd59f4ac5e51ff2ad
+EBUILD openscad-2015.03_p3-r2.ebuild 1632 BLAKE2B 6a44bb34413a6019cf4f51266096dc61deb58d1cbc8767405fcc72fcbadff2df6ea2e1b141c2caa697890428fae86afc4a9ed7c7c0e93da09829e51ad8172c0b SHA512 d1c3a4deb951cae887efe2014d0fa3426e08a8f6ff01f41936824b61c128252baf8123cfbe6237729599a521244db99af297618bba8e3539f365831f3b01139a
+EBUILD openscad-2019.05-r2.ebuild 1591 BLAKE2B 37fc3e9291cb9a35fcf581fda93e5eedeca4bba433a0b18df440f17ff0e69bd83f61ac3b728b198436cba7febf5771a9b3b0e80d106a7b00084fb6d175e6caf8 SHA512 6e8c4dde052738920542a7f6e6ac38638ff47205ffdcbf8bd64bf40e1b8976f5048c7a9e7c5d0367c1ac4c05625e0d2e99e7c11ffdae8eebaee452b5ecc9ce1b
+EBUILD openscad-9999.ebuild 1388 BLAKE2B 3104011bd4978eaefc7ec2a4594007c5fa1ace3d1d4a9d531f56edc4d453e4b8866a4ddb4bb1848fd203a6cad4a3bcd750e3b06a08963dd71e33b34dec5a8f93 SHA512 9f7ddb533d6cfac1193e288c468e499ae77c855ca47ff5c456d479998e3a12143308eda15feabdb70b8e28b537d30a357d48dfa9c2445cc47e532ec5bc403995
MISC metadata.xml 1025 BLAKE2B f1d33e8f6f5f045c0993882d461e9bd8457fc33ee5c32b115540abe18e66b8020ae2ba0f6a593b3e7feb3e48c1d85554bb8340ee0606541964770a40dafc76b6 SHA512 951f3c8d8f68fa60d56f2c01014ab757fc4a72a7d1c98518c3d4c80db55878740a8c267b87e734cc29284fe2bd05e0b54a13c0b09eb9fd8f10fb67a051b687be
diff --git a/media-gfx/openscad/openscad-2015.03_p3-r1.ebuild b/media-gfx/openscad/openscad-2015.03_p3-r2.ebuild
index 7ce8b1f70da2..c8c9432ff43a 100644
--- a/media-gfx/openscad/openscad-2015.03_p3-r1.ebuild
+++ b/media-gfx/openscad/openscad-2015.03_p3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -28,7 +28,7 @@ DEPEND="
dev-libs/mpfr:0=
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
- dev-qt/qtgui:5[-gles2]
+ dev-qt/qtgui:5[-gles2-only]
dev-qt/qtopengl:5
media-gfx/opencsg
media-libs/fontconfig:1.0
diff --git a/media-gfx/openscad/openscad-2019.05-r1.ebuild b/media-gfx/openscad/openscad-2019.05-r2.ebuild
index dfdb27dfe668..edf383dda5e4 100644
--- a/media-gfx/openscad/openscad-2019.05-r1.ebuild
+++ b/media-gfx/openscad/openscad-2019.05-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -34,7 +34,7 @@ RDEPEND="
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtdbus:5
- dev-qt/qtgui:5[-gles2]
+ dev-qt/qtgui:5[-gles2-only]
dev-qt/qtmultimedia:5
dev-qt/qtnetwork:5
dev-qt/qtopengl:5
diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
index 3af31a6a7176..6ce960b60bc8 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -26,8 +26,8 @@ DEPEND="
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtdbus:5
- dev-qt/qtgui:5[-gles2]
- dev-qt/qtmultimedia:5[-gles2]
+ dev-qt/qtgui:5[-gles2-only]
+ dev-qt/qtmultimedia:5[-gles2-only]
dev-qt/qtopengl:5
media-gfx/opencsg
media-libs/fontconfig:1.0
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index 7e890192290d..acd790b5ad8c 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -4,6 +4,6 @@ AUX openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch 2990 BLAKE2B d6508
DIST openvdb-4.0.2-patchset-02.tar.xz 12428 BLAKE2B 2684ddf010df975912fcfc8c4f944d9a9ba447b48750140b6c46db31d49297f7495e5c77e9d5b85af0b2e1d0c4987184865642dc95f1fb3e463e85ee5987d203 SHA512 04377d552e218a8eb31c43381ba32263ba206a0870dccda1bcc031863dfdbcc953da7ea89fd420dc1a338fbd6123ac30bac2039c0a2a01c1fa9253a3fdd0b54d
DIST openvdb-4.0.2.tar.gz 1689119 BLAKE2B dbc8d4ab44990440e201327d76bbf9bfe3e8f597505b1d008dedb95dc540277513f465d455079c59820acc5056c9a2edf56235e1097b6c73a1f7dd8c59609c15 SHA512 8e3e12583b81f9b9303b309e839c8321c67b67ff8a0e61bb56c87276bf25c0deff22f5a73c7c5b661b8e5df345bfdabfa6b0aea9bf16fce57d9c53a76751c75d
DIST openvdb-5.2.0.tar.gz 1788969 BLAKE2B d146b78dd7db4936779ca214b1f7957d4868bf76aedb95c9a98e21d25983b750337a63bf4bc9ccb438b683988af7a3d708676dcf7b4662c84e4926e8000ceb68 SHA512 69e21190c27a055e476a319b0c2d961303fa2f3fec30bec93ed44072d01816ef89e5e8f0abfc3a22d1c73742aa31284c664596747b49cd985fea1a751776506e
-EBUILD openvdb-4.0.2-r3.ebuild 2137 BLAKE2B 3d899278e4496b9d1d0d6a7d8d3b708e160409ec10e0a7a1390d9a68ec165cae1f09b0194581fbf4de91fb4093547077a52a6633b64db8661ccc1e8f69d0be38 SHA512 30d53679c8e6e9d553d4a8828ec4a876bc98b69dd248a616c5a821a12c5db56a2ac8f392f9f4dd40b0532cbdcce8871c0c9fc3f3016ae816bd175f54b6469d34
-EBUILD openvdb-5.2.0-r1.ebuild 1872 BLAKE2B c057d4625a41784f401c9426feceee90aa947490a6b643e41eaff70c9c45482d479afc3f219744cc172b48749ea1cf59214155d5ba0b567eebc4f973c919ae46 SHA512 55f6b579fbd4f96b7145d33d9d6ec756093b2054ae109d7e62022a28387d33076b2917020722bc8a143068af7ae19f2835b29c1a5d226f4ea3cb8e7b4fd99130
+EBUILD openvdb-4.0.2-r3.ebuild 2293 BLAKE2B c011e11315446c4ac195e98312125824a99a8017f6191e2e5e318c61304fede08dea92c9edb7f884f0ff92f859bb931ca4fc088a7c37d4480bd4dbe8ed54cdce SHA512 1fe3530d7cfa75e55f5cbdba0ca79e350506f163ef35637e7476a88a2ce8de92e6cad7bff4f6b8cd40c9b711d8c2421a845dbe07205c8d6e6608a0599214dc2d
+EBUILD openvdb-5.2.0-r1.ebuild 2028 BLAKE2B 98aec54c4d96593bc53ef61ba71b85611ac0b93c0e01d7675ec1cd759ab1ed9f8a085b793b26946068ae8a8f28f00bcccc99367041df43360798303263a211cf SHA512 20a909898f3e88d0dc2be8220907478367bf31ff365095ddfad82991f58b8796bc64821fb3385376d64c02c99afeb52e430d91f87cb5fa6f3a886a91aa8661fd
MISC metadata.xml 1033 BLAKE2B 303f49be8253322a0bbb94875f7b9b03e127e9d2ab2eea64fbac1cd51f50d5be749c4c45c9491fbf3f56de7420fdb47913b6ef3c2d12f5ea0545042f68d990d4 SHA512 a81a1cd4684197d1d9455b1398c9ba1592d596d52c8e8fc5c0cc8de0357c1f1df7478fd76e4e42cda09524b0bbf41985e13cf530adb7ca7f1605f086207301a8
diff --git a/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild b/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild
index c683e96e7099..221e31086115 100644
--- a/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild
+++ b/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild
@@ -42,7 +42,14 @@ RDEPEND="
DEPEND="${RDEPEND}
dev-cpp/tbb
virtual/pkgconfig
- doc? ( app-doc/doxygen[latex] )
+ doc? (
+ app-doc/doxygen
+ dev-texlive/texlive-bibtexextra
+ dev-texlive/texlive-fontsextra
+ dev-texlive/texlive-fontutils
+ dev-texlive/texlive-latex
+ dev-texlive/texlive-latexextra
+ )
test? ( dev-util/cppunit )"
PATCHES=(
diff --git a/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild b/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild
index acb7886d4438..2f2eb78d9fcb 100644
--- a/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild
+++ b/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild
@@ -41,7 +41,14 @@ RDEPEND="
DEPEND="${RDEPEND}
dev-cpp/tbb
virtual/pkgconfig
- doc? ( app-doc/doxygen[latex] )
+ doc? (
+ app-doc/doxygen
+ dev-texlive/texlive-bibtexextra
+ dev-texlive/texlive-fontsextra
+ dev-texlive/texlive-fontutils
+ dev-texlive/texlive-latex
+ dev-texlive/texlive-latexextra
+ )
test? ( dev-util/cppunit )"
PATCHES=( "${FILESDIR}/${P}-use-gnuinstalldirs.patch"
diff --git a/media-gfx/pngquant/Manifest b/media-gfx/pngquant/Manifest
index e0e14f9e53a4..a1727f61e41f 100644
--- a/media-gfx/pngquant/Manifest
+++ b/media-gfx/pngquant/Manifest
@@ -1,4 +1,6 @@
AUX pngquant-2.12.2-respect-CFLAGS.patch 449 BLAKE2B fb3679a05e024a276b5ae1070f90d4c59584a2b9dac062febb7bdeb1efbbd1cb4f39f8fd1aa94f81ac4318bd0413bdde44f75d418f69b916a70883220d9ef031 SHA512 68c2bf917d60da653abff4fc20c44a9f692213aed87a220a3ffb03ec308107eda7be1a6e135393658ef54d2d63bb0675f5e2a95bdf4b02628fcf5d367c0ce9ef
DIST pngquant-2.12.3-src.tar.gz 143572 BLAKE2B 6f4cc9f36c9148f36734d9afa3765e206c09e833064cff5d98494d0d71610e857d7c605bc5673eb9fd5b38029ade60c9c1ffc18e745a3dfe5dbde6d39a81d0c7 SHA512 cf39f56750a49b2818fb86b168845e54f3797b664c3f49535ee93a3dc899299192a692039396ffcddc5988d040a778006c5f701f8bcd9f5c73583a47b711b01c
+DIST pngquant-2.12.6.tar.gz 69074 BLAKE2B 3573d54d94b0085de9ffd4dd34a8fd46c49a1e02d0a6419271c17bc7ac7ab6c05d811336a3a8a8ab21d4dea774c93ee1baae141b42c255838fb1eef9cdb1a871 SHA512 8ffff346df67edf1000c71b6d26371826bc4d236b3f57ef1ec73b3b61668cff9c3ca7d541417c39bc6c89e00176c91eb28867b7a91945ac84292ca0ac54984e9
EBUILD pngquant-2.12.3.ebuild 1169 BLAKE2B 56452f5fa0d76b47151583ef5c4684781eeee2ad12736845790af6ac1a1bb06516c692156a54aa08bcafe5d9df3f5175e3be34e9564e79970ca43cb65428275f SHA512 648727074119405019a00eb3f252ff86e0157874821f3fb9e6025183937cb4639a8b15c19974ee31bb27313cf791a45c8569490e885f0a92b88b1b2d62eada44
+EBUILD pngquant-2.12.6.ebuild 1242 BLAKE2B d5f3ffc0509b69d158e8e737923cc0de6f41f7bb532834da67459fe76bc80b41eaa47779f7c02b73e714a848460f8746e3ab389ee550a5abe974daefbbaedf89 SHA512 6701e05ef462dcd1b3dd375111c727db95a53e2309462afb81f193266b85fbc8bc77cf9f502d49e5146fb10fee369a2454a272157fd05a69f12a4033cd49fca7
MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-gfx/pngquant/pngquant-2.12.6.ebuild b/media-gfx/pngquant/pngquant-2.12.6.ebuild
new file mode 100644
index 000000000000..aa316daa35f6
--- /dev/null
+++ b/media-gfx/pngquant/pngquant-2.12.6.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="command-line utility and library for lossy compression of PNG images"
+HOMEPAGE="https://pngquant.org/ https://github.com/kornelski/pngquant"
+SRC_URI="https://github.com/kornelski/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 HPND rwpng"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug lcms openmp cpu_flags_x86_sse2"
+
+RDEPEND="media-libs/libpng:0=
+ media-gfx/libimagequant:=
+ sys-libs/zlib:=
+ lcms? ( media-libs/lcms:2 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.12.2-respect-CFLAGS.patch )
+
+src_prepare() {
+ default
+
+ # avoid silent fallback to bundled lib
+ rm -rv lib || die
+}
+
+src_configure() {
+ tc-export AR CC
+ # Hand rolled configure script, so not all flags are supported.
+ ./configure \
+ --prefix="${EPREFIX}/usr" \
+ --with-libimagequant \
+ $(use debug && echo --enable-debug) \
+ $(use_enable cpu_flags_x86_sse2 sse) \
+ $(use openmp && tc-has-openmp && echo --with-openmp) \
+ $(use_with lcms lcms2) \
+ CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ dobin ${PN}
+ doman ${PN}.1
+ dodoc CHANGELOG README.md
+}
diff --git a/media-gfx/potrace/Manifest b/media-gfx/potrace/Manifest
index 98fed352d3bd..b6912b94f762 100644
--- a/media-gfx/potrace/Manifest
+++ b/media-gfx/potrace/Manifest
@@ -1,5 +1,5 @@
DIST potrace-1.15.tar.gz 650840 BLAKE2B 1a2074ff0ff958e1c9cbcd35a6267ef7f4bdfa5ba9b511413fa2c5db16a7263ed27291a0bf7c76feb25abd59db099e1096b736eab28a6397accfce88f42fdeff SHA512 c9a8edd4f3339da587b9b32e12c83c8f7b993c7c23f551fa267545d9411679bc024924e23596ed1c83985693fc894b65dfa9f860275de395d9e0a88da37a4f02
DIST potrace-1.16.tar.gz 657314 BLAKE2B ee6b04f355d593dd1ebcc4833b244e25eaaa69c91f90987d530a4e5a454668dff6ecfb7a5d8270ebbd9e7c177fd447d1b3fe2a343fc4b9413dd3f507c0c6e417 SHA512 10d85ed3fada80951223c65e923b5e6ee3e76e071575971d5b09b996b477ec5ff2403e0337c44963c6b441cc3ba6c4f7009541124a25c16b7721fdebd1f774b9
-EBUILD potrace-1.15.ebuild 800 BLAKE2B d1d24d18391bbad2f36cd81a539936b604fe258318e545855f6caf7f931af945a1ba14dbd4dfd29675cf5805f7aa2ee51c276749c09a344692d34ec2b6c1b059 SHA512 7219c25ee89e8b732d9b91a599b48d6487aa006b4e1bf11fc5a54db27790200b5788ba2810e19944ddefff9ae436e9ce5b9378263f682df3ed7acae4c04f11f7
-EBUILD potrace-1.16.ebuild 810 BLAKE2B 2dc8008fe2cd0b65e308e819b7ff04b9c9dd743b7e7e889f6fe99425da94206b4a4048edb47ee780e1a7b865c15f65761fde93b60336678888ce2349c6da0539 SHA512 00779894c3f2178015cdbc51491a016fea978750f2afa02bb41cc0115982129332e97523089ff40323972a3a45ab3f092e76a510678f3c61283adf43c03d964b
+EBUILD potrace-1.15.ebuild 797 BLAKE2B e14884895d0ffc7dbc98a0b726d515e82e0778775f886ecd21bf1cc6648d8bd6c17b6c3a99c0e9531a447117e1bfe26a77043e765c001e2b6377d2b0ca873e28 SHA512 696d1e86adb2af816cab9a0a1a43ecb5da04a4617ee6e826db3a4b9925dbc115888988b23c7b6c99c7b0700b1e98d54e8f8cfb0af6b55951af49c02613b7e508
+EBUILD potrace-1.16.ebuild 806 BLAKE2B 4ebc44c22814b01d2e0bab270554e51ae362c60de11f1b74657df38f84e712aae8d633fa0884165cf86919a2983501db3836b165bcb16d0ad20f2dd88ac63671 SHA512 f471c5488ab1aed1093150b0642fbca2b9bf2d912a90459fac6938ed1e586d469aae487f12aa1b8c9c00be92241232b0d2b061c2f030f27ea861fb21e6260e18
MISC metadata.xml 534 BLAKE2B 04a21e1af300190548959fc595c0f0ca4918bcc949bb6f5ac6747f79806b3c2f3e57ecf25076e8d8a876ff1ee45b8b816e89c957f8ca4e05292ef390c5de32e0 SHA512 00f7a8a90caa7e7d9920929733f084d41baf72c45dc998255c54964eb50f6ec70d6af8666463fdefca27f95156834f1c4e9676f115bbb86538e979967a73b6c3
diff --git a/media-gfx/potrace/potrace-1.15.ebuild b/media-gfx/potrace/potrace-1.15.ebuild
index 45c8a269b262..cb607c612110 100644
--- a/media-gfx/potrace/potrace-1.15.ebuild
+++ b/media-gfx/potrace/potrace-1.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://potrace.sourceforge.net/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="metric static-libs"
RDEPEND="sys-libs/zlib"
diff --git a/media-gfx/potrace/potrace-1.16.ebuild b/media-gfx/potrace/potrace-1.16.ebuild
index ac56cfcdbd3e..03f6e9cd2c69 100644
--- a/media-gfx/potrace/potrace-1.16.ebuild
+++ b/media-gfx/potrace/potrace-1.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://potrace.sourceforge.net/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="metric static-libs"
RDEPEND="sys-libs/zlib:="
diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest
index d120e325699c..814cad2a6f07 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -6,6 +6,6 @@ AUX povray-3.7.0.0-user-conf.patch 1491 BLAKE2B ee99672c70a5d7e12048acbfc50a3ef4
AUX povray-3.7.0_rc6-darwin-defaults.patch 920 BLAKE2B 9cffcda18626cfdbea9a6b00ae99ee300d6b29a79e22229e35d116070b4a1ac1fbb4869242a043155a4fa189f701e6bc318cd3ba8fbc743d497db26c763926c8 SHA512 17ae635430f0d57157c9915ce5b25a88afcb34f6dd9552b27a42b32d638fdfbcb8b4e41ec89b52048db9d054812535b7b41f328ffe4554e719e4a3de21cbfdee
DIST povray-3.7.0.0.tar.gz 38191521 BLAKE2B 5d936bdcdf9910ede2247cfa5e3881211da00762ac4bc08225dc6b53addc9e09546de9493e642b5d41228d81a50a4bcfbb5e606eb8bd9a224bb1afc5fc82db6e SHA512 82e3dbcd58b7ae921fe3b953815ca4dbbfb22eda434554baee4accabd1455b18cb511061f1cf9cf93128fab0a042df374fe2f68186d78c19853a465bd4bcbe10
DIST povray-3.7.0.0_p20160914-fix-c++14.patch.bz2 12876 BLAKE2B b1c458764f04a57420a4562e9faacae4ae955c3d9ce4343ffd49176bb575f63830fcd58d0777dea22b975df118aa14e2bdd91509758d33d659daa3fbbaba5880 SHA512 3329da12a822762559445e208a746ff208c39f7b63e27ba84a390074bb52a105c9a2f66180e58c5157795bb16346e11b5b05efaf077ee0d8246179975a692b04
-EBUILD povray-3.7.0.0-r1.ebuild 4601 BLAKE2B de10f72d1f0ab7abe109407939fc6bab89ef5791e5996c7be0c0122a68cace73439e47902b37f9697d1fbad349f0b8ce123b78d652e7111144d71a10842c34e6 SHA512 fd8db2ee56b12192107df4d91bc115857a9088b8d4141956b112c3edba067c07542a2236892b99ba4ee5fc31963dccb801bc0bfc116ba97092f4f19146df59b0
-EBUILD povray-3.7.0.0.ebuild 4380 BLAKE2B ef8e6a8341cf78d0f6943f2d17405bca0263df44e496c537765bcbfabbae96ba71870cb98468560dea329f5e3276713fcd17522b8694951cbc5b44aaacf744e4 SHA512 12c71437feeb850e325990e805d6a806897e44607e73ec378ee3d29cb36b2e95e19d6343615b339b84d639a959888859e8c3ccc61339d63d181531191eb055f2
+EBUILD povray-3.7.0.0-r1.ebuild 4602 BLAKE2B b6bdb77e56d18f7ae3bbae4558972d14e3a8dbe428179752af7c94f37381cf356f145f4d729673c38768114225ae3f644b3db25b56866ba417474e8489a4eea4 SHA512 cfc4eaa998fed0ac3c43876a55f2a1202a5be20b07d78020dbe995ab143afe70c07ac6e251af900fe58877c54b23f43e96691e4b7e40c05d2be84e262c1e4522
+EBUILD povray-3.7.0.0.ebuild 4381 BLAKE2B 95e53edd6cbe88e82da61d2e803e189735e88d8574036f87abfd73474c67105b85de9589b7e80a5f180fecb983cb619598c8b929b3a17c9ea51c134573e332c2 SHA512 7b94e77d2de03a070c29593333330dde32938fc01fac4b4aacc78a0a23ac4cf9def6492ace6a00f85be1aa73345b9858c16ac073bb97d5b1d0913abde347bb03
MISC metadata.xml 504 BLAKE2B f0b8ba895e8949a452dc4ddac0f3e78513b3c91107131d288e9e4ea7d1dd406622ac8a3ddeacd0b3df039ce95ab6f3dd339b80bf91f48ea99ab6d5c74a6cb4d8 SHA512 e2146892acd26bd3fc03fe1733f67073a1db1106f568ac886548b7c3e4fef508d1f3a619d74b8573696f007ae764d26e1f8556c3dbb03b9434b71258f0bcbb00
diff --git a/media-gfx/povray/povray-3.7.0.0-r1.ebuild b/media-gfx/povray/povray-3.7.0.0-r1.ebuild
index 31b33d771ffd..366bbbf7809e 100644
--- a/media-gfx/povray/povray-3.7.0.0-r1.ebuild
+++ b/media-gfx/povray/povray-3.7.0.0-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/POV-Ray/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="AGPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="debug +io-restrictions openexr static-libs tiff X"
DEPEND="
diff --git a/media-gfx/povray/povray-3.7.0.0.ebuild b/media-gfx/povray/povray-3.7.0.0.ebuild
index bf7c88f5c8a0..c4dd57d5adc9 100644
--- a/media-gfx/povray/povray-3.7.0.0.ebuild
+++ b/media-gfx/povray/povray-3.7.0.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/POV-Ray/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="AGPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="debug +io-restrictions mkl openexr static-libs tiff X"
DEPEND="
diff --git a/media-gfx/pstoedit/Manifest b/media-gfx/pstoedit/Manifest
index 888419f72fc0..8b3be10f2b7b 100644
--- a/media-gfx/pstoedit/Manifest
+++ b/media-gfx/pstoedit/Manifest
@@ -1,5 +1,5 @@
AUX pstoedit-3.60-libdl.patch 428 BLAKE2B 8ed39e1a13da74ccecaa2aeec57447fc75b682c9ea5a8fe6586052fd766bc9ab23cb76bdc56bb613cb43672f6d10a05cfaa8bc860865d2586673ab4a9c8642aa SHA512 dc29caf4b1bf1e6ce7cc73fd5ae1682f0aba8a798f632d29cca450bf3883afe54142ea06fbe6d9aa07f2580450780afe1c671cb1c37f1dd800582b2036797f73
AUX pstoedit-3.70-pkgconfig.patch 627 BLAKE2B 00412e11239e49f12babc35f2225c7ac2a25ce62e59d8b3088c0d7284b867c8919dc70c61bc60cea06e75dee84698eaf223861ad8db09cd36dfdf5ee813aee9c SHA512 8edfc9f0c0db6371405ff16641294c8aebb7dc09e9bc8b9114c7506f4fd494f0361b90abceddad68c351baa2d2917b6212056ed69c0a6dde0d914a2c801888ec
DIST pstoedit-3.70.tar.gz 1013949 BLAKE2B ec459dc56851d942076adf4352ef974188b0b8273a6f9150c8767c1d63c3c9b6d993ea8c0b1a0b59663b31652eb7a4b8697e4c38c23d5aa0572d554120a5e900 SHA512 63668ea039fdf988ba007bafb8dc1f23f06d4eb430a92b97fb93c71b819f63e2708b99476ec9b096598db2ddd30d29a69101f078e7d4fdfec314677f50293cf9
-EBUILD pstoedit-3.70-r1.ebuild 1296 BLAKE2B a7f651a8c88f9525be5902d9a68e66c0526e94108344276eaedfb85e2e5e832d1fa996b9caf468d3f8f9f33924354240ca7d64c754956459a93aa73beb547b04 SHA512 68467c26bb06438857c80d8817f7789b2b583e806918ef3829c1608671d2271103c5d48697de8e03d0cee2fc165af7312817fc31a8e447be5cfb71fb06274795
+EBUILD pstoedit-3.70-r1.ebuild 1297 BLAKE2B 5d2d967aadb67423e7fc31d2cf79c3b5f8e19064a64e6c5166a75c740b284707125a5d032212f486a873c9b989c44a0a8930d44b34f8d2836d9ee729cf358a57 SHA512 a225952f1c688def500748be8c6ef949794b6c34055d5014e39f405dc398e92c63e31b4f4e400c43a9fdef02ee3ba0a8a03affaff64cf63c045133219ab18a18
MISC metadata.xml 633 BLAKE2B 3a142022d38aaf0e5bd5d6df58b8a6e2f94589992eba8a48d875138af60bb44d8893ed91a7dcb169246ff2d2405940c406d5d37f84bfc9c621b8771b96678f05 SHA512 6d62633c23d2b45c5bdf75e8e09e3f58def09a2512e540699857809ea79ddc41c823cc382a9a412b6dc061e02c3b5574c8addc7bebd6e7bb10caa2c2408162a6
diff --git a/media-gfx/pstoedit/pstoedit-3.70-r1.ebuild b/media-gfx/pstoedit/pstoedit-3.70-r1.ebuild
index 7fff681c0e9c..425a7404d333 100644
--- a/media-gfx/pstoedit/pstoedit-3.70-r1.ebuild
+++ b/media-gfx/pstoedit/pstoedit-3.70-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE="emf imagemagick plotutils pptx static-libs"
RDEPEND="
diff --git a/media-gfx/qimgv/Manifest b/media-gfx/qimgv/Manifest
index 04add1c48e47..548c02a59502 100644
--- a/media-gfx/qimgv/Manifest
+++ b/media-gfx/qimgv/Manifest
@@ -1,6 +1,4 @@
-DIST qimgv-0.8.5.tar.gz 242650 BLAKE2B 25ac2854b0c35e2288b0e770559bac5ac0152df1e73b025fe99609e3f7126ad0c5342a6f87dd34b0847b22031ca77db7b98b1ef8b9c278fcbebb395454d426a4 SHA512 f4c3df7db433eca04ed0827039a02fcbb6e0d5b2f696010351dc6238c39b7a08784780ad8d56f3701d13506dd6c64671ce361817928d7fb2bb25b88c3f3d32ce
DIST qimgv-0.8.8.tar.gz 460682 BLAKE2B fb701fbb336bf8e51751f677f7fddfd7eb0e1b770697ee510c0008a3ebddb0a3948d5a3f6f57a676dfa3117ca03b908cc3f88bcaec16a07000108279bd5fed80 SHA512 376f79eba2a625eb0f622494ce7ba98e1182b43cc6d7e268382c794a74d2772bd17083ac9ae45fcafc5eeb0665ef06ab34bdbeee8401a35bd0652744c576e131
-EBUILD qimgv-0.8.5.ebuild 1124 BLAKE2B 77eeeeba99268152463629bc616a123f4bf178c91652baf69fdd58dfdfd68c7a7f81d4afac2b70b81026196352d417616d0dd9dea9eac6f39214bffb376bc893 SHA512 524ef964adc441ec243405b932deb0e37a41a479a0565ac83f4d15dd05ea48fa92d8d041a6617027c5c1f2a7156aa5bbd578380db552602ed198314af13bc4bc
EBUILD qimgv-0.8.8.ebuild 1126 BLAKE2B ac635b6d46d4d63c8afb846fc248ef15c29e607cc2a5a85d7236cf5e4a186a4a2ac610e60fa3dd7fd108f9d6f7de8622b72d3a0d40e315704ef7e696bc3416b8 SHA512 7ba8910b8dc806e176596f2f2ab19ab24b066d94661ad2b466c6cb3d65bc20d982335172eb7ff0642dec26d065f4bd0399c973d3740c8bbb19c272d6289106c0
EBUILD qimgv-9999.ebuild 696 BLAKE2B 4341560b05ddf294b877cd659b3647e5409e55bb39b34161106bec650c451ae46a2398a0a0d78580b1db0f27582b409162e1c199023891df764d77c123809586 SHA512 cb1d5e0eaff96f45f4cb63d50f75033a035ea0687fc801f921b0ca0c63a6812331c3efa17fd957fd07564f8d2a340530bfd4114851dab827b94830dfd09f6670
MISC metadata.xml 453 BLAKE2B ca83aa2e239dbd9bfca29a20d99b8d352392db1f17fd77497d6eb6266e19e300a30c5544508a479ee6832a6ef1211ff5df08787b726839e5ad39fdd21f8ab5d7 SHA512 ca30cade161d874f67a0aa2fdc6084bce465920bbbca9cde599f6b879dfd6801426d6603e02bb9f34f1ac1f00acba896279f231b49bcc9cd3f0355ff4bb310d9
diff --git a/media-gfx/qimgv/qimgv-0.8.5.ebuild b/media-gfx/qimgv/qimgv-0.8.5.ebuild
deleted file mode 100644
index 71f3879d1181..000000000000
--- a/media-gfx/qimgv/qimgv-0.8.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="A cross-platform image viewer with webm support, written in qt5"
-HOMEPAGE="https://github.com/easymodo/qimgv"
-SRC_URI="https://github.com/easymodo/qimgv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="exif kde video"
-
-BDEPEND="
- virtual/pkgconfig
-"
-DEPEND="
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- exif? ( media-gfx/exiv2 )
- kde? ( kde-frameworks/kwindowsystem:5 )
- video? ( media-video/mpv[libmpv] )
-"
-RDEPEND="
- ${DEPEND}
-"
-
-src_prepare() {
- cmake_src_prepare
- # respect make.conf CXXFLAGS
- sed -i -e '/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -lstdc++fs -O3")/d' CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DEXIV2=$(usex exif)
- -DKDE_SUPPORT=$(usex kde)
- -DVIDEO_SUPPORT=$(usex video)
- )
- cmake_src_configure
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/media-gfx/qrencode/Manifest b/media-gfx/qrencode/Manifest
index f09c69f3686a..7c38c1f8ce6e 100644
--- a/media-gfx/qrencode/Manifest
+++ b/media-gfx/qrencode/Manifest
@@ -1,3 +1,3 @@
DIST qrencode-4.0.2.tar.bz2 430309 BLAKE2B 1f68d2a921ba60df3a6c7381d7886b27a2876f90771d78c12d5d0fed2d6a4edb4d7da5985e2b244406a0cf3434b351fbec8b12c5944c365078ef2b227edb0acd SHA512 2429c7938e32eacbaf327c029c7745ba33259f879661a8b6470cc617c780daf5bd1d5689599151df62e84badd2568eccab6c12f157331e512ab24a3899e0f002
-EBUILD qrencode-4.0.2.ebuild 790 BLAKE2B 3124940b8adbcc3984fddd40575d11e5bfd85807ec5adc3e57b4e94ebf6994de9d4a5400d42027ebe9899d4f0e9f42d7979103871d78d1180b0dc79bc483f12c SHA512 5b9013864af0a28ab7ef3894518602d777ef8e996de0698e5f1d1cb7d8ebf1e5b8999c972c815f9ce751e9bd52d138de33213426fb73691f9372dc190d34b4cb
+EBUILD qrencode-4.0.2.ebuild 791 BLAKE2B 59ae47be368e05d95bcc77a0a18165b5d1c961aa181aea6c3c1882c3d6969a99cce6d6e31272a45bbeb478e85d3f732e21d5b9fb7f91e87306fc0d94b3feb15b SHA512 7698b6d3d99e70e37abb1a43bfd643019b411343a578bed7e1905e19db40263158710968e3e9833da20f45412dbce0fcb5f4b3d4c9b1179ce9b20b4356699fee
MISC metadata.xml 370 BLAKE2B af379243b15cc55c2e2c14bd20ec8b9bb41d4fbb6a87938aae5cbc39e17c78ac45b322d946eadec59fc48c13354fd9dfdffea8c2572301d8d4cb86f162d49bdc SHA512 f5987a8aab3b861bbe4961c69d0c72b07826c43320fd383075036ad63a070204c6ed41297b2490b4a14224f5c4269c37c40e5abc9bce4d1c5857e68e98d6428c
diff --git a/media-gfx/qrencode/qrencode-4.0.2.ebuild b/media-gfx/qrencode/qrencode-4.0.2.ebuild
index 3a6dc60172bb..a17874b37ded 100644
--- a/media-gfx/qrencode/qrencode-4.0.2.ebuild
+++ b/media-gfx/qrencode/qrencode-4.0.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://fukuchi.org/works/${PN}/${P}.tar.bz2"
LICENSE="LGPL-2"
SLOT="0/4"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/media-gfx/raw-thumbnailer/Manifest b/media-gfx/raw-thumbnailer/Manifest
index 3fd0d985b6e2..634715e67161 100644
--- a/media-gfx/raw-thumbnailer/Manifest
+++ b/media-gfx/raw-thumbnailer/Manifest
@@ -1,4 +1,4 @@
AUX raw-thumbnailer-0.2.1-libopenraw.patch 897 BLAKE2B 26065ada735e744b0bac662110f8f6a8d70f808721452adab0c7b4cf6927152ab255e424b2978147895e36833cf525893d3f601a09871e712a2dcd348d05e1f0 SHA512 c9b582a6f7d8ccd5958da96d4773105e17b9047b1081d5a4e2a48384831f83e79ef32b9fafd3cd2436472ac86554ffa2232b1d039f06d9890425c5b2d6da185d
DIST raw-thumbnailer-0.2.1.tar.gz 89468 BLAKE2B 8041cfee56f9be900c6f7bfa6dfb9b21b482ee8eb7dacb83ed37603c32edf6e1dee122de3e98b06d158b6725a1900c73c7e1aee1b8e6a53545428ff7aca47b53 SHA512 cc3c107b060add00b4af811bb548b597493ff0d54d863c530d183970ac8bdd4f6b9f4c25cf978e1d2bf80b11424dbbfb20e73c6dd1abeff3a15a08843bcd41e1
-EBUILD raw-thumbnailer-0.2.1-r1.ebuild 663 BLAKE2B 44f64c0fd57ef4719e6b78e565fe17d98dc5af592a186aca3378654bbbf889a9e81b5e344913b5b68c9a558d0844ac1c4f508107d2b695f9f2b6bf806016f9f8 SHA512 d4b42cd43e37ea53bdb4aeb6dc1e87afc79f087dcc1dfa008698f8c24cd37a50d627c6de5e27fd0c95dee018b149c6443a562abb125056763673cac510fe1c3a
+EBUILD raw-thumbnailer-0.2.1-r1.ebuild 664 BLAKE2B 9d0a4ad1cb6deb3f44a18e8440722944dc7b7bbe2c84c7b0f9142223a216ee16d39a39640477a2b932a0b80e81ec9ec934f57e62d00529bd2d2a17709f778753 SHA512 44db2f99c6535e3f8277e15ec7707931d18a5e5b79ee3ea4cf25ba8c7e9241dc79700276a363f2f9be0c78c9c85549fc241e58e80e4437c55b4264a030055843
MISC metadata.xml 407 BLAKE2B 713244da2a69bfc59fb7a82373bba128e0d08fe7c12645245fb01df403e3affc792fc26ca28967dcc6c499145e90f9a34eb7c984164ccf4396a8924c4c153312 SHA512 7383547238ca395a6cffde72366521dd7e3e04218f8840f19f093cfa61d0788d10138d39250702085a5669f715aaf3d0da5e357829a0e0fd44a70d20c14ed46a
diff --git a/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild b/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild
index f0ebcddfdce8..5cfeb0d302e5 100644
--- a/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild
+++ b/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
IUSE=""
RDEPEND=">=media-libs/libopenraw-0.1:=[gtk]
diff --git a/media-gfx/sam2p/Manifest b/media-gfx/sam2p/Manifest
index c1fe1a194935..5773724e0441 100644
--- a/media-gfx/sam2p/Manifest
+++ b/media-gfx/sam2p/Manifest
@@ -1,5 +1,5 @@
AUX sam2p-0.49.3-build-fixes.patch 6108 BLAKE2B 85c608628a932c698a5ad7f44394c85138f850f3e4c2807101eab1fefee5721bd76cd3edfebf71d57221b94709e2aa1c09c415821f3128d3ee5f71c37640365d SHA512 70e14339b6fb8f587adc4692982601db0b1d0343a737cf08931101589eaecc419e8f571bd138a6e585a7a9a7a9f2e8f3ebf3ccf4c315d805be9f625a917a56c3
AUX sam2p-0.49.3-perl526.patch 648 BLAKE2B 0fa1d54116325cfbf1720c8465ddf5d8bc6a3a11843207e075f63ffae803e128e8c961ff9ca33f961f169f1af2f1419bb5edddb139c87a7193da064aab8cc6da SHA512 22628eadcf9399ba89a652ad41ac55e98fdb596df029e466a4bbc609131e914e456451362e8639c98dbf59c7e288296b4940fa2e92d8ce671715103e9b622f0d
DIST sam2p-0.49.3.tar.gz 2184864 BLAKE2B 47d3ce6384c344f66e564ea9f70e89e311540c1bbaf640a70cec2830347b3767aa79d525d25c12cfc2aecc61aca676239b99b345fc7e6bb2edfac7c60bd8d674 SHA512 9e9c91a2cd692e49bf73e7c197a0fcbe7df96c685636d1d00456eb8b4b847de3f4848d9bb3d9246340c479c62900ddd4e0a248257aa5e6ec6e16683c5dad54f8
-EBUILD sam2p-0.49.3.ebuild 980 BLAKE2B 7b329d3a5cf0c0a37061229b3265fa2793f32da96c234ecabe4f033744eed97b29c13277b5ead3863ecd282ab3f92b96da49f72826958d94434fd51f25a3c11f SHA512 cc588d3967d9a372177c904938f35679f9b586fc0a5084d5d264c82c8e393eec17b3f310fa149b064987345c6cfa5840e4feec0571bb3bd3e2117acfb316c903
+EBUILD sam2p-0.49.3.ebuild 977 BLAKE2B f271f97481d19a1bc58930007ea2674d8237435b3a1ae0977a2a1f784e4d82dbe038982bebb1a458c074180ad8a96da3b0d97e5905f31d8d91256dc1c4efa988 SHA512 274eea35289dc9a180dc0b962e26568e8aeb522edbc6917265cdbd500448aaead014fb7f00bca1d0edbf5d2ba8581e56f1e8c0e4c8c330c30d74fa31ada257e9
MISC metadata.xml 373 BLAKE2B a0a62fca7fbcd916d83a6d7fa8f020c333b529ed06492cd8f52a8e04d228714bd53d1283e0b43f5a0c399aafdaf99b5caa5534a0ba54e1bff4958b4f28e899f7 SHA512 2bac0bb931232d7b994f24551d0fedccfcaf69932e4900264857e9ba09a9c32495ab743c1fe930e63adca3b7bc11efdea526982e6e27869033bc17731fa5c7fa
diff --git a/media-gfx/sam2p/sam2p-0.49.3.ebuild b/media-gfx/sam2p/sam2p-0.49.3.ebuild
index 6559080f200a..aab339fb4890 100644
--- a/media-gfx/sam2p/sam2p-0.49.3.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pts/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
IUSE="examples gif"
DEPEND="dev-lang/perl"
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 31fe249f42ee..732394b3fa9a 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -10,5 +10,5 @@ AUX saned.initd 294 BLAKE2B 571bd4032b2330c627a31459a18baf2044852ec1b40f0216bd5b
AUX saned.socket 132 BLAKE2B 5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3cecdae79111fb1db1cfe3b4933eca15af5f985fc6b89e4d9af3844b6e9cfd542828b6b9e57ed9 SHA512 a23ceeeb02bd9e214702003a3165886858ecbdd93df89cd37ad5f00581745454548ccda0ab656f2dc0acbf2896a8781568c786797e64a07014be003d6140a093
AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71faad18edaf71b920584366ac988d354f45bc07607ea64a97ea480fe152ac9a1cd896df99ff457cbf7 SHA512 891c751261107676f8159f403e0f4d4254099b709b9ba0ac9f2af97a9ed30f677411ad6bc316c2e6e673c616ba988253479d5e30c9617e3ae279beb79f70e965
DIST sane-backends-1.0.27.tar.gz 6430188 BLAKE2B 90f910311e31a436eaa0ca0fedd998aac3331f89a346f31613776ebc860a10cc37055fd15db8de8d743498914ea0c16e4153dbaa101380eb6e36857d730c3456 SHA512 c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5
-EBUILD sane-backends-1.0.27-r3.ebuild 8131 BLAKE2B ae8d38b48e51b64dc19df47a7fe9d1f1af59e19f53dd313a478238202a0df5f019d3b07df2fe59b093ebf255c436ca620473f0ce33d3f7ea97d16f8a4027566f SHA512 27e62801c83dc2d48abc4b228a1de021950ae4f9df7facf882f80d2246fa8996521382666cd1845f89a437839f80176146564fe37724ea2ce1423f601c4dd672
+EBUILD sane-backends-1.0.27-r3.ebuild 8128 BLAKE2B 7c6fbc94b1ccb9ccb4c6a8bb861552276422ebcf5638728794032b459cfb662f8dc20c52b4f484ad9a7eb06fba0b00e15cbfdbaa008bce7ada23008feee05e8d SHA512 23968aee0b01d5d87e57b834ecfaa9ca709a63cdfc4c62f367a484868188ddeae3f88f6a325cd33bb2f0a2f9ee3a35fbdcc8c9e2748a2505095786a1be53ae24
MISC metadata.xml 266 BLAKE2B c76ad15982ba5b341a41155c75a5fda95a99ef658ed972c452bfb7b0968aafe33f83cc5bd0f2effb1c2b4f9721a8f61987f2fb7906855b3869e7787226f2b385 SHA512 67d43b02a8c1aab418ca79b30d88af0e78f9df9b95c93887cfed5976290e714409e7dc400f09170d7e7844a411aa3e3202f49f31f39b7f580a8c0b6f3d4db659
diff --git a/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild b/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
index 149f3fdc347d..c75226331a14 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
@@ -122,7 +122,7 @@ SRC_URI="https://alioth.debian.org/frs/download.php/file/${FRS_ID}/${P}.tar.gz"
LICENSE="GPL-2 public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="
sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
diff --git a/media-gfx/scrot/Manifest b/media-gfx/scrot/Manifest
index ada8d37d529f..efc5e58411b6 100644
--- a/media-gfx/scrot/Manifest
+++ b/media-gfx/scrot/Manifest
@@ -3,7 +3,7 @@ AUX scrot.bash-completion 1063 BLAKE2B ab03add49bb68db845d1cb599e62dfd4070a8110b
DIST scrot-1.2.tar.gz 36839 BLAKE2B 26ca05fb3c8fa9069ad87bdd5cc93791994e44e2f5cd7a4b729a6c9e3035c349049500b9627fd31532c280465f77f839370d095f1b0f2ccc10649b3e6fa01edb SHA512 b89e7a94e6317fdb7bd260190c6d68a2dfefc08691b4574337afdfff84f55b8b9c955a6ac60642ae9749c1deaa16bee7b855fbd15833a95f602536693daf8c37
DIST scrot_0.8-13.debian.tar.gz 7943 BLAKE2B 6c58c76f3a8dcf61a8ca4c31f5845cb27b4d0ed2bf9619cc8ea5824b5e42c66ee5163c7f4e76308763947b933003dbd3df6e641b0596ed342993343fd5418a75 SHA512 3f6d0a8e592088af38a3d90394b6b7246430479f5b0c8451af5eae383725d1896dc4bbf595495f9f2b546f00ef38780123c4ee0e3f06971c55a6ac2dfa5b7d53
DIST scrot_0.8.orig.tar.gz 74324 BLAKE2B 56facc81c29f101279ffc6d5d323a0cecd32b1ff6d1d4bb2052a90703353a9ad5b6ab46c8840ed20834f976badab4258fbb0f031645d9689eef1b838ebd4b1a0 SHA512 cba8f589e45758ddbfe4e276399a1ecb0dbe29569be5d85d97733e7f64de2911bd2d03e62700ad0c718a1fc886c2e3def9dee1de5cac884f9e65e772cebe838c
-EBUILD scrot-0.8_p13-r1.ebuild 979 BLAKE2B b23b16d0e7bd90eecbc834b454fef4906395f20dbd02f1ed34f47e0ad4d080f82e7efe581d11f48982b04e0fc31c4b221b0a7d2a265fac656d7446eea0f399d7 SHA512 dcfe367a3879392cfeb117640beebf935e707a643fed27a5caccbb808f2850016c7a416f8b122bae8c9b8817906a6ee74cebc2aaef9c7a428a79c39fafc6e6b7
-EBUILD scrot-1.2.ebuild 924 BLAKE2B a30af374991a9b4156459994848b73b4aff855fe5695c19178bc7ac9fabbe354d70a222759bb2a2fe3fb7642904e0ac4168c66c51cc9c31433a35587b6a6ad5b SHA512 22bf5c2003ec70b2d093e4835a1d512573497011a8dcf6d48182a855a97c942fcb2c8413e872d98905f8df5232214b93bc3bf5e7d3a3b249cea019886d9464b8
+EBUILD scrot-0.8_p13-r1.ebuild 975 BLAKE2B 4f0920e23cada110c426fcd1ef874379f8ae3d9ed272dc5fd8a8cc4ffa0253066ee1f26428cad4d771bc5875fc205daea8d3e5fa381a204e5d13edcec2bab881 SHA512 b26b4f5aaa5a522a602404197697b17cd04d53d23229c7d1078e851400019c2fc506b96ba72b6aa36c9fe084711c67b9a57f4b75113e0b3ebb64289fd03fbf75
+EBUILD scrot-1.2.ebuild 920 BLAKE2B b00fcbdf7665347b42716ce8ab78b8f6965f90b4b1f1a88acd2fffacd2978145208965afd206012c837ab22126ba7e78990b8760c5a58cccef373d2715991918 SHA512 341f2fbb5f4824b38d4c42e18929173cad358faf4b9b475d0c735ddc1a681962019c3a8a35892c5120afc42895ac1ac654c1faeb7a7fee5010725a61251bc7cd
EBUILD scrot-9999.ebuild 842 BLAKE2B fa29235b7684ab9a0e39e490676476086a6759b3e84cd5f2042e46ec43fcaf4f3c17d3ebd2e7ab8ca4b43d2adbfc3c825efefbfcfcaaeaeb1c64093055e46fd4 SHA512 0e18e163e831c4d1900de70297a286b65e85dbcdea1cd95ffad8975907d329cb71164d1335c312a3e4a625ead0de90085dd02e0564349256e779d5102dd90775
MISC metadata.xml 327 BLAKE2B 44a3d3f80ed251d0864c6aabb7192146c942a2bab99a4e643189eb74445c52a92fc153e4f198b591e628697df09774a2576cf5678a58774295c881eda04e33ad SHA512 bed8805eb922c213b73629ec8c430a7825ec1451edcd332fffeaef9b855b71b9e57e490775fe462ef2234ad9b534a23f19a373f0f2131d84ff2f965b8a2ed25a
diff --git a/media-gfx/scrot/scrot-0.8_p13-r1.ebuild b/media-gfx/scrot/scrot-0.8_p13-r1.ebuild
index b090cb21f603..94d6392391df 100644
--- a/media-gfx/scrot/scrot-0.8_p13-r1.ebuild
+++ b/media-gfx/scrot/scrot-0.8_p13-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://${PN}.sourcearchive.com/downloads/${MY_PV}/${PN}_0.8.orig.tar.gz
LICENSE="feh LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86"
IUSE=""
RDEPEND=">=media-libs/imlib2-1.0.3
diff --git a/media-gfx/scrot/scrot-1.2.ebuild b/media-gfx/scrot/scrot-1.2.ebuild
index d61d7a45964a..234442c4fbc2 100644
--- a/media-gfx/scrot/scrot-1.2.ebuild
+++ b/media-gfx/scrot/scrot-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/${PV
LICENSE="feh LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
RDEPEND="
>=media-libs/giblib-1.2.3
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index dbe49f4d1e2b..b90bf87f8546 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,3 +1,3 @@
DIST shotwell-0.30.8.tar.xz 6460512 BLAKE2B aecdfa8d90bcce19c38a55872671f6521d8808fa46decba4e9910392f9f8907dd99aaecc825f4e3f6ae747ab151bf5bfa3a807364d571db0fc2ddcaad9a492f5 SHA512 dccd496a083145283c79250329f88fdfe526a98ce84b6d1c52a9c48c9e52a4749bdf2449f3102474c994ef1e687e06767b9bcda03ea97d1168d3417743a6e866
-EBUILD shotwell-0.30.8.ebuild 1761 BLAKE2B 97634c1aa95c5e010f9fcbe4efeb69e1f67556d50cc16b085f3516b55302c4232643210c03ba12b5ee6611ce2759ed78035d2a0b50709163f2acba55ff0ba964 SHA512 9dfddd186bf38c2f7622f3903c371575c01496549b3c092a69fd8a35be2e9fe2dc51642bb0dfaf610ee94c50936e32f5a3ac155fd841fd72f4cb9eb54a75ac11
+EBUILD shotwell-0.30.8.ebuild 1789 BLAKE2B abc70bd2020b9b7df3489c02b92f036dab012d9b7d9b3885b43731424a4b95bf5949b144c2eed27e9ad3d083f8a117f1cce8f6414f019f028ea9479888d0d406 SHA512 8814da09d9a8a4bd56feaea61e0c7a4034a8af313f2dc836bc6403c4665a00d5f4a7037b7e7ee0a333319b3afaa8c7f977b2af8725ab576eb0aa8cfd3a2f25e1
MISC metadata.xml 915 BLAKE2B 7f83fe936f9a575c6dd12b014007cd97c5a8ada9aa5e55ddeaddefa4eb05d724a068c81d2f6f41c5b1bae01ed2c4326eb5eba5d4bdccf48619edeb43a8eaabfd SHA512 1b226f7fabfd7f5ee4d82b28ce2998273225319b055c01509cc5e493fdc037941c0edd0099df5dada00228fb225bf5e35d0035d3cd244890ad0cbd929b84d214
diff --git a/media-gfx/shotwell/shotwell-0.30.8.ebuild b/media-gfx/shotwell/shotwell-0.30.8.ebuild
index 9a4b0984d33c..693236b40ab4 100644
--- a/media-gfx/shotwell/shotwell-0.30.8.ebuild
+++ b/media-gfx/shotwell/shotwell-0.30.8.ebuild
@@ -3,6 +3,7 @@
EAPI=6
VALA_MIN_API_VERSION="0.40"
+VALA_MAX_API_VERSION="0.46"
inherit gnome.org gnome2-utils meson vala xdg
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 426abb4dfac6..c721073347d0 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -2,6 +2,8 @@ AUX 3.26-add-control-optional-deps.patch 2773 BLAKE2B e6c3faa98ecda13c926752defe
AUX simple-scan-3.32.2-unasigned-variable.patch 1294 BLAKE2B 7e513d96237872f5afc8c5a942d40f0f98632129eb9a2476099d8d28b1eb3660c0f5831d161c1c58f989327ff9eaeb4c5d426c3812fd1fe57270176b5dd37d29 SHA512 f3bcde7dd03ff9ade43f10b14124390aa08e0f2c00b7dc3b1cf08c5870c280a1e21dbdce7029a1f4c3372f72bac5f596026e7f70c7ee36c219d0c3f4df7e31a1
DIST simple-scan-3.32.2.1.tar.xz 790848 BLAKE2B ded17193c29698a4e07e3d82689fbf84babceb36b2dedb09da5e81ed35399084d6db5b448d3bed56af559a6dc9c8708b4cda1730a248a094e005755b7dd49e95 SHA512 c49620c4be4289b18c792e35a01494a56a28b46e4f246a4c58203cf86cd34a1aa8f42738ef8b50ae6e99150630ec60f999b2000a8ee9674abc4f307db4c6c0cb
DIST simple-scan-3.32.2.tar.xz 790800 BLAKE2B 98e502cbc280285dbe20a0c843d5f8d8b38707e973f2ba6aba2ccef9d739165371f5f30d7d6658853c5a6a280ba2919a98acd02b4757b4e881f96d5a7b53449b SHA512 10322ae72461efe43a4e230443c3aca24aff6f0cab07750c6eab9ebb718889e51d8c77ff722c337f333a8952ac84f69d03ad88eedfd4432ef11f7c7493170e14
+DIST simple-scan-3.34.4.tar.xz 795228 BLAKE2B b6f185bfbc1954ae2573fd1dcfa54f67e26290654c1019bfd34c229235e27cfc1eb40de0e6d5249f97b73c57745e1133fbd6fd1c3f9bdedb795b61068d5ed25d SHA512 b16b653e0a8ce399ecbdb88c4663d7780793518809eb73681c9c6281b9cde784167090c41720b21c184b9fdece28b07ba61fe8a97f10d792cc7326a458741ba4
EBUILD simple-scan-3.32.2.1.ebuild 1528 BLAKE2B 821ca0207431cafe2cf83a4bb676df2fdade54289184bc4f248a7a326949534753d27adb63a74c195a92cfc430518bcf7efb955b5c98190539a7e6a6169337ab SHA512 0b44fb7b8837fe822085cae5dd5f10e98e56367559121a0932d24a57fec5bad475c4d495a6612095036246a625777690b466d614e7f40a7ae4cda50dbdd6ac9a
EBUILD simple-scan-3.32.2.ebuild 1526 BLAKE2B 759f8334d42a2296fceb82b2a3dd7268ea2d650247e31e72266ed34073dcc2686ab162cece76d75ff6de9239c947e1bee3b9b214b88b053b6f04971cd99a4859 SHA512 bc3b9c5722eb613e4325f21c47e0fbd23b0cb6cde2180a938dc7630e63438e37362054e3342024a3cb0af68144b00213261a13074929c076d6943503988f0813
+EBUILD simple-scan-3.34.4.ebuild 1324 BLAKE2B 61b1cd39eae6762f0cbee289d0b4ee56cb36633fc968fcfc80dad7b99163d19b2e0c0314716c957ae845a56e59ba81df78d68852b7d7ca933c7d22236fb71982 SHA512 dc4b204b412c840749383273bb7c8c3fb4bc4e44d53b8d3e2332b603a372476bf0bbce9780d13a5d5e07e3dc3e9c10145a7be1e08ac22dd44d53ef07a6fe0066
MISC metadata.xml 616 BLAKE2B 576d986402f8cc708eae60f661640808751747c764d5fe729dd014f33758e0b484a2b80a214d9a3d1ed4bce7e455e34803a62048240e5de8e203184446cdc0df SHA512 6377cb9c20b1ce2db22ba959d386e4389939b72503d87da956d659144b8a6f8b521abdd19dd4c82ac0cb32e260ce6633b75136a353f63b86593f5e1f12394d47
diff --git a/media-gfx/simple-scan/simple-scan-3.34.4.ebuild b/media-gfx/simple-scan/simple-scan-3.34.4.ebuild
new file mode 100644
index 000000000000..a2e99a48eaa5
--- /dev/null
+++ b/media-gfx/simple-scan/simple-scan-3.34.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_MIN_API_VERSION="0.34"
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Simple document scanning utility"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="colord webp"
+
+DEPEND="
+ >=dev-libs/glib-2.38:2
+ >=x11-libs/gtk+-3.22:3
+ >=sys-libs/zlib-1.2.3.1:=
+ x11-libs/cairo:=
+ x11-libs/gdk-pixbuf:2
+ >=dev-libs/libgusb-0.2.7
+ colord? ( >=x11-misc/colord-0.1.24:=[udev] )
+ webp? ( media-libs/libwebp )
+ >=media-gfx/sane-backends-1.0.20:=
+
+ virtual/jpeg:0=
+"
+# packagekit? ( >=app-admin/packagekit-base-1.1.5 )
+RDEPEND="${DEPEND}
+ x11-misc/xdg-utils
+"
+BDEPEND="
+ $(vala_depend)
+ dev-libs/libxml2:2
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ dev-libs/libgusb[vala]
+ colord? ( x11-misc/colord[vala] )
+"
+
+PATCHES=(
+ # Add control for optional dependencies
+ "${FILESDIR}"/3.26-add-control-optional-deps.patch
+)
+
+src_prepare() {
+ vala_src_prepare
+ xdg_src_prepare
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use colord)
+ -Dpackagekit=false
+ $(meson_use webp)
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/media-gfx/svg2rlg/Manifest b/media-gfx/svg2rlg/Manifest
index 850691e250e0..651fa39d5ddf 100644
--- a/media-gfx/svg2rlg/Manifest
+++ b/media-gfx/svg2rlg/Manifest
@@ -2,5 +2,5 @@ AUX svg2rlg-issue-3.patch 507 BLAKE2B 801eb095c1e383a0e75c4f79e11e8063ae94290c99
AUX svg2rlg-issue-6.patch 1221 BLAKE2B c7440b817c14851b20d5a33712029bc3430a59b1376e0b7ca52d9aeed6a7c8e2cbb07e0c91b1342182e03c0646e86ef7d730062fe5539c4440094d4644675c47 SHA512 500b929de726cb728ea10f295c7e15845046d0d3d70067c2ef54cca1466f456cb682797ddf99e0ae62ec68ba125183900763e82a2889f8941b507490a197ed88
AUX svg2rlg-issue-7.patch 473 BLAKE2B 625268097edb59bc3c71ad3ff486d293dbbcfb0789c2bd73c5848c4e0aab4ec6ba2f9e5a28b23aa12f141f92e893d4e779b871e2d5fd05960cb263d05b5bcf8b SHA512 42be68efd3aedb00d1461dfa99de7aebf9477a531a491676cc189a7299e206650df9a9bd51d27c3a2cf6e761f8892c5b61577eed1b232f5109374df32329d3e4
DIST svg2rlg-0.3.tar.gz 490908 BLAKE2B a3383326d1d503965f93ff3b7b9f144835d5c7ba1613b0bf215ce31cc968eee76c826a170f62a5c4f173c8326dbe4a9f47a9f6f1a1345d2ed9ffd5350077e2e9 SHA512 44efebe7d978a46ab26b4bc332ad08db9236a86b160d73fc1fdc2b54c44bb2604147ae458eea1fe81c579c7f94e39869459567a6b6b3a551d6db6132816c4723
-EBUILD svg2rlg-0.3.ebuild 811 BLAKE2B dc07917f18d2d41d4c48ba35a06cdeec63258726a28593eb25b6cff1ee3f610810a56802035a2514e35f5b7f03c19d2fe92a42ecbb464707267e2a109f7ba105 SHA512 1c96dc3207c1bed148f117caf95432220b585105e401a23ee0dd8238e20aa6520ed018d1ed607d215657e350ad47ed438521d6b74acd73081d20f72d5d9ee2e6
+EBUILD svg2rlg-0.3.ebuild 812 BLAKE2B f9e9170db5c8bb0e8f13bf78761f359ad616cc8c329427baec81a3f046f498e5a11be256de59fd7d3e211067709923721e838f6743cfc8f2d7438119f2f5829e SHA512 be8fca9e57a9b5deefe69363478c06e075517368ce25a8354bd6bbb19f587b40bdd2bea53235b72a6ccd9bd6d86ce92fab8ab6b7c4d47fef07ed63cac5e8a138
MISC metadata.xml 363 BLAKE2B bab52a0cc6fbf81e6993b0ce74a89882a692bd008f0b193b3f30a665cbb8e6f6741f594bc6297a606c125bf2751c189142d500264e5d909b3715716c113b5ec9 SHA512 ab6cf1b5b4bb40fc26b110c6d34ea4d21e80c127549cb43cf262a43f771113494ef357c811d70523c07a3b9da0e3137a524364c997da4f3f25e9cddbdc125813
diff --git a/media-gfx/svg2rlg/svg2rlg-0.3.ebuild b/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
index 18207130fde4..45e19a443916 100644
--- a/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
+++ b/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/media-gfx/transfig/Manifest b/media-gfx/transfig/Manifest
index a0c95a371726..0305f596b77f 100644
--- a/media-gfx/transfig/Manifest
+++ b/media-gfx/transfig/Manifest
@@ -2,5 +2,5 @@ AUX transfig-3.2.5e-gcc10-fno-common.patch 939 BLAKE2B 70af7830470b5ed524d6b5df5
DIST fig2mpdf-1.1.2.tar.bz2 191438 BLAKE2B 411791fecf6e10aac92c004c7da69a10c97a6e12f811452f12d0b51b3a1eeff8fff97d831a5e64c9047855d27e6825a4e65f62be2536651e5876edd00cc822a9 SHA512 36dea40008371386b47a4451e2f311cc2540ab063e3b61e628a535775d62a8840c5cc20c37b80465184bf041c6e583aaf3e5156079e72211d0a87ff3346d2980
DIST transfig-3.2.5e-gentoo-patchset.tar.bz2 21130 BLAKE2B 1c07bc7e85fdde29f5e9290bf3c0df75610a7c219f001920b7412d2c104fe1d8d5b2698d91cde1c08f57d4718547c2dffa0aa859bd53a295c55a285ca4f5fbb7 SHA512 4c6ca63159ae58c35c1a9c818bc3b29715a4015e6a11d283b4d0c57c0cfeccbf38160f61f3c91f9bc68f82a8b5676349bb98866f40f617bb95afd73267d00e97
DIST transfig.3.2.5e.tar.gz 531256 BLAKE2B 830a97cb801b9cb284f7746a7f4a9645263cc34fd35d904288143d730331901302b12223ba135d8fa936f5ca0eeccacd194bbe2e74dfcfbf0cf4aede273ab507 SHA512 ed1379f1112514d90a4b3eecd3222baad311d804b5090e8e66867ec299e4f9a5f8d83ef8939aa6ecaa85a18143b8fb9b97f78e078ac5eeb934a158c55de6bb1e
-EBUILD transfig-3.2.5e.ebuild 2993 BLAKE2B 89f50342d529fb295a7e60803d5605ec60f7f0d47814b68b944133e95564a7ef2850d67f20d8a2b93f0265bc458b8901c415b72de4ca4348364514417f026c5b SHA512 fe0dd0fe59c4881a6e76ab9199e3ee225cbb6f64880fda01cd67fed169bc7d609677cee3efe983f40e6c3e3a300bb657f427f1ffdfce08ba475c6f88f41bf14a
+EBUILD transfig-3.2.5e.ebuild 2994 BLAKE2B c12dbc9f3687485588ab94e6a0681c7d3a24b31835dbf049dfc2992a1268bea34a92db7f0dd5f3e1016f1ab873cbbb5262d813e607054b9fe5dfa249389338b1 SHA512 5e4a6f4c01a208a8bacd49b88e55ef511e01aecf7fa6abf025a1a82c5c2b827130e517e8e7697f4d57e0456cf580fb00653347a00af70fb0b9fac04713fc56dd
MISC metadata.xml 238 BLAKE2B 60ff9cbe893ace8f33a3d44ee85a5c73c9bd5553478173bf92c4aa93398ae1140ba28673eb6c7373ac48ede6679546b57ea08b8e676ce5c7a47792a2ba8b3148 SHA512 65918555949ddfef068a9a197dffda69aee483ac55c1b52dcf19376aecf1cb53d8a3fc0931d4ebdbe64ba3341e2a2567d56c2830eb31e6746735449c53a1203c
diff --git a/media-gfx/transfig/transfig-3.2.5e.ebuild b/media-gfx/transfig/transfig-3.2.5e.ebuild
index 668facad5ece..995ddf174764 100644
--- a/media-gfx/transfig/transfig-3.2.5e.ebuild
+++ b/media-gfx/transfig/transfig-3.2.5e.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/mcj/${MY_P}.tar.gz
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="x11-libs/libXpm
diff --git a/media-gfx/ufraw/Manifest b/media-gfx/ufraw/Manifest
index a70e24fce622..0f6ddf6c2dfb 100644
--- a/media-gfx/ufraw/Manifest
+++ b/media-gfx/ufraw/Manifest
@@ -9,5 +9,5 @@ AUX ufraw-0.22-gcc9.patch 3569 BLAKE2B ce417eb79994190666b842f6017f18eadead284bb
AUX ufraw-0.22-jasper-automagic.patch 613 BLAKE2B 100e6b31540030a20c8cff8e99329a738378788b2ab11665c0c8ab2f3246c821a176dba8b26cea354e8b0d127d2c601c21b0ac94f5264327916d0f8779618165 SHA512 855337bf109ebc0ea7b9bd429bcc429bd9caa561e2a815352c51e860a6e405d500913b70414ded7f47e053332c89b964d1817c8f22627504cf157f1565f3c7a4
AUX ufraw-0.22-jpeg9.patch 1076 BLAKE2B 84448c537706d7b29f54d4735a75bf9501eac7927529c6d8e43d6cd746763ab753715d54cf943bb8bb5ddd8a29891f7522a680426acd2eb52af450492656ae3e SHA512 520e9351d7b8aa84f79a7c2841c2f56eaca849e67e448dc9503d248e31c1aa9fecaa64a332c0a155b6ba1ab7debec8734f3f2ef710bcb534a5fca34e9b5c8f7c
DIST ufraw-0.22.tar.gz 1103554 BLAKE2B 5ffa4c660602553853221d7b31bfb78b02644bfeb4461cf752186d83ed8087b7905e414c7d741916ca9460c05849ab679b2f3098c99e5246f54a49b6a915268f SHA512 a42eff5052c18afec90245cf97ceeade78e3f288186cf697ac4abf2e8290d4081db8ac4de3ae47b3774f30a6cb4cbda392099e6fd2125fe751abb40d9b065ad2
-EBUILD ufraw-0.22-r3.ebuild 2075 BLAKE2B c4784ef9a9e28f169890b50925ea48af92e14956fbdb861e3476449c483d2af1edc9ec6aee84b1188e877359bada9d9169a9801aeed9baee0cfb18c03123b833 SHA512 dbc4cab64e2a0a242221b8924bd77c46a3e53d6e3c943b6d238779d98888a67867d8d9d36a32da03e6d7ddfbb76c5fe17033795d7e8bd59ad52e8e94946398db
+EBUILD ufraw-0.22-r3.ebuild 2072 BLAKE2B c49e11e2877256db8ad2bfa46a51e2ffd8449c5dfa8f9ca99cbc2a150f5f29169439f314539f727eceaadd1c23e5751b56fd0c9e5034a4020c9f3cd11075028d SHA512 eafd4eaa8d5570ae8fe06e014133b7a3fefe9030fde5d68dbbaab56fcc9c8b7ca0046411ea0c3ba3211d035e982fbee44946b45775877c4231dcab1b7ebf2521
MISC metadata.xml 588 BLAKE2B 3e6ec0c8b11a3c30d1b20b5df4303fc1bc10b4e6459a24358ac50bcfaa414b307efe6d392d23fd7ce1443917865deae0dfa89cc7a068567f227cdc387f99d1cb SHA512 3d161ddfe0da5620312603d66acbc24244317da4dcb905558eddda9d54bf96024881ffbdcaa49f9daf73d779d5e7dbb47a523e05cc6c614756b468f14ef66ab9
diff --git a/media-gfx/ufraw/ufraw-0.22-r3.ebuild b/media-gfx/ufraw/ufraw-0.22-r3.ebuild
index 364bb452b7e3..9d1ace9d197d 100644
--- a/media-gfx/ufraw/ufraw-0.22-r3.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE="contrast fits gimp gnome gtk openmp timezone"
REQUIRED_USE="gimp? ( gtk )"
diff --git a/media-gfx/uniconvertor/Manifest b/media-gfx/uniconvertor/Manifest
index f28bcf54f14f..de7cfc4e9dbc 100644
--- a/media-gfx/uniconvertor/Manifest
+++ b/media-gfx/uniconvertor/Manifest
@@ -4,6 +4,6 @@ AUX uniconvertor-2.0_pre379-import.patch 935 BLAKE2B 5c201dbcac46f297cc2bcb243ee
AUX uniconvertor-2.0_pre379-libimg.patch 1201 BLAKE2B d25aa6bb28c6328ade007da10207317a6bcfe5c8c38eefa7d440ad6cc473c973fd41e923367d8b125f6d3fbdbac9df54993d398c040942e00b2730dd9c753fc2 SHA512 ff373151caf0c10e9a833ab68cf153d024706293c8000af248cb11a12582216c20f79e0998bdaabce0cc47d3248f786aa55ce9ba8814b1f4bb33e07670dd3136
AUX uniconvertor-2.0_pre379-test.patch 1544 BLAKE2B 16e8b1ddd6d0ca064a2f1be12ac97bf75dccd3d73fffb252253154779d0175ac292a08f4bb38deeb815a5e6cf624a9ff80654627e46d02655c315fd7b2a640ce SHA512 760ea5ced19040d0d29230f9d6fdafafd7f6fcdd727e18261730b7696d0e9a85037cdceab8e20f202a79bd7b8c84edfa7f21619bfde1320bbdc1e1d0c6d298db
DIST uniconvertor-2.0_pre379.tar.xz 1844780 BLAKE2B 51698d88941be700dd31e5527a8ffc8b2548d9f1323242e8f31a3ad00f2e4a2c5617be87443b130d664aeceea8b96ff17b72dfe32964854cc8f121351a918ec3 SHA512 3a0dd8e52addb391225ae148a673e3464a04e0d36e5955e496ef78e91597408706e5cbc06113b3e959446c6dd89aefa821f32ef81a5d1837a2a3d405a5a63dea
-EBUILD uniconvertor-2.0_pre379-r1.ebuild 1521 BLAKE2B 6a4e8fde4ba0b892d015ec6532abb47e5621877ec10288f28b3205886554f76b22600ee3eab80f21524bf8b613804fe0a83fa14f37d0b283f140a0641daf955c SHA512 d72469c1adde2df12506e8fc7f221d11163f17b7a2ddd0d4a9b7c2d7b86a9210b6b3082957312eef343bd1f487d975e67afe02095cd93723f875a31a39987eaa
-EBUILD uniconvertor-2.0_pre379-r2.ebuild 1844 BLAKE2B ea4762b78ea72f59308e166134f39f390e51eb9f4f94d4387f2f9dad79b83a2b4e7b3d84a002d3ea5547b8401ffaa84cf45ced680a8a5cb05ab201b24d740ef1 SHA512 3479ec984b845b974c4971f48bc449a6128d6a821eef9d161d0cfef2c012e21bdf595897324962078eb7b5eff9f78b01bd3877e245bdcb5fafb7251c895e5f14
+EBUILD uniconvertor-2.0_pre379-r1.ebuild 1519 BLAKE2B 7b6256848790e4009ee8c63e76d7c859ada926ad5dd465f3a69495eed9dd24e53d80e9807358a656b626116372087eefbad542f8f011ae93ea4a002ead01e719 SHA512 ab5671f8724ed3b1a09d616ac4bf1f58e4cfd29c72717565b4967fc26fac8b5ff2edc0a72efaaa38e2c1a6d13cceb47fa105061093e0702d5db4dfebcce164f1
+EBUILD uniconvertor-2.0_pre379-r2.ebuild 1842 BLAKE2B c90a6f269ad8891c05ff22016b2d1d95316fec86c16e06200679597b804745d4fb18b202196ad5444a40e51d8701a98c33626a532ec88263c2580369e6af2db2 SHA512 65198e23b0f6c3dcd047dd9541d700cfab5104e977679249a80a72feb3042ab213b812f5100587df1283d9833e8252a4dc86da925af9c960d02ec622bbac2bf7
MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r1.ebuild b/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r1.ebuild
index 6f983cf383fd..70eb7af38ee0 100644
--- a/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r1.ebuild
+++ b/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Convert vector graphic file formats like .cdr, .svg, wmf and more."
HOMEPAGE="https://sk1project.net/modules.php?name=Products&product=uniconvertor"
SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
SLOT="0"
LICENSE="GPL-2 LGPL-2"
IUSE=""
diff --git a/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r2.ebuild b/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r2.ebuild
index 104e72153941..d3c2dfdf93f7 100644
--- a/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r2.ebuild
+++ b/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Convert vector graphic file formats like .cdr, .svg, wmf and more."
HOMEPAGE="https://sk1project.net/modules.php?name=Products&product=uniconvertor"
SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
SLOT="0"
LICENSE="GPL-2 LGPL-2"
IUSE=""
diff --git a/media-gfx/waifu2x-ncnn-vulkan/Manifest b/media-gfx/waifu2x-ncnn-vulkan/Manifest
new file mode 100644
index 000000000000..7aa06f977886
--- /dev/null
+++ b/media-gfx/waifu2x-ncnn-vulkan/Manifest
@@ -0,0 +1,3 @@
+DIST waifu2x-ncnn-vulkan-20200224.tar.gz 34063828 BLAKE2B 9fa00abd31f0d81dd785be5253e44f5bd4082ae9b2fcae747562eb6c577fd7cccdfeaf7421d09c54119fd36285dffcc68d2889ddc06d1a6ddf47ea418066367e SHA512 13531a186817da99efb60fc0b16d0d3f455d0f2d2c9b4b53ddaedf7c50f622b2e5385e4f5dd29668cf845444b39645f0b7e810ab5084aa1e3ca6dbaf424a4e13
+EBUILD waifu2x-ncnn-vulkan-20200224.ebuild 846 BLAKE2B 1f1674a2fd28d5e045b30b1122a46442d22e7d67a9690acffe1be24ea570b049d43caf005fc794ea064192d2208b5f5a81e8183462c4238c2f79b0ebd53314cb SHA512 4ed5fee1692e928ce7703e25d87fcda114a1e615fbcb6cbdbe8ab9437173f09c2816f949c22807fdab260a3e5af0ac8dc10c9f78004f92786b7318794422cb5c
+MISC metadata.xml 342 BLAKE2B 718aec175f149d204eb6afabb3a2a59e47366538f16d346a1baeeae03afdfb68bd4c5c39d642af862400f0736644141eb156b43014f4125df61a0b9979bdb83d SHA512 a9b596ab9b9e2bd6052bbb11d7b19e2b6a4fbf69935345498cf5f5fa4934731bfccaf3e3391da0260e6f165198f71545ae8f86b1b01b8507fb9b003cd7e56809
diff --git a/media-gfx/waifu2x-ncnn-vulkan/metadata.xml b/media-gfx/waifu2x-ncnn-vulkan/metadata.xml
new file mode 100644
index 000000000000..7c9fd1249e8c
--- /dev/null
+++ b/media-gfx/waifu2x-ncnn-vulkan/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>slashbeast@gentoo.org</email>
+ <name>Piotr Karbowski</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">nihui/waifu2x-ncnn-vulkan</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20200224.ebuild b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20200224.ebuild
new file mode 100644
index 000000000000..77225416ea89
--- /dev/null
+++ b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20200224.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="waifu2x converter using ncnn and vulkan"
+HOMEPAGE="https://github.com/nihui/waifu2x-ncnn-vulkan"
+
+SRC_URI="https://github.com/nihui/waifu2x-ncnn-vulkan/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+ dev-libs/ncnn
+ media-libs/vulkan-loader"
+
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+#S="${WORKDIR}/${P}/src"
+CMAKE_USE_DIR="${S}/src"
+
+src_prepare() {
+ # Make finding models actually possible.
+ sed -i 's|path_t model = PATHSTR("models-cunet")|path_t model = PATHSTR("/usr/share/waifu2x-ncnn-vulkan/models-cunet")|' src/main.cpp\
+
+ cmake_src_prepare
+}
+
+src_install() {
+ dobin "${BUILD_DIR}"/waifu2x-ncnn-vulkan
+
+ insinto "/usr/share/${PN}"
+ doins -r models/*
+}
diff --git a/media-gfx/xdot/Manifest b/media-gfx/xdot/Manifest
index 40355359e07c..a18d09cd8e29 100644
--- a/media-gfx/xdot/Manifest
+++ b/media-gfx/xdot/Manifest
@@ -1,4 +1,4 @@
DIST xdot-1.1.tar.gz 134215 BLAKE2B e241a4fb1ec69a8613f7813dc159761e6bffb82ea9f58876287d01946f4c93e66e5eef66e6844abb7738979412c2c7d2d26f76bc0563ad0c3c8550d9e8023b47 SHA512 d67c45c8c071013551f79d671a21ce546b680fac5997ba9631a882ffa3c44c15a69949643ed5e8211417006152575a1d99450ccfb6062427521d1e2bc0814f55
-EBUILD xdot-1.1.ebuild 1100 BLAKE2B 242d0a051658fe0da9365e0b4b0907371254e00c91f99ec580f49d33ec01d82d3c662e4363a66d7451240ad0d79f4dace78de8a87b6bff65276e46e951934e3d SHA512 65dfad6e67b5af81e0e12f7be56a4540a1c308d19c85b0b55f2f799e1bf112d5b35348115ed75cbc6890ee11a633954281866d87ba45ac88d9006549ef8f80d6
+EBUILD xdot-1.1.ebuild 1107 BLAKE2B 878320bb37b745a6cd5a4d5a0ddd48bf0c5df3ba2968fff576a32c3f75b7c1c3592225b446954bb2730f5e9b5a3ca13dee50c29ffd4843589d2be7d9cdddb850 SHA512 a8cedfbe8a0887251abea5a56b686ed52d260209258327774b0b1026edc4723ec7f47bbf72e657860571001bc703b458d9a95be1408ff2769cb14c3428b18473
EBUILD xdot-9999.ebuild 1102 BLAKE2B 154a7034a320211af04a977697e0e8fd7ea53ab37de9ef0e5d34fc60f13ab8c7e8861c1d4e24ae8a0a2a2e727ab3cd57070338ce058f693946eacfc98e7b2ef7 SHA512 86d2c030cadded62e64e90466ade5733919487fb07e816b089e6cd98f88345ad5f0d00460e47dac10dbe536c84292b347e3b916e12fafa6c97448759ca92daed
MISC metadata.xml 483 BLAKE2B 50b03bb7d189da9bd6ca793f30c1ba3d13d12151533b42c99321a849515d7664398ec1b10720596c0453c48d35e2a6083b0559eb127199e1d6f4fc2a93aa04c4 SHA512 7e734dd60daa1e74b28f0932f508787e8deebc75a8f46c41f77007b6c8f96751cd6b07f6638cb89b38eb81d4fd2c6f7ba9f6d449f24f17ad25fb001d7f4f5ff7
diff --git a/media-gfx/xdot/xdot-1.1.ebuild b/media-gfx/xdot/xdot-1.1.ebuild
index 400ec5717eb4..29c4dca47278 100644
--- a/media-gfx/xdot/xdot-1.1.ebuild
+++ b/media-gfx/xdot/xdot-1.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
GIT_ECLASS="git-r3"
SRC_URI=""
else
- KEYWORDS="amd64 x86"
+ KEYWORDS="amd64 ~ppc64 x86"
MY_P="${MY_PN}-${PV}"
S="${WORKDIR}/${MY_P}"
SRC_URI="https://github.com/jrfonseca/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/media-gfx/xli/Manifest b/media-gfx/xli/Manifest
index b2addc09f645..dc1f2d08bc34 100644
--- a/media-gfx/xli/Manifest
+++ b/media-gfx/xli/Manifest
@@ -3,5 +3,5 @@ AUX xli-1.17.0-fix-scale-zoom.patch 1942 BLAKE2B fefbcbec8d9dba30fc1435fc998e371
AUX xli-1.17.0-libpng14.patch 241 BLAKE2B c4894ae4a5b879d8ac961d064da80d1518d0ed9a47946c21f9a701b89361e94f0d4d2b05926f6c14be4a558707601e84352bb689847a1f01d83cae6eb25c9d02 SHA512 e5a2de3525198d323ae6c89ab9b0455559761cd4f6b86b719934bc77e31582cd557090766875d97512cb60a42e88653f5dc204dffa9ae1370695c73bfc2231b1
AUX xli-security-gentoo.diff 6940 BLAKE2B 907fd85a2b248083380ae2210665dd9c251a7d528a93b1e2dffd149827f4900cab54b84b8a0be67c198a73d180cf31f4c8cdd7c4a37a3a8c5b30718babd5b1bf SHA512 b992219eb4b89bfee57429afbf67be6d6a04051b50de6e814c84c1adb209494d2faff15a228b43a992530fbeac83f15a94e9c1988982f98eabf287c26716671e
DIST xli-2005-02-27.tar.gz 201011 BLAKE2B c16f40368a7c55cb7d31777662e4e9c1515232904df4f6f0e7fdc4daf44fdafaa0a3d9d8298493dac9352fa10eaf5d2984f9e66832ca0bfd07d9e6d551f4dca5 SHA512 132b28396ebf3832dc35ff5fa7c102539ef30a194512fe6577ce1432bb84ecd7b4368e75eaf59f26a806900f63e1bfb9a93487ce1ebe3cfef2199256a783ccf7
-EBUILD xli-1.17.0-r5.ebuild 1954 BLAKE2B b53199a09d313287ef5c7cf3bfc75ec2c82d344dc25dcba959046aae80df9ff143024b4fd9dff81760679281f9c65730fb07433c2b41b59af411195c8d731613 SHA512 ba5222a82eaca28307a9e296feeaa526a4b3a5bad9346629ce61e01ca536af74185d74a7881c76d045f0a38b5c9304102395df6e95550c6d4fcf31cde50ea0b7
+EBUILD xli-1.17.0-r5.ebuild 1955 BLAKE2B 0e55ca414d96e0b467320301fc78c75d4c67578cb04802d3293cb8da952e8d618b0af21785202f0362e4edd4a80b4637eb177b690b206bf0a98f9758ba86d939 SHA512 b1ac31544d7044df876f41377719eb5cc35f5ea584b737e9c53436427815342cc706e2df7bdbfbf901804064aad1d1f675e421f7bf865f61e872ea0164d7d273
MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-gfx/xli/xli-1.17.0-r5.ebuild b/media-gfx/xli/xli-1.17.0-r5.ebuild
index 88a1b694c474..97d0eeaee455 100644
--- a/media-gfx/xli/xli-1.17.0-r5.ebuild
+++ b/media-gfx/xli/xli-1.17.0-r5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://pantransit.reptiles.org/prog/xli/xli-${SNAPSHOT}.tar.gz"
LICENSE="HPND"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
RDEPEND="app-arch/bzip2
>=media-libs/libpng-1.0.5
diff --git a/media-gfx/xloadimage/Manifest b/media-gfx/xloadimage/Manifest
index 4e85f07d26c1..9d00cd81daea 100644
--- a/media-gfx/xloadimage/Manifest
+++ b/media-gfx/xloadimage/Manifest
@@ -8,5 +8,5 @@ AUX xloadimage-4.1-zio-shell-meta-char.diff 1372 BLAKE2B 1c960ba7ae4da62eedcdfc2
AUX xloadimage-gentoo.patch 8956 BLAKE2B 9834cb47e16fb20f970e9d33a6e42fef09d5a3d3cae3f5ab0db5c76661acb7c67a20115f4069bc2769b6d9f54acf4adea27e27b79495d74a77644db5281beba8 SHA512 8eba3107d81f0dc6caf749e9a9889f1662e5d1004e480a9a170533f3ee00c6f9f11d3c2008655322242ab61f31b676406fd44b97d83e4ce93b8f68a12397830b
DIST xloadimage-4.1-gentoo-r1.diff.bz2 41535 BLAKE2B 77cdbb2e6d5dda6084aae2831bcb8750a027f59a673f5a1f8eeb61385bd21243d640bd13a3be7fb24d2ce2cb475a05cb04c91c2b53977c61fb3aa4416e67e112 SHA512 a1a52d576eb68c44e5ff3b68a6bd87cd9b8f21f6fa8edee2d7df2329002d40f6513df6c04ecd57f66018583d0251019bd02e15756dac705b8c9cb8470cb386e3
DIST xloadimage.4.1.tar.gz 596021 BLAKE2B 3c22facf05167d1836c21243799d8f66c211e44d659b4397668ed604cdd82b3bd8f11ab7b3be5e87c59a9b3aa8569d0d3d2e474b572c3bca07b6437b293014bf SHA512 2c91699c8ef07c101ff9b458708ace01cab2979a5e88cf8a4e47ec971f7b4cb5571108afa3e53271ade4e8ccfdcf72ef9e2e09edfc0be6b8afaba50847aa0586
-EBUILD xloadimage-4.1-r12.ebuild 2506 BLAKE2B 128b3b05785c8f4b48acc60de606d9d6915599cc97c1a96c315a5c372c52172fe700cebb00ff3c7355a20f2b6345d28dbf27620f89f85bb6043d9eec2fce71b9 SHA512 1b89f05188dd9c63adec3e98cf68a9932de5a746f4fbf6dc4fbae430d737fde16cebd39118a5c239d510452e2143c569d0cb0528b62fa03f0b22bce1fb83c86a
+EBUILD xloadimage-4.1-r12.ebuild 2504 BLAKE2B 9a14aeed6e18ba4d0a4037806bba53a66e0666c26494f15ceddb66baacb0a1791a0e7234a4c8af67180c65775356da87a053cc58fb7d7cdf52d9c4f2cce37874 SHA512 8b15c89bdbf40381dda09f0c1efd4f64716f1408e468775f248257fb45a94356d81c8e359f3a4c6e83da37be7694ae550de13bcbb7f97fb8f9333ceadff8314b
MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
index 3e16fb47f0c8..15cf216466d5 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="tiff jpeg png"
RDEPEND="x11-libs/libX11
diff --git a/media-gfx/xv/Manifest b/media-gfx/xv/Manifest
index 4eced860ea74..04b8190d74d1 100644
--- a/media-gfx/xv/Manifest
+++ b/media-gfx/xv/Manifest
@@ -8,5 +8,5 @@ AUX xv-3.10a-wformat-security.patch 519 BLAKE2B 7b0ba8ee6dc33af787040e72fdfd4cf1
DIST xv-3.10a-jumbo-patches-20070520.tar.gz 1363802 BLAKE2B 1a9f77b950dfa817aa861d9b2b6898d6e378b4a61a57c746a8822793a8e11e54165faf859e073ef99c9fbea5aa0c4c8caa4608ef03f553003b779a4bf59c3ab6 SHA512 e2ac5a3b4d743bf142c162b00815dd9d8dcaf345d0649016b2c6441fe2329879471b19453808e677c1a0b8eeb3468295dba160b1f30eacb2a7a9d8524ce03e75
DIST xv-3.10a.png.bz2 3082 BLAKE2B 05f56053fc0a77bba155db306ae181f5404bced3b2c22a33b3a0a0750b84461ffec98934d3dbabd764fbb6ec95ce2851f4cf3959682a315fe6e6653cbaaa5ae4 SHA512 41e81c34e74a034292c2a8f525d1452614a2b42e980a1a2c93e3fcf990db528853d633496815e5fb2c897a780a2da171af590f436e2c7ef181eea00eb6922e9b
DIST xv-3.10a.tar.gz 2259124 BLAKE2B 42cea578a879c819be8f42ffb1d247643904d8b462a4d6faa208185e49566798605c89006cbc190725fa6356b87da3375cf04d2ba86b559419cf8f7471c867e5 SHA512 5b8c5890503e2796638921cabae8967e458c73e332acea8561b1025ed13c771bc44c0e309b4592852e33726eeaa9784f933d1312073b0ba2e0b8c0cedabcaa3f
-EBUILD xv-3.10a-r19.ebuild 2451 BLAKE2B de03f257e6112992dfab5d674cbf7cc36f7d6e0d4a1f163a4a61e5899542c000c800503874eae6e172675cf668ce7273915d47fe0d62d99d3f586cee36d1b68f SHA512 d3c7f887dad97078ed92da87157b95ad68782e228128fcf6a253896959c0bbdc3ebb1ca5935530bb9a0a43243ec31fd1bcbde62ab81706e4e4abdf213545f028
+EBUILD xv-3.10a-r19.ebuild 2452 BLAKE2B cc0b6912bd6dea69448b09c3d59d8456019350b5f59f4e8e8fb1f6a044cd7bef8a07fb5fbb6f3e093285f389c3b5ecc55b7bc4c6a5dbf882c669a4998607bddf SHA512 543fb3c725a155a829a81a053596ea46955ed8c5402760ff8fd8d0ead3b392254797bb585910f2d1fefbefbc15ab32ed9abe098e3c3abdbc39fcc14530ca603f
MISC metadata.xml 249 BLAKE2B a10cceeac3a30f80ec870c8976e45bd2e0326e472b03cdfbe85b639f95dc7cdc8f372e5efafa5c9c8e679e77a24d5507f3a8f0dc97f2207252e280b3bb936662 SHA512 2250a3bff9eebe0962c70d89aed4f7e95dd3d33b5c3171f02bcf99d972d5242ec04b25d73b3ffd99ce96a641cf8eb78befb41941a352f4ff754702712b4e937d
diff --git a/media-gfx/xv/xv-3.10a-r19.ebuild b/media-gfx/xv/xv-3.10a-r19.ebuild
index c8c707abb0cd..c0755daeb2c1 100644
--- a/media-gfx/xv/xv-3.10a-r19.ebuild
+++ b/media-gfx/xv/xv-3.10a-r19.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/png-mng/${P}-jumbo-patches-${JUMBOV}.tar.gz
LICENSE="xv"
SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="jpeg tiff png"
DEPEND="x11-libs/libXt