summaryrefslogtreecommitdiff
path: root/media-gfx
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/Manifest.gzbin39001 -> 38515 bytes
-rw-r--r--media-gfx/birdfont/Manifest3
-rw-r--r--media-gfx/birdfont/birdfont-2.18.3.ebuild88
-rw-r--r--media-gfx/birdfont/metadata.xml11
-rw-r--r--media-gfx/chafa/Manifest2
-rw-r--r--media-gfx/chafa/chafa-1.4.1.ebuild2
-rw-r--r--media-gfx/cura/Manifest2
-rw-r--r--media-gfx/cura/cura-4.6.1.ebuild2
-rw-r--r--media-gfx/curaengine/Manifest2
-rw-r--r--media-gfx/curaengine/curaengine-4.7.0.ebuild2
-rw-r--r--media-gfx/digikam/Manifest2
-rw-r--r--media-gfx/digikam/digikam-7.0.0.ebuild148
-rw-r--r--media-gfx/displaycal/Manifest5
-rw-r--r--media-gfx/displaycal/displaycal-3.8.8.1-r1.ebuild67
-rw-r--r--media-gfx/displaycal/displaycal-3.8.9.3-r1.ebuild71
-rw-r--r--media-gfx/displaycal/metadata.xml11
-rw-r--r--media-gfx/duhdraw/Manifest2
-rw-r--r--media-gfx/duhdraw/duhdraw-2.8.13-r1.ebuild6
-rw-r--r--media-gfx/entangle/Manifest2
-rw-r--r--media-gfx/entangle/entangle-2.0.ebuild67
-rw-r--r--media-gfx/fdm-materials/Manifest2
-rw-r--r--media-gfx/fdm-materials/fdm-materials-4.6.1-r1.ebuild2
-rw-r--r--media-gfx/gimp/Manifest3
-rw-r--r--media-gfx/gimp/gimp-2.10.18-r2.ebuild2
-rw-r--r--media-gfx/gimp/gimp-2.10.20-r2.ebuild213
-rw-r--r--media-gfx/mypaint-brushes/Manifest2
-rw-r--r--media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild2
-rw-r--r--media-gfx/mypaint/Manifest4
-rw-r--r--media-gfx/mypaint/files/mypaint-2.0.1-build-system.patch37
-rw-r--r--media-gfx/mypaint/mypaint-2.0.1-r2.ebuild (renamed from media-gfx/mypaint/mypaint-2.0.1-r1.ebuild)3
-rw-r--r--media-gfx/mypaint/mypaint-2.0.1.ebuild69
-rw-r--r--media-gfx/sane-backends/Manifest6
-rw-r--r--media-gfx/sane-backends/files/sane-backends-1.0.27-canon-lide-100.patch17
-rw-r--r--media-gfx/sane-backends/files/sane-backends-1.0.27-network.patch42
-rw-r--r--media-gfx/sane-backends/files/sane-backends-1.0.27-revert-samsung.patch406
-rw-r--r--media-gfx/sane-backends/files/sane-backends-1.0.27-uninitialized-variable.patch25
-rw-r--r--media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild344
-rw-r--r--media-gfx/sigal/Manifest3
-rw-r--r--media-gfx/sigal/metadata.xml31
-rw-r--r--media-gfx/sigal/sigal-1.3.0.ebuild37
40 files changed, 233 insertions, 1512 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index f630e6e76334..efc28010e967 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
Binary files differ
diff --git a/media-gfx/birdfont/Manifest b/media-gfx/birdfont/Manifest
deleted file mode 100644
index 211387d1771d..000000000000
--- a/media-gfx/birdfont/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST birdfont-2.18.3.tar.xz 2333612 BLAKE2B bf1b92bd17b0d9970d091fcbbaadb5a027da35bee57cb9e11611959bf8ca09b08d582aa3e6a950a0b1b26688a8fbb3987197bfabb6156097da6a1343426dc051 SHA512 c86fff4e40ecfc571e3880cfa99f6adf518daae5476ea1b2a78bab031bc832bc5c8d58ecc928eda4922134fd3ceca312b80cbb8cf2fd35ecb8dc7656addb854e
-EBUILD birdfont-2.18.3.ebuild 1814 BLAKE2B ff853cbd2de046d8a55312f2bd3dbb512689b38f0f33e5bb92f88e253ee88f20d6daa91d9b5248dc90dd7fae16ca7e8542d8419d3bc4e3b6332e6c3ce17112f0 SHA512 7656a32ba0c00e3b22f4071a9f090c1786c513c38e3ee6c928a8d6d2456e1f38f16705c3b757d6f36d7c84385d902935977b90c9d5a1eeb9b26d276f48473db5
-MISC metadata.xml 352 BLAKE2B a73cbe4b01dfc96aa631fc89a7bbc140d85eeb4e8757965a35a6d5cfcbd74d72499ecdeddabe963a972b9411c83c0099faf88dcef61df8cf1c9dc1b33af051a6 SHA512 ef910c9c78ad31aff97b15546e892bfa52a18ca9ccbf2b325c96c60f440fa09d5535ea2455e42dba2a11983b4e8b7eb7c3881c47fa6d43df6a22ac4d01535adc
diff --git a/media-gfx/birdfont/birdfont-2.18.3.ebuild b/media-gfx/birdfont/birdfont-2.18.3.ebuild
deleted file mode 100644
index 22980e4c63ff..000000000000
--- a/media-gfx/birdfont/birdfont-2.18.3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-PLOCALES="cs de it nl pt_BR sv"
-
-inherit python-any-r1 vala l10n toolchain-funcs multiprocessing
-
-DESCRIPTION="Font editor for the creation of vector graphics and export TTF, EOT & SVG fonts"
-HOMEPAGE="https://birdfont.org/"
-SRC_URI="https://birdfont.org/releases/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk nls"
-
-RDEPEND="
- dev-db/sqlite:3
- dev-libs/libgee:0.8=
- dev-libs/glib:2
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/libxmlbird
- x11-libs/gdk-pixbuf:2
- gtk? (
- net-libs/libsoup:2.4
- net-libs/webkit-gtk:4=
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3
- x11-libs/libnotify
- )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-python/doit[${PYTHON_USEDEP}]')
- $(vala_depend)
- nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
- default
- vala_src_prepare
- sed -i \
- -e "s:pkg-config:$(tc-getPKG_CONFIG):" \
- configure dodo.py || die
-}
-
-v() {
- echo "$@"
- "$@" || die
-}
-
-src_configure() {
- # The build scripts glob all po files to see what's available.
- # Delete the files for langs we don't want to support.
- if use nls ; then
- l10n_find_plocales_changes po "" ".po" || die
- rm_locale() { rm "po/$1.po" || die ; }
- l10n_for_each_disabled_locale_do rm_locale
- else
- rm po/*.po || die
- fi
-
- v ./configure \
- --prefix "${EPREFIX}/usr" \
- --gtk $(usex gtk True False) \
- --gee gee-0.8 \
- --valac "${VALAC}" \
- --cc "$(tc-getCC)" \
- --cflags "${CFLAGS} ${CPPFLAGS}" \
- --ldflags "${LDFLAGS}"
-}
-
-src_compile() {
- v doit run -n $(makeopts_jobs)
-}
-
-src_install() {
- v ./install.py \
- --dest "${D}" \
- --nogzip \
- --libdir "$(get_libdir)" \
- --manpages-directory "/share/man/man1"
- einstalldocs
-}
diff --git a/media-gfx/birdfont/metadata.xml b/media-gfx/birdfont/metadata.xml
deleted file mode 100644
index c0c763874bf4..000000000000
--- a/media-gfx/birdfont/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>fonts@gentoo.org</email>
-</maintainer>
-<upstream>
- <bugs-to>https://birdfont.org/bugtracker/</bugs-to>
- <remote-id type="github">johanmattssonm/birdfont</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/media-gfx/chafa/Manifest b/media-gfx/chafa/Manifest
index a8e4cb401450..5d1461923ee1 100644
--- a/media-gfx/chafa/Manifest
+++ b/media-gfx/chafa/Manifest
@@ -1,5 +1,5 @@
DIST chafa-1.4.0.tar.xz 388932 BLAKE2B 0ccaae1495bd410b05d291ebcf2b6266374f013536ec1b953d6127e63c20b11ff78e96772309caeb5c4bbfc40729f60291b0ab3d2395824801aec7763c1ac2b3 SHA512 e464750296db0eca5d718ff70dbb51529abcd4ff3d5bdd15f20f10ff0207f282e8b59799476fc05718efb48b81b331ae1518d450efd6b62b98a41049e1c6e9d5
DIST chafa-1.4.1.tar.xz 389428 BLAKE2B 8ed6c6d57953d784763f10c274bd8b7acf7857b095bae58c476d2e17418a7112f1ec000d667eebfc2eda712c9588e686ad4021da017f4d187a5461c0435c5476 SHA512 f0bd1911fd544f93afadbb2105f151dc77e31a2f3af4c7f8441a06f547a7ebe0674664721b18c3a35a7c4e745dda666713adc1dfbe5e97dfdc54856a13bd5063
EBUILD chafa-1.4.0.ebuild 862 BLAKE2B 934006cdbe8cb31ce8368470f5c6176dc072565daf8bf10501a2f61e213ab0fabbffc57226e178ddd67c5e0f027e55134658c9559ebb74b68cdc1422aaaae07b SHA512 2d852cd464a12bb6390af4e8f2ea75a46203f3f681d1b58ecee4dcc744280fabef5e12bc7949cb1b7c0cbac66ea26384c7025e76e1eec2e5eca7c06dd8de9291
-EBUILD chafa-1.4.1.ebuild 867 BLAKE2B 72b955618b8ed3c3e2906d41071ebf531288ecafd0d44e6a7e333c9151469a8f22dc8004c874f87c79fa46082348fe2ba20e838b475a602c9882a29a76d05962 SHA512 ea1fa10ef54acb434eece699d2c8330d82a4108519f420dc3a800f92a5221425f849010c8e74c266152d3787461ff8eedda08138ad49c9ffbc2cfc4d3a11d123
+EBUILD chafa-1.4.1.ebuild 866 BLAKE2B 24e4c50c2a29e9f3d5451f7b4ec9f4cc176dec6a2b5d4636e8de26e72f514b358957f78946ba0cd9cd9bde26d3c73c6677cac957d8db82733c45ba51e34c7165 SHA512 179ac5f28de859623651bfc30539d2242c2aeb949fd6398dd809a65ca7d4df80430dc1af7d2004f1a8852231d4666da29ed2ea3b404a9e43eb87a3055fd359a3
MISC metadata.xml 516 BLAKE2B ef0a2e140a6d37d3ace556ac5a6d299caa1fae8e37d93fe8aa43104a2f02d14fd4b5ed1bd218b2298616bcbc3c571868cc7e04d0a5f3ac2b091fa5588d833cbb SHA512 57bebde0a948ed0269c4decdf2b6ac8064f90dde344c547a67cbb40191eb3fb444b147ed8122ad79ba1acb487fc93ca1fb33afb5df80a41c7128e314ac4640ac
diff --git a/media-gfx/chafa/chafa-1.4.1.ebuild b/media-gfx/chafa/chafa-1.4.1.ebuild
index aecb3393c1b0..153953749e3d 100644
--- a/media-gfx/chafa/chafa-1.4.1.ebuild
+++ b/media-gfx/chafa/chafa-1.4.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://hpjansson.org/chafa/releases/${P}.tar.xz"
LICENSE="LGPL-3+"
SLOT="0"
-KEYWORDS="~amd64 arm64 x86"
+KEYWORDS="amd64 arm64 x86"
IUSE="static-libs +tools"
RDEPEND="
diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index c84a916e2413..2d612ef0dde1 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -10,5 +10,5 @@ EBUILD cura-3.4.1.ebuild 1735 BLAKE2B 407f2d1a162ad50c3e571d3b6809523a93b0d9a498
EBUILD cura-3.6.0.ebuild 1735 BLAKE2B 407f2d1a162ad50c3e571d3b6809523a93b0d9a49866bb10630d2ca0a13e9bc1769a6fb901c6ee60c9eb9ad36f1a851969969dfe54a805c2641e45b871b65432 SHA512 4d3679148889f8cfcf086adbc957648adfeaf622839d6db3401a694c4932d72e8589c4a6958f614b6954c5163c13b651745233261afb452219adbc3ed92f624e
EBUILD cura-4.2.1.ebuild 1421 BLAKE2B 89456bb773708bb3b455143fe11d97e36bf8e88a843ef5b00027de8150fb2d770cd7294878fcb46b3296cd5b16f7da751ec92c865302ca487e27655c12c37751 SHA512 56166afc68952e79a7900ce4c4330b6ce84d34ac55204ab0b6a08a2122366f4ad1fe7404cfa803ab019339d652f810776ce7dd33bf9bb89dfc0738b8308b3208
EBUILD cura-4.3.0-r1.ebuild 1421 BLAKE2B 89456bb773708bb3b455143fe11d97e36bf8e88a843ef5b00027de8150fb2d770cd7294878fcb46b3296cd5b16f7da751ec92c865302ca487e27655c12c37751 SHA512 56166afc68952e79a7900ce4c4330b6ce84d34ac55204ab0b6a08a2122366f4ad1fe7404cfa803ab019339d652f810776ce7dd33bf9bb89dfc0738b8308b3208
-EBUILD cura-4.6.1.ebuild 1520 BLAKE2B 31561d987bc6ce44068facd07cb9a7e2e6b2b0526238143cab7a89b3310a0149ece8c222fe56c5bc4f9b48029dda1ae51f5d3cc48cdc709deb20e280205bfc3a SHA512 12bf615a68c0e7b57ce8ec3bfe71fbdc65565668b746c0f8a59d4c8d6bce3e2cdb4f0705a85ab2bc744abe42cfe45776daca50fb06aa0b3fa405973fe4b0a123
+EBUILD cura-4.6.1.ebuild 1527 BLAKE2B 8f8b53c5c38fb3ba4e4ed1c59e284710b5bc11ff6689955d2f1631caf9a7a54e61c2e790808e26c8c8f5e6acab6cabf3544e8a89696b264f35c8c968a33fb809 SHA512 c93e8959b9d6591394b824ca8624a2b8226998584b14bff6912dad3b571659e95fbef0975a6d98336ce16fe59f19d738a1eafeacb245a08f9eebdc36e59d75c2
MISC metadata.xml 924 BLAKE2B 98684c30170538865b264d21a025a558b66ef0f5b46dd4cc291dacd71367cf775135d66fc379bf6bf0edfacab6e33c939a750fdcc8f036cedb7d9daf5b442072 SHA512 b09e1e1251f3171721bea6ea7ace38beed877525b1a83282035bb34fa871123c0995674d899a486b3ff67ac34429cabc12f9e90ffd1b1e3f60257389a900e483
diff --git a/media-gfx/cura/cura-4.6.1.ebuild b/media-gfx/cura/cura-4.6.1.ebuild
index c2d57876b251..bbd5d0b29de1 100644
--- a/media-gfx/cura/cura-4.6.1.ebuild
+++ b/media-gfx/cura/cura-4.6.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="+usb zeroconf"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/media-gfx/curaengine/Manifest b/media-gfx/curaengine/Manifest
index 46f064b026e5..00c0f3254f8e 100644
--- a/media-gfx/curaengine/Manifest
+++ b/media-gfx/curaengine/Manifest
@@ -10,5 +10,5 @@ EBUILD curaengine-3.6.0.ebuild 902 BLAKE2B 5216cfc20c7b68f326828fcab00d1d116dc6a
EBUILD curaengine-4.2.0.ebuild 1513 BLAKE2B 51f109e8db08e5e3d0caccc1016628e6570dfab14f30a5b061bc25cf2edff0516bc50409271f26e592f9223d775d4fbce66d8b48b6cdbb914e3115208d7b2a09 SHA512 78ca9ad1b1d59f3274021d57fe3e2d14b7225315e8eaea2179c656bfecb58e59384dcf520d4c5fe1d05af5dec21973cd8020af116eadd75969d1331d08d82d00
EBUILD curaengine-4.3.0.ebuild 951 BLAKE2B 477593726cb519294f189d8175f04168582dd756de4c0a86cb254f750cf1c0736b9913365e81eb48fe821e5b2c771d1468e5a7cf3e36bae7339d0aa5310affcb SHA512 f5974e877bd0c885f2aa5856ad410b05a16029039ed87913ccb03adedd804b1cf474addb526a8f961902f45b231199b32db852bc8b78aace2b559342715a0686
EBUILD curaengine-4.6.1.ebuild 955 BLAKE2B 733f85ddaec6e24923289023a83bba47c0f9fbd29be348ff0a338d39bdf8655255cddc54afe14d53600195c178169d3c1a83b26f25739884fee166498280596b SHA512 92d6924c086f4e8b022105d235467dce86d7f65466a9df97026f625eed054a6ec45f2901202c5cd70f5d11ddb9093de0632530e64e04957b1a86dea7eec3f569
-EBUILD curaengine-4.7.0.ebuild 2280 BLAKE2B 512648356a1f9155dff7d720ed14de5c76133fe87c8a17799d7eeb4b9610c12d34928a1448800351d8e7183186333ac2005ba99c151e6641b5ad70fac666f089 SHA512 e83fd950243da16b6974694c691fab84f6c4e3cb855c13abd88d402f3913da19df0391dacc073c00a37242b638eba11b0c628006fe843bb6ad15e8d17b5bf589
+EBUILD curaengine-4.7.0.ebuild 2287 BLAKE2B edf6a643b44302269a589d8040ed39d54d26ef5a602f9d8d2e6a196e754f78b0e3e0f3439781f6b29afa39424642b57914b34538ccfc510f2de1a8291394a5c7 SHA512 5b83c30d7ace834f57ea23f3a963bfbbf407a46d87175181df73d1e367725eb0d1fed080204f90a352965ba83ce45c70ae81b7f6852bfd7cb70af525049893ed
MISC metadata.xml 1468 BLAKE2B 7aec44b3b8d90adfa9c95365a7e299907fb0879c2358d5770b96b41f175d0d916e6786b25cc7a3b39f599d2a3e61a00cd4b3a0d039c95cd6e0fd122d2be54e4e SHA512 3ab874f2117073a17297234b29e95b70fe73ab90fbddcfe024586dc2b0b47af23998e0cc5ae271614be95f4c41fc2a9485f097ba3eefea0345d8d592d5e0f390
diff --git a/media-gfx/curaengine/curaengine-4.7.0.ebuild b/media-gfx/curaengine/curaengine-4.7.0.ebuild
index a644aeef81b8..74a7ec34474b 100644
--- a/media-gfx/curaengine/curaengine-4.7.0.ebuild
+++ b/media-gfx/curaengine/curaengine-4.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.
LICENSE="AGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="+arcus doc openmp test"
RESTRICT="!test? ( test )"
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 1fa4b86e591c..07f632785654 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,9 +1,7 @@
AUX digikam-6.3.0-cmake.patch 2038 BLAKE2B 73c6c7d008c3b76f9347f4192d435e10aa3607abf62436372ef131ac034ef538c1baa8d0d03e6b587b771fb766fa3286c649a6ffc7640a2f21e292b1e524cab6 SHA512 c8e6d2fd6c18d8c8e8733dffd1e0e2fb66b8bf3496aa6f767a4c633a56733c85bc53bdceaf689e84beca672a5013a02349cfca73d9f1e89a99252c7bac526a4d
AUX digikam-6.4.0-qt-5.15.patch 1499 BLAKE2B 8d82d27d0b5376d5974dbc4d244dc1e3c683b8bfe392956b2d13cf30753984dd84746aaca049284a2c10f5074a1a9a51b228114c0b3eb02f8ae5ceb20abc00fc SHA512 3794b43734258112dfa693795d62887e66b8c99ffe339de3baa91fcd750d409962934e9bfcfc02f253ff9b4b04241eb5c4f983dc8a1b88a8f15d94d7cd3812ac
DIST digikam-6.4.0.tar.xz 340146992 BLAKE2B ca1bc8b0d165f9774354d8489a11d46d8d7467edd3c1e90fd3a96024c4b7cd23bfd5c813251183bcca6d4beac9bffeb9d921beaa9a3752f75f1918796aacd719 SHA512 b3b5e9903538d110613aa872c9215f5e7c19f7520a2b9060c24e686f20f72075378b447239dd3e17cb8860cdd35c699399994199b848757f0497ad25a7805e42
-DIST digikam-7.0.0.tar.xz 571511148 BLAKE2B 4730a7fd70c7939f229ce6e3e95e8e8f2c37d0e54f033b3161c27e93a2eb5d464a9e1339ba1d6acce4312f91dbc3f4b55333f8b7a9a32d58a20dd04c0fbd8d2b SHA512 379d319dddd49605ae59aa8aaebc96f264f7fdfd8d6fa51be8b097e79add4042072cbc1f52d7bc96e6045b967c01f282e50bf955923016ee6e0cfd07d09e2a24
DIST digikam-7.1.0.tar.xz 593501044 BLAKE2B dcd124a18299a75c02b51642cc33d2a053f1fce4abd82b3f50ea93cc17e8b302b73284106ed716e815741cc38326695f1303e018998a6687f8cd92ab539faeb0 SHA512 df7138a45ff8de6c1e32cb0eea83e1cd4b67f027b149a696d8feb8008ceaae55934c1f1d9625c1ba29de850ad70aa01dc73f1b7517253ca6aa99f0f97b84a3a4
EBUILD digikam-6.4.0-r1.ebuild 4358 BLAKE2B ca4ffa68ef7be1191439f94f3d52916c2ef4cb06c1fca12017989290c55ae5f2e819d74286ebac80835792df81a895b3c7d002205c44d698129887e36ddc5ddc SHA512 dc14d9384b6c4ee943dd63ec5a6eb6f5fcde9539cbdc4a34d2e5f2467c83eacb9acbabfcba93ea731b5b97a0a7e5fb07e02dbbe4a35f0bc956883a9ff88bfceb
-EBUILD digikam-7.0.0.ebuild 4084 BLAKE2B fab6cca649fa9ff160e754ec45a5c70a45139c92fc79d8b740c2e24250931a43d6a304c506445db8c4ae1cac3958dce5634ba2cca43719373a0f62617b6b5523 SHA512 3bb5113b79604ae17fdfeee9fffa730dbbb06e884033c9ecb7ab9d23bcc1e30f70d5cabf9d8535503170d953be6abefe21c59f9409aa33dd3946eccd656ba600
EBUILD digikam-7.1.0.ebuild 3999 BLAKE2B 7ad4b24acbb047408c5a05c5403e5ff52296f3983a0fd09a9b5c445c6da9657eb85fd8d05fa137be247329d7f7b70f322f11dd92c8cb5d3c9a4e1ddbe9842972 SHA512 a7ed90a1f046b88ead5542dd62d4ac7cbf81f1f19e4d2cb11a8b30de6c1d8967ed8ffb45ac128765f16f1215c3c4542c7b5ce9f8041d706bf229d7f00224fca4
MISC metadata.xml 1368 BLAKE2B 5dec50abba4f748e1f8eb465807c719f4b81759277241169d9e721749a1ba807425f7d46e9feb1edb4dcf3b4dd00b40bfbb353fe479e29c8a1878ad1fbfb5082 SHA512 4cd1ada9c4274338e49a692095d80b572c309bd34c838e2663a18ec1e7230de87e27087febfedde46a0f6af19f1a3f440335750375117d20eacd0c756db8b2f8
diff --git a/media-gfx/digikam/digikam-7.0.0.ebuild b/media-gfx/digikam/digikam-7.0.0.ebuild
deleted file mode 100644
index 742181ff7bbb..000000000000
--- a/media-gfx/digikam/digikam-7.0.0.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org toolchain-funcs
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- MY_P=${PN}-${PV/_/-}
- if [[ ${PV} =~ rc[0-9]*$ ]]; then
- SRC_URI="mirror://kde/unstable/${PN}/"
- else
- SRC_URI="mirror://kde/stable/${PN}/${PV}/"
- fi
- SRC_URI+="${MY_P}.tar.xz"
- KEYWORDS="~amd64 ~x86"
- S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Digital photo management application"
-HOMEPAGE="https://www.digikam.org/"
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop webkit X"
-
-BDEPEND="
- >=dev-util/cmake-3.14.3
- sys-devel/gettext
- panorama? (
- sys-devel/bison
- sys-devel/flex
- )
-"
-COMMON_DEPEND="
- dev-libs/expat
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5[-gles2-only]
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5[mysql?]
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=dev-qt/qtxmlpatterns-${QTMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/knotifyconfig-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/solid-${KFMIN}:5
- >=media-gfx/exiv2-0.27:=
- media-libs/lcms:2
- media-libs/liblqr
- media-libs/libpng:0=
- >=media-libs/opencv-3.3.0:=[contrib,contribdnn]
- media-libs/tiff:0
- virtual/jpeg:0
- addressbook? (
- >=kde-apps/akonadi-contacts-19.04.3:5
- >=kde-frameworks/kcontacts-${KFMIN}:5
- )
- calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 )
- gphoto2? ( media-libs/libgphoto2:= )
- heif? ( media-libs/x265:= )
- imagemagick? ( media-gfx/imagemagick:= )
- lensfun? ( media-libs/lensfun )
- marble? (
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=kde-apps/marble-19.04.3:5
- >=kde-frameworks/kbookmarks-${KFMIN}:5
- )
- mediaplayer? (
- media-libs/qtav[opengl]
- media-video/ffmpeg:=
- )
- opengl? (
- >=dev-qt/qtopengl-${QTMIN}:5
- virtual/opengl
- )
- panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
- scanner? ( >=kde-apps/libksane-19.04.3:5 )
- semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
- !webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
- webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
- X? (
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libX11
- )
-"
-DEPEND="${COMMON_DEPEND}
- dev-cpp/eigen:3
- dev-libs/boost[threads]
-"
-RDEPEND="${COMMON_DEPEND}
- mysql? ( virtual/mysql[server(+)] )
- panorama? ( media-gfx/hugin )
-"
-
-RESTRICT+=" test"
-# bug 366505
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
- ecm_pkg_pretend
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
- ecm_pkg_setup
-}
-
-# FIXME: Unbundle libraw (libs/rawengine/libraw)
-src_configure() {
- local mycmakeargs=(
- -DBUILD_TESTING=OFF # bug 698192
- -DENABLE_APPSTYLES=ON
- -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
- -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
- $(cmake_use_find_package calendar KF5CalendarCore)
- $(cmake_use_find_package gphoto2 Gphoto2)
- $(cmake_use_find_package heif X265)
- $(cmake_use_find_package imagemagick ImageMagick)
- $(cmake_use_find_package lensfun LensFun)
- $(cmake_use_find_package marble Marble)
- -DENABLE_MEDIAPLAYER=$(usex mediaplayer)
- $(cmake_use_find_package mediaplayer QtAV)
- -DENABLE_MYSQLSUPPORT=$(usex mysql)
- -DENABLE_INTERNALMYSQL=$(usex mysql)
- $(cmake_use_find_package opengl OpenGL)
- $(cmake_use_find_package panorama KF5ThreadWeaver)
- $(cmake_use_find_package scanner KF5Sane)
- $(cmake_use_find_package semantic-desktop KF5FileMetaData)
- -DENABLE_QWEBENGINE=$(usex !webkit)
- $(cmake_use_find_package X X11)
- )
-
- ecm_src_configure
-}
diff --git a/media-gfx/displaycal/Manifest b/media-gfx/displaycal/Manifest
deleted file mode 100644
index 162feaf5e613..000000000000
--- a/media-gfx/displaycal/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST DisplayCAL-3.8.8.1.tar.gz 10625317 BLAKE2B 3e988221ee7d75d5a34b1cd69ab80737017c7e7a0fa16c3bc1587210b6b1108e623a3ccada3be8b99fae4c0a70f2cf45293222232f87f0ac13fedf2a1f22fcbd SHA512 e16cdc4590274f10fc122e18a5d94a1d326c43bc132e7af97c6f28c5a656f02203cfb7c73b92fa98d3ee2a8bbf560514615bc9b34c881d2758a5a6f2867092b3
-DIST DisplayCAL-3.8.9.3.tar.gz 10639277 BLAKE2B b99d2a39eb707654799b089a8f14891b257a27cb209511ed04ea6e2de7ec4bc3e68db884ebc460e25325495645d1a851b936f91632c571a385e009ea6b9cd6d2 SHA512 cece09605c12be6a154d8d8b088005e527a9e6674a89ec2787b0687a92b7f424749681f149a07bb798df6729c9f4c37e8760abeec115a014c06f94f25fc2f904
-EBUILD displaycal-3.8.8.1-r1.ebuild 1652 BLAKE2B 929df5b37144ce00c74285209caefd907fd5bc2f4a908cd96d34d745f570c54b9fa499309a8a3f6a3c68187fa2950df02c690e62f25fdaeec34cda8e832558dc SHA512 cb2ac10df0dac035c0eb97a4bba1e4a2f985c07fd04b18bb4152e922113cfaea0bb6b5be1ae30ceb543713050fbd16064677f654931531073a970c9ef23ff17b
-EBUILD displaycal-3.8.9.3-r1.ebuild 1747 BLAKE2B 49e885a779858fd543adc4be952200d046c91bc51a65652318e75acfbe7322f31ebd5785c70037f9aad3889ad0fc475af6e37f6c73240555d3612768712b39fc SHA512 9a09bd7e3e5287ec0b1ce57eb7e2d9014e024655b6f76966d2d83be8050fbc16919bf830bfe6bb256a530ba2fcb84ca403f86cd28a7da5adb6ebf1799bec7682
-MISC metadata.xml 342 BLAKE2B e74a7767c5b6e82bd35776606de555f9d4f26a25727decc6b0216fa3ea27cee8f28a7749e46b842c52e403c5150b24b4e33e0b971bd49077814e7945ee8cc290 SHA512 f9d5979fc8525c40af8d4e64afb8264873b0ae7cda1e9c4f3b3f30957c2a4f7fcbab76002783213a896395e8b5ef78e315441c28872589a91a0035d5f346d317
diff --git a/media-gfx/displaycal/displaycal-3.8.8.1-r1.ebuild b/media-gfx/displaycal/displaycal-3.8.8.1-r1.ebuild
deleted file mode 100644
index 09d6133dd94c..000000000000
--- a/media-gfx/displaycal/displaycal-3.8.8.1-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 gnome2-utils xdg
-
-MY_PN="DisplayCAL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Display calibration and characterization powered by Argyll CMS"
-HOMEPAGE="https://displaycal.net/"
-SRC_URI="mirror://sourceforge/dispcalgui/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
- >=media-gfx/argyllcms-1.1.0
- dev-python/wxpython:3.0[${PYTHON_USEDEP}]
- >=x11-libs/libX11-1.3.3
- >=x11-apps/xrandr-1.3.2
- >=x11-libs/libXxf86vm-1.1.0
- >=x11-libs/libXinerama-1.1
-"
-RDEPEND="${DEPEND}
- dev-python/faulthandler[${PYTHON_USEDEP}]
- || (
- dev-python/numpy-python2[${PYTHON_USEDEP}]
- >=dev-python/numpy-1.2.1[${PYTHON_USEDEP}]
- )
-"
-
-# Just in case someone renames the ebuild
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- # Do not generate udev/hotplug files
- sed -e '/if os.path.isdir/s#/etc/udev/rules.d\|/etc/hotplug#\0-non-existant#' \
- -i DisplayCAL/setup.py || die
- # Prohibit setup from running xdg-* programs, resulting to sandbox violation
- sed -e '/if which/s#xdg-icon-resource#\0-non-existant#' \
- -e '/if which/s#xdg-desktop-menu#\0-non-existant#' \
- -i DisplayCAL/postinstall.py || die
-
- # Remove deprecated Encoding key from .desktop file
- sed -e '/Encoding=UTF-8/d' -i misc/*.desktop || die
-
- # Remove x-world Media Type
- sed -e 's/x\-world\/x\-vrml\;//g' \
- -i misc/displaycal-vrml-to-x3d-converter.desktop || die
-
- distutils-r1_src_prepare
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_icon_cache_update
-}
diff --git a/media-gfx/displaycal/displaycal-3.8.9.3-r1.ebuild b/media-gfx/displaycal/displaycal-3.8.9.3-r1.ebuild
deleted file mode 100644
index 002517155d42..000000000000
--- a/media-gfx/displaycal/displaycal-3.8.9.3-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 gnome2-utils xdg
-
-MY_PN="DisplayCAL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Display calibration and characterization powered by Argyll CMS"
-HOMEPAGE="https://displaycal.net/"
-SRC_URI="mirror://sourceforge/dispcalgui/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
- >=media-gfx/argyllcms-1.1.0
- dev-python/wxpython:3.0[${PYTHON_USEDEP}]
- >=x11-libs/libX11-1.3.3
- >=x11-apps/xrandr-1.3.2
- >=x11-libs/libXxf86vm-1.1.0
- >=x11-libs/libXinerama-1.1
-"
-RDEPEND="${DEPEND}
- dev-python/faulthandler[${PYTHON_USEDEP}]
- || (
- dev-python/numpy-python2[${PYTHON_USEDEP}]
- >=dev-python/numpy-1.2.1[${PYTHON_USEDEP}]
- )
- || (
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
- )
-"
-
-# Just in case someone renames the ebuild
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- # Do not generate udev/hotplug files
- sed -e '/if os.path.isdir/s#/etc/udev/rules.d\|/etc/hotplug#\0-non-existant#' \
- -i DisplayCAL/setup.py || die
- # Prohibit setup from running xdg-* programs, resulting to sandbox violation
- sed -e '/if which/s#xdg-icon-resource#\0-non-existant#' \
- -e '/if which/s#xdg-desktop-menu#\0-non-existant#' \
- -i DisplayCAL/postinstall.py || die
-
- # Remove deprecated Encoding key from .desktop file
- sed -e '/Encoding=UTF-8/d' -i misc/*.desktop || die
-
- # Remove x-world Media Type
- sed -e 's/x\-world\/x\-vrml\;//g' \
- -i misc/displaycal-vrml-to-x3d-converter.desktop || die
-
- distutils-r1_src_prepare
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_icon_cache_update
-}
diff --git a/media-gfx/displaycal/metadata.xml b/media-gfx/displaycal/metadata.xml
deleted file mode 100644
index 8e283c117bd8..000000000000
--- a/media-gfx/displaycal/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>voyageur@gentoo.org</email>
- <name>Bernard Cafarelli</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">dispcalgui</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/media-gfx/duhdraw/Manifest b/media-gfx/duhdraw/Manifest
index 7d5766bf6a66..0649a0751644 100644
--- a/media-gfx/duhdraw/Manifest
+++ b/media-gfx/duhdraw/Manifest
@@ -1,5 +1,5 @@
AUX duhdraw-2.8.13-macos.patch 248 BLAKE2B ba9bd84d8cf3b271dd8292062894c76ff4e2d18a114326d505b1a4bd135a49420b0984554e894162ae292297836268d7e1868b635be9d7641d021135a60d9845 SHA512 5ee28dd33ad8589c64a69de3eac5636a178419061df167228be2f63f88c626f9a1d8f0df03d3c5890c42b7fa90d3a330d39a808579451345feb584fce5429ae0
AUX duhdraw-2.8.13-prestrip.patch 344 BLAKE2B dc84ac31a40a9fc57b2a0edc6454a3b0f1df3ad7b280bad84e9443c52eb64ba6c0396c93b6048561aee0c2d48fc5c02128ee21eb68f3dfaf63e19f479c21b5a0 SHA512 461a167ccc609b96f2a4fc8064cda9a97f22952f17c08a68e4980e7366a1fe91685fce7bdf2a5aa6e59aa8b5ebf0d9ada640c67ad64ba59c8b0d7d10a047b3d2
DIST duhdraw-2.8.13.tar.gz 51779 BLAKE2B 7d87c9bb7a23b9c520636dacec34ca20281bf68e650dfb133cfaf59e3f71e27fa2086f1aee60ce9c01e5f0a6c6483553fe1103ff503bfbb80df9679057ca8e49 SHA512 fa9102133dcd100b2cde58d4d92aabfcdf86bb16a8066191e92922d6cea470094ff226e569bf92d34e1f0f6a3e657eaf3326cecf091ed1bc37bd2faace340798
-EBUILD duhdraw-2.8.13-r1.ebuild 725 BLAKE2B dc9ec0bdb1a13615f9df2f9da00e8b29cc9fe07a3387e8f950c399f309ef56dbb3bc694055fc9010add162e2454c5b57ab1d4a9ac6b3a7b3cee4a76e3c6ea6eb SHA512 fe078f198a5587af0b56aa8bc27a4c5f31bce6af418c9907256c4f479b6b573bc8ec7da1797060bc5e167599be7d35767ced018a1b6e925b1747d9abf1af24f0
+EBUILD duhdraw-2.8.13-r1.ebuild 727 BLAKE2B 1943d2fcad8f159ded23664906a1d88fe3b0ce9e6f90324e23cb4cea737bc9954bdca2034671e8d2384ed9e40bd2987a76969f53a85da7be410e767915681938 SHA512 c7c7ecdf37ed48fb1b86e12862983a0975133c245afb4ec399a40a70d0411ff9a2607ede9cc7809155cbe80556c82e3df64f548c1633fb0163eddb4c2674d890
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/duhdraw/duhdraw-2.8.13-r1.ebuild b/media-gfx/duhdraw/duhdraw-2.8.13-r1.ebuild
index ead354248580..f3e80b91a9fb 100644
--- a/media-gfx/duhdraw/duhdraw-2.8.13-r1.ebuild
+++ b/media-gfx/duhdraw/duhdraw-2.8.13-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit toolchain-funcs
DESCRIPTION="ASCII art editor"
-HOMEPAGE="http://www.cs.helsinki.fi/u/penberg/duhdraw"
-SRC_URI="http://www.cs.helsinki.fi/u/penberg/duhdraw/${P}.tar.gz"
+HOMEPAGE="https://www.cs.helsinki.fi/u/penberg/duhdraw"
+SRC_URI="https://www.cs.helsinki.fi/u/penberg/duhdraw/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/media-gfx/entangle/Manifest b/media-gfx/entangle/Manifest
index c9933a3983c8..d1ea8112cf5f 100644
--- a/media-gfx/entangle/Manifest
+++ b/media-gfx/entangle/Manifest
@@ -1,5 +1,3 @@
-DIST entangle-2.0.tar.xz 501912 BLAKE2B b7e1c393dc95d66bf4389c607c0eb6eb70161ceb2c845135c7c99313a1ec13388c6b00fd6ed7f38ad6f9f18d8c97eba0aadab7964d1be8ec03373e5598374796 SHA512 be8b75c5dd0bdd7cd380f35b5d46d7be9f7caa2be257ce954cf9516ebd5601071ac8b50838f9c40470b6e3e5f95083c3671af68ac43eb345a60d674636a0fe86
DIST entangle-3.0.tar.xz 518808 BLAKE2B fe2bf4b114bc04fdc56792f984ae7387b70d693fa82f8deaa2023de71a8bba72bc95d4bfc430cdfaf5244e9114b4f7e8bb2e17f3b86de6529037519fa3877899 SHA512 8c6d7e067f88a770c63b76fde2a6ae71894aae95477fcf66b4670697889fdf7939d3f95532626d6f4ca7ae75841d8f247f6bcf78a1ce195b540989f1bfe5ebdd
-EBUILD entangle-2.0.ebuild 1609 BLAKE2B 37cf9af5ed3a495629b477c8f41129f51030e362c2c18510c363f6f6e3d878f0d47dcd0a98645e8dd8e79e075b07b171fcf5b12885a502d773c8e1014bc5191f SHA512 9ab26a4e189119a59cf65c3c591c44f6f934782a3a8e25b8e9dde4df2055aa83b2c1b380c6acea60e5ca2e3926aa791bc25aa3ef16ad4c2a04dce92b205793d1
EBUILD entangle-3.0.ebuild 1634 BLAKE2B 38a0424e06986024877f9ed84ee21eaeb48376cec721679d6d4372a2795d422b2d759129cedc21eb4c86b4bd5481e587b97637a5ccf3bf8f18c1bc97fb3d9f05 SHA512 48f22c44a3d5553e594d61d0786186ff8bd6bc6d6af7bb2bdcb61dbf1058d6e24ec4d7ebbd4c01729a5a22f64bfca5ca69ab60e903e20c385e228c7bc32af435
MISC metadata.xml 446 BLAKE2B 1c466f17b5df47045169784918723e953945eaad2eb5879cde6f099feec4cb419e867f77879927933fe3daec259184a361f464b968b19bdf3463b01b7371589d SHA512 555966a8638a027288abdc7ba6d625c15c18792c3401d399a12dc256ec75f14882fce3e70596a3f3e2ed6729e471af04b14d520b8e2e70206a172f98b9967dae
diff --git a/media-gfx/entangle/entangle-2.0.ebuild b/media-gfx/entangle/entangle-2.0.ebuild
deleted file mode 100644
index 9094ca377da0..000000000000
--- a/media-gfx/entangle/entangle-2.0.ebuild
+++ /dev/null
@@ -1,67 +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 gnome2-utils meson python-single-r1 xdg-utils
-
-DESCRIPTION="Tethered Camera Control & Capture"
-HOMEPAGE="https://entangle-photo.org/"
-SRC_URI="https://entangle-photo.org/download/sources/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="
- ${PYTHON_DEPS}
- >=dev-libs/glib-2.36:2
- >=dev-libs/gobject-introspection-1.54.0
- dev-libs/libgudev:=
- >=dev-libs/libpeas-1.2.0[gtk,${PYTHON_SINGLE_USEDEP}]
- >=media-libs/gexiv2-0.10[introspection]
- >=media-libs/libgphoto2-2.5.0:=
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- media-libs/lcms:2
- >=media-libs/libraw-0.9.0
- >=x11-libs/gdk-pixbuf-2.12.0:2
- >=x11-libs/gtk+-3.22:3[introspection]
- >=x11-libs/libXext-1.3.0
- x11-themes/adwaita-icon-theme"
-RDEPEND="${DEPEND}"
-
-# perl for pod2man
-BDEPEND="
- app-text/yelp-tools
- dev-lang/perl
- dev-util/glib-utils
- dev-util/gtk-doc
- dev-util/itstool
- sys-devel/gettext
- virtual/pkgconfig"
-
-src_compile() {
- # prevent gst from loading system plugins which causes
- # sandbox violations on device access
- local -x GST_PLUGIN_SYSTEM_PATH_1_0=
- # pre-generate enums to resolve race conditions
- # https://bugs.gentoo.org/709740
- meson_src_compile \
- src/backend/entangle-{camera,colour-profile}-enums.h \
- src/frontend/entangle-image-display-enums.h
- meson_src_compile
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- gnome2_schemas_update
-}
diff --git a/media-gfx/fdm-materials/Manifest b/media-gfx/fdm-materials/Manifest
index 685a44f82f3f..5450edce88be 100644
--- a/media-gfx/fdm-materials/Manifest
+++ b/media-gfx/fdm-materials/Manifest
@@ -7,6 +7,6 @@ EBUILD fdm-materials-3.4.1.ebuild 427 BLAKE2B f0c2ffd1704db661214fadee859f5ecb9a
EBUILD fdm-materials-3.6.0.ebuild 424 BLAKE2B 86abac9f2f32f709c5e2dde549df6758108d22945a55fff32f4be6c2bf3842c210af686f00a6c403f0ae13611062e300cb4e235d4bd8fd25c0cf281fcda31f7e SHA512 aaaf876fe1c373061e94067ba1c89af62fb4836c44c7115c55d7684f01be6f11653850b94b029fdc56e70fc861eb44325aa946feac81d1ac0f06c3d48d8a7264
EBUILD fdm-materials-4.2.0.ebuild 418 BLAKE2B 32a8bb1a67475a051216c3ed08230c48df1e6aef3938960d2d4d33d8a2735d6e6505ef992fbff9e9ad2cab7ba9fa7ba71227f735e0736150f35c8f08cf9d4e64 SHA512 73d45424b64d0cc9559dc9c59051e04783330915eb28e1d4d39c5f51a1028c8f819df857a38e4090f3bf14158020ff0e9833846c924072870b7d0bda314b03af
EBUILD fdm-materials-4.3.0.ebuild 418 BLAKE2B 32a8bb1a67475a051216c3ed08230c48df1e6aef3938960d2d4d33d8a2735d6e6505ef992fbff9e9ad2cab7ba9fa7ba71227f735e0736150f35c8f08cf9d4e64 SHA512 73d45424b64d0cc9559dc9c59051e04783330915eb28e1d4d39c5f51a1028c8f819df857a38e4090f3bf14158020ff0e9833846c924072870b7d0bda314b03af
-EBUILD fdm-materials-4.6.1-r1.ebuild 537 BLAKE2B 2670978d0e05fc242ac0fe2dfd069ac797adc20060ea93e3778ab0145024348063eeb8a8ae17d90d576b48aa2fa8d8fc0f672598fe2752a7130ab28efafd2c76 SHA512 f55b0d58bf6eb84b61e276119c880e0156fc182e771b264f6cb248d4a0e97e7c877d69de782547953c0f91d42db4994250201a60099148ca4876543cd4f5d3d0
+EBUILD fdm-materials-4.6.1-r1.ebuild 544 BLAKE2B 62876b85725d6065e9ecf53c100ab9787c5147b1b4428e641a89837b9e01a38bc5c7a17ba0c55b6e25a8863f6e17bf0b732922c1f99298d3b8e8fac5579b3801 SHA512 a9d88895a40efca25e88c795a357cca743dab6d89c0366eeff6081ae73ae129ddbe3575469d9ff76f571ca882db868ed02c9e9a01f2332cb807b91f896130ab3
EBUILD fdm-materials-4.6.1.ebuild 418 BLAKE2B 32a8bb1a67475a051216c3ed08230c48df1e6aef3938960d2d4d33d8a2735d6e6505ef992fbff9e9ad2cab7ba9fa7ba71227f735e0736150f35c8f08cf9d4e64 SHA512 73d45424b64d0cc9559dc9c59051e04783330915eb28e1d4d39c5f51a1028c8f819df857a38e4090f3bf14158020ff0e9833846c924072870b7d0bda314b03af
MISC metadata.xml 949 BLAKE2B d84bebe6a29c4eb2a6e644347492fe06a60e758efcaba9158d2395d2e3714565f805d01ed029bf8906c54ed286e49902adf6b4e8cef9870219cf3fd13912f5e7 SHA512 d7f04589e2e66b471a721aafa2d2be2d531211f2e5003ed7ffed918e770e6980cf891bc5728a0d1a27c3bcaebf2706ac9dd6d9dac847c412e1b7adde091a7594
diff --git a/media-gfx/fdm-materials/fdm-materials-4.6.1-r1.ebuild b/media-gfx/fdm-materials/fdm-materials-4.6.1-r1.ebuild
index dd27037aa323..99506a67b867 100644
--- a/media-gfx/fdm-materials/fdm-materials-4.6.1-r1.ebuild
+++ b/media-gfx/fdm-materials/fdm-materials-4.6.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.
LICENSE="CC0-1.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="embedded"
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 98f431aaad43..b820e28c1358 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -2,7 +2,8 @@ AUX gimp-2.10_fix_test-appdata.patch 902 BLAKE2B 2b1a131d874d65422d8bdd44732b984
DIST gimp-2.10.18.tar.bz2 32946467 BLAKE2B eb1c756ca646ee9ddc42aebe214ad3e2dedf125940dc1b9cfd04a4424bd2b6255041f1bafbda3fc214f93d97e7802372234a42e1daa0ee56caaf0f0bedd908f9 SHA512 88990f2d70508b22f4acadeab6b687e20af19b765ebc6f245d0c99b3dd853fcd3d237c3b7607e50133aa95a1d71931069029dfd7ee94441ff419c542c141bc9f
DIST gimp-2.10.20.tar.bz2 33108938 BLAKE2B 060c0e46e6f4ac861de265842d545285c2fa4590908172971ef240ae87f8caa2c015447deee810fef59c4869810676daae2e40aa611062168feffe38c7cd9b22 SHA512 7cd0b1833af87a167fdfee59fb491a72727fe3071c21c0de1813adb0f8272a92473e1e300517395b1b4593c8cb6781ee30f7a63966756e5a7f523a164308aba6
EBUILD gimp-2.10.18-r1.ebuild 6166 BLAKE2B a0457d562c194faf821e57647a171d1152f35c567332dff9fbde3e5c69a1ad55e547f07ca94d4f3f58178be7c56005655d2c77c342b8fc983968aca93784e033 SHA512 e7dbff03388e9b651851eb54aa5c8fb61736f288747d0ada5986bb9851cd5de7fefa9b57fe81b36363de27f608b254fba3049f759d4d2ccc40b1eaf3f70308b4
-EBUILD gimp-2.10.18-r2.ebuild 6317 BLAKE2B 4ed48f6450955abc83ebfc73605a825d1ab493c27ddc4b389d06c93a092961343c9496712f308aee68f81c48757ec3e44257609127a9218b9f02a4d893b7c347 SHA512 44f765e80996107ca3d4b294c4018e23e8ae5619eb2c7cebe6b1f6f0e7614fa296839d58f5b10a5e3f547b12bd1c2e303edd8893d47b5733fc44816ff3b8a0b2
+EBUILD gimp-2.10.18-r2.ebuild 6313 BLAKE2B c4858a01c8bb279ebb9f14bce5c578679bec05de6d6418a4137c012840fa7cdb707d97b74bdb602f0c9a018fe56bd67452af71bf42857b0d9a77a133caa3cc89 SHA512 eca3afb038ed0c51ae1b499e69b1af5f41e3ef2cc95b1d064241d6151b2bc8d8444e2b7a8806a84de15c4f8306a3ee07de8101827114a5a5b9c26acd0e487bca
EBUILD gimp-2.10.20-r1.ebuild 6022 BLAKE2B 75e149312d91224b99ef93146525509c411a02cf59d87f3c727fcee60504f6769d84dc676439eb59a880edb17cfda65ae5ae2eff0062c9ee4ff74247f1f73cf0 SHA512 d1aec4d39329879101a28769a192dd92cc296c80402d99dfed07c9a5f7974363cd94dfe1765142f146bca43e005a6dad77bac45a86c47be26ae2f46be23f4d62
+EBUILD gimp-2.10.20-r2.ebuild 5652 BLAKE2B 42e8acc097cb3e25713fa144e9e1259ef29c01d0bd706f6f5ecbce4040ac2841027ab9231314d8f3225b4fd9c360e16e51a4a49be02ad5612550892be96a8031 SHA512 467eebc4200c581b91c9af811132b817a7518e41beb238921e735568d8c174052da04a98b0c1a30e7683f4f0cbef4b6a794cf01e0941076df98f5e95d27d1444
EBUILD gimp-9999.ebuild 6461 BLAKE2B ba3eac8a82d0ebac3cc0ae18c2cddfecdb54fb922707e813d9a922d1f466564f50d42ab24a9de9dab1f63a1302dc84bcede6b4ca3dd4e38503cb64fcee565a93 SHA512 97a1d450095bfa7219672c45100403950029a5c0620ce50ab50eee318baf8e0b944fe387d6483f4f5b9a5c570b8f77b346306c62ba6cfaf673d01c9f6232861e
MISC metadata.xml 546 BLAKE2B 2d5b9a68c47a72325199586a142f1d8344bef770d24738169c80958f3def3a0f1ad0b4d23774d3c458d80f17a394033813e01fc5e24b8b62146d2c55b5f8c9b0 SHA512 f654d93c738c942605ae61fe0d76972a1b81bffaf4edc23a1f55bb65e71022df7f14e769a71c41e5c5c7307eef9618a667ae418dc9bc77d5ac1299bbe0c58834
diff --git a/media-gfx/gimp/gimp-2.10.18-r2.ebuild b/media-gfx/gimp/gimp-2.10.18-r2.ebuild
index f586c716b705..ec2b8c9e32d4 100644
--- a/media-gfx/gimp/gimp-2.10.18-r2.ebuild
+++ b/media-gfx/gimp/gimp-2.10.18-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gimp.org/"
SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
LICENSE="GPL-3 LGPL-3"
SLOT="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 python udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-gfx/gimp/gimp-2.10.20-r2.ebuild b/media-gfx/gimp/gimp-2.10.20-r2.ebuild
new file mode 100644
index 000000000000..b608de52d4ef
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.10.20-r2.ebuild
@@ -0,0 +1,213 @@
+# 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="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/mypaint-brushes/Manifest b/media-gfx/mypaint-brushes/Manifest
index 344ef5c1a081..db5cf1c36e35 100644
--- a/media-gfx/mypaint-brushes/Manifest
+++ b/media-gfx/mypaint-brushes/Manifest
@@ -1,5 +1,5 @@
DIST mypaint-brushes-1.3.0.tar.gz 2447093 BLAKE2B 26fc22ef7669f5d88b1cb2bbc4562baffe257c112baf4a782f5045becd17a0bea577f79f290ae51b38cb3030478ea9d2e251033cc95101caacc823d139fe4ce1 SHA512 f8e0050cd700358d75cd25e40acd73905e2a53f21c6177cf67e8012aa4fbba8dc445109f07601c3846f95532a40feff4441081c0aa4e958049fc0ed8008fb414
DIST mypaint-brushes-2.0.2.tar.gz 1564926 BLAKE2B 68a244f42cd5d9b1f96466f5409f0c7ebae257f6dbbfdc5139cb9fda86ee4898ce8fda2a35e96f3a65f41333f7f689edb85445bcd88dc0fc4b428d05ba2870fe SHA512 89cecd9d78f4de84ada97a3e33fd67b86dfd259880da15c0ecbfad0fceb8c3b0e93790f3c0bff0cc375959bdf6921b01d1f3646e27c3f961715219a349017556
EBUILD mypaint-brushes-1.3.0-r1.ebuild 558 BLAKE2B 6850bc1a3e94d52faff03b029efaa481e4f1cc436053fa96499994450ee486c4276bcae2db56ac997ac40fd3eff8c914fa1a0b8ccd55947d0906a6db182180fe SHA512 ff4b72bbae9c2fa8b217de2513b186a75865bda8dba2acf19db7c93f0da126c068983f88737f3ef3d4e30f6b48a98e59f4f4e65955ac7aea439aefeab7a83f68
-EBUILD mypaint-brushes-2.0.2.ebuild 553 BLAKE2B 320197832af961ca357cf01bbb4976e887894b5e29880cb98433f601ba680fb8c64f668ca54cd3460aec12f0680246388c6af88f0a0f541c9269b139de2c7763 SHA512 f290dccf6b5fedd71e81dd4ba71e09ba308d90083f4842a14b68b0e9511c3c0f170be4189007a74d72d84bb5813fd7c270b871cb45fbf19e27c461e23dc7c4d9
+EBUILD mypaint-brushes-2.0.2.ebuild 550 BLAKE2B 756b9a767da9891e34b38d1df5fc1aafbec00a76e14e570dc8fecba410ac075ea158cd4d7af0088924d48fbca9f2d51bee1d8eb794eb3bdf8b0ffa0674ea4b0a SHA512 6f43f61c67d41c366a411eb39e944d0114e2e6f453820400aa642ce411f4832123618dc01ac3ebe1bfe18124fa7f72ec0a7278922133a220e07b88de8b93bd13
MISC metadata.xml 191 BLAKE2B 8bff04ca02f4930d6f77dd32df009c145cacaad2d1cf271d91ae928f85acdccb0d73b0202a41aa3e60470ba6c7853e41ef76587601b2163f9ec249b7fa1c5274 SHA512 da06af54ba93db06f717082e3f09bbca9e17adad4b070a28131f2ffec15d0dfc82c79a3b2fb045fa33d6756c6df85254733622b0b7b1952b33d5590a71865c62
diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild
index 41606195eab1..4a806df9a314 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mypaint/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="CC0-1.0"
SLOT="2.0" # due to pkgconfig name "mypaint-brushes-2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~x86"
DOCS=( AUTHORS NEWS README.md ) # to exclude README symlink
diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest
index f846f2bd9a04..6de7ea08b36a 100644
--- a/media-gfx/mypaint/Manifest
+++ b/media-gfx/mypaint/Manifest
@@ -1,10 +1,8 @@
AUX mypaint-1.2.1-json-c-boolean-defs.patch 1189 BLAKE2B 7cc9728fbe01195b0c95bd844592d4fbae29a7a26758d242933ed712b940d8a893cd41bd2987952e2a817208efbffd779e9c39d4dde42d809a1e11de06a234fa SHA512 8e5815c281a6c63c7818f378d0e75a94860dd24ea69e9fff8e5951b05c407f12e2e19fefeaa559476a4dab46c88eab8821eff061e8c8eadd1f3ce150e42563c2
AUX mypaint-2.0.1-GIL-hold.patch 5153 BLAKE2B 3d70b414bfb6396fffb9ebfc9c1fe6791878a97a999355b103fd848993172049db7f97f81d96e253294b9629a2a5dfe7c6710f29561f45b89f4fb26d4cf9a788 SHA512 aa64bb4ffb907516af811bb8ef4c0bccce9b785f94e0d71a44be30e7c96ea3a35dcceeac618956bf11c9d2c5c4e05524c8492ed14967148e2d6b9646b1ed5c15
-AUX mypaint-2.0.1-build-system.patch 1141 BLAKE2B c888061735a4297ec93343a1cb41582774c1a84a642095992b043e459c11c8222f21e1b041c67e345fdc61e194bdf58b6a21daaa00d12263354740330283f8c3 SHA512 55d7c826fc955459d7089baaf31cd4b3a38d0a6b7bdcff64f88e406dd152d4d40344bbff0dbd297f5dfc65a6cc8bd6d0dc06d5c57d8e8dda03b4c42e709a2142
AUX mypaint-2.0.1-r1-build-system.patch 638 BLAKE2B 8e0209eb8fdba535cb8c0075e183681b0d8f8a11613cf7c3d2ddb5e20954d6c95da3ef3824063ac55bb11feda38cdf00eb8190cf76ca7753d2432d870926194b SHA512 8c088a089408542f57ef0fb608a63ae6fa0cce5392cb309376198813d35f5c3e54466945419984973af77e11f5bc4908961b5e81982a32fbef04c081df1b0349
DIST mypaint-1.2.1.tar.xz 37897196 BLAKE2B 2d8f6b03f710febae1c2d617a6e542543786be384585ae8a973604da2eba8a0fb770d185aa3d2dfc6f794adf29ffb9c217356a96ab27d677ebb57816f62fae9c SHA512 1783765e495b9535669a83a29d27ba684e6201fdfe0875bdd2c167b1dab8af05993b19025767fe0b2770ed9e578e4709f75d8a4820ac945812cba85609f9eb9b
DIST mypaint-2.0.1.tar.xz 7295048 BLAKE2B 813a939f95ea6887c57d8c0868e33e9bc8b1b95746d5ecd793d4fd13a32198ee5a445cfdd2691a15e944bfb0099d6ac624dff320ae29465db5b1e0d197bedb30 SHA512 449beddcc6da5d720c9efbeac94a466ed0057bd1962d42ebb419190e8b7fd8ffd341327408467fc5da47920f9d0da1fd6d78233a0dda88de5f5d52d53d9ab562
EBUILD mypaint-1.2.1-r5.ebuild 2016 BLAKE2B 0a00318c334adc4c97021ca1e52cb089075b1db667f0ad431fcf758345756d7d3558e50a353c8578d5749172ea4bbe396a99041c026cecce6174cb7cc6e4caf3 SHA512 5b1a703cf2efb5e0d729315ea092c58954975dedc177472467f03726956211b34744018cb3ef730f4b5a8ff2053f30218f838609ef225dd05eab21f5d8a683d8
-EBUILD mypaint-2.0.1-r1.ebuild 1793 BLAKE2B a8b15a6f608d1d20ddf4844074a746905a163fdc3e1083defe8b176a7f281f8480b50282dfb3bb203176731fbf44ea816d6dcf04858330462e425a78fcfbb9c1 SHA512 da6d1c0291c169758b9524b0c752586b78702fda147b077bbee5368b6898fb3ee533c5a4e341e0e143cefc5b77fc25b4f93c0be9dc70ef0f7258a563d1cd7bcd
-EBUILD mypaint-2.0.1.ebuild 1555 BLAKE2B f9ec58013d9adbea0c569fc915659abd6c96e5cd943f85d935b04bc697fc3ad8549e3f1c42d8ae86b4fa12b552e32c71f65c34ccdf1140762231d0da0fed803f SHA512 87d5098d2460b8fb002c87116216885779e72107e262dc8910ce9a69fc85424028ad740339d92750e9f9524ab3fe45545ac3c0a4644ad26e1f6a64eb15305078
+EBUILD mypaint-2.0.1-r2.ebuild 1819 BLAKE2B 118b55b447bff16f992272017b3df8e28e9929c8904fb5417646c643f32eff5df4b1b266237fbee9b914da942482a7b33fae71af5bc7993ee83f98c8b95e3d36 SHA512 c6015d2ab888f48a32c5fcea45dd6532ec315ef61226e8ddb5ddfcb2b7ea2efcb0d3147a23b361c04553c71bef8863ef4508946707619e08f5bd52cb0d3d628c
MISC metadata.xml 247 BLAKE2B 3a8d267e6befd2f46c41982b7196470f32b4fcf5dc6a42ead10b13e81bdcb7975ea998a51d0deb2c3c1a49f00b5f9216d8e43ad7e6dd0aea0f3352b19532d0a0 SHA512 21b957bb801d29dfed1d0aeceac553c9ba039a7fe94ebf899e7ab5c3316bbad116c7bd63a07ccbbb8277d2ce19f27b964499d2ccd942028290519e465e989dbb
diff --git a/media-gfx/mypaint/files/mypaint-2.0.1-build-system.patch b/media-gfx/mypaint/files/mypaint-2.0.1-build-system.patch
deleted file mode 100644
index c7806e7119dc..000000000000
--- a/media-gfx/mypaint/files/mypaint-2.0.1-build-system.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 670df4d..703f9d2 100644
---- a/setup.py
-+++ b/setup.py
-@@ -471,9 +471,6 @@ class BuildExt (build_ext):
- linkflags.extend([
- "-O0",
- ])
-- else:
-- linkflags.append("-O3")
-- ccflags.append("-O3")
-
- return build_ext.build_extension(self, ext)
-
-@@ -869,7 +866,6 @@ def get_ext_modules():
- '-Wno-write-strings',
- '-D_POSIX_C_SOURCE=200809L',
- "-DNO_TESTS", # FIXME: we're building against shared libmypaint now
-- '-g', # always include symbols, for profiling
- ]
- extra_link_args = []
-
-diff --git a/setup.py b/setup.py
-index 703f9d2..cc8abbd 100644
---- a/setup.py
-+++ b/setup.py
-@@ -456,10 +456,6 @@ class BuildExt (build_ext):
- ccflags = ext.extra_compile_args
- linkflags = ext.extra_link_args
-
-- if sys.platform != "darwin" and not self.disable_openmp:
-- linkflags.append(OPENMP_CFLAG)
-- ccflags.append(OPENMP_LDFLAG)
--
- if self.debug:
- skip = ["-DNDEBUG"]
- ccflags[:] = [f for f in ccflags if f not in skip]
diff --git a/media-gfx/mypaint/mypaint-2.0.1-r1.ebuild b/media-gfx/mypaint/mypaint-2.0.1-r2.ebuild
index 9cc5552420b7..d0e52bef58bf 100644
--- a/media-gfx/mypaint/mypaint-2.0.1-r1.ebuild
+++ b/media-gfx/mypaint/mypaint-2.0.1-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mypaint/${PN}/releases/download/v${PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="openmp"
LANGS="cs de en_CA en_GB es fr hu id it ja ko nb nn_NO pl pt_BR ro ru sl sv uk zh_CN zh_TW"
@@ -40,6 +40,7 @@ RDEPEND="
media-libs/libpng:0=
sys-devel/gettext
sys-libs/libomp
+ x11-libs/gdk-pixbuf[jpeg]
x11-libs/gtk+:3
"
DEPEND="${RDEPEND}"
diff --git a/media-gfx/mypaint/mypaint-2.0.1.ebuild b/media-gfx/mypaint/mypaint-2.0.1.ebuild
deleted file mode 100644
index 1ca2e261568c..000000000000
--- a/media-gfx/mypaint/mypaint-2.0.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit desktop distutils-r1 xdg
-
-DESCRIPTION="Fast and easy graphics application for digital painters"
-HOMEPAGE="http://mypaint.org/"
-SRC_URI="https://github.com/mypaint/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-LANGS="cs de en_CA en_GB es fr hu id it ja ko nb nn_NO pl pt_BR ro ru sl sv uk zh_CN zh_TW"
-
-BDEPEND="
- ${PYTHON_DEPS}
- dev-lang/swig
- sys-devel/gettext
- virtual/pkgconfig
-"
-RDEPEND="
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- >=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
- dev-python/protobuf-python[${PYTHON_USEDEP}]
- ')
- >=dev-libs/json-c-0.11:=
- gnome-base/librsvg
- media-gfx/mypaint-brushes:2.0
- media-libs/lcms:2
- >=media-libs/libmypaint-1.5.0
- media-libs/libpng:0=
- sys-devel/gettext
- sys-libs/libomp
- x11-libs/gtk+:3
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.0.1-build-system.patch"
-)
-
-distutils_enable_tests setup.py
-
-# TODO: Allow openmp support (patched out)
-# There's no urgency on this given that it currently
-# breaks runtime use [0]
-# [0] https://github.com/mypaint/mypaint/issues/1107.
-
-src_install() {
- distutils-r1_src_install
-
- newicon pixmaps/${PN}_logo.png ${PN}.png
-
- local lang=
- for lang in ${LANGS}; do
- if ! has ${lang} ${LINGUAS}; then
- rm -rf "${ED}"/usr/share/locale/${lang} || die
- fi
- done
-}
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 411bd6571a0b..e79fc0d75970 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1,9 +1,5 @@
AUX sane-backends-1.0.24-saned_pidfile_location.patch 345 BLAKE2B dcf7cbd5787c7a225450e03663e7c1ca69dd40fc58e3de9d994fde6a66635d6a3ca20d2886fe7cbc6a7ed3202f8f3a8c7e3d9ea4072b4418a7a43048427a06c3 SHA512 49519b8fea68292b8cbd7bdcaf5b4803a1b890800e17015ace1d662e4503cc0844f191793c8f42cd6aa7e9922ee9f961d4784e30f22abc497973be1978bf1b24
-AUX sane-backends-1.0.27-canon-lide-100.patch 907 BLAKE2B 3e625443b48e2f03d1d095c1d3d2651abf1ea073ca7bbd439ef389906ed683d7f8b43123e7a9cc6360703f1b66886ff2cb6a7428984e4073496b890ed240e9bb SHA512 870dc11926df5ef0c38588336c8d69cfa11ebf9d3355f26eec4e5178fe2dac6e8ffc576980a4b5789cdb7155fbcc97a35300c63ba4e9e1ebbdd0702c563d09f3
AUX sane-backends-1.0.27-disable-usb-tests.patch 336 BLAKE2B 00fd225a4426405d515f5b6641c86e6d9035a588a776aaec26eaa4e10beebf0a9fd97da991646b7964a867c422da2bc1cf93560d1ba326f0086675036338ff00 SHA512 64cce489e87de31e1a865b86d5829ae4914a30f47e27b07fba68629261cefcd617b8eed272c94b7554545e4802283c5bd5b53f79f54403d875726b38378ae74d
-AUX sane-backends-1.0.27-network.patch 1022 BLAKE2B bcc929635fe62af4201f474cddd141b95bf1b7520f7279b713771ed9614990b3331ec1b42f309d88e375d6c9cffacb7195e7e3f063e491bb9cd6e4ae39f79eea SHA512 04b65a06d2c76dde6fce501ba823e999eb89ea41573f887f9e7d5347f3aa5e35310fad69313e99f873640e29a9849372d2ff995678593a0781fba73b464bec0d
-AUX sane-backends-1.0.27-revert-samsung.patch 14137 BLAKE2B ec41dcc9862a50f09518207b0db83f37d14f7e3ba6b101800144a8bc7059eb9c0fb5fcbab42dc8ec68001f61b304baa628c3f2ac73be9031b946fe8088e5cf37 SHA512 70e8d86291fbb21c7c9c5fa9ba5df54c808e5e75e3155af33ab9c18c768bc1eaa05890802c52daa3e60619fa8961b7162cac4c51e2dd2dd6c7114986d3a6136f
-AUX sane-backends-1.0.27-uninitialized-variable.patch 902 BLAKE2B 6f2e86d6d79f85f73d564bc1877667c1278108d876f61551cc89abb159dee68e6b454bec190cb44eee61255fa648010293382f5575d208dd7c1e33c1492be3e9 SHA512 b3c5675e5ec3a92345832d081025dae72bcfda9854f79565fc2801e6ea710a83e953a9f075ef9754c6d893fb099544989b4aaabf8a177d5c52b8a4b9c6eac052
AUX sane-backends-1.0.30-add_hpaio_epkowa_dll.conf.patch 459 BLAKE2B d127c054b3e4f8aca5de54888e7a37c986515350aac84bb66ca195fca57138cbe3ac3f29b0982e4019b5b599b81984dceacd5523f794a04cfb5d416a051a1e61 SHA512 d9bcce33482db2f15ee094a244359fafdce196984a799509d9b16e24f46feb3aecd419520e65ca9513b40ff4975d793bec05924bfdd69586d9a6f3feb42cccc3
AUX sane-backends-1.0.30-bigendian-depth.patch 372 BLAKE2B f93f510496f1234c586f57b4814ad45ea3dd0bf78a934edd6ab951c5423be235560e54d871d8f9edef6fe51b4d9e18ecf33367635cefa1e500f8ed29a722e0bd SHA512 0cfe593471be5a89666ad9bb112999368d9195f0bf3aa13597251b3a5ebf645eeb776b29df04291f4fda6e330f2bdfbbbc04865588d9af54c5f610b9e923d9fb
AUX sane-backends-1.0.30-missing-stdint-include.patch 374 BLAKE2B e20005c96096a228126b7e1d414ae2c127bf7ad16894defc8e3c65230380449e61f75b3cd63bd80b16bf8b1ebc08e5f974eb621d16f9c6b994105bb9d95e1a89 SHA512 521a3275879e84f6727ebc3b8e5ae4fbbb1495d2c41cb6880e170c62f684da2af7ea47b0a89d0806687f8a48791f2562959158a31a30dd240880757b6c81a321
@@ -13,7 +9,5 @@ AUX saned.initd 294 BLAKE2B 571bd4032b2330c627a31459a18baf2044852ec1b40f0216bd5b
AUX saned.socket 132 BLAKE2B 5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3cecdae79111fb1db1cfe3b4933eca15af5f985fc6b89e4d9af3844b6e9cfd542828b6b9e57ed9 SHA512 a23ceeeb02bd9e214702003a3165886858ecbdd93df89cd37ad5f00581745454548ccda0ab656f2dc0acbf2896a8781568c786797e64a07014be003d6140a093
AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71faad18edaf71b920584366ac988d354f45bc07607ea64a97ea480fe152ac9a1cd896df99ff457cbf7 SHA512 891c751261107676f8159f403e0f4d4254099b709b9ba0ac9f2af97a9ed30f677411ad6bc316c2e6e673c616ba988253479d5e30c9617e3ae279beb79f70e965
DIST backends-1.0.30.tar.gz 5721262 BLAKE2B 139d3ca908d54b94d14ef4145d44a89b939807c15870be03c3c028cf95351bf9a4abd3ea115b84396366bb054f37ade883f429467dceb0663c2855b92e0a4fa5 SHA512 19127c8109c1587d60d8cba713f73b1a24242df44fa49c3e59320f48022783f05d26d3242a3f87478e583a807d88b446ef7a51afb33b674be29656496c435d7b
-DIST sane-backends-1.0.27.tar.gz 6430188 BLAKE2B 90f910311e31a436eaa0ca0fedd998aac3331f89a346f31613776ebc860a10cc37055fd15db8de8d743498914ea0c16e4153dbaa101380eb6e36857d730c3456 SHA512 c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5
-EBUILD sane-backends-1.0.27-r3.ebuild 8102 BLAKE2B 02630c414ad01a5f0a0aa860fd45600e94e7a803f09dc66d6273ea4e41340ff30c98d31a3c2329a3280b63231c5cad08c77f5bc2c8e5c3944a7d8a19b1d59cc3 SHA512 79159a2dd5e688a2b08f5eebd85c97b229d521b14c722bb367d23fe4641daec3554b24ffa4d886affd32109cc7dcc3ee0b77f5bd6e1e0f5c6af23ccce47eadac
EBUILD sane-backends-1.0.30-r2.ebuild 8229 BLAKE2B d7f2e41ea54e06aaabd9a0abd47210c45ecc891e34f9563aabf19b11df0e3d250741f1a557465d5fb2f1e5de99f18d292212b160bc52224c5026544f7bd17f0f SHA512 08ba6b7bd2b5a28a8be809794b5b720075d1b3ba383d2b8bdbb763322f9b01838374ac3c152feafe9d49edd9d135cf184e8ccd8f5adfc4b7a4b546f5a1e194ea
MISC metadata.xml 266 BLAKE2B c76ad15982ba5b341a41155c75a5fda95a99ef658ed972c452bfb7b0968aafe33f83cc5bd0f2effb1c2b4f9721a8f61987f2fb7906855b3869e7787226f2b385 SHA512 67d43b02a8c1aab418ca79b30d88af0e78f9df9b95c93887cfed5976290e714409e7dc400f09170d7e7844a411aa3e3202f49f31f39b7f580a8c0b6f3d4db659
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.27-canon-lide-100.patch b/media-gfx/sane-backends/files/sane-backends-1.0.27-canon-lide-100.patch
deleted file mode 100644
index 504f9e666e62..000000000000
--- a/media-gfx/sane-backends/files/sane-backends-1.0.27-canon-lide-100.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up sane-backends-1.0.27/backend/genesys.c.canon-lide-100 sane-backends-1.0.27/backend/genesys.c
---- sane-backends-1.0.27/backend/genesys.c.canon-lide-100 2018-02-01 10:37:26.160044539 +0100
-+++ sane-backends-1.0.27/backend/genesys.c 2018-02-01 10:45:44.616653277 +0100
-@@ -2070,11 +2070,9 @@ genesys_white_shading_calibration (Genes
- dev->model->cmd_set->set_lamp_power (dev, dev->calib_reg, SANE_TRUE);
- dev->model->cmd_set->set_motor_power (dev->calib_reg, motor);
-
-- /* if needed, go back before doin next scan, by using rewind, registers and
-- * slopes table are kept intact from previous scan */
-- if (dev->model->flags & GENESYS_FLAG_SHADING_REPARK && dev->model->cmd_set->rewind)
-+ if (dev->model->flags & GENESYS_FLAG_SHADING_REPARK)
- {
-- status = dev->model->cmd_set->rewind (dev);
-+ status = dev->model->cmd_set->slow_back_home (dev, SANE_TRUE);
- }
-
- status =
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.27-network.patch b/media-gfx/sane-backends/files/sane-backends-1.0.27-network.patch
deleted file mode 100644
index 2605ea83578d..000000000000
--- a/media-gfx/sane-backends/files/sane-backends-1.0.27-network.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/sanei/sanei_tcp.c b/sanei/sanei_tcp.c
-index a57d7c7..d0a1e92 100644
---- a/sanei/sanei_tcp.c
-+++ b/sanei/sanei_tcp.c
-@@ -45,6 +45,7 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <time.h>
-
- #ifdef HAVE_WINSOCK2_H
- #include <winsock2.h>
-@@ -123,14 +124,27 @@ sanei_tcp_write(int fd, const u_char * buf, int count)
- ssize_t
- sanei_tcp_read(int fd, u_char * buf, int count)
- {
-- ssize_t bytes_recv = 0, rc = 1;
-+ ssize_t bytes_recv = 0, rc = 1;
-+ int retry = 5;
-
- while (bytes_recv < count && rc > 0)
- {
- rc = recv(fd, buf+bytes_recv, count-bytes_recv, 0);
-+ DBG(1, "%s: bytes received %d\n", __FUNCTION__, rc);
- if (rc > 0)
- bytes_recv += rc;
--
-+ else {
-+ if ( errno == EAGAIN && retry-- ) {
-+ DBG(1, "%s: waiting %d\n", __FUNCTION__, retry);
-+ /* wait for max 1s */
-+ struct timespec req;
-+ struct timespec rem;
-+ req.tv_sec = 0;
-+ req.tv_nsec= 100000000;
-+ nanosleep(&req, &rem);
-+ rc = 1;
-+ }
-+ }
- }
- return bytes_recv;
- }
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.27-revert-samsung.patch b/media-gfx/sane-backends/files/sane-backends-1.0.27-revert-samsung.patch
deleted file mode 100644
index af3e141a010c..000000000000
--- a/media-gfx/sane-backends/files/sane-backends-1.0.27-revert-samsung.patch
+++ /dev/null
@@ -1,406 +0,0 @@
-From 9b13d4c18b2424eaed02b72a928e9607921ec265 Mon Sep 17 00:00:00 2001
-From: Bernard Cafarelli <bernard.cafarelli@gmail.com>
-Date: Tue, 17 Apr 2018 22:43:15 +0200
-Subject: [PATCH] Revert "Color scanning for Samsung models, which support JPEG
- Lossy compression."
-
-This reverts commit 926bfade544de4a4fd5f1a8082b85a97e2443770, leaving
-the new IDs in.
-As tracked in #315876, this breaks scanning with multiple Samsung scanners
-
-Conflicts:
- backend/xerox_mfp.c
- backend/xerox_mfp.h
- doc/descriptions/xerox_mfp.desc
----
- backend/Makefile.am | 2 +-
- backend/Makefile.in | 7 +-
- backend/xerox_mfp.c | 193 +-------------------------------
- backend/xerox_mfp.h | 5 -
- doc/descriptions/xerox_mfp.desc | 10 +-
- 5 files changed, 14 insertions(+), 203 deletions(-)
-
-diff --git a/backend/Makefile.am b/backend/Makefile.am
-index 18695a4a..3225b133 100644
---- a/backend/Makefile.am
-+++ b/backend/Makefile.am
-@@ -1086,7 +1086,7 @@ libxerox_mfp_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=xerox_mfp
- nodist_libsane_xerox_mfp_la_SOURCES = xerox_mfp-s.c
- libsane_xerox_mfp_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=xerox_mfp
- libsane_xerox_mfp_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
--libsane_xerox_mfp_la_LIBADD = $(COMMON_LIBS) libxerox_mfp.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo @SANEI_SANEI_JPEG_LO@ $(JPEG_LIBS) ../sanei/sanei_usb.lo ../sanei/sanei_tcp.lo $(MATH_LIB) $(SOCKET_LIBS) $(USB_LIBS) $(RESMGR_LIBS)
-+libsane_xerox_mfp_la_LIBADD = $(COMMON_LIBS) libxerox_mfp.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_tcp.lo $(MATH_LIB) $(SOCKET_LIBS) $(USB_LIBS) $(RESMGR_LIBS)
- EXTRA_DIST += xerox_mfp.conf.in
-
- libdll_preload_la_SOURCES = dll.c
-diff --git a/backend/Makefile.in b/backend/Makefile.in
-index d1dca4a2..2643bb77 100644
---- a/backend/Makefile.in
-+++ b/backend/Makefile.in
-@@ -1430,10 +1430,9 @@ libsane_v4l_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- libsane_xerox_mfp_la_DEPENDENCIES = $(COMMON_LIBS) libxerox_mfp.la \
- ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo \
- ../sanei/sanei_config.lo sane_strstatus.lo \
-- $(am__DEPENDENCIES_1) ../sanei/sanei_usb.lo \
-- ../sanei/sanei_tcp.lo $(am__DEPENDENCIES_1) \
-+ ../sanei/sanei_usb.lo ../sanei/sanei_tcp.lo \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1)
-+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- nodist_libsane_xerox_mfp_la_OBJECTS = \
- libsane_xerox_mfp_la-xerox_mfp-s.lo
- libsane_xerox_mfp_la_OBJECTS = $(nodist_libsane_xerox_mfp_la_OBJECTS)
-@@ -2754,7 +2753,7 @@ libxerox_mfp_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=xerox_mfp
- nodist_libsane_xerox_mfp_la_SOURCES = xerox_mfp-s.c
- libsane_xerox_mfp_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=xerox_mfp
- libsane_xerox_mfp_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
--libsane_xerox_mfp_la_LIBADD = $(COMMON_LIBS) libxerox_mfp.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo @SANEI_SANEI_JPEG_LO@ $(JPEG_LIBS) ../sanei/sanei_usb.lo ../sanei/sanei_tcp.lo $(MATH_LIB) $(SOCKET_LIBS) $(USB_LIBS) $(RESMGR_LIBS)
-+libsane_xerox_mfp_la_LIBADD = $(COMMON_LIBS) libxerox_mfp.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_tcp.lo $(MATH_LIB) $(SOCKET_LIBS) $(USB_LIBS) $(RESMGR_LIBS)
- libdll_preload_la_SOURCES = dll.c
- libdll_preload_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dll -DENABLE_PRELOAD
- libdll_la_SOURCES = dll.c
-diff --git a/backend/xerox_mfp.c b/backend/xerox_mfp.c
-index 8b8c8956..d37a6237 100644
---- a/backend/xerox_mfp.c
-+++ b/backend/xerox_mfp.c
-@@ -33,9 +33,6 @@
- #include "../include/sane/sanei_usb.h"
- #include "../include/sane/sanei_config.h"
- #include "../include/sane/sanei_backend.h"
--#ifdef HAVE_LIBJPEG
--#include <jpeglib.h>
--#endif
- #include "xerox_mfp.h"
-
- #define BACKEND_BUILD 13
-@@ -93,128 +90,6 @@ static char *str_cmd(int cmd)
- }
-
- #define MAX_DUMP 70
--const char *encTmpFileName = "/tmp/stmp_enc.tmp";
--
--static int decompress(struct device __sane_unused__ *dev,
-- const char __sane_unused__ *infilename)
--{
--#ifdef HAVE_LIBJPEG
-- int rc;
-- int row_stride, width, height, pixel_size;
-- struct jpeg_decompress_struct cinfo;
-- struct jpeg_error_mgr jerr;
-- unsigned long bmp_size = 0;
-- FILE *pInfile = NULL;
-- JSAMPARRAY buffer;
--
-- if ((pInfile = fopen(infilename, "rb")) == NULL) {
-- fprintf(stderr, "can't open %s\n", infilename);
-- return -1;
-- }
--
-- cinfo.err = jpeg_std_error(&jerr);
--
-- jpeg_create_decompress(&cinfo);
--
-- jpeg_stdio_src(&cinfo, pInfile);
--
-- rc = jpeg_read_header(&cinfo, TRUE);
-- if (rc != 1) {
-- jpeg_destroy_decompress(&cinfo);
-- fclose(pInfile);
-- return -1;
-- }
--
-- jpeg_start_decompress(&cinfo);
--
-- width = cinfo.output_width;
-- height = cinfo.output_height;
-- pixel_size = cinfo.output_components;
-- bmp_size = width * height * pixel_size;
-- dev->decDataSize = bmp_size;
--
-- row_stride = width * pixel_size;
--
-- buffer = (*cinfo.mem->alloc_sarray)
-- ((j_common_ptr) &cinfo, JPOOL_IMAGE, row_stride, 1);
--
-- while (cinfo.output_scanline < cinfo.output_height) {
-- buffer[0] = dev->decData + \
-- (cinfo.output_scanline) * row_stride;
-- jpeg_read_scanlines(&cinfo, buffer, 1);
-- }
-- jpeg_finish_decompress(&cinfo);
-- jpeg_destroy_decompress(&cinfo);
-- fclose(pInfile);
-- return 0;
--#else
-- return -1;
--#endif
--}
--
--static int copy_decompress_data(struct device *dev, unsigned char *pDest, int maxlen, int *destLen)
--{
-- int data_size = 0;
-- size_t result = 0, retVal = 0;
--
--
-- if (0 == dev->decDataSize) {
-- *destLen = 0;
-- return retVal;
-- }
-- data_size = dev->decDataSize - dev->currentDecDataIndex;
-- if (data_size > maxlen) {
-- data_size = maxlen;
-- }
-- memcpy(pDest, dev->decData+dev->currentDecDataIndex, data_size);
-- result = data_size;
-- *destLen = result;
-- dev->currentDecDataIndex += result;
-- retVal = result;
--
-- if (dev->decDataSize == dev->currentDecDataIndex) {
-- dev->currentDecDataIndex = 0;
-- dev->decDataSize = 0;
-- }
--
-- return retVal;
--}
--
--static int decompress_tempfile(struct device *dev)
--{
-- decompress(dev, encTmpFileName);
-- remove(encTmpFileName);
-- return 0;
--}
--
--static int dump_to_tmp_file(struct device *dev)
--{
-- unsigned char *pSrc = dev->data;
-- int srcLen = dev->datalen;
-- FILE *pInfile;
-- if ((pInfile = fopen(encTmpFileName, "a")) == NULL) {
-- fprintf(stderr, "can't open %s\n", encTmpFileName);
-- return 0;
-- }
--
-- fwrite(pSrc, 1, srcLen, pInfile);
-- fclose(pInfile);
-- return srcLen;
--}
--
--static int isSupportedDevice(struct device __sane_unused__ *dev)
--{
--#ifdef HAVE_LIBJPEG
-- /* Checking device which supports JPEG Lossy compression for color scanning*/
-- if (dev->compressionTypes & (1 << 6))
-- return 1;
-- else
-- return 0;
--#else
-- return 0;
--#endif
--}
--
- static void dbg_dump(struct device *dev)
- {
- int i;
-@@ -639,11 +514,9 @@ static void set_parameters(struct device *dev)
- dev->para.pixels_per_line = dev->win_width / px_to_len;
- dev->para.bytes_per_line = dev->para.pixels_per_line;
-
-- if (!isSupportedDevice(dev)) {
- #if BETTER_BASEDPI
-- px_to_len = 1213.9 / dev->val[OPT_RESOLUTION].w;
-+ px_to_len = 1213.9 / dev->val[OPT_RESOLUTION].w;
- #endif
-- }
- dev->para.lines = dev->win_len / px_to_len;
- if (dev->composition == MODE_LINEART ||
- dev->composition == MODE_HALFTONE) {
-@@ -765,13 +638,6 @@ static int dev_set_window(struct device *dev)
- cmd[0x11] = (SANE_Byte)floor(dev->win_off_y);
- cmd[0x12] = (SANE_Byte)((dev->win_off_y - floor(dev->win_off_y)) * 100);
- cmd[0x13] = dev->composition;
-- /* Set to JPEG Lossy Compression, if mode is color (only for supported model)...
-- * else go with Uncompressed (For backard compatibility with old models )*/
-- if (dev->composition == MODE_RGB24) {
-- if (isSupportedDevice(dev)) {
-- cmd[0x14] = 0x6;
-- }
-- }
- cmd[0x16] = dev->threshold;
- cmd[0x17] = dev->doc_source;
-
-@@ -843,7 +709,6 @@ dev_inquiry(struct device *dev)
- dev->res[0x3e] << 8 |
- dev->res[0x3f];
- dev->line_order = dev->res[0x31];
-- dev->compressionTypes = dev->res[0x32];
- dev->doc_loaded = (dev->res[0x35] == 0x02) &&
- (dev->res[0x26] & 0x03);
-
-@@ -942,10 +807,6 @@ dev_free(struct device *dev)
- free(UNCONST(dev->sane.type));
- if (dev->data)
- free(dev->data);
-- if (dev->decData) {
-- free(dev->decData);
-- dev->decData = NULL;
-- }
- memset(dev, 0, sizeof(*dev));
- free(dev);
- }
-@@ -1283,19 +1144,6 @@ sane_read(SANE_Handle h, SANE_Byte *buf, SANE_Int maxlen, SANE_Int *lenp)
- /* if there is no data to read or output from buffer */
- if (!dev->blocklen && dev->datalen <= PADDING_SIZE) {
-
-- /* copying uncompressed data */
-- if (dev->composition == MODE_RGB24 &&
-- isSupportedDevice(dev) &&
-- dev->decDataSize > 0) {
-- int diff = dev->total_img_size - dev->total_out_size;
-- int bufLen = (diff < maxlen) ? diff : maxlen;
-- if (0 < diff &&
-- 0 < copy_decompress_data(dev, buf, bufLen, lenp)) {
-- dev->total_out_size += *lenp;
-- return SANE_STATUS_GOOD;
-- }
-- }
--
- /* and we don't need to acquire next block */
- if (dev->final_block) {
- int slack = dev->total_img_size - dev->total_out_size;
-@@ -1311,10 +1159,7 @@ sane_read(SANE_Handle h, SANE_Byte *buf, SANE_Int maxlen, SANE_Int *lenp)
- /* this will never happen */
- DBG(1, "image overflow %d bytes\n", dev->total_img_size - dev->total_out_size);
- }
-- if (isSupportedDevice(dev) &&
-- dev->composition == MODE_RGB24) {
-- remove(encTmpFileName);
-- }
-+
- /* that's all */
- dev_stop(dev);
- return SANE_STATUS_EOF;
-@@ -1365,18 +1210,9 @@ sane_read(SANE_Handle h, SANE_Byte *buf, SANE_Int maxlen, SANE_Int *lenp)
-
- if (buf && lenp) { /* read mode */
- /* copy will do minimal of valid data */
-- if (dev->para.format == SANE_FRAME_RGB && dev->line_order) {
-- if (isSupportedDevice(dev)) {
-- clrlen = dump_to_tmp_file(dev);
-- /* decompress after reading entire block data*/
-- if (0 == dev->blocklen) {
-- decompress_tempfile(dev);
-- }
-- copy_decompress_data(dev, buf, maxlen, &olen);
-- } else {
-- clrlen = copy_mix_bands_trim(dev, buf, maxlen, &olen);
-- }
-- } else
-+ if (dev->para.format == SANE_FRAME_RGB && dev->line_order)
-+ clrlen = copy_mix_bands_trim(dev, buf, maxlen, &olen);
-+ else
- clrlen = copy_plain_trim(dev, buf, maxlen, &olen);
-
- dev->datalen -= clrlen;
-@@ -1455,9 +1291,6 @@ sane_start(SANE_Handle h)
- if (!dev->data && !(dev->data = malloc(DATASIZE)))
- return ret_cancel(dev, SANE_STATUS_NO_MEM);
-
-- if (!dev->decData && !(dev->decData = malloc(POST_DATASIZE)))
-- return ret_cancel(dev, SANE_STATUS_NO_MEM);
--
- if (!dev_acquire(dev))
- return dev->state;
-
-@@ -1479,22 +1312,6 @@ sane_start(SANE_Handle h)
-
- dev->total_img_size = dev->para.bytes_per_line * dev->para.lines;
-
-- if (isSupportedDevice(dev) &&
-- dev->composition == MODE_RGB24) {
-- int fd;
-- remove(encTmpFileName);
--
-- /* Precreate temporary file in exclusive mode. */
-- fd = open(encTmpFileName, O_CREAT|O_EXCL, 0600);
-- if (fd == -1) {
-- DBG(3, "%s: %p, can't create temporary file %s: %s\n", __func__,
-- (void *)dev, encTmpFileName, strerror(errno));
-- return ret_cancel(dev, SANE_STATUS_ACCESS_DENIED);
-- }
-- close(fd);
-- }
-- dev->currentDecDataIndex = 0;
--
- return SANE_STATUS_GOOD;
- }
-
-diff --git a/backend/xerox_mfp.h b/backend/xerox_mfp.h
-index 3d93f06d..ea89dda2 100644
---- a/backend/xerox_mfp.h
-+++ b/backend/xerox_mfp.h
-@@ -74,10 +74,6 @@ struct device {
- #define DATATAIL(dev) ((dev->dataoff + dev->datalen) & DATAMASK)
- #define DATAROOM(dev) dataroom(dev)
-
--#define POST_DATASIZE 0xFFFFFF
-- SANE_Byte *decData;
-- int decDataSize;
-- int currentDecDataIndex;
- /* data from CMD_INQUIRY: */
- int resolutions; /* supported resolution bitmask */
- int compositions; /* supported image compositions bitmask */
-@@ -102,7 +98,6 @@ struct device {
- int composition; /* MODE_ */
- int doc_source; /* document source */
- int threshold; /* brightness */
-- int compressionTypes;
-
- /* CMD_READ data. It is per block only, image could be in many blocks */
- int blocklen; /* image data block len (padding incl.) */
-diff --git a/doc/descriptions/xerox_mfp.desc b/doc/descriptions/xerox_mfp.desc
-index d21a6be6..67253b38 100644
---- a/doc/descriptions/xerox_mfp.desc
-+++ b/doc/descriptions/xerox_mfp.desc
-@@ -320,7 +320,7 @@
-
- :model "SCX-3405W"
- :interface "Ethernet"
--:status :good
-+:status :basic
-
- :model "SCX-3400"
- :interface "USB"
-@@ -335,17 +335,17 @@
- :model "SCX-4729FD"
- :interface "USB"
- :usbid "0x04e8" "0x3453"
--:status :good
-+:status :basic
-
- :model "CLX-6260"
- :interface "USB"
- :usbid "0x04e8" "0x3455"
--:status :good
-+:status :minimal
-
- :model "CLX-3300 Series"
- :interface "USB"
- :usbid "0x04e8" "0x3456"
--:status :good
-+:status :basic
-
- :model "SCX-470x"
- :interface "USB"
-@@ -355,7 +355,7 @@
- :model "CLX-4190"
- :interface "USB"
- :usbid "0x04e8" "0x345a"
--:status :good
-+:status :minimal
-
- :model "SCX-4650 4x21S Series"
- :interface "USB"
---
-2.17.0
-
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.27-uninitialized-variable.patch b/media-gfx/sane-backends/files/sane-backends-1.0.27-uninitialized-variable.patch
deleted file mode 100644
index 0311975c0ce8..000000000000
--- a/media-gfx/sane-backends/files/sane-backends-1.0.27-uninitialized-variable.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From dd61ef1cc84299781e382b9258d97102cee192b4 Mon Sep 17 00:00:00 2001
-From: Olaf Meeuwissen <paddy-hack@member.fsf.org>
-Date: Thu, 3 Aug 2017 18:50:05 +0900
-Subject: [PATCH] genesys: Fix use of uninitialized variable
-
-See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=869673
----
- backend/genesys.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/backend/genesys.c b/backend/genesys.c
-index 1c1bbf4..0b644c4 100644
---- a/backend/genesys.c
-+++ b/backend/genesys.c
-@@ -6237,6 +6237,7 @@ attach (SANE_String_Const devname, Genesys_Device ** devp, SANE_Bool may_wait)
- dev->model = genesys_usb_device_list[i].model;
- dev->vendorId = genesys_usb_device_list[i].vendor;
- dev->productId = genesys_usb_device_list[i].product;
-+ dev->usb_mode = 0; /* i.e. unset */
- dev->already_initialized = SANE_FALSE;
-
- DBG (DBG_info, "attach: found %s flatbed scanner %s at %s\n",
---
-2.1.4
-
diff --git a/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild b/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
deleted file mode 100644
index 3470233904fc..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
+++ /dev/null
@@ -1,344 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils flag-o-matic multilib-minimal systemd toolchain-funcs udev user
-
-# gphoto and v4l are handled by their usual USE flags.
-# The pint backend was disabled because I could not get it to compile.
-IUSE_SANE_BACKENDS="
- abaton
- agfafocus
- apple
- artec
- artec_eplus48u
- as6e
- avision
- bh
- canon
- canon630u
- canon_dr
- canon_pp
- cardscan
- coolscan
- coolscan2
- coolscan3
- dc210
- dc240
- dc25
- dell1600n_net
- dmc
- epjitsu
- epson
- epson2
- fujitsu
- genesys
- gt68xx
- hp
- hp3500
- hp3900
- hp4200
- hp5400
- hp5590
- hpljm1005
- hpsj5s
- hs2p
- ibm
- kodak
- kodakaio
- kvs1025
- kvs20xx
- kvs40xx
- leo
- lexmark
- ma1509
- magicolor
- matsushita
- microtek
- microtek2
- mustek
- mustek_pp
- mustek_usb
- mustek_usb2
- nec
- net
- niash
- p5
- pie
- pixma
- plustek
- plustek_pp
- pnm
- qcam
- ricoh
- rts8891
- s9036
- sceptre
- sharp
- sm3600
- sm3840
- snapscan
- sp15c
- st400
- stv680
- tamarack
- teco1
- teco2
- teco3
- test
- u12
- umax
- umax1220u
- umax_pp
- xerox_mfp"
-
-IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd zeroconf"
-
-for backend in ${IUSE_SANE_BACKENDS}; do
- case ${backend} in
- # Disable backends that require parallel ports as no one has those anymore.
- canon_pp|hpsj5s|mustek_pp|\
- pnm)
- IUSE+=" -sane_backends_${backend}"
- ;;
- mustek_usb2|kvs40xx)
- IUSE+=" sane_backends_${backend}"
- ;;
- *)
- IUSE+=" +sane_backends_${backend}"
- esac
-done
-
-REQUIRED_USE="
- sane_backends_mustek_usb2? ( threads )
- sane_backends_kvs40xx? ( threads )
-"
-
-DESCRIPTION="Scanner Access Now Easy - Backends"
-HOMEPAGE="http://www.sane-project.org/"
-MY_P="${P}"
-FRS_ID="4224"
-SRC_URI="https://alioth.debian.org/frs/download.php/file/${FRS_ID}/${P}.tar.gz"
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
- sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
- sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
- sane_backends_dell1600n_net? (
- >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
- >=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}]
- )
- sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
- sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
- sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
- usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] )
- gphoto2? (
- >=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
- >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
- )
- v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
- xinetd? ( sys-apps/xinetd )
- snmp? ( net-analyzer/net-snmp:0= )
- systemd? ( sys-apps/systemd:0= )
- zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
- v4l? ( sys-kernel/linux-headers )
- >=sys-devel/gettext-0.18.1
- virtual/pkgconfig
-"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/sane-config
-)
-
-pkg_setup() {
- enewgroup scanner
- enewuser saned -1 -1 -1 scanner
-}
-
-src_prepare() {
- default
-
- cat >> backend/dll.conf.in <<-EOF
- # Add support for the HP-specific backend. Needs net-print/hplip installed.
- hpaio
- # Add support for the Epson-specific backend. Needs media-gfx/iscan installed.
- epkowa
- EOF
-
- eapply "${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch
- eapply "${FILESDIR}"/${PN}-1.0.27-disable-usb-tests.patch
-
- # From Arch
- eapply "${FILESDIR}"/${PN}-1.0.27-network.patch
-
- # From Fedora
- # Fix https://bugs.gentoo.org/635348
- eapply "${FILESDIR}"/${PN}-1.0.27-canon-lide-100.patch
- # Fix https://bugs.gentoo.org/653300
- eapply "${FILESDIR}"/${PN}-1.0.27-revert-samsung.patch
-
- # From Debian
- eapply "${FILESDIR}"/${PN}-1.0.27-uninitialized-variable.patch
-
- # Fix for "make check". Upstream sometimes forgets to update this.
- local ver=$(./configure --version | awk '{print $NF; exit 0}')
- sed -i \
- -e "/by sane-desc 3.5 from sane-backends/s:sane-backends .*:sane-backends ${ver}:" \
- testsuite/tools/data/html* || die
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing # From Fedora
-
- # if LINGUAS is set, just use the listed and supported localizations.
- if [[ ${LINGUAS+set} == "set" ]]; then
- mkdir -p po || die
- strip-linguas -u po
- printf '%s\n' ${LINGUAS} > po/LINGUAS
- fi
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- # the blank is intended - an empty string would result in building ALL backends.
- local BACKENDS=" "
-
- use gphoto2 && BACKENDS="gphoto2"
- use v4l && BACKENDS="${BACKENDS} v4l"
- for backend in ${IUSE_SANE_BACKENDS}; do
- if use "sane_backends_${backend}" && [ ${backend} != pnm ]; then
- BACKENDS="${BACKENDS} ${backend}"
- fi
- done
-
- local myconf=(
- $(use_with usb)
- $(multilib_native_use_with snmp)
- )
-
- # you can only enable this backend, not disable it...
- if use sane_backends_pnm; then
- myconf+=( --enable-pnm-backend )
- fi
- if use sane_backends_mustek_pp; then
- myconf+=( --enable-parport-directio )
- fi
- if ! { use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp; }; then
- myconf+=( sane_cv_use_libieee1284=no )
- fi
-
- # relative path must be used for tests to work properly
- # All distributions pass --disable-locking because /var/lock/sane/ would be a world-writable directory
- # --without-api-spec to not automagically depend on tons of stuff
- # that break in many ways, bug #636202, #668232, #668350
- # People can refer to the "Programmer's Documentation" at http://www.sane-project.org/docs.html
- ECONF_SOURCE=${S} \
- SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
- BACKENDS="${BACKENDS}" \
- econf \
- --disable-locking \
- --without-api-spec \
- $(use_with gphoto2) \
- $(multilib_native_use_with systemd) \
- $(use_with v4l) \
- $(use_enable ipv6) \
- $(use_enable threads pthread) \
- $(use_enable zeroconf avahi) \
- "${myconf[@]}"
-}
-
-multilib_src_compile() {
- emake VARTEXFONTS="${T}/fonts"
-
- if tc-is-cross-compiler; then
- pushd "${BUILD_DIR}"/tools >/dev/null || die
-
- # The build system sucks and doesn't handle this properly.
- # https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366
- tc-export_build_env BUILD_CC
- ${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \
- -I. -I../include -I"${S}"/include \
- "${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \
- "${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die
- local dirs=( hal hotplug hotplug-ng udev )
- local targets=(
- hal/libsane.fdi
- hotplug/libsane.usermap
- hotplug-ng/libsane.db
- udev/libsane.rules
- )
- mkdir -p "${dirs[@]}" || die
- emake "${targets[@]}"
-
- popd >/dev/null
- fi
-
- if use usb; then
- sed -i -e '/^$/d' \
- tools/hotplug/libsane.usermap || die
- fi
-}
-
-multilib_src_install() {
- emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \
- docdir="${EPREFIX}"/usr/share/doc/${PF}
-
- if multilib_is_native_abi; then
- if use usb; then
- insinto /etc/hotplug/usb
- doins tools/hotplug/libsane.usermap
- fi
-
- udev_newrules tools/udev/libsane.rules 41-libsane.rules
- insinto "/usr/share/pkgconfig"
- doins tools/sane-backends.pc
- fi
-}
-
-multilib_src_install_all() {
- keepdir /var/lib/lock/sane
- fowners root:scanner /var/lib/lock/sane
- fperms g+w /var/lib/lock/sane
- dodir /etc/env.d
-
- if use systemd; then
- systemd_newunit "${FILESDIR}"/saned_at.service "saned@.service"
- systemd_newunit "${FILESDIR}"/saned.socket saned.socket
- fi
-
- if use usb; then
- exeinto /etc/hotplug/usb
- doexe tools/hotplug/libusbscanner
- newdoc tools/hotplug/README README.hotplug
- fi
-
- dodoc NEWS AUTHORS ChangeLog* PROBLEMS README README.linux
- find "${D}" -name '*.la' -delete || die
-
- if use xinetd; then
- insinto /etc/xinetd.d
- doins "${FILESDIR}"/saned
- fi
-
- newinitd "${FILESDIR}"/saned.initd saned
- newconfd "${FILESDIR}"/saned.confd saned
-}
-
-pkg_postinst() {
- if use xinetd; then
- elog "If you want remote clients to connect, edit"
- elog "/etc/sane.d/saned.conf and /etc/hosts.allow"
- fi
-
- if ! use systemd; then
- elog "If you are using a USB scanner, add all users who want"
- elog "to access your scanner to the \"scanner\" group."
- fi
-}
diff --git a/media-gfx/sigal/Manifest b/media-gfx/sigal/Manifest
deleted file mode 100644
index f441be68e6ca..000000000000
--- a/media-gfx/sigal/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sigal-1.3.0.tar.gz 3267422 BLAKE2B 0be6dc6b92c8681e47ad7094004793fe78fd8974075958374268bb55f6d2deb903b5ad858c2603c751f74fd2394c945d3f933b3fb44a8f58b18dcd9a2c1c1236 SHA512 132c94a472301a2cc81a4aef13afa8137a6b69dfc035821e22fca6b0598cb94f1788f1a8cf1b47412214c9480867be816070aaa938290a1d10bccc407c38aaf4
-EBUILD sigal-1.3.0.ebuild 872 BLAKE2B f3c89f1299b61c8769cd068fe89bee7d4e0848e7ac73486233264e90e7c3252dc5224d862a1d9eb2e8f162a495183853f6f952d874d045f41d0c04131e550176 SHA512 118373cdddec32a41697436295b2f8d8885edd73a14b12d92c71a53c05f6edb6e1d877767a25173d61981282efa0d97b2efb1c6bc7ecfa5bd13ccd1758405894
-MISC metadata.xml 1062 BLAKE2B 2997924c7ffdf6ddf3afd6b8d55ab426c7701eb3beb3c566f870507730f99ddd4875621029e078d7f1db16d582de448257701ff7c6325169fafb71a15e9e2304 SHA512 d49289c1dbd612fe88b6ef3d883b073c4b2985839decd5d3b9d73a3c24e0aa83e37890068be8e127ad1f88f86b9b37f7f2f61299c431b3a21b6219f2671a73d3
diff --git a/media-gfx/sigal/metadata.xml b/media-gfx/sigal/metadata.xml
deleted file mode 100644
index 8a8f5b028e46..000000000000
--- a/media-gfx/sigal/metadata.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>thomas@gstaedtner.net</email>
- <name>Thomas Gstädtner</name>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
- <longdescription>
- Sigal is yet another simple static gallery generator.
- It's written in Python and it allows to build a static gallery
- of images with the following features:
- - Process directories recursively.
- - Generate HTML pages using jinja2 templates.
- - Relative links for a portable output.
- - Support themes, videos, EXIF tags, zip download.
- - Parallel processing.
- - MIT licensed.
- </longdescription>
- <upstream>
- <remote-id type="pypi">sigal</remote-id>
- <remote-id type="github">saimn/sigal</remote-id>
- <bugs-to>https://github.com/saimn/sigal/issues</bugs-to>
- </upstream>
- <use>
- <flag name="s3">Enables support for the Amazon S3 service.</flag>
- </use>
-</pkgmetadata>
diff --git a/media-gfx/sigal/sigal-1.3.0.ebuild b/media-gfx/sigal/sigal-1.3.0.ebuild
deleted file mode 100644
index 50b523364a30..000000000000
--- a/media-gfx/sigal/sigal-1.3.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple static web gallery generator"
-HOMEPAGE="http://sigal.saimon.org/"
-SRC_URI="https://github.com/saimn/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="s3 test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-python/blinker[${PYTHON_USEDEP}]
- dev-python/click[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/markdown[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/pilkit[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
- s3? ( dev-python/boto[${PYTHON_USEDEP}] )
- test? (
- dev-python/boto[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- )"
-RDEPEND="${CDEPEND}"
-
-DOCS="README.rst"
-
-python_test() {
- esetup.py test
-}