summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/ahoviewer/ahoviewer-1.6.5-r3.ebuild (renamed from media-gfx/ahoviewer/ahoviewer-1.6.5-r1.ebuild)6
-rw-r--r--media-gfx/album/album-4.15-r1.ebuild4
-rw-r--r--media-gfx/alembic/Manifest1
-rw-r--r--media-gfx/alembic/alembic-1.7.12.ebuild90
-rw-r--r--media-gfx/alembic/alembic-1.7.16.ebuild4
-rw-r--r--media-gfx/alembic/files/alembic-1.7.11-0001-Fix-to-find-boost-with-cmake-3.11.patch60
-rw-r--r--media-gfx/alembic/files/alembic-1.7.11-0002-Find-IlmBase-by-setting-a-proper-ILMBASE_ROOT-value.patch72
-rw-r--r--media-gfx/alembic/files/alembic-1.7.11-0003-Fix-env-var-for-renderman.patch29
-rw-r--r--media-gfx/alembic/files/alembic-1.7.11-0004-Fix-a-compile-issue-with-const.patch27
-rw-r--r--media-gfx/alembic/files/alembic-1.7.11-0006-python-PyAlembic-Tests-CMakeLists.txt-fix-variable.patch29
-rw-r--r--media-gfx/alembic/metadata.xml9
-rw-r--r--media-gfx/argyllcms/argyllcms-2.1.2-r1.ebuild2
-rw-r--r--media-gfx/argyllcms/argyllcms-2.1.2.ebuild91
-rw-r--r--media-gfx/asymptote/Manifest6
-rw-r--r--media-gfx/asymptote/asymptote-2.62.ebuild211
-rw-r--r--media-gfx/asymptote/asymptote-2.65.ebuild211
-rw-r--r--media-gfx/asymptote/asymptote-2.68.ebuild (renamed from media-gfx/asymptote/asymptote-2.67.ebuild)6
-rw-r--r--media-gfx/asymptote/asymptote-2.69.ebuild (renamed from media-gfx/asymptote/asymptote-2.61.ebuild)44
-rw-r--r--media-gfx/asymptote/files/asy-ftd.vim2
-rw-r--r--media-gfx/asymptote/files/asymptote-2.61-info.patch13
-rw-r--r--media-gfx/asymptote/files/asymptote-2.61-xdg-utils.patch22
-rw-r--r--media-gfx/asymptote/files/asymptote-2.62-info.patch13
-rw-r--r--media-gfx/asymptote/files/asymptote-2.62-xdg-utils.patch22
-rw-r--r--media-gfx/asymptote/files/asymptote-2.68-info.patch (renamed from media-gfx/asymptote/files/asymptote-2.67-info.patch)0
-rw-r--r--media-gfx/asymptote/files/asymptote-2.68-xdg-utils.patch (renamed from media-gfx/asymptote/files/asymptote-2.67-xdg-utils.patch)0
-rw-r--r--media-gfx/asymptote/files/asymptote-2.69-info.patch (renamed from media-gfx/asymptote/files/asymptote-2.65-info.patch)6
-rw-r--r--media-gfx/asymptote/files/asymptote-2.69-xdg-utils.patch (renamed from media-gfx/asymptote/files/asymptote-2.65-xdg-utils.patch)13
-rw-r--r--media-gfx/asymptote/metadata.xml2
-rw-r--r--media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild11
-rw-r--r--media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-include-order.patch24
-rw-r--r--media-gfx/blender/Manifest4
-rw-r--r--media-gfx/blender/blender-2.83.10.ebuild320
-rw-r--r--media-gfx/blender/blender-2.83.12.ebuild328
-rw-r--r--media-gfx/blender/blender-2.83.4-r1.ebuild4
-rw-r--r--media-gfx/blender/blender-2.90.1-r1.ebuild6
-rw-r--r--media-gfx/blender/blender-2.91.0.ebuild335
-rw-r--r--media-gfx/blender/blender-2.91.2.ebuild334
-rw-r--r--media-gfx/blender/metadata.xml9
-rw-r--r--media-gfx/cairosvg/Manifest3
-rw-r--r--media-gfx/cairosvg/cairosvg-2.5.0.ebuild40
-rw-r--r--media-gfx/cairosvg/cairosvg-2.5.1.ebuild (renamed from media-gfx/cairosvg/cairosvg-2.4.2.ebuild)10
-rw-r--r--media-gfx/cairosvg/files/cairosvg-2.5.1-no-ref.patch30
-rw-r--r--media-gfx/cellwriter/Manifest1
-rw-r--r--media-gfx/cellwriter/cellwriter-1.3.5.ebuild31
-rw-r--r--media-gfx/chafa/Manifest1
-rw-r--r--media-gfx/chafa/chafa-1.6.0.ebuild36
-rw-r--r--media-gfx/converseen/Manifest2
-rw-r--r--media-gfx/converseen/converseen-0.9.9.0.ebuild (renamed from media-gfx/converseen/converseen-0.9.6.2.ebuild)20
-rw-r--r--media-gfx/converseen/files/converseen-0.9.9.0-appdata-path.patch17
-rw-r--r--media-gfx/converseen/files/converseen-0.9.9.0-gnuinstalldirs.patch (renamed from media-gfx/converseen/files/converseen-0.9.6.2-gnuinstalldirs.patch)20
-rw-r--r--media-gfx/converseen/files/converseen-0.9.9.0-no-update.patch20
-rw-r--r--media-gfx/converseen/metadata.xml5
-rw-r--r--media-gfx/cropgui/cropgui-0.4.1.ebuild2
-rw-r--r--media-gfx/cropgui/cropgui-0.5.ebuild2
-rw-r--r--media-gfx/crwinfo/crwinfo-0.2.ebuild2
-rw-r--r--media-gfx/cura/Manifest3
-rw-r--r--media-gfx/cura/cura-4.6.1-r1.ebuild57
-rw-r--r--media-gfx/cura/cura-4.7.0.ebuild57
-rw-r--r--media-gfx/cura/cura-4.8.0.ebuild (renamed from media-gfx/cura/cura-4.7.0-r1.ebuild)13
-rw-r--r--media-gfx/cura/files/cura-4.6.1-fix-install-paths.patch31
-rw-r--r--media-gfx/cura/metadata.xml2
-rw-r--r--media-gfx/curaengine/Manifest3
-rw-r--r--media-gfx/curaengine/curaengine-4.6.1.ebuild45
-rw-r--r--media-gfx/curaengine/curaengine-4.8.0.ebuild (renamed from media-gfx/curaengine/curaengine-4.7.0.ebuild)1
-rw-r--r--media-gfx/curaengine/files/curaengine-4.7.0-fix-tests.patch13
-rw-r--r--media-gfx/curaengine/metadata.xml1
-rw-r--r--media-gfx/darktable/Manifest6
-rw-r--r--media-gfx/darktable/darktable-3.0.2.ebuild149
-rw-r--r--media-gfx/darktable/darktable-3.2.1.ebuild150
-rw-r--r--media-gfx/darktable/darktable-3.4.0-r1.ebuild (renamed from media-gfx/darktable/darktable-3.2.1-r1.ebuild)63
-rw-r--r--media-gfx/darktable/darktable-3.4.1.ebuild (renamed from media-gfx/darktable/darktable-3.2.1-r2.ebuild)56
-rw-r--r--media-gfx/darktable/darktable-9999.ebuild68
-rw-r--r--media-gfx/darktable/files/darktable-3.0.2_cmake-opencl-kernel-loop.patch28
-rw-r--r--media-gfx/darktable/files/darktable-3.0.2_jsonschema-automagic.patch19
-rw-r--r--media-gfx/darktable/files/darktable-3.4.0-xmmintrin-sse-only.patch30
-rw-r--r--media-gfx/darktable/files/darktable-3.4.0_jsonschema-automagic.patch25
-rw-r--r--media-gfx/darktable/metadata.xml3
-rw-r--r--media-gfx/dcraw/dcraw-9.28.0-r2.ebuild2
-rw-r--r--media-gfx/digikam/digikam-7.1.0-r1.ebuild (renamed from media-gfx/digikam/digikam-7.1.0.ebuild)2
-rw-r--r--media-gfx/ebdftopcf/ebdftopcf-2.ebuild4
-rw-r--r--media-gfx/engauge/metadata.xml5
-rw-r--r--media-gfx/entangle/entangle-3.0.ebuild2
-rw-r--r--media-gfx/eog-plugins/Manifest1
-rw-r--r--media-gfx/eog-plugins/eog-plugins-3.26.5.ebuild2
-rw-r--r--media-gfx/eog-plugins/eog-plugins-3.26.6.ebuild64
-rw-r--r--media-gfx/eog/Manifest2
-rw-r--r--media-gfx/eog/eog-3.36.4.ebuild70
-rw-r--r--media-gfx/eog/eog-3.38.1.ebuild71
-rw-r--r--media-gfx/exact-image/exact-image-0.8.1-r3.ebuild2
-rw-r--r--media-gfx/exact-image/exact-image-1.0.2.ebuild2
-rw-r--r--media-gfx/exif/Manifest1
-rw-r--r--media-gfx/exif/exif-0.6.21.ebuild27
-rw-r--r--media-gfx/exif/exif-0.6.22.ebuild4
-rw-r--r--media-gfx/exiv2/exiv2-0.27.3.ebuild2
-rw-r--r--media-gfx/fbgrab/metadata.xml4
-rw-r--r--media-gfx/fbida/Manifest2
-rw-r--r--media-gfx/fbida/fbida-2.12.ebuild125
-rw-r--r--media-gfx/fbida/fbida-2.13-r1.ebuild121
-rw-r--r--media-gfx/fbida/files/fbida-2.10-fprintf-format.patch11
-rw-r--r--media-gfx/fbida/files/fbida-2.13-Autoconf.patch11
-rw-r--r--media-gfx/fdm-materials/Manifest3
-rw-r--r--media-gfx/fdm-materials/fdm-materials-4.7.0.ebuild26
-rw-r--r--media-gfx/fdm-materials/fdm-materials-4.8.0.ebuild (renamed from media-gfx/fdm-materials/fdm-materials-4.6.1-r1.ebuild)0
-rw-r--r--media-gfx/feh/Manifest6
-rw-r--r--media-gfx/feh/feh-3.4.1.ebuild70
-rw-r--r--media-gfx/feh/feh-3.5.ebuild70
-rw-r--r--media-gfx/feh/feh-3.6.1.ebuild (renamed from media-gfx/feh/feh-3.3.ebuild)4
-rw-r--r--media-gfx/feh/feh-3.6.ebuild (renamed from media-gfx/feh/feh-3.4.ebuild)4
-rw-r--r--media-gfx/figurine/figurine-1.0.5-r1.ebuild18
-rw-r--r--media-gfx/figurine/files/figurine-1.0.5-fno-common.patch115
-rw-r--r--media-gfx/flameshot/flameshot-0.6.0.ebuild2
-rw-r--r--media-gfx/fontforge/fontforge-20200314.ebuild6
-rw-r--r--media-gfx/fontforge/fontforge-20201107.ebuild6
-rw-r--r--media-gfx/fotoxx/files/fotoxx-15.05-docdir.patch (renamed from media-gfx/fotoxx/files/fotoxx-15.05.patch)1
-rw-r--r--media-gfx/fotoxx/files/fotoxx-15.05-gcc-11.patch31
-rw-r--r--media-gfx/fotoxx/fotoxx-15.05.ebuild9
-rw-r--r--media-gfx/freecad/Manifest1
-rw-r--r--media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch26
-rw-r--r--media-gfx/freecad/files/freecad-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch33
-rw-r--r--media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch26
-rw-r--r--media-gfx/freecad/freecad-0.19_pre20201231.ebuild284
-rw-r--r--media-gfx/freecad/freecad-9999.ebuild283
-rw-r--r--media-gfx/freecad/metadata.xml115
-rw-r--r--media-gfx/freewrl/files/freewrl-1.22.13-desktop.patch11
-rw-r--r--media-gfx/freewrl/files/freewrl-1.22.13-fontconfig-match.patch19
-rw-r--r--media-gfx/freewrl/files/freewrl-1.22.13-java-fix.patch54
-rw-r--r--media-gfx/freewrl/files/freewrl-1.22.13-mozjs187-config.patch10
-rw-r--r--media-gfx/freewrl/files/freewrl-2.3.3-ld.gold.patch35
-rw-r--r--media-gfx/freewrl/files/freewrl-3.0.0-fno-common.patch11
-rw-r--r--media-gfx/freewrl/freewrl-3.0.0-r1.ebuild4
-rw-r--r--media-gfx/freewrl/freewrl-9999.ebuild3
-rw-r--r--media-gfx/freewrl/metadata.xml5
-rw-r--r--media-gfx/frogr/metadata.xml5
-rw-r--r--media-gfx/geeqie/Manifest1
-rw-r--r--media-gfx/geeqie/geeqie-1.5.1-r1.ebuild4
-rw-r--r--media-gfx/geeqie/geeqie-1.5.1.ebuild2
-rw-r--r--media-gfx/geeqie/geeqie-1.6.ebuild94
-rw-r--r--media-gfx/gif2png/gif2png-2.5.14.ebuild8
-rw-r--r--media-gfx/gifsicle/Manifest1
-rw-r--r--media-gfx/gifsicle/gifsicle-1.91.ebuild32
-rw-r--r--media-gfx/gifsicle/gifsicle-1.92.ebuild4
-rw-r--r--media-gfx/gimp/Manifest3
-rw-r--r--media-gfx/gimp/gimp-2.10.20-r3.ebuild213
-rw-r--r--media-gfx/gimp/gimp-2.10.22-r2.ebuild (renamed from media-gfx/gimp/gimp-2.10.22-r1.ebuild)20
-rw-r--r--media-gfx/gimp/gimp-2.99.4.ebuild (renamed from media-gfx/gimp/gimp-2.99.2.ebuild)39
-rw-r--r--media-gfx/gimp/gimp-9999.ebuild34
-rw-r--r--media-gfx/gmic/Manifest2
-rw-r--r--media-gfx/gmic/gmic-2.9.4.ebuild4
-rw-r--r--media-gfx/gmic/gmic-2.9.5.ebuild (renamed from media-gfx/gmic/gmic-2.9.2-r1.ebuild)24
-rw-r--r--media-gfx/gnofract4d/gnofract4d-4.0.1_p1-r1.ebuild2
-rw-r--r--media-gfx/gnofract4d/gnofract4d-4.3_p20201029.ebuild6
-rw-r--r--media-gfx/gnome-photos/gnome-photos-3.34.2.ebuild2
-rw-r--r--media-gfx/gnome-screenshot/Manifest1
-rw-r--r--media-gfx/gnome-screenshot/gnome-screenshot-3.38.0.ebuild62
-rw-r--r--media-gfx/graphicsmagick/Manifest2
-rw-r--r--media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-flags.patch56
-rw-r--r--media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-CVE-2020-12672.patch67
-rw-r--r--media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-20045-20318-21956.patch38
-rw-r--r--media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-23042.patch42
-rw-r--r--media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-flags.patch59
-rw-r--r--media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild (renamed from media-gfx/graphicsmagick/graphicsmagick-1.3.35-r1.ebuild)20
-rw-r--r--media-gfx/graphicsmagick/graphicsmagick-9999.ebuild17
-rw-r--r--media-gfx/graphite2/graphite2-1.3.14.ebuild6
-rw-r--r--media-gfx/graphviz/Manifest1
-rw-r--r--media-gfx/graphviz/files/dotty_change_button.patch22
-rw-r--r--media-gfx/graphviz/graphviz-2.42.3-r1.ebuild281
-rw-r--r--media-gfx/graphviz/graphviz-2.44.1-r1.ebuild4
-rw-r--r--media-gfx/grub-splashes/grub-splashes-20091109.ebuild2
-rw-r--r--media-gfx/gscan2pdf/Manifest2
-rw-r--r--media-gfx/gscan2pdf/gscan2pdf-2.10.2.ebuild (renamed from media-gfx/gscan2pdf/gscan2pdf-2.8.1.ebuild)17
-rw-r--r--media-gfx/gthumb/Manifest2
-rw-r--r--media-gfx/gthumb/gthumb-3.10.2.ebuild (renamed from media-gfx/gthumb/gthumb-3.10.0.ebuild)2
-rw-r--r--media-gfx/hugin/Manifest2
-rw-r--r--media-gfx/hugin/hugin-2020.0.0-r1.ebuild (renamed from media-gfx/hugin/hugin-2019.2.0.ebuild)29
-rw-r--r--media-gfx/hugin/hugin-9999.ebuild29
-rw-r--r--media-gfx/imagemagick/Manifest11
-rw-r--r--media-gfx/imagemagick/imagemagick-6.9.11.61-r1.ebuild (renamed from media-gfx/imagemagick/imagemagick-6.9.11.35.ebuild)10
-rw-r--r--media-gfx/imagemagick/imagemagick-6.9.11.62.ebuild (renamed from media-gfx/imagemagick/imagemagick-6.9.11.41-r1.ebuild)10
-rw-r--r--media-gfx/imagemagick/imagemagick-6.9.12.2.ebuild254
-rw-r--r--media-gfx/imagemagick/imagemagick-7.0.10.61-r1.ebuild (renamed from media-gfx/imagemagick/imagemagick-7.0.10.35.ebuild)10
-rw-r--r--media-gfx/imagemagick/imagemagick-7.0.11.0.ebuild (renamed from media-gfx/imagemagick/imagemagick-7.0.10.41-r1.ebuild)10
-rw-r--r--media-gfx/imagemagick/imagemagick-7.0.11.1.ebuild268
-rw-r--r--media-gfx/imagemagick/imagemagick-7.0.11.2.ebuild268
-rw-r--r--media-gfx/imagemagick/imagemagick-9999.ebuild10
-rw-r--r--media-gfx/imagemagick/metadata.xml4
-rw-r--r--media-gfx/imageworsener/Manifest1
-rw-r--r--media-gfx/imageworsener/imageworsener-1.3.2.ebuild50
-rw-r--r--media-gfx/imageworsener/imageworsener-1.3.3.ebuild2
-rw-r--r--media-gfx/img2pdf/Manifest1
-rw-r--r--media-gfx/img2pdf/img2pdf-0.3.6.ebuild2
-rw-r--r--media-gfx/img2pdf/img2pdf-0.4.0.ebuild50
-rw-r--r--media-gfx/imv/Manifest2
-rw-r--r--media-gfx/imv/files/imv-4.2.0-add-string-inc.patch9
-rw-r--r--media-gfx/imv/files/imv-4.2.0-wayland-roundtrip-after-scale.patch14
-rw-r--r--media-gfx/imv/imv-4.0.1-r2.ebuild91
-rw-r--r--media-gfx/imv/imv-4.2.0.ebuild86
-rw-r--r--media-gfx/imv/imv-9999.ebuild102
-rw-r--r--media-gfx/imv/metadata.xml25
-rw-r--r--media-gfx/inkscape/Manifest2
-rw-r--r--media-gfx/inkscape/inkscape-1.0.1-r1.ebuild (renamed from media-gfx/inkscape/inkscape-1.0.1.ebuild)17
-rw-r--r--media-gfx/inkscape/inkscape-1.0.2-r1.ebuild (renamed from media-gfx/inkscape/inkscape-1.0-r1.ebuild)25
-rw-r--r--media-gfx/inkscape/inkscape-9999.ebuild13
-rw-r--r--media-gfx/iscan/Manifest1
-rw-r--r--media-gfx/iscan/files/iscan-2.30.4.2-c99.patch24
-rw-r--r--media-gfx/iscan/iscan-2.30.4.2-r1.ebuild3
-rw-r--r--media-gfx/iscan/iscan-3.65.0.ebuild103
-rw-r--r--media-gfx/jp2a/jp2a-1.0.6-r1.ebuild4
-rw-r--r--media-gfx/krita/Manifest3
-rw-r--r--media-gfx/krita/files/krita-4.3.0-tests-optional.patch536
-rw-r--r--media-gfx/krita/files/krita-4.4.2-quazip1.patch36
-rw-r--r--media-gfx/krita/krita-4.3.0.ebuild127
-rw-r--r--media-gfx/krita/krita-4.4.2.ebuild (renamed from media-gfx/krita/krita-4.4.1.ebuild)9
-rw-r--r--media-gfx/libimagequant/Manifest2
-rw-r--r--media-gfx/libimagequant/files/libimagequant-2.14.0-fix-openmp-pragma.patch25
-rw-r--r--media-gfx/libimagequant/libimagequant-2.12.2.ebuild2
-rw-r--r--media-gfx/libimagequant/libimagequant-2.12.3.ebuild4
-rw-r--r--media-gfx/libimagequant/libimagequant-2.14.0.ebuild (renamed from media-gfx/libimagequant/libimagequant-2.11.7.ebuild)36
-rw-r--r--media-gfx/llgal/llgal-0.13.19-r1.ebuild (renamed from media-gfx/llgal/llgal-0.13.19.ebuild)8
-rw-r--r--media-gfx/llgal/metadata.xml11
-rw-r--r--media-gfx/lximage-qt/lximage-qt-0.16.0.ebuild4
-rw-r--r--media-gfx/maim/maim-5.6.3.ebuild4
-rw-r--r--media-gfx/mcomix/Manifest1
-rw-r--r--media-gfx/mcomix/mcomix-1.3.0_pre20200206.ebuild2
-rw-r--r--media-gfx/mcomix/mcomix-1.3.0_pre20201123.ebuild75
-rw-r--r--media-gfx/mcomix/mcomix-9999.ebuild5
-rw-r--r--media-gfx/meshlab/Manifest4
-rw-r--r--media-gfx/meshlab/files/2016.12/0001-compile-server.patch22
-rw-r--r--media-gfx/meshlab/files/2016.12/0001-depend-on-system-glew.patch72
-rw-r--r--media-gfx/meshlab/files/2016.12/0001-disable-edit-quality.patch25
-rw-r--r--media-gfx/meshlab/files/2016.12/0001-disable-filter-layer.patch25
-rw-r--r--media-gfx/meshlab/files/2016.12/0001-disable-filter-ssynth.patch25
-rw-r--r--media-gfx/meshlab/files/2016.12/0001-remove-not-sane-plugins.patch25
-rw-r--r--media-gfx/meshlab/files/2016.12/0001-set-shader-and-texture-paths.patch164
-rw-r--r--media-gfx/meshlab/files/2016.12/0001-update-1.3.3-pluginmanager.patch.patch29
-rw-r--r--media-gfx/meshlab/files/2016.12/0001-use-external-bzip.patch51
-rw-r--r--media-gfx/meshlab/files/2016.12/0001-use-external-glew.patch95
-rw-r--r--media-gfx/meshlab/files/2016.12/0001-use-external-jhead.patch56
-rw-r--r--media-gfx/meshlab/files/2016.12/0001-use-external-lib3ds.patch48
-rw-r--r--media-gfx/meshlab/files/2016.12/0001-use-external-muParser.patch37
-rw-r--r--media-gfx/meshlab/files/2016.12/0001-use-external-openctm.patch43
-rw-r--r--media-gfx/meshlab/files/2016.12/meshlab-2016.12-align1.patch16
-rw-r--r--media-gfx/meshlab/files/2016.12/meshlab-2016.12-align2.patch11
-rw-r--r--media-gfx/meshlab/files/2016.12/meshlab-2016.12-asString.patch62
-rw-r--r--media-gfx/meshlab/files/2016.12/meshlab-2016.12-fix-plugins-path.patch17
-rw-r--r--media-gfx/meshlab/files/2016.12/meshlab-2016.12-qprintable.patch20
-rw-r--r--media-gfx/meshlab/files/2016.12/meshlab-2016.12-qt-5.15.patch33
-rw-r--r--media-gfx/meshlab/files/2016.12/meshlab-2016.12-qt-includes.patch22
-rw-r--r--media-gfx/meshlab/files/2016.12/meshlab-2016.12-remove-header.patch38
-rw-r--r--media-gfx/meshlab/files/2016.12/remove-edit_mutualcorrs.patch10
-rw-r--r--media-gfx/meshlab/files/2016.12/remove-io_TXT.patch10
-rw-r--r--media-gfx/meshlab/files/meshlab-2020.12-disable-updates.patch38
-rw-r--r--media-gfx/meshlab/files/meshlab-2020.12-find-plugins.patch39
-rw-r--r--media-gfx/meshlab/meshlab-2016.12-r4.ebuild113
-rw-r--r--media-gfx/meshlab/meshlab-2020.12.ebuild63
-rw-r--r--media-gfx/meshlab/metadata.xml22
-rw-r--r--media-gfx/mypaint/mypaint-2.0.1-r2.ebuild2
-rw-r--r--media-gfx/netpaint/netpaint-1.1.2.ebuild2
-rw-r--r--media-gfx/nomacs/files/nomacs-3.16.224-quazip1.patch127
-rw-r--r--media-gfx/nomacs/nomacs-3.16.224-r2.ebuild (renamed from media-gfx/nomacs/nomacs-3.16.224.ebuild)6
-rw-r--r--media-gfx/opencsg/metadata.xml4
-rw-r--r--media-gfx/openscad/files/openscad-2019.05-0003-change-C-standard-to-c-14.patch76
-rw-r--r--media-gfx/openscad/metadata.xml2
-rw-r--r--media-gfx/openscad/openscad-2019.05-r4.ebuild (renamed from media-gfx/openscad/openscad-2019.05-r3.ebuild)11
-rw-r--r--media-gfx/opentoonz/Manifest1
-rw-r--r--media-gfx/opentoonz/opentoonz-1.3.0-r1.ebuild87
-rw-r--r--media-gfx/openvdb/openvdb-4.0.2-r4.ebuild2
-rw-r--r--media-gfx/openvdb/openvdb-5.2.0-r2.ebuild2
-rw-r--r--media-gfx/openvdb/openvdb-6.2.1-r1.ebuild2
-rw-r--r--media-gfx/openvdb/openvdb-7.0.0-r1.ebuild6
-rw-r--r--media-gfx/openvdb/openvdb-7.1.0-r1.ebuild6
-rw-r--r--media-gfx/optipng/optipng-0.7.7-r1.ebuild4
-rw-r--r--media-gfx/optipng/optipng-0.7.7.ebuild4
-rw-r--r--media-gfx/pencil/Manifest1
-rw-r--r--media-gfx/pencil/files/pencil-0.6.4-fixes-for-qt-5.15.0.patch30
-rw-r--r--media-gfx/pencil/pencil-0.6.4-r1.ebuild65
-rw-r--r--media-gfx/pencil/pencil-0.6.4.ebuild63
-rw-r--r--media-gfx/pngcheck/Manifest2
-rw-r--r--media-gfx/pngcheck/pngcheck-3.0.2.ebuild (renamed from media-gfx/pngcheck/pngcheck-2.3.0.ebuild)8
-rw-r--r--media-gfx/pngcrush/pngcrush-1.8.13.ebuild4
-rw-r--r--media-gfx/povray/files/povray-3.7.0.0-boost-1.50.patch72
-rw-r--r--media-gfx/povray/metadata.xml1
-rw-r--r--media-gfx/povray/povray-3.7.0.0-r1.ebuild4
-rw-r--r--media-gfx/povray/povray-3.7.0.0.ebuild146
-rw-r--r--media-gfx/povtree/povtree-1.5-r1.ebuild4
-rw-r--r--media-gfx/prusaslicer/Manifest1
-rw-r--r--media-gfx/prusaslicer/files/prusaslicer-2.3.0-miniz-zip-header.patch9
-rw-r--r--media-gfx/prusaslicer/metadata.xml21
-rw-r--r--media-gfx/prusaslicer/prusaslicer-2.3.0.ebuild86
-rw-r--r--media-gfx/pstoedit/Manifest1
-rw-r--r--media-gfx/pstoedit/files/pstoedit-3.60-libdl.patch13
-rw-r--r--media-gfx/pstoedit/files/pstoedit-3.70-pkgconfig.patch14
-rw-r--r--media-gfx/pstoedit/pstoedit-3.70-r1.ebuild63
-rw-r--r--media-gfx/pstoedit/pstoedit-3.75.ebuild2
-rw-r--r--media-gfx/qrencode/qrencode-4.1.1.ebuild2
-rw-r--r--media-gfx/quat/quat-1.20-r2.ebuild (renamed from media-gfx/quat/quat-1.20-r1.ebuild)29
-rw-r--r--media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild2
-rw-r--r--media-gfx/sane-backends/Manifest1
-rw-r--r--media-gfx/sane-backends/files/sane-backends-1.0.31-autoconf-2.70.patch93
-rw-r--r--media-gfx/sane-backends/files/sane-backends-1.0.31-backend_pot_input.patch33
-rw-r--r--media-gfx/sane-backends/files/sane-backends-1.0.31-udev_rules_update.patch55
-rw-r--r--media-gfx/sane-backends/sane-backends-1.0.31.ebuild366
-rw-r--r--media-gfx/sane-frontends/Manifest1
-rw-r--r--media-gfx/sane-frontends/sane-frontends-1.0.14-r5.ebuild59
-rw-r--r--media-gfx/sane-frontends/sane-frontends-1.0.14-r6.ebuild4
-rw-r--r--media-gfx/scour/Manifest2
-rw-r--r--media-gfx/scour/metadata.xml1
-rw-r--r--media-gfx/scour/scour-0.37.ebuild2
-rw-r--r--media-gfx/scour/scour-0.38.1.ebuild25
-rw-r--r--media-gfx/scour/scour-0.38.2.ebuild25
-rw-r--r--media-gfx/scrot/Manifest4
-rw-r--r--media-gfx/scrot/files/scrot.bash-completion40
-rw-r--r--media-gfx/scrot/scrot-0.8_p13-r1.ebuild38
-rw-r--r--media-gfx/scrot/scrot-1.2.ebuild44
-rw-r--r--media-gfx/scrot/scrot-1.3-r1.ebuild45
-rw-r--r--media-gfx/scrot/scrot-1.4.ebuild2
-rw-r--r--media-gfx/simple-scan/Manifest1
-rw-r--r--media-gfx/simple-scan/simple-scan-3.36.4.ebuild2
-rw-r--r--media-gfx/simple-scan/simple-scan-3.36.7.ebuild70
-rw-r--r--media-gfx/slic3r/Manifest2
-rw-r--r--media-gfx/slic3r/files/slic3r-1.1.7-adjust_var_path.patch11
-rw-r--r--media-gfx/slic3r/files/slic3r-1.3.0-boost-1.73.patch146
-rw-r--r--media-gfx/slic3r/files/slic3r-1.3.0-boost.patch10
-rw-r--r--media-gfx/slic3r/files/slic3r-1.3.0-use-system-clipper.patch44
-rw-r--r--media-gfx/slic3r/files/slic3r-1.3.0-wayland.patch10
-rw-r--r--media-gfx/slic3r/files/slic3r-1.3.1_pre20200824-boost-1.73.patch133
-rw-r--r--media-gfx/slic3r/files/slic3r-9999-boost-173.patch39
-rw-r--r--media-gfx/slic3r/files/slic3r-9999-no-locallib.patch609
-rw-r--r--media-gfx/slic3r/metadata.xml6
-rw-r--r--media-gfx/slic3r/slic3r-1.1.7.ebuild115
-rw-r--r--media-gfx/slic3r/slic3r-1.3.0-r3.ebuild (renamed from media-gfx/slic3r/slic3r-1.3.0-r2.ebuild)38
-rw-r--r--media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild (renamed from media-gfx/slic3r/slic3r-1.3.0-r1.ebuild)44
-rw-r--r--media-gfx/slic3r/slic3r-9999.ebuild30
-rw-r--r--media-gfx/svg2rlg/Manifest1
-rw-r--r--media-gfx/svg2rlg/metadata.xml14
-rw-r--r--media-gfx/svg2rlg/svg2rlg-0.4.0.ebuild39
-rw-r--r--media-gfx/tachyon/tachyon-0.99_beta6-r1.ebuild4
-rw-r--r--media-gfx/tachyon/tachyon-0.99_beta6-r2.ebuild4
-rw-r--r--media-gfx/termtosvg/termtosvg-1.1.0.ebuild2
-rw-r--r--media-gfx/tgif/tgif-4.2.5-r2.ebuild4
-rw-r--r--media-gfx/tintii/tintii-2.10.0-r1.ebuild (renamed from media-gfx/tintii/tintii-2.10.0.ebuild)18
-rw-r--r--media-gfx/transfig/transfig-3.2.5e-r1.ebuild4
-rw-r--r--media-gfx/tuxpaint/Manifest1
-rw-r--r--media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild71
-rw-r--r--media-gfx/valentina/files/valentina-0.6.1-disable-vcs-version.patch75
-rw-r--r--media-gfx/valentina/valentina-0.6.1-r1.ebuild16
-rw-r--r--media-gfx/valentina/valentina-9999.ebuild13
-rw-r--r--media-gfx/viewnior/viewnior-1.7-r2.ebuild2
-rw-r--r--media-gfx/wkhtmltopdf/Manifest1
-rw-r--r--media-gfx/wkhtmltopdf/metadata.xml8
-rw-r--r--media-gfx/wkhtmltopdf/wkhtmltopdf-0.12.5.ebuild43
-rw-r--r--media-gfx/word_cloud/word_cloud-1.6.0.ebuild2
-rw-r--r--media-gfx/xdot/xdot-1.1.ebuild2
-rw-r--r--media-gfx/xdot/xdot-1.2.ebuild7
-rw-r--r--media-gfx/xdot/xdot-9999.ebuild5
-rw-r--r--media-gfx/xfig/xfig-3.2.7b.ebuild4
-rw-r--r--media-gfx/xli/xli-1.17.0-r5.ebuild4
-rw-r--r--media-gfx/xloadimage/xloadimage-4.1-r12.ebuild4
-rw-r--r--media-gfx/xpaint/xpaint-2.10.2-r1.ebuild (renamed from media-gfx/xpaint/xpaint-2.10.2.ebuild)16
-rw-r--r--media-gfx/xv/xv-3.10a-r19.ebuild2
-rw-r--r--media-gfx/yafaray/metadata.xml4
-rw-r--r--media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch120
-rw-r--r--media-gfx/zbar/files/zbar-0.23.1_musl_include_locale_h.patch23
-rw-r--r--media-gfx/zbar/zbar-0.23-r1.ebuild3
-rw-r--r--media-gfx/zbar/zbar-0.23.1.ebuild7
364 files changed, 6707 insertions, 7086 deletions
diff --git a/media-gfx/ahoviewer/ahoviewer-1.6.5-r1.ebuild b/media-gfx/ahoviewer/ahoviewer-1.6.5-r3.ebuild
index c5d5266e2ca..bff03cef4b0 100644
--- a/media-gfx/ahoviewer/ahoviewer-1.6.5-r1.ebuild
+++ b/media-gfx/ahoviewer/ahoviewer-1.6.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,7 +17,7 @@ IUSE="gnutls gnome-keyring +gstreamer +rar +ssl +zip"
DEPEND="
dev-cpp/glibmm:2
dev-cpp/gtkmm:2.4
- dev-libs/libconfig[cxx]
+ dev-libs/libconfig:=[cxx]
dev-libs/libxml2:2
dev-libs/libsigc++:2
net-misc/curl
@@ -26,7 +26,7 @@ DEPEND="
media-libs/gst-plugins-bad:1.0
media-libs/gstreamer:1.0
)
- rar? ( app-arch/unrar )
+ rar? ( app-arch/unrar:= )
ssl? (
gnutls? (
net-libs/gnutls:=
diff --git a/media-gfx/album/album-4.15-r1.ebuild b/media-gfx/album/album-4.15-r1.ebuild
index 283dda684e5..c62b27853d4 100644
--- a/media-gfx/album/album-4.15-r1.ebuild
+++ b/media-gfx/album/album-4.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -10,7 +10,7 @@ SRC_URI="https://marginalhacks.com/bin/album.versions/${P}.tar.gz
LICENSE="marginalhacks"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
IUSE="doc ffmpeg plugins themes"
DEPEND=""
diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index e09960db353..6b21cc8ad5b 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -1,2 +1 @@
-DIST alembic-1.7.12.tar.gz 827983 BLAKE2B 7d508fdbfd92f213936635666a221fdad30f242a37ef8ff54a6272854565ebb890ffd11d8fe010f1558c0872fcb23080413d76380772ebf5db52033bdf0d9c85 SHA512 e05e0b24056c17f01784ced1f9606a269974de195f1aca8a6fce2123314e7ee609f70df77ac7fe18dc7f0c04fb883d38cc7de9b963caacf9586aaa24d4ac6210
DIST alembic-1.7.16.tar.gz 855709 BLAKE2B 8009ed199b7dca190e40f56969d7c446e65bd78f58cee75dda4883ecf02b6c7ee422db76c4f523a76a4b2d42ef1547ededf5de0055cdb5d801c5cd4918a0b5f4 SHA512 bd4777dc4abf15bfb8307b00fd2d67671e89944d0dd8a74a657f4aee49e6a1cd0ab1fe5bb7f9afc63abcce2123466bb8a9a3886d41724ed2c242bc61d7d5b3a1
diff --git a/media-gfx/alembic/alembic-1.7.12.ebuild b/media-gfx/alembic/alembic-1.7.12.ebuild
deleted file mode 100644
index d67d4611da1..00000000000
--- a/media-gfx/alembic/alembic-1.7.12.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake multiprocessing
-
-DESCRIPTION="Open framework for storing and sharing scene data"
-HOMEPAGE="https://www.alembic.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="+boost doc examples hdf5 prman test zlib"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- hdf5? ( zlib )
-"
-
-RDEPEND="
- ${PYTHON_DEPS}
- >=media-libs/openexr-2.3.0:=
- boost? ( >=dev-libs/boost-1.65.0:= )
- hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] )
- zlib? ( >=sys-libs/zlib-1.2.11-r1 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( >=app-doc/doxygen-1.8.14-r1 )"
-
-DOCS=( "ACKNOWLEDGEMENTS.txt" "FEEDBACK.txt" "NEWS.txt" "README.txt" )
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.7.11-0001-Fix-to-find-boost-with-cmake-3.11.patch"
- "${FILESDIR}/${PN}-1.7.11-0002-Find-IlmBase-by-setting-a-proper-ILMBASE_ROOT-value.patch"
- "${FILESDIR}/${PN}-1.7.11-0003-Fix-env-var-for-renderman.patch"
- "${FILESDIR}/${PN}-1.7.11-0004-Fix-a-compile-issue-with-const.patch"
- "${FILESDIR}/${PN}-1.7.11-0005-Fix-install-locations.patch"
- "${FILESDIR}/${PN}-1.7.11-0006-python-PyAlembic-Tests-CMakeLists.txt-fix-variable.patch"
-)
-
-src_prepare() {
- cmake_src_prepare
- if use doc; then
- doxygen -u Doxyfile || die "Failed to update Doxyfile"
- sed -i -e 's|DOT_NUM_THREADS[ \t]*= 0|DOT_NUM_THREADS = '$(makeopts_jobs)'|' Doxyfile || die "Failed to change dot threads"
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DALEMBIC_SHARED_LIBS=ON
- # The CMakeLists.txt file needs C++11 or C++-0x if none of them
- # is defined
- -DALEMBIC_LIB_USES_BOOST=$(usex boost)
- -DALEMBIC_LIB_USES_TR1=$(usex !boost)
- -DUSE_ARNOLD=OFF
- -DUSE_BINARIES=ON
- -DUSE_EXAMPLES=$(usex examples)
- -DUSE_HDF5=$(usex hdf5)
- -DUSE_MAYA=OFF
- -DUSE_PRMAN=$(usex prman)
- -DUSE_PYALEMBIC=OFF
- -DUSE_TESTS=$(usex test)
- )
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- if use doc; then
- doxygen Doxyfile || die "Failed to build documentation"
- fi
-}
-
-src_install() {
- use doc && local HTML_DOCS=( doc/html/. )
- cmake_src_install
-}
-
-pkg_postinst() {
- if use prman; then
- einfo "If you're looking for an ebuild for renderman, you may want to"
- einfo "try the waebbl overlay: 'eselect repository enable waebbl'"
- einfo "followed by 'emerge renderman'"
- fi
-}
diff --git a/media-gfx/alembic/alembic-1.7.16.ebuild b/media-gfx/alembic/alembic-1.7.16.ebuild
index e7b7b255e52..ed542a1b220 100644
--- a/media-gfx/alembic/alembic-1.7.16.ebuild
+++ b/media-gfx/alembic/alembic-1.7.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm ~x86"
IUSE="hdf5 test zlib"
RESTRICT="!test? ( test )"
diff --git a/media-gfx/alembic/files/alembic-1.7.11-0001-Fix-to-find-boost-with-cmake-3.11.patch b/media-gfx/alembic/files/alembic-1.7.11-0001-Fix-to-find-boost-with-cmake-3.11.patch
deleted file mode 100644
index d36e2503427..00000000000
--- a/media-gfx/alembic/files/alembic-1.7.11-0001-Fix-to-find-boost-with-cmake-3.11.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 2060f95c43685895f36269667c30acf7499b81b6 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Sat, 15 Jun 2019 13:19:57 +0200
-Subject: [PATCH 1/5] Fix to find boost with >=cmake-3.11
-
-Cmake version 3.11 and later has a new syntax introduced, when
-looking for boost libraries.
-This patches adds this syntax if an appropriate cmake version is used.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- cmake/AlembicBoost.cmake | 10 +++++++++-
- python/PyAlembic/CMakeLists.txt | 8 ++++----
- 2 files changed, 13 insertions(+), 5 deletions(-)
-
-diff --git a/cmake/AlembicBoost.cmake b/cmake/AlembicBoost.cmake
-index 21b3515..db59157 100644
---- a/cmake/AlembicBoost.cmake
-+++ b/cmake/AlembicBoost.cmake
-@@ -79,7 +79,15 @@ IF (USE_PYALEMBIC AND APPLE)
- ENDIF()
-
- IF (USE_PYALEMBIC)
-- FIND_PACKAGE(Boost 1.42.0 COMPONENTS program_options python)
-+ # cmake>=3.11 has a new syntax when searching for boost, which
-+ # needs to add the python version.
-+ # Hardcode the python version number, as PYTHON_VERSION_{MAJOR,MINOR}
-+ # are not yet know in the configuration phase.
-+ IF(CMAKE_MINOR_VERSION VERSION_GREATER 10)
-+ FIND_PACKAGE(Boost 1.42.0 COMPONENTS program_options python27)
-+ ELSE()
-+ FIND_PACKAGE(Boost 1.42.0 COMPONENTS program_options python)
-+ ENDIF()
- ELSE()
- FIND_PACKAGE(Boost 1.42.0 COMPONENTS program_options)
- ENDIF()
-diff --git a/python/PyAlembic/CMakeLists.txt b/python/PyAlembic/CMakeLists.txt
-index a3fdb31..af8dcb5 100644
---- a/python/PyAlembic/CMakeLists.txt
-+++ b/python/PyAlembic/CMakeLists.txt
-@@ -33,12 +33,12 @@
- ##
- ##-*****************************************************************************
-
--MESSAGE(STATUS "Boost_PYTHON_LIBRARY: ${Boost_PYTHON_LIBRARY}")
-+MESSAGE(STATUS "Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY: ${Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY_RELEASE}")
-
- # set core libs
--IF (Boost_PYTHON_LIBRARY AND ALEMBIC_PYTHON_LIBRARY)
-- MESSAGE(STATUS "Found libboost_python: ${Boost_PYTHON_LIBRARY}")
-- SET(PLIBS ${ALEMBIC_PYTHON_LIBRARY} ${Boost_PYTHON_LIBRARY})
-+IF (Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY_RELEASE AND ALEMBIC_PYTHON_LIBRARY)
-+ MESSAGE(STATUS "Found libboost_python: ${Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY_RELEASE}")
-+ SET(PLIBS ${ALEMBIC_PYTHON_LIBRARY} ${Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY_RELEASE})
-
- # lots of warnings coming from unused local typedefs inside boost python
- IF (NOT WINDOWS)
---
-2.22.0
-
diff --git a/media-gfx/alembic/files/alembic-1.7.11-0002-Find-IlmBase-by-setting-a-proper-ILMBASE_ROOT-value.patch b/media-gfx/alembic/files/alembic-1.7.11-0002-Find-IlmBase-by-setting-a-proper-ILMBASE_ROOT-value.patch
deleted file mode 100644
index c561e26a665..00000000000
--- a/media-gfx/alembic/files/alembic-1.7.11-0002-Find-IlmBase-by-setting-a-proper-ILMBASE_ROOT-value.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 60bbcde225f3c28a36d8643c451509d9deb09222 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Sat, 15 Jun 2019 13:34:09 +0200
-Subject: [PATCH 2/5] Find IlmBase by setting a proper ILMBASE_ROOT value and
- by using pkg-config to determine the installed ilmbase version, instead of
- using the cmake STRINGS command.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- cmake/Modules/FindIlmBase.cmake | 18 +++++++++++++++++-
- cmake/Modules/FindPyIlmBase.cmake | 2 +-
- 2 files changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/Modules/FindIlmBase.cmake b/cmake/Modules/FindIlmBase.cmake
-index 679a02f..0fe2b1a 100644
---- a/cmake/Modules/FindIlmBase.cmake
-+++ b/cmake/Modules/FindIlmBase.cmake
-@@ -52,7 +52,7 @@ IF(NOT DEFINED ILMBASE_ROOT)
- SET( ALEMBIC_ILMBASE_ROOT NOTFOUND )
- ELSE()
- # TODO: set to default install path when shipping out
-- SET( ALEMBIC_ILMBASE_ROOT "/usr/local/ilmbase-1.0.1/" )
-+ SET( ALEMBIC_ILMBASE_ROOT "/usr" )
- ENDIF()
- ELSE()
- IF ( ${WINDOWS} )
-@@ -87,6 +87,21 @@ SET(_ilmbase_SEARCH_DIRS
- /usr/freeware
- )
-
-+# use pkg-config to determine the correct version
-+include(FindPkgConfig)
-+IF(PKG_CONFIG_FOUND)
-+ PKG_CHECK_MODULES(PC_ILMBASE QUIET IlmBase)
-+ IF(PC_ILMBASE_FOUND)
-+ SET(ILMBASE_VERSION ${PC_ILMBASE_VERSION})
-+ SET(ALEMBIC_ILMBASE_INCLUDE_DIRECTORY ${PC_ILMBASE_INCLUDE_DIRS})
-+ STRING(REGEX MATCH "-lHalf" ALEMBIC_ILMBASE_HALF_LIB ${PC_ILMBASE_LDFLAGS})
-+ STRING(REGEX MATCH "-lIex" ALEMBIC_ILMBASE_IEX_LIB ${PC_ILMBASE_LDFLAGS})
-+ STRING(REGEX MATCH "-lIexMath" ALEMBIC_ILMBASE_IEXMATH_LIB ${PC_ILMBASE_LDFLAGS})
-+ STRING(REGEX MATCH "-lIlmThread" ALEMBIC_ILMBASE_ILMTHREAD_LIB ${PC_ILMBASE_LDFLAGS})
-+ String(REGEX MATCH "-lImath" ALEMBIC_ILMBASE_IMATH_LIB ${PC_ILMBASE_LDFLAGS})
-+ ENDIF()
-+ELSE(PKG_CONFIG_FOUND)
-+
- FIND_PATH(ILMBASE_INCLUDE_DIR
- NAMES
- IlmBaseConfig.h
-@@ -179,6 +194,7 @@ IF ( ${ALEMBIC_ILMBASE_INCLUDE_DIRECTORY} STREQUAL "ALEMBIC_ILMBASE_INCLUDE_DIRE
- MESSAGE( FATAL_ERROR "ilmbase header files not found, required: ALEMBIC_ILMBASE_ROOT: ${ALEMBIC_ILMBASE_ROOT}" )
- ENDIF()
-
-+ENDIF(PKG_CONFIG_FOUND)
-
- MESSAGE( STATUS "ILMBASE INCLUDE PATH: ${ALEMBIC_ILMBASE_INCLUDE_DIRECTORY}" )
- MESSAGE( STATUS "HALF LIB: ${ALEMBIC_ILMBASE_HALF_LIB}" )
-diff --git a/cmake/Modules/FindPyIlmBase.cmake b/cmake/Modules/FindPyIlmBase.cmake
-index d55f8d3..b5f3cb5 100644
---- a/cmake/Modules/FindPyIlmBase.cmake
-+++ b/cmake/Modules/FindPyIlmBase.cmake
-@@ -44,7 +44,7 @@ ELSE()
- SET(ALEMBIC_PYILMBASE_ROOT NOTFOUND)
- ELSE()
- # TODO: set to default install path when shipping out
-- SET(ALEMBIC_PYILMBASE_ROOT "/usr/local/pyilmbase/")
-+ SET(ALEMBIC_PYILMBASE_ROOT "/usr")
- ENDIF()
- ELSE()
- IF (${WINDOWS})
---
-2.22.0
-
diff --git a/media-gfx/alembic/files/alembic-1.7.11-0003-Fix-env-var-for-renderman.patch b/media-gfx/alembic/files/alembic-1.7.11-0003-Fix-env-var-for-renderman.patch
deleted file mode 100644
index 9777bad13e8..00000000000
--- a/media-gfx/alembic/files/alembic-1.7.11-0003-Fix-env-var-for-renderman.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 3ca71af0e83fce89df0bfb472b28abe3c4e08c57 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Sat, 15 Jun 2019 15:13:03 +0200
-Subject: [PATCH 3/5] Fix env var for renderman. This is called RMANTREE on
- linux.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- cmake/AlembicPRMan.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/AlembicPRMan.cmake b/cmake/AlembicPRMan.cmake
-index e02b237..fdbf26c 100644
---- a/cmake/AlembicPRMan.cmake
-+++ b/cmake/AlembicPRMan.cmake
-@@ -66,8 +66,8 @@ ELSE()
- ENDIF()
-
- # Prefer PRMAN_ROOT set from the environment over the CMakeCache'd variable
--IF(NOT $ENV{PRMAN_ROOT}x STREQUAL "x")
-- SET( ALEMBIC_PRMAN_ROOT $ENV{PRMAN_ROOT})
-+IF(NOT $ENV{RMANTREE}x STREQUAL "x")
-+ SET( ALEMBIC_PRMAN_ROOT $ENV{RMANTREE})
- ENDIF()
-
-
---
-2.22.0
-
diff --git a/media-gfx/alembic/files/alembic-1.7.11-0004-Fix-a-compile-issue-with-const.patch b/media-gfx/alembic/files/alembic-1.7.11-0004-Fix-a-compile-issue-with-const.patch
deleted file mode 100644
index 73e989ba6a6..00000000000
--- a/media-gfx/alembic/files/alembic-1.7.11-0004-Fix-a-compile-issue-with-const.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d1895084e41970c8f91e9357fcb739ac29c47109 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Sat, 15 Jun 2019 16:19:30 +0200
-Subject: [PATCH 4/5] WriteGeo.cpp: Fix a compile issue, where an invalid
- conversion from char* to const char* took place.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- prman/Procedural/WriteGeo.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/prman/Procedural/WriteGeo.cpp b/prman/Procedural/WriteGeo.cpp
-index 95b4867..5ad0b71 100644
---- a/prman/Procedural/WriteGeo.cpp
-+++ b/prman/Procedural/WriteGeo.cpp
-@@ -898,7 +898,7 @@ void ProcessCurves( ICurves &curves, ProcArgs &args )
- void WriteIdentifier( const ObjectHeader &ohead )
- {
- std::string name = ohead.getFullName();
-- char* nameArray[] = { const_cast<char*>( name.c_str() ), RI_NULL };
-+ const char* nameArray[] = { const_cast<char*>( name.c_str() ), RI_NULL };
-
- RiAttribute(const_cast<char*>( "identifier" ), const_cast<char*>( "name" ),
- nameArray, RI_NULL );
---
-2.22.0
-
diff --git a/media-gfx/alembic/files/alembic-1.7.11-0006-python-PyAlembic-Tests-CMakeLists.txt-fix-variable.patch b/media-gfx/alembic/files/alembic-1.7.11-0006-python-PyAlembic-Tests-CMakeLists.txt-fix-variable.patch
deleted file mode 100644
index 6bb8090344f..00000000000
--- a/media-gfx/alembic/files/alembic-1.7.11-0006-python-PyAlembic-Tests-CMakeLists.txt-fix-variable.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 13b88370a862e16b417e9df6e40c2a9cba10852c Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Fri, 2 Aug 2019 21:31:03 +0200
-Subject: [PATCH] python/PyAlembic/Tests/CMakeLists.txt: fix variable
-
-The patch fixes a boost_python related variable which didn't had
-the version suffix for python.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- python/PyAlembic/Tests/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/python/PyAlembic/Tests/CMakeLists.txt b/python/PyAlembic/Tests/CMakeLists.txt
-index c32a018..ed9b23d 100644
---- a/python/PyAlembic/Tests/CMakeLists.txt
-+++ b/python/PyAlembic/Tests/CMakeLists.txt
-@@ -57,7 +57,7 @@ TARGET_LINK_LIBRARIES(PyAlembic_Test Alembic::Alembic ${ALEMBIC_PYILMBASE_LIBS})
-
- ADD_TEST(PyAlembic_Python_TEST PyAlembic_Test)
-
--GET_FILENAME_COMPONENT(BOOST_LIBRARY_DIR ${Boost_PYTHON_LIBRARY} PATH)
-+GET_FILENAME_COMPONENT(BOOST_LIBRARY_DIR ${Boost_PYTHON27_LIBRARY} PATH)
- GET_FILENAME_COMPONENT(ILMBASE_LIBRARY_DIR ${ALEMBIC_ILMBASE_IMATH_LIB} PATH)
-
- CONFIGURE_FILE(
---
-2.22.0
-
diff --git a/media-gfx/alembic/metadata.xml b/media-gfx/alembic/metadata.xml
index 034ebe0790b..cbe5fd8cc57 100644
--- a/media-gfx/alembic/metadata.xml
+++ b/media-gfx/alembic/metadata.xml
@@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>waebbl@gmail.com</email>
+ <email>waebbl-gentoo@posteo.net</email>
<name>Bernd Waibel</name>
</maintainer>
<maintainer type="project">
@@ -14,17 +14,12 @@
developed by Sony Pictures Imageworks Inc. and Lucasfilm Ltd.
</longdescription>
<use>
- <flag name="boost">Use <pkg>dev-libs/boost</pkg> library</flag>
- <flag name="examples">Install alembic examples</flag>
<flag name="hdf5">Add support <pkg>sci-libs/hdf5</pkg></flag>
- <flag name="prman">
- Compile Alembic plugin for Renderman (experimental)
- </flag>
<flag name="test">Build and run the test-suite</flag>
<flag name="zlib">Use <pkg>sys-libs/zlib</pkg> for compressions</flag>
</use>
<upstream>
<bugs-to>https://github.com/alembic/alembic/issues</bugs-to>
- <remote-id type="github">https://github.com/alembic/alembic</remote-id>
+ <remote-id type="github">alembic/alembic</remote-id>
</upstream>
</pkgmetadata>
diff --git a/media-gfx/argyllcms/argyllcms-2.1.2-r1.ebuild b/media-gfx/argyllcms/argyllcms-2.1.2-r1.ebuild
index 25461f6d175..8525a9f4b21 100644
--- a/media-gfx/argyllcms/argyllcms-2.1.2-r1.ebuild
+++ b/media-gfx/argyllcms/argyllcms-2.1.2-r1.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/argyllcms/argyllcms-2.1.2.ebuild b/media-gfx/argyllcms/argyllcms-2.1.2.ebuild
deleted file mode 100644
index 4eae0ce5c41..00000000000
--- a/media-gfx/argyllcms/argyllcms-2.1.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multiprocessing toolchain-funcs udev
-
-MY_P="Argyll_V${PV}"
-
-DESCRIPTION="Open source, ICC compatible color management system"
-HOMEPAGE="http://www.argyllcms.com/"
-SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm64 hppa x86"
-IUSE="doc libressl"
-
-RDEPEND="
- media-libs/tiff:0
- sys-libs/zlib
- virtual/jpeg:0
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libXdmcp
- x11-libs/libXext
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXxf86vm
- x11-libs/libXScrnSaver
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}
- app-arch/unzip
- dev-util/ftjam"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
- # Make it respect LDFLAGS
- echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop
-
- # Evil hack to get --as-needed working. The build system unfortunately lists all
- # the shared libraries by default on the command line _before_ the object to be built...
- echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop
-
- append-cflags -DUNIX -D_THREAD_SAFE
-
- sed \
- -e 's:CCFLAGS:CFLAGS:g' \
- -e "s:ar rusc:$(tc-getAR) rusc:g" \
- -i Jambase || die
-
- tc-export CC RANLIB
-
- jam -dx -fJambase "-j$(makeopts_jobs)" || die
-}
-
-src_install() {
- jam -dx -fJambase install || die
-
- rm bin/License.txt || die
-
- pushd bin > /dev/null
- local binname
- for binname in * ; do
- newbin ${binname} argyll-${binname}
- done
- popd > /dev/null
-
- dodoc log.txt Readme.txt ttbd.txt notes.txt
- if use doc; then
- docinto html
- dodoc doc/*html doc/*jpg doc/*gif
- fi
-
- insinto /usr/share/${PN}
- doins -r ref
-
- udev_dorules usb/55-Argyll.rules
-}
-
-pkg_postinst() {
- elog "If you have a Spyder2 you need to extract the firmware"
- elog "from the CVSpyder.dll of the windows driver package"
- elog "and store it as /usr/share/color/spyd2PLD.bin"
- echo
- elog "For further info on setting up instrument access read"
- elog "http://www.argyllcms.com/doc/Installing_Linux.html"
- echo
-}
diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index 96bdef79e14..db4715715f9 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -1,4 +1,2 @@
-DIST asymptote-2.61.src.tgz 4623504 BLAKE2B 8432f07ce21f630c5bdae609650c0bb2bcd237a121df68030dc19d1cae986f0bfa56dd0e241570809f9fcb202440e8b9b3c6d47a22eeaabe3eb9523360a166ca SHA512 34bb610360b4536da70ca9edf1e069ebbf0c9225948b92b3d59ea25e8684587364fa7bbb03909ba02617e6ee81d41a2e530c9ed639141e4cda42096143cab5f7
-DIST asymptote-2.62.src.tgz 4625853 BLAKE2B 49a5c75f936149139576cc224b005e76d2465a6c813bcb152f2534e98e042685c1500eafb0954b9e53ac0e667b47ab88a8b3387f1627d58828008d0e4d4cc0c8 SHA512 f7e817cdbb3c079a10c5f6f56a1eb47b1aaf8230902c06870bc8feacfed5f7af3d8ed22e4c60cc7130828ced8d36ec035533de1074cb049d3de9006ee542ac2e
-DIST asymptote-2.65.src.tgz 4640419 BLAKE2B a508532b9697a0744d48f8109d5b04ca71eb1ee7a08f15eccd2b95d63c16c980621ef03d01a03917a767c774f14a239a13f8fe50ad98b154b092f710917af1ad SHA512 c6879689192c1646a318b389de222accc55c8d5e9df17fab3c88c37f627d2cff8133cdefe9e6dec2784cf72edf261e557ad83f7fac6e67fd49c483e9d8971026
-DIST asymptote-2.67.src.tgz 4668696 BLAKE2B 30be754a0e5869caad4d605f162dffe688d2dc09a0163a8c37d15fd9d6dd05652b7b0b2710ab31edaa8f4b36484df256d032f8826f3547e755eb90e5dbb179ec SHA512 5854ce51bc7a3d330eeb0887376645c3d292a368b06d01ec84c15ee5beee90ae429abfee1bff5025bdfb51edfa7f66e535c1187f66440df0c6626c79e3de6210
+DIST asymptote-2.68.src.tgz 4672007 BLAKE2B 96c1a99815cf04180ea2fe01528615390faf8d1e5853d4e2e5f4fcdf48f0ec7e774ab0facdb86ad427e6ac11f5ce684902997f7d1e4855460ad450f6d6c64cfd SHA512 20aa3ae5116b93f266020a1d45178d7120cf39980634108b86a0bc8a4202e28b2cf0a1ac6fa5e921506db150e9077a1e3d7b8ad04869bc9bd22bae447f45fd46
+DIST asymptote-2.69.src.tgz 4673601 BLAKE2B 9734ffec10c9c0b8053598402a4eb81a3ed8a48f8ce8e58d1720442be26e25fe7778d6d47cd2d29dae61183d15aaa456bca430ab98e951844c8210484226e67f SHA512 a1b746600b4e6880350e57adeb3a3228d10b1b0c1db11ee0e750545cf8023716eec92253c0cd0980747f72c16fd0097f25ee688657168f24a0def106260e0791
diff --git a/media-gfx/asymptote/asymptote-2.62.ebuild b/media-gfx/asymptote/asymptote-2.62.ebuild
deleted file mode 100644
index af22df7d3e9..00000000000
--- a/media-gfx/asymptote/asymptote-2.62.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit autotools elisp-common latex-package python-r1
-
-DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
-HOMEPAGE="https://asymptote.sourceforge.io/"
-SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- offscreen? ( opengl )
- doc? ( boehm-gc )"
-
-RDEPEND="
- >=sys-libs/ncurses-5.4-r5:0=
- >=sys-libs/readline-4.3-r5:0=
- imagemagick? ( media-gfx/imagemagick[png] )
- opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm )
- offscreen? ( media-libs/mesa[osmesa] )
- svg? ( app-text/dvisvgm )
- sigsegv? ( dev-libs/libsigsegv )
- boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] )
- fftw? ( >=sci-libs/fftw-3.0.1 )
- gsl? ( sci-libs/gsl )
- python? ( ${PYTHON_DEPS} )
- X? (
- ${PYTHON_DEPS}
- dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,svg]
- dev-python/numpy
- dev-python/pycson
- >=gnome-base/librsvg-2.40
- )
- latex? (
- virtual/latex-base
- >=dev-texlive/texlive-latexextra-2013
- )
- emacs? ( >=app-editors/emacs-23.1:* )
- vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-DEPEND="${RDEPEND}
- doc? (
- dev-lang/perl
- media-gfx/imagemagick[png]
- virtual/texi2dvi
- virtual/latex-base
- app-text/ghostscript-gpl )
- test? ( app-text/ghostscript-gpl )"
-
-TEXMF=/usr/share/texmf-site
-
-PATCHES=(
- # Changing pdf, ps, image viewers to xdg-open
- "${FILESDIR}/${P}-xdg-utils.patch"
-
- # Bug #322473
- "${FILESDIR}/${P}-info.patch"
-)
-
-src_prepare() {
- sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \
- -i configure.ac \
- || die "sed configure.ac failed"
-
- default
- eautoreconf
-}
-
-src_configure() {
- # for the CPPFLAGS see
- # https://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349
- econf \
- CPPFLAGS=-DHAVE_SYS_TYPES_H \
- CFLAGS="${CXXFLAGS}" \
- --disable-gc-debug \
- $(use_enable boehm-gc gc system) \
- $(use_enable fftw) \
- $(use_enable gsl) \
- $(use_enable opengl gl) \
- $(use_enable offscreen) \
- $(use_enable sigsegv)
-}
-
-src_compile() {
- default
-
- cd doc || die
- emake asy.1
- if use doc; then
- # info
- einfo "Making info"
- emake ${PN}.info
- cd FAQ || die
- emake
- cd .. || die
- # pdf
- einfo "Making pdf docs"
- export VARTEXFONTS="${T}"/fonts
- # see bug #260606
- emake -j1 asymptote.pdf
- emake CAD.pdf
- fi
- cd .. || die
-
- if use emacs; then
- einfo "Compiling emacs lisp files"
- elisp-compile base/*.el
- fi
-}
-
-src_install() {
- # the program
- dobin asy
-
- # .asy files
- insinto /usr/share/${PN}
- doins base/*.asy
-
- # documentation
- dodoc BUGS ChangeLog README ReleaseNotes TODO
- doman doc/asy.1
-
- # X GUI
- if use X; then
- insinto /usr/share/${PN}
- doins -r GUI
- chmod +x "${D}"/usr/share/${PN}/GUI/xasy.py
- dosym ../share/${PN}/GUI/xasy.py /usr/bin/xasy
- doman doc/xasy.1x
- fi
-
- # examples
- if use examples; then
- insinto /usr/share/${PN}/examples
- doins \
- examples/*.asy \
- doc/*.asy \
- doc/*.csv \
- doc/*.dat \
- doc/extra/*.asy
- insinto /usr/share/${PN}/examples/animations
- doins examples/animations/*.asy
- fi
-
- # LaTeX style
- if use latex; then
- cd doc || die
- insinto "${TEXMF}"/tex/latex/${PN}
- doins ${PN}.sty asycolors.sty
- if use examples; then
- insinto /usr/share/${PN}/examples
- doins latexusage.tex
- insinto /usr/share/${PN}/examples/animations
- doins ../examples/animations/*.tex
- fi
- cd .. || die
- fi
-
- # asymptote.py
- if use python; then
- python_foreach_impl python_domodule base/${PN}.py
- fi
-
- # emacs mode
- if use emacs; then
- elisp-install ${PN} base/*.el base/*.elc
- elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
- fi
-
- # vim syntax
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins base/asy.vim
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}"/asy-ftd.vim
- fi
-
- # extra documentation
- if use doc; then
- cd doc || die
- doinfo ${PN}.info*
- dodoc ${PN}.pdf CAD.pdf
- cd FAQ || die
- dodoc asy-faq.ascii
- doinfo asy-faq.info
- docinto html/FAQ
- dodoc asy-faq.html/*
- fi
-}
-
-pkg_postinst() {
- use latex && latex-package_rehash
- use emacs && elisp-site-regen
-
- elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer'
- elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer'
-}
-
-pkg_postrm() {
- use latex && latex-package_rehash
- use emacs && elisp-site-regen
-}
diff --git a/media-gfx/asymptote/asymptote-2.65.ebuild b/media-gfx/asymptote/asymptote-2.65.ebuild
deleted file mode 100644
index 99fe53927a8..00000000000
--- a/media-gfx/asymptote/asymptote-2.65.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit autotools elisp-common latex-package python-r1
-
-DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
-HOMEPAGE="https://asymptote.sourceforge.io/"
-SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- offscreen? ( opengl )
- doc? ( boehm-gc )"
-
-RDEPEND="
- >=sys-libs/ncurses-5.4-r5:0=
- >=sys-libs/readline-4.3-r5:0=
- imagemagick? ( media-gfx/imagemagick[png] )
- opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm )
- offscreen? ( media-libs/mesa[osmesa] )
- svg? ( app-text/dvisvgm )
- sigsegv? ( dev-libs/libsigsegv )
- boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] )
- fftw? ( >=sci-libs/fftw-3.0.1 )
- gsl? ( sci-libs/gsl )
- python? ( ${PYTHON_DEPS} )
- X? (
- ${PYTHON_DEPS}
- dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,svg]
- dev-python/numpy
- dev-python/pycson
- >=gnome-base/librsvg-2.40
- )
- latex? (
- virtual/latex-base
- >=dev-texlive/texlive-latexextra-2013
- )
- emacs? ( >=app-editors/emacs-23.1:* )
- vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-DEPEND="${RDEPEND}
- doc? (
- dev-lang/perl
- media-gfx/imagemagick[png]
- virtual/texi2dvi
- virtual/latex-base
- app-text/ghostscript-gpl )
- test? ( app-text/ghostscript-gpl )"
-
-TEXMF=/usr/share/texmf-site
-
-PATCHES=(
- # Changing pdf, ps, image viewers to xdg-open
- "${FILESDIR}/${P}-xdg-utils.patch"
-
- # Bug #322473
- "${FILESDIR}/${P}-info.patch"
-)
-
-src_prepare() {
- sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \
- -i configure.ac \
- || die "sed configure.ac failed"
-
- default
- eautoreconf
-}
-
-src_configure() {
- # for the CPPFLAGS see
- # https://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349
- econf \
- CPPFLAGS=-DHAVE_SYS_TYPES_H \
- CFLAGS="${CXXFLAGS}" \
- --disable-gc-debug \
- $(use_enable boehm-gc gc system) \
- $(use_enable fftw) \
- $(use_enable gsl) \
- $(use_enable opengl gl) \
- $(use_enable offscreen) \
- $(use_enable sigsegv)
-}
-
-src_compile() {
- default
-
- cd doc || die
- emake asy.1
- if use doc; then
- # info
- einfo "Making info"
- emake ${PN}.info
- cd FAQ || die
- emake
- cd .. || die
- # pdf
- einfo "Making pdf docs"
- export VARTEXFONTS="${T}"/fonts
- # see bug #260606
- emake -j1 asymptote.pdf
- emake CAD.pdf
- fi
- cd .. || die
-
- if use emacs; then
- einfo "Compiling emacs lisp files"
- elisp-compile base/*.el
- fi
-}
-
-src_install() {
- # the program
- dobin asy
-
- # .asy files
- insinto /usr/share/${PN}
- doins base/*.asy
-
- # documentation
- dodoc BUGS ChangeLog README ReleaseNotes TODO
- doman doc/asy.1
-
- # X GUI
- if use X; then
- insinto /usr/share/${PN}
- doins -r GUI
- chmod +x "${D}"/usr/share/${PN}/GUI/xasy.py
- dosym ../share/${PN}/GUI/xasy.py /usr/bin/xasy
- doman doc/xasy.1x
- fi
-
- # examples
- if use examples; then
- insinto /usr/share/${PN}/examples
- doins \
- examples/*.asy \
- doc/*.asy \
- doc/*.csv \
- doc/*.dat \
- doc/extra/*.asy
- insinto /usr/share/${PN}/examples/animations
- doins examples/animations/*.asy
- fi
-
- # LaTeX style
- if use latex; then
- cd doc || die
- insinto "${TEXMF}"/tex/latex/${PN}
- doins ${PN}.sty asycolors.sty
- if use examples; then
- insinto /usr/share/${PN}/examples
- doins latexusage.tex
- insinto /usr/share/${PN}/examples/animations
- doins ../examples/animations/*.tex
- fi
- cd .. || die
- fi
-
- # asymptote.py
- if use python; then
- python_foreach_impl python_domodule base/${PN}.py
- fi
-
- # emacs mode
- if use emacs; then
- elisp-install ${PN} base/*.el base/*.elc
- elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
- fi
-
- # vim syntax
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins base/asy.vim
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}"/asy-ftd.vim
- fi
-
- # extra documentation
- if use doc; then
- cd doc || die
- doinfo ${PN}.info*
- dodoc ${PN}.pdf CAD.pdf
- cd FAQ || die
- dodoc asy-faq.ascii
- doinfo asy-faq.info
- docinto html/FAQ
- dodoc asy-faq.html/*
- fi
-}
-
-pkg_postinst() {
- use latex && latex-package_rehash
- use emacs && elisp-site-regen
-
- elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer'
- elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer'
-}
-
-pkg_postrm() {
- use latex && latex-package_rehash
- use emacs && elisp-site-regen
-}
diff --git a/media-gfx/asymptote/asymptote-2.67.ebuild b/media-gfx/asymptote/asymptote-2.68.ebuild
index 1e7593538a8..55f17d507ae 100644
--- a/media-gfx/asymptote/asymptote-2.67.ebuild
+++ b/media-gfx/asymptote/asymptote-2.68.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
inherit autotools elisp-common latex-package python-r1
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X"
RESTRICT="!test? ( test )"
diff --git a/media-gfx/asymptote/asymptote-2.61.ebuild b/media-gfx/asymptote/asymptote-2.69.ebuild
index 0117ea06a1d..b7b0b25d288 100644
--- a/media-gfx/asymptote/asymptote-2.61.ebuild
+++ b/media-gfx/asymptote/asymptote-2.69.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{7..9} )
inherit autotools elisp-common latex-package python-r1
@@ -13,8 +13,9 @@ SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="+boehm-gc curl doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax"
+# FIXME: xasy is currently broken
RESTRICT="!test? ( test )"
REQUIRED_USE="
@@ -25,8 +26,9 @@ REQUIRED_USE="
RDEPEND="
>=sys-libs/ncurses-5.4-r5:0=
>=sys-libs/readline-4.3-r5:0=
+ net-libs/libtirpc
imagemagick? ( media-gfx/imagemagick[png] )
- opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm )
+ opengl? ( media-libs/mesa media-libs/freeglut media-libs/glew:0 media-libs/glm )
offscreen? ( media-libs/mesa[osmesa] )
svg? ( app-text/dvisvgm )
sigsegv? ( dev-libs/libsigsegv )
@@ -34,13 +36,7 @@ RDEPEND="
fftw? ( >=sci-libs/fftw-3.0.1 )
gsl? ( sci-libs/gsl )
python? ( ${PYTHON_DEPS} )
- X? (
- ${PYTHON_DEPS}
- dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,svg]
- dev-python/numpy
- dev-python/pycson
- >=gnome-base/librsvg-2.40
- )
+ curl? ( net-misc/curl )
latex? (
virtual/latex-base
>=dev-texlive/texlive-latexextra-2013
@@ -83,6 +79,7 @@ src_configure() {
CFLAGS="${CXXFLAGS}" \
--disable-gc-debug \
$(use_enable boehm-gc gc system) \
+ $(use_enable curl) \
$(use_enable fftw) \
$(use_enable gsl) \
$(use_enable opengl gl) \
@@ -123,29 +120,26 @@ src_install() {
# .asy files
insinto /usr/share/${PN}
- doins base/*.asy
+ doins -r base/*.asy base/shaders base/webgl
# documentation
dodoc BUGS ChangeLog README ReleaseNotes TODO
doman doc/asy.1
- # X GUI
- if use X; then
- insinto /usr/share/${PN}
- doins -r GUI
- chmod +x "${D}"/usr/share/${PN}/GUI/xasy.py
- dosym ../share/${PN}/GUI/xasy.py /usr/bin/xasy
- doman doc/xasy.1x
- fi
-
# examples
if use examples; then
insinto /usr/share/${PN}/examples
doins \
examples/*.asy \
+ examples/*.views \
+ examples/*.dat \
+ examples/*.bib \
+ examples/piicon.png \
+ examples/100d.pdb1 \
doc/*.asy \
doc/*.csv \
doc/*.dat \
+ doc/pixel.pdf \
doc/extra/*.asy
insinto /usr/share/${PN}/examples/animations
doins examples/animations/*.asy
@@ -158,7 +152,7 @@ src_install() {
doins ${PN}.sty asycolors.sty
if use examples; then
insinto /usr/share/${PN}/examples
- doins latexusage.tex
+ doins latexusage.tex externalprc.tex
insinto /usr/share/${PN}/examples/animations
doins ../examples/animations/*.tex
fi
@@ -172,7 +166,7 @@ src_install() {
# emacs mode
if use emacs; then
- elisp-install ${PN} base/*.el base/*.elc
+ elisp-install ${PN} base/*.el base/*.elc asy-keywords.el
elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
fi
@@ -181,7 +175,7 @@ src_install() {
insinto /usr/share/vim/vimfiles/syntax
doins base/asy.vim
insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}"/asy-ftd.vim
+ doins base/asy_filetype.vim
fi
# extra documentation
diff --git a/media-gfx/asymptote/files/asy-ftd.vim b/media-gfx/asymptote/files/asy-ftd.vim
deleted file mode 100644
index 0f5e3957900..00000000000
--- a/media-gfx/asymptote/files/asy-ftd.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-au BufNewFile,BufRead *.asy setf asy
-filetype plugin on
diff --git a/media-gfx/asymptote/files/asymptote-2.61-info.patch b/media-gfx/asymptote/files/asymptote-2.61-info.patch
deleted file mode 100644
index 0046ab9628a..00000000000
--- a/media-gfx/asymptote/files/asymptote-2.61-info.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: asymptote-2.61/doc/asymptote.texi
-===================================================================
---- asymptote-2.61.orig/doc/asymptote.texi
-+++ asymptote-2.61/doc/asymptote.texi
-@@ -23,7 +23,7 @@ file LICENSE in the top-level source dir
-
- @dircategory Languages
- @direntry
--* asymptote: (asymptote/asymptote). Vector graphics language.
-+* asymptote: (asymptote). Vector graphics language.
- @end direntry
-
- @titlepage
diff --git a/media-gfx/asymptote/files/asymptote-2.61-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.61-xdg-utils.patch
deleted file mode 100644
index 269691eecfe..00000000000
--- a/media-gfx/asymptote/files/asymptote-2.61-xdg-utils.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: asymptote-2.61/settings.cc
-===================================================================
---- asymptote-2.61.orig/settings.cc
-+++ asymptote-2.61/settings.cc
-@@ -98,13 +98,13 @@ string defaultPSViewer="open";
- string defaultPDFViewer="open";
- string defaultHTMLViewer="open";
- #else
--string defaultPSViewer="gv";
--string defaultPDFViewer="acroread";
--string defaultHTMLViewer="google-chrome";
-+string defaultPSViewer="xdg-open";
-+string defaultPDFViewer="xdg-open";
-+string defaultHTMLViewer="xdg-open";
- #endif
- string defaultGhostscript="gs";
- string defaultGhostscriptLibrary="";
--string defaultDisplay="display";
-+string defaultDisplay="xdg-open";
- string defaultAnimate="animate";
- void queryRegistry() {}
- const string dirsep="/";
diff --git a/media-gfx/asymptote/files/asymptote-2.62-info.patch b/media-gfx/asymptote/files/asymptote-2.62-info.patch
deleted file mode 100644
index ffc8ac7c8fb..00000000000
--- a/media-gfx/asymptote/files/asymptote-2.62-info.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: asymptote-2.62/doc/asymptote.texi
-===================================================================
---- asymptote-2.62.orig/doc/asymptote.texi
-+++ asymptote-2.62/doc/asymptote.texi
-@@ -23,7 +23,7 @@ file LICENSE in the top-level source dir
-
- @dircategory Languages
- @direntry
--* asymptote: (asymptote/asymptote). Vector graphics language.
-+* asymptote: (asymptote). Vector graphics language.
- @end direntry
-
- @titlepage
diff --git a/media-gfx/asymptote/files/asymptote-2.62-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.62-xdg-utils.patch
deleted file mode 100644
index b26bc78fda2..00000000000
--- a/media-gfx/asymptote/files/asymptote-2.62-xdg-utils.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: asymptote-2.62/settings.cc
-===================================================================
---- asymptote-2.62.orig/settings.cc
-+++ asymptote-2.62/settings.cc
-@@ -98,13 +98,13 @@ string defaultPSViewer="open";
- string defaultPDFViewer="open";
- string defaultHTMLViewer="open";
- #else
--string defaultPSViewer="gv";
--string defaultPDFViewer="acroread";
--string defaultHTMLViewer="google-chrome";
-+string defaultPSViewer="xdg-open";
-+string defaultPDFViewer="xdg-open";
-+string defaultHTMLViewer="xdg-open";
- #endif
- string defaultGhostscript="gs";
- string defaultGhostscriptLibrary="";
--string defaultDisplay="display";
-+string defaultDisplay="xdg-open";
- string defaultAnimate="animate";
- void queryRegistry() {}
- const string dirsep="/";
diff --git a/media-gfx/asymptote/files/asymptote-2.67-info.patch b/media-gfx/asymptote/files/asymptote-2.68-info.patch
index c0812477115..c0812477115 100644
--- a/media-gfx/asymptote/files/asymptote-2.67-info.patch
+++ b/media-gfx/asymptote/files/asymptote-2.68-info.patch
diff --git a/media-gfx/asymptote/files/asymptote-2.67-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.68-xdg-utils.patch
index a6a2c7daba0..a6a2c7daba0 100644
--- a/media-gfx/asymptote/files/asymptote-2.67-xdg-utils.patch
+++ b/media-gfx/asymptote/files/asymptote-2.68-xdg-utils.patch
diff --git a/media-gfx/asymptote/files/asymptote-2.65-info.patch b/media-gfx/asymptote/files/asymptote-2.69-info.patch
index 27d0e5ce868..63f2dc28176 100644
--- a/media-gfx/asymptote/files/asymptote-2.65-info.patch
+++ b/media-gfx/asymptote/files/asymptote-2.69-info.patch
@@ -1,7 +1,7 @@
-Index: asymptote-2.65/doc/asymptote.texi
+Index: asymptote-2.69/doc/asymptote.texi
===================================================================
---- asymptote-2.65.orig/doc/asymptote.texi
-+++ asymptote-2.65/doc/asymptote.texi
+--- asymptote-2.69.orig/doc/asymptote.texi
++++ asymptote-2.69/doc/asymptote.texi
@@ -23,7 +23,7 @@ file LICENSE in the top-level source dir
@dircategory Languages
diff --git a/media-gfx/asymptote/files/asymptote-2.65-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.69-xdg-utils.patch
index 6f4fb6cbcf4..f07d23ac618 100644
--- a/media-gfx/asymptote/files/asymptote-2.65-xdg-utils.patch
+++ b/media-gfx/asymptote/files/asymptote-2.69-xdg-utils.patch
@@ -1,18 +1,19 @@
-Index: asymptote-2.65/settings.cc
+Только в asymptote-2.67.orig: .pc
+Index: asymptote-2.69/settings.cc
===================================================================
---- asymptote-2.65.orig/settings.cc
-+++ asymptote-2.65/settings.cc
-@@ -100,13 +100,13 @@ string defaultPSViewer="open";
+--- asymptote-2.69.orig/settings.cc
++++ asymptote-2.69/settings.cc
+@@ -101,13 +101,13 @@ string defaultPSViewer="open";
string defaultPDFViewer="open";
string defaultHTMLViewer="open";
- #else
+ #else
-string defaultPSViewer="gv";
-string defaultPDFViewer="acroread";
-string defaultHTMLViewer="google-chrome";
+string defaultPSViewer="xdg-open";
+string defaultPDFViewer="xdg-open";
+string defaultHTMLViewer="xdg-open";
- #endif
+ #endif
string defaultGhostscript="gs";
string defaultGhostscriptLibrary="";
-string defaultDisplay="display";
diff --git a/media-gfx/asymptote/metadata.xml b/media-gfx/asymptote/metadata.xml
index fee8887be49..0f12983bc2f 100644
--- a/media-gfx/asymptote/metadata.xml
+++ b/media-gfx/asymptote/metadata.xml
@@ -20,10 +20,12 @@
</longdescription>
<use>
<flag name="boehm-gc">Enables using the Boehm-Demers-Weiser conservative garbage collector</flag>
+ <flag name="curl">Enables running remote programs via <pkg>net-misc/curl</pkg></flag>
<flag name="sigsegv">Enables using <pkg>dev-libs/libsigsegv</pkg></flag>
<flag name="offscreen">Enables off-screen rendering</flag>
</use>
<upstream>
<remote-id type="sourceforge">asymptote</remote-id>
+ <remote-id type="github">vectorgraphics/asymptote</remote-id>
</upstream>
</pkgmetadata>
diff --git a/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild b/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild
index b9fffc443b2..aa638775851 100644
--- a/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild
+++ b/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit cmake-utils
+inherit cmake
DESCRIPTION="SIFT algorithm for automatic panorama creation in C"
HOMEPAGE="http://hugin.sourceforge.net/ http://user.cs.tu-berlin.de/~nowozin/autopano-sift/"
@@ -25,4 +25,7 @@ RDEPEND="${DEPEND}
!media-gfx/autopano-sift
"
-PATCHES=( "${FILESDIR}"/${P}-lm.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-lm.patch
+ "${FILESDIR}"/${P}-include-order.patch # bug 759514
+)
diff --git a/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-include-order.patch b/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-include-order.patch
new file mode 100644
index 00000000000..becab6d4aeb
--- /dev/null
+++ b/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-include-order.patch
@@ -0,0 +1,24 @@
+Subject: [PATCH] adjust to include order deoendency
+
+---
+ autopano-sift-C-2.5.1/KeypointXML.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/autopano-sift-C-2.5.1/KeypointXML.c b/autopano-sift-C-2.5.1/KeypointXML.c
+index 9da70a8..30c35e1 100644
+--- a/KeypointXML.c
++++ b/KeypointXML.c
+@@ -13,10 +13,9 @@
+ * (C) Copyright 2004 -- Sebastian Nowozin (nowozin@cs.tu-berlin.de)
+ */
+
+-#include "AutoPanoSift.h"
+-
+ #include <libxml/xmlreader.h>
+ #include <libxml/xmlwriter.h>
++#include "AutoPanoSift.h"
+
+ KeypointXMLList* KeypointXMLReader_ReadComplete (char* filename)
+ {
+--
+2.26.2
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 5f4b3e32e53..3456c59fc5d 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,2 +1,6 @@
+DIST blender-2.83.10.tar.xz 38624904 BLAKE2B e52597b3acce875943dff75575c42c8c1fdeb19cb74b4f3609e56730e8fb6d5bbc94a6215a1e9da52b46e45c48c9a46dc4f3ed0d22e16186d9e7434b27eef70f SHA512 96b252176d867b3cac76a99cbee95313b60935a34edc44f27c67a1f75f20b353f0894288df2696718e95a03a07a1630797a431b752ffb4dd14692739d714a589
+DIST blender-2.83.12.tar.xz 39132904 BLAKE2B 175e8c5ab9324421f23357bc367b2e70ee8c391130d376d6d53eefbf90529d09921395cd11e7b1709aaa4d24ec6f8df64050869e41bbe211229126db08f22089 SHA512 f313c92e311e852742e74934504fcd3ccd296bcea2499f605cef568e3c615ececd9d70dec5025e4d4ff19f03803c148a8b03a4b68b7ca978554f5b1122c9890b
DIST blender-2.83.4.tar.xz 38528352 BLAKE2B 54596207cbee34fcaa6b81a0d829976b42c28c793b88de81d78c1c3fdfe9dd2a0189a314be281b2a0f1829a0b7fd30d37bceaa28d35c9794dcb0f009fa71e83d SHA512 061735273159742784ed210d13fb39ad076efbbfd5f0291bab1b983699d43b20462dc7e4795e28dab0cd191c9879b43d9ad0f0545c24ef5da23c74679e5ccab5
DIST blender-2.90.1.tar.xz 38836408 BLAKE2B 42622e742ebd397dc035c85cf26ab72ffee64f2cd46f1523de78dc8861bc19286a7d87b9e31a0d6afdf9a931da7018ccbdb9b4185b8535b4529656c6d85efc34 SHA512 e7d6f8df598f2a2a99f64716331ec4e981a5a49c76b307caf7856480c778455cfc4bbb56fbedc8b22d1e10951ebaeb6844d1ead9476847bf2824dddf5b135992
+DIST blender-2.91.0.tar.xz 41528920 BLAKE2B f28bce92b0b63e380c7ce2c9dae0ae4235792ae7c7dff52c2c9c0c5baa81b4d540f853f49d7622f6feca8c7f403b254b55f200758a64e4d95bd43709e5509c1d SHA512 a4b6cb09765d735274fb4a61ac301cbd6ee16f09ab77b19a6e283454b9b8a8c76f1b181501dc285b288130da9e283d3343b948b2855eea00bcb9e114636d55aa
+DIST blender-2.91.2.tar.xz 42057100 BLAKE2B f10f838ad6d56135fddf9e9171473e1e589f511a38112845d650436a1eb4da94ea0777571dffc6446f4217dce647b087cf5a18841d7dde2086d187bb8f7d3654 SHA512 9a3bae01bd09b1d665af4882f53e8a88d85ff44678233c90788a7801ce0d551a3cc1f71026b71ea1c77d7eaedf7ab6fc8709104c22b564f4fc6cc0d5b3b76f5e
diff --git a/media-gfx/blender/blender-2.83.10.ebuild b/media-gfx/blender/blender-2.83.10.ebuild
new file mode 100644
index 00000000000..abed89a6644
--- /dev/null
+++ b/media-gfx/blender/blender-2.83.10.ebuild
@@ -0,0 +1,320 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 \
+ toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org"
+
+SRC_URI="https://download.blender.org/source/${P}.tar.xz"
+
+# Blender can have letters in the version string,
+# so strip off the letter if it exists.
+MY_PV="$(ver_cut 1-2)"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 BL )"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb \
+ abi6-compat abi7-compat alembic collada color-management cuda cycles \
+ debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm \
+ man ndof nls openal opencl openimageio openmp opensubdiv \
+ openvdb osl sdl sndfile standalone test tiff valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ alembic? ( openexr )
+ cuda? ( cycles )
+ cycles? ( openexr tiff openimageio )
+ elbeem? ( tbb )
+ opencl? ( cycles )
+ openvdb? (
+ ^^ ( abi6-compat abi7-compat )
+ tbb
+ )
+ osl? ( cycles llvm )
+ standalone? ( cycles )"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-libs/boost:=[nls?,threads(+)]
+ dev-libs/lzo:2=
+ $(python_gen_cond_dep '
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ ')
+ media-libs/freetype:=
+ media-libs/glew:*
+ media-libs/libpng:=
+ media-libs/libsamplerate
+ sys-libs/zlib:=
+ virtual/glu
+ virtual/jpeg
+ virtual/libintl
+ virtual/opengl
+ alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] )
+ collada? ( >=media-libs/opencollada-1.6.68 )
+ color-management? ( media-libs/opencolorio )
+ cuda? ( dev-util/nvidia-cuda-toolkit:= )
+ ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] )
+ fftw? ( sci-libs/fftw:3.0= )
+ !headless? (
+ x11-libs/libX11
+ x11-libs/libXi
+ x11-libs/libXxf86vm
+ )
+ jack? ( virtual/jack )
+ jemalloc? ( dev-libs/jemalloc:= )
+ jpeg2k? ( media-libs/openjpeg:2= )
+ llvm? ( sys-devel/llvm:= )
+ ndof? (
+ app-misc/spacenavd
+ dev-libs/libspnav
+ )
+ nls? ( virtual/libiconv )
+ openal? ( media-libs/openal )
+ opencl? ( virtual/opencl )
+ openimageio? ( media-libs/openimageio:= )
+ openexr? (
+ media-libs/ilmbase:=
+ media-libs/openexr:=
+ )
+ opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] )
+ openvdb? (
+ ~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?]
+ dev-libs/c-blosc:=
+ )
+ osl? ( media-libs/osl:= )
+ sdl? ( media-libs/libsdl2[sound,joystick] )
+ sndfile? ( media-libs/libsndfile )
+ tbb? ( dev-cpp/tbb )
+ tiff? ( media-libs/tiff )
+ valgrind? ( dev-util/valgrind )
+"
+
+DEPEND="${RDEPEND}
+ dev-cpp/eigen:=
+"
+
+BDEPEND="
+ virtual/pkgconfig
+ doc? (
+ 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 )
+"
+
+CMAKE_BUILD_TYPE="Release"
+
+blender_check_requirements() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+ if use doc; then
+ CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+ fi
+}
+
+pkg_pretend() {
+ blender_check_requirements
+}
+
+pkg_setup() {
+ blender_check_requirements
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ # we don't want static glew, but it's scattered across
+ # multiple files that differ from version to version
+ # !!!CHECK THIS SED ON EVERY VERSION BUMP!!!
+ local file
+ while IFS="" read -d $'\0' -r file ; do
+ sed -i -e '/-DGLEW_STATIC/d' "${file}" || die
+ done < <(find . -type f -name "CMakeLists.txt")
+
+ # Disable MS Windows help generation. The variable doesn't do what it
+ # it sounds like.
+ sed -e "s|GENERATE_HTMLHELP = YES|GENERATE_HTMLHELP = NO|" \
+ -i doc/doxygen/Doxyfile || die
+}
+
+src_configure() {
+ # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
+ # shadows, see bug #276338 for reference
+ append-flags -funsigned-char
+ append-lfs-flags
+
+ if use openvdb; then
+ local version
+ if use abi6-compat; then
+ version=6;
+ elif use abi7-compat; then
+ version=7;
+ else
+ die "Openvdb abi version not compatible"
+ fi
+ append-cppflags -DOPENVDB_ABI_VERSION_NUMBER=${version}
+ fi
+
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=OFF
+ -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+ -DPYTHON_LIBRARY="$(python_get_library_path)"
+ -DPYTHON_VERSION="${EPYTHON/python/}"
+ -DWITH_ALEMBIC=$(usex alembic)
+ -DWITH_ASSERT_ABORT=$(usex debug)
+ -DWITH_BOOST=ON
+ -DWITH_BULLET=$(usex bullet)
+ -DWITH_CODEC_FFMPEG=$(usex ffmpeg)
+ -DWITH_CODEC_SNDFILE=$(usex sndfile)
+ -DWITH_CXX_GUARDEDALLOC=$(usex debug)
+ -DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
+ -DWITH_CYCLES=$(usex cycles)
+ -DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl)
+ -DWITH_CYCLES_STANDALONE=$(usex standalone)
+ -DWITH_CYCLES_STANDALONE_GUI=$(usex standalone)
+ -DWITH_CYCLES_OSL=$(usex osl)
+ -DWITH_DOC_MANPAGE=$(usex man)
+ -DWITH_FFTW3=$(usex fftw)
+ -DWITH_GTESTS=$(usex test)
+ -DWITH_HEADLESS=$(usex headless)
+ -DWITH_INSTALL_PORTABLE=OFF
+ -DWITH_IMAGE_DDS=$(usex dds)
+ -DWITH_IMAGE_OPENEXR=$(usex openexr)
+ -DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
+ -DWITH_IMAGE_TIFF=$(usex tiff)
+ -DWITH_INPUT_NDOF=$(usex ndof)
+ -DWITH_INTERNATIONAL=$(usex nls)
+ -DWITH_JACK=$(usex jack)
+ -DWITH_LLVM=$(usex llvm)
+ -DWITH_MEM_JEMALLOC=$(usex jemalloc)
+ -DWITH_MEM_VALGRIND=$(usex valgrind)
+ -DWITH_MOD_FLUID=$(usex elbeem)
+ -DWITH_MOD_OCEANSIM=$(usex fftw)
+ -DWITH_OPENAL=$(usex openal)
+ -DWITH_OPENCOLLADA=$(usex collada)
+ -DWITH_OPENCOLORIO=$(usex color-management)
+ -DWITH_OPENIMAGEIO=$(usex openimageio)
+ -DWITH_OPENMP=$(usex openmp)
+ -DWITH_OPENSUBDIV=$(usex opensubdiv)
+ -DWITH_OPENVDB=$(usex openvdb)
+ -DWITH_OPENVDB_BLOSC=$(usex openvdb)
+ -DWITH_PYTHON_INSTALL=$(usex system-python OFF ON)
+ -DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON)
+ -DWITH_SDL=$(usex sdl)
+ -DWITH_STATIC_LIBS=OFF
+ -DWITH_SYSTEM_EIGEN3=ON
+ -DWITH_SYSTEM_GLEW=ON
+ -DWITH_SYSTEM_LZO=ON
+ -DWITH_TBB=$(usex tbb)
+ -DWITH_X11=$(usex !headless)
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use doc; then
+ # Workaround for binary drivers.
+ addpredict /dev/ati
+ addpredict /dev/dri
+ addpredict /dev/nvidiactl
+
+ einfo "Generating Blender C/C++ API docs ..."
+ cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+ doxygen -u Doxyfile || die
+ doxygen || die "doxygen failed to build API docs."
+
+ cd "${CMAKE_USE_DIR}" || die
+ einfo "Generating (BPY) Blender Python API docs ..."
+ "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
+
+ cd "${CMAKE_USE_DIR}"/doc/python_api || die
+ sphinx-build sphinx-in BPY_API || die "sphinx failed."
+ fi
+}
+
+src_test() {
+ if use test; then
+ einfo "Running Blender Unit Tests ..."
+ cd "${BUILD_DIR}"/bin/tests || die
+ local f
+ for f in *_test; do
+ ./"${f}" || die
+ done
+ fi
+}
+
+src_install() {
+ # Pax mark blender for hardened support.
+ pax-mark m "${BUILD_DIR}"/bin/blender
+
+ if use standalone; then
+ dobin "${BUILD_DIR}"/bin/cycles
+ fi
+
+ if use doc; then
+ docinto "html/API/python"
+ dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
+
+ docinto "html/API/blender"
+ dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
+ fi
+
+ cmake_src_install
+
+ # fix doc installdir
+ docinto "html"
+ dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
+ rm -r "${ED}"/usr/share/doc/blender || die
+
+ python_fix_shebang "${ED}/usr/bin/blender-thumbnailer.py"
+ python_optimize "${ED}/usr/share/blender/${MY_PV}/scripts"
+}
+
+pkg_postinst() {
+ elog
+ elog "Blender uses python integration. As such, may have some"
+ elog "inherent risks with running unknown python scripts."
+ elog
+ elog "It is recommended to change your blender temp directory"
+ elog "from /tmp to /home/user/tmp or another tmp file under your"
+ elog "home directory. This can be done by starting blender, then"
+ elog "dragging the main menu down do display all paths."
+ elog
+ ewarn
+ ewarn "This ebuild does not unbundle the massive amount of 3rd party"
+ ewarn "libraries which are shipped with blender. Note that"
+ ewarn "these have caused security issues in the past."
+ ewarn "If you are concerned about security, file a bug upstream:"
+ ewarn " https://developer.blender.org/"
+ ewarn
+ xdg_icon_cache_update
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+
+ ewarn ""
+ ewarn "You may want to remove the following directory."
+ ewarn "~/.config/${PN}/${MY_PV}/cache/"
+ ewarn "It may contain extra render kernels not tracked by portage"
+ ewarn ""
+}
diff --git a/media-gfx/blender/blender-2.83.12.ebuild b/media-gfx/blender/blender-2.83.12.ebuild
new file mode 100644
index 00000000000..7eb344fbf59
--- /dev/null
+++ b/media-gfx/blender/blender-2.83.12.ebuild
@@ -0,0 +1,328 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 \
+ toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org"
+SRC_URI="https://download.blender.org/source/${P}.tar.xz"
+
+# Blender can have letters in the version string,
+# so strip off the letter if it exists.
+MY_PV="$(ver_cut 1-2)"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 BL )"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb \
+ abi6-compat abi7-compat alembic collada color-management cuda cycles \
+ debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm \
+ man ndof nls openal opencl openimageio openmp opensubdiv \
+ openvdb osl sdl sndfile standalone test tiff valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ alembic? ( openexr )
+ cuda? ( cycles )
+ cycles? ( openexr tiff openimageio )
+ elbeem? ( tbb )
+ opencl? ( cycles )
+ openvdb? (
+ ^^ ( abi6-compat abi7-compat )
+ tbb
+ )
+ osl? ( cycles llvm )
+ standalone? ( cycles )"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-libs/boost:=[nls?,threads(+)]
+ dev-libs/lzo:2=
+ $(python_gen_cond_dep '
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ ')
+ media-libs/freetype:=
+ media-libs/glew:*
+ media-libs/libpng:=
+ media-libs/libsamplerate
+ sys-libs/zlib:=
+ virtual/glu
+ virtual/jpeg
+ virtual/libintl
+ virtual/opengl
+ alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] )
+ collada? ( >=media-libs/opencollada-1.6.68 )
+ color-management? ( media-libs/opencolorio )
+ cuda? ( dev-util/nvidia-cuda-toolkit:= )
+ ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] )
+ fftw? ( sci-libs/fftw:3.0= )
+ !headless? (
+ x11-libs/libX11
+ x11-libs/libXi
+ x11-libs/libXxf86vm
+ )
+ jack? ( virtual/jack )
+ jemalloc? ( dev-libs/jemalloc:= )
+ jpeg2k? ( media-libs/openjpeg:2= )
+ llvm? ( sys-devel/llvm:= )
+ ndof? (
+ app-misc/spacenavd
+ dev-libs/libspnav
+ )
+ nls? ( virtual/libiconv )
+ openal? ( media-libs/openal )
+ opencl? ( virtual/opencl )
+ openimageio? ( media-libs/openimageio:= )
+ openexr? (
+ media-libs/ilmbase:=
+ media-libs/openexr:=
+ )
+ opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] )
+ openvdb? (
+ ~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?]
+ dev-libs/c-blosc:=
+ )
+ osl? ( media-libs/osl:= )
+ sdl? ( media-libs/libsdl2[sound,joystick] )
+ sndfile? ( media-libs/libsndfile )
+ tbb? ( dev-cpp/tbb )
+ tiff? ( media-libs/tiff )
+ valgrind? ( dev-util/valgrind )
+"
+
+DEPEND="${RDEPEND}
+ dev-cpp/eigen:=
+"
+
+BDEPEND="
+ virtual/pkgconfig
+ doc? (
+ 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 )
+"
+
+CMAKE_BUILD_TYPE="Release"
+
+blender_check_requirements() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+ if use doc; then
+ CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+ fi
+}
+
+pkg_pretend() {
+ blender_check_requirements
+}
+
+pkg_setup() {
+ blender_check_requirements
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ # we don't want static glew, but it's scattered across
+ # multiple files that differ from version to version
+ # !!!CHECK THIS SED ON EVERY VERSION BUMP!!!
+ local file
+ while IFS="" read -d $'\0' -r file ; do
+ sed -i -e '/-DGLEW_STATIC/d' "${file}" || die
+ done < <(find . -type f -name "CMakeLists.txt")
+
+ # Disable MS Windows help generation. The variable doesn't do what it
+ # it sounds like.
+ sed -e "s|GENERATE_HTMLHELP = YES|GENERATE_HTMLHELP = NO|" \
+ -i doc/doxygen/Doxyfile || die
+}
+
+src_configure() {
+ # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
+ # shadows, see bug #276338 for reference
+ append-flags -funsigned-char
+ append-lfs-flags
+
+ if use openvdb; then
+ local version
+ if use abi6-compat; then
+ version=6;
+ elif use abi7-compat; then
+ version=7;
+ else
+ die "Openvdb abi version not compatible"
+ fi
+ append-cppflags -DOPENVDB_ABI_VERSION_NUMBER=${version}
+ fi
+
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=OFF
+ -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+ -DPYTHON_LIBRARY="$(python_get_library_path)"
+ -DPYTHON_VERSION="${EPYTHON/python/}"
+ -DWITH_ALEMBIC=$(usex alembic)
+ -DWITH_ASSERT_ABORT=$(usex debug)
+ -DWITH_BOOST=ON
+ -DWITH_BULLET=$(usex bullet)
+ -DWITH_CODEC_FFMPEG=$(usex ffmpeg)
+ -DWITH_CODEC_SNDFILE=$(usex sndfile)
+ -DWITH_CXX_GUARDEDALLOC=$(usex debug)
+ -DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
+ -DWITH_CYCLES=$(usex cycles)
+ -DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl)
+ -DWITH_CYCLES_STANDALONE=$(usex standalone)
+ -DWITH_CYCLES_STANDALONE_GUI=$(usex standalone)
+ -DWITH_CYCLES_OSL=$(usex osl)
+ -DWITH_DOC_MANPAGE=$(usex man)
+ -DWITH_FFTW3=$(usex fftw)
+ -DWITH_GTESTS=$(usex test)
+ -DWITH_HEADLESS=$(usex headless)
+ -DWITH_INSTALL_PORTABLE=OFF
+ -DWITH_IMAGE_DDS=$(usex dds)
+ -DWITH_IMAGE_OPENEXR=$(usex openexr)
+ -DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
+ -DWITH_IMAGE_TIFF=$(usex tiff)
+ -DWITH_INPUT_NDOF=$(usex ndof)
+ -DWITH_INTERNATIONAL=$(usex nls)
+ -DWITH_JACK=$(usex jack)
+ -DWITH_LLVM=$(usex llvm)
+ -DWITH_MEM_JEMALLOC=$(usex jemalloc)
+ -DWITH_MEM_VALGRIND=$(usex valgrind)
+ -DWITH_MOD_FLUID=$(usex elbeem)
+ -DWITH_MOD_OCEANSIM=$(usex fftw)
+ -DWITH_OPENAL=$(usex openal)
+ -DWITH_OPENCOLLADA=$(usex collada)
+ -DWITH_OPENCOLORIO=$(usex color-management)
+ -DWITH_OPENIMAGEIO=$(usex openimageio)
+ -DWITH_OPENMP=$(usex openmp)
+ -DWITH_OPENSUBDIV=$(usex opensubdiv)
+ -DWITH_OPENVDB=$(usex openvdb)
+ -DWITH_OPENVDB_BLOSC=$(usex openvdb)
+ -DWITH_PYTHON_INSTALL=$(usex system-python OFF ON)
+ -DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON)
+ -DWITH_SDL=$(usex sdl)
+ -DWITH_STATIC_LIBS=OFF
+ -DWITH_SYSTEM_EIGEN3=ON
+ -DWITH_SYSTEM_GLEW=ON
+ -DWITH_SYSTEM_LZO=ON
+ -DWITH_TBB=$(usex tbb)
+ -DWITH_X11=$(usex !headless)
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use doc; then
+ # Workaround for binary drivers.
+ addpredict /dev/ati
+ addpredict /dev/dri
+ addpredict /dev/nvidiactl
+
+ einfo "Generating Blender C/C++ API docs ..."
+ cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+ doxygen -u Doxyfile || die
+ doxygen || die "doxygen failed to build API docs."
+
+ cd "${CMAKE_USE_DIR}" || die
+ einfo "Generating (BPY) Blender Python API docs ..."
+ "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
+
+ cd "${CMAKE_USE_DIR}"/doc/python_api || die
+ sphinx-build sphinx-in BPY_API || die "sphinx failed."
+ fi
+}
+
+src_test() {
+ if use test; then
+ einfo "Running Blender Unit Tests ..."
+ cd "${BUILD_DIR}"/bin/tests || die
+ local f
+ for f in *_test; do
+ ./"${f}" || die
+ done
+ fi
+}
+
+src_install() {
+ # Pax mark blender for hardened support.
+ pax-mark m "${BUILD_DIR}"/bin/blender
+
+ if use standalone; then
+ dobin "${BUILD_DIR}"/bin/cycles
+ fi
+
+ if use doc; then
+ docinto "html/API/python"
+ dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
+
+ docinto "html/API/blender"
+ dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
+ fi
+
+ cmake_src_install
+
+ # fix doc installdir
+ docinto "html"
+ dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
+ rm -r "${ED}"/usr/share/doc/blender || die
+
+ python_fix_shebang "${ED}/usr/bin/blender-thumbnailer.py"
+ python_optimize "${ED}/usr/share/blender/${MY_PV}/scripts"
+}
+
+pkg_postinst() {
+ elog
+ elog "Blender uses python integration. As such, may have some"
+ elog "inherent risks with running unknown python scripts."
+ elog
+ elog "It is recommended to change your blender temp directory"
+ elog "from /tmp to /home/user/tmp or another tmp file under your"
+ elog "home directory. This can be done by starting blender, then"
+ elog "dragging the main menu down do display all paths."
+ elog
+ ewarn
+ ewarn "This ebuild does not unbundle the massive amount of 3rd party"
+ ewarn "libraries which are shipped with blender. Note that"
+ ewarn "these have caused security issues in the past."
+ ewarn "If you are concerned about security, file a bug upstream:"
+ ewarn " https://developer.blender.org/"
+ ewarn
+
+ if use python_single_target_python3_8; then
+ elog "You've enabled python-3.8 support for blender, which is still experimental."
+ elog "If you experience breakages with e.g. plugins, please switch to"
+ elog "python_single_target_python3_7 instead."
+ elog "Bug: https://bugs.gentoo.org/737388"
+ elog
+ fi
+
+ xdg_icon_cache_update
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+
+ ewarn ""
+ ewarn "You may want to remove the following directory."
+ ewarn "~/.config/${PN}/${MY_PV}/cache/"
+ ewarn "It may contain extra render kernels not tracked by portage"
+ ewarn ""
+}
diff --git a/media-gfx/blender/blender-2.83.4-r1.ebuild b/media-gfx/blender/blender-2.83.4-r1.ebuild
index a4a6501ff7a..f28ba088062 100644
--- a/media-gfx/blender/blender-2.83.4-r1.ebuild
+++ b/media-gfx/blender/blender-2.83.4-r1.ebuild
@@ -88,7 +88,7 @@ RDEPEND="${PYTHON_DEPS}
~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?]
dev-libs/c-blosc:=
)
- osl? ( media-libs/osl )
+ osl? ( media-libs/osl:= )
sdl? ( media-libs/libsdl2[sound,joystick] )
sndfile? ( media-libs/libsndfile )
tbb? ( dev-cpp/tbb )
@@ -114,6 +114,8 @@ BDEPEND="
nls? ( sys-devel/gettext )
"
+CMAKE_BUILD_TYPE="Release"
+
blender_check_requirements() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
diff --git a/media-gfx/blender/blender-2.90.1-r1.ebuild b/media-gfx/blender/blender-2.90.1-r1.ebuild
index 7ad59e31836..8c7494285e8 100644
--- a/media-gfx/blender/blender-2.90.1-r1.ebuild
+++ b/media-gfx/blender/blender-2.90.1-r1.ebuild
@@ -30,7 +30,7 @@ RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
alembic? ( openexr )
cuda? ( cycles )
- cycles? ( openexr tiff openimageio )
+ cycles? ( openexr tbb tiff openimageio )
elbeem? ( tbb )
opencl? ( cycles )
openvdb? (
@@ -88,7 +88,7 @@ RDEPEND="${PYTHON_DEPS}
~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?]
dev-libs/c-blosc:=
)
- osl? ( media-libs/osl )
+ osl? ( media-libs/osl:= )
sdl? ( media-libs/libsdl2[sound,joystick] )
sndfile? ( media-libs/libsndfile )
tbb? ( dev-cpp/tbb )
@@ -114,6 +114,8 @@ BDEPEND="
nls? ( sys-devel/gettext )
"
+CMAKE_BUILD_TYPE="Release"
+
blender_check_requirements() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
diff --git a/media-gfx/blender/blender-2.91.0.ebuild b/media-gfx/blender/blender-2.91.0.ebuild
new file mode 100644
index 00000000000..bedb7cf4283
--- /dev/null
+++ b/media-gfx/blender/blender-2.91.0.ebuild
@@ -0,0 +1,335 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 \
+ toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org"
+
+SRC_URI="https://download.blender.org/source/${P}.tar.xz"
+
+# Blender can have letters in the version string,
+# so strip off the letter if it exists.
+MY_PV="$(ver_cut 1-2)"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 BL )"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb \
+ abi6-compat abi7-compat alembic collada color-management cuda cycles \
+ debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm \
+ man ndof nls openal opencl openimageio openmp opensubdiv \
+ openvdb osl sdl sndfile standalone test tiff valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ alembic? ( openexr )
+ cuda? ( cycles )
+ cycles? ( openexr tbb tiff openimageio )
+ elbeem? ( tbb )
+ opencl? ( cycles )
+ openvdb? (
+ ^^ ( abi6-compat abi7-compat )
+ tbb
+ )
+ osl? ( cycles llvm )
+ standalone? ( cycles )"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-libs/boost:=[nls?,threads(+)]
+ dev-libs/gmp
+ dev-libs/pugixml
+ dev-libs/lzo:2=
+ $(python_gen_cond_dep '
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ ')
+ media-gfx/potrace
+ media-libs/fontconfig:=
+ media-libs/freetype:=
+ media-libs/glew:*
+ media-libs/libpng:=
+ media-libs/libsamplerate
+ sys-libs/zlib:=
+ virtual/glu
+ virtual/jpeg
+ virtual/libintl
+ virtual/opengl
+ alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] )
+ collada? ( >=media-libs/opencollada-1.6.68 )
+ color-management? ( media-libs/opencolorio )
+ cuda? ( dev-util/nvidia-cuda-toolkit:= )
+ cycles? ( media-libs/freeglut )
+ ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] )
+ fftw? ( sci-libs/fftw:3.0= )
+ !headless? (
+ x11-libs/libX11
+ x11-libs/libXi
+ x11-libs/libXxf86vm
+ )
+ jack? ( virtual/jack )
+ jemalloc? ( dev-libs/jemalloc:= )
+ jpeg2k? ( media-libs/openjpeg:2= )
+ llvm? ( sys-devel/llvm:= )
+ ndof? (
+ app-misc/spacenavd
+ dev-libs/libspnav
+ )
+ nls? ( virtual/libiconv )
+ openal? ( media-libs/openal )
+ opencl? ( virtual/opencl )
+ openimageio? ( media-libs/openimageio:= )
+ openexr? (
+ media-libs/ilmbase:=
+ media-libs/openexr:=
+ )
+ opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] )
+ openvdb? (
+ ~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?]
+ dev-libs/c-blosc:=
+ )
+ osl? ( media-libs/osl:= )
+ sdl? ( media-libs/libsdl2[sound,joystick] )
+ sndfile? ( media-libs/libsndfile )
+ tbb? ( dev-cpp/tbb )
+ tiff? ( media-libs/tiff )
+ valgrind? ( dev-util/valgrind )
+"
+
+DEPEND="${RDEPEND}
+ dev-cpp/eigen:=
+"
+
+BDEPEND="
+ virtual/pkgconfig
+ doc? (
+ 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 )
+"
+
+CMAKE_BUILD_TYPE="Release"
+
+blender_check_requirements() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+ if use doc; then
+ CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+ fi
+}
+
+pkg_pretend() {
+ blender_check_requirements
+}
+
+pkg_setup() {
+ blender_check_requirements
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ # we don't want static glew, but it's scattered across
+ # multiple files that differ from version to version
+ # !!!CHECK THIS SED ON EVERY VERSION BUMP!!!
+ local file
+ while IFS="" read -d $'\0' -r file ; do
+ sed -i -e '/-DGLEW_STATIC/d' "${file}" || die
+ done < <(find . -type f -name "CMakeLists.txt")
+
+ # Disable MS Windows help generation. The variable doesn't do what it
+ # it sounds like.
+ sed -e "s|GENERATE_HTMLHELP = YES|GENERATE_HTMLHELP = NO|" \
+ -i doc/doxygen/Doxyfile || die
+}
+
+src_configure() {
+ # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
+ # shadows, see bug #276338 for reference
+ append-flags -funsigned-char
+ append-lfs-flags
+
+ if use openvdb; then
+ local version
+ if use abi6-compat; then
+ version=6;
+ elif use abi7-compat; then
+ version=7;
+ else
+ die "Openvdb abi version not compatible"
+ fi
+ append-cppflags -DOPENVDB_ABI_VERSION_NUMBER=${version}
+ fi
+
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=OFF
+ -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+ -DPYTHON_LIBRARY="$(python_get_library_path)"
+ -DPYTHON_VERSION="${EPYTHON/python/}"
+ -DWITH_ALEMBIC=$(usex alembic)
+ -DWITH_ASSERT_ABORT=$(usex debug)
+ -DWITH_BOOST=ON
+ -DWITH_BULLET=$(usex bullet)
+ -DWITH_CODEC_FFMPEG=$(usex ffmpeg)
+ -DWITH_CODEC_SNDFILE=$(usex sndfile)
+ -DWITH_CXX_GUARDEDALLOC=$(usex debug)
+ -DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
+ -DWITH_CYCLES=$(usex cycles)
+ -DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl)
+ -DWITH_CYCLES_EMBREE=OFF
+ -DWITH_CYCLES_STANDALONE=$(usex standalone)
+ -DWITH_CYCLES_STANDALONE_GUI=$(usex standalone)
+ -DWITH_CYCLES_OSL=$(usex osl)
+ -DWITH_DOC_MANPAGE=$(usex man)
+ -DWITH_FFTW3=$(usex fftw)
+ -DWITH_GHOST_X11=$(usex !headless)
+ -DWITH_GTESTS=$(usex test)
+ -DWITH_HEADLESS=$(usex headless)
+ -DWITH_INSTALL_PORTABLE=OFF
+ -DWITH_IMAGE_DDS=$(usex dds)
+ -DWITH_IMAGE_OPENEXR=$(usex openexr)
+ -DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
+ -DWITH_IMAGE_TIFF=$(usex tiff)
+ -DWITH_INPUT_NDOF=$(usex ndof)
+ -DWITH_INTERNATIONAL=$(usex nls)
+ -DWITH_JACK=$(usex jack)
+ -DWITH_LLVM=$(usex llvm)
+ -DWITH_MEM_JEMALLOC=$(usex jemalloc)
+ -DWITH_MEM_VALGRIND=$(usex valgrind)
+ -DWITH_MOD_FLUID=$(usex elbeem)
+ -DWITH_MOD_OCEANSIM=$(usex fftw)
+ -DWITH_OPENAL=$(usex openal)
+ -DWITH_OPENCOLLADA=$(usex collada)
+ -DWITH_OPENCOLORIO=$(usex color-management)
+ -DWITH_OPENIMAGEIO=$(usex openimageio)
+ -DWITH_OPENMP=$(usex openmp)
+ -DWITH_OPENSUBDIV=$(usex opensubdiv)
+ -DWITH_OPENVDB=$(usex openvdb)
+ -DWITH_OPENVDB_BLOSC=$(usex openvdb)
+ -DWITH_PYTHON_INSTALL=$(usex system-python OFF ON)
+ -DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON)
+ -DWITH_SDL=$(usex sdl)
+ -DWITH_STATIC_LIBS=OFF
+ -DWITH_SYSTEM_EIGEN3=ON
+ -DWITH_SYSTEM_GLEW=ON
+ -DWITH_SYSTEM_LZO=ON
+ -DWITH_TBB=$(usex tbb)
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use doc; then
+ # Workaround for binary drivers.
+ addpredict /dev/ati
+ addpredict /dev/dri
+ addpredict /dev/nvidiactl
+
+ einfo "Generating Blender C/C++ API docs ..."
+ cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+ doxygen -u Doxyfile || die
+ doxygen || die "doxygen failed to build API docs."
+
+ cd "${CMAKE_USE_DIR}" || die
+ einfo "Generating (BPY) Blender Python API docs ..."
+ "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
+
+ cd "${CMAKE_USE_DIR}"/doc/python_api || die
+ sphinx-build sphinx-in BPY_API || die "sphinx failed."
+ fi
+}
+
+src_test() {
+ if use test; then
+ einfo "Running Blender Unit Tests ..."
+ cd "${BUILD_DIR}"/bin/tests || die
+ local f
+ for f in *_test; do
+ ./"${f}" || die
+ done
+ fi
+}
+
+src_install() {
+ # Pax mark blender for hardened support.
+ pax-mark m "${BUILD_DIR}"/bin/blender
+
+ if use standalone; then
+ dobin "${BUILD_DIR}"/bin/cycles
+ fi
+
+ if use doc; then
+ docinto "html/API/python"
+ dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
+
+ docinto "html/API/blender"
+ dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
+ fi
+
+ cmake_src_install
+
+ # fix doc installdir
+ docinto "html"
+ dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
+ rm -r "${ED}"/usr/share/doc/blender || die
+
+ python_fix_shebang "${ED}/usr/bin/blender-thumbnailer.py"
+ python_optimize "${ED}/usr/share/blender/${MY_PV}/scripts"
+}
+
+pkg_postinst() {
+ elog
+ elog "Blender uses python integration. As such, may have some"
+ elog "inherent risks with running unknown python scripts."
+ elog
+ elog "It is recommended to change your blender temp directory"
+ elog "from /tmp to /home/user/tmp or another tmp file under your"
+ elog "home directory. This can be done by starting blender, then"
+ elog "dragging the main menu down do display all paths."
+ elog
+ ewarn
+ ewarn "This ebuild does not unbundle the massive amount of 3rd party"
+ ewarn "libraries which are shipped with blender. Note that"
+ ewarn "these have caused security issues in the past."
+ ewarn "If you are concerned about security, file a bug upstream:"
+ ewarn " https://developer.blender.org/"
+ ewarn
+
+ if use python_single_target_python3_8; then
+ elog "You've enabled python-3.8 support for blender, which is still experimental."
+ elog "If you experience breakages with e.g. plugins, please switch to"
+ elog "python_single_target_python3_7 instead."
+ elog "Bug: https://bugs.gentoo.org/737388"
+ elog
+ fi
+
+ xdg_icon_cache_update
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+
+ ewarn ""
+ ewarn "You may want to remove the following directory."
+ ewarn "~/.config/${PN}/${MY_PV}/cache/"
+ ewarn "It may contain extra render kernels not tracked by portage"
+ ewarn ""
+}
diff --git a/media-gfx/blender/blender-2.91.2.ebuild b/media-gfx/blender/blender-2.91.2.ebuild
new file mode 100644
index 00000000000..652671fd7a0
--- /dev/null
+++ b/media-gfx/blender/blender-2.91.2.ebuild
@@ -0,0 +1,334 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 \
+ toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org"
+SRC_URI="https://download.blender.org/source/${P}.tar.xz"
+
+# Blender can have letters in the version string,
+# so strip off the letter if it exists.
+MY_PV="$(ver_cut 1-2)"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 BL )"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb \
+ abi6-compat abi7-compat alembic collada color-management cuda cycles \
+ debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm \
+ man ndof nls openal opencl openimageio openmp opensubdiv \
+ openvdb osl sdl sndfile standalone test tiff valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ alembic? ( openexr )
+ cuda? ( cycles )
+ cycles? ( openexr tbb tiff openimageio )
+ elbeem? ( tbb )
+ opencl? ( cycles )
+ openvdb? (
+ ^^ ( abi6-compat abi7-compat )
+ tbb
+ )
+ osl? ( cycles llvm )
+ standalone? ( cycles )"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-libs/boost:=[nls?,threads(+)]
+ dev-libs/gmp
+ dev-libs/pugixml
+ dev-libs/lzo:2=
+ $(python_gen_cond_dep '
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ ')
+ media-gfx/potrace
+ media-libs/fontconfig:=
+ media-libs/freetype:=
+ media-libs/glew:*
+ media-libs/libpng:=
+ media-libs/libsamplerate
+ sys-libs/zlib:=
+ virtual/glu
+ virtual/jpeg
+ virtual/libintl
+ virtual/opengl
+ alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] )
+ collada? ( >=media-libs/opencollada-1.6.68 )
+ color-management? ( media-libs/opencolorio )
+ cuda? ( dev-util/nvidia-cuda-toolkit:= )
+ cycles? ( media-libs/freeglut )
+ ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] )
+ fftw? ( sci-libs/fftw:3.0= )
+ !headless? (
+ x11-libs/libX11
+ x11-libs/libXi
+ x11-libs/libXxf86vm
+ )
+ jack? ( virtual/jack )
+ jemalloc? ( dev-libs/jemalloc:= )
+ jpeg2k? ( media-libs/openjpeg:2= )
+ llvm? ( sys-devel/llvm:= )
+ ndof? (
+ app-misc/spacenavd
+ dev-libs/libspnav
+ )
+ nls? ( virtual/libiconv )
+ openal? ( media-libs/openal )
+ opencl? ( virtual/opencl )
+ openimageio? ( media-libs/openimageio:= )
+ openexr? (
+ media-libs/ilmbase:=
+ media-libs/openexr:=
+ )
+ opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] )
+ openvdb? (
+ ~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?]
+ dev-libs/c-blosc:=
+ )
+ osl? ( media-libs/osl:= )
+ sdl? ( media-libs/libsdl2[sound,joystick] )
+ sndfile? ( media-libs/libsndfile )
+ tbb? ( dev-cpp/tbb )
+ tiff? ( media-libs/tiff )
+ valgrind? ( dev-util/valgrind )
+"
+
+DEPEND="${RDEPEND}
+ dev-cpp/eigen:=
+"
+
+BDEPEND="
+ virtual/pkgconfig
+ doc? (
+ 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 )
+"
+
+CMAKE_BUILD_TYPE="Release"
+
+blender_check_requirements() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+ if use doc; then
+ CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+ fi
+}
+
+pkg_pretend() {
+ blender_check_requirements
+}
+
+pkg_setup() {
+ blender_check_requirements
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ # we don't want static glew, but it's scattered across
+ # multiple files that differ from version to version
+ # !!!CHECK THIS SED ON EVERY VERSION BUMP!!!
+ local file
+ while IFS="" read -d $'\0' -r file ; do
+ sed -i -e '/-DGLEW_STATIC/d' "${file}" || die
+ done < <(find . -type f -name "CMakeLists.txt")
+
+ # Disable MS Windows help generation. The variable doesn't do what it
+ # it sounds like.
+ sed -e "s|GENERATE_HTMLHELP = YES|GENERATE_HTMLHELP = NO|" \
+ -i doc/doxygen/Doxyfile || die
+}
+
+src_configure() {
+ # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
+ # shadows, see bug #276338 for reference
+ append-flags -funsigned-char
+ append-lfs-flags
+
+ if use openvdb; then
+ local version
+ if use abi6-compat; then
+ version=6;
+ elif use abi7-compat; then
+ version=7;
+ else
+ die "Openvdb abi version not compatible"
+ fi
+ append-cppflags -DOPENVDB_ABI_VERSION_NUMBER=${version}
+ fi
+
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=OFF
+ -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+ -DPYTHON_LIBRARY="$(python_get_library_path)"
+ -DPYTHON_VERSION="${EPYTHON/python/}"
+ -DWITH_ALEMBIC=$(usex alembic)
+ -DWITH_ASSERT_ABORT=$(usex debug)
+ -DWITH_BOOST=ON
+ -DWITH_BULLET=$(usex bullet)
+ -DWITH_CODEC_FFMPEG=$(usex ffmpeg)
+ -DWITH_CODEC_SNDFILE=$(usex sndfile)
+ -DWITH_CXX_GUARDEDALLOC=$(usex debug)
+ -DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
+ -DWITH_CYCLES=$(usex cycles)
+ -DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl)
+ -DWITH_CYCLES_EMBREE=OFF
+ -DWITH_CYCLES_STANDALONE=$(usex standalone)
+ -DWITH_CYCLES_STANDALONE_GUI=$(usex standalone)
+ -DWITH_CYCLES_OSL=$(usex osl)
+ -DWITH_DOC_MANPAGE=$(usex man)
+ -DWITH_FFTW3=$(usex fftw)
+ -DWITH_GHOST_X11=$(usex !headless)
+ -DWITH_GTESTS=$(usex test)
+ -DWITH_HEADLESS=$(usex headless)
+ -DWITH_INSTALL_PORTABLE=OFF
+ -DWITH_IMAGE_DDS=$(usex dds)
+ -DWITH_IMAGE_OPENEXR=$(usex openexr)
+ -DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
+ -DWITH_IMAGE_TIFF=$(usex tiff)
+ -DWITH_INPUT_NDOF=$(usex ndof)
+ -DWITH_INTERNATIONAL=$(usex nls)
+ -DWITH_JACK=$(usex jack)
+ -DWITH_LLVM=$(usex llvm)
+ -DWITH_MEM_JEMALLOC=$(usex jemalloc)
+ -DWITH_MEM_VALGRIND=$(usex valgrind)
+ -DWITH_MOD_FLUID=$(usex elbeem)
+ -DWITH_MOD_OCEANSIM=$(usex fftw)
+ -DWITH_OPENAL=$(usex openal)
+ -DWITH_OPENCOLLADA=$(usex collada)
+ -DWITH_OPENCOLORIO=$(usex color-management)
+ -DWITH_OPENIMAGEIO=$(usex openimageio)
+ -DWITH_OPENMP=$(usex openmp)
+ -DWITH_OPENSUBDIV=$(usex opensubdiv)
+ -DWITH_OPENVDB=$(usex openvdb)
+ -DWITH_OPENVDB_BLOSC=$(usex openvdb)
+ -DWITH_PYTHON_INSTALL=$(usex system-python OFF ON)
+ -DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON)
+ -DWITH_SDL=$(usex sdl)
+ -DWITH_STATIC_LIBS=OFF
+ -DWITH_SYSTEM_EIGEN3=ON
+ -DWITH_SYSTEM_GLEW=ON
+ -DWITH_SYSTEM_LZO=ON
+ -DWITH_TBB=$(usex tbb)
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use doc; then
+ # Workaround for binary drivers.
+ addpredict /dev/ati
+ addpredict /dev/dri
+ addpredict /dev/nvidiactl
+
+ einfo "Generating Blender C/C++ API docs ..."
+ cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+ doxygen -u Doxyfile || die
+ doxygen || die "doxygen failed to build API docs."
+
+ cd "${CMAKE_USE_DIR}" || die
+ einfo "Generating (BPY) Blender Python API docs ..."
+ "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
+
+ cd "${CMAKE_USE_DIR}"/doc/python_api || die
+ sphinx-build sphinx-in BPY_API || die "sphinx failed."
+ fi
+}
+
+src_test() {
+ if use test; then
+ einfo "Running Blender Unit Tests ..."
+ cd "${BUILD_DIR}"/bin/tests || die
+ local f
+ for f in *_test; do
+ ./"${f}" || die
+ done
+ fi
+}
+
+src_install() {
+ # Pax mark blender for hardened support.
+ pax-mark m "${BUILD_DIR}"/bin/blender
+
+ if use standalone; then
+ dobin "${BUILD_DIR}"/bin/cycles
+ fi
+
+ if use doc; then
+ docinto "html/API/python"
+ dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
+
+ docinto "html/API/blender"
+ dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
+ fi
+
+ cmake_src_install
+
+ # fix doc installdir
+ docinto "html"
+ dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
+ rm -r "${ED}"/usr/share/doc/blender || die
+
+ python_fix_shebang "${ED}/usr/bin/blender-thumbnailer.py"
+ python_optimize "${ED}/usr/share/blender/${MY_PV}/scripts"
+}
+
+pkg_postinst() {
+ elog
+ elog "Blender uses python integration. As such, may have some"
+ elog "inherent risks with running unknown python scripts."
+ elog
+ elog "It is recommended to change your blender temp directory"
+ elog "from /tmp to /home/user/tmp or another tmp file under your"
+ elog "home directory. This can be done by starting blender, then"
+ elog "dragging the main menu down do display all paths."
+ elog
+ ewarn
+ ewarn "This ebuild does not unbundle the massive amount of 3rd party"
+ ewarn "libraries which are shipped with blender. Note that"
+ ewarn "these have caused security issues in the past."
+ ewarn "If you are concerned about security, file a bug upstream:"
+ ewarn " https://developer.blender.org/"
+ ewarn
+
+ if use python_single_target_python3_8; then
+ elog "You've enabled python-3.8 support for blender, which is still experimental."
+ elog "If you experience breakages with e.g. plugins, please switch to"
+ elog "python_single_target_python3_7 instead."
+ elog "Bug: https://bugs.gentoo.org/737388"
+ elog
+ fi
+
+ xdg_icon_cache_update
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+
+ ewarn ""
+ ewarn "You may want to remove the following directory."
+ ewarn "~/.config/${PN}/${MY_PV}/cache/"
+ ewarn "It may contain extra render kernels not tracked by portage"
+ ewarn ""
+}
diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml
index 0dff6db1f81..18a7b03a8de 100644
--- a/media-gfx/blender/metadata.xml
+++ b/media-gfx/blender/metadata.xml
@@ -42,9 +42,6 @@
<flag name="dds">
Adds DDS textures support to Blender.
</flag>
- <flag name="doc">
- Build C and Python API documentation directly from the source code.
- </flag>
<flag name="elbeem">
Adds surface fluid simulation to Blender using El'Beem library.
</flag>
@@ -54,9 +51,6 @@
<flag name="llvm">
Enable features depending on llvm.
</flag>
- <flag name="man">
- Build and install man pages.
- </flag>
<flag name="ndof">
Enable NDOF input devices (SpaceNavigator and friends).
</flag>
@@ -86,9 +80,6 @@
<flag name="tbb">
Use threading building blocks library from <pkg>dev-cpp/tbb</pkg>.
</flag>
- <flag name="test">
- Build the provided unit tests.
- </flag>
<flag name="valgrind">
Add support for memory debugging using
<pkg>dev-util/valgrind</pkg>
diff --git a/media-gfx/cairosvg/Manifest b/media-gfx/cairosvg/Manifest
index b3725209e8f..0447e6919c6 100644
--- a/media-gfx/cairosvg/Manifest
+++ b/media-gfx/cairosvg/Manifest
@@ -1,2 +1 @@
-DIST CairoSVG-2.4.2.tar.gz 38715 BLAKE2B 3c8f77561e13e0fdec371a601f09f0d107f972955c8e8fbc34f5092a7ff5f65b24338c20ae8e21b428eea083925a36b3e5635a9b0010c569d013169d919b7a35 SHA512 0d6dd22d9569fd3849cf7f6594c86bed719169dac1f0f3219e88d82f9d245bf29d51715159085cb26c0340c8f0dcb88412d141ec0ee3710b1477626f5a578441
-DIST CairoSVG-2.5.0.tar.gz 40481 BLAKE2B d177570710f54a7d64446de81a700a6ebe5dd475ab75e268575ee2d3a45cb1da14a349d6a5516ef965191093f12ba916a1919fe115fa4b6e4dc0f9a22657946b SHA512 9387273a5531f2e055871d3ccc3b770a46e549dceb443d9d7dbf3635f44da4a752f06ece2f86582f57eac08d59d78f833e1ed2e7badea340d5a0f1eb31beb24c
+DIST CairoSVG-2.5.1.tar.gz 8397716 BLAKE2B f5d307f3019df3b8e19a86c4f185bb6c95ff5f450705a06506f03447f7a4e97091fed4dbbdad7220da0b04c6bed3eb252f3f3e8d91bff55ab6432d0df7f62d70 SHA512 5f6732758ed8024b58173bc920a44fcafa65a2daf301ee07e088d542f1e82d0093bd853e58da2484c392d1b625fd27c0634d07ad58cf00e674741aa413013605
diff --git a/media-gfx/cairosvg/cairosvg-2.5.0.ebuild b/media-gfx/cairosvg/cairosvg-2.5.0.ebuild
deleted file mode 100644
index a0513821d46..00000000000
--- a/media-gfx/cairosvg/cairosvg-2.5.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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..9} )
-
-inherit distutils-r1
-
-MY_PN="CairoSVG"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="CLI and library to export SVG to PDF, PostScript, and PNG"
-HOMEPAGE="https://cairosvg.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- dev-python/cairocffi[${PYTHON_USEDEP}]
- dev-python/cssselect2[${PYTHON_USEDEP}]
- dev-python/defusedxml[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/tinycss2[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- # junk deps
- sed -e '/pytest-runner/d' \
- -e '/--flake8/d' \
- -e '/--isort/d' \
- -i setup.cfg || die
- distutils-r1_src_prepare
-}
diff --git a/media-gfx/cairosvg/cairosvg-2.4.2.ebuild b/media-gfx/cairosvg/cairosvg-2.5.1.ebuild
index 2341e26567f..9c2727b8be5 100644
--- a/media-gfx/cairosvg/cairosvg-2.4.2.ebuild
+++ b/media-gfx/cairosvg/cairosvg-2.5.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
inherit distutils-r1
@@ -36,5 +36,11 @@ src_prepare() {
-e '/--flake8/d' \
-e '/--isort/d' \
-i setup.cfg || die
+
+ # this test compares output against old version; this makes little
+ # sense for us and requires both distfiles around
+ rm test_non_regression/test_non_regression.py || die
+ eapply "${FILESDIR}"/${P}-no-ref.patch
+
distutils-r1_src_prepare
}
diff --git a/media-gfx/cairosvg/files/cairosvg-2.5.1-no-ref.patch b/media-gfx/cairosvg/files/cairosvg-2.5.1-no-ref.patch
new file mode 100644
index 00000000000..1b2ff0eb720
--- /dev/null
+++ b/media-gfx/cairosvg/files/cairosvg-2.5.1-no-ref.patch
@@ -0,0 +1,30 @@
+From f79fce1d3703f2985c543575d5eb15ffb0eb7bb6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 7 Jan 2021 00:31:52 +0100
+Subject: [PATCH] Do not use reference_cairosvg
+
+---
+ test_non_regression/__init__.py | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/test_non_regression/__init__.py b/test_non_regression/__init__.py
+index 8876e11..4b2e29b 100644
+--- a/test_non_regression/__init__.py
++++ b/test_non_regression/__init__.py
+@@ -8,12 +8,7 @@ import os
+
+ import cairosvg
+
+-reference_cairosvg = imp.load_source(
+- 'cairosvg_reference', pathname=os.path.join(
+- os.path.dirname(__file__), 'cairosvg_reference', 'cairosvg',
+- '__init__.py'))
+-
+-cairosvg.features.LOCALE = reference_cairosvg.features.LOCALE = 'en_US'
++cairosvg.features.LOCALE = 'en_US'
+
+ TEST_FOLDER = os.path.join(os.path.dirname(__file__), 'svg')
+
+--
+2.30.0
+
diff --git a/media-gfx/cellwriter/Manifest b/media-gfx/cellwriter/Manifest
index 7a49d37a872..19c5caa614e 100644
--- a/media-gfx/cellwriter/Manifest
+++ b/media-gfx/cellwriter/Manifest
@@ -1,2 +1 @@
-DIST cellwriter-1.3.5.tar.gz 293241 BLAKE2B 57d287782af21ae8010dc43ea89a2da081ecee854740cd8c5991de62450929a89f04c1601ff77ac69b945d5997042c8f739defa00614aa0af947655d5251f8ef SHA512 a9b682babda4335ea18716032ac52e73578459e9ab8866b20177f6d0cb606b9da2bf5a3fae2e2547277351db2533c7e92461f5c6a6ebc542ffe5844ff7ae65d6
DIST cellwriter-1.3.6.tar.gz 434211 BLAKE2B 2734ee3a7e61f626d253613513675a4f3819724d9f9110af08ff4809f7abe68cb897815f5dc74d686ea6e016453117bc4869fd89ef4396446ea2de830cc9ec7f SHA512 0d564b03454a440e27c72323a4dd7943d6f1c84d1ed2db172ca999f62fdafed599559f9a6dff9df5f37820d489bd7ae2c6dd9a91965e308fcb1d1722bce543fa
diff --git a/media-gfx/cellwriter/cellwriter-1.3.5.ebuild b/media-gfx/cellwriter/cellwriter-1.3.5.ebuild
deleted file mode 100644
index 83526f62589..00000000000
--- a/media-gfx/cellwriter/cellwriter-1.3.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnome2-utils
-
-DESCRIPTION="Grid-entry natural handwriting input panel"
-HOMEPAGE="http://risujin.org/cellwriter/"
-SRC_URI="http://pub.risujin.org/cellwriter/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
- x11-libs/libX11
- x11-libs/libXtst"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- x11-base/xorg-proto"
-
-DOCS="AUTHORS ChangeLog README TODO" # NEWS is no-op
-
-src_prepare() {
- sed -i -e '/Encoding/d' ${PN}.desktop || die
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-gfx/chafa/Manifest b/media-gfx/chafa/Manifest
index c8d6ff58a27..bcce16cf5d3 100644
--- a/media-gfx/chafa/Manifest
+++ b/media-gfx/chafa/Manifest
@@ -1 +1,2 @@
DIST chafa-1.4.1.tar.xz 389428 BLAKE2B 8ed6c6d57953d784763f10c274bd8b7acf7857b095bae58c476d2e17418a7112f1ec000d667eebfc2eda712c9588e686ad4021da017f4d187a5461c0435c5476 SHA512 f0bd1911fd544f93afadbb2105f151dc77e31a2f3af4c7f8441a06f547a7ebe0674664721b18c3a35a7c4e745dda666713adc1dfbe5e97dfdc54856a13bd5063
+DIST chafa-1.6.0.tar.xz 417888 BLAKE2B f9837a9062396f92974088ea2e59e050089b462442ac01af17dc7f47f4c3a24542facd4c977cac2ee9db3c4af9bae2349cea9186f9d0362cf7bb74f4e83d345b SHA512 47843b8bf1b0555ae3570f688229e9f848e2e30c80aa277278230196f6fdb583b7f9170d1740171f2f4c5d5d915e00df407722067bcf6f2dc888804b7bd074da
diff --git a/media-gfx/chafa/chafa-1.6.0.ebuild b/media-gfx/chafa/chafa-1.6.0.ebuild
new file mode 100644
index 00000000000..2c7e6798a52
--- /dev/null
+++ b/media-gfx/chafa/chafa-1.6.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="versatile and fast Unicode/ASCII/ANSI graphics renderer"
+HOMEPAGE="https://hpjansson.org/chafa/ https://github.com/hpjansson/chafa"
+SRC_URI="https://hpjansson.org/chafa/releases/${P}.tar.xz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+tools"
+
+RDEPEND="
+ dev-libs/glib:2
+ media-gfx/imagemagick:0=
+ tools? ( >=media-libs/freetype-2.0.0 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+ econf \
+ --disable-static \
+ --disable-man \
+ $(use_with tools)
+}
+
+src_install() {
+ local DOCS=( AUTHORS NEWS README TODO )
+ default
+
+ use tools && doman docs/chafa.1
+
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-gfx/converseen/Manifest b/media-gfx/converseen/Manifest
index ed16f72e505..7440bc6d747 100644
--- a/media-gfx/converseen/Manifest
+++ b/media-gfx/converseen/Manifest
@@ -1 +1 @@
-DIST converseen-0.9.6.2.tar.gz 276879 BLAKE2B 3f41c8a85d275b2a2fb1c2c8971f92e447b0c7b236d5b90a07629400925b8627e1e9e837239e2114cd2e6f755941b4ef28adfbecf9813963d01b925af4e348e0 SHA512 897bcb4554ca05d92dc939837f74022fcc21e05273cb40445c0d02ce3e10e87f9e74eeccee69e4ed1bdf63ca3bd759d4d51769daee5ea34df7997114c7937f7c
+DIST converseen-0.9.9.0.tar.gz 280547 BLAKE2B 978df93748cd5585b99f371f9538f9ae0a6fa683c9a452a8fb3eceb0c6a7b972423dbd396f8702a4db839852d39bb7c3b654603a08a5dc61481ed74c6aa3aa0b SHA512 8ec01de40fc32bc83c97b3e1d1d0400b9ae5c8c5f374dfae452a75f1bec648d6db26ea036103e15c84e4360ed83f27ce5d35a64592289de083e9701e6153ca63
diff --git a/media-gfx/converseen/converseen-0.9.6.2.ebuild b/media-gfx/converseen/converseen-0.9.9.0.ebuild
index 803e1a01e29..06de610772d 100644
--- a/media-gfx/converseen/converseen-0.9.6.2.ebuild
+++ b/media-gfx/converseen/converseen-0.9.9.0.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit cmake-utils
+inherit cmake
DESCRIPTION="Batch image converter and resizer based on ImageMagick"
-HOMEPAGE="http://converseen.fasterland.net/"
+HOMEPAGE="https://converseen.fasterland.net/
+ https://github.com/Faster3ck/Converseen/"
SRC_URI="https://github.com/Faster3ck/Converseen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="debug"
@@ -23,10 +24,15 @@ RDEPEND="
dev-qt/qtwidgets:5
media-gfx/imagemagick:=[cxx]
"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
dev-qt/linguist-tools:5
"
S="${WORKDIR}/${P^}"
-PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-gnuinstalldirs.patch"
+ "${FILESDIR}/${P}-appdata-path.patch"
+ "${FILESDIR}/${P}-no-update.patch"
+)
diff --git a/media-gfx/converseen/files/converseen-0.9.9.0-appdata-path.patch b/media-gfx/converseen/files/converseen-0.9.9.0-appdata-path.patch
new file mode 100644
index 00000000000..127fc7ad926
--- /dev/null
+++ b/media-gfx/converseen/files/converseen-0.9.9.0-appdata-path.patch
@@ -0,0 +1,17 @@
+Description: install appdata to package directory
+ The CMAKE_INSTALL_PREFIX was not set to install path and set its correct
+ location.
+Author: Laszlo Boszormenyi (GCS) <gcs@debian.org>
+Last-Update: 2018-08-21
+
+--- a/converseen.pro
++++ b/converseen.pro
+@@ -122,7 +122,7 @@ loc/converseen_uk_UA.qm
+ desktopFile.files = res/converseen.desktop
+ kdeservicemenu.path = $${SHARE_DIR}/kservices5/ServiceMenus
+ kdeservicemenu.files = res/converseen_import.desktop
+- appdata.path = /usr/share/appdata/
++ appdata.path = /usr/share/metainfo/
+ appdata.files = converseen.appdata.xml
+
+ isEmpty(QMAKE_LRELEASE) {
diff --git a/media-gfx/converseen/files/converseen-0.9.6.2-gnuinstalldirs.patch b/media-gfx/converseen/files/converseen-0.9.9.0-gnuinstalldirs.patch
index 3b53d056948..50ad7a01e8d 100644
--- a/media-gfx/converseen/files/converseen-0.9.6.2-gnuinstalldirs.patch
+++ b/media-gfx/converseen/files/converseen-0.9.9.0-gnuinstalldirs.patch
@@ -1,15 +1,15 @@
-From ba62e29b7739c96ad073a7c14d4fdb5883dbe94c Mon Sep 17 00:00:00 2001
+From 6dbded67fdbe977719ded2a6ffdcdc87165dd541 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
Date: Tue, 9 Jan 2018 02:06:09 +0100
Subject: [PATCH] Use GNUInstalldirs
No need to reinvent the wheel, make use of standards provided by cmake.
---
- CMakeLists.txt | 36 +++++++++++++++++++-----------------
- 1 file changed, 19 insertions(+), 17 deletions(-)
+ CMakeLists.txt | 40 +++++++++++++++++++++-------------------
+ 1 file changed, 21 insertions(+), 19 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a944102..de5e556 100755
+index f135b66..4bd8764 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 2.6)
@@ -21,7 +21,7 @@ index a944102..de5e556 100755
ADD_DEFINITIONS( ${OPTIMIZATION_FLAGS} )
SET(converseen_UIS
-@@ -129,20 +131,20 @@ ADD_EXECUTABLE(${GUI}
+@@ -131,22 +133,22 @@ ADD_EXECUTABLE(${GUI}
TARGET_LINK_LIBRARIES(${GUI} ${Qt5Network_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${ImageMagick_LIBRARY} ${ImageMagick_Magick++_LIBRARY} ${ImageMagick_MagickCore_LIBRARY})
@@ -29,7 +29,7 @@ index a944102..de5e556 100755
-install(FILES res/converseen.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
-install(FILES res/converseen.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps)
-install(FILES res/converseen_import.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kservices5/ServiceMenus)
--install(FILES converseen.appdata.xml DESTINATION /usr/share/appdata/)
+-install(FILES converseen.appdata.xml DESTINATION /usr/share/metainfo/)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_cs_CZ.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_de_DE.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_es_CL.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
@@ -42,11 +42,13 @@ index a944102..de5e556 100755
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pl_PL.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ja_JP.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_da_DK.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_uk_UA.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_sv_SE.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/converseen DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(FILES res/converseen.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
+install(FILES res/converseen.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pixmaps)
+install(FILES res/converseen_import.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/kservices5/ServiceMenus)
-+install(FILES converseen.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/appdata/)
++install(FILES converseen.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo/)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_cs_CZ.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_de_DE.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_es_CL.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
@@ -59,6 +61,8 @@ index a944102..de5e556 100755
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pl_PL.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ja_JP.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_da_DK.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_uk_UA.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_sv_SE.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
--
-2.15.1
+2.30.1
diff --git a/media-gfx/converseen/files/converseen-0.9.9.0-no-update.patch b/media-gfx/converseen/files/converseen-0.9.9.0-no-update.patch
new file mode 100644
index 00000000000..f4dad00586a
--- /dev/null
+++ b/media-gfx/converseen/files/converseen-0.9.9.0-no-update.patch
@@ -0,0 +1,20 @@
+Description: Don't check upstream versions
+ Don't check new versions page due to privacy concerns.
+Forwarded: no
+Last-Update: 2018-08-21
+Author: Laszlo Boszormenyi (GCS) <gcs@debian.org>
+Bug-Debian: https://bugs.debian.org/761944
+
+---
+
+--- a/src/mainwindowimpl.cpp
++++ b/src/mainwindowimpl.cpp
+@@ -1012,7 +1012,7 @@ void MainWindowImpl::openFlattrLink()
+ void MainWindowImpl::checkForUpdates()
+ {
+ UpdateChecker *up = new UpdateChecker();
+- up->checkForUpdates();
++// up->checkForUpdates();
+ }
+
+ void MainWindowImpl::bugReport()
diff --git a/media-gfx/converseen/metadata.xml b/media-gfx/converseen/metadata.xml
index 4716a659219..c9088408f03 100644
--- a/media-gfx/converseen/metadata.xml
+++ b/media-gfx/converseen/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>maksbotan@gentoo.org</email>
- <name>Maxim Koltsov</name>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<remote-id type="github">Faster3ck/Converseen</remote-id>
</upstream>
diff --git a/media-gfx/cropgui/cropgui-0.4.1.ebuild b/media-gfx/cropgui/cropgui-0.4.1.ebuild
index 867b72d6161..5563225ddde 100644
--- a/media-gfx/cropgui/cropgui-0.4.1.ebuild
+++ b/media-gfx/cropgui/cropgui-0.4.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
inherit eutils python-r1 desktop xdg-utils
DESCRIPTION="GUI for lossless cropping of jpeg images"
diff --git a/media-gfx/cropgui/cropgui-0.5.ebuild b/media-gfx/cropgui/cropgui-0.5.ebuild
index 9f412bfb5f0..ed810b81811 100644
--- a/media-gfx/cropgui/cropgui-0.5.ebuild
+++ b/media-gfx/cropgui/cropgui-0.5.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
inherit eutils python-r1 desktop xdg-utils
DESCRIPTION="GUI for lossless cropping of jpeg images"
diff --git a/media-gfx/crwinfo/crwinfo-0.2.ebuild b/media-gfx/crwinfo/crwinfo-0.2.ebuild
index debdd7e0557..399e3208c0f 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/cura/Manifest b/media-gfx/cura/Manifest
index 8e2e7103861..5dfea09d774 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,2 +1 @@
-DIST cura-4.6.1.tar.gz 36080329 BLAKE2B 5d86734334a2c65afd62eea6b3324b0fc543670b48f5410eac16561590706feed2320c45b22e60c9835973f965a00f222280441daf44866ffc93ebcf1295c750 SHA512 8802993a98e75428d11bfdc7721d5d48e8939ef1c783789db2941cb40b6fc8014eacbdea09c559c6d68cb1dd99def15bfb503d5c164f057a384c8a7620b15dc2
-DIST cura-4.7.0.tar.gz 29712949 BLAKE2B b208a669aa38b07012099fe01ec453232c2bd3007befe649a4fd4cb0a0b12473762a5069d09218a3f2fe865141bbb8c8b7d5a26168fed02900abb20d78b0ad3f SHA512 0b3383042b9c8cf2ce27caee95c365be786c9eb40898c74ea4e0fb903241087e48a6e908d85635a9e43cf21ca3623098c6fe980d0cec3fc6a59c01c9c9cb4d9d
+DIST cura-4.8.0.tar.gz 31930258 BLAKE2B 0a10a03f5fa34ec0279b9476063f71d8ae904e05485b84fac011fa5061812cd74f4be6df7e6d93046365799fc2fb1bcf4d10d89c69d2c8455080f99c12cec153 SHA512 0a34438299908021242e47e74418e56fe61c41cff5c29df938b4705b5d23ceb6e1bd17b9eb8110f8ec75c7a08afe8928857d4f2fd5befa00c187bce717105711
diff --git a/media-gfx/cura/cura-4.6.1-r1.ebuild b/media-gfx/cura/cura-4.6.1-r1.ebuild
deleted file mode 100644
index 74ad049667a..00000000000
--- a/media-gfx/cura/cura-4.6.1-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake desktop python-single-r1 xdg
-
-MY_PN=Cura
-
-DESCRIPTION="A 3D model slicing application for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/Cura"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+usb zeroconf"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="sys-devel/gettext"
-RDEPEND="${PYTHON_DEPS}
- ~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
- ~dev-libs/libcharon-${PV}[${PYTHON_SINGLE_USEDEP}]
- ~dev-libs/libsavitar-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
- ~dev-python/uranium-${PV}[${PYTHON_SINGLE_USEDEP}]
- ~media-gfx/curaengine-${PV}
- ~media-gfx/fdm-materials-${PV}
- $(python_gen_cond_dep '
- dev-python/requests[${PYTHON_MULTI_USEDEP}]
- dev-python/sentry-sdk[${PYTHON_MULTI_USEDEP}]
- usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] )
- zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] )
- ')"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-PATCHES=( "${FILESDIR}/${PN}-4.6.1-fix-install-paths.patch" )
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
- sed -i "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
- )
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- doicon icons/*.png
- python_optimize "${D}${get_libdir}"
-}
diff --git a/media-gfx/cura/cura-4.7.0.ebuild b/media-gfx/cura/cura-4.7.0.ebuild
deleted file mode 100644
index 4264d19b6a6..00000000000
--- a/media-gfx/cura/cura-4.7.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake desktop python-single-r1 xdg
-
-MY_PN=Cura
-
-DESCRIPTION="A 3D model slicing application for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/Cura"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+usb zeroconf"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="sys-devel/gettext"
-RDEPEND="${PYTHON_DEPS}
- ~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
- ~dev-libs/libcharon-${PV}[${PYTHON_SINGLE_USEDEP}]
- ~dev-libs/libsavitar-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
- ~dev-python/uranium-${PV}[${PYTHON_SINGLE_USEDEP}]
- ~media-gfx/curaengine-${PV}
- ~media-gfx/fdm-materials-${PV}
- $(python_gen_cond_dep '
- dev-python/requests[${PYTHON_MULTI_USEDEP}]
- dev-python/sentry-sdk[${PYTHON_MULTI_USEDEP}]
- usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] )
- zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] )
- ')"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-PATCHES=( "${FILESDIR}/${PN}-4.6.1-fix-install-paths.patch" )
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
- sed -i "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
- )
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- doicon icons/*.png
- python_optimize "${D}${get_libdir}"
-}
diff --git a/media-gfx/cura/cura-4.7.0-r1.ebuild b/media-gfx/cura/cura-4.8.0.ebuild
index 36f6fd35e91..615180db9ee 100644
--- a/media-gfx/cura/cura-4.7.0-r1.ebuild
+++ b/media-gfx/cura/cura-4.8.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=(python3_{6..8})
+PYTHON_COMPAT=(python3_{7..8})
inherit cmake desktop python-single-r1 xdg
MY_PN=Cura
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.
LICENSE="LGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+usb zeroconf"
+IUSE="debug +usb zeroconf"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
BDEPEND="sys-devel/gettext"
@@ -23,6 +23,7 @@ RDEPEND="${PYTHON_DEPS}
~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
~dev-libs/libcharon-${PV}[${PYTHON_SINGLE_USEDEP}]
~dev-libs/libsavitar-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
+ ~dev-python/pynest2d-${PV}[${PYTHON_SINGLE_USEDEP}]
~dev-python/uranium-${PV}[${PYTHON_SINGLE_USEDEP}]
~media-gfx/curaengine-${PV}
~media-gfx/fdm-materials-${PV}
@@ -39,19 +40,21 @@ RDEPEND="${PYTHON_DEPS}
DEPEND="${RDEPEND}"
DOCS=(README.md)
-PATCHES=("${FILESDIR}/${PN}-4.6.1-fix-install-paths.patch")
S="${WORKDIR}/${MY_PN}-${PV}"
src_prepare() {
- sed -i -e "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die
+ sed -i -e "s:lib\${LIB_SUFFIX}/python\${Python3_VERSION_MAJOR}.\${Python3_VERSION_MINOR}/site-packages:$(python_get_sitedir):g" CMakeLists.txt || die
+
cmake_src_prepare
}
src_configure() {
# trimesh not available in portage
local mycmakeargs=(
+ -DCURA_BUILDTYPE="ebuild"
+ -DCURA_VERSION=${PV}
-DCURA_NO_INSTALL_PLUGINS="AMFReader;Toolbox;TrimeshReader"
- -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
+ -DCURA_DEBUGMODE=$(usex debug)
)
cmake_src_configure
}
diff --git a/media-gfx/cura/files/cura-4.6.1-fix-install-paths.patch b/media-gfx/cura/files/cura-4.6.1-fix-install-paths.patch
deleted file mode 100644
index 4d5f00ad47d..00000000000
--- a/media-gfx/cura/files/cura-4.6.1-fix-install-paths.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- Cura-4.5.0-orig/CMakeLists.txt 2020-03-01 16:32:23.380956083 +0200
-+++ Cura-4.5.0/CMakeLists.txt 2020-02-25 17:16:45.000000000 +0200
-@@ -48,6 +48,15 @@
- find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
- endif()
-
-+if(NOT PYTHON_SITE_PACKAGES_DIR)
-+ if(APPLE OR WIN32)
-+ set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-+ CACHE STRING "Directory to install Python bindings to")
-+ else()
-+ set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}/dist-packages
-+ CACHE STRING "Directory to install Python bindings to")
-+ endif()
-+endif()
-
- if(NOT ${URANIUM_DIR} STREQUAL "")
- set(CMAKE_MODULE_PATH "${URANIUM_DIR}/cmake")
-@@ -80,10 +89,10 @@
- DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}/dist-packages/cura)
- else()
- install(DIRECTORY cura
-- DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages
-+ DESTINATION ${PYTHON_SITE_PACKAGES_DIR}
- FILES_MATCHING PATTERN *.py)
- install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py
-- DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages/cura)
-+ DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/cura)
- endif()
- install(FILES ${CMAKE_BINARY_DIR}/cura.desktop
- DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
diff --git a/media-gfx/cura/metadata.xml b/media-gfx/cura/metadata.xml
index 19761d81848..615b4b60345 100644
--- a/media-gfx/cura/metadata.xml
+++ b/media-gfx/cura/metadata.xml
@@ -28,6 +28,8 @@
<flag name="usb">Access 3D printers via USB</flag>
</use>
<upstream>
+ <bugs-to>https://github.com/Ultimaker/Cura/issues</bugs-to>
+ <doc>https://github.com/Ultimaker/Cura/wiki</doc>
<remote-id type="github">Ultimaker/Cura</remote-id>
</upstream>
</pkgmetadata>
diff --git a/media-gfx/curaengine/Manifest b/media-gfx/curaengine/Manifest
index 31167c77231..ac812d6972c 100644
--- a/media-gfx/curaengine/Manifest
+++ b/media-gfx/curaengine/Manifest
@@ -1,2 +1 @@
-DIST curaengine-4.6.1.tar.gz 1685119 BLAKE2B 352c5b4b98866ebe6f90dc095960d2417ccf9c023334b4006b604da45aed1e3b6066700b08be3727214433fd505de87cad4da8e17d9067571d91dd0ec7660ebe SHA512 8b3a65fb00bebc37acd24a6d4277c1f09849c0318fca00867479d62c0f64b8628064a898128e1ffc5fb99eed2c1d45a310df2f97fde9c37a9ccc311f5ba4d057
-DIST curaengine-4.7.0.tar.gz 1684860 BLAKE2B da25da5656eb2c2d9cd9bd1c8ea0f633284a6d300f2b5ab7a916be262d20106d07a17a5c5ac63b854b32e98f616ecadbc05a912146f4f6d396c646ca69637116 SHA512 4c5f2eb70912315595e7f090ba9a34196ecb740eb25b5b2da2decf6485260999e8a87f7c2619c6efab9b46280e9eecf11f7e6bb021359c3b72da9fb900b0c1c3
+DIST curaengine-4.8.0.tar.gz 1690082 BLAKE2B 7c582ad0743a937ad4efa2a224e052383b90632c8f33f666a4139a74954a7243e17107ac39b35c1a5e41df89e303d618e4407d7e9a75efc5d96913aaaf498273 SHA512 be0d12cfe61932bf03dde61df8fb7f31cbd0aef6a44292130a7a67e318891f37db685722ba5d3cf66e88d4ff1de64ac86be5e494b750f8f7ff4b52d7976cb670
diff --git a/media-gfx/curaengine/curaengine-4.6.1.ebuild b/media-gfx/curaengine/curaengine-4.6.1.ebuild
deleted file mode 100644
index 9a634cff090..00000000000
--- a/media-gfx/curaengine/curaengine-4.6.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake toolchain-funcs
-
-MY_PN="CuraEngine"
-
-DESCRIPTION="A 3D model slicing engine for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/CuraEngine"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="|| ( sys-devel/gcc sys-devel/clang )
- doc? ( app-doc/doxygen )"
-RDEPEND="${PYTHON_DEPS}
- ~dev-libs/libarcus-${PV}:*
- dev-libs/protobuf
- dev-libs/stb"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_configure() {
- local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" )
- cmake_src_configure
-}
-
-src_compile() {
- cmake_build
- if use doc; then
- doxygen || die
- mv docs/html . || die
- find html -name '*.md5' -or -name '*.map' -delete || die
- HTML_DOCS=( html )
- fi
-}
diff --git a/media-gfx/curaengine/curaengine-4.7.0.ebuild b/media-gfx/curaengine/curaengine-4.8.0.ebuild
index 74a7ec34474..2f4c30faf72 100644
--- a/media-gfx/curaengine/curaengine-4.7.0.ebuild
+++ b/media-gfx/curaengine/curaengine-4.8.0.ebuild
@@ -32,7 +32,6 @@ DEPEND="${RDEPEND}
BDEPEND="doc? ( app-doc/doxygen )"
DOCS=( README.md )
-PATCHES=( "${FILESDIR}/${PN}-4.7.0-fix-tests.patch" )
S="${WORKDIR}/${MY_PN}-${PV}"
src_prepare() {
diff --git a/media-gfx/curaengine/files/curaengine-4.7.0-fix-tests.patch b/media-gfx/curaengine/files/curaengine-4.7.0-fix-tests.patch
deleted file mode 100644
index 33feab3d394..00000000000
--- a/media-gfx/curaengine/files/curaengine-4.7.0-fix-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Upstream issue: https://github.com/Ultimaker/CuraEngine/issues/1318
-
---- a/tests/utils/SparseGridTest.cpp
-+++ b/tests/utils/SparseGridTest.cpp
-@@ -1,6 +1,7 @@
- //Copyright (c) 2019 Ultimaker B.V.
- //CuraEngine is released under the terms of the AGPLv3 or higher.
-
-+#include <algorithm>
- #include <gtest/gtest.h>
- #include <unordered_set>
- #include <vector>
-
diff --git a/media-gfx/curaengine/metadata.xml b/media-gfx/curaengine/metadata.xml
index 45587a19e8c..9bb6b008a45 100644
--- a/media-gfx/curaengine/metadata.xml
+++ b/media-gfx/curaengine/metadata.xml
@@ -37,6 +37,7 @@
<subslots>soname major version number</subslots>
</slots>
<upstream>
+ <bugs-to>https://github.com/Ultimaker/CuraEngine/issues</bugs-to>
<remote-id type="github">Ultimaker/CuraEngine</remote-id>
</upstream>
</pkgmetadata>
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 50c2152b4a6..25b0a41f8d0 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,6 +1,6 @@
DIST darktable-2.6.2-gcc9.patch.tar.xz 25864 BLAKE2B 857803d4c46b47b1e06e962533c231621fa23e72dffae617bc4e078316fc22c5883df404b30e63d7ed2111078d0d7b54bfa3510524c92fa739238904e2ec17f0 SHA512 29b208fa0b04aa11a2c45312763ba471785b2d0f669c07a6092b82adc0284428d7dc9ea8ebae7bd851414f04191e6aafb434fcc127f062ef66d075208c7d49cb
DIST darktable-2.6.2.tar.xz 3512572 BLAKE2B ee3070ac0f6b6b1c401865801631fb28397f484f30778065b7f899204813530a47ff6e752504b645f59bc29f868e1498e39f5f4e70f8259d8fecf5abc3f15cd6 SHA512 e7a90535747a8615fa2dbd1eb05f81314cc61c689a8a85fda0e2be40208ab0248e6f6ef296bb0894d3d527ed47c6cf6640538029c0c2d58a38d2d5ce10f6f5c0
-DIST darktable-3.0.2.tar.xz 3931240 BLAKE2B 5f86579a43e396c8116aba63c43e13d7312e5c3a569f9c242fe9a7882f02c5e0ebd7e4b9bbd34576eb83b3b78298038bf0d87bf4786dd19d0fa73ed30de21f67 SHA512 ee2d83f60621586f9e1be958f4b0c3d2214fbf30338837dbd07b901641c32d565cd29f814f5ff75a450495acee2383aa62ba3da3873009077704c925bab501f1
-DIST darktable-3.2.1.tar.xz 3920728 BLAKE2B 79ef5df93d6c4728d19bc8bf01d018f071efe1ea94a68be53fced7217df608e5362b9905e2e633af4d0a11574ca3e42eac9d97fd3bfaf3a22b45b61213f60070 SHA512 0c76f7c145b470d0b129e4565727cef0c7509c1cb7f2405e41b20c81411741513cfc2976c7b8fe168bc1b017e7bfc292bb2d824c3beddce6432ee7143513bdc7
+DIST darktable-3.4.0.tar.xz 4444452 BLAKE2B 98b717aafe940a6916a2c2c42577be4956a171e7b445d69d20cb6aa1db35a255919524e8547c229461c64022fa3df5ace57a9e7a5ed32304820d5f263c3acbfc SHA512 b0a1e58f9af4007b22bacd7c61c75bdd036db9b1bbb6bd0ed785759d1a7a5a095a49a2a68c1555c661c4fff2549fcd35d2db2d9d4c16fc035bb37939804c749f
+DIST darktable-3.4.1.tar.xz 4456192 BLAKE2B 7b573db69cb32496ad79d6636b50d3b2db471376c2486d356e1da2740d48644821265c3249a40603a521d588ef89cee33e31d7a6b216f106625ca2aa3f8bfb68 SHA512 3376c5e2aa52d02fcfc45d9efb1a60a7bee6210dc81e1131f2c163ca2059860f7e3a64b5cfd05117dcaaf8c7810d08a84058a0b64ef6fd24c90bbafde7ca4f6f
DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B a7a254e49dd57ee03480d52f4506a436210324cc4a2651f3c2fd70ca65cb7aa1735934a5e046ffa662b2aa1f081042d2d1e6ce0f70b6768719c52e2d14c358ce SHA512 e68005ee8706f2342755ce3e4dcd6c2907c1607bc9b750154dceb4b52dcccf50c581ab65212efc8ffb2447f5d828e0fdb61d0471c3d14938e098528e50f32e14
-DIST darktable-usermanual-3.0.0.pdf 16237603 BLAKE2B ff5c24bb038deb37269a84389937740fa0ff77a9fb5bef4c484cdd903e39609588f632f577ce53c690d3abb832ace451d0d9d3f563ebdb6196ae8e2dac008a01 SHA512 2523b48e2baaa71561dc119340aed3bbf2ab4481dceb0c3ca2bbb7b0cacfaab894fa4eef82b667648cd7bb049304dbda09fa1a638f7734219b672b3ea8ee0eac
+DIST darktable-usermanual-3.4.0.pdf 16241791 BLAKE2B d6fc232c3eddb5474e36ce1fbc02c3472291e5ebdf2eae09c419215263f615546a79f88ee9d252b387fc5e4f2c9714398deab8de176b3d928b6a17c2878cef56 SHA512 fd154c02d5e0c63d9698b2f80a7439a191f4582b717b2f163923eda40aae1ebe8aeaf1a70efdc423eb8c8269d74fc0e23df8c9c0269ee8f5a357611501c3547e
diff --git a/media-gfx/darktable/darktable-3.0.2.ebuild b/media-gfx/darktable/darktable-3.0.2.ebuild
deleted file mode 100644
index 4fd99f7da34..00000000000
--- a/media-gfx/darktable/darktable-3.0.2.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic 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"
-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 tools 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
- )
-"
-RDEPEND="${COMMON_DEPEND}
- kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
-"
-
-PATCHES=(
- "${FILESDIR}"/"${PN}"-find-opencl-header.patch
- "${FILESDIR}"/${PN}-3.0.2_cmake-opencl-kernel-loop.patch
- "${FILESDIR}"/${PN}-3.0.2_jsonschema-automagic.patch
-)
-
-S="${WORKDIR}/${P/_/~}"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- # Bug #695658
- if tc-is-gcc; then
- test-flags-CC -floop-block &> /dev/null || \
- die "Please switch to a gcc version built with USE=graphite"
- fi
-
- if use openmp ; then
- tc-has-openmp || die "Please switch to an openmp compatible compiler"
- fi
- 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_CURVE_TOOLS=$(usex tools)
- -DBUILD_NOISE_TOOLS=$(usex tools)
- -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
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- elog
- 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."
- elog
- ewarn "It will not be possible to downgrade!"
- ewarn
-}
diff --git a/media-gfx/darktable/darktable-3.2.1.ebuild b/media-gfx/darktable/darktable-3.2.1.ebuild
deleted file mode 100644
index 49e44beeb08..00000000000
--- a/media-gfx/darktable/darktable-3.2.1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic 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 ~arm64"
-LANGS=" de es fr he it pl pt-BR 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
- lto nls opencl openmp openexr tools 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
- )
-"
-RDEPEND="${COMMON_DEPEND}
- kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
-"
-
-PATCHES=(
- "${FILESDIR}"/"${PN}"-find-opencl-header.patch
- "${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
- "${FILESDIR}"/${PN}-3.0.2_jsonschema-automagic.patch
-)
-
-S="${WORKDIR}/${P/_/~}"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- # Bug #695658
- if tc-is-gcc; then
- test-flags-CC -floop-block &> /dev/null || \
- die "Please switch to a gcc version built with USE=graphite"
- fi
-
- if use openmp ; then
- tc-has-openmp || die "Please switch to an openmp compatible compiler"
- fi
- 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_CURVE_TOOLS=$(usex tools)
- -DBUILD_NOISE_TOOLS=$(usex tools)
- -DBUILD_PRINT=$(usex cups)
- -DCUSTOM_CFLAGS=ON
- -DRAWSPEED_ENABLE_LTO=$(usex lto)
- -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
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- elog
- 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."
- elog
- ewarn "It will not be possible to downgrade!"
- ewarn
-}
diff --git a/media-gfx/darktable/darktable-3.2.1-r1.ebuild b/media-gfx/darktable/darktable-3.4.0-r1.ebuild
index 05d2a6634f2..36695e589e2 100644
--- a/media-gfx/darktable/darktable-3.2.1-r1.ebuild
+++ b/media-gfx/darktable/darktable-3.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,29 +7,41 @@ LUA_COMPAT=( lua5-3 )
inherit cmake flag-o-matic lua-single 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 ~arm64"
-LANGS=" de es fr he it pl pt-BR ru sl"
-IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
- lto lua nls opencl openmp openexr system-lua tools webp
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git"
+
+ LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN zh-TW"
+else
+ DOC_PV="3.4.0"
+ MY_PV="${PV/_/}"
+ MY_P="${P/_/.}"
+
+ 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 )"
+
+ KEYWORDS="amd64 arm64 -x86"
+ LANGS=" af cs de es fi fr he hu it pl pt-BR ru sk sl"
+fi
+
+IUSE="avif colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
+ lto lua nls opencl openmp openexr test tools webp
${LANGS// / l10n_}"
-REQUIRED_USE="system-lua? ( lua ${LUA_REQUIRED_USE} )"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
BDEPEND="
dev-util/intltool
virtual/pkgconfig
nls? ( sys-devel/gettext )
+ test? ( >=dev-python/jsonschema-3.2.0 )
"
COMMON_DEPEND="
dev-db/sqlite:3
@@ -49,17 +61,19 @@ COMMON_DEPEND="
x11-libs/cairo
>=x11-libs/gtk+-3.22:3
x11-libs/pango
+ avif? ( >=media-libs/libavif-0.8.2 )
colord? ( x11-libs/colord-gtk:0= )
cups? ( net-print/cups )
flickr? ( media-libs/flickcurl )
geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+ gmic? ( media-gfx/gmic )
gnome-keyring? ( >=app-crypt/libsecret-0.18 )
gphoto2? ( media-libs/libgphoto2:= )
graphicsmagick? ( media-gfx/graphicsmagick )
jpeg2k? ( media-libs/openjpeg:2= )
+ lua? ( ${LUA_DEPS} )
opencl? ( virtual/opencl )
openexr? ( media-libs/openexr:0= )
- system-lua? ( ${LUA_DEPS} )
webp? ( media-libs/libwebp:0= )
"
DEPEND="${COMMON_DEPEND}
@@ -72,10 +86,12 @@ RDEPEND="${COMMON_DEPEND}
kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
"
+# the xmmintrin patch will no longer be needed come 3.4.1
PATCHES=(
"${FILESDIR}"/"${PN}"-find-opencl-header.patch
"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
- "${FILESDIR}"/${PN}-3.0.2_jsonschema-automagic.patch
+ "${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
+ "${FILESDIR}"/${PN}-3.4.0-xmmintrin-sse-only.patch
)
S="${WORKDIR}/${P/_/~}"
@@ -94,6 +110,10 @@ pkg_pretend() {
fi
}
+pkg_setup() {
+ use lua && lua-single_pkg_setup
+}
+
src_prepare() {
use cpu_flags_x86_sse3 && append-flags -msse3
@@ -103,21 +123,18 @@ src_prepare() {
}
src_configure() {
- # As of darktable-3.2.1, AVIF support is not compatible with >=media-libs/libavif-0.8.0; see Bug #751352.
- # GMIC support mostly works but there are several problems with the media-gfx/gmic ebuilds currently
- # in the tree, and the package itself has got no maintainer.
local mycmakeargs=(
-DBUILD_CURVE_TOOLS=$(usex tools)
-DBUILD_NOISE_TOOLS=$(usex tools)
-DBUILD_PRINT=$(usex cups)
-DCUSTOM_CFLAGS=ON
- -DDONT_USE_INTERNAL_LUA=$(usex system-lua)
+ -DDONT_USE_INTERNAL_LUA=ON
-DRAWSPEED_ENABLE_LTO=$(usex lto)
- -DUSE_AVIF=no
+ -DUSE_AVIF=$(usex avif)
-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-DUSE_COLORD=$(usex colord)
-DUSE_FLICKR=$(usex flickr)
- -DUSE_GMIC=no
+ -DUSE_GMIC=$(usex gmic)
-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
-DUSE_KWALLET=$(usex kwallet)
-DUSE_LIBSECRET=$(usex gnome-keyring)
@@ -129,6 +146,7 @@ src_configure() {
-DUSE_OPENJPEG=$(usex jpeg2k)
-DUSE_OPENMP=$(usex openmp)
-DUSE_WEBP=$(usex webp)
+ -DWANT_JSON_VALIDATION=$(usex test)
)
CMAKE_BUILD_TYPE="RELWITHDEBINFO"
cmake_src_configure
@@ -136,9 +154,10 @@ src_configure() {
src_install() {
cmake_src_install
+ # This USE flag is masked for -9999
use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
- if use nls ; then
+ if use nls; then
for lang in ${LANGS} ; do
if ! use l10n_${lang}; then
rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
diff --git a/media-gfx/darktable/darktable-3.2.1-r2.ebuild b/media-gfx/darktable/darktable-3.4.1.ebuild
index 03bc356adc6..f5fe46fb2c5 100644
--- a/media-gfx/darktable/darktable-3.2.1-r2.ebuild
+++ b/media-gfx/darktable/darktable-3.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,29 +7,41 @@ LUA_COMPAT=( lua5-3 )
inherit cmake flag-o-matic lua-single 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 ~arm64"
-LANGS=" de es fr he it pl pt-BR ru sl"
-IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
- lto lua nls opencl openmp openexr system-lua tools webp
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git"
+
+ LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN zh-TW"
+else
+ DOC_PV="3.4.0"
+ MY_PV="${PV/_/}"
+ MY_P="${P/_/.}"
+
+ 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 )"
+
+ KEYWORDS="~amd64 ~arm64 -x86"
+ LANGS=" af cs de es fi fr he hu it pl pt-BR ru sk sl"
+fi
+
+IUSE="avif colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
+ lto lua nls opencl openmp openexr test tools webp
${LANGS// / l10n_}"
-REQUIRED_USE="system-lua? ( lua ${LUA_REQUIRED_USE} )"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
BDEPEND="
dev-util/intltool
virtual/pkgconfig
nls? ( sys-devel/gettext )
+ test? ( >=dev-python/jsonschema-3.2.0 )
"
COMMON_DEPEND="
dev-db/sqlite:3
@@ -49,6 +61,7 @@ COMMON_DEPEND="
x11-libs/cairo
>=x11-libs/gtk+-3.22:3
x11-libs/pango
+ avif? ( >=media-libs/libavif-0.8.2 )
colord? ( x11-libs/colord-gtk:0= )
cups? ( net-print/cups )
flickr? ( media-libs/flickcurl )
@@ -58,9 +71,9 @@ COMMON_DEPEND="
gphoto2? ( media-libs/libgphoto2:= )
graphicsmagick? ( media-gfx/graphicsmagick )
jpeg2k? ( media-libs/openjpeg:2= )
+ lua? ( ${LUA_DEPS} )
opencl? ( virtual/opencl )
openexr? ( media-libs/openexr:0= )
- system-lua? ( ${LUA_DEPS} )
webp? ( media-libs/libwebp:0= )
"
DEPEND="${COMMON_DEPEND}
@@ -76,7 +89,7 @@ RDEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}"/"${PN}"-find-opencl-header.patch
"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
- "${FILESDIR}"/${PN}-3.0.2_jsonschema-automagic.patch
+ "${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
)
S="${WORKDIR}/${P/_/~}"
@@ -95,6 +108,10 @@ pkg_pretend() {
fi
}
+pkg_setup() {
+ use lua && lua-single_pkg_setup
+}
+
src_prepare() {
use cpu_flags_x86_sse3 && append-flags -msse3
@@ -104,15 +121,14 @@ src_prepare() {
}
src_configure() {
- # As of darktable-3.2.1, AVIF support is not compatible with >=media-libs/libavif-0.8.0; see Bug #751352.
local mycmakeargs=(
-DBUILD_CURVE_TOOLS=$(usex tools)
-DBUILD_NOISE_TOOLS=$(usex tools)
-DBUILD_PRINT=$(usex cups)
-DCUSTOM_CFLAGS=ON
- -DDONT_USE_INTERNAL_LUA=$(usex system-lua)
+ -DDONT_USE_INTERNAL_LUA=ON
-DRAWSPEED_ENABLE_LTO=$(usex lto)
- -DUSE_AVIF=no
+ -DUSE_AVIF=$(usex avif)
-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-DUSE_COLORD=$(usex colord)
-DUSE_FLICKR=$(usex flickr)
@@ -128,6 +144,7 @@ src_configure() {
-DUSE_OPENJPEG=$(usex jpeg2k)
-DUSE_OPENMP=$(usex openmp)
-DUSE_WEBP=$(usex webp)
+ -DWANT_JSON_VALIDATION=$(usex test)
)
CMAKE_BUILD_TYPE="RELWITHDEBINFO"
cmake_src_configure
@@ -135,9 +152,10 @@ src_configure() {
src_install() {
cmake_src_install
+ # This USE flag is masked for -9999
use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
- if use nls ; then
+ if use nls; then
for lang in ${LANGS} ; do
if ! use l10n_${lang}; then
rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild
index 94d8c657437..e2dca8478be 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-9999.ebuild
@@ -3,25 +3,45 @@
EAPI=7
-inherit cmake flag-o-matic git-r3 toolchain-funcs xdg
+LUA_COMPAT=( lua5-3 )
-EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git"
+inherit cmake flag-o-matic lua-single toolchain-funcs xdg
DESCRIPTION="A virtual lighttable and darkroom for photographers"
HOMEPAGE="https://www.darktable.org/"
-
LICENSE="GPL-3 CC-BY-3.0"
SLOT="0"
-#KEYWORDS="~amd64 ~arm64"
-LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN zh-TW"
-IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
- lto lua nls opencl openmp openexr tools webp
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git"
+
+ LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN zh-TW"
+else
+ DOC_PV="3.4.0"
+ MY_PV="${PV/_/}"
+ MY_P="${P/_/.}"
+
+ 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 )"
+
+ KEYWORDS="~amd64 ~arm64 -x86"
+ LANGS=" af cs de es fi fr he hu it pl pt-BR ru sk sl"
+fi
+
+IUSE="avif colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
+ lto lua nls opencl openmp openexr test tools webp
${LANGS// / l10n_}"
-BDEPEND=">=dev-python/jsonschema-3.2.0
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
dev-util/intltool
virtual/pkgconfig
nls? ( sys-devel/gettext )
+ test? ( >=dev-python/jsonschema-3.2.0 )
"
COMMON_DEPEND="
dev-db/sqlite:3
@@ -41,14 +61,17 @@ COMMON_DEPEND="
x11-libs/cairo
>=x11-libs/gtk+-3.22:3
x11-libs/pango
+ avif? ( >=media-libs/libavif-0.8.2 )
colord? ( x11-libs/colord-gtk:0= )
cups? ( net-print/cups )
flickr? ( media-libs/flickcurl )
geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+ gmic? ( media-gfx/gmic )
gnome-keyring? ( >=app-crypt/libsecret-0.18 )
gphoto2? ( media-libs/libgphoto2:= )
graphicsmagick? ( media-gfx/graphicsmagick )
jpeg2k? ( media-libs/openjpeg:2= )
+ lua? ( ${LUA_DEPS} )
opencl? ( virtual/opencl )
openexr? ( media-libs/openexr:0= )
webp? ( media-libs/libwebp:0= )
@@ -65,8 +88,12 @@ RDEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}"/"${PN}"-find-opencl-header.patch
+ "${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
+ "${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
)
+S="${WORKDIR}/${P/_/~}"
+
pkg_pretend() {
if [[ ${MERGE_TYPE} != binary ]]; then
# Bug #695658
@@ -81,6 +108,10 @@ pkg_pretend() {
fi
}
+pkg_setup() {
+ use lua && lua-single_pkg_setup
+}
+
src_prepare() {
use cpu_flags_x86_sse3 && append-flags -msse3
@@ -90,17 +121,18 @@ src_prepare() {
}
src_configure() {
- # TODO: switch to system Lua once 5.3 has been unmasked
local mycmakeargs=(
- -DDONT_USE_INTERNAL_LUA=OFF
-DBUILD_CURVE_TOOLS=$(usex tools)
-DBUILD_NOISE_TOOLS=$(usex tools)
-DBUILD_PRINT=$(usex cups)
-DCUSTOM_CFLAGS=ON
+ -DDONT_USE_INTERNAL_LUA=ON
-DRAWSPEED_ENABLE_LTO=$(usex lto)
+ -DUSE_AVIF=$(usex avif)
-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-DUSE_COLORD=$(usex colord)
-DUSE_FLICKR=$(usex flickr)
+ -DUSE_GMIC=$(usex gmic)
-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
-DUSE_KWALLET=$(usex kwallet)
-DUSE_LIBSECRET=$(usex gnome-keyring)
@@ -112,6 +144,7 @@ src_configure() {
-DUSE_OPENJPEG=$(usex jpeg2k)
-DUSE_OPENMP=$(usex openmp)
-DUSE_WEBP=$(usex webp)
+ -DWANT_JSON_VALIDATION=$(usex test)
)
CMAKE_BUILD_TYPE="RELWITHDEBINFO"
cmake_src_configure
@@ -119,9 +152,10 @@ src_configure() {
src_install() {
cmake_src_install
+ # This USE flag is masked for -9999
use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
- if use nls ; then
+ if use nls; then
for lang in ${LANGS} ; do
if ! use l10n_${lang}; then
rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
@@ -129,3 +163,15 @@ src_install() {
done
fi
}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ elog
+ 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."
+ elog
+ ewarn "It will not be possible to downgrade!"
+ ewarn
+}
diff --git a/media-gfx/darktable/files/darktable-3.0.2_cmake-opencl-kernel-loop.patch b/media-gfx/darktable/files/darktable-3.0.2_cmake-opencl-kernel-loop.patch
deleted file mode 100644
index c1fd701fb9a..00000000000
--- a/media-gfx/darktable/files/darktable-3.0.2_cmake-opencl-kernel-loop.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 767d48e0f60e7f858e8b31a88dd8cc1258e7ee9e Mon Sep 17 00:00:00 2001
-From: Marcus Haehnel <marcus@mh-development.info>
-Date: Sat, 21 Mar 2020 09:14:45 +0100
-Subject: [PATCH] Fix invalid CMake syntax
-
-The syntax of the foreach statement in data/kernels/CMakeLists.txt
-was invalid. This lead to errors when running cmake.
-
-Use correct syntax to make the build work.
----
- data/kernels/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/data/kernels/CMakeLists.txt b/data/kernels/CMakeLists.txt
-index ce947bef9c..f605c18b7e 100644
---- a/data/kernels/CMakeLists.txt
-+++ b/data/kernels/CMakeLists.txt
-@@ -31,8 +31,8 @@ macro (testcompile_opencl_kernel IN)
- endmacro (testcompile_opencl_kernel)
-
- if (TESTBUILD_OPENCL_PROGRAMS)
-- foreach(IN ${DT_OPENCL_KERNELS})
-- testcompile_opencl_kernel(${IN})
-+ foreach(KERNEL IN ITEMS ${DT_OPENCL_KERNELS})
-+ testcompile_opencl_kernel(${KERNEL})
- endforeach()
- endif()
-
diff --git a/media-gfx/darktable/files/darktable-3.0.2_jsonschema-automagic.patch b/media-gfx/darktable/files/darktable-3.0.2_jsonschema-automagic.patch
deleted file mode 100644
index 1aa0aec5163..00000000000
--- a/media-gfx/darktable/files/darktable-3.0.2_jsonschema-automagic.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -319,15 +319,7 @@
- message(STATUS "Test-compilation of OpenCL programs is disabled.")
- endif()
-
--# we need jsonschema to check noiseprofiles.json
--find_program(jsonschema_BIN jsonschema)
--if(${jsonschema_BIN} STREQUAL "jsonschema_BIN-NOTFOUND")
-- message(STATUS "Missing jsonschema, problems in noiseprofiles.json might go unnoticed")
-- set(VALIDATE_JSON 0)
--else(${jsonschema_BIN} STREQUAL "jsonschema_BIN-NOTFOUND")
-- message(STATUS "Found jsonschema")
-- set(VALIDATE_JSON 1)
--endif(${jsonschema_BIN} STREQUAL "jsonschema_BIN-NOTFOUND")
-+set(VALIDATE_JSON 0)
-
- # we need an xslt interpreter to generate preferences_gen.h and darktablerc
- find_program(Xsltproc_BIN xsltproc)
diff --git a/media-gfx/darktable/files/darktable-3.4.0-xmmintrin-sse-only.patch b/media-gfx/darktable/files/darktable-3.4.0-xmmintrin-sse-only.patch
new file mode 100644
index 00000000000..2e13ad859c8
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-3.4.0-xmmintrin-sse-only.patch
@@ -0,0 +1,30 @@
+From d10c290fb3b47bbc8fd90d6d1d7935b900c1caf6 Mon Sep 17 00:00:00 2001
+From: Pascal Obry <pascal@obry.net>
+Date: Thu, 24 Dec 2020 16:17:19 +0100
+Subject: [PATCH] guided_filter: include xmmintrin.h only if SSE defined.
+
+Fixes #7428.
+---
+ src/common/guided_filter.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/common/guided_filter.h b/src/common/guided_filter.h
+index 36be0de04b9..59c8b2af999 100644
+--- a/src/common/guided_filter.h
++++ b/src/common/guided_filter.h
+@@ -18,6 +18,7 @@
+
+ #pragma once
+
++#if defined(__SSE__)
+ #ifdef __PPC64__
+ #ifdef NO_WARN_X86_INTRINSICS
+ #include <xmmintrin.h>
+@@ -29,6 +30,7 @@
+ #else
+ #include <xmmintrin.h>
+ #endif // __PPC64__
++#endif
+
+ #include "common/darktable.h"
+ #include "common/opencl.h"
diff --git a/media-gfx/darktable/files/darktable-3.4.0_jsonschema-automagic.patch b/media-gfx/darktable/files/darktable-3.4.0_jsonschema-automagic.patch
new file mode 100644
index 00000000000..45d61e6af6c
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-3.4.0_jsonschema-automagic.patch
@@ -0,0 +1,25 @@
+jsonschema is only used at install time to validate a file that release
+tarballs already include, treat running it as a late part of tests.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -350,6 +350,9 @@
+ endif()
+
+ # we need jsonschema to check noiseprofiles.json
++# In case of Git clones this file is generated at build time, for releases
++# it is included in the tarball.
++if (WANT_JSON_VALIDATION)
+ find_program(jsonschema_BIN jsonschema)
+ if(${jsonschema_BIN} STREQUAL "jsonschema_BIN-NOTFOUND")
+ message(STATUS "Missing jsonschema, problems in noiseprofiles.json might go unnoticed")
+@@ -358,6 +361,9 @@
+ message(STATUS "Found jsonschema")
+ set(VALIDATE_JSON 1)
+ endif(${jsonschema_BIN} STREQUAL "jsonschema_BIN-NOTFOUND")
++else()
++ set(VALIDATE_JSON 0)
++endif()
+
+ # we need an XSLT interpreter to generate preferences_gen.h and darktablerc
+ find_program(Xsltproc_BIN xsltproc)
diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
index f7f953454f3..b05ca306c75 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -10,17 +10,16 @@
<name>Markus Meier</name>
</maintainer>
<use>
+ <flag name="avif">Support importing and exporting AVIF images</flag>
<flag name="flickr">Add support for uploading photos to flickr</flag>
<flag name="geolocation">Enable geotagging support</flag>
<flag name="gmic">Use the G'MIC image-processing framework (<pkg>media-gfx/gmic</pkg>), e.g. to support Colour LUTs compressed using their compression scheme</flag>
<flag name="kwallet">Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg></flag>
<flag name="lto">Enable link-time optimisations in the RawSpeed library</flag>
<flag name="opencl">Enable opencl support</flag>
- <flag name="system-lua">Use dev-lang/lua instead of the bundled liblua</flag>
<flag name="tools">Install tools for generating base curves and noise profiles</flag>
</use>
<upstream>
<remote-id type="github">darktable-org/darktable</remote-id>
- <remote-id type="sourceforge">darktable</remote-id>
</upstream>
</pkgmetadata>
diff --git a/media-gfx/dcraw/dcraw-9.28.0-r2.ebuild b/media-gfx/dcraw/dcraw-9.28.0-r2.ebuild
index 7163adea330..49a9c411cf3 100644
--- a/media-gfx/dcraw/dcraw-9.28.0-r2.ebuild
+++ b/media-gfx/dcraw/dcraw-9.28.0-r2.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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
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/digikam-7.1.0.ebuild b/media-gfx/digikam/digikam-7.1.0-r1.ebuild
index 3fcf93ec3dc..194a341e777 100644
--- a/media-gfx/digikam/digikam-7.1.0.ebuild
+++ b/media-gfx/digikam/digikam-7.1.0-r1.ebuild
@@ -81,7 +81,7 @@ COMMON_DEPEND="
>=kde-frameworks/kbookmarks-${KFMIN}:5
)
mediaplayer? (
- media-libs/qtav[opengl]
+ media-libs/qtav[opengl(+)]
media-video/ffmpeg:=
)
opengl? (
diff --git a/media-gfx/ebdftopcf/ebdftopcf-2.ebuild b/media-gfx/ebdftopcf/ebdftopcf-2.ebuild
index 1d890acb3b8..9d7d4f6cc57 100644
--- a/media-gfx/ebdftopcf/ebdftopcf-2.ebuild
+++ b/media-gfx/ebdftopcf/ebdftopcf-2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE=""
# these apps are used at runtime by ebdftopcf
diff --git a/media-gfx/engauge/metadata.xml b/media-gfx/engauge/metadata.xml
index f716ecb660c..fa3fced03f3 100644
--- a/media-gfx/engauge/metadata.xml
+++ b/media-gfx/engauge/metadata.xml
@@ -1,10 +1,7 @@
<?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>
+ <!-- maintainer-needed -->
<upstream>
<remote-id type="sourceforge">digitizer</remote-id>
</upstream>
diff --git a/media-gfx/entangle/entangle-3.0.ebuild b/media-gfx/entangle/entangle-3.0.ebuild
index 59d37d09fd0..f6883eee636 100644
--- a/media-gfx/entangle/entangle-3.0.ebuild
+++ b/media-gfx/entangle/entangle-3.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{7..8} )
inherit gnome2-utils meson python-single-r1 xdg-utils
DESCRIPTION="Tethered Camera Control & Capture"
diff --git a/media-gfx/eog-plugins/Manifest b/media-gfx/eog-plugins/Manifest
index e7d9b40b9ee..80e1e6f0855 100644
--- a/media-gfx/eog-plugins/Manifest
+++ b/media-gfx/eog-plugins/Manifest
@@ -1 +1,2 @@
DIST eog-plugins-3.26.5.tar.xz 478188 BLAKE2B 655eb9860435775862ba44bd26530edff778a3c8c574e9bf592800b4d57b4e5b0e52d36b7d71d6a6d615d47c320542105dcee9de89250901fcbfa6c255dcfddc SHA512 3b7979d241c2c0b522ffb6c30a6b8c90fed9e899cda8a73fb9d9a9392f474516f8c24fc75f3f35f920c8a6cf04b8bda611a8669839588936c48467813a6227a7
+DIST eog-plugins-3.26.6.tar.xz 482004 BLAKE2B a70a7d1b69b7d5e6e4d44e79a4305c08ab95c06596512bf458628a65b1a8b5f7fc6c3caf39385ce722de7fdabcf0cc5e620f9dfbc53dfc377fe29252fb21a23c SHA512 67b3cfcc071ef5a196f87041039f65c9ef8e7ba2ef1cdc8dd9ea4d67f64c8b1ee0990446c5cec4fe229aabb35d106a4c0804ba6e8cbd2edfe5a91ddc3765527a
diff --git a/media-gfx/eog-plugins/eog-plugins-3.26.5.ebuild b/media-gfx/eog-plugins/eog-plugins-3.26.5.ebuild
index 33ba60e823b..50facce0391 100644
--- a/media-gfx/eog-plugins/eog-plugins-3.26.5.ebuild
+++ b/media-gfx/eog-plugins/eog-plugins-3.26.5.ebuild
@@ -3,7 +3,7 @@
EAPI=6
GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
inherit gnome2 python-single-r1
diff --git a/media-gfx/eog-plugins/eog-plugins-3.26.6.ebuild b/media-gfx/eog-plugins/eog-plugins-3.26.6.ebuild
new file mode 100644
index 00000000000..cbe89d34fbb
--- /dev/null
+++ b/media-gfx/eog-plugins/eog-plugins-3.26.6.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="Eye of GNOME plugins"
+HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+exif map picasa +python"
+REQUIRED_USE="
+ map? ( exif )
+ python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+ >=dev-libs/glib-2.38:2
+ >=dev-libs/libpeas-0.7.4:=
+ >=media-gfx/eog-3.15.90
+ >=x11-libs/gtk+-3.14:3
+ exif? ( >=media-libs/libexif-0.6.16 )
+ map? (
+ media-libs/libchamplain:0.12[gtk]
+ >=media-libs/clutter-1.9.4:1.0
+ >=media-libs/clutter-gtk-1.1.2:1.0 )
+ picasa? ( >=dev-libs/libgdata-0.9.1:= )
+ python? (
+ ${PYTHON_DEPS}
+ >=dev-libs/glib-2.32:2[dbus]
+ dev-libs/libpeas:=[gtk,python,${PYTHON_SINGLE_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+ ')
+ gnome-base/gsettings-desktop-schemas
+ media-gfx/eog[introspection]
+ x11-libs/gtk+:3[introspection]
+ x11-libs/pango[introspection] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ >=sys-devel/gettext-0.19.7
+ virtual/pkgconfig
+"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ local plugins="fit-to-width,send-by-mail,hide-titlebar,light-theme"
+ use exif && plugins="${plugins},exif-display"
+ use map && plugins="${plugins},map"
+ use picasa && plugins="${plugins},postasa"
+ use python && plugins="${plugins},slideshowshuffle,pythonconsole,fullscreenbg,export-to-folder,maximize-windows"
+ gnome2_src_configure \
+ $(use_enable python) \
+ --with-plugins=${plugins}
+}
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 5f042a51356..f48d6babbec 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1 +1,3 @@
DIST eog-3.36.3.tar.xz 3651556 BLAKE2B 6224b21342b24bed8cfed5702c440547423a7c0db36278c082f336f274ebabea401700c418eafced814fb33043362963055acbcacc81edff8b0f202898c09542 SHA512 90205561dbc49aa42e60f636ce23d04dcd05513d28176ffa4c1dd6602889c4b2c920bd299086d3d7bfee72fcc6a029e2d34e14eb80ba5f91573161fbd1b85aea
+DIST eog-3.36.4.tar.xz 3651632 BLAKE2B f971ab236422a875ea8d91a661c6c653ba2ef4834b282dcce7d5c53e9c23bedf49610c0a8ff1bedb2af1821610ab29de8476a2b13b6cb1b82e58c3309b56b7dd SHA512 d1f4aa2e225a8147507cbed74a74bd435887884a2431f3ea0d1c569217a291f93c1440bede1c6abf03660ad8df46530e8b2195399ac8faaac36b1e31e8e93daf
+DIST eog-3.38.1.tar.xz 3655616 BLAKE2B 1e0265dc798413e9b2588c36879a526069bc3d8788339e97470d8d0b738e01cd2fc00bc3db118721fd45a40e5829e225d9451d4cf868e0c9a7bfd74cdc90c06d SHA512 26317413271001b4edcd30438e81a2bb1d2e10edd639c054ffdc08743a5274b27afb51186a660e29022be5e9ecf10043b94e7d409194589d2bba6906ede2cff9
diff --git a/media-gfx/eog/eog-3.36.4.ebuild b/media-gfx/eog/eog-3.36.4.ebuild
new file mode 100644
index 00000000000..75800455eb9
--- /dev/null
+++ b/media-gfx/eog/eog-3.36.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="The Eye of GNOME image viewer"
+HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome"
+
+LICENSE="GPL-2+"
+SLOT="1"
+
+IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
+REQUIRED_USE="exif? ( jpeg )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+ >=dev-libs/glib-2.53.4:2
+ >=dev-libs/libpeas-0.7.4:=[gtk]
+ >=gnome-base/gnome-desktop-2.91.2:3=
+ >=gnome-base/gsettings-desktop-schemas-2.91.92
+ >=x11-misc/shared-mime-info-0.20
+ >=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?]
+ >=x11-libs/gtk+-3.22.0:3[introspection,X]
+ sys-libs/zlib
+
+ exif? ( >=media-libs/libexif-0.6.14 )
+ lcms? ( media-libs/lcms:2 )
+ xmp? ( media-libs/exempi:2 )
+ jpeg? ( virtual/jpeg:0 )
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+ svg? ( >=gnome-base/librsvg-2.44.0:2 )
+
+ x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ gtk-doc? ( >=dev-util/gtk-doc-1.16
+ app-text/docbook-xml-dtd:4.1.2 )
+ dev-util/glib-utils
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use exif libexif)
+ $(meson_use lcms cms)
+ $(meson_use xmp)
+ $(meson_use jpeg libjpeg)
+ $(meson_use svg librsvg)
+ $(meson_use gtk-doc gtk_doc)
+ $(meson_use introspection)
+ -Dinstalled_tests=false
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/media-gfx/eog/eog-3.38.1.ebuild b/media-gfx/eog/eog-3.38.1.ebuild
new file mode 100644
index 00000000000..e0fd2241d63
--- /dev/null
+++ b/media-gfx/eog/eog-3.38.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="The Eye of GNOME image viewer"
+HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome"
+
+LICENSE="GPL-2+"
+SLOT="1"
+
+IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
+REQUIRED_USE="exif? ( jpeg )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+ >=dev-libs/glib-2.53.4:2
+ >=dev-libs/libpeas-0.7.4:=[gtk]
+ >=gnome-base/gnome-desktop-2.91.2:3=
+ >=gnome-base/gsettings-desktop-schemas-2.91.92
+ >=x11-misc/shared-mime-info-0.20
+ >=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?]
+ >=x11-libs/gtk+-3.22.0:3[introspection,X]
+ sys-libs/zlib
+
+ exif? ( >=media-libs/libexif-0.6.14 )
+ lcms? ( media-libs/lcms:2 )
+ xmp? ( media-libs/exempi:2 )
+ jpeg? ( virtual/jpeg:0 )
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+ svg? ( >=gnome-base/librsvg-2.44.0:2 )
+
+ x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ gtk-doc? ( >=dev-util/gtk-doc-1.16
+ app-text/docbook-xml-dtd:4.1.2 )
+ dev-util/glib-utils
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use exif libexif)
+ $(meson_use lcms cms)
+ $(meson_use xmp)
+ $(meson_use jpeg libjpeg)
+ $(meson_use svg librsvg)
+ $(meson_use gtk-doc gtk_doc)
+ $(meson_use introspection)
+ -Dinstalled_tests=false
+ -Dlibportal=false # Not packaged
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/media-gfx/exact-image/exact-image-0.8.1-r3.ebuild b/media-gfx/exact-image/exact-image-0.8.1-r3.ebuild
index 91c362a6c1e..54e1fbe7f7f 100644
--- a/media-gfx/exact-image/exact-image-0.8.1-r3.ebuild
+++ b/media-gfx/exact-image/exact-image-0.8.1-r3.ebuild
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/agg[truetype]
sys-libs/zlib
expat? ( dev-libs/expat )
jpeg? ( virtual/jpeg )
- lua? ( dev-lang/lua:= )
+ lua? ( dev-lang/lua:0= )
openexr? ( media-libs/openexr )
php? ( dev-lang/php:* )
perl? ( dev-lang/perl )
diff --git a/media-gfx/exact-image/exact-image-1.0.2.ebuild b/media-gfx/exact-image/exact-image-1.0.2.ebuild
index 62b39e9d7e4..de0d4b8a5af 100644
--- a/media-gfx/exact-image/exact-image-1.0.2.ebuild
+++ b/media-gfx/exact-image/exact-image-1.0.2.ebuild
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/agg[truetype]
sys-libs/zlib
expat? ( dev-libs/expat )
jpeg? ( virtual/jpeg )
- lua? ( dev-lang/lua:= )
+ lua? ( dev-lang/lua:0= )
openexr? ( media-libs/openexr )
php? ( dev-lang/php:* )
perl? ( dev-lang/perl )
diff --git a/media-gfx/exif/Manifest b/media-gfx/exif/Manifest
index 7fdaf2ae5a3..8a884efe8b8 100644
--- a/media-gfx/exif/Manifest
+++ b/media-gfx/exif/Manifest
@@ -1,2 +1 @@
-DIST exif-0.6.21.tar.bz2 387531 BLAKE2B 494d4910af2e8f740aeebdeeaf8dec5ae638d3e78339c55d5acc38879ab4837164d2ef407bd07a2e36a00df15d53b132bb027e2e97e79c229c589819af3b7f7b SHA512 73b5b7df08462a6a084a8fb973c39197f5d64ed753a97cb2f94a4acf815fdf0313214c2c8e44a46a24a1f6304fdaa68a579b4a2e246cc095f6e9588e93368cdc
DIST exif-0.6.22.tar.gz 569665 BLAKE2B 556927fca99416ff174c0c4403337f2f8b85cb14472d920a48a9598d8b7e3be6b800b0b37a764cd89fb45b62376a05ef1f0ae6b260a076f0949aadf8a441a2eb SHA512 b194bacb28ff2b910014edce732f97a875852abd486ce62bcf9274eb0ed668a0ee9c954cf60455191969aacb48d3d4d3172958a183b29f050c0bf8d55de14e7d
diff --git a/media-gfx/exif/exif-0.6.21.ebuild b/media-gfx/exif/exif-0.6.21.ebuild
deleted file mode 100644
index fe46fdf1414..00000000000
--- a/media-gfx/exif/exif-0.6.21.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Small CLI util to show EXIF infos hidden in JPEG files"
-HOMEPAGE="https://libexif.github.io/"
-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"
-IUSE="nls"
-
-BDEPEND="
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
-"
-DEPEND="
- dev-libs/popt
- >=media-libs/libexif-${PV}
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- econf $(use_enable nls)
-}
diff --git a/media-gfx/exif/exif-0.6.22.ebuild b/media-gfx/exif/exif-0.6.22.ebuild
index 01a292a9d04..fb8a673b2a4 100644
--- a/media-gfx/exif/exif-0.6.22.ebuild
+++ b/media-gfx/exif/exif-0.6.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/lib${PN}/${PN}/releases/download/${PN}-${PV//./_}-re
LICENSE="LGPL-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/exiv2-0.27.3.ebuild b/media-gfx/exiv2/exiv2-0.27.3.ebuild
index e532ee4154f..245e6ec2e29 100644
--- a/media-gfx/exiv2/exiv2-0.27.3.ebuild
+++ b/media-gfx/exiv2/exiv2-0.27.3.ebuild
@@ -13,7 +13,7 @@ else
fi
CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
inherit cmake-multilib python-any-r1
DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
diff --git a/media-gfx/fbgrab/metadata.xml b/media-gfx/fbgrab/metadata.xml
index 2cb7edde3a3..5b159fbcadd 100644
--- a/media-gfx/fbgrab/metadata.xml
+++ b/media-gfx/fbgrab/metadata.xml
@@ -2,10 +2,6 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>zlogene@gentoo.org</email>
- <name>Mikle Kolyada</name>
- </maintainer>
- <maintainer type="person">
<email>pinkbyte@gentoo.org</email>
<name>Sergey Popov</name>
</maintainer>
diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest
index 905819e9f56..4fcf2f72351 100644
--- a/media-gfx/fbida/Manifest
+++ b/media-gfx/fbida/Manifest
@@ -1,4 +1,2 @@
-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
diff --git a/media-gfx/fbida/fbida-2.12.ebuild b/media-gfx/fbida/fbida-2.12.ebuild
deleted file mode 100644
index 80d37357377..00000000000
--- a/media-gfx/fbida/fbida-2.12.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)"
-HOMEPAGE="https://www.kraxel.org/blog/linux/fbida/"
-SRC_URI="
- https://www.kraxel.org/releases/${PN}/${P}.tar.gz
- mirror://gentoo/ida.png.bz2
-"
-LICENSE="GPL-2 IJG"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 sparc x86"
-IUSE="curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp"
-REQUIRED_USE="
- ghostscript? ( tiff )
-"
-
-CDEPEND="
- !media-gfx/fbi
- app-text/poppler
- >=media-libs/fontconfig-2.2
- >=media-libs/freetype-2.0
- media-libs/libepoxy
- media-libs/libexif
- media-libs/mesa[X(+)]
- virtual/jpeg:*
- virtual/ttf-fonts
- x11-libs/cairo[opengl]
- x11-libs/libdrm
- curl? ( net-misc/curl )
- gif? ( media-libs/giflib:= )
- lirc? ( app-misc/lirc )
- png? ( media-libs/libpng:* )
- scanner? ( media-gfx/sane-backends )
- tiff? ( media-libs/tiff:* )
- webp? ( media-libs/libwebp )
- X? (
- >=x11-libs/motif-2.3:0
- x11-libs/libX11
- x11-libs/libXpm
- x11-libs/libXt
- )
-"
-
-DEPEND="
- ${CDEPEND}
- X? ( x11-base/xorg-proto )
-"
-
-RDEPEND="
- ${CDEPEND}
- ghostscript? (
- app-text/ghostscript-gpl
- )
-"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/ida-desktop.patch \
- "${FILESDIR}"/${PN}-2.10-giflib-4.2.patch \
- "${FILESDIR}"/${PN}-2.10-fprintf-format.patch
-
- tc-export CC CPP
-
- # upstream omission?
- echo ${PV} > VERSION
-}
-
-src_configure() {
- # Let autoconf do its job and then fix things to build fbida
- # according to our specifications
- emake Make.config
-
- gentoo_fbida() {
- local useflag=${1}
- local config=${2}
-
- local option="no"
- use ${useflag} && option="yes"
-
- sed -i \
- -e "s|HAVE_${config}.*|HAVE_${config} := ${option}|" \
- "${S}/Make.config" || die
- }
-
- gentoo_fbida X MOTIF
- gentoo_fbida curl LIBCURL
- gentoo_fbida fbcon LINUX_FB_H
- gentoo_fbida gif LIBUNGIF
- gentoo_fbida lirc LIBLIRC
- gentoo_fbida ghostscript LIBTIFF
- gentoo_fbida png LIBPNG
- gentoo_fbida scanner LIBSANE
- gentoo_fbida tiff LIBTIFF
- gentoo_fbida webp LIBWEBP
-}
-
-src_compile() {
- emake verbose=yes
-}
-
-src_install() {
- emake \
- DESTDIR="${D}" \
- STRIP="" \
- prefix=/usr \
- install
-
- dodoc README
-
- if use fbcon && ! use ghostscript; then
- rm \
- "${D}"/usr/bin/fbgs \
- "${D}"/usr/share/man/man1/fbgs.1 \
- || die
- fi
-
- if use X ; then
- doicon "${WORKDIR}"/ida.png
- domenu desktop/ida.desktop
- fi
-}
diff --git a/media-gfx/fbida/fbida-2.13-r1.ebuild b/media-gfx/fbida/fbida-2.13-r1.ebuild
deleted file mode 100644
index 9c67c20e134..00000000000
--- a/media-gfx/fbida/fbida-2.13-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)"
-HOMEPAGE="https://www.kraxel.org/blog/linux/fbida/"
-SRC_URI="
- https://www.kraxel.org/releases/${PN}/${P}.tar.gz
- mirror://gentoo/ida.png.bz2
-"
-LICENSE="GPL-2 IJG"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp"
-REQUIRED_USE="
- ghostscript? ( tiff )
-"
-
-CDEPEND="
- !media-gfx/fbi
- app-text/poppler
- >=media-libs/fontconfig-2.2
- >=media-libs/freetype-2.0
- media-libs/libepoxy
- media-libs/libexif
- media-libs/mesa[X(+)]
- virtual/jpeg:*
- virtual/ttf-fonts
- x11-libs/cairo[opengl]
- x11-libs/libdrm
- curl? ( net-misc/curl )
- gif? ( media-libs/giflib:= )
- lirc? ( app-misc/lirc )
- png? ( media-libs/libpng:* )
- scanner? ( media-gfx/sane-backends )
- tiff? ( media-libs/tiff:* )
- webp? ( media-libs/libwebp )
- X? (
- >=x11-libs/motif-2.3:0
- x11-libs/libX11
- x11-libs/libXpm
- x11-libs/libXt
- )
-"
-
-DEPEND="
- ${CDEPEND}
- X? ( x11-base/xorg-proto )
-"
-
-RDEPEND="
- ${CDEPEND}
- ghostscript? (
- app-text/ghostscript-gpl
- )
-"
-PATCHES=(
- "${FILESDIR}"/ida-desktop.patch
- "${FILESDIR}"/${PN}-2.10-giflib-4.2.patch
- "${FILESDIR}"/${PN}-2.10-fprintf-format.patch
- "${FILESDIR}"/${PN}-2.13-Autoconf.patch
-)
-
-src_configure() {
- tc-export CC CPP
-
- # Let autoconf do its job and then fix things to build fbida
- # according to our specifications
- emake Make.config
-
- gentoo_fbida() {
- local useflag=${1}
- local config=${2}
-
- local option="no"
- use ${useflag} && option="yes"
-
- sed -i \
- -e "s|HAVE_${config}.*|HAVE_${config} := ${option}|" \
- "${S}/Make.config" || die
- }
-
- gentoo_fbida X MOTIF
- gentoo_fbida curl LIBCURL
- gentoo_fbida fbcon LINUX_FB_H
- gentoo_fbida gif LIBUNGIF
- gentoo_fbida lirc LIBLIRC
- gentoo_fbida ghostscript LIBTIFF
- gentoo_fbida png LIBPNG
- gentoo_fbida scanner LIBSANE
- gentoo_fbida tiff LIBTIFF
- gentoo_fbida webp LIBWEBP
-}
-
-src_compile() {
- emake verbose=yes
-}
-
-src_install() {
- emake \
- DESTDIR="${ED}" \
- STRIP="" \
- prefix=/usr \
- install
-
- dodoc README
-
- if use fbcon && ! use ghostscript; then
- rm \
- "${ED}"/usr/bin/fbgs \
- "${ED}"/usr/share/man/man1/fbgs.1 \
- || die
- fi
-
- if use X ; then
- doicon "${WORKDIR}"/ida.png
- domenu desktop/ida.desktop
- fi
-}
diff --git a/media-gfx/fbida/files/fbida-2.10-fprintf-format.patch b/media-gfx/fbida/files/fbida-2.10-fprintf-format.patch
deleted file mode 100644
index d1c0b36dbfb..00000000000
--- a/media-gfx/fbida/files/fbida-2.10-fprintf-format.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/wr/write-ps.c
-+++ b/wr/write-ps.c
-@@ -458,7 +458,7 @@
- fprintf(fp,"\n");
- }
- }
-- fprintf(fp,footer);
-+ fprintf(fp, "%s", footer);
- return 0;
- }
-
diff --git a/media-gfx/fbida/files/fbida-2.13-Autoconf.patch b/media-gfx/fbida/files/fbida-2.13-Autoconf.patch
deleted file mode 100644
index 41c4e2f7d9b..00000000000
--- a/media-gfx/fbida/files/fbida-2.13-Autoconf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mk/Autoconf.mk
-+++ b/mk/Autoconf.mk
-@@ -162,7 +162,7 @@
- @true
-
- Make.config: $(srcdir)/GNUmakefile
-- @echo -e "$(make-config-q)" > $@
-+ @printf "$(make-config-q)" > $@
- @echo
- @echo "Make.config written, edit if needed"
- @echo
diff --git a/media-gfx/fdm-materials/Manifest b/media-gfx/fdm-materials/Manifest
index b28e3226448..69323ad55a5 100644
--- a/media-gfx/fdm-materials/Manifest
+++ b/media-gfx/fdm-materials/Manifest
@@ -1,2 +1 @@
-DIST fdm-materials-4.6.1.tar.gz 36321 BLAKE2B bbdc28bf9d05b14f4b0545c4c50c67c31668f97aa9b6fcb8d51c5c958523ebe3307deb07587239df6a73e47c523db6c15f0ea4eb3c2560931a055c784d2b30cc SHA512 784b89acfb2a5bdc6a0e8ce864326ab21f4785887baa215ffcfe472853cc8386d32ed237199df3744c25d12abbef89605445e74b104770f0f3f8363944008c6e
-DIST fdm-materials-4.7.0.tar.gz 41139 BLAKE2B a372d8273809a7d1a14e0b6e35a9c7266d626f26013f53a5d6c8462e2b1054bd65c72745ed1afdf96b17d6573f74b8555c946ef76c94acb8d860efa459d9955e SHA512 cbc42e2777d1332b5187cf1f826f73bf5c1c5a1106d851dc08d8082f41bde6846f349ed2339ae60ad00b2005b0983f01850931adc765d545de0a700f1d9cccaf
+DIST fdm-materials-4.8.0.tar.gz 43850 BLAKE2B d9fa025eeb4f11c027fd64a2615d214a47024df62d53ee6b43391ac5383812581ae2ca075804277b6f7094639238646211cb5b978580edf91d004e83ef7ce405 SHA512 6e2812dc61ad00437d4c7943c3746cd915e1e49edef49f89ea2c4ca4cf023d67c400d1ae1e3c40923928d20ac09b184fc0632b828900b6236f9dfd346f19036d
diff --git a/media-gfx/fdm-materials/fdm-materials-4.7.0.ebuild b/media-gfx/fdm-materials/fdm-materials-4.7.0.ebuild
deleted file mode 100644
index 99506a67b86..00000000000
--- a/media-gfx/fdm-materials/fdm-materials-4.7.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MY_PN="fdm_materials"
-
-DESCRIPTION="FDM materials for media-gfx/cura"
-HOMEPAGE="https://github.com/Ultimaker/fdm_materials"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="embedded"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_configure() {
- local mycmakeargs=(
- -DEMBEDDED=$(usex embedded on off)
- )
- cmake_src_configure
-}
diff --git a/media-gfx/fdm-materials/fdm-materials-4.6.1-r1.ebuild b/media-gfx/fdm-materials/fdm-materials-4.8.0.ebuild
index 99506a67b86..99506a67b86 100644
--- a/media-gfx/fdm-materials/fdm-materials-4.6.1-r1.ebuild
+++ b/media-gfx/fdm-materials/fdm-materials-4.8.0.ebuild
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index bcdea483dfd..6335227892d 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -1,4 +1,2 @@
-DIST feh-3.3.tar.bz2 2112880 BLAKE2B 56042367c0acce966e115e77f3afa1acd3f942a956bc453de364bcd17d90393ad2868039a5793af64826cd50322e4ef5f9f2b9678f982c7c85b025ed208f8bb8 SHA512 0372115a8f2df77cdfc0fc1b24479e72d9be1f24127c787909ef671075b199b8d5f873200ce202f51705991cf3c5f5cc71ef8f47294fe520e3a9acc5cb7582a9
-DIST feh-3.4.1.tar.bz2 2114441 BLAKE2B c24e5f54762439cfbb031b4b24ded03f1c0c9c75233ae5b6dc66a7a56922902c672606a1b36fef9b30789c09946c8ccc5f9a60fe201db07e70bcf0ce0638c0c1 SHA512 d674d3134819cf6731aebf8af87a2f890d54dd7f8c64071e8816a032aeeb95c31f56752bb3477be0dfb653f813872b32dc2daf4e0514fed03e3f6bba36896c66
-DIST feh-3.4.tar.bz2 2114146 BLAKE2B 0bc65db77c67c42b693122b877417c3dc4db7a0551cdf62723b3f7c134e5f2bb73ee6d0aa5a0c81402cf5a5f723ceb29a45fb5e4aef1911dc643aeb82c3ef17d SHA512 50cb7fd33b583ee802cbbba8ed7a74e9eb72a141ffa28ab998a196f9f8d030a8192420fc084136f699cb33b1b8c4d8c2c111fa90695dd82a1366330a428383ce
-DIST feh-3.5.tar.bz2 2115162 BLAKE2B 8300cfc0e480afb070d40e35390edb30dc451dc5581add5f377a370bf606f7e7730a99c8a4773accb38b01a4e9b47fe5c95d8e9c2dcf9d71e96a71c4fd11a388 SHA512 69b4c73a8009c5b5e031bdf3c6a628da2f3cd71927d6c546ba2b2cfb6d10912e4a44e5d0de93704645a4dd33d71f1445749abe03383cc2298fa10c2d5d88fb5e
+DIST feh-3.6.1.tar.bz2 2116064 BLAKE2B cae12f9475a2678c2f521baac9deb6668eae07811ae0904bbefef873fd54182b94532bf811394964e725f0e45890f65fcfc3dc988135d388ddcf625adbeca4e0 SHA512 b4350f1c5f66a450b2f088affea973abab9e184df110b693e46e1fc532d213d62a52bf08029f345daf92d45c828ff3bd380dcd7b167f319f1ff3b1d04150cd75
+DIST feh-3.6.tar.bz2 2116101 BLAKE2B 8ad47c6b456746d951728fd8a0ba1a2fed4ceb4a7e15554f68b4de071da7b3f4e9e16a10b1a05e51291b8b4127bab98f2b96231298fd181d8dc544bc089a772f SHA512 1df017adcf0650ff2cdc26556cbea5a6b8c9dad1dd44128cccc79312334d0140ab9e5c9c8bac7249dcfbdd7985ae75d847752eadad14216102d8ab7bcb2c42c7
diff --git a/media-gfx/feh/feh-3.4.1.ebuild b/media-gfx/feh/feh-3.4.1.ebuild
deleted file mode 100644
index 7d87a35ace6..00000000000
--- a/media-gfx/feh/feh-3.4.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs xdg-utils
-
-DESCRIPTION="A fast, lightweight imageviewer using imlib2"
-HOMEPAGE="https://feh.finalrewind.org/"
-SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
-
-LICENSE="feh"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="debug curl exif test xinerama"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="media-libs/imlib2[X]
- >=media-libs/libpng-1.2:0=
- x11-libs/libX11
- curl? ( net-misc/curl )
- exif? ( media-libs/libexif )
- xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${COMMON_DEPEND}
- virtual/jpeg:0"
-DEPEND="${COMMON_DEPEND}
- x11-base/xorg-proto
- x11-libs/libXt
- test? (
- >=dev-lang/perl-5.10
- dev-perl/Test-Command
- media-libs/imlib2[gif,jpeg,png]
- )"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.2-debug-cflags.patch )
-
-pkg_setup() {
- use_feh() { usex $1 1 0; }
-
- fehopts=(
- DESTDIR="${D}"
- PREFIX="${EPREFIX}"/usr
- doc_dir='${main_dir}'/share/doc/${PF}
- example_dir='${main_dir}'/share/doc/${PF}/examples
- curl=$(use_feh curl)
- debug=$(use_feh debug)
- xinerama=$(use_feh xinerama)
- exif=$(use_feh exif)
- )
-}
-
-src_compile() {
- tc-export CC
- emake "${fehopts[@]}"
-}
-
-src_install() {
- emake "${fehopts[@]}" install
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
diff --git a/media-gfx/feh/feh-3.5.ebuild b/media-gfx/feh/feh-3.5.ebuild
deleted file mode 100644
index 7d87a35ace6..00000000000
--- a/media-gfx/feh/feh-3.5.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs xdg-utils
-
-DESCRIPTION="A fast, lightweight imageviewer using imlib2"
-HOMEPAGE="https://feh.finalrewind.org/"
-SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
-
-LICENSE="feh"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="debug curl exif test xinerama"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="media-libs/imlib2[X]
- >=media-libs/libpng-1.2:0=
- x11-libs/libX11
- curl? ( net-misc/curl )
- exif? ( media-libs/libexif )
- xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${COMMON_DEPEND}
- virtual/jpeg:0"
-DEPEND="${COMMON_DEPEND}
- x11-base/xorg-proto
- x11-libs/libXt
- test? (
- >=dev-lang/perl-5.10
- dev-perl/Test-Command
- media-libs/imlib2[gif,jpeg,png]
- )"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.2-debug-cflags.patch )
-
-pkg_setup() {
- use_feh() { usex $1 1 0; }
-
- fehopts=(
- DESTDIR="${D}"
- PREFIX="${EPREFIX}"/usr
- doc_dir='${main_dir}'/share/doc/${PF}
- example_dir='${main_dir}'/share/doc/${PF}/examples
- curl=$(use_feh curl)
- debug=$(use_feh debug)
- xinerama=$(use_feh xinerama)
- exif=$(use_feh exif)
- )
-}
-
-src_compile() {
- tc-export CC
- emake "${fehopts[@]}"
-}
-
-src_install() {
- emake "${fehopts[@]}" install
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
diff --git a/media-gfx/feh/feh-3.3.ebuild b/media-gfx/feh/feh-3.6.1.ebuild
index 4e3f9e8b8cd..d0173f659d3 100644
--- a/media-gfx/feh/feh-3.3.ebuild
+++ b/media-gfx/feh/feh-3.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
LICENSE="feh"
SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 x86"
IUSE="debug curl exif test xinerama"
RESTRICT="!test? ( test )"
diff --git a/media-gfx/feh/feh-3.4.ebuild b/media-gfx/feh/feh-3.6.ebuild
index cdfb177f990..d0173f659d3 100644
--- a/media-gfx/feh/feh-3.4.ebuild
+++ b/media-gfx/feh/feh-3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
LICENSE="feh"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 x86"
IUSE="debug curl exif test xinerama"
RESTRICT="!test? ( test )"
diff --git a/media-gfx/figurine/figurine-1.0.5-r1.ebuild b/media-gfx/figurine/figurine-1.0.5-r1.ebuild
index 7c6fffe4dba..1895738ddc5 100644
--- a/media-gfx/figurine/figurine-1.0.5-r1.ebuild
+++ b/media-gfx/figurine/figurine-1.0.5-r1.ebuild
@@ -1,7 +1,9 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
+
+inherit toolchain-funcs
DESCRIPTION="A vector based graphics editor similar to xfig, but simpler"
HOMEPAGE="http://figurine.sourceforge.net/"
@@ -10,17 +12,13 @@ SRC_URI="mirror://sourceforge/figurine/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-RDEPEND=""
-DEPEND="${RDEPEND}
- >=media-gfx/transfig-3.2"
+DEPEND="media-gfx/transfig"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
src_configure() {
+ tc-export CC
econf
}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README
-}
diff --git a/media-gfx/figurine/files/figurine-1.0.5-fno-common.patch b/media-gfx/figurine/files/figurine-1.0.5-fno-common.patch
new file mode 100644
index 00000000000..362d40b2257
--- /dev/null
+++ b/media-gfx/figurine/files/figurine-1.0.5-fno-common.patch
@@ -0,0 +1,115 @@
+https://bugs.gentoo.org/707666
+--- a/src/draw.c
++++ b/src/draw.c
+@@ -126,6 +126,8 @@
+ #include "include/figurine.h"
+ #include "include/extern.h"
+
++extern GC whitegc;
++
+ /* redraws a section of a view */
+ /* this should really take a number of disjoint regions */
+ void
+--- a/src/include/extern.h
++++ b/src/include/extern.h
+@@ -285,7 +285,7 @@ extern Pixmap bfills[];
+ extern Pixmap nofill;
+ extern char *filltags[];
+ extern char *fontnames[40][2];
+-int numfontnames;
++extern int numfontnames;
+ extern List afonts;
+
+ extern uint justificationicon_number;
+--- a/src/include/stk_extern.h
++++ b/src/include/stk_extern.h
+@@ -71,8 +71,8 @@ extern GC fontgc;
+ extern GC sfontgc;
+ extern GC colgc;
+ extern Cursor stk_arrow_cursor;
+-XFontStruct *stk_font;
+-XFontStruct *stk_sfont;
++extern XFontStruct *stk_font;
++extern XFontStruct *stk_sfont;
+ extern List stk_window_list;
+ extern stkInternalMenuBar stk_menu_bar;
+ extern stkInternalIconPanel stk_icon_panel;
+--- a/src/init.c
++++ b/src/init.c
+@@ -151,6 +151,8 @@
+ /* xbm's for fillstyle */
+ #include "pixmaps/fillstyles.h"
+
++extern int numfontnames;
++extern GC whitegc;
+
+ static Colormap colourmap;
+ static Visual *visual;
+--- a/src/stk_dialog.c
++++ b/src/stk_dialog.c
+@@ -74,6 +74,9 @@
+
+ static int dial_ticket=0;
+
++extern XFontStruct *stk_sfont;
++extern GC whitegc;
++
+ void free_list(void *);
+ void set_window_cursor(Window, int);
+
+--- a/src/stk_globals.c
++++ b/src/stk_globals.c
+@@ -52,7 +52,7 @@
+ #include "include/stk.h"
+
+ GC topleftgc; /* top & left decoration */
+-GC whitegc; /* white */
++extern GC whitegc; /* white */
+ GC bottomrightgc; /* bottom and right decoration */
+ GC backgroundgc; /* standard GC for STK widget */
+ GC fontgc; /* for drawing the font */
+--- a/src/stk_init.c
++++ b/src/stk_init.c
+@@ -60,6 +60,9 @@
+ extern int screen;
+ extern WindowStruct bar_window;
+
++extern XFontStruct *stk_sfont;
++extern GC whitegc;
++
+ void free_list(void *);
+
+ void
+--- a/src/stk_keyboard.c
++++ b/src/stk_keyboard.c
+@@ -59,6 +59,8 @@
+
+ int str_print(char *str);
+
++extern XFontStruct *stk_font;
++
+ int str_print(char *str)
+ {
+ while (*str!='\0')
+--- a/src/stk_menu.c
++++ b/src/stk_menu.c
+@@ -85,6 +85,8 @@
+
+ void free_list(void *);
+
++extern XFontStruct *stk_font;
++
+ /* create top-level menu bar */
+ int
+ stk_create_menu_bar(WindowStruct window, stkMenuBar *menu)
+--- a/src/stk_util.c
++++ b/src/stk_util.c
+@@ -70,6 +70,8 @@
+
+ extern Atom windelete;
+
++extern XFontStruct *stk_font;
++
+ /* client-side toggle tooltips */
+ void
+ stk_tooltips(Boolean on)
diff --git a/media-gfx/flameshot/flameshot-0.6.0.ebuild b/media-gfx/flameshot/flameshot-0.6.0.ebuild
index 7c9bcc840ba..bf095c3de1b 100644
--- a/media-gfx/flameshot/flameshot-0.6.0.ebuild
+++ b/media-gfx/flameshot/flameshot-0.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lupoDharkael/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
LICENSE="FreeArt GPL-3 Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/media-gfx/fontforge/fontforge-20200314.ebuild b/media-gfx/fontforge/fontforge-20200314.ebuild
index 613e6a7f425..3572b345a24 100644
--- a/media-gfx/fontforge/fontforge-20200314.ebuild
+++ b/media-gfx/fontforge/fontforge-20200314.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2004-2020 Gentoo Authors
+# Copyright 2004-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
inherit python-single-r1 xdg cmake
@@ -12,7 +12,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 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"
IUSE="doc truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode woff2 X"
RESTRICT="!test? ( test )"
diff --git a/media-gfx/fontforge/fontforge-20201107.ebuild b/media-gfx/fontforge/fontforge-20201107.ebuild
index 96f32a9698b..671629d1993 100644
--- a/media-gfx/fontforge/fontforge-20201107.ebuild
+++ b/media-gfx/fontforge/fontforge-20201107.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2004-2020 Gentoo Authors
+# Copyright 2004-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
inherit python-single-r1 xdg cmake
@@ -12,7 +12,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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="doc truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode woff2 X"
RESTRICT="!test? ( test )"
diff --git a/media-gfx/fotoxx/files/fotoxx-15.05.patch b/media-gfx/fotoxx/files/fotoxx-15.05-docdir.patch
index 15fdaa9abac..8cab49ff51e 100644
--- a/media-gfx/fotoxx/files/fotoxx-15.05.patch
+++ b/media-gfx/fotoxx/files/fotoxx-15.05-docdir.patch
@@ -1,4 +1,3 @@
-diff -r -U1 fotoxx-14.10.2.orig/Makefile fotoxx-14.10.2/Makefile
--- fotoxx-14.10.2.orig/Makefile 2014-10-09 15:17:09.000000000 +0700
+++ fotoxx-14.10.2/Makefile 2014-10-13 20:44:55.061728475 +0700
@@ -16,3 +16,3 @@
diff --git a/media-gfx/fotoxx/files/fotoxx-15.05-gcc-11.patch b/media-gfx/fotoxx/files/fotoxx-15.05-gcc-11.patch
new file mode 100644
index 00000000000..5d84e687d39
--- /dev/null
+++ b/media-gfx/fotoxx/files/fotoxx-15.05-gcc-11.patch
@@ -0,0 +1,31 @@
+Fix 'smart_erase_blur' declaration and definition mismatch.
+
+https://bugs.gentoo.org/768207
+--- a/f.repair.cc
++++ b/f.repair.cc
+@@ -2265,7 +2265,7 @@ void smart_erase_func(int mode)
+
+ // add blur to the erased area to help mask the side-effects
+
+-int smart_erase_blur(float radius)
++void smart_erase_blur(float radius)
+ {
+ int ii, px, py, dx, dy, adx, ady;
+ float blur_weight[12][12]; // up to blur radius = 10
+@@ -2274,7 +2274,7 @@ int smart_erase_blur(float radius)
+ float red, green, blue;
+ float *pix9, *pix3, *pixN;
+
+- if (sa_stat != 3) return 0;
++ if (sa_stat != 3) return;
+
+ rad = radius - 0.2;
+ rad2 = rad * rad;
+@@ -2342,7 +2342,6 @@ int smart_erase_blur(float radius)
+ CEF->Fmods++;
+ CEF->Fsaved = 0;
+ Fpaint2(); // update window
+- return 0;
+ }
+
+
diff --git a/media-gfx/fotoxx/fotoxx-15.05.ebuild b/media-gfx/fotoxx/fotoxx-15.05.ebuild
index dd440e48f70..b15710b3982 100644
--- a/media-gfx/fotoxx/fotoxx-15.05.ebuild
+++ b/media-gfx/fotoxx/fotoxx-15.05.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.kornelix.com/uploads/1/3/0/3/13035936/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE=""
DEPEND="
@@ -25,7 +25,10 @@ RDEPEND="${DEPEND}
media-libs/exiftool
x11-misc/xdg-utils"
-PATCHES=( "${FILESDIR}"/${P}.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-docdir.patch
+ "${FILESDIR}"/${P}-gcc-11.patch
+)
src_compile() {
tc-export CXX
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
new file mode 100644
index 00000000000..99ac7bbf679
--- /dev/null
+++ b/media-gfx/freecad/Manifest
@@ -0,0 +1 @@
+DIST freecad-0.19_pre20201231.tar.gz 236040771 BLAKE2B 648d8c1d8ab03f56403544f8e6a20dc5edc35b2cfc353c875202ce3e85449e450cbda93f410fec15366ce3aab342a93e981fa11cd9f5443a2fc40ef38ac0a1d0 SHA512 457792b0a12196d9e2d8113d9721a3b3a6d4fbc93bae001787db3eac43503a74a89a69564903b4005f8648476a150b6d871b3d78adfbf41c7260a4265132da34
diff --git a/media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch b/media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
new file mode 100644
index 00000000000..9f4131f15a3
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
@@ -0,0 +1,26 @@
+From e08aec1344e753cd338a61c3584230741e00b23f Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Thu, 31 Dec 2020 13:26:44 +0100
+Subject: [PATCH 1/2] FindCoin3DDoc.cmake: fix patch for coin docs
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ cMake/FindCoin3DDoc.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cMake/FindCoin3DDoc.cmake b/cMake/FindCoin3DDoc.cmake
+index c6c92f2..1af53c2 100644
+--- a/cMake/FindCoin3DDoc.cmake
++++ b/cMake/FindCoin3DDoc.cmake
+@@ -22,7 +22,7 @@ IF (COIN3D_FOUND)
+ # Unix systems
+ find_path(COIN3D_DOC_PATH index.html
+ /usr/share/doc/libcoin80-doc/html
+- /usr/share/doc/coin/html
++ /usr/share/doc/coin-4.0.0/html
+ /usr/share/doc/Coin/html
+ )
+ IF( EXISTS ${COIN3D_DOC_PATH})
+--
+2.30.0
+
diff --git a/media-gfx/freecad/files/freecad-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch b/media-gfx/freecad/files/freecad-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch
new file mode 100644
index 00000000000..26bb4421077
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch
@@ -0,0 +1,33 @@
+From bce02c4804d14ae2257ad5f5e7fae4e2baa74503 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Thu, 31 Dec 2020 13:31:47 +0100
+Subject: [PATCH 2/2] CMakeLists.txt: add option for ccache
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ CMakeLists.txt | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f4dabf7..17b9fad 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,9 +8,12 @@ if (POLICY CMP0072)
+ cmake_policy(SET CMP0072 OLD)
+ endif(POLICY CMP0072)
+
+-find_program(CCACHE_PROGRAM ccache) #This check should occur before project()
+-if(CCACHE_PROGRAM)
+- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
++option(FREECAD_USE_CCACHE "Use ccache to build FreeCAD" OFF)
++if(FREECAD_USE_CCACHE)
++ find_program(CCACHE_PROGRAM ccache) #This check should occur before project()
++ if(CCACHE_PROGRAM)
++ set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
++ endif()
+ endif()
+
+ project(FreeCAD)
+--
+2.30.0
+
diff --git a/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch b/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
new file mode 100644
index 00000000000..ac8d194d00e
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
@@ -0,0 +1,26 @@
+From acc8a26b73a87ae024bce30e9f1531610b6e0e5f Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sat, 13 Feb 2021 14:54:28 +0100
+Subject: [PATCH] [Gentoo specific] don't check vcs
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ src/Tools/SubWCRev.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Tools/SubWCRev.py b/src/Tools/SubWCRev.py
+index 9795450..59938bd 100644
+--- a/src/Tools/SubWCRev.py
++++ b/src/Tools/SubWCRev.py
+@@ -455,7 +455,7 @@ def main():
+ if o in ("-b", "--bindir"):
+ bindir = a
+
+- vcs=[GitControl(), DebianGitHub(), BazaarControl(), Subversion(), MercurialControl(), DebianChangelog(), UnknownControl()]
++ vcs=[UnknownControl()]
+ for i in vcs:
+ if i.extractInfo(srcdir, bindir):
+ # Open the template file and the version file
+--
+2.30.1
+
diff --git a/media-gfx/freecad/freecad-0.19_pre20201231.ebuild b/media-gfx/freecad/freecad-0.19_pre20201231.ebuild
new file mode 100644
index 00000000000..9d1447e685a
--- /dev/null
+++ b/media-gfx/freecad/freecad-0.19_pre20201231.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# vtk needs updating to use 3.9
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit check-reqs cmake desktop optfeature python-single-r1 xdg
+
+DESCRIPTION="QT based Computer Aided Design application"
+HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD"
+
+if [[ ${PV} = *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git"
+ S="${WORKDIR}/freecad-${PV}"
+else
+ COMMIT=82ec99dbc1f0f054748059ae8bb138eb44b43073
+ SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+ S="${WORKDIR}/FreeCAD-${COMMIT}"
+fi
+
+# code is licensed LGPL-2
+# examples are licensed CC-BY-SA (without note of specific version)
+LICENSE="LGPL-2 CC-BY-SA-4.0"
+SLOT="0"
+IUSE="ccache debug headless pcl test"
+RESTRICT="!test? ( test )"
+
+FREECAD_EXPERIMENTAL_MODULES="cloud plot ship"
+FREECAD_STABLE_MODULES="addonmgr arch drawing fem idf image
+ inspection material mesh openscad part-design path points
+ raytracing robot show spreadsheet surface techdraw tux"
+
+for module in ${FREECAD_STABLE_MODULES}; do
+ IUSE="${IUSE} +${module}"
+done
+for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
+ IUSE="${IUSE} -${module}"
+done
+unset module
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ >=dev-cpp/eigen-3.3.1:3
+ dev-libs/OpenNI2[opengl(+)]
+ dev-libs/libspnav[X]
+ dev-libs/xerces-c
+ dev-qt/designer:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtopengl:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwebengine:5[widgets]
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtxml:5
+ >=media-libs/coin-4.0.0
+ media-libs/freetype
+ media-libs/qhull
+ sci-libs/flann[openmp]
+ >=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
+ sci-libs/opencascade:=[vtk(+)]
+ sci-libs/orocos_kdl:=
+ sys-libs/zlib
+ virtual/glu
+ virtual/libusb:1
+ virtual/opengl
+ cloud? (
+ dev-libs/openssl:=
+ net-misc/curl
+ )
+ fem? ( <sci-libs/vtk-9[boost,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
+ mesh? ( sci-libs/hdf5:=[fortran,zlib] )
+ openscad? ( media-gfx/openscad )
+ pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] )
+ $(python_gen_cond_dep '
+ dev-libs/boost:=[python,threads,${PYTHON_MULTI_USEDEP}]
+ dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pivy-0.6.5[${PYTHON_MULTI_USEDEP}]
+ dev-python/pyside2[gui,svg,${PYTHON_MULTI_USEDEP}]
+ dev-python/shiboken2[${PYTHON_MULTI_USEDEP}]
+ addonmgr? ( dev-python/GitPython[${PYTHON_MULTI_USEDEP}] )
+ mesh? ( dev-python/pybind11[${PYTHON_MULTI_USEDEP}] )
+ ')
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-lang/swig
+ ccache? ( dev-util/ccache )
+"
+
+# To get required dependencies:
+# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
+# We set the following requirements by default:
+# draft, import, part, qt5, sketcher, start, web.
+#
+# Additionally if mesh is set, we auto-enable mesh_part, flat_mesh and smesh
+# Fem actually needs smesh, but as long as we don't have a smesh package, we enable
+# smesh through the mesh USE flag. Note however, the fem<-smesh dependency isn't
+# reflected by the REQUIRES_MODS macro, but at
+# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake:187.
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ arch? ( mesh )
+ debug? ( mesh )
+ drawing? ( spreadsheet )
+ fem? ( mesh )
+ inspection? ( mesh points )
+ openscad? ( mesh )
+ path? ( mesh robot )
+ ship? ( image plot )
+ techdraw? ( spreadsheet drawing )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
+ "${FILESDIR}"/${P}-0002-CMakeLists.txt-add-option-for-ccache.patch
+ "${FILESDIR}"/${P}-0003-Gentoo-specific-don-t-check-vcs.patch
+)
+
+DOCS=( README.md ChangeLog.txt CODE_OF_CONDUCT.md )
+
+CHECKREQS_DISK_BUILD="7G"
+
+pkg_setup() {
+ check-reqs_pkg_setup
+ python-single-r1_pkg_setup
+ [[ -z ${CASROOT} ]] && die "\${CASROOT} not set, plesae run eselect opencascade"
+}
+
+src_prepare() {
+ # the upstream provided file doesn't find the coin doc tag file,
+ # but cmake ships a working one, so we use this.
+ rm "${S}/cMake/FindCoin3D.cmake" || die
+
+ # Fix OpenCASCADE lookup
+ sed -e 's|/usr/include/opencascade|${CASROOT}/include/opencascade|' \
+ -e 's|/usr/lib|${CASROOT}/'$(get_libdir)' NO_DEFAULT_PATH|' \
+ -i cMake/FindOpenCasCade.cmake || die
+
+ # Fix desktop file
+ sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_ADDONMGR=$(usex addonmgr)
+ -DBUILD_ARCH=$(usex arch)
+ -DBUILD_ASSEMBLY=OFF
+ -DBUILD_CLOUD=$(usex cloud)
+ -DBUILD_COMPLETE=OFF # deprecated
+ -DBUILD_DRAFT=ON # basic workspace, enable it by default
+ -DBUILD_DRAWING=$(usex drawing)
+ -DBUILD_ENABLE_CXX_STD:STRING="C++14" # needed for >=boost-1.75.0
+ -DBUILD_FEM=$(usex fem)
+ -DBUILD_FEM_NETGEN=OFF
+ -DBUILD_FLAT_MESH=$(usex mesh)
+ -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory
+ -DBUILD_FREETYPE=ON # automagic dep
+ -DBUILD_GUI=$(usex !headless)
+ -DBUILD_IDF=$(usex idf)
+ -DBUILD_IMAGE=$(usex image)
+ -DBUILD_IMPORT=ON # import module for various file formats
+ -DBUILD_INSPECTION=$(usex inspection)
+ -DBUILD_JTREADER=OFF # code has been removed upstream, but option is still there
+ -DBUILD_MATERIAL=$(usex material)
+ -DBUILD_MESH=$(usex mesh)
+ -DBUILD_MESH_PART=$(usex mesh)
+ -DBUILD_OPENSCAD=$(usex openscad)
+ -DBUILD_PART=ON # basic workspace, enable it by default
+ -DBUILD_PART_DESIGN=$(usex part-design)
+ -DBUILD_PATH=$(usex path)
+ -DBUILD_PLOT=$(usex plot) # conflicts with possible external workbench
+ -DBUILD_POINTS=$(usex points)
+ -DBUILD_QT5=ON # OFF means to use Qt4
+ -DBUILD_RAYTRACING=$(usex raytracing)
+ -DBUILD_REVERSEENGINEERING=OFF # currently only an empty sandbox
+ -DBUILD_ROBOT=$(usex robot)
+ -DBUILD_SHIP=$(usex ship) # conflicts with possible external workbench
+ -DBUILD_SHOW=$(usex show)
+ -DBUILD_SKETCHER=ON # needed by draft workspace
+ -DBUILD_SMESH=$(usex mesh)
+ -DBUILD_SPREADSHEET=$(usex spreadsheet)
+ -DBUILD_START=ON # basic workspace, enable it by default
+ -DBUILD_SURFACE=$(usex surface)
+ -DBUILD_TECHDRAW=$(usex techdraw)
+ -DBUILD_TUX=$(usex tux)
+ -DBUILD_VR=OFF
+ -DBUILD_WEB=ON # needed by start workspace
+ -DBUILD_WITH_CONDA=OFF
+
+ -DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data
+ -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+ -DCMAKE_INSTALL_INCLUDEDIR=/usr/include/${PN}
+ -DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN}
+
+ -DFREECAD_BUILD_DEBIAN=OFF
+
+ -DFREECAD_USE_CCACHE=$(usex ccache)
+ -DFREECAD_USE_EXTERNAL_KDL=ON
+ -DFREECAD_USE_EXTERNAL_SMESH=OFF # no package in Gentoo
+ -DFREECAD_USE_EXTERNAL_ZIPIOS=OFF # doesn't work yet, also no package in Gentoo tree
+ -DFREECAD_USE_FREETYPE=ON
+ -DFREECAD_USE_OCC_VARIANT:STRING="Official Version"
+ -DFREECAD_USE_PCL=$(usex pcl)
+ -DFREECAD_USE_PYBIND11=$(usex mesh)
+ -DFREECAD_USE_QT_FILEDIALOG=ON
+ -DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
+
+ -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
+ -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
+ -DOCCT_CMAKE_FALLBACK=ON # don't use occt-config which isn't included in opencascade for Gentoo
+ )
+
+ if use debug; then
+ mycmakeargs+=(
+ # sandbox needs mesh support
+ -DBUILD_SANDBOX=$(usex mesh)
+ -DBUILD_TEMPLATE=ON
+ -DBUILD_TEST=ON
+ )
+ else
+ mycmakeargs+=(
+ -DBUILD_SANDBOX=OFF
+ -DBUILD_TEMPLATE=OFF
+ -DBUILD_TEST=OFF
+ )
+ fi
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ if ! use headless; then
+ dosym ../$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad
+ mv "${ED}"/usr/$(get_libdir)/freecad/share/* "${ED}"/usr/share || die "failed to move shared ressources"
+ fi
+ dosym ../$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
+
+ python_optimize "${ED}"/usr/share/${PN}/data/Mod/ "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ if use plot; then
+ einfo "Note: You are enabling the 'plot' USE flag."
+ einfo "This conflicts with the plot workbench that can be loaded"
+ einfo "via the addon manager! You can only install one of those."
+ fi
+
+ if use ship; then
+ einfo "Note: You are enabling the 'ship' USE flag."
+ einfo "This conflicts with the ship workbench that can be loaded"
+ einfo "via the addon manager! You can only install one of those."
+ fi
+
+ einfo "You can load a lot of additional workbenches using the integrated"
+ einfo "AddonManager."
+
+ einfo "There are a lot of additional tools, for which FreeCAD has builtin"
+ einfo "support. Some of them are available in Gentoo. Take a look at"
+ einfo "https://wiki.freecadweb.org/Installing#External_software_supported_by_FreeCAD"
+ optfeature "interact with git repositories" dev-python/GitPython
+ optfeature "work with COLLADA documents" dev-python/pycollada
+ optfeature "dependency graphs" media-gfx/graphviz
+ optfeature "PBR Rendering" media-gfx/povray
+ optfeature "FEM mesh generator" sci-libs/gmsh
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+}
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
new file mode 100644
index 00000000000..e2cb13d51fc
--- /dev/null
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -0,0 +1,283 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# vtk needs updating to use 3.9
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit check-reqs cmake desktop optfeature python-single-r1 xdg
+
+DESCRIPTION="QT based Computer Aided Design application"
+HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD"
+
+if [[ ${PV} = *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git"
+ S="${WORKDIR}/freecad-${PV}"
+else
+ COMMIT=82ec99dbc1f0f054748059ae8bb138eb44b43073
+ SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+ S="${WORKDIR}/FreeCAD-${COMMIT}"
+fi
+
+# code is licensed LGPL-2
+# examples are licensed CC-BY-SA (without note of specific version)
+LICENSE="LGPL-2 CC-BY-SA-4.0"
+SLOT="0"
+IUSE="ccache debug headless pcl test"
+RESTRICT="!test? ( test )"
+
+FREECAD_EXPERIMENTAL_MODULES="cloud plot ship"
+FREECAD_STABLE_MODULES="addonmgr arch drawing fem idf image
+ inspection material mesh openscad part-design path points
+ raytracing robot show spreadsheet surface techdraw tux"
+
+for module in ${FREECAD_STABLE_MODULES}; do
+ IUSE="${IUSE} +${module}"
+done
+for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
+ IUSE="${IUSE} -${module}"
+done
+unset module
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ >=dev-cpp/eigen-3.3.1:3
+ dev-libs/OpenNI2[opengl(+)]
+ dev-libs/libspnav[X]
+ dev-libs/xerces-c
+ dev-qt/designer:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtopengl:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwebengine:5[widgets]
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtxml:5
+ >=media-libs/coin-4.0.0
+ media-libs/freetype
+ media-libs/qhull
+ sci-libs/flann[openmp]
+ >=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
+ sci-libs/opencascade:=[vtk(+)]
+ sci-libs/orocos_kdl:=
+ sys-libs/zlib
+ virtual/glu
+ virtual/libusb:1
+ virtual/opengl
+ cloud? (
+ dev-libs/openssl:=
+ net-misc/curl
+ )
+ fem? ( <sci-libs/vtk-9[boost,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
+ mesh? ( sci-libs/hdf5:=[fortran,zlib] )
+ openscad? ( media-gfx/openscad )
+ pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] )
+ $(python_gen_cond_dep '
+ dev-libs/boost:=[python,threads,${PYTHON_MULTI_USEDEP}]
+ dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pivy-0.6.5[${PYTHON_MULTI_USEDEP}]
+ dev-python/pyside2[gui,svg,${PYTHON_MULTI_USEDEP}]
+ dev-python/shiboken2[${PYTHON_MULTI_USEDEP}]
+ addonmgr? ( dev-python/GitPython[${PYTHON_MULTI_USEDEP}] )
+ mesh? ( dev-python/pybind11[${PYTHON_MULTI_USEDEP}] )
+ ')
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-lang/swig
+ ccache? ( dev-util/ccache )
+"
+
+# To get required dependencies:
+# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
+# We set the following requirements by default:
+# draft, import, part, qt5, sketcher, start, web.
+#
+# Additionally if mesh is set, we auto-enable mesh_part, flat_mesh and smesh
+# Fem actually needs smesh, but as long as we don't have a smesh package, we enable
+# smesh through the mesh USE flag. Note however, the fem<-smesh dependency isn't
+# reflected by the REQUIRES_MODS macro, but at
+# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake:187.
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ arch? ( mesh )
+ debug? ( mesh )
+ drawing? ( spreadsheet )
+ fem? ( mesh )
+ inspection? ( mesh points )
+ openscad? ( mesh )
+ path? ( mesh robot )
+ ship? ( image plot )
+ techdraw? ( spreadsheet drawing )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
+ "${FILESDIR}"/${PN}-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch
+)
+
+DOCS=( README.md ChangeLog.txt CODE_OF_CONDUCT.md )
+
+CHECKREQS_DISK_BUILD="7G"
+
+pkg_setup() {
+ check-reqs_pkg_setup
+ python-single-r1_pkg_setup
+ [[ -z ${CASROOT} ]] && die "\${CASROOT} not set, plesae run eselect opencascade"
+}
+
+src_prepare() {
+ # the upstream provided file doesn't find the coin doc tag file,
+ # but cmake ships a working one, so we use this.
+ rm "${S}/cMake/FindCoin3D.cmake" || die
+
+ # Fix OpenCASCADE lookup
+ sed -e 's|/usr/include/opencascade|${CASROOT}/include/opencascade|' \
+ -e 's|/usr/lib|${CASROOT}/'$(get_libdir)' NO_DEFAULT_PATH|' \
+ -i cMake/FindOpenCasCade.cmake || die
+
+ # Fix desktop file
+ sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_ADDONMGR=$(usex addonmgr)
+ -DBUILD_ARCH=$(usex arch)
+ -DBUILD_ASSEMBLY=OFF
+ -DBUILD_CLOUD=$(usex cloud)
+ -DBUILD_COMPLETE=OFF # deprecated
+ -DBUILD_DRAFT=ON # basic workspace, enable it by default
+ -DBUILD_DRAWING=$(usex drawing)
+ -DBUILD_ENABLE_CXX_STD:STRING="C++14" # needed for >=boost-1.75.0
+ -DBUILD_FEM=$(usex fem)
+ -DBUILD_FEM_NETGEN=OFF
+ -DBUILD_FLAT_MESH=$(usex mesh)
+ -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory
+ -DBUILD_FREETYPE=ON # automagic dep
+ -DBUILD_GUI=$(usex !headless)
+ -DBUILD_IDF=$(usex idf)
+ -DBUILD_IMAGE=$(usex image)
+ -DBUILD_IMPORT=ON # import module for various file formats
+ -DBUILD_INSPECTION=$(usex inspection)
+ -DBUILD_JTREADER=OFF # code has been removed upstream, but option is still there
+ -DBUILD_MATERIAL=$(usex material)
+ -DBUILD_MESH=$(usex mesh)
+ -DBUILD_MESH_PART=$(usex mesh)
+ -DBUILD_OPENSCAD=$(usex openscad)
+ -DBUILD_PART=ON # basic workspace, enable it by default
+ -DBUILD_PART_DESIGN=$(usex part-design)
+ -DBUILD_PATH=$(usex path)
+ -DBUILD_PLOT=$(usex plot) # conflicts with possible external workbench
+ -DBUILD_POINTS=$(usex points)
+ -DBUILD_QT5=ON # OFF means to use Qt4
+ -DBUILD_RAYTRACING=$(usex raytracing)
+ -DBUILD_REVERSEENGINEERING=OFF # currently only an empty sandbox
+ -DBUILD_ROBOT=$(usex robot)
+ -DBUILD_SHIP=$(usex ship) # conflicts with possible external workbench
+ -DBUILD_SHOW=$(usex show)
+ -DBUILD_SKETCHER=ON # needed by draft workspace
+ -DBUILD_SMESH=$(usex mesh)
+ -DBUILD_SPREADSHEET=$(usex spreadsheet)
+ -DBUILD_START=ON # basic workspace, enable it by default
+ -DBUILD_SURFACE=$(usex surface)
+ -DBUILD_TECHDRAW=$(usex techdraw)
+ -DBUILD_TUX=$(usex tux)
+ -DBUILD_VR=OFF
+ -DBUILD_WEB=ON # needed by start workspace
+ -DBUILD_WITH_CONDA=OFF
+
+ -DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data
+ -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+ -DCMAKE_INSTALL_INCLUDEDIR=/usr/include/${PN}
+ -DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN}
+
+ -DFREECAD_BUILD_DEBIAN=OFF
+
+ -DFREECAD_USE_CCACHE=$(usex ccache)
+ -DFREECAD_USE_EXTERNAL_KDL=ON
+ -DFREECAD_USE_EXTERNAL_SMESH=OFF # no package in Gentoo
+ -DFREECAD_USE_EXTERNAL_ZIPIOS=OFF # doesn't work yet, also no package in Gentoo tree
+ -DFREECAD_USE_FREETYPE=ON
+ -DFREECAD_USE_OCC_VARIANT:STRING="Official Version"
+ -DFREECAD_USE_PCL=$(usex pcl)
+ -DFREECAD_USE_PYBIND11=$(usex mesh)
+ -DFREECAD_USE_QT_FILEDIALOG=ON
+ -DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
+
+ -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
+ -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
+ -DOCCT_CMAKE_FALLBACK=ON # don't use occt-config which isn't included in opencascade for Gentoo
+ )
+
+ if use debug; then
+ mycmakeargs+=(
+ # sandbox needs mesh support
+ -DBUILD_SANDBOX=$(usex mesh)
+ -DBUILD_TEMPLATE=ON
+ -DBUILD_TEST=ON
+ )
+ else
+ mycmakeargs+=(
+ -DBUILD_SANDBOX=OFF
+ -DBUILD_TEMPLATE=OFF
+ -DBUILD_TEST=OFF
+ )
+ fi
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ if ! use headless; then
+ dosym ../$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad
+ mv "${ED}"/usr/$(get_libdir)/freecad/share/* "${ED}"/usr/share || die "failed to move shared ressources"
+ fi
+ dosym ../$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
+
+ python_optimize "${ED}"/usr/share/${PN}/data/Mod/ "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ if use plot; then
+ einfo "Note: You are enabling the 'plot' USE flag."
+ einfo "This conflicts with the plot workbench that can be loaded"
+ einfo "via the addon manager! You can only install one of those."
+ fi
+
+ if use ship; then
+ einfo "Note: You are enabling the 'ship' USE flag."
+ einfo "This conflicts with the ship workbench that can be loaded"
+ einfo "via the addon manager! You can only install one of those."
+ fi
+
+ einfo "You can load a lot of additional workbenches using the integrated"
+ einfo "AddonManager."
+
+ einfo "There are a lot of additional tools, for which FreeCAD has builtin"
+ einfo "support. Some of them are available in Gentoo. Take a look at"
+ einfo "https://wiki.freecadweb.org/Installing#External_software_supported_by_FreeCAD"
+ optfeature "interact with git repositories" dev-python/GitPython
+ optfeature "work with COLLADA documents" dev-python/pycollada
+ optfeature "dependency graphs" media-gfx/graphviz
+ optfeature "PBR Rendering" media-gfx/povray
+ optfeature "FEM mesh generator" sci-libs/gmsh
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+}
diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml
new file mode 100644
index 00000000000..599d1643a22
--- /dev/null
+++ b/media-gfx/freecad/metadata.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>waebbl-gentoo@posteo.net</email>
+ <name>Bernd Waibel</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <description>Gentoo Proxy Maintainers</description>
+ </maintainer>
+ <use>
+ <flag name="addonmgr">
+ Build the addon manager module for automatic handling of 3rd
+ party addons
+ </flag>
+ <flag name="arch">
+ Build the architecture workbench for working with architectural
+ elements
+ </flag>
+ <flag name="ccache">
+ Use <pkg>dev-util/ccache</pkg> to build the package.
+ </flag>
+ <flag name="cloud">
+ Build the Cloud workbench, to access cloud providers (mostly
+ Amazon S3).
+ </flag>
+ <flag name="drawing">
+ Build the drawing module and workbench to display 3D work on a
+ 2D sheet
+ </flag>
+ <flag name="fem">
+ Build the FEM module and workbench which provides Finite Element
+ Analysis (FEA) workflows
+ </flag>
+ <flag name="headless">
+ Build FreeCAD without a GUI, usable for server-side instances.
+ The Python modules are still available, without their GUI parts though.
+ </flag>
+ <flag name="idf">
+ Build the IDF module to provide file exchange capabilities with
+ IDF files
+ </flag>
+ <flag name="image">
+ Build the image module and workbench for working with bitmap
+ images
+ </flag>
+ <flag name="inspection">
+ Build the inspection workbench which gives you specific tools
+ for examination of shapes (experimental)
+ </flag>
+ <flag name="material">
+ Build the material module and workbench to work with materials
+ </flag>
+ <flag name="mesh">
+ Build the mesh module and workbench to work with triangulated
+ meshes
+ </flag>
+ <flag name="openscad">
+ Build the OpenSCAD module for interoperability with OpenSCAD
+ and repairing Constructive Solid Geometry (CSG) history
+ </flag>
+ <flag name="part-design">
+ Build the part design module and workbench for build part shapes
+ from sketches
+ </flag>
+ <flag name="path"><!-- FIXME: auto-enable through robot? -->
+ Build the path module and workbench to procude G-Code instructions
+ for CNC
+ </flag>
+ <flag name="pcl">
+ Use external <pkg>sci-libs/pcl</pkg> for point clouds support.
+ </flag>
+ <flag name="plot">
+ Build the internal plot workbench. NOTE: This conflicts with the
+ external plot workbench, which you can add via the Addon Manager!
+ </flag>
+ <flag name="points">
+ Build the points module and workbench for working with point clouds
+ </flag>
+ <flag name="raytracing">
+ Build the raytracing module and workbench for raytracing and rendering
+ </flag>
+ <flag name="robot">
+ Build the robot module and workbench for studying robot movements
+ </flag>
+ <flag name="ship">
+ Build the ship module and workbench which works over ship entities,
+ that must be created on top of provided geometry. NOTE: This conflicts
+ with the external ship workbench, which you can add via the Addon Manager!
+ </flag>
+ <flag name="show">
+ Build the show module, a helper module for visibility automation
+ </flag>
+ <flag name="spreadsheet">
+ Build the spreadsheet module and workbench to create and manipulate
+ spreadsheet data
+ </flag>
+ <flag name="surface">
+ Build the surface module and workbench
+ </flag>
+ <flag name="techdraw">
+ Build the techdraw module and workbench, a more advanced and
+ feature-rich successor of the drawing workbench
+ </flag>
+ <flag name="tux">
+ Build the Tux module
+ </flag>
+ </use>
+ <upstream>
+ <bugs-to>https://www.freecadweb.org/tracker/</bugs-to>
+ <remote-id type="github">FreeCAD/FreeCAD</remote-id>
+ <doc lang="en">https://www.freecadweb.org/wiki/MainPage</doc>
+ </upstream>
+</pkgmetadata>
diff --git a/media-gfx/freewrl/files/freewrl-1.22.13-desktop.patch b/media-gfx/freewrl/files/freewrl-1.22.13-desktop.patch
deleted file mode 100644
index 6d620b7ab94..00000000000
--- a/media-gfx/freewrl/files/freewrl-1.22.13-desktop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/freewrl-1.22.13/data/freewrl.desktop 2009-06-08 06:26:21.000000000 -0400
-+++ b/freewrl-1.22.13/data/freewrl.desktop 2013-12-23 10:45:54.916307951 -0500
-@@ -3,7 +3,7 @@
- Name=FreeWRL
- Comment=View X3D and VRML files
- Exec=/usr/bin/freewrl
--Icon=freewrl.png
-+Icon=freewrl
- Terminal=false
- Type=Application
- Categories=Graphics;3DGraphics;Viewer;
diff --git a/media-gfx/freewrl/files/freewrl-1.22.13-fontconfig-match.patch b/media-gfx/freewrl/files/freewrl-1.22.13-fontconfig-match.patch
deleted file mode 100644
index 36b844ea8b6..00000000000
--- a/media-gfx/freewrl/files/freewrl-1.22.13-fontconfig-match.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/lib/scenegraph/Component_Text.c 15 Aug 2012 13:31:45 -0000 1.56
-+++ src/lib/scenegraph/Component_Text.c 29 Aug 2012 14:18:43 -0000 1.57
-@@ -370,6 +370,7 @@
- FcPattern *FW_fp=NULL;
- FcPattern *FW_fm=NULL;
- FcChar8 *FW_file=NULL;
-+ FcResult fcjunkresult;
- #else
-
- if (!p->font_directory) {
-@@ -487,7 +488,7 @@
- #ifdef HAVE_FONTCONFIG
- FcConfigSubstitute(0,FW_fp,FcMatchPattern);
- FcDefaultSubstitute(FW_fp);
-- if (!(FW_fm = FcFontMatch(0,FW_fp,0))) {
-+ if (!(FW_fm = FcFontMatch(0,FW_fp,&fcjunkresult))) {
- /* do whatever is done when no match found */
- printf ("could not find font for id %x\n",num);
- } else {
diff --git a/media-gfx/freewrl/files/freewrl-1.22.13-java-fix.patch b/media-gfx/freewrl/files/freewrl-1.22.13-java-fix.patch
deleted file mode 100644
index 882062cb7e1..00000000000
--- a/media-gfx/freewrl/files/freewrl-1.22.13-java-fix.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/src/java/Makefile.sources
-+++ b/src/java/Makefile.sources
-@@ -1,4 +1,4 @@
--dist_noinst_JAVA = \
-+noinst_JAVA = \
- org/web3d/x3d/sai/Browser.java \
- org/web3d/x3d/sai/BrowserEvent.java \
- org/web3d/x3d/sai/BrowserFactoryImpl.java \
-@@ -309,6 +309,7 @@ noinst_JAVA = \
- vrml/InvalidFieldException.java \
- vrml/InvalidRouteException.java \
- vrml/InvalidVRMLSyntaxException.java \
-+ vrml/InvalidX3DSyntaxException.java \
- vrml/MField.java \
- vrml/field/ConstMFColor.java \
- vrml/field/ConstMFFloat.java \
---- /dev/null
-+++ b/src/java/vrml/InvalidX3DSyntaxException.java
-@@ -0,0 +1,6 @@
-+package vrml;
-+
-+public class InvalidX3DSyntaxException extends Exception {
-+ public InvalidX3DSyntaxException() { super(); }
-+ public InvalidX3DSyntaxException(String s) { super(s); }
-+}
---- a/src/java/Makefile.am 2014-03-10 10:37:09.000000000 -0400
-+++ b/src/java/Makefile.am 2014-03-12 12:29:42.000000000 -0400
-@@ -1,5 +1,10 @@
- # Java Classes for EAI/SAI/etc.
-
-+# NOTE - automake-1.11.6 changed how class*.stamp is generated, now need
-+# to use noinst_JAVA and EXTRA_DIST instead of dist_noinst_JAVA to
-+# keep behaviour consistent and compatible with both automake-1.11.6 and
-+# older automake
-+
- # Get global variables for Makefile defined by toplevel Makefile.globals
- include $(top_srcdir)/Makefile.globals
-
-@@ -9,11 +14,12 @@
- jarfile = vrml.jar
- jardir = $(JAVA_DIR)
-
--$(jarfile): $(dist_noinst_JAVA) classdist_noinst.stamp
-- $(JAR) cmf $(JAVAROOT)/manifest.extras $@ -C $(JAVAROOT) $$(echo $(dist_noinst_JAVA:.java=.class))
-+$(jarfile): $(noinst_JAVA) manifest.extras classnoinst.stamp
-+ $(JAR) cmf $(JAVAROOT)/manifest.extras $@ -C $(JAVAROOT) $$(echo $(noinst_JAVA:.java=.class))
-
- jar_DATA = $(jarfile)
-
--CLEANFILES = $(jarfile) $$(echo $(dist_noinst_JAVA:.java=.class))
-+CLEANFILES = $(jarfile) $$(echo $(noinst_JAVA:.java=.class))
-+EXTRA_DIST = $(noinst_JAVA) java.policy manifest.extras
-
- include Makefile.sources
diff --git a/media-gfx/freewrl/files/freewrl-1.22.13-mozjs187-config.patch b/media-gfx/freewrl/files/freewrl-1.22.13-mozjs187-config.patch
deleted file mode 100644
index 645a2315c16..00000000000
--- a/media-gfx/freewrl/files/freewrl-1.22.13-mozjs187-config.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/configure.ac 2012-06-13 13:17:43.000000000 -0400
-+++ b/configure.ac 2012-06-18 15:34:59.000000000 -0400
-@@ -192,6 +192,7 @@
- AC_MY_CHECK_MODULE(JAVASCRIPT_ENGINE,[spidermonkey],[>=],[1.7.0])
- ;;
- *)
-+ AC_MY_CHECK_MODULE(JAVASCRIPT_ENGINE,[mozjs187])
- AC_MY_CHECK_MODULE(JAVASCRIPT_ENGINE,[mozjs185])
- AC_MY_CHECK_MODULE(JAVASCRIPT_ENGINE,[mozilla-js],[>=],[1.9])
- AC_MY_CHECK_MODULE(JAVASCRIPT_ENGINE,[xulrunner-js],[>=],[1.8])
diff --git a/media-gfx/freewrl/files/freewrl-2.3.3-ld.gold.patch b/media-gfx/freewrl/files/freewrl-2.3.3-ld.gold.patch
deleted file mode 100644
index 6660f175b50..00000000000
--- a/media-gfx/freewrl/files/freewrl-2.3.3-ld.gold.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit 57d2d3b900c7d57e167fb7c90b36ca8c9c80b8bd
-Author: Ian Stakenvicius <axs@gentoo.org>
-Date: Mon Apr 28 10:53:57 2014 -0400
-
- autotools: fixed underlinking issue with libm
-
- Signed-off-by: Ian Stakenvicius <axs@gentoo.org>
-
-diff --git a/freex3d/configure.ac b/freex3d/configure.ac
-index 49db07c..48b09c8 100644
---- a/freex3d/configure.ac
-+++ b/freex3d/configure.ac
-@@ -73,6 +73,8 @@ AC_PROG_GCC_TRADITIONAL
- dnl AC_FUNC_MALLOC
- AC_CHECK_FUNCS([strchr strrchr strdup strndup strerror getopt getopt_long getopt_long_only malloc calloc realloc usleep gettimeofday])
-
-+# Check for math
-+AC_CHECK_LIBM
-
- # ====================================================
- # FreeWRL specific configuration: target system
-diff --git a/freex3d/src/lib/Makefile.am b/freex3d/src/lib/Makefile.am
-index ae7fb05..1b1af8a 100644
---- a/freex3d/src/lib/Makefile.am
-+++ b/freex3d/src/lib/Makefile.am
-@@ -40,7 +40,8 @@ EXTERNAL_LIBS = \
- $(PNG_LIBS) \
- $(LIBCURL_LIBS) \
- $(IMLIB2_LIBS) \
-- $(LIBLO_LIBS)
-+ $(LIBLO_LIBS) \
-+ $(LIBM)
-
-
- # X11 flags specific to x11 target (default on Linux -- optional on Mac)
diff --git a/media-gfx/freewrl/files/freewrl-3.0.0-fno-common.patch b/media-gfx/freewrl/files/freewrl-3.0.0-fno-common.patch
new file mode 100644
index 00000000000..e3fbc2d736e
--- /dev/null
+++ b/media-gfx/freewrl/files/freewrl-3.0.0-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/src/lib/desktop.c
++++ b/src/lib/desktop.c
+@@ -233,7 +233,7 @@ enum {
+ url2file_task_spawn,
+ } url2file_task_tactic;
+
+-enum {
++typedef enum {
+ file2blob_task_chain,
+ file2blob_task_spawn,
+ file2blob_task_enqueue,
diff --git a/media-gfx/freewrl/freewrl-3.0.0-r1.ebuild b/media-gfx/freewrl/freewrl-3.0.0-r1.ebuild
index 5ff59f6d8e1..b7a8547435d 100644
--- a/media-gfx/freewrl/freewrl-3.0.0-r1.ebuild
+++ b/media-gfx/freewrl/freewrl-3.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,6 @@ if [[ ${PV} == "9999" ]]; then
EGIT_REPO_URI="git://git.code.sf.net/p/freewrl/git"
S="${WORKDIR}/${P}/freex3d"
SRC_URI=
- KEYWORDS=
else
SRC_URI="mirror://sourceforge/freewrl/${P}.tar.bz2"
KEYWORDS="~amd64 ~x86"
@@ -57,6 +56,7 @@ RDEPEND="${COMMONDEPEND}
src_prepare() {
epatch_user
+ epatch "${FILESDIR}"/${P}-fno-common.patch
eautoreconf
}
diff --git a/media-gfx/freewrl/freewrl-9999.ebuild b/media-gfx/freewrl/freewrl-9999.ebuild
index 9987dd19fbc..0f77fc735ce 100644
--- a/media-gfx/freewrl/freewrl-9999.ebuild
+++ b/media-gfx/freewrl/freewrl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,6 @@ if [[ ${PV} == "9999" ]]; then
EGIT_BRANCH="develop"
S="${WORKDIR}/${P}/freex3d"
SRC_URI=
- KEYWORDS=
else
SRC_URI="mirror://sourceforge/freewrl/${P}.tar.bz2"
KEYWORDS="~amd64 ~x86"
diff --git a/media-gfx/freewrl/metadata.xml b/media-gfx/freewrl/metadata.xml
index 51d17f440b6..46c0887e1b1 100644
--- a/media-gfx/freewrl/metadata.xml
+++ b/media-gfx/freewrl/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>axs@gentoo.org</email>
- <name>Ian Stakenvicius</name>
- </maintainer>
+ <!-- maintainer-needed -->
<longdescription>
FreeWRL is a VRML97 (VRML-2.0) and X3D interactive viewer, providing both a traditional Xorg application
and a nsbrowser plugin for use with many available web browsers. The package depends heavily on OpenGL
diff --git a/media-gfx/frogr/metadata.xml b/media-gfx/frogr/metadata.xml
index a75837990a7..56b1b12cb47 100644
--- a/media-gfx/frogr/metadata.xml
+++ b/media-gfx/frogr/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>sobhan@gentoo.org</email>
- <name>Sobhan Mohammadpour</name>
- </maintainer>
+ <!-- maintainer-needed -->
<longdescription>
Frogr is a small application for the GNOME desktop that allows users to
manage their accounts in the Flickr image hosting website. It supports all
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index da65766b857..56e07a788c9 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1 +1,2 @@
DIST geeqie-1.5.1.tar.xz 1587116 BLAKE2B f8742a88eefd90fb1e7e1d1365058cef190b6231fcb001faa9f110676e8403c8e5959f9af398d6fa1ddc4e4c62439728904c6c39f5095f476014a5b7b74b4d16 SHA512 265eade90afe45856855e856c5f640786ca2e3add57c3ade8ca380d075297f96bf44c6e0c4fd6eabbc2666a37f898b50d37dd2e01d77875b8a622d72d8a0e6ac
+DIST geeqie-1.6.tar.xz 1693488 BLAKE2B ee5369884c4c0e60fe827d43ef336c5aaa89d55aec8905bb8cdd4edb2ee12e15d525577a3c85403e2e8955a08c817007b72d1d1e3614063377a21aaba317acee SHA512 4acd05c6012c80581e9c594c7dc7d12265528aa8d3868afef9def36798945afb851da9376bbe5f205ac3c5e1e2362188cc0e2891b49f3ea4396bbc6974c143ef
diff --git a/media-gfx/geeqie/geeqie-1.5.1-r1.ebuild b/media-gfx/geeqie/geeqie-1.5.1-r1.ebuild
index f0063ff9ba0..ad5ba687216 100644
--- a/media-gfx/geeqie/geeqie-1.5.1-r1.ebuild
+++ b/media-gfx/geeqie/geeqie-1.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="http://www.geeqie.org/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map nls pdf tiff xmp"
RDEPEND="
diff --git a/media-gfx/geeqie/geeqie-1.5.1.ebuild b/media-gfx/geeqie/geeqie-1.5.1.ebuild
index 63b12f277dc..4e7557f9002 100644
--- a/media-gfx/geeqie/geeqie-1.5.1.ebuild
+++ b/media-gfx/geeqie/geeqie-1.5.1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
jpeg? ( virtual/jpeg:0 )
lcms? ( media-libs/lcms:2 )
lirc? ( app-misc/lirc )
- lua? ( >=dev-lang/lua-5.1:= )
+ lua? ( >=dev-lang/lua-5.1:0= )
map? ( media-libs/libchamplain:0.12 )
pdf? ( >=app-text/poppler-0.62[cairo] )
tiff? ( media-libs/tiff:0 )
diff --git a/media-gfx/geeqie/geeqie-1.6.ebuild b/media-gfx/geeqie/geeqie-1.6.ebuild
new file mode 100644
index 00000000000..39216c02793
--- /dev/null
+++ b/media-gfx/geeqie/geeqie-1.6.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+LUA_COMPAT=( lua5-{1..3} )
+
+inherit autotools lua-single xdg
+
+DESCRIPTION="A lightweight GTK image viewer forked from GQview"
+HOMEPAGE="http://www.geeqie.org"
+SRC_URI="http://www.geeqie.org/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc exif ffmpegthumbnailer gpu-accel +gtk3 jpeg lcms lirc lua map nls pdf tiff xmp"
+
+RDEPEND="
+ virtual/libintl
+ doc? ( app-text/gnome-doc-utils )
+ ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
+ gpu-accel? ( media-libs/clutter-gtk )
+ gtk3? ( x11-libs/gtk+:3 )
+ !gtk3? ( x11-libs/gtk+:2 )
+ jpeg? ( virtual/jpeg:0 )
+ lcms? ( media-libs/lcms:2 )
+ lirc? ( app-misc/lirc )
+ lua? ( ${LUA_DEPS} )
+ map? ( media-libs/libchamplain:0.12 )
+ pdf? ( >=app-text/poppler-0.62[cairo] )
+ tiff? ( media-libs/tiff:0 )
+ xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
+ !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/glib-utils
+ dev-util/intltool
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+ gpu-accel? ( gtk3 )
+ map? ( gpu-accel )"
+
+src_prepare() {
+ default
+
+ # Remove -Werror (gcc changes may add new warnings)
+ sed -e '/CFLAGS/s/-Werror //g' -i configure.ac || die
+
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --with-readmedir="${EPREFIX}"/usr/share/doc/${PF}
+ $(use_enable debug debug-log)
+ $(use_enable ffmpegthumbnailer)
+ $(use_enable gpu-accel)
+ $(use_enable gtk3)
+ $(use_enable jpeg)
+ $(use_enable lcms)
+ $(use_enable lua)
+ $(use_enable lirc)
+ $(use_enable map)
+ $(use_enable nls)
+ $(use_enable pdf)
+ $(use_enable tiff)
+ )
+
+ if use exif || use xmp; then
+ myeconfargs+=( --enable-exiv2 )
+ else
+ myeconfargs+=( --disable-exiv2)
+ fi
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ rm -f "${D}/usr/share/doc/${PF}/COPYING"
+ # Application needs access to the uncompressed file
+ docompress -x /usr/share/doc/${PF}/README.md
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ elog "Some plugins may require additional packages"
+ elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)"
+ elog "- RAW images plugin: media-gfx/ufraw"
+}
diff --git a/media-gfx/gif2png/gif2png-2.5.14.ebuild b/media-gfx/gif2png/gif2png-2.5.14.ebuild
index 41f89555dbb..3e81c042cda 100644
--- a/media-gfx/gif2png/gif2png-2.5.14.ebuild
+++ b/media-gfx/gif2png/gif2png-2.5.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,12 +11,16 @@ SRC_URI="http://catb.org/~esr/${PN}/${P}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
RDEPEND=">=media-libs/libpng-1.2:0=
sys-libs/zlib:="
DEPEND="${RDEPEND}"
+# Tests are known to fail, #688702
+# EOL; Upstream has rewritten gif2png in Go
+RESTRICT=test
+
src_prepare() {
default
diff --git a/media-gfx/gifsicle/Manifest b/media-gfx/gifsicle/Manifest
index 09034ab6caa..f28a7beca97 100644
--- a/media-gfx/gifsicle/Manifest
+++ b/media-gfx/gifsicle/Manifest
@@ -1,2 +1 @@
-DIST gifsicle-1.91.tar.gz 571588 BLAKE2B be3973141e57618d50efb5205f79e485a4450ceed02d6c718e49305250941656f0d220c91d2056554348d14348ed1ddf03f0aa9c47e22589994c5e80046422f6 SHA512 49b89e6f99bffd0dd732c920b936c2430a2f4f595d46e41654e5f39f180acaf9b0a4aec6cf52597c470d7c60265f16b730f6ce82e08701a2054fc3d08754c6da
DIST gifsicle-1.92.tar.gz 575199 BLAKE2B 53716621846b14c0727e05893cb1876572ab80aa4d444c2b75499b541a19a5e45738b817c203b3926301378b2211a3263311c424cd8dd53e71d2b60f28ecdfb3 SHA512 5d9539eb5a6a8b87aed49ff3ca3d62e337845edbd05459b002369d571f74878c99740c34f50b4c86e5b8787ff189d4c21230e4f9019cd96a09db603afd7563dc
diff --git a/media-gfx/gifsicle/gifsicle-1.91.ebuild b/media-gfx/gifsicle/gifsicle-1.91.ebuild
deleted file mode 100644
index 6d131f898b8..00000000000
--- a/media-gfx/gifsicle/gifsicle-1.91.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Create, manipulate, and optimize GIF images and animations"
-HOMEPAGE="https://www.lcdf.org/~eddietwo/gifsicle/ https://github.com/kohler/gifsicle"
-SRC_URI="https://www.lcdf.org/~eddietwo/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="X"
-
-RDEPEND="
- X? (
- x11-libs/libX11
- x11-libs/libXt
- )
-"
-DEPEND="
- ${RDEPEND}
- X? ( x11-base/xorg-proto )
-"
-DOCS=(
- NEWS.md
- README.md
-)
-
-src_configure() {
- econf $(usex X "" "--disable-gifview")
-}
diff --git a/media-gfx/gifsicle/gifsicle-1.92.ebuild b/media-gfx/gifsicle/gifsicle-1.92.ebuild
index a51d01b0835..6b7dc995375 100644
--- a/media-gfx/gifsicle/gifsicle-1.92.ebuild
+++ b/media-gfx/gifsicle/gifsicle-1.92.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://www.lcdf.org/~eddietwo/${PN}/${P}.tar.gz"
LICENSE="GPL-2 MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="X"
RDEPEND="
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index fbbacddfe9d..3d2eaa2ee2d 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,3 +1,2 @@
-DIST gimp-2.10.20.tar.bz2 33108938 BLAKE2B 060c0e46e6f4ac861de265842d545285c2fa4590908172971ef240ae87f8caa2c015447deee810fef59c4869810676daae2e40aa611062168feffe38c7cd9b22 SHA512 7cd0b1833af87a167fdfee59fb491a72727fe3071c21c0de1813adb0f8272a92473e1e300517395b1b4593c8cb6781ee30f7a63966756e5a7f523a164308aba6
DIST gimp-2.10.22.tar.bz2 33152226 BLAKE2B d11b0ee8f0f24934383028a0b21820af30da6133814d64b67981888086f3eaa4378e474ff801db046f2fe5d380325ac7279df6e749d100219e2f6558c9bdf10d SHA512 13841ac4a186df47e4155095ca888a903b2db9e25a73fbb834fe981ccf915cb67a3e08506e5c13b6c5f35e27b1de24befbccf871e438b1a35f67f069bebd8fd0
-DIST gimp-2.99.2.tar.bz2 32375596 BLAKE2B 3dc5af7935e3503106cf2020798974d68fe86e5034792b09683519502474022e3a7832f418dfcdb4a022e6ebe878bb567bfbbbe51a96f0ae76375adc0dfdd6e5 SHA512 0a773ab01427abfb1b7690e855a041dc4883630fc827ce9d83169ccc5b4f925ecb9a0a16928a9c0ed0592c2c351ced5832e212d3115475c0f7a6092822adc194
+DIST gimp-2.99.4.tar.bz2 30355676 BLAKE2B b982139e36809b7e149c1c055d7cf0506c0c00beda2745904c62f4b56f1f1605378358f29ab427f7df6c68251ce367e00d79a1b9b7b3d0fde22526895eb5ce27 SHA512 1abb6851f4c6af440d75d09c55dcb6bf6485739de1960fb536035935729331221265beef589386da685ad8ffbe83e0f0699cf2db55589953deae4d82aa99154b
diff --git a/media-gfx/gimp/gimp-2.10.20-r3.ebuild b/media-gfx/gimp/gimp-2.10.20-r3.ebuild
deleted file mode 100644
index b108c5a443a..00000000000
--- a/media-gfx/gimp/gimp-2.10.20-r3.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# 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 toolchain-funcs 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="0/2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
-
-IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec 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.2: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.78
- >=media-libs/fontconfig-2.12.4
- >=media-libs/freetype-2.1.7
- >=media-libs/gegl-0.4.24: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() {
- if has_version "media-gfx/mypaint-brushes:2.0" ; then
- sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
- fi
-
- 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
-
- export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-_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 cpu_flags_ppc_altivec 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.10.22-r1.ebuild b/media-gfx/gimp/gimp-2.10.22-r2.ebuild
index 97824d5c1ab..7da8cd3f7e7 100644
--- a/media-gfx/gimp/gimp-2.10.22-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.10.22-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
GNOME2_EAUTORECONF=yes
WANT_AUTOMAKE=
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gimp.org/"
SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
LICENSE="GPL-3 LGPL-3"
SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
@@ -32,10 +32,11 @@ COMMON_DEPEND="
>=media-libs/fontconfig-2.12.4
>=media-libs/freetype-2.1.7
>=media-libs/gegl-0.4.26:0.4[cairo]
+ <media-libs/gegl-0.4.28:0.4
>=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/libmypaint-1.6.1:=
>=media-libs/libpng-1.6.25:0=
>=media-libs/tiff-3.5.7:0
net-libs/glib-networking[ssl]
@@ -84,6 +85,7 @@ DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
# Bugs 685210 (and duplicate 691070)
PATCHES=(
"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
+ "${FILESDIR}/${PN}-2.99.2_fix_autoconf-2.70.patch"
)
src_prepare() {
@@ -164,7 +166,7 @@ _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 || die
+ cd "${ED}"/usr/$(get_libdir)/gimp/2.0/plug-ins || die
for plugin_slash in $(ls -d1 */); do
plugin=${plugin_slash%/}
if [[ -f ${plugin}/${plugin} ]]; then
@@ -186,17 +188,17 @@ 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
+ 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
+ local gimp_app_version=$(ver_cut 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
+ rm -r "${ED}"/usr/share/gtk-doc || die
fi
_rename_plugins || die
diff --git a/media-gfx/gimp/gimp-2.99.2.ebuild b/media-gfx/gimp/gimp-2.99.4.ebuild
index f06290af12d..9d731708d3a 100644
--- a/media-gfx/gimp/gimp-2.99.2.ebuild
+++ b/media-gfx/gimp/gimp-2.99.4.ebuild
@@ -1,24 +1,26 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+LUA_COMPAT=( luajit )
+PYTHON_COMPAT=( python3_{7,8,9} )
GNOME2_EAUTORECONF=yes
VALA_MIN_API_VERSION="0.40"
VALA_USE_DEPEND=vapigen
-inherit autotools gnome2 python-single-r1 toolchain-funcs vala virtualx
+inherit autotools gnome2 lua-single python-single-r1 toolchain-funcs vala virtualx
DESCRIPTION="GNU Image Manipulation Program"
HOMEPAGE="https://www.gimp.org/"
SRC_URI="mirror://gimp/v2.99/${P}.tar.bz2"
LICENSE="GPL-3 LGPL-3"
SLOT="0/3"
-#KEYWORDS="~amd64"
+KEYWORDS=""
IUSE="aalib alsa aqua debug doc gnome heif javascript jpeg2k lua mng openexr postscript python udev unwind vala vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+ python? ( ${PYTHON_REQUIRED_USE} )"
RESTRICT="!test? ( test )"
@@ -34,10 +36,10 @@ COMMON_DEPEND="
dev-libs/libxslt
>=gnome-base/librsvg-2.40.21:2
>=media-gfx/mypaint-brushes-2.0.2:=
- >=media-libs/babl-0.1.78[introspection,lcms,vala?]
+ >=media-libs/babl-0.1.84[introspection,lcms,vala?]
>=media-libs/fontconfig-2.12.6
>=media-libs/freetype-2.10.2
- >=media-libs/gegl-0.4.26:0.4[cairo,introspection,lcms,vala?]
+ >=media-libs/gegl-0.4.28:0.4[cairo,introspection,lcms,vala?]
>=media-libs/gexiv2-0.10.10
>=media-libs/harfbuzz-2.6.5
>=media-libs/lcms-2.9:2
@@ -51,7 +53,7 @@ COMMON_DEPEND="
>=x11-libs/gdk-pixbuf-2.40.0:2
>=x11-libs/gtk+-3.24.16:3
x11-libs/libXcursor
- >=x11-libs/pango-1.42.4
+ >=x11-libs/pango-1.44.7
aalib? ( media-libs/aalib )
alsa? ( >=media-libs/alsa-lib-1.0.0 )
aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
@@ -59,8 +61,10 @@ COMMON_DEPEND="
javascript? ( dev-libs/gjs )
jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= )
lua? (
- dev-lang/luajit
- dev-lua/lgi
+ ${LUA_DEPS}
+ $(lua_gen_cond_dep '
+ dev-lua/lgi[${LUA_USEDEP}]
+ ')
)
mng? ( media-libs/libmng:= )
openexr? ( >=media-libs/openexr-2.3.0:= )
@@ -96,7 +100,6 @@ DEPEND="
>=sys-devel/automake-1.11
>=sys-devel/gettext-0.21
>=sys-devel/libtool-2.4.6
- virtual/pkgconfig
doc? (
>=dev-util/gtk-doc-1.32
dev-util/gtk-doc-am
@@ -104,23 +107,25 @@ DEPEND="
vala? ( $(vala_depend) )
"
+# TODO: there are probably more atoms in DEPEND which should be in BDEPEND now
+BDEPEND="virtual/pkgconfig"
+
DOCS=( "AUTHORS" "HACKING" "NEWS" "README" "README.i18n" )
# Bugs 685210 (and duplicate 691070)
PATCHES=(
"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
- "${FILESDIR}/${P}_fix_autoconf-2.70.patch"
)
pkg_setup() {
+ use lua && lua-single_pkg_setup
+
if use python; then
python-single-r1_pkg_setup
fi
}
src_prepare() {
- sed -i -e 's/\[gegl_micro_version\], \[27\]/\[gegl_micro_version\], \[26\]/' configure.ac || die
-
sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
@@ -204,7 +209,7 @@ _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.99/plug-ins || exit 1
+ cd "${ED}"/usr/$(get_libdir)/gimp/2.99/plug-ins || exit 1
for plugin_slash in $(ls -d1 */); do
plugin=${plugin_slash%/}
if [[ -f ${plugin}/${plugin} ]]; then
@@ -230,12 +235,12 @@ 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
+ 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)
- mv "${ED%/}"/usr/share/man/man1/gimp-console{-*,}.1 || die
+ mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die
_rename_plugins || die
}
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 0d94d06ee02..0e8f9ddf7cc 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -1,14 +1,15 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+LUA_COMPAT=( luajit )
+PYTHON_COMPAT=( python3_{7,8,9} )
GNOME2_EAUTORECONF=yes
VALA_MIN_API_VERSION="0.40"
VALA_USE_DEPEND=vapigen
-inherit autotools git-r3 gnome2 python-single-r1 toolchain-funcs vala virtualx
+inherit autotools git-r3 gnome2 lua-single python-single-r1 toolchain-funcs vala virtualx
DESCRIPTION="GNU Image Manipulation Program"
HOMEPAGE="https://www.gimp.org/"
@@ -19,7 +20,8 @@ SLOT="0/3"
KEYWORDS=""
IUSE="aalib alsa aqua debug doc gnome heif javascript jpeg2k lua mng openexr postscript python udev unwind vala vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+ python? ( ${PYTHON_REQUIRED_USE} )"
RESTRICT="!test? ( test )"
@@ -35,10 +37,10 @@ COMMON_DEPEND="
dev-libs/libxslt
>=gnome-base/librsvg-2.40.21:2
>=media-gfx/mypaint-brushes-2.0.2:=
- >=media-libs/babl-0.1.82[introspection,lcms,vala?]
+ >=media-libs/babl-0.1.84[introspection,lcms,vala?]
>=media-libs/fontconfig-2.12.6
>=media-libs/freetype-2.10.2
- >=media-libs/gegl-0.4.27:0.4[cairo,introspection,lcms,vala?]
+ >=media-libs/gegl-0.4.28:0.4[cairo,introspection,lcms,vala?]
>=media-libs/gexiv2-0.10.10
>=media-libs/harfbuzz-2.6.5
>=media-libs/lcms-2.9:2
@@ -52,7 +54,7 @@ COMMON_DEPEND="
>=x11-libs/gdk-pixbuf-2.40.0:2
>=x11-libs/gtk+-3.24.16:3
x11-libs/libXcursor
- >=x11-libs/pango-1.42.4
+ >=x11-libs/pango-1.44.7
aalib? ( media-libs/aalib )
alsa? ( >=media-libs/alsa-lib-1.0.0 )
aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
@@ -60,8 +62,10 @@ COMMON_DEPEND="
javascript? ( dev-libs/gjs )
jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= )
lua? (
- dev-lang/luajit
- dev-lua/lgi
+ ${LUA_DEPS}
+ $(lua_gen_cond_dep '
+ dev-lua/lgi[${LUA_USEDEP}]
+ ')
)
mng? ( media-libs/libmng:= )
openexr? ( >=media-libs/openexr-2.3.0:= )
@@ -97,7 +101,6 @@ DEPEND="
>=sys-devel/automake-1.11
>=sys-devel/gettext-0.21
>=sys-devel/libtool-2.4.6
- virtual/pkgconfig
doc? (
>=dev-util/gtk-doc-1.32
dev-util/gtk-doc-am
@@ -105,6 +108,9 @@ DEPEND="
vala? ( $(vala_depend) )
"
+# TODO: there are probably more atoms in DEPEND which should be in BDEPEND now
+BDEPEND="virtual/pkgconfig"
+
DOCS=( "AUTHORS" "HACKING" "NEWS" "README" "README.i18n" )
# Bugs 685210 (and duplicate 691070)
@@ -113,6 +119,8 @@ PATCHES=(
)
pkg_setup() {
+ use lua && lua-single_pkg_setup
+
if use python; then
python-single-r1_pkg_setup
fi
@@ -210,7 +218,7 @@ _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.99/plug-ins || exit 1
+ cd "${ED}"/usr/$(get_libdir)/gimp/2.99/plug-ins || exit 1
for plugin_slash in $(ls -d1 */); do
plugin=${plugin_slash%/}
if [[ -f ${plugin}/${plugin} ]]; then
@@ -236,12 +244,12 @@ 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
+ 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)
- mv "${ED%/}"/usr/share/man/man1/gimp-console{-*,}.1 || die
+ mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die
_rename_plugins || die
}
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index a5ed8f534c6..17da03c6dd4 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,2 +1,2 @@
-DIST gmic_2.9.2.tar.gz 6639693 BLAKE2B 4b452cc5c82e8ea30a1bd65e51b6187fc12d9c7f8af6d0f8107a8d183c6e87dff11394f103eae7ac17daa00c6c9aa0f47ce78a92156e2da9bc4ee0fcacbf398d SHA512 be8707b5c156b17189548c1f808b976afcb7b7cce20ff54ff4589eda9a76a8cddf81c64b7a53c332254b2c8c29fb8ca0926016cadcb1efb7131a38d857fce796
DIST gmic_2.9.4.tar.gz 7279628 BLAKE2B ca5fc69a2990a86a340c4305dc406d4e9032ba04afa59819dc2c788b4c181d23bd03d3050380802fe1effa2b6389df60734f8b3523fac7b0ff6bc35b64a368a6 SHA512 76bb4798e91a68e76a985d7fbc488f8677facaa1efc4ab3a0b9c7d966aa3f5763d1ae1de80f572636d58f1831d9bdae1651ea0b6a76d49a18bf5ad6e12756d73
+DIST gmic_2.9.5.tar.gz 7304367 BLAKE2B 5227aced76cc5ff0a0144f940c71daeeb947e282b6f8c28894ecfda6b863803d0c2227bac869362ba0710fa33fcf81a4c77ea582cbea77ab8a670f65eef9826c SHA512 95d0642cad057eeaa8f7bdd4259719adf6f36189e7851e9e09399bb61f3a52722f0f83f0d2d5991c4e44a692fd3afc735fdb93e6fe45ae092d1e51a139560809
diff --git a/media-gfx/gmic/gmic-2.9.4.ebuild b/media-gfx/gmic/gmic-2.9.4.ebuild
index 4af6d1c63fa..09772f17dec 100644
--- a/media-gfx/gmic/gmic-2.9.4.ebuild
+++ b/media-gfx/gmic/gmic-2.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="amd64 arm64 x86"
fi
DESCRIPTION="GREYC's Magic Image Converter"
diff --git a/media-gfx/gmic/gmic-2.9.2-r1.ebuild b/media-gfx/gmic/gmic-2.9.5.ebuild
index 4af6d1c63fa..20cad100504 100644
--- a/media-gfx/gmic/gmic-2.9.2-r1.ebuild
+++ b/media-gfx/gmic/gmic-2.9.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -20,10 +20,8 @@ HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
LICENSE="CeCILL-2 GPL-3"
SLOT="0"
-IUSE="+cli curl digikam ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
REQUIRED_USE="
- || ( cli digikam gimp krita qt5 )
- digikam? ( png zlib fftw X )
gimp? ( png zlib fftw X )
krita? ( png zlib fftw X )
qt5? ( png zlib fftw X )
@@ -38,10 +36,6 @@ QT_DEPEND="
"
COMMON_DEPEND="
curl? ( net-misc/curl )
- digikam? (
- media-gfx/digikam
- ${QT_DEPEND}
- )
fftw? ( sci-libs/fftw:3.0=[threads] )
gimp? (
media-gfx/gimp:0/2
@@ -67,7 +61,6 @@ RDEPEND="${COMMON_DEPEND}
ffmpeg? ( media-video/ffmpeg:0= )
"
DEPEND="${COMMON_DEPEND}
- digikam? ( dev-qt/linguist-tools )
gimp? ( dev-qt/linguist-tools )
krita? ( dev-qt/linguist-tools )
qt5? ( dev-qt/linguist-tools )
@@ -90,7 +83,7 @@ src_prepare() {
cmake_src_prepare
sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
- if use digikam || use gimp || use krita || use qt5; then
+ if use gimp || use krita || use qt5; then
# respect user flags
sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
@@ -136,11 +129,6 @@ src_configure() {
-DGMIC_PATH="${S}/src"
)
- if use digikam; then
- mycmakeargs+=( -DGMIC_QT_HOST=digikam )
- BUILD_DIR="${BUILD_DIR}"/digikam cmake_src_configure
- fi
-
if use gimp; then
mycmakeargs+=( -DGMIC_QT_HOST=gimp )
BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
@@ -162,7 +150,6 @@ src_compile() {
# build gmic-qt frontends
local S="${S}/gmic-qt"
- use digikam && { BUILD_DIR="${BUILD_DIR}"/digikam cmake_src_compile || die "failed building digikam plugin" ; }
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" ; }
@@ -178,11 +165,6 @@ src_install() {
doins resources/gmic_cluts.gmz
# install gmic-qt frontends
- if use digikam; then
- local DIGIKAMDIR="/usr/$(get_libdir)/qt5/plugins/digikam/editor"
- exeinto "${DIGIKAMDIR}"
- doexe "${BUILD_DIR}"/digikam/Editor_GmicQt_Plugin.so
- fi
if use gimp; then
exeinto "${PLUGINDIR}"
doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
diff --git a/media-gfx/gnofract4d/gnofract4d-4.0.1_p1-r1.ebuild b/media-gfx/gnofract4d/gnofract4d-4.0.1_p1-r1.ebuild
index aff5c5c7b18..ddede64604e 100644
--- a/media-gfx/gnofract4d/gnofract4d-4.0.1_p1-r1.ebuild
+++ b/media-gfx/gnofract4d/gnofract4d-4.0.1_p1-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
DISTUTILS_SINGLE_IMPL=1
DISTUTILS_USE_SETUPTOOLS=no
diff --git a/media-gfx/gnofract4d/gnofract4d-4.3_p20201029.ebuild b/media-gfx/gnofract4d/gnofract4d-4.3_p20201029.ebuild
index 644c1fba092..414a07e0ba7 100644
--- a/media-gfx/gnofract4d/gnofract4d-4.3_p20201029.ebuild
+++ b/media-gfx/gnofract4d/gnofract4d-4.3_p20201029.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
DISTUTILS_SINGLE_IMPL=1
inherit distutils-r1 optfeature virtualx xdg
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/fract4d/gnofract4d/archive/${COMMIT}.tar.gz -> ${P}.
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
DEPEND="
media-libs/libpng:0=
diff --git a/media-gfx/gnome-photos/gnome-photos-3.34.2.ebuild b/media-gfx/gnome-photos/gnome-photos-3.34.2.ebuild
index 66f59c29055..d7514e59171 100644
--- a/media-gfx/gnome-photos/gnome-photos-3.34.2.ebuild
+++ b/media-gfx/gnome-photos/gnome-photos-3.34.2.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_7 )
inherit gnome.org gnome2-utils meson python-any-r1 virtualx xdg
diff --git a/media-gfx/gnome-screenshot/Manifest b/media-gfx/gnome-screenshot/Manifest
index 329b57d7c9b..351c6e42634 100644
--- a/media-gfx/gnome-screenshot/Manifest
+++ b/media-gfx/gnome-screenshot/Manifest
@@ -1 +1,2 @@
DIST gnome-screenshot-3.36.0.tar.xz 231420 BLAKE2B ce916d4d221252f47c84ebdec52ddcc2e25c2481df848cb6199842857c7ba537f56c22bdcb2a8e5b988d767fbc242d0c727119bc1ae9d569644eae15688aebf5 SHA512 fda599e7c50b37d8356352085b2f45f3b8c868af897352810998e127bd7333d5a1383369ec1cb980064f7e0aafa0e01bc5cdb31563ea56b1a7e4099fc18cc6b4
+DIST gnome-screenshot-3.38.0.tar.xz 356716 BLAKE2B 31f2a0cdf16a9f967c789ec1f698140f78a5c4d66489bc8a47b8b61b5e536e6b67fd60b9cb241221262eef5b3117ce3e1a59fa162a7f193de440f7de9db0afc3 SHA512 183f81b9b481d1afb4a3c8e37b25a78652e599d4c5a4f1a2cc9449cd1efdf3b613018c17de9ab61304ba19ad7152d696aeed475c0184a4728ea1359ca2be2ecf
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.38.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.38.0.ebuild
new file mode 100644
index 00000000000..9b96935da73
--- /dev/null
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-3.38.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 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="X"
+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="
+ X? (
+ 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]
+ >=gui-libs/libhandy-1:1=
+"
+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_configure() {
+ local emesonargs=(
+ $(meson_feature X x11)
+ )
+ meson_src_configure
+}
+
+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/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 5c6174e3fae..097ae8445d3 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -1 +1 @@
-DIST GraphicsMagick-1.3.35.tar.xz 5543224 BLAKE2B 8a284d85341c10939fdece5c565d5b881276afb9b4c5dfb2221b780a01b99f78ee62761722c372baf9155c63f7ef176b67310aeedcab0368f4f26f5b0150bcce SHA512 baae92089d52147ef961f93495abc8a9d8b1a963af61d87a650c1ab105d46816aa38c83f654edcb5a0e1b7f07ccc06eaeaa443b9bde3a63a0b9bfb45f3ae144c
+DIST GraphicsMagick-1.3.36.tar.xz 5600712 BLAKE2B 069ab4f9bb5beea3321860bf8e43c8a1b51ab102054e92486375209a86fd3c1c1fb44d4b2c43a65c78f36e9f37e09316fe77b4f261bfb0af3b2c2a86ff8b5aa5 SHA512 27ed5fcbfb0303436bdcb0f11d18257a967d471251b51e633e2c655b0a7e5ed01f61a61f9702cc7d4c02714e005ac18ca9ba0f690c0580e41d07947a03c5cbb4
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-flags.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-flags.patch
deleted file mode 100644
index 1ebef540033..00000000000
--- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-flags.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Fix various preprocessor, compiler, and linker flags added to config wrappers.
-Previously they would add build time flags to the files which is incorrect.
-
---- GraphicsMagick-1.3.19/configure.ac
-+++ GraphicsMagick-1.3.19/configure.ac
-@@ -346,6 +346,7 @@
-
- AC_OPENMP([C])
- CFLAGS="$OPENMP_CFLAGS $CFLAGS"
-+MAGICK_API_CFLAGS="$MAGICK_API_CFLAGS $OPENMP_CFLAGS"
- #CXXFLAGS="$OPENMP_CXXFLAGS $CXXFLAGS"
- #LDFLAGS="$LDFLAGS $OPENMP_CFLAGS"
- AC_SUBST(OPENMP_CFLAGS)
-@@ -3407,9 +3408,10 @@
- MAGICK_DEP_LIBS=`echo $MAGICK_DEP_LIBS | sed -e 's/ */ /g'`
- #LIBS=`echo $LIBS | sed -e 's/ */ /g'`
-
--MAGICK_API_CFLAGS=$CFLAGS
-+MAGICK_API_CFLAGS=`echo $MAGICK_API_CFLAGS | sed -e 's/ */ /g'`
- MAGICK_API_CPPFLAGS=`echo $MAGICK_API_CPPFLAGS | sed -e 's/ */ /g'`
--MAGICK_API_LDFLAGS="-L$LIB_DIR $LDFLAGS"
-+MAGICK_API_CXXFLAGS=""
-+MAGICK_API_LDFLAGS="-L$LIB_DIR"
- MAGICK_API_DEP_LIBS="$MAGICK_DEP_LIBS"
- MAGICK_API_LIBS="-lGraphicsMagick $MAGICK_API_DEP_LIBS"
-
-@@ -3440,6 +3442,7 @@
-
- AC_SUBST(MAGICK_API_CFLAGS)
- AC_SUBST(MAGICK_API_CPPFLAGS)
-+AC_SUBST(MAGICK_API_CXXFLAGS)
- AC_SUBST(MAGICK_API_PC_CPPFLAGS)
- AC_SUBST(MAGICK_API_LDFLAGS)
- AC_SUBST(MAGICK_API_LIBS)
---- GraphicsMagick-1.3.19/magick/GraphicsMagick-config.in
-+++ GraphicsMagick-1.3.19/magick/GraphicsMagick-config.in
-@@ -30,7 +30,7 @@
- echo @PACKAGE_VERSION@
- ;;
- --cflags)
-- echo '@CFLAGS@'
-+ echo '@MAGICK_API_CFLAGS@'
- ;;
- --cppflags)
- echo '@MAGICK_API_CPPFLAGS@'
---- GraphicsMagick-1.3.19/Magick++/bin/GraphicsMagick++-config.in
-+++ GraphicsMagick-1.3.19/Magick++/bin/GraphicsMagick++-config.in
-@@ -33,7 +33,7 @@
- echo '@MAGICK_API_CPPFLAGS@'
- ;;
- --cxxflags)
-- echo '@CXXFLAGS@'
-+ echo '@MAGICK_API_CXXFLAGS@'
- ;;
- --ldflags)
- echo '@MAGICK_API_LDFLAGS@'
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-CVE-2020-12672.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-CVE-2020-12672.patch
deleted file mode 100644
index b314ea288e4..00000000000
--- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-CVE-2020-12672.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -r 4917a4242fc0 -r 50395430a371 coders/png.c
---- a/coders/png.c Fri May 01 13:49:13 2020 -0500
-+++ b/coders/png.c Sat May 30 10:18:16 2020 -0500
-@@ -5304,7 +5304,7 @@
- if (logging)
- (void) LogMagickEvent(CoderEvent,GetMagickModule(),
- "MAGN chunk (%lu bytes): "
-- "First_magnified_object_id=%u, Last_magnified_object_id=%u, "
-+ "First_magnified_object_id=%u, Las t_magnified_object_id=%u, "
- "MB=%u, ML=%u, MR=%u, MT=%u, MX=%u, MY=%u, "
- "X_method=%u, Y_method=%u",
- length,
-@@ -5679,6 +5679,8 @@
- /*
- If magnifying and a supported method is requested then
- magnify the image.
-+
-+ http://www.libpng.org/pub/mng/spec/mng-1.0-20010209-pdg.html#mng-MAGN
- */
- if (((mng_info->magn_methx > 0) && (mng_info->magn_methx <= 5)) &&
- ((mng_info->magn_methy > 0) && (mng_info->magn_methy <= 5)))
-@@ -5689,7 +5691,28 @@
-
- if (logging)
- (void) LogMagickEvent(CoderEvent,GetMagickModule(),
-- " Processing MNG MAGN chunk");
-+ " Processing MNG MAGN chunk: MB=%u, ML=%u,"
-+ " MR=%u, MT=%u, MX=%u, MY=%u,"
-+ " X_method=%u, Y_method=%u",
-+ mng_info->magn_mb,mng_info->magn_ml,
-+ mng_info->magn_mr,mng_info->magn_mt,
-+ mng_info->magn_mx,mng_info->magn_my,
-+ mng_info->magn_methx,
-+ mng_info->magn_methy);
-+
-+ /*
-+ If the image width is 1, then X magnification is done
-+ by simple pixel replication.
-+ */
-+ if (image->columns == 1)
-+ mng_info->magn_methx = 1;
-+
-+ /*
-+ If the image height is 1, then Y magnification is done
-+ by simple pixel replication.
-+ */
-+ if (image->rows == 1)
-+ mng_info->magn_methy = 1;
-
- if (mng_info->magn_methx == 1)
- {
-@@ -5734,12 +5757,10 @@
- Image
- *large_image;
-
-- int
-- yy;
--
- long
- m,
-- y;
-+ y,
-+ yy;
-
- register long
- x;
-
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-20045-20318-21956.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-20045-20318-21956.patch
deleted file mode 100644
index c7921dd2e69..00000000000
--- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-20045-20318-21956.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -r 50395430a371 -r 83b4d2b4b873 coders/wpg.c
---- a/coders/wpg.c Sat May 30 10:18:16 2020 -0500
-+++ b/coders/wpg.c Sat May 30 17:33:51 2020 -0500
-@@ -403,7 +403,7 @@
- x++; \
- if((long) x>=ldblk) \
- { \
-- if(InsertRow(BImgBuff,y,image,bpp)==MagickFail) RetVal=-6; \
-+ if(InsertRow(BImgBuff,y,image,bpp)==MagickFail) { RetVal=-6; goto unpack_wpg_raser_error; } \
- x=0; \
- y++; \
- if(y>=image->rows) break; \
-@@ -537,6 +537,7 @@
- }
- }
- }
-+unpack_wpg_raser_error:;
- MagickFreeMemory(BImgBuff);
- return(RetVal);
- }
-@@ -552,7 +553,7 @@
- x++; \
- if((long) x >= ldblk) \
- { \
-- if(InsertRow(BImgBuff,(long) y,image,bpp)==MagickFail) RetVal=-6; \
-+ if(InsertRow(BImgBuff,(long) y,image,bpp)==MagickFail) { RetVal=-6; goto unpack_wpg2_error; } \
- x=0; \
- y++; \
- XorMe = 0; \
-@@ -729,6 +730,7 @@
- }
- }
- }
-+unpack_wpg2_error:;
- FreeUnpackWPG2RasterAllocs(BImgBuff,UpImgBuff);
- return(RetVal);
- }
-
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-23042.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-23042.patch
deleted file mode 100644
index 197a230a340..00000000000
--- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-23042.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -r 24ed4812e580 -r b0aa53a5f970 coders/wpg.c
---- a/coders/wpg.c Tue Jun 02 07:45:45 2020 -0500
-+++ b/coders/wpg.c Sat Jun 06 14:12:18 2020 -0500
-@@ -413,9 +413,12 @@
-
- /** Call this function to ensure that all data matrix is filled with something. This function
- * is used only to error recovery. */
--static void ZeroFillMissingData(unsigned char *BImgBuff,unsigned long x, unsigned long y, Image *image,
-- int bpp, long ldblk)
-+static MagickPassFail ZeroFillMissingData(unsigned char *BImgBuff,unsigned long x, unsigned long y, Image *image,
-+ int bpp, long ldblk)
- {
-+ MagickPassFail
-+ status = MagickPass;
-+
- while(y<image->rows && image->exception.severity!=UndefinedException)
- {
- if((long) x<ldblk)
-@@ -427,9 +430,13 @@
- x = 0; /* Next pass will need to clear whole row */
- }
- if(InsertRow(BImgBuff,y,image,bpp) == MagickFail)
-- break;
-+ {
-+ status = MagickFail;
-+ break;
-+ }
- y++;
- }
-+ return status;
- }
-
-
-@@ -528,7 +535,6 @@
- }
- if(InsertRow(BImgBuff,y,image,bpp)==MagickFail)
- {
-- ZeroFillMissingData(BImgBuff,x,y,image,bpp,ldblk);
- MagickFreeMemory(BImgBuff);
- return(-6);
- }
-
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-flags.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-flags.patch
new file mode 100644
index 00000000000..311cd782925
--- /dev/null
+++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-flags.patch
@@ -0,0 +1,59 @@
+diff --git a/Magick++/bin/GraphicsMagick++-config.in b/Magick++/bin/GraphicsMagick++-config.in
+index 9733be2..4c49362 100755
+--- a/Magick++/bin/GraphicsMagick++-config.in
++++ b/Magick++/bin/GraphicsMagick++-config.in
+@@ -33,7 +33,7 @@ while test $# -gt 0; do
+ echo '@MAGICK_API_CPPFLAGS@'
+ ;;
+ --cxxflags)
+- echo '@CXXFLAGS@'
++ echo '@MAGICK_API_CXXFLAGS@'
+ ;;
+ --ldflags)
+ echo '@MAGICK_API_LDFLAGS@'
+diff --git a/configure.ac b/configure.ac
+index d6a30f6..2f5ff6c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -335,6 +335,7 @@ fi
+
+ AC_OPENMP([C])
+ CFLAGS="$OPENMP_CFLAGS $CFLAGS"
++MAGICK_API_CFLAGS="$MAGICK_API_CFLAGS $OPENMP_CFLAGS"
+ #CXXFLAGS="$OPENMP_CXXFLAGS $CXXFLAGS"
+ #LDFLAGS="$LDFLAGS $OPENMP_CFLAGS"
+ AC_SUBST([OPENMP_CFLAGS])
+@@ -3689,9 +3690,10 @@ MAGICK_DEP_LIBS=`echo $MAGICK_DEP_LIBS | sed -e 's/ */ /g'`
+ MAGICK_EXTRA_DEP_LIBS=`echo $MAGICK_EXTRA_DEP_LIBS | sed -e 's/ */ /g'`
+ #LIBS=`echo $LIBS | sed -e 's/ */ /g'`
+
+-MAGICK_API_CFLAGS=$CFLAGS
++MAGICK_API_CFLAGS=`echo $MAGICK_API_CFLAGS | sed -e 's/ */ /g'`
+ MAGICK_API_CPPFLAGS=`echo $MAGICK_API_CPPFLAGS | sed -e 's/ */ /g'`
+-MAGICK_API_LDFLAGS="-L$LIB_DIR $LDFLAGS"
++MAGICK_API_CXXFLAGS=""
++MAGICK_API_LDFLAGS="-L$LIB_DIR"
+ MAGICK_API_DEP_LIBS="$MAGICK_DEP_LIBS"
+ MAGICK_API_LIBS="-lGraphicsMagick $MAGICK_API_DEP_LIBS $MAGICK_EXTRA_DEP_LIBS"
+
+@@ -3721,6 +3723,7 @@ AC_SUBST([X_CFLAGS])
+
+ AC_SUBST([MAGICK_API_CFLAGS])
+ AC_SUBST([MAGICK_API_CPPFLAGS])
++AC_SUBST(MAGICK_API_CXXFLAGS)
+ AC_SUBST([MAGICK_API_PC_CPPFLAGS])
+ AC_SUBST([MAGICK_API_LDFLAGS])
+ AC_SUBST([MAGICK_API_LIBS])
+diff --git a/magick/GraphicsMagick-config.in b/magick/GraphicsMagick-config.in
+index 8b2f016..3f66ae3 100644
+--- a/magick/GraphicsMagick-config.in
++++ b/magick/GraphicsMagick-config.in
+@@ -30,7 +30,7 @@ while test $# -gt 0; do
+ echo @PACKAGE_VERSION@
+ ;;
+ --cflags)
+- echo '@CFLAGS@'
++ echo '@MAGICK_API_CFLAGS@'
+ ;;
+ --cppflags)
+ echo '@MAGICK_API_CPPFLAGS@'
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.35-r1.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
index 2533e3b977e..61f1c141918 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.35-r1.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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/"
+HOMEPAGE="http://www.graphicsmagick.org/ http://hg.code.sf.net/p/graphicsmagick/code/"
LICENSE="MIT"
SLOT="0/${PV%.*}"
@@ -16,7 +16,8 @@ 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 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+ S="${WORKDIR}/${MY_P}"
+ KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
fi
IUSE="bzip2 +cxx debug dynamic-loading fpx imagemagick jbig jpeg lcms lzma
@@ -39,24 +40,19 @@ RDEPEND="dev-libs/libltdl: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.36-flags.patch
"${FILESDIR}"/${PN}-1.3.19-perl.patch
- "${FILESDIR}"/${P}-CVE-2020-12672.patch
- "${FILESDIR}"/${P}-oss-fuzz-20045-20318-21956.patch
- "${FILESDIR}"/${P}-oss-fuzz-23042.patch
)
src_prepare() {
diff --git a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
index 5cde9ca8939..029471742ca 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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/"
+HOMEPAGE="http://www.graphicsmagick.org/ http://hg.code.sf.net/p/graphicsmagick/code/"
LICENSE="MIT"
SLOT="0/${PV%.*}"
@@ -16,7 +16,8 @@ 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"
+ S="${WORKDIR}/${MY_P}"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
fi
IUSE="bzip2 +cxx debug dynamic-loading fpx imagemagick jbig jpeg lcms lzma
@@ -39,20 +40,18 @@ RDEPEND="dev-libs/libltdl: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.36-flags.patch
"${FILESDIR}"/${PN}-1.3.19-perl.patch
)
diff --git a/media-gfx/graphite2/graphite2-1.3.14.ebuild b/media-gfx/graphite2/graphite2-1.3.14.ebuild
index ce5d97c4eeb..2916af32a84 100644
--- a/media-gfx/graphite2/graphite2-1.3.14.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.14.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
CMAKE_ECLASS=cmake
GENTOO_DEPEND_ON_PERL="no"
@@ -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 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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="perl test"
RESTRICT="!test? ( test )"
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index a56cb546665..eec2245c13b 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,2 +1 @@
-DIST graphviz-2.42.3.tar.gz 26246717 BLAKE2B 71c61dcd056c9a2e2655c3be995d1da17b3af0d3374e74400fc38da11ab81849f7b5e528f99fc2046294958a4bab0a411ab204e434360f316a5367403472e8a1 SHA512 e03ca6da0ddb1162bd179d159d7dbb379d55012d63bb922aa800260fce52b65beb1a9b5ca1a5199ad3537201b0b4841efc9facee6e03065c6bd02e840f8a29c9
DIST graphviz-2.44.1.tar.gz 34079677 BLAKE2B 90183afa6affedb097eab237fae148a9c085c3a724fb74d370f7c042b53d09b44ba0cb755a2ac74175d89d3a45687b60f0e210bdd404fc72da98bdf61b9eaa8d SHA512 42e6137c7cce18daf6f17e6fcbbdfe8e0a531de1bdd3ac7b8751445214aa0d85713b65ba896a234a02670827b0d608bd64b758ef60a4d0384ffa3355ee0dbc42
diff --git a/media-gfx/graphviz/files/dotty_change_button.patch b/media-gfx/graphviz/files/dotty_change_button.patch
deleted file mode 100644
index 8c5f34a2e12..00000000000
--- a/media-gfx/graphviz/files/dotty_change_button.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/cmd/dotty/dotty_ui.lefty b/cmd/dotty/dotty_ui.lefty
-index a8c9116..a708c61 100644
---- a/cmd/dotty/dotty_ui.lefty
-+++ b/cmd/dotty/dotty_ui.lefty
-@@ -342,7 +342,7 @@ dotty.protovt.normal.uifuncs = [
- else
- gt.insertedge (gt, data.pobj, null, data.obj, null, null, 1);
- };
-- 'rightdown' = function (data) {
-+ 'rightup' = function (data) {
- local vt, gt, menu, i;
-
- vt = dotty.views[data.widget];
-@@ -447,7 +447,7 @@ dotty.protovt.birdseye.uifuncs = [
- 'middledown' = dotty.protovt.normal.uifuncs.middledown;
- 'middlemove' = dotty.protovt.normal.uifuncs.middlemove;
- 'middleup' = dotty.protovt.normal.uifuncs.middleup;
-- 'rightdown' = dotty.protovt.normal.uifuncs.rightdown;
-+ 'rightup' = dotty.protovt.normal.uifuncs.rightup;
- 'keyup' = dotty.protovt.normal.uifuncs.keyup;
- 'redraw' = dotty.protovt.normal.uifuncs.redraw;
- 'closeview' = dotty.protovt.normal.uifuncs.closeview;
diff --git a/media-gfx/graphviz/graphviz-2.42.3-r1.ebuild b/media-gfx/graphviz/graphviz-2.42.3-r1.ebuild
deleted file mode 100644
index 86275dffb43..00000000000
--- a/media-gfx/graphviz/graphviz-2.42.3-r1.ebuild
+++ /dev/null
@@ -1,281 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit autotools flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils
-
-DESCRIPTION="Open Source Graph Visualization Software"
-HOMEPAGE="https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/"
-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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="+cairo devil doc examples gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD"
-
-REQUIRED_USE="
- !cairo? ( !X !gtk !postscript !lasi )
- pdf? ( cairo )
- python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Requires ksh, tests against installed package, missing files and directory
-RESTRICT="test"
-
-BDEPEND="
- sys-devel/flex
- sys-devel/libtool
- x11-libs/gdk-pixbuf:2
- virtual/pkgconfig
- nls? ( >=sys-devel/gettext-0.14.5 )
- perl? ( dev-lang/swig )
- python? ( dev-lang/swig )
- ruby? ( dev-lang/swig )
- tcl? ( dev-lang/swig )
-"
-RDEPEND="
- >=dev-libs/expat-2
- >=dev-libs/glib-2.11.1:2
- dev-libs/libltdl:0
- >=media-libs/fontconfig-2.3.95
- >=media-libs/freetype-2.1.10
- >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib]
- >=media-libs/libpng-1.2:0=
- sys-libs/zlib
- virtual/jpeg:0
- virtual/libiconv
- cairo? (
- >=x11-libs/cairo-1.1.10[svg]
- >=x11-libs/pango-1.12
- )
- devil? ( media-libs/devil[png,jpeg] )
- gtk? ( x11-libs/gtk+:2 )
- gts? ( sci-libs/gts )
- lasi? ( media-libs/lasi )
- pdf? ( app-text/poppler )
- perl? ( dev-lang/perl:= )
- postscript? ( app-text/ghostscript-gpl )
- python? ( ${PYTHON_DEPS} )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- )
- ruby? ( dev-lang/ruby:* )
- svg? ( gnome-base/librsvg )
- tcl? ( >=dev-lang/tcl-8.3:0= )
- X? (
- x11-libs/libX11
- x11-libs/libXaw
- x11-libs/libXmu
- x11-libs/libXpm
- x11-libs/libXt
- )
-"
-DEPEND="${RDEPEND}
- guile? (
- dev-lang/swig
- dev-scheme/guile
- )
- java? (
- dev-lang/swig
- >=virtual/jdk-1.5
- )
-"
-
-# Dependency description / Maintainer-Info:
-
-# Rendering is done via the following plugins (/plugins):
-# - core, dot_layout, neato_layout, gd , dot
-# the ones which are always compiled in, depend on zlib, gd
-# - gtk
-# Directly depends on gtk-2.
-# needs 'pangocairo' enabled in graphviz configuration
-# gtk-2 depends on pango, cairo and libX11 directly.
-# - gdk-pixbuf
-# Disabled, GTK-1 junk.
-# - glitz
-# Disabled, no particular reason
-# needs 'pangocairo' enabled in graphviz configuration
-# - ming
-# flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
-# incomplete.
-# - cairo/pango:
-# Needs pango for text layout, uses cairo methods to draw stuff
-# - xlib:
-# needs cairo+pango,
-# can make use of gnomeui and inotify support (??? unsure),
-# needs libXaw for UI
-# UI also links directly against libX11, libXmu, and libXt
-# and uses libXpm if available so we make sure it always is
-
-# There can be swig-generated bindings for the following languages (/tclpkg/gv):
-# - c-sharp (disabled)
-# - scheme (enabled via guile) ... no longer broken on ~x86
-# - go (disabled)
-# - io (disabled)
-# - java (enabled via java) *2
-# - lua (enabled via lua)
-# - ocaml (enabled via ocaml)
-# - perl (enabled via perl) *1
-# - php (enabled via php) *2
-# - python (enabled via python) *1
-# - ruby (enabled via ruby) *1
-# - tcl (enabled via tcl)
-# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location
-# *2 = Those bindings don't build because the paths for the headers/libs aren't
-# detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5)
-
-# There are several other tools in /tclpkg:
-# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl
-# tkspline, tkstubs ; enabled with: --with-tk
-
-# And the commands (/cmd):
-# - dot, dotty, gvedit, gvpr, lefty, lneato, smyrna, tools/* :)
-# sci-libs/gts can be used for some of these
-# - lefty:
-# needs Xaw and X to build
-# - gvedit (via 'qt5'):
-# based on ./configure it needs qt-core and qt-gui only
-# - smyrna : experimental opengl front-end (via 'smyrna')
-# currently disabled -- it segfaults a lot
-# needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut
-# sci-libs/gts, x11-libs/gtk. Also needs 'gtk','glade','glut','gts' and 'png'
-# with flags enabled at configure time
-
-PATCHES=( "${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch
- "${FILESDIR}"/dotty_change_button.patch )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- default
-
- # ToDo: Do the same thing for examples and/or
- # write a patch for a configuration-option
- # and send it to upstream
- # note - the longer sed expression removes multi-line assignments that are extended via '\'
- if ! use doc ; then
- find . -iname Makefile.am \
- | xargs sed -i -e '/^\(html\|pdf\)_DATA.*\\[[:space:]]*$/{:m;N;s/\\\n//;tm;d}' \
- -e '/^\(html\|pdf\)_DATA/d' || die
- fi
-
- # This is an old version of libtool
- # use the ./configure option to exclude its use, and
- # delete the dir since we don't need to eautoreconf it
- rm -r libltdl || die
-
- # Nuke the dead symlinks for the bindings
- sed -i -e '/$(pkgluadir)/d' tclpkg/gv/Makefile.am || die
-
- # replace the whitespace with tabs
- sed -i -e 's: :\t:g' doc/info/Makefile.am || die
-
- # use correct version of qmake. bug #567236
- sed -i -e "/AC_CHECK_PROGS(QMAKE/a AC_SUBST(QMAKE,$(qt5_get_bindir)/qmake)" configure.ac || die
-
- # workaround for http://www.graphviz.org/mantisbt/view.php?id=1895
- use elibc_FreeBSD && append-flags $(test-flags -fno-builtin-sincos)
-
- use java && append-cppflags $(java-pkg_get-jni-cflags)
-
- eautoreconf
-}
-
-src_configure() {
- local myconf=(
- --enable-ltdl
- --enable-gdk-pixbuf
- $(use_with cairo pangocairo)
- $(use_with devil)
- $(use_with gtk)
- $(use_with gts)
- $(use_with qt5 qt)
- $(use_with lasi)
- $(use_with pdf poppler)
- $(use_with postscript ghostscript)
- $(use_enable static-libs static)
- $(use_with svg rsvg)
- $(use_with X x)
- $(use_with X xaw)
- $(use_with X lefty)
- --with-digcola
- --with-fontconfig
- --with-freetype2
- --with-ipsepcola
- --with-libgd
- --with-sfdp
- --without-ming
- # new/experimental features, to be tested, disable for now
- --with-cgraph
- --without-glitz
- --without-ipsepcola
- --without-smyrna
- --without-visio
- # Bindings:
- $(use_enable guile)
- $(use_enable java)
- $(use_enable perl)
- $(use_enable python python2)
- $(use_enable python python3)
- $(use_enable ruby)
- $(use_enable tcl)
- --disable-go
- --disable-io
- --disable-lua
- --disable-ocaml
- --disable-php
- --disable-python
- --disable-r
- --disable-sharp
- # libtool file collision, bug #276609
- --without-included-ltdl
- --disable-ltdl-install
- )
- econf "${myconf[@]}"
-}
-
-src_install() {
- sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile || die
-
- emake DESTDIR="${D}" \
- txtdir="${EPREFIX}"/usr/share/doc/${PF} \
- htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
- htmlinfodir="${EPREFIX}"/usr/share/doc/${PF}/html/info \
- pdfdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \
- pkgconfigdir="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \
- install
-
- if ! use examples; then
- rm -rf "${ED}"/usr/share/graphviz/demo || die
- fi
-
- if ! use static-libs; then
- find "${ED}" -name '*.la' -delete || die
- fi
-
- einstalldocs
-
- use python && python_optimize \
- "${D}$(python_get_sitedir)" \
- "${D}/usr/$(get_libdir)/graphviz/python2" \
- "${D}/usr/$(get_libdir)/graphviz/python3"
-}
-
-pkg_postinst() {
- # This actually works if --enable-ltdl is passed
- # to configure
- dot -c || die
-}
-
-pkg_postrm() {
- # Remove cruft, bug #547344
- rm -rf "${EROOT}"/usr/$(get_libdir)/graphviz/config{,6} || die
-}
diff --git a/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild b/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
index cc8390a654b..e17e6e89118 100644
--- a/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
IUSE="+cairo devil doc examples 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/grub-splashes/grub-splashes-20091109.ebuild b/media-gfx/grub-splashes/grub-splashes-20091109.ebuild
index bfae4f9cf8e..f9e3edde5ce 100644
--- a/media-gfx/grub-splashes/grub-splashes-20091109.ebuild
+++ b/media-gfx/grub-splashes/grub-splashes-20091109.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest
index 407baff7ace..cd8523ffbd9 100644
--- a/media-gfx/gscan2pdf/Manifest
+++ b/media-gfx/gscan2pdf/Manifest
@@ -1,3 +1,3 @@
DIST gscan2pdf-1.8.11.tar.xz 409212 BLAKE2B 37cb716f13818eaffc39c210b810b845368cc5e323569e8f9d5603b5b412c4182520798321358e4c21339fdbd5f15026a0acd6421a49e7db79ecca86633c3ab0 SHA512 1ea09b8768771be4a1700cb8a6523d5f74fcbf0ebe459d97796032b56f896fd0c50e5ca1ed4c96aedef7e61f6952a92986153cc70173dd5ad91ccfb72461c565
-DIST gscan2pdf-2.8.1.tar.xz 476880 BLAKE2B c54e318fa00670f6b2f996791477fd61076abdfe57f2d924cad1fa9092a8796851c9ab503aabb7831ac374e390a19a821a5c7a8b996235deb7d7781b8b47f76c SHA512 2a9f52ce53030f2871d2430b6aab6b06bb1d4e2efbde25ad24196cfa99ad7b13342ff0f2827526020f5c12079e156bc430f891bdb6ffa9545a210bf1cba29be5
+DIST gscan2pdf-2.10.2.tar.xz 489484 BLAKE2B d699b471bcf701a83e87d982b7faebeac4a420083df35d875405483ea05fb4b28c9626c7b662629130801852a1602d6a90ea9627fdeebfd42ec25cf57a4e7835 SHA512 807af9af9c1451f761e1f64a0ebe132fc98252100202c0af0dea53210cd30bed5f4c293a8f5f52b03b493422053420c1506ca32a34515c90b7a5290837bc686a
DIST gscan2pdf-2.9.1.tar.xz 484740 BLAKE2B e75ac6a5296ba2f89838ae9c95dc0ceb592ea8ffaf8d89a0635043e07fedbdcf97df26ac810556da7d0e0306eb7aaff76dc18162c6a5f89cb1953bd623a594a3 SHA512 4fc3107c871a7915ebdc023476b1159c0fe03934f1a52a417a5bc285be46f7db0ed38ec4cf015b15953c728ef19d1f4f30207d418b655c950bfb64ddc5d23237
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.8.1.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.10.2.ebuild
index f383412678c..412081e98a7 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-2.8.1.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-2.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -25,13 +25,15 @@ RDEPEND="
dev-perl/glib-perl
dev-perl/GooCanvas2
dev-perl/Gtk3
+ dev-perl/Gtk3-ImageView
dev-perl/Gtk3-SimpleList
dev-perl/HTML-Parser
dev-perl/Image-Sane
dev-perl/List-MoreUtils
+ dev-perl/Locale-Codes
dev-perl/Locale-gettext
dev-perl/Log-Log4perl
- dev-perl/PDF-API2
+ dev-perl/PDF-Builder
dev-perl/Proc-ProcessTable
dev-perl/Readonly
dev-perl/Set-IntSpan
@@ -50,14 +52,15 @@ RDEPEND="
BDEPEND="
test? (
${RDEPEND}
+ dev-perl/IPC-System-Simple
dev-perl/Sub-Override
media-libs/fontconfig
- app-text/djvu[tiff]
+ app-text/djvu[jpeg,tiff]
app-text/poppler[utils]
- app-text/tesseract[-opencl,osd(+),tiff]
+ app-text/tesseract[-opencl,osd(+),png,tiff]
app-text/unpaper
- media-gfx/imagemagick[djvu,png,tiff,perl,postscript]
+ media-gfx/imagemagick[djvu,jpeg,png,tiff,perl,postscript]
media-gfx/sane-backends[sane_backends_test]
media-gfx/sane-frontends
)"
@@ -73,7 +76,7 @@ pkg_postinst() {
optfeature "encrypting PDFs" app-text/pdftk
optfeature "creating PostScript files from PDFs" app-text/poppler[utils]
optfeature "adding to an existing PDF" app-text/poppler[utils]
- optfeature "Optical Character Recognition" app-text/tesseract[osd,tiff]
+ optfeature "Optical Character Recognition" app-text/tesseract[tiff]
optfeature "scan post-processing" app-text/unpaper
optfeature "automatic document feeder support" media-gfx/sane-frontends
optfeature "sending PDFs as email attachments" x11-misc/xdg-utils
@@ -88,7 +91,9 @@ src_test() {
echo " $(best_version app-text/djvu)"
echo " $(best_version app-text/poppler)"
echo " $(best_version app-text/tesseract)"
+ echo " $(best_version dev-perl/Gtk3-ImageView)"
echo " $(best_version dev-perl/Image-Sane)"
+ echo " $(best_version dev-perl/PDF-Builder)"
echo " $(best_version media-gfx/imagemagick)"
echo " $(best_version media-gfx/sane-backends)"
echo " $(best_version media-libs/tiff)"
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index 9ebf6b38ec4..ad4f326204f 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -1 +1 @@
-DIST gthumb-3.10.0.tar.xz 7550040 BLAKE2B 183ffa4c567728375c34a3f84c72d44f266a893fa8d4be7b8270faa2a120bf2e6c61d5e35494aa5e4d4e14366017adbb020f7a3dc8c51b6f012e8f18cee1a72f SHA512 d7bcac6b260bf7d5816af69ea89953517cbc43ea289227ccceebd0700b753a7d97349e6a30ec6bbb42690c56abff5b69dc3fc073f1ee2831ae1aa7d220722efd
+DIST gthumb-3.10.2.tar.xz 7582448 BLAKE2B 29c6e74706e0f78c4a641841861f9e4d996c5baa7e9a26e12352e6c124402bad24af1ee45871f413de4935abe53109ffad484ed8d853c131cfa438714e4226b5 SHA512 3b4d23a744e0663a0358d41697b1b01ec2faa3f12fc29853c82de8109dec5ef66c3827ed6e0efb97147e34ab9643b42daedc3ee7babe03f486ba589323604b74
diff --git a/media-gfx/gthumb/gthumb-3.10.0.ebuild b/media-gfx/gthumb/gthumb-3.10.2.ebuild
index a7ddac9f803..aae8425356f 100644
--- a/media-gfx/gthumb/gthumb-3.10.0.ebuild
+++ b/media-gfx/gthumb/gthumb-3.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 424227ceba5..d7d176549e2 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1 +1 @@
-DIST hugin-2019.2.0.tar.bz2 10335030 BLAKE2B 4fbcb974eea01dbd8d722f64b5cadfd1b3fe101e5e7849d069c531e55e1ea71c226bcb1550b59374bbe8adf111b7c0bc5e48c14f45bdb685486cbeccde5add70 SHA512 2ddfe7468a474c385ef66a88c3a5a2491183765ae431e5044f504d2e95ec3cb99c0b97b98dda282ba7950f6f2001f46b2f2ea39b9025718c2a329dea967685c1
+DIST hugin-2020.0.0.tar.bz2 10371301 BLAKE2B f5092dfe3c61344f8b03e14dd85903ae6f5170989b6824578bd3350408d7a11be2c2f9cd83d030a3967b81e4125cf97af075d79136a93e06de3fac8901859c6d SHA512 4c55767c630ea03faf359bda606e5e9e7709a47ab41e821772da8c6da0cf658b1d31d7d8e96ea1c41ec61bdeb2da8c86c92b5d6964a9301732a13137178ec04e
diff --git a/media-gfx/hugin/hugin-2019.2.0.ebuild b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
index 0981ba7e2ee..8a8381d740e 100644
--- a/media-gfx/hugin/hugin-2019.2.0.ebuild
+++ b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
@@ -1,19 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python3_{6,7,8} )
+WX_GTK_VER="3.0-gtk3"
+PYTHON_COMPAT=( python3_{7,8} )
-inherit python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
+inherit python-single-r1 wxwidgets cmake xdg
DESCRIPTION="GUI for the creation & processing of panoramic images"
HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
SLOT="0"
@@ -42,7 +39,7 @@ CDEPEND="
virtual/glu
virtual/jpeg:0
virtual/opengl
- x11-libs/wxGTK:3.0=[X,opengl]
+ x11-libs/wxGTK:${WX_GTK_VER}=[X,opengl]
lapack? ( virtual/blas virtual/lapack )
python? ( ${PYTHON_DEPS} )
sift? ( media-gfx/autopano-sift-C )"
@@ -71,7 +68,7 @@ src_prepare() {
-e "/COMMAND.*GZIP/d" \
-e "s/\.gz//g" \
"${S}"/doc/CMakeLists.txt || die
- cmake-utils_src_prepare
+ cmake_src_prepare
}
src_configure() {
@@ -79,17 +76,13 @@ src_configure() {
-DBUILD_HSI=$(usex python)
-DENABLE_LAPACK=$(usex lapack)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
use python && python_optimize
- mkdir -p "${ED}"/usr/share/metainfo || die
- mv "${ED}"/usr/share/appdata/* "${ED}"/usr/share/metainfo/ || die
- rmdir "${ED}"/usr/share/appdata || die
-
local lang
for lang in ${LANGS} ; do
case ${lang} in
@@ -99,7 +92,7 @@ src_install() {
*) dir=${lang/-/_};;
esac
if ! use l10n_${lang} ; then
- rm -r "${ED%/}"/usr/share/locale/${dir} || die
+ rm -r "${ED}"/usr/share/locale/${dir} || die
fi
done
}
diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild
index 34db3dfeb05..b55ba425e71 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+WX_GTK_VER="3.0-gtk3"
+PYTHON_COMPAT=( python3_{7,8} )
-inherit mercurial python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
+inherit mercurial python-single-r1 wxwidgets cmake xdg
DESCRIPTION="GUI for the creation & processing of panoramic images"
HOMEPAGE="http://hugin.sf.net"
@@ -19,7 +19,7 @@ SLOT="0"
KEYWORDS=""
LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW"
-IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
+IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
CDEPEND="
!!dev-util/cocom
@@ -41,12 +41,13 @@ CDEPEND="
virtual/glu
virtual/jpeg:0
virtual/opengl
- x11-libs/wxGTK:3.0=[X,opengl]
+ x11-libs/wxGTK:${WX_GTK_VER}=[X,opengl]
lapack? ( virtual/blas virtual/lapack )
python? ( ${PYTHON_DEPS} )
sift? ( media-gfx/autopano-sift-C )"
RDEPEND="${CDEPEND}
- media-libs/exiftool"
+ media-libs/exiftool
+ raw? ( media-gfx/dcraw )"
DEPEND="${CDEPEND}
dev-cpp/tclap
sys-devel/gettext
@@ -65,7 +66,7 @@ pkg_setup() {
}
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
}
src_configure() {
@@ -73,17 +74,13 @@ src_configure() {
-DBUILD_HSI=$(usex python)
-DENABLE_LAPACK=$(usex lapack)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
use python && python_optimize
- mkdir -p "${ED}"/usr/share/metainfo || die
- mv "${ED}"/usr/share/appdata/* "${ED}"/usr/share/metainfo/ || die
- rmdir "${ED}"/usr/share/appdata || die
-
local lang
for lang in ${LANGS} ; do
case ${lang} in
@@ -93,7 +90,7 @@ src_install() {
*) dir=${lang/-/_};;
esac
if ! use l10n_${lang} ; then
- rm -r "${ED%/}"/usr/share/locale/${dir} || die
+ rm -r "${ED}"/usr/share/locale/${dir} || die
fi
done
}
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 9334c59d7a6..a8e47c6dc94 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,4 +1,7 @@
-DIST ImageMagick-6.9.11-35.tar.xz 9214584 BLAKE2B a482a8134b321395437178bcc25963931738f73925698c860f6d7088fe1ed79917d6e7d4a4da3b5fe71aeb29695901341fdc20336f68e64ae63bba1bd5ef9ce2 SHA512 3d04e1add469486b6c9d1e562f7623bed516a64e797abd3113c34937723333550f52245f89395da7126f656a58c0c2d3516cec14abe0a3d6ab2a75a1ccde1645
-DIST ImageMagick-6.9.11-41.tar.xz 9163764 BLAKE2B 943dbed16e096adb88ac81c9fb50190bb9bbfd4fda24145b49bb147034f2b69403ed17c61a5edf52d28f22c4d729d4704ad10084f395b8d6890e87c800cc5486 SHA512 7331885b5dc0b1048e961e9c357fbfc0eabb71c265387842eb42530b0f02210d017f7e0536602780f294f48c6077932abd7d10322584da9b392a7a18e7460cc9
-DIST ImageMagick-7.0.10-35.tar.xz 9656888 BLAKE2B 3b1da9c2a6118cd4885eeaa366f2fbcda1a16a9a81025b810431262510ec70d2397512e3b1a5eedf95a3a29bebdff16399b2cb308a0da67b512472c86a6505ca SHA512 340395496b1d41f52ffd6c5928d9426edbc3e79aa1d3ad38b41eac361b6291a2ede3d3997ced61500fd34a32b74f774e7335e6d13de0b7c5e70d7039ec95887c
-DIST ImageMagick-7.0.10-41.tar.xz 9645036 BLAKE2B 3e90fc739cc271a20be49e1cf7b2a637e1b3916ae2934d7874f28339039ce5c331c35eb8863ef6144270586afd85ac9475a0603d64b9a8189a9f06de6f47f42e SHA512 62439bcc7a2447593bedf165c2c05e67e27d672823523d611439fa2dc288e948772389772dcf1f8633ca7dbf38b514cf5fc3bfb5fb3d61e2efdd38fe7a2ad040
+DIST ImageMagick-6.9.11-61.tar.xz 9171260 BLAKE2B 89047378e414a7455baa28d413f49dfce3eb54e462211ba5e61f786111c569b26166217ca7e9f5e12c0602bde64c8e9726a67ee3c6be4366d692c2b6232dbbbf SHA512 742fb0b3ff4da98ff05a7fd48b1c5db038bf276975575c4e549f30d61001384c6b508cff526f621467d38a29a9cf015f0cc8c42801720f1b47d6737afb4bac78
+DIST ImageMagick-6.9.11-62.tar.xz 9172472 BLAKE2B 4be79ca6024f6d8e12fe492e6a541dfc4c6b70bf33dcfa8b3d2bb4d9a774a39bb974683e7444c47ee82349ae21e05fba458bcc45b71656f55084c9354ef7ddf6 SHA512 92987953b01c8ecdc3be0b78ee7bdc9e50e0a581f9682f283fcc2345a66ab2b75d678e2b989f90bcaf6eba95581b6234cb86ae33ee44faf6090760e72f838232
+DIST ImageMagick-6.9.12-2.tar.xz 9168640 BLAKE2B b0ce3b8ac5ff27f6d6fd0995d0f214f791fdce6c881e6b58579aaa22a7e87ca8d441185f69ba9d50a9aea501f28f06564ac76f7d1d5b1760206eeaf17560a8a7 SHA512 105d11d23457050c9f94223d524230ab62cdf457fe17630179c92f53a6bb60b8c04fa0f60f388303a90e2106aea6e0f1863a9a49a8fdfefd5d15d13eca58a770
+DIST ImageMagick-7.0.10-61.tar.xz 10143308 BLAKE2B bc343b72567d326f30825637366e5d5614e8d53e5222fce357acf0acc9aceae84fe99d67bc7ff2d593e754b990d1e8449785a04724437b61a35e9282f9af799b SHA512 f90d8847fed7f1a5ca3fa247eb1ea115d6afe6fe379fb48733c539456663ca89426336f7ef8be087c1caa0eeafc7d63285f3c35c400fa94b30459796650421c3
+DIST ImageMagick-7.0.11-0.tar.xz 10147348 BLAKE2B 7237808a9352fd1e5988b3b91245335202e78576beb1ed07362adee4320e27ad2253dc4e2f0afe5a5510a17210488a60d2a6920634475908c75823986ca9ed03 SHA512 484a1f53c0d49359fc41d681ddb3fe5bcd0fa8a9b89db1f6f19df5cba0596ab1d8c035d6e7e8d000370ebdd040c6a50ca3d867cf6e50ac29c03471bc34bb4e0e
+DIST ImageMagick-7.0.11-1.tar.xz 10145440 BLAKE2B 24d4e455825b631db2d8e5c1dac8a4fe3ea2e5432db649cbc71b1486c497a6041e639bb185a4bff5393cecb762de42074fbe480e29b75d52e2fd143b27360cdd SHA512 046d6008f93506b98c064c87b81fee3e1b7bfd02f5aceb84eb01419b3e13ef8d75be9cdbbf2511247c9382f709a93c4ede53befd7a5c4f6e86d4a307cb838cc4
+DIST ImageMagick-7.0.11-2.tar.xz 10145568 BLAKE2B 2edc25dfeda99fee1d4fec4a90fcd48b350c93317082239b243874b0394cefe154ca7553fb1d688971c5352d896ff6327f31ca708a2000427601c53d0ce5c7ea SHA512 29ddf675bde3165d86f786eebfe8443cb4205d6218cb3cfa78be26d18fb30ad13913db32124377030c283156f4aa81cc28acef5cd7c1a873a66d5f563e5152ac
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.35.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.61-r1.ebuild
index 45ebf61e641..923c0a8e841 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.11.35.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.61-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -13,9 +13,9 @@ 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"
+SLOT="0/6.9.11-60"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
REQUIRED_USE="corefonts? ( truetype )
test? ( corefonts )"
@@ -206,7 +206,7 @@ src_install() {
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
+ find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
if use opencl; then
cat <<-EOF > "${T}"/99${PN}
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.41-r1.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.62.ebuild
index 671132b9e8f..7ff90f249df 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.11.41-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.62.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -13,9 +13,9 @@ HOMEPAGE="https://www.imagemagick.org/"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
LICENSE="imagemagick"
-SLOT="0/6.9.11-37"
-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"
+SLOT="0/6.9.11-60"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
REQUIRED_USE="corefonts? ( truetype )
test? ( corefonts )"
@@ -206,7 +206,7 @@ src_install() {
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
+ find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
if use opencl; then
cat <<-EOF > "${T}"/99${PN}
diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.2.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.2.ebuild
new file mode 100644
index 00000000000..7ff90f249df
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.2.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
+
+MY_PV="$(ver_rs 3 '-')"
+MY_P="ImageMagick-${MY_PV}"
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+SLOT="0/6.9.11-60"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+REQUIRED_USE="corefonts? ( truetype )
+ test? ( corefonts )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-libs/libltdl:0
+ bzip2? ( app-arch/bzip2 )
+ corefonts? ( media-fonts/corefonts )
+ djvu? ( app-text/djvu )
+ fftw? ( sci-libs/fftw:3.0 )
+ fontconfig? ( media-libs/fontconfig )
+ fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+ graphviz? ( media-gfx/graphviz )
+ heif? ( media-libs/libheif:= )
+ jbig? ( >=media-libs/jbigkit-2:= )
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+ lcms? ( media-libs/lcms:2= )
+ lqr? ( media-libs/liblqr )
+ opencl? ( virtual/opencl )
+ openexr? ( media-libs/openexr:0= )
+ pango? ( x11-libs/pango )
+ perl? ( >=dev-lang/perl-5.8.8:0= )
+ png? ( media-libs/libpng:0= )
+ postscript? ( app-text/ghostscript-gpl )
+ raw? ( media-libs/libraw:= )
+ svg? (
+ gnome-base/librsvg
+ media-gfx/potrace
+ )
+ tiff? ( media-libs/tiff:0= )
+ truetype? (
+ media-fonts/urw-fonts
+ >=media-libs/freetype-2
+ )
+ webp? ( media-libs/libwebp:0= )
+ wmf? ( media-libs/libwmf )
+ X? (
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libXext
+ x11-libs/libXt
+ )
+ xml? ( dev-libs/libxml2:= )
+ lzma? ( app-arch/xz-utils )
+ zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+ !media-gfx/graphicsmagick[imagemagick]
+ virtual/pkgconfig
+ X? ( x11-base/xorg-proto )"
+
+S="${WORKDIR}/${MY_P}"
+#S="${WORKDIR}/ImageMagick6-${MY_PV}"
+
+src_prepare() {
+ default
+
+ # Apply hardening #664236
+ cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+ sed -i -e '/^<policymap>$/ {
+ r policy-hardening.snippet
+ d
+ }' \
+ config/policy.xml || \
+ die "Failed to apply hardening of policy.xml"
+ einfo "policy.xml hardened"
+
+ elibtoolize # for Darwin modules
+
+ # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+ local mesa_cards ati_cards nvidia_cards render_cards
+ shopt -s nullglob
+ ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+ if test -n "${ati_cards}"; then
+ addpredict "${ati_cards}"
+ fi
+ mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+ if test -n "${mesa_cards}"; then
+ addpredict "${mesa_cards}"
+ fi
+ nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
+ if test -n "${nvidia_cards}"; then
+ addpredict "${nvidia_cards}"
+ fi
+ render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+ if test -n "${render_cards}"; then
+ addpredict "${render_cards}"
+ fi
+ shopt -u nullglob
+ addpredict /dev/nvidiactl
+}
+
+src_configure() {
+ local depth=16
+ use q8 && depth=8
+ use q32 && depth=32
+
+ local openmp=disable
+ use openmp && { tc-has-openmp && openmp=enable; }
+
+ use perl && perl_check_env
+
+ [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+ local myeconfargs=(
+ $(use_enable static-libs static)
+ $(use_enable hdri)
+ $(use_enable opencl)
+ --with-threads
+ --with-modules
+ --with-quantum-depth=${depth}
+ $(use_with cxx magick-plus-plus)
+ $(use_with perl)
+ --with-perl-options='INSTALLDIRS=vendor'
+ --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+ $(use_with bzip2 bzlib)
+ $(use_with X x)
+ $(use_with zlib)
+ --without-autotrace
+ $(use_with postscript dps)
+ $(use_with djvu)
+ --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+ $(use_with fftw)
+ $(use_with fpx)
+ $(use_with fontconfig)
+ $(use_with truetype freetype)
+ $(use_with postscript gslib)
+ $(use_with graphviz gvc)
+ $(use_with heif heic)
+ $(use_with jbig)
+ $(use_with jpeg)
+ $(use_with jpeg2k openjp2)
+ $(use_with lcms)
+ $(use_with lqr)
+ $(use_with lzma)
+ $(use_with openexr)
+ $(use_with pango)
+ $(use_with png)
+ $(use_with raw)
+ $(use_with svg rsvg)
+ $(use_with tiff)
+ $(use_with webp)
+ $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+ $(use_with wmf)
+ $(use_with xml)
+ --${openmp}-openmp
+ --with-gcc-arch=no-automagic
+ )
+ CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+ # Install default (unrestricted) policy in $HOME for test suite #664238
+ local _im_local_config_home="${HOME}/.config/ImageMagick"
+ mkdir -p "${_im_local_config_home}" || \
+ die "Failed to create IM config dir in '${_im_local_config_home}'"
+ cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+ die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+ local im_command= IM_COMMANDS=()
+ IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+ IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
+ IM_COMMANDS+=( "emake check" ) # Run tests
+
+ for im_command in "${IM_COMMANDS[@]}"; do
+ eval "${S}"/magick.sh \
+ ${im_command} || \
+ die "Failed to run \"${im_command}\""
+ done
+}
+
+src_install() {
+ # Ensure documentation installation files and paths with each release!
+ emake \
+ DESTDIR="${D}" \
+ DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+ install
+
+ rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+ dodoc {AUTHORS,README}.txt ChangeLog
+
+ if use perl; then
+ find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+ find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+ fi
+
+ find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+ # .la files in parent are not needed, keep plugin .la files
+ find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
+
+ if use opencl; then
+ cat <<-EOF > "${T}"/99${PN}
+ SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
+ EOF
+
+ insinto /etc/sandbox.d
+ doins "${T}"/99${PN} #472766
+ fi
+
+ insinto /usr/share/${PN}
+ doins config/*icm
+}
+
+pkg_postinst() {
+ local _show_policy_xml_notice=
+
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ # This is a new installation
+ _show_policy_xml_notice=yes
+ else
+ local v
+ for v in ${REPLACING_VERSIONS}; do
+ if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
+ # This is an upgrade
+ _show_policy_xml_notice=yes
+
+ # Show this elog only once
+ break
+ fi
+ done
+ fi
+
+ if [[ -n "${_show_policy_xml_notice}" ]]; then
+ elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
+ elog "which will prevent the usage of the following coders by default:"
+ elog ""
+ elog " - PS"
+ elog " - PS2"
+ elog " - PS3"
+ elog " - EPS"
+ elog " - PDF"
+ elog " - XPS"
+ fi
+}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.35.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.61-r1.ebuild
index 9407d6f5b2d..2f9f0b5033d 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.10.35.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.61-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -13,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 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A collection of tools and libraries for many image formats"
HOMEPAGE="https://www.imagemagick.org/"
LICENSE="imagemagick"
-SLOT="0/7.0.10"
-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-60"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
RESTRICT="!test? ( test )"
REQUIRED_USE="corefonts? ( truetype )
@@ -220,7 +220,7 @@ src_install() {
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
+ find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
if use opencl; then
cat <<-EOF > "${T}"/99${PN}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.41-r1.ebuild b/media-gfx/imagemagick/imagemagick-7.0.11.0.ebuild
index c476290b8c6..5256a3f29d2 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.10.41-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -13,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 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A collection of tools and libraries for many image formats"
HOMEPAGE="https://www.imagemagick.org/"
LICENSE="imagemagick"
-SLOT="0/7.0.10-37"
-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.11-0"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
RESTRICT="!test? ( test )"
REQUIRED_USE="corefonts? ( truetype )
@@ -220,7 +220,7 @@ src_install() {
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
+ find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
if use opencl; then
cat <<-EOF > "${T}"/99${PN}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.11.1.ebuild b/media-gfx/imagemagick/imagemagick-7.0.11.1.ebuild
new file mode 100644
index 00000000000..5256a3f29d2
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.11.1.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
+ inherit git-r3
+ MY_P="imagemagick-9999"
+else
+ MY_PV="$(ver_rs 3 '-')"
+ MY_P="ImageMagick-${MY_PV}"
+ SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+SLOT="0/7.0.11-0"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="corefonts? ( truetype )
+ svg? ( xml )
+ test? ( corefonts )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="
+ dev-libs/libltdl:0
+ bzip2? ( app-arch/bzip2 )
+ corefonts? ( media-fonts/corefonts )
+ djvu? ( app-text/djvu )
+ fftw? ( sci-libs/fftw:3.0 )
+ fontconfig? ( media-libs/fontconfig )
+ fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+ graphviz? ( media-gfx/graphviz )
+ heif? ( media-libs/libheif:= )
+ jbig? ( >=media-libs/jbigkit-2:= )
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+ lcms? ( media-libs/lcms:2= )
+ lqr? ( media-libs/liblqr )
+ opencl? ( virtual/opencl )
+ openexr? ( media-libs/openexr:0= )
+ pango? ( x11-libs/pango )
+ perl? ( >=dev-lang/perl-5.8.8:0= )
+ png? ( media-libs/libpng:0= )
+ postscript? ( app-text/ghostscript-gpl )
+ raw? ( media-libs/libraw:= )
+ svg? (
+ gnome-base/librsvg
+ media-gfx/potrace
+ )
+ tiff? ( media-libs/tiff:0= )
+ truetype? (
+ media-fonts/urw-fonts
+ >=media-libs/freetype-2
+ )
+ webp? ( media-libs/libwebp:0= )
+ wmf? ( media-libs/libwmf )
+ X? (
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libXext
+ x11-libs/libXt
+ )
+ xml? ( dev-libs/libxml2:= )
+ lzma? ( app-arch/xz-utils )
+ zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+ !media-gfx/graphicsmagick[imagemagick]
+ X? ( x11-base/xorg-proto )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+
+ # Apply hardening #664236
+ cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+ sed -i -e '/^<policymap>$/ {
+ r policy-hardening.snippet
+ d
+ }' \
+ config/policy.xml || \
+ die "Failed to apply hardening of policy.xml"
+ einfo "policy.xml hardened"
+
+ elibtoolize # for Darwin modules
+
+ # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+ local ati_cards mesa_cards nvidia_cards render_cards
+ shopt -s nullglob
+ ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+ if test -n "${ati_cards}"; then
+ addpredict "${ati_cards}"
+ fi
+ mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+ if test -n "${mesa_cards}"; then
+ addpredict "${mesa_cards}"
+ fi
+ nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+ if test -n "${nvidia_cards}"; then
+ addpredict "${nvidia_cards}"
+ fi
+ render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+ if test -n "${render_cards}"; then
+ addpredict "${render_cards}"
+ fi
+ shopt -u nullglob
+ addpredict /dev/nvidiactl
+}
+
+src_configure() {
+ local depth=16
+ use q8 && depth=8
+ use q32 && depth=32
+
+ local openmp=disable
+ use openmp && { tc-has-openmp && openmp=enable; }
+
+ use perl && perl_check_env
+
+ [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+ local myeconfargs=(
+ $(use_enable static-libs static)
+ $(use_enable hdri)
+ $(use_enable opencl)
+ --with-threads
+ --with-modules
+ --with-quantum-depth=${depth}
+ $(use_with cxx magick-plus-plus)
+ $(use_with perl)
+ --with-perl-options='INSTALLDIRS=vendor'
+ --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+ $(use_with bzip2 bzlib)
+ $(use_with X x)
+ $(use_with zlib)
+ --without-autotrace
+ $(use_with postscript dps)
+ $(use_with djvu)
+ --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+ $(use_with fftw)
+ $(use_with fpx)
+ $(use_with fontconfig)
+ $(use_with truetype freetype)
+ $(use_with postscript gslib)
+ $(use_with graphviz gvc)
+ $(use_with heif heic)
+ $(use_with jbig)
+ $(use_with jpeg)
+ $(use_with jpeg2k openjp2)
+ --without-jxl
+ $(use_with lcms)
+ $(use_with lqr)
+ $(use_with lzma)
+ $(use_with openexr)
+ $(use_with pango)
+ $(use_with png)
+ $(use_with raw)
+ $(use_with svg rsvg)
+ $(use_with tiff)
+ $(use_with webp)
+ $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+ $(use_with wmf)
+ $(use_with xml)
+ --${openmp}-openmp
+ --with-gcc-arch=no-automagic
+ )
+ CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+ # Install default (unrestricted) policy in $HOME for test suite #664238
+ local _im_local_config_home="${HOME}/.config/ImageMagick"
+ mkdir -p "${_im_local_config_home}" || \
+ die "Failed to create IM config dir in '${_im_local_config_home}'"
+ cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+ die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+ local im_command= IM_COMMANDS=()
+ if [[ ${PV} == "9999" ]] ; then
+ IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
+ else
+ IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+ fi
+ IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
+ IM_COMMANDS+=( "emake check" ) # Run tests
+
+ for im_command in "${IM_COMMANDS[@]}"; do
+ eval "${S}"/magick.sh \
+ ${im_command} || \
+ die "Failed to run \"${im_command}\""
+ done
+}
+
+src_install() {
+ # Ensure documentation installation files and paths with each release!
+ emake \
+ DESTDIR="${D}" \
+ DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+ install
+
+ rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+ dodoc {AUTHORS,README}.txt ChangeLog
+
+ if use perl; then
+ find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+ find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+ fi
+
+ find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+ # .la files in parent are not needed, keep plugin .la files
+ find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
+
+ if use opencl; then
+ cat <<-EOF > "${T}"/99${PN}
+ SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
+ EOF
+
+ insinto /etc/sandbox.d
+ doins "${T}"/99${PN} #472766
+ fi
+
+ insinto /usr/share/${PN}
+ doins config/*icm
+}
+
+pkg_postinst() {
+ local _show_policy_xml_notice=
+
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ # This is a new installation
+ _show_policy_xml_notice=yes
+ else
+ local v
+ for v in ${REPLACING_VERSIONS}; do
+ if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
+ # This is an upgrade
+ _show_policy_xml_notice=yes
+
+ # Show this elog only once
+ break
+ fi
+ done
+ fi
+
+ if [[ -n "${_show_policy_xml_notice}" ]]; then
+ elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
+ elog "which will prevent the usage of the following coders by default:"
+ elog ""
+ elog " - PS"
+ elog " - PS2"
+ elog " - PS3"
+ elog " - EPS"
+ elog " - PDF"
+ elog " - XPS"
+ fi
+}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.11.2.ebuild b/media-gfx/imagemagick/imagemagick-7.0.11.2.ebuild
new file mode 100644
index 00000000000..5256a3f29d2
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.11.2.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
+ inherit git-r3
+ MY_P="imagemagick-9999"
+else
+ MY_PV="$(ver_rs 3 '-')"
+ MY_P="ImageMagick-${MY_PV}"
+ SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+SLOT="0/7.0.11-0"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="corefonts? ( truetype )
+ svg? ( xml )
+ test? ( corefonts )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="
+ dev-libs/libltdl:0
+ bzip2? ( app-arch/bzip2 )
+ corefonts? ( media-fonts/corefonts )
+ djvu? ( app-text/djvu )
+ fftw? ( sci-libs/fftw:3.0 )
+ fontconfig? ( media-libs/fontconfig )
+ fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+ graphviz? ( media-gfx/graphviz )
+ heif? ( media-libs/libheif:= )
+ jbig? ( >=media-libs/jbigkit-2:= )
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+ lcms? ( media-libs/lcms:2= )
+ lqr? ( media-libs/liblqr )
+ opencl? ( virtual/opencl )
+ openexr? ( media-libs/openexr:0= )
+ pango? ( x11-libs/pango )
+ perl? ( >=dev-lang/perl-5.8.8:0= )
+ png? ( media-libs/libpng:0= )
+ postscript? ( app-text/ghostscript-gpl )
+ raw? ( media-libs/libraw:= )
+ svg? (
+ gnome-base/librsvg
+ media-gfx/potrace
+ )
+ tiff? ( media-libs/tiff:0= )
+ truetype? (
+ media-fonts/urw-fonts
+ >=media-libs/freetype-2
+ )
+ webp? ( media-libs/libwebp:0= )
+ wmf? ( media-libs/libwmf )
+ X? (
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libXext
+ x11-libs/libXt
+ )
+ xml? ( dev-libs/libxml2:= )
+ lzma? ( app-arch/xz-utils )
+ zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+ !media-gfx/graphicsmagick[imagemagick]
+ X? ( x11-base/xorg-proto )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+
+ # Apply hardening #664236
+ cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+ sed -i -e '/^<policymap>$/ {
+ r policy-hardening.snippet
+ d
+ }' \
+ config/policy.xml || \
+ die "Failed to apply hardening of policy.xml"
+ einfo "policy.xml hardened"
+
+ elibtoolize # for Darwin modules
+
+ # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+ local ati_cards mesa_cards nvidia_cards render_cards
+ shopt -s nullglob
+ ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+ if test -n "${ati_cards}"; then
+ addpredict "${ati_cards}"
+ fi
+ mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+ if test -n "${mesa_cards}"; then
+ addpredict "${mesa_cards}"
+ fi
+ nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+ if test -n "${nvidia_cards}"; then
+ addpredict "${nvidia_cards}"
+ fi
+ render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+ if test -n "${render_cards}"; then
+ addpredict "${render_cards}"
+ fi
+ shopt -u nullglob
+ addpredict /dev/nvidiactl
+}
+
+src_configure() {
+ local depth=16
+ use q8 && depth=8
+ use q32 && depth=32
+
+ local openmp=disable
+ use openmp && { tc-has-openmp && openmp=enable; }
+
+ use perl && perl_check_env
+
+ [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+ local myeconfargs=(
+ $(use_enable static-libs static)
+ $(use_enable hdri)
+ $(use_enable opencl)
+ --with-threads
+ --with-modules
+ --with-quantum-depth=${depth}
+ $(use_with cxx magick-plus-plus)
+ $(use_with perl)
+ --with-perl-options='INSTALLDIRS=vendor'
+ --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+ $(use_with bzip2 bzlib)
+ $(use_with X x)
+ $(use_with zlib)
+ --without-autotrace
+ $(use_with postscript dps)
+ $(use_with djvu)
+ --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+ $(use_with fftw)
+ $(use_with fpx)
+ $(use_with fontconfig)
+ $(use_with truetype freetype)
+ $(use_with postscript gslib)
+ $(use_with graphviz gvc)
+ $(use_with heif heic)
+ $(use_with jbig)
+ $(use_with jpeg)
+ $(use_with jpeg2k openjp2)
+ --without-jxl
+ $(use_with lcms)
+ $(use_with lqr)
+ $(use_with lzma)
+ $(use_with openexr)
+ $(use_with pango)
+ $(use_with png)
+ $(use_with raw)
+ $(use_with svg rsvg)
+ $(use_with tiff)
+ $(use_with webp)
+ $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+ $(use_with wmf)
+ $(use_with xml)
+ --${openmp}-openmp
+ --with-gcc-arch=no-automagic
+ )
+ CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+ # Install default (unrestricted) policy in $HOME for test suite #664238
+ local _im_local_config_home="${HOME}/.config/ImageMagick"
+ mkdir -p "${_im_local_config_home}" || \
+ die "Failed to create IM config dir in '${_im_local_config_home}'"
+ cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+ die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+ local im_command= IM_COMMANDS=()
+ if [[ ${PV} == "9999" ]] ; then
+ IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
+ else
+ IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+ fi
+ IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
+ IM_COMMANDS+=( "emake check" ) # Run tests
+
+ for im_command in "${IM_COMMANDS[@]}"; do
+ eval "${S}"/magick.sh \
+ ${im_command} || \
+ die "Failed to run \"${im_command}\""
+ done
+}
+
+src_install() {
+ # Ensure documentation installation files and paths with each release!
+ emake \
+ DESTDIR="${D}" \
+ DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+ install
+
+ rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+ dodoc {AUTHORS,README}.txt ChangeLog
+
+ if use perl; then
+ find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+ find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+ fi
+
+ find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+ # .la files in parent are not needed, keep plugin .la files
+ find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
+
+ if use opencl; then
+ cat <<-EOF > "${T}"/99${PN}
+ SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
+ EOF
+
+ insinto /etc/sandbox.d
+ doins "${T}"/99${PN} #472766
+ fi
+
+ insinto /usr/share/${PN}
+ doins config/*icm
+}
+
+pkg_postinst() {
+ local _show_policy_xml_notice=
+
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ # This is a new installation
+ _show_policy_xml_notice=yes
+ else
+ local v
+ for v in ${REPLACING_VERSIONS}; do
+ if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
+ # This is an upgrade
+ _show_policy_xml_notice=yes
+
+ # Show this elog only once
+ break
+ fi
+ done
+ fi
+
+ if [[ -n "${_show_policy_xml_notice}" ]]; then
+ elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
+ elog "which will prevent the usage of the following coders by default:"
+ elog ""
+ elog " - PS"
+ elog " - PS2"
+ elog " - PS3"
+ elog " - EPS"
+ elog " - PDF"
+ elog " - XPS"
+ fi
+}
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild
index 542b188a282..5256a3f29d2 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -13,15 +13,15 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A collection of tools and libraries for many image formats"
HOMEPAGE="https://www.imagemagick.org/"
LICENSE="imagemagick"
-SLOT="0/7.0.10"
-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.11-0"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
RESTRICT="!test? ( test )"
REQUIRED_USE="corefonts? ( truetype )
@@ -220,7 +220,7 @@ src_install() {
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
+ find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
if use opencl; then
cat <<-EOF > "${T}"/99${PN}
diff --git a/media-gfx/imagemagick/metadata.xml b/media-gfx/imagemagick/metadata.xml
index 03046b7fbb4..b8cb95f4c2a 100644
--- a/media-gfx/imagemagick/metadata.xml
+++ b/media-gfx/imagemagick/metadata.xml
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <maintainer type="project">
+ <email>codec@gentoo.org</email>
+ <name>Gentoo Codec Project</name>
+ </maintainer>
<maintainer type="person">
<email>dilfridge@gentoo.org</email>
<name>Andreas K. Huettel</name>
diff --git a/media-gfx/imageworsener/Manifest b/media-gfx/imageworsener/Manifest
index 797a55e5dc7..b23e4fa6b63 100644
--- a/media-gfx/imageworsener/Manifest
+++ b/media-gfx/imageworsener/Manifest
@@ -1,2 +1 @@
-DIST imageworsener-1.3.2.tar.gz 661710 BLAKE2B ac79b9d883be34b93e935dc813e6f1edb4806203a20d1f7663d7cbeec74d62227aa88c92b9e96cb940f2a952e92d9724f98fe69dcbd7d2a9dccc2c0a2e9d19c2 SHA512 99b30ac838f437a85985eb830d0557f22c69bc40ef2dafe3493f145b70a89b72699e134f061719fa0dcc8b585ed2b418a6afc0c2f7ce67e2e9383d48a7b7b668
DIST imageworsener-1.3.3.tar.gz 662243 BLAKE2B 6b34dc111c5b2dcc25fdc717b7ec8d4268ca1b67c31cca58b5e1983643f1e3b78543a3bdba24b3692a05cb83a887bfcf0e7b09307535994d280056a0047c8b0d SHA512 ebe8a31819cf665d8d8d7e789d873de03206e74e100ea99b2d8dc6ac2590025ff0058066daeb17ebfaa6cf49222e33c8a9efa83f39f5e2b9b49d27a3ee1b027f
diff --git a/media-gfx/imageworsener/imageworsener-1.3.2.ebuild b/media-gfx/imageworsener/imageworsener-1.3.2.ebuild
deleted file mode 100644
index 1725bfb56b4..00000000000
--- a/media-gfx/imageworsener/imageworsener-1.3.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils ltprune
-
-MY_P=${PN}-src-${PV}
-MY_PN=imagew
-
-DESCRIPTION="Utility for image scaling and processing"
-HOMEPAGE="http://entropymine.com/imageworsener/"
-SRC_URI="http://entropymine.com/${PN}/${P}.tar.gz"
-
-LICENSE="MIT-with-advertising"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="jpeg png static-libs test webp zlib"
-
-DEPEND="png? ( media-libs/libpng:0 )
- jpeg? ( virtual/jpeg:0 )
- webp? ( >=media-libs/libwebp-0.1.3 )
- zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="test? ( jpeg png webp zlib )"
-RESTRICT="!test? ( test )"
-
-src_configure() {
- local switch=''
- use test && switch=test
-
- econf \
- $(use_enable static-libs static) \
- $(use_with ${switch} jpeg) \
- $(use_with ${switch} png) \
- $(use_with ${switch} webp) \
- $(use_with ${switch} zlib)
-}
-
-src_install() {
- default
- dodoc {changelog,readme,technical}.txt
- prune_libtool_files
-}
-
-src_test() {
- cd "${S}"/tests || die
- ./runtest "${S}"/${MY_PN}
-}
diff --git a/media-gfx/imageworsener/imageworsener-1.3.3.ebuild b/media-gfx/imageworsener/imageworsener-1.3.3.ebuild
index c51206e3f3e..0b004e603e3 100644
--- a/media-gfx/imageworsener/imageworsener-1.3.3.ebuild
+++ b/media-gfx/imageworsener/imageworsener-1.3.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://entropymine.com/${PN}/${P}.tar.gz"
LICENSE="MIT-with-advertising"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="jpeg png static-libs test webp zlib"
DEPEND="png? ( media-libs/libpng:0 )
diff --git a/media-gfx/img2pdf/Manifest b/media-gfx/img2pdf/Manifest
index acbe9c1cbde..cd9d747f458 100644
--- a/media-gfx/img2pdf/Manifest
+++ b/media-gfx/img2pdf/Manifest
@@ -1 +1,2 @@
DIST img2pdf-0.3.6.tar.gz 91006 BLAKE2B ad89b42be4613c30383770f336b07773bf13e87061fca61eb7d5e25d6489662fc2bae94d9a6d61d531a77f41b9e94492d0db1f32570f6d471fa9f8cb0816630d SHA512 2a9d31b9de52123941fd650123a483f4dc0757edda304da994353b5f3167bddbb25fa1ed8fededcf859c5d07b65b9c2d5185000949002a68dcae1e7bf0f1547d
+DIST img2pdf-0.4.0.tar.gz 107027 BLAKE2B 0bf13e2d4a5aff68779130bc14100a5c6d1ac4eaca9da28ceb50104550b6e4331f6a2202514bcdac0480c0148794d18e9f2dd46ded68bbaa301a207460f91c85 SHA512 bab9ee6ef5273a686cb10e52bdeb62b6df3c0da99d0f0558677e07dc7ad776c2d62829a2f5e9c5639acfb9fc6e9c5e3a81aed42dc288c2a39d245775f1d4391b
diff --git a/media-gfx/img2pdf/img2pdf-0.3.6.ebuild b/media-gfx/img2pdf/img2pdf-0.3.6.ebuild
index 612d1425962..b706261bef3 100644
--- a/media-gfx/img2pdf/img2pdf-0.3.6.ebuild
+++ b/media-gfx/img2pdf/img2pdf-0.3.6.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
diff --git a/media-gfx/img2pdf/img2pdf-0.4.0.ebuild b/media-gfx/img2pdf/img2pdf-0.4.0.ebuild
new file mode 100644
index 00000000000..03f64a2071d
--- /dev/null
+++ b/media-gfx/img2pdf/img2pdf-0.4.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Losslessly convert raster images to PDF"
+HOMEPAGE="https://gitlab.mister-muffin.de/josch/img2pdf"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gui"
+
+# missing dev-python/pdfrw dependency and
+# require old version of imagemagick
+# waiting new version
+RESTRICT="test"
+
+#BDEPEND="test? (
+# dev-python/numpy[${PYTHON_USEDEP}]
+# dev-python/pdfrw[${PYTHON_USEDEP}]
+# dev-python/pikepdf[${PYTHON_USEDEP}]
+# dev-python/pytest[${PYTHON_USEDEP}]
+# dev-python/scipy[${PYTHON_USEDEP}]
+# <media-gfx/imagemagick-7.0.0[jpeg,jpeg2k,png,q8,q32,tiff]
+#)"
+RDEPEND="dev-python/pikepdf[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ gui? ( $(python_gen_impl_dep tk) )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ distutils-r1_python_prepare_all
+
+ # Remove gui executable if there's no demand/support for it.
+ if ! use gui; then
+ sed -i '/gui_scripts/d' setup.py || die
+ fi
+}
+
+python_test() {
+ pytest -vv src/img2pdf_test.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/media-gfx/imv/Manifest b/media-gfx/imv/Manifest
index 00813efe7c9..755d47506de 100644
--- a/media-gfx/imv/Manifest
+++ b/media-gfx/imv/Manifest
@@ -1,2 +1,2 @@
-DIST imv-4.0.1.tar.gz 74982 BLAKE2B 5ff7f093307fdf6114e56f0e5d5a47a4320607eea12daa9a9c89c679f558b4d31f206f7eb03a8b0435a3f05974949029ebfc6e1b1fe4d7d2859bbd722ecb6366 SHA512 f946346638d4314956e86f0e7dfa38baf0ebbb80970f1738749e6c7b80642c2315256738b94ab04d45784c0930edadfc7cc339d2bcfd6eb80fd2e1e98b2d9b28
DIST imv-4.1.0.tar.gz 77341 BLAKE2B d6735feba4d3e958db70eddea72bbbeb60731cf550680320448ba226ba74eb467617ad295f9094995e0bf31c99473f067ff41f16689ce21fb87d7a9fd2e0946a SHA512 92d7551bda55185b29724e90230dac608a82f4a45cd3cb9c7a5d261f65eede6dcdde78f5c16eecfc1242533ec8e155204189fab3cacf31ddc088707af5131b2a
+DIST imv-4.2.0.tar.gz 77809 BLAKE2B a0c8aeb4d50d252818f4a4bedc145a8e2ffffa3ae14d888ef4623fe17a714bd17397399064019b32a48e6ebe3613f592428b075988ed533166c06c2b885d245b SHA512 7b64c6d4e5e484fd2ef4e28e2ba5cc74e4d28f8e2fa329ae7c744bd77ce8a345123f9cc3c77e015ff780938d5add97cfe9ed4e5a3a52b03a91b7bb6bb50e7115
diff --git a/media-gfx/imv/files/imv-4.2.0-add-string-inc.patch b/media-gfx/imv/files/imv-4.2.0-add-string-inc.patch
new file mode 100644
index 00000000000..e726d7b093a
--- /dev/null
+++ b/media-gfx/imv/files/imv-4.2.0-add-string-inc.patch
@@ -0,0 +1,9 @@
+https://github.com/eXeC64/imv/issues/299
+--- a/src/backend_freeimage.c 2020-12-17 15:30:42.000000000 -0500
++++ b/src/backend_freeimage.c 2021-01-23 12:03:46.175921640 -0500
+@@ -8,4 +8,5 @@
+ #include <FreeImage.h>
+ #include <stdlib.h>
++#include <string.h>
+
+ struct private {
diff --git a/media-gfx/imv/files/imv-4.2.0-wayland-roundtrip-after-scale.patch b/media-gfx/imv/files/imv-4.2.0-wayland-roundtrip-after-scale.patch
new file mode 100644
index 00000000000..38101332906
--- /dev/null
+++ b/media-gfx/imv/files/imv-4.2.0-wayland-roundtrip-after-scale.patch
@@ -0,0 +1,14 @@
+https://github.com/eXeC64/imv/issues/305
+--- a/src/wl_window.c 2020-12-17 15:30:42.000000000 -0500
++++ b/src/wl_window.c 2021-02-02 19:03:52.598901093 -0500
+@@ -545,2 +545,3 @@
+ wl_surface_commit(window->wl_surface);
++ wl_display_roundtrip(window->wl_display);
+ size_t buffer_width = window->width * window->scale;
+@@ -636,4 +637,4 @@
+ .height = window->height,
+- .buffer_width = window->width * window->scale,
+- .buffer_height = window->height * window->scale
++ .buffer_width = buffer_width,
++ .buffer_height = buffer_height,
+ }
diff --git a/media-gfx/imv/imv-4.0.1-r2.ebuild b/media-gfx/imv/imv-4.0.1-r2.ebuild
deleted file mode 100644
index a93b2f9f626..00000000000
--- a/media-gfx/imv/imv-4.0.1-r2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs xdg-utils
-
-DESCRIPTION="Minimal image viewer designed for tiling window manager users"
-HOMEPAGE="https://github.com/eXeC64/imv"
-SRC_URI="https://github.com/eXeC64/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT-with-advertising"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X +freeimage jpeg png +svg test tiff wayland"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
- || ( X wayland )
-"
-
-RDEPEND="
- !sys-apps/renameutils
- media-libs/fontconfig
- media-libs/libsdl2
- media-libs/sdl2-ttf
- X? (
- virtual/glu
- x11-libs/libX11
- x11-libs/libxcb
- x11-libs/libxkbcommon
- x11-libs/pango
- )
- freeimage? ( media-libs/freeimage )
- jpeg? ( media-libs/libjpeg-turbo )
- png? ( media-libs/libpng )
- svg? ( gnome-base/librsvg )
- tiff? ( media-libs/tiff )
- wayland? ( dev-libs/wayland )
-"
-BDEPEND="
- app-text/asciidoc
- test? ( dev-util/cmocka )
-"
-DEPEND="
- ${RDEPEND}
-"
-
-src_prepare() {
- default
- sed -i -e 's|pkg-config|$(PKG_CONFIG)|g' Makefile || die
-}
-
-src_configure() {
- tc-export PKG_CONFIG
- local WINDOWS
- if use X; then
- if ! use wayland; then
- WINDOWS=x11
- else
- WINDOWS=all
- fi
- else
- if use wayland; then
- WINDOWS=wayland
- fi
- fi
-
- BACKENDS=(
- BACKEND_FREEIMAGE=$(usex freeimage)
- BACKEND_JPEG=$(usex jpeg)
- BACKEND_LIBPNG=$(usex png)
- BACKEND_LIBRSVG=$(usex svg)
- BACKEND_LIBTIFF=$(usex tiff)
- WINDOWS=${WINDOWS}
- )
-}
-
-src_compile() {
- emake ${BACKENDS[@]}
-}
-
-src_install() {
- emake ${BACKENDS[@]} DESTDIR="${D}" install
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/media-gfx/imv/imv-4.2.0.ebuild b/media-gfx/imv/imv-4.2.0.ebuild
new file mode 100644
index 00000000000..25863200b0b
--- /dev/null
+++ b/media-gfx/imv/imv-4.2.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit xdg meson
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/eXeC64/imv.git"
+else
+ SRC_URI="https://github.com/eXeC64/imv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Minimal image viewer designed for tiling window manager users"
+HOMEPAGE="https://github.com/eXeC64/imv"
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+IUSE="+X +freeimage gif heif jpeg png svg test tiff wayland"
+REQUIRED_USE="|| ( X wayland )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-libs/icu:=
+ dev-libs/inih
+ media-libs/libglvnd[X?]
+ x11-libs/libxkbcommon[X?]
+ x11-libs/pango
+ X? (
+ x11-libs/libX11
+ x11-libs/libxcb:=
+ )
+ freeimage? ( media-libs/freeimage )
+ gif? ( media-libs/libnsgif )
+ heif? ( media-libs/libheif:= )
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ png? ( media-libs/libpng:= )
+ svg? ( >=gnome-base/librsvg-2.44 )
+ tiff? ( media-libs/tiff )
+ wayland? ( dev-libs/wayland )
+ !sys-apps/renameutils
+"
+DEPEND="
+ ${RDEPEND}
+ test? ( dev-util/cmocka )
+"
+BDEPEND="
+ app-text/asciidoc
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.2.0-add-string-inc.patch"
+ "${FILESDIR}/${PN}-4.2.0-wayland-roundtrip-after-scale.patch"
+)
+
+src_prepare() {
+ default
+
+ # allow building with libglvnd[-X]
+ if ! use X; then
+ sed -i "/dependency('gl')/s/gl/opengl/" meson.build || die
+ fi
+
+ # glu isn't used by anything
+ sed -i "/dependency('glu')/d" meson.build || die
+}
+
+src_configure() {
+ local windows=all
+ use X || windows=wayland
+ use wayland || windows=x11
+
+ local emesonargs=(
+ $(meson_feature freeimage)
+ $(meson_feature gif libnsgif)
+ $(meson_feature heif libheif)
+ $(meson_feature jpeg libjpeg)
+ $(meson_feature png libpng)
+ $(meson_feature svg librsvg)
+ $(meson_feature test)
+ $(meson_feature tiff libtiff)
+ -Dwindows=${windows}
+ )
+ meson_src_configure
+}
diff --git a/media-gfx/imv/imv-9999.ebuild b/media-gfx/imv/imv-9999.ebuild
index 65f50d9221c..735366ed533 100644
--- a/media-gfx/imv/imv-9999.ebuild
+++ b/media-gfx/imv/imv-9999.ebuild
@@ -1,89 +1,81 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit git-r3 meson xdg-utils
+inherit xdg meson
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/eXeC64/imv.git"
+else
+ SRC_URI="https://github.com/eXeC64/imv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
DESCRIPTION="Minimal image viewer designed for tiling window manager users"
-LICENSE="MIT-with-advertising"
HOMEPAGE="https://github.com/eXeC64/imv"
-EGIT_REPO_URI="https://github.com/eXeC64/imv"
-KEYWORDS=""
+LICENSE="MIT-with-advertising"
SLOT="0"
-IUSE="X +freeimage +png jpeg svg gif heif test tiff wayland"
+IUSE="+X +freeimage gif heif jpeg png svg test tiff wayland"
+REQUIRED_USE="|| ( X wayland )"
RESTRICT="!test? ( test )"
-REQUIRED_USE="
- || ( X wayland )
-"
RDEPEND="
- !sys-apps/renameutils
dev-libs/icu:=
- media-libs/fontconfig
- media-libs/libsdl2
- media-libs/sdl2-ttf
+ dev-libs/inih
+ media-libs/libglvnd[X?]
+ x11-libs/libxkbcommon[X?]
+ x11-libs/pango
X? (
- virtual/glu
x11-libs/libX11
- x11-libs/libxcb
- x11-libs/libxkbcommon[X]
- x11-libs/pango
- )
- freeimage? ( media-libs/freeimage[png?,jpeg?,tiff?] )
- !freeimage? (
- jpeg? ( media-libs/libjpeg-turbo )
- png? ( media-libs/libpng )
- tiff? ( media-libs/tiff )
+ x11-libs/libxcb:=
)
+ freeimage? ( media-libs/freeimage )
gif? ( media-libs/libnsgif )
- heif? ( media-libs/libheif )
+ heif? ( media-libs/libheif:= )
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ png? ( media-libs/libpng:= )
svg? ( >=gnome-base/librsvg-2.44 )
+ tiff? ( media-libs/tiff )
wayland? ( dev-libs/wayland )
-"
-BDEPEND="
- app-text/asciidoc
- test? ( dev-util/cmocka )
+ !sys-apps/renameutils
"
DEPEND="
${RDEPEND}
+ test? ( dev-util/cmocka )
+"
+BDEPEND="
+ app-text/asciidoc
"
-src_configure() {
- local WINDOWS
- if use X; then
- if ! use wayland; then
- WINDOWS=x11
- else
- WINDOWS=all
- fi
- else
- if use wayland; then
- WINDOWS=wayland
- fi
- fi
+src_prepare() {
+ default
- if ! use test; then
- sed -i -e '/^dep_cmocka/,/^endforeach$/d' meson.build || die
+ # allow building with libglvnd[-X]
+ if ! use X; then
+ sed -i "/dependency('gl')/s/gl/opengl/" meson.build || die
fi
+ # glu isn't used by anything
+ sed -i "/dependency('glu')/d" meson.build || die
+}
+
+src_configure() {
+ local windows=all
+ use X || windows=wayland
+ use wayland || windows=x11
+
local emesonargs=(
$(meson_feature freeimage)
$(meson_feature gif libnsgif)
$(meson_feature heif libheif)
+ $(meson_feature jpeg libjpeg)
+ $(meson_feature png libpng)
$(meson_feature svg librsvg)
- $(usex freeimage -Dlibjpeg=disabled -Dlibjpeg=enabled)
- $(usex freeimage -Dlibpng=disabled -Dlibjpeg=enabled)
- $(usex freeimage -Dlibtiff=disabled -Dlibjpeg=enabled)
- -Dwindows=$WINDOWS
+ $(meson_feature test)
+ $(meson_feature tiff libtiff)
+ -Dwindows=${windows}
)
meson_src_configure
}
-
-pkg_postinst() {
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/media-gfx/imv/metadata.xml b/media-gfx/imv/metadata.xml
index 5ae50d4b1ee..196a224f746 100644
--- a/media-gfx/imv/metadata.xml
+++ b/media-gfx/imv/metadata.xml
@@ -1,13 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-<flag name="freeimage">Use <pkg>media-libs/freeimage</pkg> as image library</flag>
-<flag name="heif">Use <pkg>media-libs/libheif</pkg> as image library</flag>
-<flag name="libnsgif">Use <pkg>media-libs/libnsgif</pkg> as image library</flag>
-</use>
-<upstream>
-<remote-id type="github">eXeC64/imv</remote-id>
-</upstream>
+ <maintainer type="person">
+ <email>sudinave@gmail.com</email>
+ <name>Ionen Wolkens</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <use>
+ <flag name="freeimage">Use <pkg>media-libs/freeimage</pkg> for additional image support</flag>
+ <flag name="heif">Add HEIF/HEIC image support</flag>
+ <flag name="libnsgif">Add animated GIF support</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">eXeC64/imv</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 9048977f8e6..2455bcce911 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,2 +1,2 @@
DIST inkscape-1.0.1.tar.xz 32051632 BLAKE2B d17ae49c42908e24aade2216f5adaf56b14ac830decfa2c07ea711c034d144251d5c039f516934a6d004b48165ab3a70d40a7cb7e658ae5e97ef37b392a7d556 SHA512 70145e02fe7c3ffbfa3dcea690bfe3315131fb9a507c70bcdc1d0db394d207e3bd04d7cc86c3b625597bddfd2b6e09a03841aece6d2ffb6517fe1c619193ec96
-DIST inkscape-1.0.tar.xz 31935616 BLAKE2B 096ef6ccfd519118acffa3b15302a2d92f94976f37cf58c1fdab79abb64a2de14d02e1199364c71265a332f57809603ec1b6f4f34b90e910376e1cbc5c6d1cb8 SHA512 37c18079eb926fd6874deee95e4008bae165c5e52d05cb53bbc8f4a48eedd0e0ab6b3e5dfbb23709169187bfe8eb5aa44d576268667f2566a2cd4dd5426554f0
+DIST inkscape-1.0.2.tar.xz 32421620 BLAKE2B c3f9c37b15343ba0955a6d06810aef5fb9e035a240f99579301b8cd93858a62b5ed1a3ff528a9642ec74b8900305495236cf7f4c672864369a4e33dca3b34bd4 SHA512 f4fbc627c0f07db11194715c505b771a60af29a9a7f8be0232e4f7eb6b1c5814c3f160c2003d64ec62aeb92ef44174320a47aa6b6abc7a67cc27c996cba9522d
diff --git a/media-gfx/inkscape/inkscape-1.0.1.ebuild b/media-gfx/inkscape/inkscape-1.0.1-r1.ebuild
index c7b103100cf..861ac2210cd 100644
--- a/media-gfx/inkscape/inkscape-1.0.1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
PYTHON_REQ_USE="xml"
inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
@@ -14,7 +14,7 @@ SRC_URI="https://inkscape.org/gallery/item/21571/${P}.tar.xz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms
openmp postscript spell static-libs svg2 visio wpg"
@@ -32,14 +32,14 @@ BDEPEND="
"
COMMON_DEPEND="${PYTHON_DEPS}
>=app-text/poppler-0.57.0:=[cairo]
- >=dev-cpp/cairomm-1.12
- >=dev-cpp/glibmm-2.54.1
+ >=dev-cpp/cairomm-1.12:0
+ >=dev-cpp/glibmm-2.54.1:2
dev-cpp/gtkmm:3.0
- >=dev-cpp/pangomm-2.40
+ >=dev-cpp/pangomm-2.40:1.4
>=dev-libs/boehm-gc-7.1:=
dev-libs/double-conversion:=
>=dev-libs/glib-2.41
- >=dev-libs/libsigc++-2.8
+ >=dev-libs/libsigc++-2.8:2
>=dev-libs/libxml2-2.7.4
>=dev-libs/libxslt-1.1.25
dev-libs/gdl:3
@@ -155,4 +155,7 @@ src_install() {
if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
python_optimize "${ED}"/usr/share/${PN}/extensions
fi
+
+ # Empty directory causes sandbox issues, see bug #761915
+ rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
}
diff --git a/media-gfx/inkscape/inkscape-1.0-r1.ebuild b/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild
index 0e5ca71a8f9..6e4e248cea3 100644
--- a/media-gfx/inkscape/inkscape-1.0-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild
@@ -1,29 +1,25 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
PYTHON_REQ_USE="xml"
inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
DESCRIPTION="SVG based generic vector-drawing program"
HOMEPAGE="https://inkscape.org/"
-SRC_URI="https://inkscape.org/gallery/item/18460/${P}.tar.xz"
+SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms
openmp postscript spell static-libs svg2 visio wpg"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-PATCHES=(
- "${FILESDIR}/missing_atomic_include.patch"
-)
-
BDEPEND="
dev-util/glib-utils
>=dev-util/intltool-0.40
@@ -32,14 +28,14 @@ BDEPEND="
"
COMMON_DEPEND="${PYTHON_DEPS}
>=app-text/poppler-0.57.0:=[cairo]
- >=dev-cpp/cairomm-1.12
- >=dev-cpp/glibmm-2.54.1
+ >=dev-cpp/cairomm-1.12:0
+ >=dev-cpp/glibmm-2.54.1:2
dev-cpp/gtkmm:3.0
- >=dev-cpp/pangomm-2.40
+ >=dev-cpp/pangomm-2.40:1.4
>=dev-libs/boehm-gc-7.1:=
dev-libs/double-conversion:=
>=dev-libs/glib-2.41
- >=dev-libs/libsigc++-2.8
+ >=dev-libs/libsigc++-2.8:2
>=dev-libs/libxml2-2.7.4
>=dev-libs/libxslt-1.1.25
dev-libs/gdl:3
@@ -102,7 +98,7 @@ DEPEND="${COMMON_DEPEND}
RESTRICT="test"
-S="${WORKDIR}"/${P}_2020-05-01_4035a4fb49
+S="${WORKDIR}"/${P}_2021-01-15_e86c870879
pkg_pretend() {
if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
@@ -155,4 +151,7 @@ src_install() {
if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
python_optimize "${ED}"/usr/share/${PN}/extensions
fi
+
+ # Empty directory causes sandbox issues, see bug #761915
+ rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
}
diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 1cc566e6135..e29603e7c82 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -28,14 +28,14 @@ BDEPEND="
"
COMMON_DEPEND="${PYTHON_DEPS}
>=app-text/poppler-0.57.0:=[cairo]
- >=dev-cpp/cairomm-1.12
- >=dev-cpp/glibmm-2.54.1
+ >=dev-cpp/cairomm-1.12:0
+ >=dev-cpp/glibmm-2.54.1:2
dev-cpp/gtkmm:3.0
- >=dev-cpp/pangomm-2.40
+ >=dev-cpp/pangomm-2.40:1.4
>=dev-libs/boehm-gc-7.1:=
dev-libs/double-conversion:=
>=dev-libs/glib-2.41
- >=dev-libs/libsigc++-2.8
+ >=dev-libs/libsigc++-2.8:2
>=dev-libs/libxml2-2.7.4
>=dev-libs/libxslt-1.1.25
dev-libs/gdl:3
@@ -152,4 +152,7 @@ src_install() {
if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
python_optimize "${ED}"/usr/share/${PN}/extensions
fi
+
+ # Empty directory causes sandbox issues, see bug #761915
+ rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
}
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 740a69344d0..7067adf48f6 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -1,4 +1,5 @@
DIST imagescan_3.63.0.orig.tar.gz 12776113 BLAKE2B d1a9f1d60ba4a2239c6ed74f7f9e0da078e2743e78e0abb67a69506bf90ac35b069f84b5a092a6eb8fd73f60eb668e78b4c7fae56b3a65b6b3d8600f082c064a SHA512 3c9b18e630d6fb1c042244542675e89a8b467469d7212ab684f72100810d1f7d0ec16d13c472a83ca05a3a4fc44e366f692a36cd6b0e81c9a332dd3b40de9535
+DIST imagescan_3.65.0.orig.tar.gz 12651383 BLAKE2B e1436b6d6bf9fc3fc4e5185706fc814e1a4351bf37cd733a3fb88cd16a1c3422ebe0bf4cca77ac00c431edc990aaa50b8994e3bc0f72acba3b0e0608882b63ae SHA512 c719ac540af496efe72b2be87a2b89cbec8eee61a2a985574d0db766c00b7187315378382d8501e26dad132e93de3d3e9431c8e679b569f3c35ea8181b1ca022
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
diff --git a/media-gfx/iscan/files/iscan-2.30.4.2-c99.patch b/media-gfx/iscan/files/iscan-2.30.4.2-c99.patch
new file mode 100644
index 00000000000..93683c2887b
--- /dev/null
+++ b/media-gfx/iscan/files/iscan-2.30.4.2-c99.patch
@@ -0,0 +1,24 @@
+--- a/backend/defines.h 2021-01-04 08:13:48.995137756 -0000
++++ b/backend/defines.h 2021-01-04 08:16:00.524563361 -0000
+@@ -31,6 +31,13 @@
+
+
+ #ifndef __cplusplus
++
++/* Use the C99 bool type if available
++ */
++#ifdef HAVE_STDBOOL_H
++#include <stdbool.h>
++#else
++
+ /*! A C++ Boolean type and corresponding keywords for our C code.
+ */
+ typedef enum {
+@@ -38,6 +45,7 @@
+ true
+ } bool;
+ #endif
++#endif
+
+
+ /* Run-time contract validation.
diff --git a/media-gfx/iscan/iscan-2.30.4.2-r1.ebuild b/media-gfx/iscan/iscan-2.30.4.2-r1.ebuild
index 333d41b9b1c..c1eb390986e 100644
--- a/media-gfx/iscan/iscan-2.30.4.2-r1.ebuild
+++ b/media-gfx/iscan/iscan-2.30.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -70,6 +70,7 @@ PATCHES=(
"${FILESDIR}"/iscan-2.30.1.1-gcc6.patch
"${FILESDIR}"/iscan-2.30.3.1-fix-x86-unknown-types.patch
"${FILESDIR}"/iscan-2.30.4.2-sscanf.patch
+ "${FILESDIR}"/iscan-2.30.4.2-c99.patch
)
QA_PRESTRIPPED="usr/lib.*/libesmod.so.*"
diff --git a/media-gfx/iscan/iscan-3.65.0.ebuild b/media-gfx/iscan/iscan-3.65.0.ebuild
new file mode 100644
index 00000000000..f143a547464
--- /dev/null
+++ b/media-gfx/iscan/iscan-3.65.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop flag-o-matic udev xdg-utils
+
+DESCRIPTION="EPSON Image Scan v3 for Linux"
+HOMEPAGE="https://support.epson.net/linux/en/imagescanv3.php https://gitlab.com/utsushi/utsushi"
+SRC_URI="https://support.epson.net/linux/src/scanner/imagescanv3/common/imagescan_${PV}.orig.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="graphicsmagick gui test"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+ dev-libs/boost:=
+ media-gfx/sane-backends
+ media-libs/tiff
+ virtual/jpeg
+ virtual/libusb:1
+ graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+ !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+ gui? ( dev-cpp/gtkmm:2.4 )
+"
+# Disable opencl as during reorient.utr test it produces inconsistent results
+DEPEND="${RDEPEND}
+ test? (
+ app-text/tesseract[png,tiff,training,-opencl]
+ media-fonts/dejavu
+ virtual/imagemagick-tools[png,tiff]
+ )
+"
+RESTRICT="!test? ( test )"
+S="${WORKDIR}/utsushi-0.$(ver_cut 2-3)"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.61.0-ijg-libjpeg.patch
+ "${FILESDIR}"/${PN}-3.61.0-imagemagick-7.patch
+ "${FILESDIR}"/${PN}-3.62.0-gcc-10.patch
+ "${FILESDIR}"/${PN}-3.62.0-boost-1.73.patch
+ "${FILESDIR}"/${PN}-3.62.0-fix-symbols.patch
+ "${FILESDIR}"/${PN}-3.62.0-tests-boost.patch
+ "${FILESDIR}"/${PN}-3.62.0-tests-tesseract.patch
+ "${FILESDIR}"/${PN}-3.62.0-tests-linkage.patch
+ "${FILESDIR}"/${PN}-3.63.0-autoconf-2.70.patch
+)
+
+src_prepare() {
+ default
+
+ # Remove vendored libraries
+ rm -r upstream/boost || die
+ # Workaround for deprecation warnings:
+ # https://gitlab.com/utsushi/utsushi/issues/90
+ sed -e 's|=-Werror|="-Werror -Wno-error=deprecated-declarations"|g' -i configure.ac || die
+ # Disable check-soname test
+ sed -e '/SANE_BACKEND_SANITY_CHECKS +=/d' -i sane/Makefile.am || die
+ eautoreconf
+}
+
+src_configure() {
+ # Workaround for:
+ # /usr/lib64/utsushi/libutsushi.so.0: undefined symbol: libcnx_usb_LTX_factory
+ append-ldflags $(no-as-needed)
+ # https://bugs.gentoo.org/720994
+ append-ldflags -pthread
+ local myconf=(
+ $(use_with gui gtkmm)
+ --enable-sane-config
+ --enable-udev-config
+ --with-boost=yes
+ --with-jpeg
+ --with-magick=$(usex graphicsmagick GraphicsMagick ImageMagick)
+ --with-magick-pp=$(usex graphicsmagick GraphicsMagick ImageMagick)
+ --with-sane
+ --with-tiff
+ --with-udev-confdir="$(get_udevdir)"
+ )
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ default
+ dodoc lib/devices.conf
+ find "${ED}" -name '*.la' -delete || die
+ if use gui; then
+ newicon -s scalable doc/icon.svg "${PN}".svg
+ make_desktop_entry utsushi "Image Scan"
+ fi
+}
+
+pkg_postinst() {
+ use gui && xdg_icon_cache_update
+ elog "If you encounter problems with media-gfx/xsane when scanning (e.g., bad resolution),"
+ elog "please try the built-in GUI and kde-misc/skanlite first before reporting bugs."
+}
+
+pkg_postrm() {
+ use gui && xdg_icon_cache_update
+}
diff --git a/media-gfx/jp2a/jp2a-1.0.6-r1.ebuild b/media-gfx/jp2a/jp2a-1.0.6-r1.ebuild
index 92bd292af74..50869054faa 100644
--- a/media-gfx/jp2a/jp2a-1.0.6-r1.ebuild
+++ b/media-gfx/jp2a/jp2a-1.0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 ~sparc x86 ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ~ia64 ppc ppc64 ~sparc x86 ~x64-macos ~x64-solaris"
IUSE="curl"
RDEPEND="sys-libs/ncurses
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 2d039017079..333f01ff520 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1,2 @@
DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
-DIST krita-4.3.0.tar.xz 166246720 BLAKE2B 74a6e02968a2abdeb59ca2702f0a4a7be23473657667b14592ad08b81d25d9e4815fb5d206a23f33a82268974e9369450525c53b43fef46831ad4c501c34546c SHA512 5633a6ccacc140b119082f14fe792b1219b8065304fccc55a84a2373a46cb036ad40f718beb8719e1f664e35d679b18e86f5f3db8685166a187d8cf3a77722f4
-DIST krita-4.4.1.tar.xz 169788052 BLAKE2B fe0cbba0e63a3873578c54055b0a11941518a52a9fab17e54f13d26325717a5d6e7f0d6c79d29df2bcc91c39174bc992d2e1e14e1012a5fdd8c447f224e3a190 SHA512 8832202384bae5c73715087b1b3230e459eb780cfa71b7c7bfb92ba4498b8b78575a7b3437aa4b88f396cec47080ccaaaadbc1b1f8bcbcdeb607909fee710afe
+DIST krita-4.4.2.tar.xz 174168244 BLAKE2B 95f22853ee31c8121b7d54e6771f8fbb708b19a106bf78026344ac6f2cb02ffbd446d291601359042579ba0e89d6d0a641015e95070c17369a2a8e9e01560660 SHA512 a75925e9690eaea03900cdb8da20dc25f1bf22fdb4515f685111f3503bf7c334acf79e6668b55a70464c77a04229ca34d6f160d5490987592af783ca9fc7d7ef
diff --git a/media-gfx/krita/files/krita-4.3.0-tests-optional.patch b/media-gfx/krita/files/krita-4.3.0-tests-optional.patch
deleted file mode 100644
index b58dcf1f4a8..00000000000
--- a/media-gfx/krita/files/krita-4.3.0-tests-optional.patch
+++ /dev/null
@@ -1,536 +0,0 @@
-From 3c9fe10e25e94bdb1eb5e7b07ac2696635fdc5a3 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 17 Jun 2020 20:18:28 +0200
-Subject: [PATCH] Don't build tests when testing not requested
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-
-diff --git a/libs/brush/CMakeLists.txt b/libs/brush/CMakeLists.txt
-index 536b1a4ac5..7d8435eec4 100644
---- a/libs/brush/CMakeLists.txt
-+++ b/libs/brush/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory( tests )
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- include_directories(SYSTEM
- ${EIGEN3_INCLUDE_DIR}
-diff --git a/libs/flake/CMakeLists.txt b/libs/flake/CMakeLists.txt
-index cbdac265d2..1a50c1620a 100644
---- a/libs/flake/CMakeLists.txt
-+++ b/libs/flake/CMakeLists.txt
-@@ -9,8 +9,10 @@ include_directories(
- )
-
- add_subdirectory(styles)
--add_subdirectory(tests)
--add_subdirectory(resources/tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+ add_subdirectory(resources/tests)
-+endif()
-
- set(kritaflake_SRCS
- KoGradientHelper.cpp
-diff --git a/libs/global/CMakeLists.txt b/libs/global/CMakeLists.txt
-index e8162c5e46..f6ea6bc840 100644
---- a/libs/global/CMakeLists.txt
-+++ b/libs/global/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory( tests )
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- include(CheckFunctionExists)
- check_function_exists(backtrace HAVE_BACKTRACE)
-diff --git a/libs/image/CMakeLists.txt b/libs/image/CMakeLists.txt
-index 810dee2f16..44c72ba2d5 100644
---- a/libs/image/CMakeLists.txt
-+++ b/libs/image/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory( tests )
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- add_subdirectory( tiles3 )
-
-diff --git a/libs/image/tiles3/CMakeLists.txt b/libs/image/tiles3/CMakeLists.txt
-index 88c0516360..01f2383ddb 100644
---- a/libs/image/tiles3/CMakeLists.txt
-+++ b/libs/image/tiles3/CMakeLists.txt
-@@ -1 +1,3 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-diff --git a/libs/libkis/CMakeLists.txt b/libs/libkis/CMakeLists.txt
-index 958104aaaf..3b8a33eadc 100644
---- a/libs/libkis/CMakeLists.txt
-+++ b/libs/libkis/CMakeLists.txt
-@@ -48,4 +48,6 @@ set_target_properties(kritalibkis PROPERTIES
- install(TARGETS kritalibkis ${INSTALL_TARGETS_DEFAULT_ARGS})
-
-
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-diff --git a/libs/metadata/CMakeLists.txt b/libs/metadata/CMakeLists.txt
-index d33aff38fc..abdc2f7a36 100644
---- a/libs/metadata/CMakeLists.txt
-+++ b/libs/metadata/CMakeLists.txt
-@@ -29,4 +29,6 @@ set_target_properties(kritametadata PROPERTIES
-
- install(TARGETS kritametadata ${INSTALL_TARGETS_DEFAULT_ARGS})
-
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-diff --git a/libs/odf/CMakeLists.txt b/libs/odf/CMakeLists.txt
-index 6acbf4d1a5..50e60b55d8 100644
---- a/libs/odf/CMakeLists.txt
-+++ b/libs/odf/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory( tests )
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- set(kritaodf_LIB_SRCS
- KoOdf.cpp
-diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
-index 7e38c6cb00..60879fcea2 100644
---- a/libs/pigment/CMakeLists.txt
-+++ b/libs/pigment/CMakeLists.txt
-@@ -33,8 +33,10 @@ else()
- set(__per_arch_alpha_applicator_factory_objs KoAlphaMaskApplicatorFactoryImpl.cpp)
- endif()
-
--add_subdirectory(tests)
--add_subdirectory(benchmarks)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+ add_subdirectory(benchmarks)
-+endif()
-
- set(kritapigment_SRCS
- DebugPigment.cpp
-diff --git a/libs/store/CMakeLists.txt b/libs/store/CMakeLists.txt
-index b7c42996bd..30f9d5c5c6 100644
---- a/libs/store/CMakeLists.txt
-+++ b/libs/store/CMakeLists.txt
-@@ -1,6 +1,8 @@
- include_directories(${QUAZIP_INCLUDE_DIRS})
-
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- set(kritastore_LIB_SRCS
- KoDirectoryStore.cpp
-diff --git a/libs/ui/CMakeLists.txt b/libs/ui/CMakeLists.txt
-index d273bf548a..d180fd8970 100644
---- a/libs/ui/CMakeLists.txt
-+++ b/libs/ui/CMakeLists.txt
-@@ -13,7 +13,9 @@ if (ANDROID)
- include_directories (${Qt5AndroidExtras_INCLUDE_DIRS})
- endif()
-
--add_subdirectory( tests )
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- if (APPLE)
- find_library(FOUNDATION_LIBRARY Foundation)
-diff --git a/libs/widgets/CMakeLists.txt b/libs/widgets/CMakeLists.txt
-index 75eded9db1..c0093cfd3a 100644
---- a/libs/widgets/CMakeLists.txt
-+++ b/libs/widgets/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory( tests )
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-diff --git a/libs/widgetutils/CMakeLists.txt b/libs/widgetutils/CMakeLists.txt
-index c62eeafb79..c33b16dd91 100644
---- a/libs/widgetutils/CMakeLists.txt
-+++ b/libs/widgetutils/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- configure_file(xmlgui/config-xmlgui.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-xmlgui.h )
-
-diff --git a/plugins/color/lcms2engine/CMakeLists.txt b/plugins/color/lcms2engine/CMakeLists.txt
-index e14de2ba7c..8c56372cb3 100644
---- a/plugins/color/lcms2engine/CMakeLists.txt
-+++ b/plugins/color/lcms2engine/CMakeLists.txt
-@@ -1,6 +1,8 @@
- project( lcmsengine )
-
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- include_directories(SYSTEM
- ${LCMS2_INCLUDE_DIR}
-diff --git a/plugins/dockers/animation/CMakeLists.txt b/plugins/dockers/animation/CMakeLists.txt
-index a0b4b4beb4..b3de3f2749 100644
---- a/plugins/dockers/animation/CMakeLists.txt
-+++ b/plugins/dockers/animation/CMakeLists.txt
-@@ -1,4 +1,4 @@
--if (NOT WIN32 AND NOT APPLE)
-+if(BUILD_TESTING AND NOT WIN32 AND NOT APPLE)
- add_subdirectory(tests)
- endif()
-
-diff --git a/plugins/dockers/lut/CMakeLists.txt b/plugins/dockers/lut/CMakeLists.txt
-index 01844be146..6745db73e6 100644
---- a/plugins/dockers/lut/CMakeLists.txt
-+++ b/plugins/dockers/lut/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- include_directories(SYSTEM
- ${OCIO_INCLUDE_DIR}
-diff --git a/plugins/extensions/qmic/CMakeLists.txt b/plugins/extensions/qmic/CMakeLists.txt
-index afd390b726..f5766c1b50 100644
---- a/plugins/extensions/qmic/CMakeLists.txt
-+++ b/plugins/extensions/qmic/CMakeLists.txt
-@@ -20,4 +20,6 @@ add_library(kritaqmic MODULE ${kritaqmic_SOURCES})
- target_link_libraries(kritaqmic kritaui)
- install(TARGETS kritaqmic DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
-
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-diff --git a/plugins/filters/CMakeLists.txt b/plugins/filters/CMakeLists.txt
-index 63a5de64e9..f8b4467926 100644
---- a/plugins/filters/CMakeLists.txt
-+++ b/plugins/filters/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory( tests )
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
- add_subdirectory( blur )
- add_subdirectory( colors )
- add_subdirectory( colorsfilters )
-diff --git a/plugins/filters/unsharp/CMakeLists.txt b/plugins/filters/unsharp/CMakeLists.txt
-index e63725abb1..5a61b5f89c 100644
---- a/plugins/filters/unsharp/CMakeLists.txt
-+++ b/plugins/filters/unsharp/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory( tests )
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- set(kritaunsharpfilter_SOURCES
- unsharp.cpp
-diff --git a/plugins/impex/brush/CMakeLists.txt b/plugins/impex/brush/CMakeLists.txt
-index b0343eddd4..ef7c617a40 100644
---- a/plugins/impex/brush/CMakeLists.txt
-+++ b/plugins/impex/brush/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- set(kritabrushexport_PART_SRCS
- kis_brush_export.cpp
-diff --git a/plugins/impex/csv/CMakeLists.txt b/plugins/impex/csv/CMakeLists.txt
-index 60eba64463..cf6e6ac9bd 100644
---- a/plugins/impex/csv/CMakeLists.txt
-+++ b/plugins/impex/csv/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- # import
-
-diff --git a/plugins/impex/exr/CMakeLists.txt b/plugins/impex/exr/CMakeLists.txt
-index aa39a91879..c80833941f 100644
---- a/plugins/impex/exr/CMakeLists.txt
-+++ b/plugins/impex/exr/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- include_directories(SYSTEM ${OPENEXR_INCLUDE_DIRS} )
-
-diff --git a/plugins/impex/gif/CMakeLists.txt b/plugins/impex/gif/CMakeLists.txt
-index bb7f582b6c..b95c9d3d07 100644
---- a/plugins/impex/gif/CMakeLists.txt
-+++ b/plugins/impex/gif/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- set(kritagifexport_SOURCES
- kis_gif_export.cpp
-diff --git a/plugins/impex/heif/CMakeLists.txt b/plugins/impex/heif/CMakeLists.txt
-index d25f3e1704..a7f663b13f 100644
---- a/plugins/impex/heif/CMakeLists.txt
-+++ b/plugins/impex/heif/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${HEIF_CFLAGS}")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${HEIF_CFLAGS}")
-diff --git a/plugins/impex/heightmap/CMakeLists.txt b/plugins/impex/heightmap/CMakeLists.txt
-index a8b03308d9..04e0f1000a 100644
---- a/plugins/impex/heightmap/CMakeLists.txt
-+++ b/plugins/impex/heightmap/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
-
-diff --git a/plugins/impex/jp2/CMakeLists.txt b/plugins/impex/jp2/CMakeLists.txt
-index c9393f6cfa..b4333025aa 100644
---- a/plugins/impex/jp2/CMakeLists.txt
-+++ b/plugins/impex/jp2/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenJPEG_CFLAGS}")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenJPEG_CFLAGS}")
-diff --git a/plugins/impex/jpeg/CMakeLists.txt b/plugins/impex/jpeg/CMakeLists.txt
-index 50edb05c96..eaa90964a7 100644
---- a/plugins/impex/jpeg/CMakeLists.txt
-+++ b/plugins/impex/jpeg/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- set(ICCJPEG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lcms")
-
-diff --git a/plugins/impex/libkra/CMakeLists.txt b/plugins/impex/libkra/CMakeLists.txt
-index 2b840c1e8a..88d849172f 100644
---- a/plugins/impex/libkra/CMakeLists.txt
-+++ b/plugins/impex/libkra/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- set(kritalibkra_LIB_SRCS
- kis_colorize_dom_utils.cpp
-diff --git a/plugins/impex/ora/CMakeLists.txt b/plugins/impex/ora/CMakeLists.txt
-index a476f422b4..0f4e563505 100644
---- a/plugins/impex/ora/CMakeLists.txt
-+++ b/plugins/impex/ora/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- set(libkritaconverter_LIB_SRCS
- ora_converter.cpp
-diff --git a/plugins/impex/pdf/CMakeLists.txt b/plugins/impex/pdf/CMakeLists.txt
-index 320da291a4..c423ff4214 100644
---- a/plugins/impex/pdf/CMakeLists.txt
-+++ b/plugins/impex/pdf/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- set(kritapdfimport_SOURCES kis_pdf_import.cpp kis_pdf_import_widget.cpp )
-
-diff --git a/plugins/impex/png/CMakeLists.txt b/plugins/impex/png/CMakeLists.txt
-index d567e8059e..6d3815f06f 100644
---- a/plugins/impex/png/CMakeLists.txt
-+++ b/plugins/impex/png/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- set(kritapngimport_SOURCES
- kis_png_import.cc
-diff --git a/plugins/impex/psd/CMakeLists.txt b/plugins/impex/psd/CMakeLists.txt
-index 4112536da2..f81598d01d 100644
---- a/plugins/impex/psd/CMakeLists.txt
-+++ b/plugins/impex/psd/CMakeLists.txt
-@@ -1,4 +1,4 @@
--if (NOT MSVC AND NOT APPLE)
-+if(BUILD_TESTING AND NOT MSVC AND NOT APPLE)
- add_subdirectory(tests)
- endif()
-
-diff --git a/plugins/impex/qimageio/CMakeLists.txt b/plugins/impex/qimageio/CMakeLists.txt
-index c916af4870..f1a068e9c2 100644
---- a/plugins/impex/qimageio/CMakeLists.txt
-+++ b/plugins/impex/qimageio/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- set(kritaqimageioexport_SOURCES
- kis_qimageio_export.cpp
-diff --git a/plugins/impex/qml/CMakeLists.txt b/plugins/impex/qml/CMakeLists.txt
-index e53156905a..1dff196ac5 100644
---- a/plugins/impex/qml/CMakeLists.txt
-+++ b/plugins/impex/qml/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- set(kritaqmlexport_SOURCES
- qml_converter.cc
-diff --git a/plugins/impex/raw/CMakeLists.txt b/plugins/impex/raw/CMakeLists.txt
-index 71cb5b355c..70241a8903 100644
---- a/plugins/impex/raw/CMakeLists.txt
-+++ b/plugins/impex/raw/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- if(OPENEXR_FOUND)
- include_directories(${OPENEXR_INCLUDE_DIRS})
-diff --git a/plugins/impex/svg/CMakeLists.txt b/plugins/impex/svg/CMakeLists.txt
-index 8f803a2783..6642112c11 100644
---- a/plugins/impex/svg/CMakeLists.txt
-+++ b/plugins/impex/svg/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- set(kritasvgimport_SOURCES
- kis_svg_import.cc
-diff --git a/plugins/impex/tga/CMakeLists.txt b/plugins/impex/tga/CMakeLists.txt
-index b7fe804897..79c2aff4d4 100644
---- a/plugins/impex/tga/CMakeLists.txt
-+++ b/plugins/impex/tga/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- set(kritatgaexport_SOURCES
- kis_tga_export.cpp
-diff --git a/plugins/impex/tiff/CMakeLists.txt b/plugins/impex/tiff/CMakeLists.txt
-index 8e57566510..0ee181c9bc 100644
---- a/plugins/impex/tiff/CMakeLists.txt
-+++ b/plugins/impex/tiff/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- set(libkritatiffconverter_LIB_SRCS
- kis_tiff_converter.cc
-diff --git a/plugins/impex/xcf/CMakeLists.txt b/plugins/impex/xcf/CMakeLists.txt
-index d76985be87..a754b686ba 100644
---- a/plugins/impex/xcf/CMakeLists.txt
-+++ b/plugins/impex/xcf/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-
- set(XCFTOOLS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/xcftools")
-
-diff --git a/plugins/paintops/defaultpaintops/CMakeLists.txt b/plugins/paintops/defaultpaintops/CMakeLists.txt
-index 68ac300940..35cd140838 100644
---- a/plugins/paintops/defaultpaintops/CMakeLists.txt
-+++ b/plugins/paintops/defaultpaintops/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(brush/tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(brush/tests)
-+endif()
-
- include_directories(brush
- duplicate
-diff --git a/plugins/paintops/libpaintop/CMakeLists.txt b/plugins/paintops/libpaintop/CMakeLists.txt
-index 4d6d831760..59ca6657ca 100644
---- a/plugins/paintops/libpaintop/CMakeLists.txt
-+++ b/plugins/paintops/libpaintop/CMakeLists.txt
-@@ -103,5 +103,6 @@ set_target_properties(kritalibpaintop PROPERTIES
-
- install(TARGETS kritalibpaintop ${INSTALL_TARGETS_DEFAULT_ARGS})
-
--
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ add_subdirectory(tests)
-+endif()
-diff --git a/plugins/tools/basictools/CMakeLists.txt b/plugins/tools/basictools/CMakeLists.txt
-index 9d725a7c7a..0221e604be 100644
---- a/plugins/tools/basictools/CMakeLists.txt
-+++ b/plugins/tools/basictools/CMakeLists.txt
-@@ -1,6 +1,6 @@
--if (NOT APPLE)
-+if(BUILD_TESTING AND NOT APPLE)
- add_subdirectory(tests)
--endif ()
-+endif()
-
- set(kritadefaulttools_SOURCES
- default_tools.cc
-diff --git a/plugins/tools/tool_transform2/CMakeLists.txt b/plugins/tools/tool_transform2/CMakeLists.txt
-index e90230c48e..2cf727a991 100644
---- a/plugins/tools/tool_transform2/CMakeLists.txt
-+++ b/plugins/tools/tool_transform2/CMakeLists.txt
-@@ -1,4 +1,4 @@
--if (NOT WIN32 AND NOT APPLE)
-+if(BUILD_TESTING AND NOT WIN32 AND NOT APPLE)
- add_subdirectory(tests)
- endif()
-
---
-2.27.0
-
diff --git a/media-gfx/krita/files/krita-4.4.2-quazip1.patch b/media-gfx/krita/files/krita-4.4.2-quazip1.patch
new file mode 100644
index 00000000000..6a49bd3ba2e
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.4.2-quazip1.patch
@@ -0,0 +1,36 @@
+From 3eaf480ae5d615e8e26153cca98115ff0f23135f Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Mon, 5 Oct 2020 20:11:26 +0200
+Subject: [PATCH] Support quazip 1.0
+
+Update FindQuaZip to find the QuaZip 1.0 library names and include dirs. Once support for quazip<1 is dropped this should be ported to use quazip's own QuaZipConfig
+---
+ cmake/modules/FindQuaZip.cmake | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/cmake/modules/FindQuaZip.cmake b/cmake/modules/FindQuaZip.cmake
+index 7e628fcd4b..345c7909ab 100644
+--- a/cmake/modules/FindQuaZip.cmake
++++ b/cmake/modules/FindQuaZip.cmake
+@@ -25,15 +25,15 @@ ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
+ ELSE(WIN32)
+ FIND_PACKAGE(PkgConfig)
+ # pkg_check_modules(PC_QCA2 QUIET qca2)
+- pkg_check_modules(PC_QUAZIP quazip)
++ pkg_check_modules(PC_QUAZIP quazip quazip1-qt5)
+ FIND_LIBRARY(QUAZIP_LIBRARIES
+ WIN32_DEBUG_POSTFIX d
+- NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX}
++ NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX} quazip1-qt5
+ HINTS /usr/lib /usr/lib64
+ )
+ FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h
+ HINTS /usr/include /usr/local/include
+- PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX}
++ PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX} QuaZip-Qt5-1.0/quazip
+ )
+ FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include)
+ ENDIF (WIN32)
+--
+GitLab
+
diff --git a/media-gfx/krita/krita-4.3.0.ebuild b/media-gfx/krita/krita-4.3.0.ebuild
deleted file mode 100644
index 745d2ca7bf0..00000000000
--- a/media-gfx/krita/krita-4.3.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{7,8,9} )
-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}/${PV}/${P}.tar.xz
- https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz"
- KEYWORDS="amd64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://apps.kde.org/en/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}"/${P}-tests-optional.patch
- "${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
- ecm_pkg_setup
-}
-
-src_prepare() {
- ecm_src_prepare
- sed -e "/CMAKE_CXX_STANDARD/s/11/14/" -i CMakeLists.txt || die
-}
-
-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/krita/krita-4.4.1.ebuild b/media-gfx/krita/krita-4.4.2.ebuild
index 1b8485696af..f6d505b9971 100644
--- a/media-gfx/krita/krita-4.4.1.ebuild
+++ b/media-gfx/krita/krita-4.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ inherit ecm kde.org python-single-r1
if [[ ${KDE_BUILD_TYPE} = release ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz"
- KEYWORDS="~amd64 ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
fi
DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
@@ -31,7 +31,7 @@ BDEPEND="
"
RDEPEND="${PYTHON_DEPS}
dev-libs/boost:=
- dev-libs/quazip
+ dev-libs/quazip:0=
$(python_gen_cond_dep '
dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
dev-python/sip[${PYTHON_MULTI_USEDEP}]
@@ -90,6 +90,7 @@ RESTRICT+=" test"
PATCHES=(
"${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
"${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch
+ "${FILESDIR}"/${P}-quazip1.patch
)
pkg_setup() {
@@ -108,7 +109,7 @@ src_configure() {
addpredict /dev/dri
local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_SeExpr2=ON # not packaged
+ -DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged
$(cmake_use_find_package color-management OCIO)
$(cmake_use_find_package fftw FFTW3)
$(cmake_use_find_package gif GIF)
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index e540bad6592..8bd330c0508 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -1,3 +1,3 @@
-DIST libimagequant-2.11.7.tar.gz 74311 BLAKE2B 204fbe794014c11d767991a03e729b234978fb1edb1fdffcb7d332461ccaa1a536a1e9dbc7b44a8838db61cc76fdbc1eb75087b480f4fc42bf791fea913639a2 SHA512 8816811c06eec27232e39725c581e382b7076f3bc23b017810de0e92236e6e4eb480def7b50347c9b75f7d792245669398c39a17359eb81077badf12e6f0a172
DIST libimagequant-2.12.2.tar.gz 75611 BLAKE2B 23f5d3666fd21696d4f4dab9db3669642a9e3f6ca971804b914e845018df538136c3db900419ac35230be9fd487b48e0ab672b653e2ee82387c19569b49d6cfc SHA512 7e7bfcffd163d8b73a46d523dc441e4a4726f5dde804f306f13900f74afae6f6e7cf780bf157b5823a71c790bcdd0e9c9c34cf43f84a21289e470fc78835d8d8
DIST libimagequant-2.12.3.tar.gz 75866 BLAKE2B 857a0e3f0187251e37e0c7f4f5f5cbf49266e4eb9f684118705778d9469330cf95780ea11b83d19e28251f047a7e9b8e7ac32ac4d9554cb5d9e1b3230d39e796 SHA512 4818b00b6f154407f3e402d56f4891c2d7594c8056fada0402d7fa0024ae50127340dd8295da5f5dca13fe1829670a3fa8793aa528f3e74a2294c9a7e37b7257
+DIST libimagequant-2.14.0.tar.gz 97471 BLAKE2B df6403aea0b0e3cbaf05c6c60726ac3de85195779e4829dd04acec28ba93ea8d629846fa71d765949e721f592300da1d35227ec7bb28e00c600c575ba3fdc4fe SHA512 d34aa2ac9f08eebd80fb9e3e7fe22a3f10ce840152c4192735d57ae37c223350af09eeff6870ee2634b3fc51b03d1663cd6afd17daeab923af3b5f60fbef57d4
diff --git a/media-gfx/libimagequant/files/libimagequant-2.14.0-fix-openmp-pragma.patch b/media-gfx/libimagequant/files/libimagequant-2.14.0-fix-openmp-pragma.patch
new file mode 100644
index 00000000000..7e2d5861961
--- /dev/null
+++ b/media-gfx/libimagequant/files/libimagequant-2.14.0-fix-openmp-pragma.patch
@@ -0,0 +1,25 @@
+From 44525d34b738f733a81037286ece603ca0fdcf10 Mon Sep 17 00:00:00 2001
+From: Kornel <kornel@geekhood.net>
+Date: Wed, 27 Jan 2021 17:36:33 +0000
+Subject: [PATCH] Update OMP pragma
+
+---
+ libimagequant.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/libimagequant.c b/libimagequant.c
+index 4f0b48f..828f768 100644
+--- a/libimagequant.c
++++ b/libimagequant.c
+@@ -1279,10 +1279,7 @@ LIQ_NONNULL static float remap_to_palette(liq_image *const input_image, unsigned
+
+ #if __GNUC__ >= 9 || __clang__
+ #pragma omp parallel for if (rows*cols > 3000) \
+- schedule(static) default(none) shared(acolormap,average_color,cols,input_image,map,n,output_pixels,rows,transparent_index) reduction(+:remapping_error)
+-#else
+- #pragma omp parallel for if (rows*cols > 3000) \
+- schedule(static) default(none) shared(acolormap) shared(average_color) reduction(+:remapping_error)
++ schedule(static) default(none) shared(background,acolormap,average_color,cols,input_image,map,n,output_pixels,rows,transparent_index) reduction(+:remapping_error)
+ #endif
+ for(int row = 0; row < rows; ++row) {
+ const f_pixel *const row_pixels = liq_image_get_row_f(input_image, row);
diff --git a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
index f14ba77a542..5ecbf05fe92 100644
--- a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="GPL-3"
SLOT="0/0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE="cpu_flags_x86_sse2 debug openmp static-libs"
DEPEND=""
diff --git a/media-gfx/libimagequant/libimagequant-2.12.3.ebuild b/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
index b434e3e4b78..a0eab3ab6c3 100644
--- a/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="GPL-3"
SLOT="0/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="cpu_flags_x86_sse2 debug openmp static-libs"
DEPEND=""
diff --git a/media-gfx/libimagequant/libimagequant-2.11.7.ebuild b/media-gfx/libimagequant/libimagequant-2.14.0.ebuild
index b318487fa32..21f2b031268 100644
--- a/media-gfx/libimagequant/libimagequant-2.11.7.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.14.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit toolchain-funcs
@@ -11,37 +11,37 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="GPL-3"
SLOT="0/0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="cpu_flags_x86_sse2 debug openmp static-libs"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cpu_flags_x86_sse2 debug openmp"
-DEPEND=""
-RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}"/libimagequant-2.12.2-respect-CFLAGS.patch
+ "${FILESDIR}"/libimagequant-2.12.2-fix-pkgconfig.patch
+ "${FILESDIR}"/libimagequant-2.14.0-fix-openmp-pragma.patch
+)
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
+src_prepare() {
+ default
+ sed -i '/install.*STATICLIB/d' Makefile || die
+}
+
src_configure() {
tc-export AR CC
# Hand rolled configure script, so not all flags are supported.
./configure \
--prefix="${EPREFIX}/usr" \
- $(use debug && echo --enable-debug) \
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \
+ $(use_enable debug) \
$(use_enable cpu_flags_x86_sse2 sse) \
$(use_with openmp) \
CFLAGS="${CFLAGS} ${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
+ LDFLAGS="${LDFLAGS}" || die
}
src_compile() {
- emake shared
- use static-libs && emake static
-}
-
-src_install() {
- dolib.so libimagequant.so
- dolib.so libimagequant.so.*
- use static-libs && dolib.a libimagequant.a
- doheader libimagequant.h
- einstalldocs
+ emake shared imagequant.pc
}
diff --git a/media-gfx/llgal/llgal-0.13.19.ebuild b/media-gfx/llgal/llgal-0.13.19-r1.ebuild
index e42d2ab056a..95f0b64a59c 100644
--- a/media-gfx/llgal/llgal-0.13.19.ebuild
+++ b/media-gfx/llgal/llgal-0.13.19-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,11 +15,13 @@ KEYWORDS="amd64 ~ppc x86"
# Package warrants IUSE doc and possibly examples
IUSE="exif"
-RDEPEND="media-gfx/imagemagick
+RDEPEND="
dev-perl/Image-Size
dev-perl/URI
dev-perl/Locale-gettext
- exif? ( media-libs/exiftool )"
+ exif? ( media-libs/exiftool )
+ virtual/imagemagick-tools
+"
S="${WORKDIR}/${PN}-${P}"
diff --git a/media-gfx/llgal/metadata.xml b/media-gfx/llgal/metadata.xml
index b946dc190e7..3b43b50502a 100644
--- a/media-gfx/llgal/metadata.xml
+++ b/media-gfx/llgal/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="person">
- <email>aballier@gentoo.org</email>
- <name>Alexis Ballier</name>
-</maintainer>
+ <maintainer type="person">
+ <email>aballier@gentoo.org</email>
+ <name>Alexis Ballier</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">bgoglin/llgal</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/media-gfx/lximage-qt/lximage-qt-0.16.0.ebuild b/media-gfx/lximage-qt/lximage-qt-0.16.0.ebuild
index 9fc843665a0..8bd658c7b2f 100644
--- a/media-gfx/lximage-qt/lximage-qt-0.16.0.ebuild
+++ b/media-gfx/lximage-qt/lximage-qt-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
else
SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
fi
LICENSE="GPL-2 GPL-2+"
diff --git a/media-gfx/maim/maim-5.6.3.ebuild b/media-gfx/maim/maim-5.6.3.ebuild
index 561201c54d1..1e8914586a3 100644
--- a/media-gfx/maim/maim-5.6.3.ebuild
+++ b/media-gfx/maim/maim-5.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://github.com/naelstrof/maim.git"
else
SRC_URI="https://github.com/naelstrof/maim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
fi
LICENSE="GPL-3"
diff --git a/media-gfx/mcomix/Manifest b/media-gfx/mcomix/Manifest
index 7070a2d548c..a0df5274dc4 100644
--- a/media-gfx/mcomix/Manifest
+++ b/media-gfx/mcomix/Manifest
@@ -1 +1,2 @@
DIST mcomix-1.3.0_pre20200206.tar.gz 3292571 BLAKE2B ad76316020645495042d27bf831588e628da11077efe29b302a57be4e688558b4db8d3f850200bf4a54b84b428a16a52f88ea5e20be85b628ef3630a5f624643 SHA512 c98d4a7022993af3a5c0b5425df52f14b586549472bcd4576a72039c8c6d4fde31df4255df45ab7467acb0280bda02b92d4803b7f92b7c1c818b58df7b52a3ff
+DIST mcomix-1.3.0_pre20201123.tar.gz 3888279 BLAKE2B 0bce5d8b3d6e20fc3c422d137963fa8cf506ce969bb5c8062b1db4dcd85d5c1912352fa1eb8c752719b0ac95715486ae47d56e0bf24119f9f55af56f6fbf657c SHA512 24b470e1dca266851bb241f109b39c785443ece36d12a01e579c8a59cb7585ad3978b3696829318f04d4b172cfcf57cf100d76c7c25765260bf26f698d85ba2a
diff --git a/media-gfx/mcomix/mcomix-1.3.0_pre20200206.ebuild b/media-gfx/mcomix/mcomix-1.3.0_pre20200206.ebuild
index 3e3e5684b3a..fe0ef2ebb67 100644
--- a/media-gfx/mcomix/mcomix-1.3.0_pre20200206.ebuild
+++ b/media-gfx/mcomix/mcomix-1.3.0_pre20200206.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
inherit desktop python-r1 xdg
# Hash used for this version
diff --git a/media-gfx/mcomix/mcomix-1.3.0_pre20201123.ebuild b/media-gfx/mcomix/mcomix-1.3.0_pre20201123.ebuild
new file mode 100644
index 00000000000..068254aaee8
--- /dev/null
+++ b/media-gfx/mcomix/mcomix-1.3.0_pre20201123.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit desktop python-r1 xdg
+
+# Hash used for this version
+GIT_PV="cdcb27533dc7ee2ebf7b0a8ab5ba10e61c0b8ff8"
+
+DESCRIPTION="GTK image viewer for comic book archives"
+HOMEPAGE="https://github.com/multiSnow/mcomix3"
+SRC_URI="https://github.com/multiSnow/mcomix3/archive/${GIT_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+ virtual/jpeg
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/pygobject[${PYTHON_USEDEP}]
+ !media-gfx/comix"
+BDEPEND="sys-devel/gettext"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S=${WORKDIR}/mcomix3-${GIT_PV}
+
+src_prepare() {
+ default
+
+ for file in mcomix/mcomix/messages/*/LC_MESSAGES/*po
+ do
+ msgfmt ${file} -o ${file/po/mo} || die
+ rm ${file} || die
+ done
+}
+
+src_install() {
+ python_foreach_impl python_domodule mcomix/mcomix
+ python_foreach_impl python_newscript mcomix/mcomixstarter.py mcomix
+
+ for size in 16 22 24 32 48
+ do
+ doicon -s ${size} \
+ mime/icons/${size}x${size}/*png \
+ mcomix/mcomix/images/${size}x${size}/mcomix.png
+ done
+ doicon mcomix/mcomix/images/mcomix.png
+ domenu mime/mcomix.desktop
+ doman man/mcomix.1
+
+ insinto /usr/share/metainfo
+ doins mime/mcomix.appdata.xml
+
+ dodoc README.rst TODO
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ 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
+}
diff --git a/media-gfx/mcomix/mcomix-9999.ebuild b/media-gfx/mcomix/mcomix-9999.ebuild
index 15afb7c558e..b489652caa2 100644
--- a/media-gfx/mcomix/mcomix-9999.ebuild
+++ b/media-gfx/mcomix/mcomix-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
inherit desktop git-r3 python-r1 xdg
DESCRIPTION="GTK image viewer for comic book archives"
@@ -52,9 +52,6 @@ src_install() {
insinto /usr/share/metainfo
doins mime/mcomix.appdata.xml
- insinto /usr/share/mime/packages
- doins mime/mcomix.xml
-
dodoc README.rst TODO
}
diff --git a/media-gfx/meshlab/Manifest b/media-gfx/meshlab/Manifest
index 4e546dc7ad7..0f1b247f501 100644
--- a/media-gfx/meshlab/Manifest
+++ b/media-gfx/meshlab/Manifest
@@ -1,2 +1,2 @@
-DIST meshlab-2016.12.tar.gz 94194402 BLAKE2B 53dda75b51198d529d35ae64e1b9d8ec240ec6031835e6cde2ff1ad21403086112a6f4b9acf5c6f53328787078b3e1a90cc177f5e009834b310cdf6b168c59b0 SHA512 68bf863fc390725a949578b545bc749bbe2c07ca75d1461772c7777fd6a4b095f11b64b5b0e8b729f83fea1bb9e3ca4b41123cdea3799a8eee0de587eb7bf1d8
-DIST vcglib-1.0.1.tar.gz 9063634 BLAKE2B 91fba7ebf1ac18d0dfb33d3e26656e546b7c35ae753777730c44ebdf327413dfe94dd5e84907eb7e1644d70bfdf7d00ae8ecd0a81587d790a31354f7db09d626 SHA512 55d1854054744abae2d41e7b5041df89253bae108df5fc1cfe777013de7192dce04bc474475cb11a1d0343ebcab1ea61b381d9d9c36c452528043e85e75bc211
+DIST meshlab-2020.12.tar.gz 111438055 BLAKE2B 4969c1f8f60be6ff55effd710c0bceb290ad6ac01153c233fd6a943f15e86189c04c06aa474ea89899d31b77d6960ffabbda6a12c3107d750469945e0c73c335 SHA512 0a00493f3e622a7bb0b70ddf0e1710376b47bd844aa785782a62f31a46ae1ee4b493c1e4ae0184f51f30be263f84efc0073e266d50748adc10ef229f107e4c87
+DIST vcglib-2020.12.tar.gz 6777201 BLAKE2B 9e2e3eb4ae7b930a8a334d58ee4bdadaf43e9a031d523471d17ca39d241c0dd66ec846a360cbcccd53d8728a2c7a6b6fa7d7a3efc04c01515ac3366b10f01aa8 SHA512 d7eec0c9c847e6ade7a3bee9aa1cddbb6855c388b15e2b35889ce998ea9a1c7afb0034ec31c38de3cbc2d867c8d8a474b13e4e2e3218e636926967abe4e54924
diff --git a/media-gfx/meshlab/files/2016.12/0001-compile-server.patch b/media-gfx/meshlab/files/2016.12/0001-compile-server.patch
deleted file mode 100644
index 6e2e31af9bd..00000000000
--- a/media-gfx/meshlab/files/2016.12/0001-compile-server.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 188c3465b9cc5be7c72b21e012a89b9d07e6e2c4 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <mohammadpour.sobhan@gmail.com>
-Date: Mon, 20 Nov 2017 14:40:02 +0330
-Subject: [PATCH] compile server
-
----
- meshlab_mini.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meshlab_mini.pro b/meshlab_mini.pro
-index abe0259..b18771e 100644
---- a/meshlab_mini.pro
-+++ b/meshlab_mini.pro
-@@ -34,4 +34,4 @@ SUBDIRS = common \
- # meshlabplugins/filter_unsharp \
- # meshlabplugins/io_collada \
- # meshlabplugins/io_x3d \
--# meshlabserver
-+ meshlabserver
---
-2.15.0
-
diff --git a/media-gfx/meshlab/files/2016.12/0001-depend-on-system-glew.patch b/media-gfx/meshlab/files/2016.12/0001-depend-on-system-glew.patch
deleted file mode 100644
index d8c5bb1f5aa..00000000000
--- a/media-gfx/meshlab/files/2016.12/0001-depend-on-system-glew.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 58a86b4c48ef89faa5d4d16c502d5350fb1c5df3 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
-Date: Thu, 23 Nov 2017 00:57:42 +0330
-Subject: [PATCH] depend-on-system-glew
-
----
- common/common.pro | 7 +------
- meshlab/meshlab.pro | 2 --
- 2 files changed, 1 insertion(+), 8 deletions(-)
-
-diff --git a/common/common.pro b/common/common.pro
-index 51cdcb5..85849dc 100644
---- a/common/common.pro
-+++ b/common/common.pro
-@@ -1,7 +1,6 @@
- include (../general.pri)
- EXIF_DIR = ../external/jhead-2.95
-
--GLEWCODE = $$GLEWDIR/src/glew.c
-
- win32-msvc2005:DESTDIR = ../distrib
- win32-msvc2008:DESTDIR = ../distrib
-@@ -53,9 +52,7 @@ ln -s ../../../meshlab/src/distrib/shaders ../distrib/shaders ;\
- echo "linked shader dir"; \
- fi;\
- "
--INCLUDEPATH *= ../.. \
-- $$VCGDIR \
-- $$GLEWDIR/include
-+
- TEMPLATE = lib
- linux-g++:CONFIG += dll
- linux-g++:DESTDIR = ../distrib
-@@ -80,7 +77,6 @@ QT += script
- TARGET = common
- DEPENDPATH += .
- INCLUDEPATH += . $$EXIF_DIR
--DEFINES += GLEW_STATIC
- win32-msvc2005:DEFINES += _CRT_SECURE_NO_WARNINGS
- win32-msvc2008:DEFINES += _CRT_SECURE_NO_WARNINGS
- win32-msvc2010:DEFINES += _CRT_SECURE_NO_WARNINGS
-@@ -117,7 +113,6 @@ SOURCES += filterparameter.cpp \
- mlapplication.cpp \
- scriptsyntax.cpp \
- searcher.cpp \
-- $$GLEWCODE \
- meshlabdocumentxml.cpp \
- meshlabdocumentbundler.cpp \
- ml_shared_data_context.cpp
-diff --git a/meshlab/meshlab.pro b/meshlab/meshlab.pro
-index 0e50581..37d44ba 100644
---- a/meshlab/meshlab.pro
-+++ b/meshlab/meshlab.pro
-@@ -9,7 +9,6 @@ INCLUDEPATH *= . \
- .. \
- ../.. \
- $$VCGDIR \
-- $$GLEWDIR/include \
- $$EXIF_DIR
- DEPENDPATH += $$VCGDIR \
- $$VCGDIR/vcg \
-@@ -64,7 +63,6 @@ SOURCES = main.cpp \
- $$VCGDIR/wrap/gui/trackball.cpp \
- $$VCGDIR/wrap/gui/trackmode.cpp \
- $$VCGDIR/wrap/gui/coordinateframe.cpp \
-- #$$GLEWDIR/src/glew.c \
- glarea_setting.cpp \
- filterthread.cpp
-
---
-2.15.0
-
diff --git a/media-gfx/meshlab/files/2016.12/0001-disable-edit-quality.patch b/media-gfx/meshlab/files/2016.12/0001-disable-edit-quality.patch
deleted file mode 100644
index ed58bc0cb97..00000000000
--- a/media-gfx/meshlab/files/2016.12/0001-disable-edit-quality.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 59588b3198e0ca6cd97265a65ea87b40897d3bd9 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
-Date: Thu, 23 Nov 2017 00:41:15 +0330
-Subject: [PATCH] disable-edit-quality
-
----
- meshlab_full.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meshlab_full.pro b/meshlab_full.pro
-index 143e226..9939225 100644
---- a/meshlab_full.pro
-+++ b/meshlab_full.pro
-@@ -69,7 +69,7 @@ SUBDIRS = common \
- meshlabplugins/edit_pickpoints \
- meshlabplugins/edit_point\
- plugins_experimental/edit_referencing \
-- meshlabplugins/edit_quality \
-+# meshlabplugins/edit_quality \
- meshlabplugins/edit_select \
- # Sample Plugins
- sampleplugins/sampleedit \
---
-2.15.0
-
diff --git a/media-gfx/meshlab/files/2016.12/0001-disable-filter-layer.patch b/media-gfx/meshlab/files/2016.12/0001-disable-filter-layer.patch
deleted file mode 100644
index 407d7775f9f..00000000000
--- a/media-gfx/meshlab/files/2016.12/0001-disable-filter-layer.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 90862a887b923984e17343447c30251f2d6fc541 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
-Date: Thu, 23 Nov 2017 12:37:14 +0330
-Subject: [PATCH] disable filter layer
-
----
- meshlab_full.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meshlab_full.pro b/meshlab_full.pro
-index 9939225..1691d31 100644
---- a/meshlab_full.pro
-+++ b/meshlab_full.pro
-@@ -34,7 +34,7 @@ SUBDIRS = common \
- sampleplugins/filter_geodesic \
- meshlabplugins/filter_img_patch_param \
- meshlabplugins/filter_isoparametrization \
-- meshlabplugins/filter_layer \
-+# meshlabplugins/filter_layer \
- meshlabplugins/filter_measure \
- meshlabplugins/filter_meshing \
- plugins_experimental/filter_mutualglobal \
---
-2.15.0
-
diff --git a/media-gfx/meshlab/files/2016.12/0001-disable-filter-ssynth.patch b/media-gfx/meshlab/files/2016.12/0001-disable-filter-ssynth.patch
deleted file mode 100644
index c5f84998a62..00000000000
--- a/media-gfx/meshlab/files/2016.12/0001-disable-filter-ssynth.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 22f946dece8e56683a197204ac05292045a3dda1 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
-Date: Wed, 22 Nov 2017 23:20:57 +0330
-Subject: [PATCH] disable-filter-ssynth
-
----
- meshlab_full.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meshlab_full.pro b/meshlab_full.pro
-index 4a256a1..143e226 100644
---- a/meshlab_full.pro
-+++ b/meshlab_full.pro
-@@ -49,7 +49,7 @@ SUBDIRS = common \
- meshlabplugins/filter_sdfgpu \
- meshlabplugins/filter_select \
- plugins_experimental/filter_sketchfab \
-- meshlabplugins/filter_ssynth \
-+# meshlabplugins/filter_ssynth \
- meshlabplugins/filter_texture \
- meshlabplugins/filter_trioptimize \
- meshlabplugins/filter_unsharp \
---
-2.15.0
-
diff --git a/media-gfx/meshlab/files/2016.12/0001-remove-not-sane-plugins.patch b/media-gfx/meshlab/files/2016.12/0001-remove-not-sane-plugins.patch
deleted file mode 100644
index 320912c40ed..00000000000
--- a/media-gfx/meshlab/files/2016.12/0001-remove-not-sane-plugins.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0358aad037efc55701622884bf0ed1249a08387f Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
-Date: Thu, 23 Nov 2017 02:23:03 +0330
-Subject: [PATCH] remove not sane plugins
-
----
- meshlab_full.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meshlab_full.pro b/meshlab_full.pro
-index 9939225..b8a6bce 100644
---- a/meshlab_full.pro
-+++ b/meshlab_full.pro
-@@ -27,7 +27,7 @@ SUBDIRS = common \
- meshlabplugins/filter_color_projection \
- meshlabplugins/filter_create \
- sampleplugins/filter_createiso \
-- meshlabplugins/filter_csg \
-+# meshlabplugins/filter_csg \
- meshlabplugins/filter_dirt \
- meshlabplugins/filter_fractal \
- meshlabplugins/filter_func \
---
-2.15.0
-
diff --git a/media-gfx/meshlab/files/2016.12/0001-set-shader-and-texture-paths.patch b/media-gfx/meshlab/files/2016.12/0001-set-shader-and-texture-paths.patch
deleted file mode 100644
index a1a4f3f860a..00000000000
--- a/media-gfx/meshlab/files/2016.12/0001-set-shader-and-texture-paths.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-From 4780d519177021364427b44567fd9a67879435aa Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
-Date: Fri, 24 Nov 2017 18:20:11 +0330
-Subject: [PATCH] set shader and texture paths
-
----
- meshlabplugins/render_gdp/meshrender.cpp | 6 +++++-
- meshlabplugins/render_gdp/shaderDialog.cpp | 6 +++++-
- plugins_experimental/render_splatpyramid/dialog.cpp | 7 +++++--
- plugins_experimental/render_splatpyramid/splat_pyramid.cc | 6 +++++-
- plugins_unsupported/render_rm/glstateholder.cpp | 12 ++++++++++--
- plugins_unsupported/render_rm/rmmeshrender.cpp | 6 +++++-
- plugins_unsupported/render_rm/rmshaderdialog.cpp | 10 +++++++++-
- 7 files changed, 44 insertions(+), 9 deletions(-)
-
-diff --git a/meshlabplugins/render_gdp/meshrender.cpp b/meshlabplugins/render_gdp/meshrender.cpp
-index 5841ce6..28e66b3 100644
---- a/meshlabplugins/render_gdp/meshrender.cpp
-+++ b/meshlabplugins/render_gdp/meshrender.cpp
-@@ -38,7 +38,11 @@ void MeshShaderRenderPlugin::initActionList() {
- qaNone->setCheckable(false);
- actionList << qaNone;*/
-
-- QDir shadersDir = QDir(qApp->applicationDirPath());
-+#if defined(Q_OS_LINUX)
-+ QDir shadersDir("/usr/share/meshlab");
-+#else
-+ QDir shadersDir = QDir(qApp->applicationDirPath());
-+#endif
- #if defined(Q_OS_WIN)
- if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release" || shadersDir.dirName() == "plugins")
- shadersDir.cdUp();
-diff --git a/meshlabplugins/render_gdp/shaderDialog.cpp b/meshlabplugins/render_gdp/shaderDialog.cpp
-index 1315757..168c0f8 100644
---- a/meshlabplugins/render_gdp/shaderDialog.cpp
-+++ b/meshlabplugins/render_gdp/shaderDialog.cpp
-@@ -317,7 +317,11 @@ void ShaderDialog::changeTexturePath(int i) {
- void ShaderDialog::browseTexturePath(int i) {
- QFileDialog fd(0,"Choose new texture");
-
-- QDir shadersDir = QDir(qApp->applicationDirPath());
-+#if defined(Q_OS_LINUX)
-+ QDir shadersDir("/usr/share/meshlab");
-+#else
-+ QDir shadersDir = QDir(qApp->applicationDirPath());
-+#endif
- #if defined(Q_OS_WIN)
- if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release")
- shadersDir.cdUp();
-diff --git a/plugins_experimental/render_splatpyramid/dialog.cpp b/plugins_experimental/render_splatpyramid/dialog.cpp
-index 589ba48..11cf3fe 100644
---- a/plugins_experimental/render_splatpyramid/dialog.cpp
-+++ b/plugins_experimental/render_splatpyramid/dialog.cpp
-@@ -122,8 +122,11 @@ void Dialog::changeTexturePath(int i) {
-
- void Dialog::browseTexturePath(int i) {
- QFileDialog fd(0,"Choose new texture");
--
-- QDir shadersDir = QDir(qApp->applicationDirPath());
-+#if defined(Q_OS_LINUX)
-+ QDir shadersDir("/usr/share/meshlab");
-+#else
-+ QDir shadersDir = QDir(qApp->applicationDirPath());
-+#endif
- #if defined(Q_OS_WIN)
- if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release")
- shadersDir.cdUp();
-diff --git a/plugins_experimental/render_splatpyramid/splat_pyramid.cc b/plugins_experimental/render_splatpyramid/splat_pyramid.cc
-index a4915d1..75074a6 100644
---- a/plugins_experimental/render_splatpyramid/splat_pyramid.cc
-+++ b/plugins_experimental/render_splatpyramid/splat_pyramid.cc
-@@ -85,7 +85,11 @@ void PyramidPointRendererPlugin::Init(QAction *, MeshDocument &md, RenderMode &,
- objects[i].setRendererType( render_mode );
-
- /// Sets the path to the meshlab's shaders directory
-- QDir shadersDir = QDir(qApp->applicationDirPath());
-+#if defined(Q_OS_LINUX)
-+ QDir shadersDir("/usr/share/meshlab");
-+#else
-+ QDir shadersDir = QDir(qApp->applicationDirPath());
-+#endif
- #if defined(Q_OS_WIN)
- if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release" || shadersDir.dirName() == "plugins" )
- shadersDir.cdUp();
-diff --git a/plugins_unsupported/render_rm/glstateholder.cpp b/plugins_unsupported/render_rm/glstateholder.cpp
-index fa7cdd9..544c6b3 100644
---- a/plugins_unsupported/render_rm/glstateholder.cpp
-+++ b/plugins_unsupported/render_rm/glstateholder.cpp
-@@ -75,8 +75,12 @@ UniformValue::UniformValue(UniformVar &v)
-
- // if it's a texture, try to load it from the standard path
- if (!textureFilename.isEmpty()) {
-+#if defined(Q_OS_LINUX)
-+ QDir textureDir("/usr/share/meshlab");
-+#else
- QDir textureDir = QDir(qApp->applicationDirPath());
--
-+#endif
-+
- #if defined(Q_OS_WIN)
- if (textureDir.dirName() == "debug" ||
- textureDir.dirName() == "release" ||
-@@ -158,7 +162,11 @@ void UniformValue::updateUniformVariableValuesFromDialog(int rowIdx, int colIdx,
- // * choose the filename with a dialog (55 by convention)
- if (rowIdx == 5 && colIdx == 5) {
- QFileDialog fd(0, "Choose new texture");
-- QDir texturesDir = QDir(qApp->applicationDirPath());
-+#if defined(Q_OS_LINUX)
-+ QDir textureDir("/usr/share/meshlab");
-+#else
-+ QDir textureDir = QDir(qApp->applicationDirPath());
-+#endif
-
- #if defined(Q_OS_WIN)
- if (texturesDir.dirName() == "debug" ||
-diff --git a/plugins_unsupported/render_rm/rmmeshrender.cpp b/plugins_unsupported/render_rm/rmmeshrender.cpp
-index 9e516d2..f367842 100644
---- a/plugins_unsupported/render_rm/rmmeshrender.cpp
-+++ b/plugins_unsupported/render_rm/rmmeshrender.cpp
-@@ -63,7 +63,11 @@ QList<QAction*> RmMeshShaderRenderPlugin::actions()
-
- void RmMeshShaderRenderPlugin::initActionList() {
-
-- QDir shadersDir = QDir(qApp->applicationDirPath());
-+#if defined(Q_OS_LINUX)
-+ QDir shadersDir("/usr/share/meshlab/shaders");
-+#else
-+ QDir shadersDir = QDir(qApp->applicationDirPath());
-+#endif
- #if defined(Q_OS_WIN)
- if (shadersDir.dirName() == "debug" ||
- shadersDir.dirName() == "release" ||
-diff --git a/plugins_unsupported/render_rm/rmshaderdialog.cpp b/plugins_unsupported/render_rm/rmshaderdialog.cpp
-index 1f6c02b..6c8af80 100644
---- a/plugins_unsupported/render_rm/rmshaderdialog.cpp
-+++ b/plugins_unsupported/render_rm/rmshaderdialog.cpp
-@@ -332,7 +332,11 @@ void RmShaderDialog::fillTabsWithPass(int index)
-
- QFileInfo finfo(v.textureFilename);
-
-+ #if defined(Q_OS_LINUX)
-+ QDir textureDir("/usr/share/meshlab");
-+ #else
- QDir textureDir = QDir(qApp->applicationDirPath());
-+ #endif
- #if defined(Q_OS_WIN)
- if (textureDir.dirName() == "debug" || textureDir.dirName() == "release" || textureDir.dirName() == "plugins" ) textureDir.cdUp();
- #elif defined(Q_OS_MAC)
-@@ -444,7 +448,11 @@ void RmShaderDialog::valuesChanged(const QString & varNameAndIndex )
- // choose the filename with a dialog
- QFileDialog fd(0,"Choose new texture");
-
-- QDir texturesDir = QDir(qApp->applicationDirPath());
-+#if defined(Q_OS_LINUX)
-+ QDir textureDir("/usr/share/meshlab");
-+#else
-+ QDir textureDir = QDir(qApp->applicationDirPath());
-+#endif
- #if defined(Q_OS_WIN)
- if (texturesDir.dirName() == "debug" || texturesDir.dirName() == "release") texturesDir.cdUp();
- #elif defined(Q_OS_MAC)
---
-2.15.0
-
diff --git a/media-gfx/meshlab/files/2016.12/0001-update-1.3.3-pluginmanager.patch.patch b/media-gfx/meshlab/files/2016.12/0001-update-1.3.3-pluginmanager.patch.patch
deleted file mode 100644
index 9f6d7487817..00000000000
--- a/media-gfx/meshlab/files/2016.12/0001-update-1.3.3-pluginmanager.patch.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 6310a419f2a0e0f11f59a60fee850a1b64c2f41e Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
-Date: Fri, 24 Nov 2017 17:47:43 +0330
-Subject: [PATCH] update 1.3.3/pluginmanager.patch
-
----
- common/pluginmanager.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/common/pluginmanager.cpp b/common/pluginmanager.cpp
-index 5354055..551e73f 100644
---- a/common/pluginmanager.cpp
-+++ b/common/pluginmanager.cpp
-@@ -189,8 +189,11 @@ QString PluginManager::osDependentFileBaseName(const QString &plname)
-
- QString PluginManager::getBaseDirPath()
- {
-+ #if defined(Q_OS_LINUX)
-+ QDir baseDir("/usr/lib/meshlab");
-+ #else
- QDir baseDir(qApp->applicationDirPath());
--
-+ #endif
- #if defined(Q_OS_WIN)
- // Windows:
- // during development with visual studio binary could be in the debug/release subdir.
---
-2.15.0
-
diff --git a/media-gfx/meshlab/files/2016.12/0001-use-external-bzip.patch b/media-gfx/meshlab/files/2016.12/0001-use-external-bzip.patch
deleted file mode 100644
index e01d5ebae85..00000000000
--- a/media-gfx/meshlab/files/2016.12/0001-use-external-bzip.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 731519b5573ab503b78f2c892e2d5c4bcabef1ea Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
-Date: Wed, 22 Nov 2017 23:33:11 +0330
-Subject: [PATCH] use-external-bzip
-
----
- meshlabplugins/edit_arc3D/edit_arc3D.pro | 31 -------------------------------
- 1 file changed, 31 deletions(-)
-
-diff --git a/meshlabplugins/edit_arc3D/edit_arc3D.pro b/meshlabplugins/edit_arc3D/edit_arc3D.pro
-index 08b5860..75db42c 100644
---- a/meshlabplugins/edit_arc3D/edit_arc3D.pro
-+++ b/meshlabplugins/edit_arc3D/edit_arc3D.pro
-@@ -28,34 +28,3 @@ SOURCES += edit_arc3D.cpp \
- TARGET = edit_arc3D
- RESOURCES = edit_arc3D.qrc
-
--win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/bz2.lib
--win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/bz2.lib
--win32-msvc2010:LIBS += ../../external/lib/win32-msvc2010/bz2.lib
--win32-msvc2012:LIBS += ../../external/lib/win32-msvc2012/bz2.lib
--win32-msvc2013:LIBS += ../../external/lib/win32-msvc2013/bz2.lib
--win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/bz2.lib
--win32-g++:LIBS += ../../external/lib/win32-gcc/libbz2.a
--linux-g++:LIBS += ../../external/lib/linux-g++/libbz2.a
--linux-g++-32:LIBS += ../../external/lib/linux-g++-32/libbz2.a
--linux-g++-64:LIBS += ../../external/lib/linux-g++-64/libbz2.a
--mac:LIBS += -lbz2
--
--win32-msvc2005:INCLUDEPATH += ../../external/bzip2-1.0.5
--win32-msvc2008:INCLUDEPATH += ../../external/bzip2-1.0.5
--win32-msvc2010:INCLUDEPATH += ../../external/bzip2-1.0.5
--win32-msvc2012:INCLUDEPATH += ../../external/bzip2-1.0.5
--win32-msvc2013:INCLUDEPATH += ../../external/bzip2-1.0.5
--win32-msvc2015:INCLUDEPATH += ../../external/bzip2-1.0.5
--
--win32-g++:INCLUDEPATH += ../../external/bzip2-1.0.5
--linux-g++:INCLUDEPATH += ../../external/bzip2-1.0.5
--linux-g++-32:INCLUDEPATH += ../../external/bzip2-1.0.5
--linux-g++-64:INCLUDEPATH += ../../external/bzip2-1.0.5
--
--
--CONFIG(release, debug|release) {
-- win32-g++:release:QMAKE_CXXFLAGS -= -O2
-- win32-g++:release:QMAKE_CFLAGS -= -O2
-- win32-g++:release:QMAKE_CXXFLAGS += -O3 -mtune=pentium3 -ffast-math
--}
--
---
-2.15.0
-
diff --git a/media-gfx/meshlab/files/2016.12/0001-use-external-glew.patch b/media-gfx/meshlab/files/2016.12/0001-use-external-glew.patch
deleted file mode 100644
index 58d76049992..00000000000
--- a/media-gfx/meshlab/files/2016.12/0001-use-external-glew.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 3b698bccccaeeee03c4bf454971b9c4bc00f2450 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
-Date: Thu, 23 Nov 2017 01:22:19 +0330
-Subject: [PATCH] use-external-glew
-
----
- common/common.pro | 7 ++++---
- meshlab/meshlab.pro | 8 ++++----
- meshlabserver/meshlabserver.pro | 8 ++++----
- 3 files changed, 12 insertions(+), 11 deletions(-)
-
-diff --git a/common/common.pro b/common/common.pro
-index 8bdf6a5..0edc245 100644
---- a/common/common.pro
-+++ b/common/common.pro
-@@ -1,7 +1,7 @@
- include (../general.pri)
- #EXIF_DIR = ../external/jhead-2.95
-
--GLEWCODE = $$GLEWDIR/src/glew.c
-+#GLEWCODE = $$GLEWDIR/src/glew.c
-
- win32-msvc2005:DESTDIR = ../distrib
- win32-msvc2008:DESTDIR = ../distrib
-@@ -55,7 +55,8 @@ fi;\
- "
- INCLUDEPATH *= ../.. \
- $$VCGDIR \
-- $$GLEWDIR/include
-+# $$GLEWDIR/include
-+
- TEMPLATE = lib
- linux-g++:CONFIG += dll
- linux-g++:DESTDIR = ../distrib
-@@ -80,7 +81,7 @@ QT += script
- TARGET = common
- DEPENDPATH += .
- #INCLUDEPATH += . $$EXIF_DIR
--DEFINES += GLEW_STATIC
-+#DEFINES += GLEW_STATIC
- win32-msvc2005:DEFINES += _CRT_SECURE_NO_WARNINGS
- win32-msvc2008:DEFINES += _CRT_SECURE_NO_WARNINGS
- win32-msvc2010:DEFINES += _CRT_SECURE_NO_WARNINGS
-diff --git a/meshlab/meshlab.pro b/meshlab/meshlab.pro
-index 5456342..9d45834 100644
---- a/meshlab/meshlab.pro
-+++ b/meshlab/meshlab.pro
-@@ -9,7 +9,7 @@ INCLUDEPATH *= . \
- .. \
- ../.. \
- $$VCGDIR \
-- $$GLEWDIR/include \
-+# $$GLEWDIR/include \
- # $$EXIF_DIR
-
- DEPENDPATH += $$VCGDIR \
-@@ -151,11 +151,11 @@ win32-g++:LIBS += -L../external/lib/win32-gcc -ljhead -L../distrib -lcom
- # win32-g++:release:LIBS += -L../common/release -lcommon
- #}
-
--linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU
-+linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU -lGLEW
- linux-g++:QMAKE_RPATHDIR += ../distrib
--linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -ljhead -L../distrib -lcommon -lGLU
-+linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -ljhead -L../distrib -lcommon -lGLU -lGLEW
- linux-g++-32:QMAKE_RPATHDIR += ../distrib
--linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -ljhead -L../distrib -lcommon -lGLU
-+linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -ljhead -L../distrib -lcommon -lGLU -lGLEW
- linux-g++-64:QMAKE_RPATHDIR += ../distrib
-
- # uncomment in your local copy only in emergency cases.
-diff --git a/meshlabserver/meshlabserver.pro b/meshlabserver/meshlabserver.pro
-index c9f5d0e..2b96033 100644
---- a/meshlabserver/meshlabserver.pro
-+++ b/meshlabserver/meshlabserver.pro
-@@ -28,12 +28,12 @@ win32-msvc2008: LIBS += -L../distrib -lcommon -lopengl32 -lGLU32
- win32-msvc2010: LIBS += -L../distrib -lcommon -lopengl32 -lGLU32
- win32-msvc2012: LIBS += -L../distrib -lcommon -lopengl32 -lGLU32
- win32-msvc2015: LIBS += -L../distrib -lcommon -lopengl32 -lGLU32
--win32-g++: LIBS += -L../distrib -lcommon
--linux-g++: LIBS += -L../distrib -lcommon
-+win32-g++: LIBS += -L../distrib -lcommon
-+linux-g++: LIBS += -L../distrib -lcommon -lGLEW
- linux-g++:QMAKE_RPATHDIR += ../distrib
--linux-g++-32: LIBS += -L../distrib -lcommon
-+linux-g++-32: LIBS += -L../distrib -lcommon -lGLEW
- linux-g++-32:QMAKE_RPATHDIR += ../distrib
--linux-g++-64: LIBS += -L../distrib -lcommon
-+linux-g++-64: LIBS += -L../distrib -lcommon -lGLEW
- linux-g++-64:QMAKE_RPATHDIR += ../distrib
- #CONFIG (release,debug | release) {
- # win32-msvc2005:release: LIBS += -L../common/release -lcommon
---
-2.15.0
-
diff --git a/media-gfx/meshlab/files/2016.12/0001-use-external-jhead.patch b/media-gfx/meshlab/files/2016.12/0001-use-external-jhead.patch
deleted file mode 100644
index 002c2dc3bdf..00000000000
--- a/media-gfx/meshlab/files/2016.12/0001-use-external-jhead.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 68d92b2de5d598d4d85e2cdbddec5219ba317796 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
-Date: Thu, 23 Nov 2017 01:21:10 +0330
-Subject: [PATCH] use-external-jhead
-
----
- common/common.pro | 4 ++--
- meshlab/meshlab.pro | 5 +++--
- 2 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/common/common.pro b/common/common.pro
-index 51cdcb5..8bdf6a5 100644
---- a/common/common.pro
-+++ b/common/common.pro
-@@ -1,5 +1,5 @@
- include (../general.pri)
--EXIF_DIR = ../external/jhead-2.95
-+#EXIF_DIR = ../external/jhead-2.95
-
- GLEWCODE = $$GLEWDIR/src/glew.c
-
-@@ -79,7 +79,7 @@ QT += script
-
- TARGET = common
- DEPENDPATH += .
--INCLUDEPATH += . $$EXIF_DIR
-+#INCLUDEPATH += . $$EXIF_DIR
- DEFINES += GLEW_STATIC
- win32-msvc2005:DEFINES += _CRT_SECURE_NO_WARNINGS
- win32-msvc2008:DEFINES += _CRT_SECURE_NO_WARNINGS
-diff --git a/meshlab/meshlab.pro b/meshlab/meshlab.pro
-index 0e50581..5456342 100644
---- a/meshlab/meshlab.pro
-+++ b/meshlab/meshlab.pro
-@@ -1,7 +1,7 @@
- include (../general.pri)
- #CONFIG += debug_and_release
- DESTDIR = ../distrib
--EXIF_DIR = ../external/jhead-2.95
-+#EXIF_DIR = ../external/jhead-2.95
-
- DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x000000
-
-@@ -10,7 +10,8 @@ INCLUDEPATH *= . \
- ../.. \
- $$VCGDIR \
- $$GLEWDIR/include \
-- $$EXIF_DIR
-+# $$EXIF_DIR
-+
- DEPENDPATH += $$VCGDIR \
- $$VCGDIR/vcg \
- $$VCGDIR/wrap
---
-2.15.0
-
diff --git a/media-gfx/meshlab/files/2016.12/0001-use-external-lib3ds.patch b/media-gfx/meshlab/files/2016.12/0001-use-external-lib3ds.patch
deleted file mode 100644
index acbd8f4b5fe..00000000000
--- a/media-gfx/meshlab/files/2016.12/0001-use-external-lib3ds.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 911bc805f89c464540fdce4c16e15f64476cf161 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
-Date: Wed, 22 Nov 2017 19:25:35 +0330
-Subject: [PATCH] use-external-lib3ds
-
----
- meshlabplugins/io_3ds/io_3ds.pro | 24 ------------------------
- 1 file changed, 24 deletions(-)
-
-diff --git a/meshlabplugins/io_3ds/io_3ds.pro b/meshlabplugins/io_3ds/io_3ds.pro
-index 601f5da..5a19589 100644
---- a/meshlabplugins/io_3ds/io_3ds.pro
-+++ b/meshlabplugins/io_3ds/io_3ds.pro
-@@ -9,31 +9,7 @@ HEADERS = meshio.h \
- io_3ds.h
-
- SOURCES += meshio.cpp \
--
--DEFINES += LIB3DS_STATIC
-
- TARGET = io_3ds
-
--INCLUDEPATH += ../../external/lib3ds-1.3.0/
--
--# Notes on the paths of lib3ds files.
--# Once you have compiled the library put the lib files in a dir named lib/XXX/
--# where XXX is the name of your system according to the QT naming style.
--# Linux users can rely on their own package managers and hope that it is installing the last version of lib3ds
--
--win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/3ds.lib
--win32-msvc.net:LIBS += ../../external/lib/win32-msvc.net/3ds.lib
--win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/3ds.lib
--win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/3ds.lib
--win32-g++:LIBS += ../../external/lib/win32-gcc/lib3ds.a
--linux-g++:LIBS += ../../external/lib/linux-g++/lib3ds.a
--linux-g++-32:LIBS += ../../external/lib/linux-g++-32/lib3ds.a
--linux-g++-64:LIBS += ../../external/lib/linux-g++-64/lib3ds.a
--
--# unix:LIBS += -L../../../../code/lib/lib3ds-1.3.0/lib3ds/lib/unix -l3ds
--
--# mac:LIBS -= -l3ds
--# mac:LIBS += ../../../../code/lib/lib3ds-1.3.0/lib/mac/lib3ds.a
--
--macx:LIBS += $$MACLIBDIR/lib3ds.a
-
---
-2.15.0
-
diff --git a/media-gfx/meshlab/files/2016.12/0001-use-external-muParser.patch b/media-gfx/meshlab/files/2016.12/0001-use-external-muParser.patch
deleted file mode 100644
index f107d5bc69e..00000000000
--- a/media-gfx/meshlab/files/2016.12/0001-use-external-muParser.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 0928f85bc8fb8215a98c5a115d85269f51f65b5e Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
-Date: Wed, 22 Nov 2017 22:49:16 +0330
-Subject: [PATCH] use-external-muParser
-
----
- meshlabplugins/filter_func/filter_func.pro | 17 -----------------
- 1 file changed, 17 deletions(-)
-
-diff --git a/meshlabplugins/filter_func/filter_func.pro b/meshlabplugins/filter_func/filter_func.pro
-index a7cc17a..23d5578 100644
---- a/meshlabplugins/filter_func/filter_func.pro
-+++ b/meshlabplugins/filter_func/filter_func.pro
-@@ -6,20 +6,3 @@ SOURCES += filter_func.cpp
-
- TARGET = filter_func
-
--INCLUDEPATH += ../../external/muparser_v225/include
--
--# Note: we need static libs so when building muparser lib use
--# ./configure --enable-shared=no
--
--win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/muparser.lib
--win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/muparser.lib
--win32-msvc2010:LIBS += ../../external/lib/win32-msvc2010/muparser.lib
--win32-msvc2012:LIBS += ../../external/lib/win32-msvc2012/muparser.lib
--win32-msvc2013:LIBS += ../../external/lib/win32-msvc2013/muparser.lib
--win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/muparser.lib
--
--macx:LIBS += $$MACLIBDIR/libmuparser.a
--linux-g++:LIBS += ../../external/lib/linux-g++/libmuparser.a
--linux-g++-32:LIBS += ../../external/lib/linux-g++-32/libmuparser.a
--linux-g++-64:LIBS += ../../external/lib/linux-g++-64/libmuparser.a
--win32-g++:LIBS += ../../external/lib/win32-gcc/libmuparser.a
---
-2.15.0
-
diff --git a/media-gfx/meshlab/files/2016.12/0001-use-external-openctm.patch b/media-gfx/meshlab/files/2016.12/0001-use-external-openctm.patch
deleted file mode 100644
index 7c48aa14a74..00000000000
--- a/media-gfx/meshlab/files/2016.12/0001-use-external-openctm.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 7af5fa63c7577d4da060a2a8442b2f453023be86 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
-Date: Wed, 22 Nov 2017 22:41:39 +0330
-Subject: [PATCH] use-external-openctm
-
----
- meshlabplugins/io_ctm/io_ctm.pro | 20 --------------------
- 1 file changed, 20 deletions(-)
-
-diff --git a/meshlabplugins/io_ctm/io_ctm.pro b/meshlabplugins/io_ctm/io_ctm.pro
-index 479b64e..434e6ad 100644
---- a/meshlabplugins/io_ctm/io_ctm.pro
-+++ b/meshlabplugins/io_ctm/io_ctm.pro
-@@ -3,26 +3,6 @@ HEADERS += io_ctm.h \
- $$VCGDIR/wrap/io_trimesh/import_ctm.h \
- $$VCGDIR/wrap/io_trimesh/export_ctm.h
- SOURCES += io_ctm.cpp
--INCLUDEPATH += ../../external/OpenCTM-1.0.3/lib
- TARGET = io_ctm
-
--win32-msvc.net:QMAKE_CXXFLAGS += /DOPENCTM_STATIC
--win32-msvc2005:QMAKE_CXXFLAGS += /DOPENCTM_STATIC
--win32-msvc2008:QMAKE_CXXFLAGS += /DOPENCTM_STATIC
--win32-msvc2010:QMAKE_CXXFLAGS += /DOPENCTM_STATIC
--win32-msvc2012:QMAKE_CXXFLAGS += /DOPENCTM_STATIC
--win32-msvc2015:QMAKE_CXXFLAGS += /DOPENCTM_STATIC
--win32-g++:DEFINES += OPENCTM_STATIC
-
--win32-msvc.net:LIBS += ../../external/lib/win32-msvc.net/openctm.lib
--win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/openctm.lib
--win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/openctm.lib
--win32-msvc2010:LIBS += ../../external/lib/win32-msvc2010/openctm.lib
--win32-msvc2012:LIBS += ../../external/lib/win32-msvc2012/openctm.lib
--win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/openctm.lib
--win32-g++:LIBS += ../../external/lib/win32-gcc/libopenctm.a
--linux-g++:LIBS += ../../external/lib/linux-g++/libopenctm.a
--linux-g++-32:LIBS += ../../external/lib/linux-g++-32/libopenctm.a
--linux-g++-64:LIBS += ../../external/lib/linux-g++-64/libopenctm.a
--#macx:LIBS += ../../external/lib/macx/libopenctm.a
--macx:LIBS += $$MACLIBDIR/libopenctm.a
---
-2.15.0
-
diff --git a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-align1.patch b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-align1.patch
deleted file mode 100644
index cdba89c0ac3..00000000000
--- a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-align1.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/meshlabplugins/edit_align/align/AlignGlobal.cpp 2016-12-23 13:24:59.000000000 +0300
-+++ b/meshlabplugins/edit_align/align/AlignGlobal.cpp 2017-11-26 03:05:11.010113483 +0300
-@@ -429,11 +429,11 @@
-
- ******************************/
-
--bool AlignGlobal::GlobalAlign(const std::map<int,string> &Names, const double epsilon, int maxiter, bool Rigid, FILE *elfp, CallBack* cb )
-+bool AlignGlobal::GlobalAlign(const std::map<int,string> &Names, const double epsilon, int maxiter, bool Rigid, FILE *elfp, CallBackPos* cb )
- {
- double change;
- int step, localmaxiter;
-- cb("Global Alignment...");
-+ cb(0,"Global Alignment...");
- LOG(elfp,"----------------\n----------------\nGlobalAlignment (target eps %7.3f)\n",epsilon);
-
- queue<AlignGlobal::Node *> Q;
diff --git a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-align2.patch b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-align2.patch
deleted file mode 100644
index 455eec096c8..00000000000
--- a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-align2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/meshlabplugins/edit_align/align/AlignGlobal.h 2016-12-23 13:24:59.000000000 +0300
-+++ b/meshlabplugins/edit_align/align/AlignGlobal.h 2017-11-26 03:10:09.210116792 +0300
-@@ -115,7 +115,7 @@
- Node *ChooseDormantWithMostActiveLink ();
- void MakeAllDormant();
- void Clear();
-- bool GlobalAlign(const std::map<int,std::string> &Names, const double epsilon, int maxiter, bool Rigid, FILE *elfp=0, CallBack * cb=DummyCallBack );
-+ bool GlobalAlign(const std::map<int,std::string> &Names, const double epsilon, int maxiter, bool Rigid, FILE *elfp=0, CallBackPos * cb=DummyCallBackPos );
-
- bool CheckGraph();
-
diff --git a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-asString.patch b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-asString.patch
deleted file mode 100644
index 7e58790590a..00000000000
--- a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-asString.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From e1410053455a497d32b1e896eb7e99a7224b6832 Mon Sep 17 00:00:00 2001
-From: Miro Hrončok <miro@hroncok.cz>
-Date: Aug 29 2018 20:40:58 +0000
-Subject: Fix FTBFS (#1604819)
-
-
----
-
-diff --git a/meshlab-2016.12-qprintable.patch b/meshlab-2016.12-qprintable.patch
-new file mode 100644
-index 0000000..9a916f6
---- /dev/null
-+++ b/meshlab-2016.12-qprintable.patch
-@@ -0,0 +1,20 @@
-+--- a/src/meshlabserver/mainserver.cpp 2016-12-23 11:24:59.000000000 +0100
-++++ b/src/meshlabserver/mainserver.cpp.a 2018-08-29 20:32:03.009295180 +0200
-+@@ -897,7 +897,7 @@
-+ }
-+
-+ if (meshDocument.size() < outmeshlist.size())
-+- fprintf(logfp, "Error: trying to save %i meshes, but only %i available in the project\n", qPrintable(outmeshlist.size()), qPrintable(meshDocument.size()));
-++ fprintf(logfp, "Error: trying to save %i meshes, but only %i available in the project\n", outmeshlist.size(), meshDocument.size());
-+ else
-+ {
-+ for (int ii = 0; ii < outmeshlist.size(); ++ii)
-+@@ -911,7 +911,7 @@
-+ fprintf(logfp, "Output mesh %s has NOT been saved\n", qPrintable(outmeshlist[ii].filename));
-+ }
-+ else
-+- fprintf(logfp, "Invalid layer %i. Output mesh %s will not be saved\n", qPrintable(ii), qPrintable(outmeshlist[ii].filename));
-++ fprintf(logfp, "Invalid layer %i. Output mesh %s will not be saved\n", ii, qPrintable(outmeshlist[ii].filename));
-+ }
-+
-+ }
-diff --git a/meshlab-2016.12-qt-includes.patch b/meshlab-2016.12-qt-includes.patch
-new file mode 100644
-index 0000000..66e4f67
---- /dev/null
-+++ b/meshlab-2016.12-qt-includes.patch
-@@ -0,0 +1,21 @@
-+--- a/src/meshlabplugins/render_gdp/shaderDialog.h 2016-12-23 11:24:59.000000000 +0100
-++++ b/src/meshlabplugins/render_gdp/shaderDialog.h.a 2018-08-29 20:55:01.414996789 +0200
-+@@ -32,6 +32,8 @@
-+ #include "shaderStructs.h"
-+ #include "ui_shaderDialog.h"
-+ #include <QMap>
-++#include <QLineEdit>
-++#include <QSlider>
-+
-+ class QGLWidget;
-+
-+--- ./meshlab-2016.12/src/meshlabplugins/edit_paint/paintbox.cpp 2016-12-23 11:24:59.000000000 +0100
-++++ ./meshlab-2016.12/src/meshlabplugins/edit_paint/paintbox.cpp.a 2018-08-29 21:19:42.411581082 +0200
-+@@ -23,6 +23,7 @@
-+
-+ #include "paintbox.h"
-+ #include <QFileDialog>
-++#include <QAction>
-+
-+ Paintbox::Paintbox(QWidget * parent, Qt::WindowFlags flags) : QWidget(parent, flags)
-+ {
-
diff --git a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-fix-plugins-path.patch b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-fix-plugins-path.patch
deleted file mode 100644
index d7b17fe904b..00000000000
--- a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-fix-plugins-path.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/common/pluginmanager.cpp b/common/pluginmanager.cpp
-index 5354055..9a523d4 100644
---- a/common/pluginmanager.cpp
-+++ b/common/pluginmanager.cpp
-@@ -189,7 +189,11 @@ QString PluginManager::osDependentFileBaseName(const QString &plname)
-
- QString PluginManager::getBaseDirPath()
- {
-- QDir baseDir(qApp->applicationDirPath());
-+ #if defined(Q_OS_LINUX)
-+ QDir baseDir("/usr/share/meshlab");
-+ #else
-+ QDir baseDir(qApp->applicationDirPath());
-+ #endif
-
- #if defined(Q_OS_WIN)
- // Windows:
diff --git a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qprintable.patch b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qprintable.patch
deleted file mode 100644
index 61965baa9a9..00000000000
--- a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qprintable.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/meshlabserver/mainserver.cpp
-+++ b/meshlabserver/mainserver.cpp
-@@ -897,7 +897,7 @@
- }
-
- if (meshDocument.size() < outmeshlist.size())
-- fprintf(logfp, "Error: trying to save %i meshes, but only %i available in the project\n", qPrintable(outmeshlist.size()), qPrintable(meshDocument.size()));
-+ fprintf(logfp, "Error: trying to save %i meshes, but only %i available in the project\n", outmeshlist.size(), meshDocument.size());
- else
- {
- for (int ii = 0; ii < outmeshlist.size(); ++ii)
-@@ -911,7 +911,7 @@
- fprintf(logfp, "Output mesh %s has NOT been saved\n", qPrintable(outmeshlist[ii].filename));
- }
- else
-- fprintf(logfp, "Invalid layer %i. Output mesh %s will not be saved\n", qPrintable(ii), qPrintable(outmeshlist[ii].filename));
-+ fprintf(logfp, "Invalid layer %i. Output mesh %s will not be saved\n", ii, qPrintable(outmeshlist[ii].filename));
- }
-
- }
diff --git a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qt-5.15.patch b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qt-5.15.patch
deleted file mode 100644
index ab052cd69eb..00000000000
--- a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qt-5.15.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From c57222e79f1c7840e1ed01a4abd17d089f5e5185 Mon Sep 17 00:00:00 2001
-From: alemuntoni <muntoni.alessandro@gmail.com>
-Date: Tue, 26 May 2020 12:35:03 +0200
-Subject: [PATCH] missing include
-
----
- meshlab/glarea.cpp | 1 +
- meshlab/meshlab.pro | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/meshlab/glarea.cpp b/meshlab/glarea.cpp
-index 6c0421062..dfd7af229 100644
---- a/meshlab/glarea.cpp
-+++ b/meshlab/glarea.cpp
-@@ -34,6 +34,7 @@
- #include <QFileDialog>
- #include <QClipboard>
- #include <QLocale>
-+#include <QPainterPath>
-
- #include <wrap/gl/picking.h>
- #include <wrap/qt/trackball.h>
-diff --git a/meshlab/meshlab.pro b/meshlab/meshlab.pro
-index 26ef88d00..842eb5ea5 100644
---- a/meshlab/meshlab.pro
-+++ b/meshlab/meshlab.pro
-@@ -1,5 +1,6 @@
- # You have to copy the file by hand into the meshlab.app/Contents/Resources directory.
- # ICON += images/meshlab_obj.icns
-+QT += gui
- QT += opengl
- QT += xml
- QT += xmlpatterns
diff --git a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qt-includes.patch b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qt-includes.patch
deleted file mode 100644
index 0991bfc71e1..00000000000
--- a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qt-includes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/meshlabplugins/render_gdp/shaderDialog.h
-+++ b/meshlabplugins/render_gdp/shaderDialog.h
-@@ -32,6 +32,8 @@
- #include "shaderStructs.h"
- #include "ui_shaderDialog.h"
- #include <QMap>
-+#include <QLineEdit>
-+#include <QSlider>
-
- class QGLWidget;
-
---- a/meshlabplugins/edit_paint/paintbox.cpp
-+++ b/meshlabplugins/edit_paint/paintbox.cpp
-@@ -23,6 +23,7 @@
-
- #include "paintbox.h"
- #include <QFileDialog>
-+#include <QAction>
-
- Paintbox::Paintbox(QWidget * parent, Qt::WindowFlags flags) : QWidget(parent, flags)
- {
-
diff --git a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-remove-header.patch b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-remove-header.patch
deleted file mode 100644
index 8aeace8546a..00000000000
--- a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-remove-header.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -ru vcglib/wrap/io_trimesh/import_nvm.h vcglib/wrap/io_trimesh/import_nvm.h
---- a/vcglib/wrap/io_trimesh/import_nvm.h 2016-12-29 12:54:58.000000000 +0300
-+++ b/vcglib/wrap/io_trimesh/import_nvm.h 2017-12-28 12:20:14.591670159 +0300
-@@ -85,15 +85,6 @@
- return true;
- }
-
--static bool ReadHeader(const char * filename,unsigned int &/*num_cams*/, unsigned int &/*num_points*/){
-- FILE *fp = fopen(filename, "r");
-- if(!fp) return false;
-- ReadHeader(fp);
-- fclose(fp);
-- return true;
--}
--
--
- static int Open( OpenMeshType &m, std::vector<Shot<ScalarType> > & shots,
- std::vector<std::string > & image_filenames,
- const char * filename, CallBackPos *cb=0)
-diff -ru vcglib/wrap/io_trimesh/import_out.h vcglib/wrap/io_trimesh/import_out.h
---- a/vcglib/wrap/io_trimesh/import_out.h 2016-12-29 12:54:58.000000000 +0300
-+++ b/vcglib/wrap/io_trimesh/import_out.h 2017-12-28 12:20:48.434017234 +0300
-@@ -85,15 +85,6 @@
- return true;
- }
-
--static bool ReadHeader(const char * filename,unsigned int &/*num_cams*/, unsigned int &/*num_points*/){
-- FILE *fp = fopen(filename, "r");
-- if(!fp) return false;
-- ReadHeader(fp);
-- fclose(fp);
-- return true;
--}
--
--
- static int Open( OpenMeshType &m, std::vector<Shot<ScalarType> > & shots,
- std::vector<std::string > & image_filenames,
- const char * filename,const char * filename_images, CallBackPos *cb=0)
diff --git a/media-gfx/meshlab/files/2016.12/remove-edit_mutualcorrs.patch b/media-gfx/meshlab/files/2016.12/remove-edit_mutualcorrs.patch
deleted file mode 100644
index b372c7baf5e..00000000000
--- a/media-gfx/meshlab/files/2016.12/remove-edit_mutualcorrs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/meshlab_full.pro 2017-10-25 21:39:01.438252054 +0200
-+++ b/meshlab_full.pro 2017-10-25 21:39:25.417251424 +0200
-@@ -66,7 +66,6 @@
- meshlabplugins/edit_arc3D \
- meshlabplugins/edit_manipulators \
- meshlabplugins/edit_measure \
-- plugins_experimental/edit_mutualcorrs \
- meshlabplugins/edit_paint\
- meshlabplugins/edit_pickpoints \
- meshlabplugins/edit_point\
diff --git a/media-gfx/meshlab/files/2016.12/remove-io_TXT.patch b/media-gfx/meshlab/files/2016.12/remove-io_TXT.patch
deleted file mode 100644
index 3d0eb74429b..00000000000
--- a/media-gfx/meshlab/files/2016.12/remove-io_TXT.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/meshlab_full.pro 2017-10-25 21:41:57.178247439 +0200
-+++ b/meshlab_full.pro 2017-10-25 21:42:11.629247060 +0200
-@@ -16,7 +16,6 @@
- meshlabplugins/io_x3d \
- meshlabplugins/io_expe \
- meshlabplugins/io_pdb \
-- plugins_experimental/io_TXT \
- # Filter plugins
- meshlabplugins/filter_aging \
- meshlabplugins/filter_ao \
diff --git a/media-gfx/meshlab/files/meshlab-2020.12-disable-updates.patch b/media-gfx/meshlab/files/meshlab-2020.12-disable-updates.patch
new file mode 100644
index 00000000000..d8cadf06d9b
--- /dev/null
+++ b/media-gfx/meshlab/files/meshlab-2020.12-disable-updates.patch
@@ -0,0 +1,38 @@
+--- a/meshlab/mainwindow_Init.cpp
++++ b/meshlab/mainwindow_Init.cpp
+@@ -607,7 +607,6 @@
+ helpMenu->addAction(onlineHelpAct);
+ helpMenu->addAction(onscreenHelpAct);
+ helpMenu->addAction(submitBugAct);
+- helpMenu->addAction(checkUpdatesAct);
+
+ fillEditMenu();
+ fillRenderMenu();
+--- a/meshlab/mainwindow_RunTime.cpp
++++ b/meshlab/mainwindow_RunTime.cpp
+@@ -2623,7 +2623,9 @@
+
+ void MainWindow::helpOnline()
+ {
++#if defined(__ENABLE_AUTO_STATS__)
+ checkForUpdates(false);
++#endif
+ QDesktopServices::openUrl(QUrl("http://www.meshlab.net/#support"));
+ }
+
+@@ -2882,6 +2884,7 @@
+ void MainWindow::showEvent(QShowEvent * event)
+ {
+ QWidget::showEvent(event);
++#if defined(__ENABLE_AUTO_STATS__)
+ QSettings settings;
+ QSettings::setDefaultFormat(QSettings::NativeFormat);
+ const QString versioncheckeddatestring("lastTimeMeshLabVersionCheckedOnStart");
+@@ -2902,6 +2905,7 @@
+ settings.setValue(versioncheckeddatestring, todayStr);
+ }
+ sendUsAMail();
++#endif
+ }
+
+ void MainWindow::meshAdded(int mid)
diff --git a/media-gfx/meshlab/files/meshlab-2020.12-find-plugins.patch b/media-gfx/meshlab/files/meshlab-2020.12-find-plugins.patch
new file mode 100644
index 00000000000..0d3c4c118ce
--- /dev/null
+++ b/media-gfx/meshlab/files/meshlab-2020.12-find-plugins.patch
@@ -0,0 +1,39 @@
+--- a/common/CMakeLists.txt
++++ b/common/CMakeLists.txt
+@@ -75,6 +75,11 @@
+ endif()
+ add_library(meshlab-common ${TARGET_TYPE} ${SOURCES} ${HEADERS} ${RESOURCES})
+
++if(NOT WIN32 AND NOT APPLE)
++ target_compile_definitions(
++ meshlab-common PRIVATE MESHLAB_LIB_INSTALL_DIR="${MESHLAB_LIB_INSTALL_DIR}")
++endif()
++
+ target_include_directories(meshlab-common PRIVATE ${EXTERNAL_DIR}/easyexif/)
+ target_link_libraries(
+ meshlab-common
+--- a/common/pluginmanager.cpp
++++ b/common/pluginmanager.cpp
+@@ -225,7 +225,21 @@ QMap<QString, RichParameterList> PluginManager::generateFilterParameterMap()
+ QString PluginManager::getBaseDirPath()
+ {
+ QDir baseDir(qApp->applicationDirPath());
+-
++
++#if defined(Q_OS_LINUX)
++ if (baseDir.dirName() == "bin") {
++ baseDir.cdUp();
++#ifdef MESHLAB_LIB_INSTALL_DIR
++ baseDir.cd(MESHLAB_LIB_INSTALL_DIR);
++#else
++ baseDir.cd("lib");
++ if(baseDir.exists("meshlab")) {
++ baseDir.cd("meshlab");
++ }
++#endif // MESHLAB_LIB_INSTALL_DIR
++ }
++#endif
++
+ #if defined(Q_OS_WIN)
+ // Windows:
+ // during development with visual studio binary could be in the debug/release subdir.
diff --git a/media-gfx/meshlab/meshlab-2016.12-r4.ebuild b/media-gfx/meshlab/meshlab-2016.12-r4.ebuild
deleted file mode 100644
index 505a20ab0b5..00000000000
--- a/media-gfx/meshlab/meshlab-2016.12-r4.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils
-
-DESCRIPTION="The open source system for processing and editing 3D triangular meshes"
-HOMEPAGE="http://www.meshlab.net"
-VCG_VERSION="1.0.1"
-SRC_URI="https://github.com/cnr-isti-vclab/meshlab/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/cnr-isti-vclab/vcglib/archive/v${VCG_VERSION}.tar.gz -> vcglib-${VCG_VERSION}.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="-minimal"
-
-DEPEND="dev-cpp/eigen:3
- dev-cpp/muParser
- dev-qt/qtcore:5
- dev-qt/qtopengl:5
- dev-qt/qtscript:5
- dev-qt/qtxmlpatterns:5
- >=media-gfx/jhead-3.00-r2
- media-libs/glew:0
- media-libs/qhull
- =media-libs/lib3ds-1*
- media-libs/openctm
- sci-libs/levmar
- sci-libs/mpir"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/meshlab-${PV}/src"
-
-PATCHES=(
- "${FILESDIR}/${PV}/0001-set-shader-and-texture-paths.patch"
- #remove ot working plugins
- "${FILESDIR}/${PV}/remove-edit_mutualcorrs.patch"
- "${FILESDIR}/${PV}/remove-io_TXT.patch"
- #since structure synth doesn't seem to be compiling
- "${FILESDIR}/${PV}/0001-disable-filter-ssynth.patch"
- #this has been fixed in the tree
- "${FILESDIR}/${PV}/0001-disable-edit-quality.patch"
- #this causes segfaults
- "${FILESDIR}/${PV}/0001-disable-filter-layer.patch"
- #for when we use minimal
- "${FILESDIR}/${PV}/0001-compile-server.patch"
- "${FILESDIR}/${PV}/0001-use-external-lib3ds.patch"
- "${FILESDIR}/${PV}/0001-use-external-openctm.patch"
- "${FILESDIR}/${PV}/0001-use-external-muParser.patch"
- "${FILESDIR}/${PV}/0001-use-external-bzip.patch"
- "${FILESDIR}/${PV}/0001-use-external-jhead.patch"
- "${FILESDIR}/${PV}/0001-use-external-glew.patch"
- #cause gnu stack quickstart related qa
- "${FILESDIR}/${PV}/0001-remove-not-sane-plugins.patch"
- "${FILESDIR}/${PV}/${P}-fix-plugins-path.patch"
- "${FILESDIR}/${PV}/${P}-align1.patch"
- "${FILESDIR}/${PV}/${P}-align2.patch"
- "${FILESDIR}/${PV}/${P}-asString.patch"
- "${FILESDIR}/${PV}/${P}-qprintable.patch"
- "${FILESDIR}/${PV}/${P}-qt-includes.patch"
- "${FILESDIR}/${PV}/${P}-qt-5.15.patch"
-)
-
-src_prepare() {
- mv "${WORKDIR}/vcglib-${VCG_VERSION}" "${WORKDIR}/vcglib" || die "vcglib mv failed"
- default
- #proof of patchset
- #remove libs that are being used from the system
- rm -r "external/lib3ds-1.3.0" || die "rm failed"
- rm -r "external/OpenCTM-1.0.3" || die "rm failed"
- rm -r "external/muparser_v132" || die "rm failed"
- rm -r "external/muparser_v225" || die "rm failed"
- rm -r "external/bzip2-1.0.5" || die "rm failed"
- rm -r "external/jhead-2.95" || die "rm failed"
- rm -r "external/glew-1.5.1" || die "rm failed"
- rm -r "external/glew-1.7.0" || die "rm failed"
- #we still depend on lm.h
- #rm -r "external"
- rm -r "distrib/plugins/U3D_W32" || die
- rm -r "distrib/plugins/U3D_OSX" || die
-
- # Fix bug 638796
- cd "${WORKDIR}" || die
- eapply "${FILESDIR}/${PV}/${P}-remove-header.patch"
-}
-
-src_configure() {
- use minimal || eqmake5 -r meshlab_full.pro
- use minimal && eqmake5 -r meshlab_mini.pro
-}
-
-src_install() {
- dobin distrib/{meshlab,meshlabserver}
- dolib.so distrib/libcommon.so.1.0.0
- dosym libcommon.so.1.0.0 /usr/$(get_libdir)/libcommon.so.1
- dosym libcommon.so.1 /usr/$(get_libdir)/libcommon.so
- exeinto /usr/$(get_libdir)/meshlab/plugins
- doexe distrib/plugins/*.so
- insinto /usr/share/meshlab/shaders
- doins -r distrib/shaders/*
- insinto /usr/share/meshlab/plugins
- doins -r distrib/plugins/*
- insinto /usr/share/meshlab/textures
- doins -r distrib/textures/*
- insinto /usr/share/meshlab/sample
- doins -r distrib/sample/*
- newicon "${S}"/meshlab/images/eye512.png "${PN}".png
- make_desktop_entry meshlab "Meshlab" "${PN}" Graphics
-}
diff --git a/media-gfx/meshlab/meshlab-2020.12.ebuild b/media-gfx/meshlab/meshlab-2020.12.ebuild
new file mode 100644
index 00000000000..03fbb0d1f0e
--- /dev/null
+++ b/media-gfx/meshlab/meshlab-2020.12.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="A system for processing and editing unstructured 3D triangular meshes"
+HOMEPAGE="http://www.meshlab.net"
+VCG_VERSION="2020.12"
+SRC_URI="https://github.com/cnr-isti-vclab/meshlab/archive/Meshlab-${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/cnr-isti-vclab/vcglib/archive/${VCG_VERSION}.tar.gz -> vcglib-${VCG_VERSION}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="double-precision -minimal"
+
+DEPEND="
+ dev-cpp/eigen:3
+ dev-cpp/muParser
+ dev-libs/gmp:=
+ >=dev-qt/qtcore-5.12:5
+ >=dev-qt/qtopengl-5.12:5
+ >=dev-qt/qtscript-5.12:5
+ >=dev-qt/qtxml-5.12:5
+ >=dev-qt/qtxmlpatterns-5.12:5
+ media-libs/glew:0=
+ =media-libs/lib3ds-1*
+ media-libs/openctm:=
+ media-libs/qhull:=
+ sci-libs/levmar
+ sci-libs/mpir:="
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/meshlab-Meshlab-${PV}/src"
+
+PATCHES=(
+ "${FILESDIR}/${P}-disable-updates.patch"
+ "${FILESDIR}/${P}-find-plugins.patch"
+)
+
+src_unpack() {
+ unpack ${P}.tar.gz
+ cd "${S}"
+ unpack vcglib-2020.12.tar.gz
+ mv vcglib-2020.12/* vcglib
+}
+
+src_configure() {
+ CMAKE_BUILD_TYPE=Release
+
+ local mycmakeargs=(
+ -DBUILD_MINI=$(usex minimal)
+ -DBUILD_WITH_DOUBLE_SCALAR=$(usex double-precision)
+ )
+ cmake_src_configure
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+}
diff --git a/media-gfx/meshlab/metadata.xml b/media-gfx/meshlab/metadata.xml
index 5454c9e8ca1..95901ec9bfc 100644
--- a/media-gfx/meshlab/metadata.xml
+++ b/media-gfx/meshlab/metadata.xml
@@ -1,20 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>amynka@gentoo.org</email>
- </maintainer>
<maintainer type="project">
<email>3dprint@gentoo.org</email>
<name>Gentoo 3D print</name>
</maintainer>
- <longdescription lang="en">
- Printrun is a set of G-code sending applications for RepRap.
- It consists of printcore (dumb G-code sender), pronsole (featured command line
- G-code sender), pronterface (featured G-code sender with graphical user
- interface), and a small collection of helpful scripts.
+ <maintainer type="person">
+ <email>amynka@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+ MeshLab is an open source, portable, and extensible system for the processing and editing of unstructured 3D
+ triangular meshes. The system is aimed to help the processing of the typical not-so-small unstructured models
+ arising in 3D scanning, providing a set of tools for editing, cleaning, healing, inspecting, rendering and
+ converting these kinds of meshes.
</longdescription>
+ <use>
+ <flag name="double-precision">Use double type instead of float type for scalars</flag>
+ </use>
<upstream>
- <remote-id type="sourceforge">meshlab</remote-id>
+ <bugs-to>https://github.com/cnr-isti-vclab/meshlab/issues</bugs-to>
+ <remote-id type="github">cnr-isti-vclab/meshlab</remote-id>
</upstream>
</pkgmetadata>
diff --git a/media-gfx/mypaint/mypaint-2.0.1-r2.ebuild b/media-gfx/mypaint/mypaint-2.0.1-r2.ebuild
index 494d4ce80a0..197c29a7919 100644
--- a/media-gfx/mypaint/mypaint-2.0.1-r2.ebuild
+++ b/media-gfx/mypaint/mypaint-2.0.1-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
DISTUTILS_SINGLE_IMPL=1
inherit desktop distutils-r1 xdg
diff --git a/media-gfx/netpaint/netpaint-1.1.2.ebuild b/media-gfx/netpaint/netpaint-1.1.2.ebuild
index 36c3bcd4fe2..46c0f02e9d4 100644
--- a/media-gfx/netpaint/netpaint-1.1.2.ebuild
+++ b/media-gfx/netpaint/netpaint-1.1.2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
inherit distutils-r1
diff --git a/media-gfx/nomacs/files/nomacs-3.16.224-quazip1.patch b/media-gfx/nomacs/files/nomacs-3.16.224-quazip1.patch
new file mode 100644
index 00000000000..06f6b8c2fb8
--- /dev/null
+++ b/media-gfx/nomacs/files/nomacs-3.16.224-quazip1.patch
@@ -0,0 +1,127 @@
+From b4a1e98a83598072ea6d720ae4d56d380bee5a75 Mon Sep 17 00:00:00 2001
+From: Petr Vanek <petr@yarpen.cz>
+Date: Sun, 15 Nov 2020 19:15:59 +0100
+Subject: [PATCH] fixed #569 Build fails with quazip 1.0 (#576)
+
+---
+ cmake/Unix.cmake | 28 +++++++++++++++------
+ src/DkCore/DkBasicLoader.cpp | 4 +++
+ src/DkCore/DkImageContainer.cpp | 4 +++
+ src/DkCore/DkImageLoader.cpp | 6 ++++-
+ src/DkGui/DkDialog.cpp | 4 +++
+ 5 files changed, 37 insertions(+), 9 deletions(-)
+
+diff --git a/cmake/Unix.cmake b/cmake/Unix.cmake
+index 5567084b..c90ba320 100644
+--- a/cmake/Unix.cmake
++++ b/cmake/Unix.cmake
+@@ -102,14 +102,26 @@ unset(QT_ROOT CACHE)
+
+ if(ENABLE_QUAZIP)
+ if(USE_SYSTEM_QUAZIP)
+- SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+-
+- find_package(QuaZip5 QUIET)
+- if(NOT QUAZIP_FOUND)
+- message(FATAL_ERROR "QUAZIP not found. It's mandatory when used with ENABLE_QUAZIP enabled, you can also disable USE_SYSTEM_QUAZIP")
+- else()
+- add_definitions(-DWITH_QUAZIP)
+- endif()
++ # Let's try QuaZip1 first (it's the bright future)
++ find_package(QuaZip-Qt5 QUIET)
++ if (QuaZip-Qt5_FOUND)
++ message(STATUS "QUAZIP: QuaZip-1 for Qt5 found")
++ set(QUAZIP_LIBRARIES QuaZip::QuaZip)
++ add_definitions(-DWITH_QUAZIP1)
++ else ()
++ message(WARNING "QUAZIP: 1.x not found. Trying to find 0.x")
++ # QuaZip < 1.0. This leg can be removed (including cmake/FindQuaZip5.cmake)
++ # ater the final migration to 1.x in Linux distros
++ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
++
++ find_package(QuaZip5 QUIET)
++ if(NOT QUAZIP_FOUND)
++ message(FATAL_ERROR "QUAZIP: even 0.x not found. It's mandatory when used with ENABLE_QUAZIP enabled, you can also disable USE_SYSTEM_QUAZIP")
++ endif()
++
++ endif (QuaZip-Qt5_FOUND)
++ # we have any QuaZip after all
++ add_definitions(-DWITH_QUAZIP)
+ else()
+ find_package(ZLIB REQUIRED)
+ set(QUAZIP_INCLUDE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/quazip-0.7/quazip ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/quazip-0.7/)
+diff --git a/src/DkCore/DkBasicLoader.cpp b/src/DkCore/DkBasicLoader.cpp
+index 7f9e889c..b7edfd43 100644
+--- a/src/DkCore/DkBasicLoader.cpp
++++ b/src/DkCore/DkBasicLoader.cpp
+@@ -54,8 +54,12 @@
+
+ // quazip
+ #ifdef WITH_QUAZIP
++#ifdef WITH_QUAZIP1
++#include <quazip/JlCompress.h>
++#else
+ #include <quazip5/JlCompress.h>
+ #endif
++#endif
+
+ // opencv
+ #ifdef WITH_OPENCV
+diff --git a/src/DkCore/DkImageContainer.cpp b/src/DkCore/DkImageContainer.cpp
+index 810994d3..150da9c2 100644
+--- a/src/DkCore/DkImageContainer.cpp
++++ b/src/DkCore/DkImageContainer.cpp
+@@ -41,8 +41,12 @@
+
+ // quazip
+ #ifdef WITH_QUAZIP
++#ifdef WITH_QUAZIP1
++#include <quazip/JlCompress.h>
++#else
+ #include <quazip5/JlCompress.h>
+ #endif
++#endif
+ #pragma warning(pop) // no warnings from includes - end
+
+ #pragma warning(disable: 4251) // TODO: remove
+diff --git a/src/DkCore/DkImageLoader.cpp b/src/DkCore/DkImageLoader.cpp
+index 09d25d23..e4186f2b 100644
+--- a/src/DkCore/DkImageLoader.cpp
++++ b/src/DkCore/DkImageLoader.cpp
+@@ -79,8 +79,12 @@
+
+ // quazip
+ #ifdef WITH_QUAZIP
++#ifdef WITH_QUAZIP1
++#include <quazip/JlCompress.h>
++#else
+ #include <quazip5/JlCompress.h>
+ #endif
++#endif
+
+ // opencv
+ #ifdef WITH_OPENCV
+@@ -2212,4 +2216,4 @@ QString DkImageLoader::fileName() const {
+ return mCurrentImage->fileName();
+ }
+
+-}
+\ No newline at end of file
++}
+diff --git a/src/DkGui/DkDialog.cpp b/src/DkGui/DkDialog.cpp
+index 008c9a3b..85842eca 100644
+--- a/src/DkGui/DkDialog.cpp
++++ b/src/DkGui/DkDialog.cpp
+@@ -97,8 +97,12 @@
+
+ // quazip
+ #ifdef WITH_QUAZIP
++#ifdef WITH_QUAZIP1
++#include <quazip/JlCompress.h>
++#else
+ #include <quazip5/JlCompress.h>
+ #endif
++#endif
+
+ #pragma warning(pop) // no warnings from includes - end
+
diff --git a/media-gfx/nomacs/nomacs-3.16.224.ebuild b/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild
index 252958e43a9..9c6f50df160 100644
--- a/media-gfx/nomacs/nomacs-3.16.224.ebuild
+++ b/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -36,7 +36,7 @@ RDEPEND="
dev-qt/qtimageformats:5
media-libs/tiff
)
- zip? ( dev-libs/quazip )
+ zip? ( dev-libs/quazip:0= )
"
DEPEND="${RDEPEND}"
BDEPEND="
@@ -48,6 +48,8 @@ S="${WORKDIR}/${P}/ImageLounge"
DOCS=( src/changelog.txt )
+PATCHES=( "${FILESDIR}"/${P}-quazip1.patch )
+
src_prepare() {
if use plugins ; then
rmdir plugins || die
diff --git a/media-gfx/opencsg/metadata.xml b/media-gfx/opencsg/metadata.xml
index a6159b39f26..be0edabb665 100644
--- a/media-gfx/opencsg/metadata.xml
+++ b/media-gfx/opencsg/metadata.xml
@@ -2,12 +2,12 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>waebbl@gmail.com</email>
+ <email>waebbl-gentoo@posteo.net</email>
<name>Bernd Waibel</name>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
- <description>Gentoo Proxy Maintainer Team</description>
+ <name>Proxy Maintainers</name>
</maintainer>
<longdescription>
OpenCSG is a library that does image-based CSG rendering using
diff --git a/media-gfx/openscad/files/openscad-2019.05-0003-change-C-standard-to-c-14.patch b/media-gfx/openscad/files/openscad-2019.05-0003-change-C-standard-to-c-14.patch
new file mode 100644
index 00000000000..3863d5631b9
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-2019.05-0003-change-C-standard-to-c-14.patch
@@ -0,0 +1,76 @@
+From 02f9a4eca87d7713a8345b8513423d9d4a5127e0 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Fri, 27 Nov 2020 18:49:09 +0100
+Subject: [PATCH] change C++ standard to c++14
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ c++11.pri => c++std.pri | 21 ++++++++-------------
+ common.pri | 2 +-
+ 2 files changed, 9 insertions(+), 14 deletions(-)
+ rename c++11.pri => c++std.pri (74%)
+
+diff --git a/c++11.pri b/c++std.pri
+similarity index 74%
+rename from c++11.pri
+rename to c++std.pri
+index 0a2c3b6..aac656d 100644
+--- a/c++11.pri
++++ b/c++std.pri
+@@ -4,16 +4,16 @@ macx {
+ dirs = $${BOOSTDIR} $${QMAKE_LIBDIR}
+ for(dir, dirs) {
+ system(otool -L $${dir}/libboost_thread* | grep libc++ >& /dev/null ) {
+- message("Using libc++11")
++ message("Using libc++")
+ CONFIG += libc++
+ }
+ else {
+ message("Using libstdc++")
+ CONFIG += libstdc++
+- c++11 {
+- # libc++ is a requirement for using C++11
+- warning("Disabling C++11 since libstdc++ dependencies were found")
+- CONFIG -= c++11
++ c++std {
++ # libc++ is a requirement for using C++14
++ warning("Disabling C++14 since libstdc++ dependencies were found")
++ CONFIG -= c++std
+ }
+ }
+ }
+@@ -25,9 +25,9 @@ macx {
+ }
+ }
+
+-c++11 {
+- QMAKE_CXXFLAGS += -std=c++11
+- message("Using C++11")
++c++std {
++ QMAKE_CXXFLAGS += -std=c++14
++ message("Using C++14")
+
+ *clang*: {
+ # 3rd party libraries will probably violate this for a long time
+@@ -41,8 +41,3 @@ c++11 {
+ QMAKE_OBJECTIVE_CFLAGS_WARN_ON += $$CXX11_SUPPRESS_WARNINGS
+ }
+ }
+-else {
+- *clang* {
+- QMAKE_CXXFLAGS_WARN_ON += -Wno-c++11-extensions
+- }
+-}
+diff --git a/common.pri b/common.pri
+index 1110757..d1d5edc 100644
+--- a/common.pri
++++ b/common.pri
+@@ -30,4 +30,4 @@ include(win.pri)
+ include(flex.pri)
+ include(bison.pri)
+ include(opengl.pri)
+-include(c++11.pri)
++include(c++std.pri)
+--
+2.29.2
+
diff --git a/media-gfx/openscad/metadata.xml b/media-gfx/openscad/metadata.xml
index 5ed7ed33c62..75aa20b67f1 100644
--- a/media-gfx/openscad/metadata.xml
+++ b/media-gfx/openscad/metadata.xml
@@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>waebbl@gmail.com</email>
+ <email>waebbl-gentoo@posteo.net</email>
<name>Bernd Waibel</name>
</maintainer>
<maintainer type="project">
diff --git a/media-gfx/openscad/openscad-2019.05-r3.ebuild b/media-gfx/openscad/openscad-2019.05-r4.ebuild
index 42738f600c3..32ad22bf16f 100644
--- a/media-gfx/openscad/openscad-2019.05-r3.ebuild
+++ b/media-gfx/openscad/openscad-2019.05-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -20,6 +20,7 @@ RESTRICT="test"
PATCHES=(
"${FILESDIR}/${P}_fix-boost-1.72.0-build.patch"
"${FILESDIR}/${P}-0001-Fix-build-with-boost-1.73.patch"
+ "${FILESDIR}/${P}-0003-change-C-standard-to-c-14.patch"
)
RDEPEND="
@@ -46,7 +47,7 @@ RDEPEND="
>=media-libs/glew-2.0.0:0=
media-libs/harfbuzz:=
media-libs/lib3mf
- <sci-mathematics/cgal-5:=
+ sci-mathematics/cgal:=
>=x11-libs/qscintilla-2.10.3:=
emacs? ( >=app-editors/emacs-23.1:* )
"
@@ -66,6 +67,9 @@ src_prepare() {
# fix path prefix
sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
+ # change c++ standard
+ sed -e 's/CONFIG += c++11/CONFIG += c++std/' -i openscad.pro || die
+
# disable ccache
if ! use ccache; then
eapply "${FILESDIR}/${P}-0002-Gentoo-specific-Disable-ccache-building.patch"
@@ -92,6 +96,9 @@ src_install() {
elisp-install ${PN} contrib/*.el contrib/*.elc
fi
+ mv -i "${ED}"/usr/share/openscad/locale "${ED}"/usr/share || die "failed to move locales"
+ ln -sf ../locale "${ED}"/usr/share/openscad/locale || die
+
einstalldocs
}
diff --git a/media-gfx/opentoonz/Manifest b/media-gfx/opentoonz/Manifest
index 17d952a18c8..71e06c6c484 100644
--- a/media-gfx/opentoonz/Manifest
+++ b/media-gfx/opentoonz/Manifest
@@ -1,2 +1 @@
-DIST opentoonz-1.3.0.tar.gz 39920932 BLAKE2B 292e01c078a4cf461fff0814a60e4ab6aea9a74a63f23e854815632432e07e65d5c01dce9d3aab36595f94ca06dd83b078e52858532d8dadb2e7518514c08b08 SHA512 5df272c943f2c222a457545c99388266579d88c702d6c7e71dfe0c924a0189e30323cf9e369c96755c507ee5347620da0140215b2647555f0b3bdae41c615c71
DIST opentoonz-1.4.0.tar.gz 53531141 BLAKE2B adb7a85fb0581d92119b5f6b75dc320428ea0763955f8c883072cba78045acdeea75a5cea82065a29d2c59f53b4843d8ff92690c9a47c01605b4702fd36d6c13 SHA512 777f5d59ec8076e1e53a81347e15bef198bea77449073f1e9d5fdd371a61e20fd6dc8b26c6656c783959782bd71008fbb63c05742aaa50c92bd317aded7d0649
diff --git a/media-gfx/opentoonz/opentoonz-1.3.0-r1.ebuild b/media-gfx/opentoonz/opentoonz-1.3.0-r1.ebuild
deleted file mode 100644
index b9eb63a1383..00000000000
--- a/media-gfx/opentoonz/opentoonz-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="An open-source full-featured 2D animation creation software"
-HOMEPAGE="https://github.com/opentoonz/opentoonz"
-SRC_URI="https://github.com/opentoonz/opentoonz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD libtiff"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- app-arch/lz4:=
- >=dev-libs/boost-1.55.0:=
- dev-libs/lzo:2
- >=dev-qt/qtcore-5.9:5
- >=dev-qt/qtgui-5.9:5
- >=dev-qt/qtmultimedia-5.9:5[widgets]
- >=dev-qt/qtnetwork-5.9:5
- >=dev-qt/qtopengl-5.9:5
- >=dev-qt/qtprintsupport-5.9:5
- >=dev-qt/qtscript-5.9:5
- >=dev-qt/qtsvg-5.9:5
- >=dev-qt/qtwidgets-5.9:5
- >=dev-qt/qtxml-5.9:5
- media-libs/freeglut
- media-libs/freetype:2
- media-libs/glew:=
- media-libs/libjpeg-turbo
- >=media-libs/libmypaint-1.3.0:=
- media-libs/libpng:=
- media-libs/libsdl2
- virtual/cblas
- >=sci-libs/superlu-4.1:=
- sys-libs/zlib:=
- virtual/libusb:=
- virtual/opengl
-"
-DEPEND="
- ${RDEPEND}
- dev-qt/linguist-tools:5
- virtual/pkgconfig
-"
-
-CMAKE_USE_DIR="${S}"/toonz/sources
-
-src_configure() {
- local mycmakeargs=(
- -DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a"
- -DSUPERLU_INCLUDE_DIR="${EPREFIX}/usr/include/superlu"
- -DLZO_INCLUDE_DIR="${EPREFIX}/usr/include/lzo"
- -DCMAKE_SKIP_RPATH=ON
- )
-
- # The upstream uses their own modified libtiff
- # See: https://github.com/opentoonz/opentoonz/blob/master/doc/how_to_build_linux.md#building-libtiff
- cd thirdparty/tiff-4.0.3 || die
- econf \
- --with-pic \
- --disable-jbig \
- --enable-static \
- --disable-shared
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cd "${S}"/thirdparty/tiff-4.0.3 || die
- emake
-
- cmake-utils_src_compile
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- gnome2_icon_cache_update
-}
diff --git a/media-gfx/openvdb/openvdb-4.0.2-r4.ebuild b/media-gfx/openvdb/openvdb-4.0.2-r4.ebuild
index ab2d24826d9..841627eb807 100644
--- a/media-gfx/openvdb/openvdb-4.0.2-r4.ebuild
+++ b/media-gfx/openvdb/openvdb-4.0.2-r4.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
inherit cmake flag-o-matic python-single-r1
diff --git a/media-gfx/openvdb/openvdb-5.2.0-r2.ebuild b/media-gfx/openvdb/openvdb-5.2.0-r2.ebuild
index e7e00d1db24..30a8f69cbd0 100644
--- a/media-gfx/openvdb/openvdb-5.2.0-r2.ebuild
+++ b/media-gfx/openvdb/openvdb-5.2.0-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
inherit cmake flag-o-matic python-single-r1
diff --git a/media-gfx/openvdb/openvdb-6.2.1-r1.ebuild b/media-gfx/openvdb/openvdb-6.2.1-r1.ebuild
index 43345499ba5..5179dddc6da 100644
--- a/media-gfx/openvdb/openvdb-6.2.1-r1.ebuild
+++ b/media-gfx/openvdb/openvdb-6.2.1-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
inherit cmake flag-o-matic python-single-r1
diff --git a/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild b/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild
index a22bb7a1d6f..4fd0ea08306 100644
--- a/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild
+++ b/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
inherit cmake flag-o-matic python-single-r1
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.g
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~arm ~x86"
IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 doc numpy python static-libs test utils abi5-compat abi6-compat +abi7-compat"
RESTRICT="!test? ( test )"
diff --git a/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild b/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild
index 1b5f48159d4..52e0454b175 100644
--- a/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild
+++ b/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
inherit cmake flag-o-matic python-single-r1
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.g
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 doc numpy python static-libs test utils abi6-compat +abi7-compat"
RESTRICT="!test? ( test )"
diff --git a/media-gfx/optipng/optipng-0.7.7-r1.ebuild b/media-gfx/optipng/optipng-0.7.7-r1.ebuild
index 11a75013d0a..d09924d7eff 100644
--- a/media-gfx/optipng/optipng-0.7.7-r1.ebuild
+++ b/media-gfx/optipng/optipng-0.7.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
IUSE=""
RDEPEND="sys-libs/zlib
diff --git a/media-gfx/optipng/optipng-0.7.7.ebuild b/media-gfx/optipng/optipng-0.7.7.ebuild
index 7765ca76dae..6afec58dacc 100644
--- a/media-gfx/optipng/optipng-0.7.7.ebuild
+++ b/media-gfx/optipng/optipng-0.7.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
IUSE=""
RDEPEND="sys-libs/zlib
diff --git a/media-gfx/pencil/Manifest b/media-gfx/pencil/Manifest
index 6bf8522b33e..f25b8666527 100644
--- a/media-gfx/pencil/Manifest
+++ b/media-gfx/pencil/Manifest
@@ -1,2 +1 @@
-DIST pencil-0.6.4.tar.gz 3397891 BLAKE2B cb3fc754cd9abc2944fd184ea61b057a784a5b9e3c42724ef50b117a933cad0b72456a32e849c2de3ae6a7eb8bc6bdeee3ed751e8a6c8c68a74130d03ba6f1de SHA512 da28bd6bcdb0336c81e0735bec261373cd1e5db06feb012d4bba098c9df2ebea6f5b763e9c5e5e17c1518efdd6b9cde634ecf2152b49c25cde6c93da63e6fde8
DIST pencil-0.6.5.tar.gz 3714951 BLAKE2B 0b3ba5165f4a6778588eed3141c6260a29470ccf277e42612e68e8b4daf5b9cf32f6a4343c038d6014ceb1e99f7ce8c2a398130ea55e7ef16e2d006de3661625 SHA512 6d95dc4157ea0f5da829f40cdf99c682e560ca74af6964693d221321e7b3e923893957fc30475a725f09c18dc4667968ec6cd92e5ffb56999ea70a927266b637
diff --git a/media-gfx/pencil/files/pencil-0.6.4-fixes-for-qt-5.15.0.patch b/media-gfx/pencil/files/pencil-0.6.4-fixes-for-qt-5.15.0.patch
deleted file mode 100644
index cbbaf2b2065..00000000000
--- a/media-gfx/pencil/files/pencil-0.6.4-fixes-for-qt-5.15.0.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/core_lib/src/graphics/bitmap/bitmapimage.cpp
-+++ b/core_lib/src/graphics/bitmap/bitmapimage.cpp
-@@ -20,6 +20,7 @@ GNU General Public License for more details.
- #include <QDebug>
- #include <QtMath>
- #include <QFile>
-+#include <QPainterPath>
- #include "util.h"
-
- BitmapImage::BitmapImage()
---- a/core_lib/src/graphics/vector/beziercurve.cpp
-+++ b/core_lib/src/graphics/vector/beziercurve.cpp
-@@ -22,6 +22,7 @@ GNU General Public License for more details.
-
- #include <cmath>
- #include <QList>
-+#include <QPainterPath>
- #include "object.h"
- #include "pencilerror.h"
-
---- a/core_lib/src/managers/viewmanager.cpp
-+++ b/core_lib/src/managers/viewmanager.cpp
-@@ -15,6 +15,7 @@ GNU General Public License for more details.
-
- */
-
-+#include <QPainterPath>
- #include "viewmanager.h"
- #include "editor.h"
- #include "object.h"
diff --git a/media-gfx/pencil/pencil-0.6.4-r1.ebuild b/media-gfx/pencil/pencil-0.6.4-r1.ebuild
deleted file mode 100644
index e5623d01001..00000000000
--- a/media-gfx/pencil/pencil-0.6.4-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils xdg-utils
-
-DESCRIPTION="2D animation and drawing program based on Qt5"
-HOMEPAGE="https://www.pencil2d.org/"
-SRC_URI="https://github.com/pencil2d/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
- dev-qt/qtnetwork:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}
- test? ( dev-qt/qttest:5 )
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-PATCHES=( "${FILESDIR}"/pencil-0.6.4-fixes-for-qt-5.15.0.patch )
-
-src_prepare() {
- default
- sed -e "/^QT/s/xmlpatterns //" \
- -i core_lib/core_lib.pro tests/tests.pro || die
-}
-
-src_configure() {
- eqmake5
-}
-
-src_install() {
- einstalldocs
-
- # install target not yet provided
- # emake INSTALL_ROOT="${D}" install
- newbin bin/pencil2d ${PN}
-
- newicon app/data/icons/icon.png ${PN}.png
- make_desktop_entry ${PN} pencil2d ${PN} Graphics
-
- insinto /usr/share/mime/packages/
- doins app/data/pencil2d.xml
-
- # TODO: Install l10n files
-}
-
-pkg_postinst() {
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
diff --git a/media-gfx/pencil/pencil-0.6.4.ebuild b/media-gfx/pencil/pencil-0.6.4.ebuild
deleted file mode 100644
index 7a7001dd26d..00000000000
--- a/media-gfx/pencil/pencil-0.6.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils xdg-utils
-
-DESCRIPTION="2D animation and drawing program based on Qt5"
-HOMEPAGE="https://www.pencil2d.org/"
-SRC_URI="https://github.com/pencil2d/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
- dev-qt/qtnetwork:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}
- test? ( dev-qt/qttest:5 )
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-src_prepare() {
- default
- sed -e "/^QT/s/xmlpatterns //" \
- -i core_lib/core_lib.pro tests/tests.pro || die
-}
-
-src_configure() {
- eqmake5
-}
-
-src_install() {
- einstalldocs
-
- # install target not yet provided
- # emake INSTALL_ROOT="${D}" install
- newbin bin/pencil2d ${PN}
-
- newicon app/data/icons/icon.png ${PN}.png
- make_desktop_entry ${PN} pencil2d ${PN} Graphics
-
- insinto /usr/share/mime/packages/
- doins app/data/pencil2d.xml
-
- # TODO: Install l10n files
-}
-
-pkg_postinst() {
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
diff --git a/media-gfx/pngcheck/Manifest b/media-gfx/pngcheck/Manifest
index f7d74b0cfa7..38a9de56965 100644
--- a/media-gfx/pngcheck/Manifest
+++ b/media-gfx/pngcheck/Manifest
@@ -1 +1 @@
-DIST pngcheck-2.3.0.tar.gz 59864 BLAKE2B 3c635555f76d22d6949309707b7054608f5e093d3a557eb88eb9fc48aef76326f8e6b0dbcdf8e30213a042416f0e6f798e41411763e7604b12495b6b2748cddc SHA512 d099a360d41fc553e9ea02e56ae9812a4a72f3b7f1cd73c021fdb0b9233bb247e100b95fe8e297a2dcdd1bb996128a365794cb8f5702e5c93618af03f18140ad
+DIST pngcheck-3.0.2.tar.gz 63202 BLAKE2B 4cc6040e087aa2f5829e79ea1a5feb45af8bb15fa72325f9cb4822169c7d278306d6d89b936fd4c3c3819a09380e07f1f64ce0c276e776c3146c1533b1ee1363 SHA512 81bba699141c0f506ee589785eccc4b1ea882df5d211bcd91885bbcc4230bf14d23fc1298ffc10a110d6a8459522f6a01bfba1f81739f6085e4d3de964bda3d5
diff --git a/media-gfx/pngcheck/pngcheck-2.3.0.ebuild b/media-gfx/pngcheck/pngcheck-3.0.2.ebuild
index 4358988b8ba..660faab0b47 100644
--- a/media-gfx/pngcheck/pngcheck-2.3.0.ebuild
+++ b/media-gfx/pngcheck/pngcheck-3.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,6 @@ SRC_URI="mirror://sourceforge/png-mng/${P}.tar.gz"
LICENSE="HPND GPL-2+"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE=""
RDEPEND="sys-libs/zlib"
DEPEND="${RDEPEND}"
@@ -20,11 +19,14 @@ DEPEND="${RDEPEND}"
src_compile() {
emake -f Makefile.unx \
CC="$(tc-getCC)" \
- CFLAGS="${LDFLAGS} ${CFLAGS} -DUSE_ZLIB" \
+ LD="$(tc-getLD)" \
+ CFLAGS="${CFLAGS} ${LDFLAGS} -DUSE_ZLIB" \
ZLIB="-lz"
}
src_install() {
dobin png{check,split,-fix-IDAT-windowsize}
+ doman pngcheck.1 gpl/pngsplit.1
+
einstalldocs
}
diff --git a/media-gfx/pngcrush/pngcrush-1.8.13.ebuild b/media-gfx/pngcrush/pngcrush-1.8.13.ebuild
index d312b40a5f5..0d7eb8c3b76 100644
--- a/media-gfx/pngcrush/pngcrush-1.8.13.ebuild
+++ b/media-gfx/pngcrush/pngcrush-1.8.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="system-libs? ( mirror://sourceforge/pmt/${P}-nolib.tar.xz )
LICENSE="pngcrush"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="+system-libs"
RDEPEND="
diff --git a/media-gfx/povray/files/povray-3.7.0.0-boost-1.50.patch b/media-gfx/povray/files/povray-3.7.0.0-boost-1.50.patch
deleted file mode 100644
index f8e807ad647..00000000000
--- a/media-gfx/povray/files/povray-3.7.0.0-boost-1.50.patch
+++ /dev/null
@@ -1,72 +0,0 @@
- configure.ac | 26 ++++++--------------------
- vfe/unix/platformbase.cpp | 2 +-
- 2 files changed, 7 insertions(+), 21 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 51596f8..900c150 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -57,8 +57,6 @@ AC_CONFIG_SRCDIR([unix/disp_text.cpp])
- m4_include([unix/config/acx_pthread.m4])
- m4_include([unix/config/ax_arg_enable.m4])
- m4_include([unix/config/ax_arg_with.m4])
--m4_include([unix/config/ax_boost_base.m4])
--m4_include([unix/config/ax_boost_thread.m4])
- m4_include([unix/config/ax_test_compiler_flags.m4])
- m4_include([unix/config/ax_check_lib.m4])
- m4_include([unix/config/ax_check_libjpeg.m4])
-@@ -168,6 +166,7 @@ AC_CANONICAL_HOST
-
- AM_INIT_AUTOMAKE([1.9 dist-bzip2])
- AM_MAINTAINER_MODE
-+LT_INIT
-
- AX_FIX_INCORRECT_PATH(C_INCLUDE_PATH, ".", [pov_warn_path="$pov_warn_path C_INCLUDE_PATH"])
- AX_FIX_INCORRECT_PATH(CPLUS_INCLUDE_PATH, ".", [pov_warn_path="$pov_warn_path CPLUS_INCLUDE_PATH"])
-@@ -298,28 +297,15 @@ LIBS="$LIBS $PTHREAD_CFLAGS $PTHREAD_LIBS" # append
-
- # Boost; required library
- # the following macro stops with error when boost is not found
--AX_BOOST_BASE([$required_libboost_version])
--AX_BOOST_THREAD
--if test x"$ax_cv_boost_thread" != x"yes"; then
-+BOOST_REQUIRE([$required_libboost_version])
-+BOOST_THREADS
-+if test x"$boost_cv_lib_thread" != x"yes"; then
- AC_MSG_ERROR([cannot find a suitable boost thread library])
- else
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" # append
-- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" # append
-- LIBS="$BOOST_THREAD_LIB $LIBS"
-+ LDFLAGS="$LDFLAGS -L$BOOST_LDPATH" # append
-+ LIBS="$BOOST_THREAD_LIBS $LIBS"
- fi
--AC_MSG_CHECKING([whether the boost thread library is usable])
--AC_RUN_IFELSE(
-- [AC_LANG_PROGRAM([[
--#include <boost/thread/thread.hpp>
-- ]],
-- [[boost::defer_lock_t(); return 0;]])],
-- [AC_MSG_RESULT([yes])],
-- [
-- AC_MSG_RESULT([no])
-- AC_MSG_FAILURE([cannot link with the boost thread library])
-- ],
-- [AC_MSG_RESULT([cross-compiling])] # FIXME
--)
- AC_DEFINE([USE_OFFICIAL_BOOST], [], [Use the official Boost libraries.])
-
- # Intel Math Kernel library
-diff --git a/vfe/unix/platformbase.cpp b/vfe/unix/platformbase.cpp
-index 8669d19..83c0191 100644
---- a/vfe/unix/platformbase.cpp
-+++ b/vfe/unix/platformbase.cpp
-@@ -68,7 +68,7 @@ namespace pov_base
- #else
- // taken from source/base/timer.cpp
- boost::xtime t;
-- boost::xtime_get(&t, boost::TIME_UTC);
-+ boost::xtime_get(&t, POV_TIME_UTC);
- POV_ULONG ns = (POV_ULONG)(t.sec) * (POV_ULONG)(1000000000) + (POV_ULONG)(t.nsec) + (POV_ULONG)(msec) * (POV_ULONG)(1000000);
- t.sec = (boost::xtime::xtime_sec_t)(ns / (POV_ULONG)(1000000000));
- t.nsec = (boost::xtime::xtime_nsec_t)(ns % (POV_ULONG)(1000000000));
diff --git a/media-gfx/povray/metadata.xml b/media-gfx/povray/metadata.xml
index a23bbb8953d..fbb9f48050c 100644
--- a/media-gfx/povray/metadata.xml
+++ b/media-gfx/povray/metadata.xml
@@ -5,7 +5,6 @@
<email>sci@gentoo.org</email>
</maintainer>
<use>
- <flag name="mkl">Enable support for Intel Vector Math Library, part of sci-libs/mkl</flag>
<flag name="io-restrictions">POV-Ray's mechanism for control of I/O operations</flag>
</use>
<upstream>
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 366bbbf7809..0808cab1667 100644
--- a/media-gfx/povray/povray-3.7.0.0-r1.ebuild
+++ b/media-gfx/povray/povray-3.7.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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"
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
deleted file mode 100644
index c4dd57d5adc..00000000000
--- a/media-gfx/povray/povray-3.7.0.0.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils flag-o-matic multilib versionator virtualx
-
-POVRAY_MAJOR_VER=$(get_version_component_range 1-3)
-POVRAY_MINOR_VER=$(get_version_component_range 4)
-if [ -n "$POVRAY_MINOR_VER" ]; then
- POVRAY_MINOR_VER=${POVRAY_MINOR_VER/rc/RC}
- MY_PV="${POVRAY_MAJOR_VER}.${POVRAY_MINOR_VER}"
-else
- MY_PV=${POVRAY_MAJOR_VER}
-fi
-
-DESCRIPTION="The Persistence of Vision Raytracer"
-HOMEPAGE="http://www.povray.org/"
-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"
-IUSE="debug +io-restrictions mkl openexr static-libs tiff X"
-
-DEPEND="
- >=dev-libs/boost-1.50.0:=[threads(+)]
- media-libs/libpng:0
- sys-libs/zlib
- virtual/jpeg
- mkl? ( sci-libs/mkl )
- openexr? (
- media-libs/ilmbase
- media-libs/openexr )
- tiff? ( media-libs/tiff:0 )
- X? ( media-libs/libsdl )"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
- sys-devel/boost-m4"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-PATCHES=(
- "${FILESDIR}"/${P}-user-conf.patch
- "${FILESDIR}"/${P}-boost-1.50.patch
- "${FILESDIR}"/${P}-automagic.patch
- )
-
-src_prepare() {
- [[ ${CHOST} == *-darwin* ]] && \
- PATCHES+=( "${FILESDIR}"/${PN}-3.7.0_rc6-darwin-defaults.patch )
-
- cd unix || die
- bash -x prebuild.sh || die
- cd .. || die
- rm -rf libraries || die
-
- # Change some destination directories that cannot be adjusted via configure
- sed \
- -e 's:${povsysconfdir}/$PACKAGE/$VERSION_BASE:${povsysconfdir}/'${PN}':g' \
- -e 's:${povdatadir}/$PACKAGE-$VERSION_BASE:${povdatadir}/'${PN}':g' \
- -e 's:${povdatadir}/doc/$PACKAGE-$VERSION_BASE:${povdatadir}/doc/'${PF}':g' \
- -e 's:BOOST_THREAD_LIBS $LIBS:BOOST_THREAD_LIBS $LIBS -lboost_date_time:g' \
- -i configure.ac || die
-
- sed \
- -e "s:^povlibdir = .*:povlibdir = @datadir@/${PN}:" \
- -e "s:^povdocdir = .*:povdocdir = @datadir@/doc/${PF}:" \
- -e "s:^povconfdir = .*:povconfdir = @sysconfdir@/${PN}:" \
- -e 's:mkdir_p:MKDIR_P:g' \
- -i Makefile.am || die
-
- # The "+p" option on the test command line causes a pause and
- # prompts the user to interact, so remove it.
- sed -i -e "s:biscuit.pov -f +d +p:biscuit.pov -f +d:" Makefile.am || die
-
- autotools-utils_src_prepare
-}
-
-_src_compile() {
- einfo "${LDFLAGS}"
- autotools-utils_src_compile LDFLAGS="${LDFLAGS}"
-}
-
-src_configure() {
- local non_redist_conf
-
- # Fixes bug 71255
- if [[ $(get-flag march) == k6-2 ]]; then
- filter-flags -fomit-frame-pointer
- fi
-
- # The config files are installed correctly (e.g. povray.conf),
- # but the code compiles using incorrect [default] paths
- # (based on /usr/local...), so povray will not find the system
- # config files without the following fix:
- append-cppflags -DPOVLIBDIR=\\\"${EROOT}usr/share/${PN}\\\" -DPOVCONFDIR=\\\"${EROOT}etc/${PN}\\\"
-
- if ! use tiff ; then
- non_redist_conf="NON_REDISTRIBUTABLE_BUILD=yes"
- else
- non_redist_conf=""
- fi
-
- local myeconfargs=(
- ${non_redist_conf}
- COMPILED_BY="Portage (Gentoo `uname`) on `hostname -f`"
- $(use_enable debug)
- $(use_enable io-restrictions)
- $(use_with openexr openexr "${EPREFIX}/usr/$(get_libdir)")
- $(use_with mkl libmkl "${EPREFIX}/usr/$(get_libdir)")
- $(use_with tiff libtiff "${EPREFIX}/usr/$(get_libdir)")
- $(use_with X libsdl "${EPREFIX}/usr/$(get_libdir)")
- $(use_with X x "${EPREFIX}/usr/$(get_libdir)")
- --disable-pipe
- --disable-strip
- --disable-optimiz
- --disable-optimiz-arch
- )
- autotools-utils_src_configure
-}
-
-src_test() {
- # For the beta releases, we generate a license extension in case needed
- VIRTUALX_COMMAND="autotools-utils_src_test"
- virtualmake
-}
-
-pkg_preinst() {
- # Copy the old config files if they are in the old location
- # but do not yet exist in the new location.
- # This way, they can be treated by CONFIG_PROTECT as normal.
- for conf_file in $(ls "${ED}/etc/${PN}"); do
- if [ ! -e "${EROOT}etc/${PN}/${conf_file}" ]; then
- for version_dir in $(ls "${EROOT}etc/${PN}" | grep "^[0-9]" | sort -rn); do
- if [ -e "${EROOT}etc/${PN}/${version_dir}/${conf_file}" ]; then
- mv "${EROOT}etc/${PN}/${version_dir}/${conf_file}" "${EROOT}etc/${PN}"
- elog "Note: ${conf_file} moved from ${EROOT}etc/povray/${version_dir}/ to ${EROOT}etc/povray/"
- break
- fi
- done
- fi
- done
-}
diff --git a/media-gfx/povtree/povtree-1.5-r1.ebuild b/media-gfx/povtree/povtree-1.5-r1.ebuild
index ecc9cd96661..a531b33bc6f 100644
--- a/media-gfx/povtree/povtree-1.5-r1.ebuild
+++ b/media-gfx/povtree/povtree-1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="http://propro.ru/go/Wshop/povtree/${MY_P}.zip"
# Free for non-commercial use, according to e-mail from authors #446168
LICENSE="free-noncomm"
SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
RDEPEND=">=virtual/jre-1.3"
DEPEND="app-arch/unzip"
diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
new file mode 100644
index 00000000000..33a0f438d35
--- /dev/null
+++ b/media-gfx/prusaslicer/Manifest
@@ -0,0 +1 @@
+DIST prusaslicer-2.3.0.tar.gz 34785471 BLAKE2B 89691baf30ac2be901ebee594262a82e2c922ddae75b055561707fe152c392175766082844ad1ae2cb2fefb29a9d3abe03c0302ad84c347e94d127756429d0a7 SHA512 2bd3e7d384ba1c59007744f4aba89de9ca9864e4bdc7b6faa9a56f514212878d1d2e7d70fc0f08e39310af76c365d1a3f8f1df263e8656249483a5b33cab417d
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.3.0-miniz-zip-header.patch b/media-gfx/prusaslicer/files/prusaslicer-2.3.0-miniz-zip-header.patch
new file mode 100644
index 00000000000..8fd587d3d48
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.3.0-miniz-zip-header.patch
@@ -0,0 +1,9 @@
+https://bugs.gentoo.org/761541
+--- a/src/libslic3r/miniz_extension.hpp 2021-01-11 08:01:51.000000000 -0500
++++ b/src/libslic3r/miniz_extension.hpp 2021-01-12 01:16:10.503404521 -0500
+@@ -4,4 +4,5 @@
+ #include <string>
+ #include <miniz.h>
++#include <miniz_zip.h>
+
+ namespace Slic3r {
diff --git a/media-gfx/prusaslicer/metadata.xml b/media-gfx/prusaslicer/metadata.xml
new file mode 100644
index 00000000000..dd17dbe10ea
--- /dev/null
+++ b/media-gfx/prusaslicer/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>3dprint@gentoo.org</email>
+ <name>Gentoo 3D Printer Project</name>
+ </maintainer>
+ <longdescription>
+ PrusaSlicer takes 3D models (STL, OBJ, AMF) and converts them into G-code instructions for FFF printers or PNG
+ layers for mSLA 3D printers. It's compatible with any modern printer based on the RepRap toolchain, including
+ all those based on the Marlin, Prusa, Sprinter and Repetier firmware. It also works with Mach3, LinuxCNC and
+ Machinekit controllers.
+
+ PrusaSlicer is based on Slic3r by Alessandro Ranellucci and the RepRap community.
+ </longdescription>
+ <upstream>
+ <bugs-to>https://github.com/prusa3d/PrusaSlicer/issues</bugs-to>
+ <doc>https://help.prusa3d.com/en/article/general-info_1910</doc>
+ <remote-id type="github">prusa3d/PrusaSlicer</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/media-gfx/prusaslicer/prusaslicer-2.3.0.ebuild b/media-gfx/prusaslicer/prusaslicer-2.3.0.ebuild
new file mode 100644
index 00000000000..de0016701b2
--- /dev/null
+++ b/media-gfx/prusaslicer/prusaslicer-2.3.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit xdg cmake desktop wxwidgets
+
+MY_PN="PrusaSlicer"
+
+DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
+HOMEPAGE="https://www.prusa3d.com/prusaslicer/"
+SRC_URI="https://github.com/prusa3d/${MY_PN}/archive/version_${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gui test"
+
+# tests fail to link with USE=-gui, bug #760096
+REQUIRED_USE="test? ( gui )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-cpp/eigen:3
+ dev-cpp/tbb
+ >=dev-libs/boost-1.73.0:=[nls,threads]
+ dev-libs/cereal
+ dev-libs/expat
+ dev-libs/gmp:=
+ >=dev-libs/miniz-2.1.0-r2
+ dev-libs/mpfr:=
+ >=media-gfx/openvdb-5.0.0
+ media-libs/ilmbase:=
+ media-libs/libpng:0=
+ media-libs/qhull:=
+ sci-libs/libigl
+ sci-libs/nlopt
+ >=sci-mathematics/cgal-5.0:=
+ sys-apps/dbus
+ sys-libs/zlib:=
+ gui? (
+ dev-libs/glib:2
+ media-libs/glew:0=
+ net-misc/curl
+ virtual/glu
+ virtual/opengl
+ x11-libs/gtk+:3
+ x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+ )
+"
+DEPEND="${RDEPEND}
+ media-libs/qhull[static-libs]
+"
+
+S="${WORKDIR}/${MY_PN}-version_${PV}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-miniz-zip-header.patch"
+)
+
+src_configure() {
+ use gui && setup-wxwidgets
+
+ local mycmakeargs=(
+ -DSLIC3R_BUILD_TESTS=$(usex test)
+ -DSLIC3R_FHS=ON
+ -DSLIC3R_GTK=3
+ -DSLIC3R_GUI=$(usex gui)
+ -DSLIC3R_PCH=OFF
+ -DSLIC3R_WX_STABLE=ON
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ if use gui; then
+ newicon -s 128 resources/icons/PrusaSlicer_128px.png PrusaSlicer.png
+ newicon -s 128 resources/icons/PrusaSlicer-gcodeviewer_128px.png PrusaSlicer-gcodeviewer.png
+ domenu src/platform/unix/Prusa{Slicer,Gcodeviewer}.desktop
+ fi
+}
diff --git a/media-gfx/pstoedit/Manifest b/media-gfx/pstoedit/Manifest
index b1b5f5552a5..7f5aba28690 100644
--- a/media-gfx/pstoedit/Manifest
+++ b/media-gfx/pstoedit/Manifest
@@ -1,2 +1 @@
-DIST pstoedit-3.70.tar.gz 1013949 BLAKE2B ec459dc56851d942076adf4352ef974188b0b8273a6f9150c8767c1d63c3c9b6d993ea8c0b1a0b59663b31652eb7a4b8697e4c38c23d5aa0572d554120a5e900 SHA512 63668ea039fdf988ba007bafb8dc1f23f06d4eb430a92b97fb93c71b819f63e2708b99476ec9b096598db2ddd30d29a69101f078e7d4fdfec314677f50293cf9
DIST pstoedit-3.75.tar.gz 1290057 BLAKE2B 607a265ea6f058e1ba432d55c4602452cd52a48302441ecee542a113d90b090ce888cc6fa5e3a8e3a2fdbf94dce9b1ab1f7f5ba58ab81f1f509eea9052a3cd82 SHA512 54b8cf7e78e52027d45e7550821476d9a9c4df4f63af83792b6a2909bc62236450ba6b619f95eede9f61a715f4937f1fbaf2ce4ae4b486daa0294c396a882a28
diff --git a/media-gfx/pstoedit/files/pstoedit-3.60-libdl.patch b/media-gfx/pstoedit/files/pstoedit-3.60-libdl.patch
deleted file mode 100644
index 279ed715f53..00000000000
--- a/media-gfx/pstoedit/files/pstoedit-3.60-libdl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 6b33220..30c9f2e 100755
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -139,7 +139,7 @@ libpstoedit_la_SOURCES = \
- genericints.h \
- version.h
-
--libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} -ldl -lm
-+l