summaryrefslogtreecommitdiff
path: root/media-gfx
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-08-18 18:16:17 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-08-18 18:16:17 +0100
commitfc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch)
tree326613a08f25851c388715e205576a2e7d25dc4f /media-gfx
parentb24bd25253fe093f722ab576d29fdc41d04cb1ee (diff)
gentoo resync : 18.08.2019
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/Manifest.gzbin41308 -> 41304 bytes
-rw-r--r--media-gfx/alembic/Manifest3
-rw-r--r--media-gfx/alembic/alembic-1.7.11.ebuild1
-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/asymptote/Manifest8
-rw-r--r--media-gfx/asymptote/asymptote-2.41-r1.ebuild2
-rw-r--r--media-gfx/asymptote/asymptote-2.47.ebuild2
-rw-r--r--media-gfx/asymptote/asymptote-2.48-r1.ebuild2
-rw-r--r--media-gfx/asymptote/asymptote-2.49.ebuild2
-rw-r--r--media-gfx/clockphoto/Manifest2
-rw-r--r--media-gfx/clockphoto/clockphoto-1.2.ebuild26
-rw-r--r--media-gfx/darktable/Manifest2
-rw-r--r--media-gfx/darktable/metadata.xml1
-rw-r--r--media-gfx/digikam/Manifest6
-rw-r--r--media-gfx/digikam/digikam-6.2.0.ebuild (renamed from media-gfx/digikam/digikam-6.1.0.ebuild)12
-rw-r--r--media-gfx/digikam/files/digikam-6.2.0-cmake.patch66
-rw-r--r--media-gfx/digikam/files/digikam-6.2.0-googlephoto-upload.patch25
-rw-r--r--media-gfx/eog/Manifest2
-rw-r--r--media-gfx/eog/eog-3.28.4.ebuild2
-rw-r--r--media-gfx/evoluspencil/Manifest5
-rw-r--r--media-gfx/evoluspencil/evoluspencil-2.0.5.ebuild44
-rw-r--r--media-gfx/evoluspencil/evoluspencil-3.0.4.ebuild2
-rw-r--r--media-gfx/evoluspencil/files/launcher9
-rw-r--r--media-gfx/exiv2/Manifest3
-rw-r--r--media-gfx/exiv2/files/exiv2-0.27.0-doc.patch28
-rw-r--r--media-gfx/exiv2/files/exiv2-0.27.0-fix-pkgconfig.patch24
-rw-r--r--media-gfx/exiv2/files/exiv2-0.27.0-png-broken-icc-profile.patch34
-rw-r--r--media-gfx/fbida/Manifest8
-rw-r--r--media-gfx/fbida/fbida-2.12.ebuild2
-rw-r--r--media-gfx/fbida/fbida-2.13-r1.ebuild2
-rw-r--r--media-gfx/fbida/fbida-2.14.ebuild2
-rw-r--r--media-gfx/fbida/fbida-9999.ebuild2
-rw-r--r--media-gfx/gnome-font-viewer/Manifest2
-rw-r--r--media-gfx/gnome-font-viewer/gnome-font-viewer-3.30.0.ebuild4
-rw-r--r--media-gfx/gnome-photos/Manifest2
-rw-r--r--media-gfx/gnome-photos/gnome-photos-3.30.1-r1.ebuild2
-rw-r--r--media-gfx/gnome-screenshot/Manifest2
-rw-r--r--media-gfx/gnome-screenshot/gnome-screenshot-3.30.0.ebuild2
-rw-r--r--media-gfx/gthumb/Manifest2
-rw-r--r--media-gfx/gthumb/metadata.xml1
-rw-r--r--media-gfx/imagemagick/Manifest12
-rw-r--r--media-gfx/imagemagick/imagemagick-6.9.10.56.ebuild2
-rw-r--r--media-gfx/imagemagick/imagemagick-6.9.10.60.ebuild (renamed from media-gfx/imagemagick/imagemagick-6.9.10.50.ebuild)2
-rw-r--r--media-gfx/imagemagick/imagemagick-7.0.8.56.ebuild2
-rw-r--r--media-gfx/imagemagick/imagemagick-7.0.8.60.ebuild (renamed from media-gfx/imagemagick/imagemagick-7.0.8.50.ebuild)2
-rw-r--r--media-gfx/krita/Manifest4
-rw-r--r--media-gfx/krita/krita-4.2.5.ebuild (renamed from media-gfx/krita/krita-4.2.4.ebuild)4
-rw-r--r--media-gfx/librecad/Manifest2
-rw-r--r--media-gfx/librecad/files/librecad-2.1.3-gcc-9.patch209
-rw-r--r--media-gfx/librecad/librecad-2.1.3-r5.ebuild51
-rw-r--r--media-gfx/nomacs/Manifest3
-rw-r--r--media-gfx/nomacs/files/nomacs-3.12-gcc9.patch39
-rw-r--r--media-gfx/nomacs/nomacs-3.12.ebuild1
-rw-r--r--media-gfx/nvidia-cg-toolkit/Manifest2
-rw-r--r--media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r3.ebuild2
-rw-r--r--media-gfx/optipng/Manifest2
-rw-r--r--media-gfx/optipng/optipng-0.7.7.ebuild2
-rw-r--r--media-gfx/ristretto/Manifest2
-rw-r--r--media-gfx/ristretto/ristretto-0.10.0.ebuild39
-rw-r--r--media-gfx/shotwell/Manifest2
-rw-r--r--media-gfx/shotwell/shotwell-0.30.2.ebuild2
-rw-r--r--media-gfx/simple-scan/Manifest2
-rw-r--r--media-gfx/simple-scan/metadata.xml3
-rw-r--r--media-gfx/symboleditor/Manifest6
-rw-r--r--media-gfx/symboleditor/files/symboleditor-2.0.0-cmake.patch41
-rw-r--r--media-gfx/symboleditor/files/symboleditor-2.0.0-doc-optional.patch28
-rw-r--r--media-gfx/symboleditor/symboleditor-2.0.0-r1.ebuild48
-rw-r--r--media-gfx/symboleditor/symboleditor-2.1.0.ebuild2
-rw-r--r--media-gfx/xdot/Manifest4
-rw-r--r--media-gfx/xdot/xdot-1.0.ebuild36
-rw-r--r--media-gfx/xdot/xdot-1.1.ebuild2
71 files changed, 561 insertions, 372 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index b9856176d520..f29d93affa67 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
Binary files differ
diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index 9eefff98291b..b7a52f527c11 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -3,6 +3,7 @@ AUX alembic-1.7.11-0002-Find-IlmBase-by-setting-a-proper-ILMBASE_ROOT-value.patc
AUX alembic-1.7.11-0003-Fix-env-var-for-renderman.patch 828 BLAKE2B 8e135e4d814a7dc9b60a8599b20ba1356d0e470755e0e7295ad31f2b4fe57a97dcdddb75867304d6ecf69727b05254c462bf9e5aa973d6c7f33c97dc39edabd2 SHA512 e5eba451947dd0eaf20b91c468960c35b1900c8ac4eb28f1114e9b829aec4c799b671c4e42ac9812478fa8a69b75a8c87845d561761346da2a3e435f6545b695
AUX alembic-1.7.11-0004-Fix-a-compile-issue-with-const.patch 1044 BLAKE2B 49ed2fe0b260e9917f781ed5e1e2fb5ffaad89f567be893ff68580f7ec766ceb7f3ffc884d5f5cf030d467b0fcd096d56363b4273e8d1968c1ed3d5b9016fda8 SHA512 18d32d6b1d611f9ec9f545281f5900f58673cf773b11fbcf457d9a0c39a8c87690e1d39b2dfb910f74696b73d34e23f7adefa8242c29d80595ac3fb0879d87d6
AUX alembic-1.7.11-0005-Fix-install-locations.patch 8305 BLAKE2B 25688ca368f4d58a32d5c7afbbd4b1a738d3a69644034d18d487f2d48348ca4de32e3e691a8c5ec137c4829079cb0fedbdd9c5cfc98ff38144097845f07e0065 SHA512 b025cc77c21c57b43d9536e488ac5d68037cfa186c561399409ba863c722fca20f75b939aa7d5166d302b92e636deba05e0db4747d614f3420b4e76d30a8cbb2
+AUX alembic-1.7.11-0006-python-PyAlembic-Tests-CMakeLists.txt-fix-variable.patch 1074 BLAKE2B 1d8b252eb8fcfe18e019a11350d1b9974d30a1d95146d5dd8eda8feb585c4e7d1070543f290d32e41929b17e86fda9a6eca7d045d4b4cf8fc31b4075addedf7a SHA512 059c89cbe402429684e56fa14041cf65974259b4ad1d464edd925bb6353d758402689e8de7021a3b3de6f98b1225a90fc50bbc843639b9be2823527afe77ee57
AUX alembic-1.7.9-CMakeLists-fix_lib.patch 7317 BLAKE2B 8739f5808cb8821cf8404dcbd492620bd1b0fc4ac09600f345a89b813d07e24fb305a5615a9d58b11ae36f7754a9527bf583586017d1018eff658760370f9777 SHA512 000d31ffd5c5843a33532fbf02c2410cbeb7504fd89d9133f4a91d435682572df0cee7d59f039b0e32e98c05df7685ac2a3880630cebd6782e38161a8bca4c31
AUX alembic-1.7.9-find-boost-python-for-cmake-ge-3.11.patch 794 BLAKE2B b19aabcc393e2cd218d055e00b7ca1e0e69206326b756e4ee9f5cc67678f0e519b6f788593e33e833b61b71ee98fbd8e2a3e633548144601ce47b2aa8f625380 SHA512 bd1ebeaf3e1e28badb9e5a6914bf3073cfa8935c74a044ebe5dfb84117c8058696ae10866898fb6dd122fd4b7de926070e422e1487f0f6749226fe87e646b52c
AUX alembic-1.7.9-find-pyilmbase-python-module.patch 542 BLAKE2B 448114ef30e6131229b6e789af7a231e766e2584c64eca9f4e09cd7bae8555d1c9f00b62c3e53136fa20be25530ed15019ea5f55a32ee286b925b726678092fb SHA512 4dfef7da97b1fe82b7c210ff8cfc7e664d56b7379dde0246ab18311fc28188dd59251b745644f75debaffe9e5eeff61c965ee9bcf6102ff6f50af7f9db4c8a2e
@@ -12,6 +13,6 @@ AUX alembic-1.7.9-prman.patch 822 BLAKE2B ed5faf9b8e4eb165b82a5001b129403ce0afcb
AUX alembic-FindIlmBase-pkgconfig.patch 971 BLAKE2B 946766bceb152a1673737af5158be9f5efce812a70adfe36bf5642f150d2576f14c22670cc1bbf9027834c69ac661ca30d27f06f9fbf73f656dd883ce38a381f SHA512 4f5fa5a33c8fb4edcb3c0a5d0290a912015c0e02ecd6340e5dced1f658302034148a1050aee1dcbf3d7d89f11c5e9ea07637c659414951152dd49081c70560c7
DIST alembic-1.7.11.tar.gz 826833 BLAKE2B ea2ee92cefcc92d3658b8c71351ec0f72bd1fb5d5b6c771ceebe81b1db61a280420f480cd3612f44bc134cccb388954be89baba9dc6e5973e102bc55d65cd974 SHA512 94b9c218a2fe6e2e24205aff4a2f6bab784851c2aa15592fb60ea91f0e8038b0c0656a118f3a5cba0d3de8917dd90b74d0e2d1c4ac034b9ee3f5d0741d9f6b70
DIST alembic-1.7.9.tar.gz 813379 BLAKE2B 599edeb5ad805656755b3e150fba56182d1d60673951b0c1702b3e3e82d9499ec4fcb938303103c27f84458f61ab8de4b872eaa322380ae7713e3b4cd3831af7 SHA512 8025c20525ffbd5bdc9dd5a33ad8238e49f063d244ab9d112e7d1ddb7ee7cf9b36ceb74cb45d658ce22d3033552c89bddf6b818cf466ea46aa1a70a41fdeddb2
-EBUILD alembic-1.7.11.ebuild 3037 BLAKE2B bd5f738928e270968f93d17f2ac60f1291e8c28f0b0c10ef61efe875da56baf61fd706146d1accc44c040376faa80f9754a645db2666f22ae4a6e5c484f87092 SHA512 e13c06ea392e765bba02ce4819e2693ef91968f9f449e8a189f1218e34431fc98fae3c166eab758171840c79bd11c0cba24431cbd8c5f21405b3321ff6f87e29
+EBUILD alembic-1.7.11.ebuild 3119 BLAKE2B 040244248ec857db60a11694161671343e2f0bf407bfd40a0fa8505199ce24b6b3829b95f9f2147b24b898531c4b37ba2c676bc5b42573208d9f552fc446e3d8 SHA512 cf22b4742a8f52713713043cb9327b56ede8f41e79392dc07c601db2d7fbf310908bbbc7f8f6893de9374ccfcaa95baa9f458db437e7ba4c93e8e97f9528696b
EBUILD alembic-1.7.9.ebuild 3015 BLAKE2B dd6e430c4b1d11e7bcab88de6ee6c5bb2c6bb176ec700c59448c31477069fc42dda77fee34694ff983c25bec7854b3adaa7c1b120b61648e4f41b0d6d41e40aa SHA512 6ed134efe406b41b3187f33edbc092076cff7f42eabb110d5bd9f0191f984a040ce86e5ccd0ab4f9bcaa7ea86de58b4002424684f9f68bd5600bc511dbdfba7f
MISC metadata.xml 1343 BLAKE2B b0e902df8e5f04bcbe4e784abe396b926db2de2347560181ab77ee60da7cec55ab10aafda38623109681240992b8b43208fc65fe72fc8dd66cf6ebf09defc085 SHA512 af9abd189b8c15b53b60b818a7ce419b812092ba1725ebfa4d3267c5d2f67018c7f3cc06bc24fe9af614fb420b4f8176585a53920378521779c4ca52c39c22cc
diff --git a/media-gfx/alembic/alembic-1.7.11.ebuild b/media-gfx/alembic/alembic-1.7.11.ebuild
index ac081bcaddb5..f23a45282d8c 100644
--- a/media-gfx/alembic/alembic-1.7.11.ebuild
+++ b/media-gfx/alembic/alembic-1.7.11.ebuild
@@ -45,6 +45,7 @@ PATCHES=(
"${FILESDIR}/${P}-0003-Fix-env-var-for-renderman.patch"
"${FILESDIR}/${P}-0004-Fix-a-compile-issue-with-const.patch"
"${FILESDIR}/${P}-0005-Fix-install-locations.patch"
+ "${FILESDIR}/${P}-0006-python-PyAlembic-Tests-CMakeLists.txt-fix-variable.patch"
)
src_prepare() {
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
new file mode 100644
index 000000000000..6bb8090344f1
--- /dev/null
+++ b/media-gfx/alembic/files/alembic-1.7.11-0006-python-PyAlembic-Tests-CMakeLists.txt-fix-variable.patch
@@ -0,0 +1,29 @@
+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/asymptote/Manifest b/media-gfx/asymptote/Manifest
index 0dbc5be5d2a0..fa16ed1e8da8 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -16,8 +16,8 @@ DIST asymptote-2.41.src.tgz 3516426 BLAKE2B d4623609be58566e32de82c5c47f635ed737
DIST asymptote-2.47.src.tgz 3621676 BLAKE2B 575032093276b9df6b8d74897a4721dd0d5419b3380bce7962afc9dcdd20ec3bd47b5c4b882f2276a2ac4c0d99e657d7385122d7dc400efbfb52ceec753ee8f4 SHA512 9efc4a70e8d29d6d50ba49c54c48da38beb00f64e5b39f23dbaec5cb12b714e427473fdffbf71f2d636a007cbfc993fa3237a8beab01e3419c1da1287823c159
DIST asymptote-2.48.src.tgz 3729763 BLAKE2B 5820ddbbd27f6e7296501f50f25051d8417a0ab24d7c4c777013bf23601b5cbe34a69ba781e16e05141fda4e2e7a8bc527a41829f8d9e983aadc19bd05743122 SHA512 cd8b756185ae6627ea66bcaea224152f6644df633fe7ed40c1738f3b2ec31fbaa7ba97f2b1e290b073995779768ee3a264dd942f609b768cab7624d12807583d
DIST asymptote-2.49.src.tgz 3730453 BLAKE2B b52c2fbac5ea9c6046f2bd2990c7f3792823ae0ecd749c58990bcee898b8af7d26c4b457bee6aa15fb11e3c63a7cdc6d7e4976418ee96fc4470a17f3202d79cd SHA512 08c20e45ab764281b480a97c5e2294cdfcc18b179cbdc85cf9956806b40fe305360d589077bd3ac429985503b0e7d17c889a37349d8c6fdf8ccbd8d822544226
-EBUILD asymptote-2.41-r1.ebuild 4666 BLAKE2B b08d0c753cd411fa0c0c6d32a9c28874e3f035481a5a52277e3e0c43dcab2fc98a51671859ec4542cbbd8d65b0a7519e15cc665053d1e28cc190a8547ae088b3 SHA512 3160eada27c3c6a905df3b622019fb2f759a13ce7c261eabbd84d64483e55fbecc3ae13a5fb42d61b70e4a2874dd32187df1d0bb63f64e02fa6899dc1efeac80
-EBUILD asymptote-2.47.ebuild 4609 BLAKE2B 72b9016f520f39be0841b5363935e0e8fed242c2b1389d3c483f607495c7f432f58384072c760de9869c2d64b5864e19d93b124f9ba8650d44ca08c74f827ef7 SHA512 32f999eead1c5a8875b29ab01b268f4e1724bf4ba80d8e90665d5229fd6b9f267aa1f692b531d137d48175aaa49fe6abb87a05a8950635c80faa890abd8a8bda
-EBUILD asymptote-2.48-r1.ebuild 4655 BLAKE2B 5a26448a84033c85122683607981353344e67713cfc0ed1a817a4ada501db5110a913d0ab025b5e8762a4fdd4056f15b7f0272a9c2f4175a1bf78240832eb4ff SHA512 2a3ce261339eeadd288ffa56ffd1290496c7e961af2cee84aa5865f50e3f5971fbd9ba89f58ddb2febce28c1d05c396ab3fa4ea19c3d26dab90c215a062fe81c
-EBUILD asymptote-2.49.ebuild 4596 BLAKE2B 0462fb2a5efad3462fb7c348a80538badef4fb99df887e8134e1c6eef761c774277914c566dc333a1a6bcc6009cb25655c3d985f7d4d8ec734891a2c9180a8ff SHA512 a0094454032cfec2378a7586c6619d551d8b2cde249db9777db91a6731327f0d54cb0a7eddefbe33119875dec50b32738b82f5d82475c6c88ab3aa1cbabc26ea
+EBUILD asymptote-2.41-r1.ebuild 4672 BLAKE2B 3b0b7c2f37727b801dba23f9d08b6725f76aa8ce6e5bcd18997bb15e730499eb7e4e92c54fb141ce4edc6d447f35f0870274df6900e3b03cea4fbb6bc9ed8b00 SHA512 aacd5ffff6ff44e5d0a7c645e4cba18d8d0c8b70474a7d9472e8965aa7fb3a4336bed7af0bd22505f719354d8bb30f92aa2fb6b4f1ee976e2217820248aed523
+EBUILD asymptote-2.47.ebuild 4615 BLAKE2B 1924537e78957d575bc63607d9c09ba6c0e08ea52bdf778525418f307c1f7b20f038a82451bcfc8f939ecf3d01c8f7bd92a2c89363367aa31ce75860d5fa873f SHA512 60ae4850de58fec996d69a86fc223c4fa4f503df9195a0e0d0cfed3298e7722fcd0fcd9224ffe55971938ff4c99ca6f8fa2dbfdf45660125b54576d1c222fb32
+EBUILD asymptote-2.48-r1.ebuild 4661 BLAKE2B 2afb63bfb99ea550aedc51380ac4175237dfc91ec54cb49aaf4fe0fc46df5d9aea5a65afb46d275f84d2bcb22cbc120e56c62dd0eeb08ced9c9aa8067143bf0d SHA512 967212f30e642bc17a1255dc6db91fd719efa0d651f969821207136532b1ee2932d1585d9e4869a60c1241b0bdabfbd1fd473e0dfa51cafec405304712157cad
+EBUILD asymptote-2.49.ebuild 4602 BLAKE2B e00d8b2cd0ea10e7a2b127e9f82bc21d1553c2d105580aac7b8cf9ed6e9870262c0441bb316c1078ed17f6da02192599e7afd2f2b8e6e65e69e3452de570c305 SHA512 15b12de5d134c9584d55725b27b6c3822ec9f696e5503398d860db9c54fc25962e893c8e6fead9712742a01f9b7b1c392f372937edc8b90d4d37ec63d59c001d
MISC metadata.xml 1105 BLAKE2B 4b7d588a861ed68910f0d5a7b7f5691b3e97b6cf4514c3544c8610c77340797354575b49b70980320e55ecf5ea8188bbe8f6cc8fce55d18dc466f1d0fd83ade3 SHA512 f115ea831900270542ffe545260eda1ed51d321eca5aa7772f336bcc0e0c6471be3cbde2991c3e48ea5b3fbf51b8541b13de850406af15e42c992da0f2ed08ee
diff --git a/media-gfx/asymptote/asymptote-2.41-r1.ebuild b/media-gfx/asymptote/asymptote-2.41-r1.ebuild
index a685b5b6a919..217c37ad1255 100644
--- a/media-gfx/asymptote/asymptote-2.41-r1.ebuild
+++ b/media-gfx/asymptote/asymptote-2.41-r1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
>=sys-libs/ncurses-5.4-r5:0=
>=sys-libs/readline-4.3-r5:0=
imagemagick? ( media-gfx/imagemagick[png] )
- opengl? ( >=media-libs/mesa-8 )
+ opengl? ( >=media-libs/mesa-8[X(+)] )
offscreen? ( media-libs/mesa[osmesa] )
svg? ( app-text/dvisvgm )
sigsegv? ( dev-libs/libsigsegv )
diff --git a/media-gfx/asymptote/asymptote-2.47.ebuild b/media-gfx/asymptote/asymptote-2.47.ebuild
index ed3c4ae957a9..a22f78842577 100644
--- a/media-gfx/asymptote/asymptote-2.47.ebuild
+++ b/media-gfx/asymptote/asymptote-2.47.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
>=sys-libs/ncurses-5.4-r5:0=
>=sys-libs/readline-4.3-r5:0=
imagemagick? ( media-gfx/imagemagick[png] )
- opengl? ( >=media-libs/mesa-8 )
+ opengl? ( >=media-libs/mesa-8[X(+)] )
offscreen? ( media-libs/mesa[osmesa] )
svg? ( app-text/dvisvgm )
sigsegv? ( dev-libs/libsigsegv )
diff --git a/media-gfx/asymptote/asymptote-2.48-r1.ebuild b/media-gfx/asymptote/asymptote-2.48-r1.ebuild
index 6a39f53426e1..24ae7be985c2 100644
--- a/media-gfx/asymptote/asymptote-2.48-r1.ebuild
+++ b/media-gfx/asymptote/asymptote-2.48-r1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
>=sys-libs/ncurses-5.4-r5:0=
>=sys-libs/readline-4.3-r5:0=
imagemagick? ( media-gfx/imagemagick[png] )
- opengl? ( media-libs/mesa media-libs/freeglut media-libs/glew:0 media-libs/glm )
+ opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm )
offscreen? ( media-libs/mesa[osmesa] )
svg? ( app-text/dvisvgm )
sigsegv? ( dev-libs/libsigsegv )
diff --git a/media-gfx/asymptote/asymptote-2.49.ebuild b/media-gfx/asymptote/asymptote-2.49.ebuild
index 60224c1dae4b..d424b071ff4c 100644
--- a/media-gfx/asymptote/asymptote-2.49.ebuild
+++ b/media-gfx/asymptote/asymptote-2.49.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
>=sys-libs/ncurses-5.4-r5:0=
>=sys-libs/readline-4.3-r5:0=
imagemagick? ( media-gfx/imagemagick[png] )
- opengl? ( media-libs/mesa media-libs/freeglut media-libs/glew:0 media-libs/glm )
+ opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm )
offscreen? ( media-libs/mesa[osmesa] )
svg? ( app-text/dvisvgm )
sigsegv? ( dev-libs/libsigsegv )
diff --git a/media-gfx/clockphoto/Manifest b/media-gfx/clockphoto/Manifest
index 7e4420ae7919..24ab2c8d118b 100644
--- a/media-gfx/clockphoto/Manifest
+++ b/media-gfx/clockphoto/Manifest
@@ -1,3 +1,5 @@
DIST clockphoto-1.1.tar.xz 717820 BLAKE2B 8e8847b69bd2e5cdc3381afbc9d097f0a16763f987aa9843360aae327d02080577b371a81d31e888622e2735af271ce3df6aa7a0f014d1f275b06cedb3e30036 SHA512 21a114191445fc3a0d888b4c0288d3fcd49394b3390cc04306136b8e6569d8d039851813cf5e44f38bcadd8a60cd649adaea2fbc881a3182e3aae249c1962d0b
+DIST clockphoto-1.2.tar.xz 717836 BLAKE2B b730ed9cca21ef7c23c6d6eeacbbdb59df6b5ac6c59b5f9821f4958ebc212df6c803cd062400c19e9e66e39c711a80cdf3355d53d6f6f10237cb67e40b818e28 SHA512 db5740b3c291df8cc79dec94196aa912afd316c601ddd6809b76d3a9f12a4df9b6530d4c9a031720cd5f309d7d05cbe62530ce1e2a9d8a7c2997d56a30b97739
EBUILD clockphoto-1.1.ebuild 532 BLAKE2B 4bbaa046a954fd83eadff39e439405ff2396d8a8131f780c1c0b57bc8ba2a306e906799527701dec74b8fee14c7e11c2934dc24db2f0bc0ac0ee7b2aeae24d26 SHA512 df59cd3a4a1ae930a2fc5a591289f4c2ef556940cb3c9f0b603b8f50c701137f3958f0aab1d244d4343191486753276dee588eae9608b5e4c47dac3a06f22d2a
+EBUILD clockphoto-1.2.ebuild 531 BLAKE2B b28d3e7c890026b66a69a97235ffbf4f424ee69f3a4193bed9687d64dbbc48f3964d616493dad61b8cfadd512e2b4cf6525022bb157c7ad18c552eece1372183 SHA512 63f10a3bb3aad34891c54b5415775601093b3cb3518f5fbc23ff57c7876a375a122d1c01d25665a51f7dd9a821a96b70d708ea2b1d899af1849fb2cba435802c
MISC metadata.xml 250 BLAKE2B 3c6a58190f2680dd7f7e4afd9e6abfedc7e36181b1a8d7fa9710e08c805ef85988e4a156221c61fc71c36f8e84113537b70a8f144e0764e7704f7dd074af8172 SHA512 d2115b154bf731eac11fd7b96a95baa2467cb660371f7a3dc7a7a77cf4a6cf992b97c5353f184010eac1d37cdfffa6c5d9ec35d82e171f0fad5086767d0173a5
diff --git a/media-gfx/clockphoto/clockphoto-1.2.ebuild b/media-gfx/clockphoto/clockphoto-1.2.ebuild
new file mode 100644
index 000000000000..c7140026fc37
--- /dev/null
+++ b/media-gfx/clockphoto/clockphoto-1.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="Adjusts photo timestamps based on clock photos."
+HOMEPAGE="https://git.zx2c4.com/clockphoto/about/"
+SRC_URI="https://git.zx2c4.com/clockphoto/snapshot/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5"
+RDEPEND="media-gfx/exiv2 ${DEPEND}"
+
+src_configure() {
+ eqmake5
+}
+
+src_install() {
+ dobin clockphoto
+}
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 887434518239..53a84562a50d 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -5,4 +5,4 @@ DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B a7a254e49dd57ee03480d52f450
EBUILD darktable-2.6.1.ebuild 3763 BLAKE2B df499fa003b19a7f98fac89c5ba73209dd0922e733d596e9ceff9d5ec7034777eee8e57cf6418af3d37afb628bc7ce3bc616617034477be54c62b4d36ec454b9 SHA512 8a9504b625666b88ab790a250a725907d068fccd66cb2e70d17b0b7a55824eb3512fa320b4009f6300af242b8533a0a766c8ad5f10b3cd89c28b7d1f5a4a32f5
EBUILD darktable-2.6.2.ebuild 3768 BLAKE2B 177d62db7bc383244eadfb2cad1806d1e7cba958656bc597252b57431746807cf3bf2a310b577bc6b91a753e6d5198fce0935a46c0d3cf3c2fef50fe9ac8a782 SHA512 ca6cb3a3b140d1cb914a0e64beba5e7e97804fbc42a8419ea824d2ca6d68502eea60d7673cf093dd86b500739562a714e3f9bdbef16e95aea78687f56f274789
EBUILD darktable-9999.ebuild 3159 BLAKE2B 3baf702f5ac1c0bbab2797e3ff2fdf63477b5f0050d2f23fe1bbf8090021ba30c68a491f34dffc18b5034d5d24fe3cc0625bc52a87062605e9e9dcdda55c7af8 SHA512 e5baeaa66d89d7a05b584a8d3b7d035b4a3c8f143a2d51cc800f7b3769ab9d71f85f171d362cb20ac64f79d538f1ef5bf428e216733928695ba3e0a0d4b87e3c
-MISC metadata.xml 871 BLAKE2B 5576cc42a46ae48d681043c22cbf206855a0770f112e42138a264950235b1af96751740800f8d9402bf5e00adf725511e557f3b65ec355abbe26de451ad5b70c SHA512 330c5e8b17daee39f3152fbcaed1979814b3b5d0aa205860e5ff309ae068037da0f4190f91672be17c138fcda91890954b2cd310b3725bada6f3916a73cebf1a
+MISC metadata.xml 784 BLAKE2B 7e7f55f709fa5d7da777b272232cece75e55e2754701f759630afe0857f971341fa0d4b2b1a6c96391b3de2bd94966ccb0ed6e8fb17089de71f34418ed397cba SHA512 ae9a9f28be76a93c0b5c90892489c0e8397ea84f043fa03787e6ad774b8c79c834059fd5e55d6f46e63bd9a9411218585e99e59acef7e21493ff4543bb0210c4
diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
index 228506baefbe..57ab6042d4e3 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -6,7 +6,6 @@
<name>Gentoo Graphics Project</name>
</maintainer>
<use>
- <flag name="colord">Support color management using <pkg>x11-misc/colord</pkg></flag>
<flag name="flickr">Add support for uploading photos to flickr</flag>
<flag name="geolocation">Enable geotagging support</flag>
<flag name="kwallet">Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg></flag>
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index fd87d4e0fd3f..8cd14dfa580e 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,6 +1,8 @@
AUX digikam-6.0.0-cmake.patch 1972 BLAKE2B 103f282e8cdc33d6e7cc3982bb15b290ff2381846d6262005922b97df1b54d9dd7572fb95eee01a3cf413dda9eed28e0201123bfedddc7beda6dc4ddc99e5d55 SHA512 8efe171f763692efd7c8449e1365e2d531a4d1b6da79fe1f5048dbe1b328f70b6e923298015f2a162751843eb88db2dd1af744a2b2cd3219e0f44aea4d3a569a
+AUX digikam-6.2.0-cmake.patch 2011 BLAKE2B da9e459cd8c7f89d986166cf19dde36d599565f573831057c0d68706c05f4b49240215e159d36e377f16b178c7de04e713bdfb3214bd83e114cbbd5b40f4f37a SHA512 44a63a08da538bee35efc965789b463455646c3ee9ed8fbe6f22591155c20b623e48838af52f8b521a35b3548fe44909516a15a4d815347e61de71d07bbfad17
+AUX digikam-6.2.0-googlephoto-upload.patch 1072 BLAKE2B 5384a259b2fdd15cf195fed8f5aa1a16a0af3932af1e2226b3bfd2be95d19f6fee003fd9d3344c0921ff5655d22ea4f30f98e8ed7c1e5dee1d4b91d4d031562e SHA512 c71ab51371e45538f33ba9603eabdc8e3e518f7e38aa274407d90f216a14f6071066f388291d072fca46eb6589e3cafe0eb5b78f3bb3520ca9aa85add092d265
DIST digikam-6.0.0.tar.xz 331386500 BLAKE2B 93da3822ad10b3c017aadcdcc1501af5dfcfa07640d73b6987cc7e1229573e02489c166abf16a07378466fcd2bf7c4423415af563b5ab835e6d5d8ea63a04eba SHA512 b8a70dde0b3838c4ccaffa3324eacb0541642e82177c90a1f8fcbd9691c194369f2760c4ea56c58b7ae049fc1a748d5d88cb537c62e3700ed5e21bad44d01adb
-DIST digikam-6.1.0.tar.xz 332466544 BLAKE2B 2f9aad537108a905d42bd218052287ccdb76a75e4883990c19a4c12318dbf019fa37b547e1adf4394dad14ab6f2a38d5f0c397060382d525ef7c1cabafa649d6 SHA512 36cffce4fdb751dafc45b2d447fbbd1134b7dc59c19eb6f7aebcf8d66327f6d8a49e787e346984cc842c81dc033ff8f7f8614a81073d99a0c6902770a26053da
+DIST digikam-6.2.0.tar.xz 339472960 BLAKE2B 0db48839474d599a364fba73cad751b889fe6f37c88323d1feddce67acb0ecad306c67976e1524328e6aaf33464c9dd35b1b85cf3c41ba72be9cef664e30d520 SHA512 05667c91af290df0eabd3b18a7c6741ded3f1b01b0a9cb572d6df79f25787d0291624760d6c0fa23bd36665a94bc7ccba845c117ee381de7edff97d1d4158e56
EBUILD digikam-6.0.0.ebuild 3951 BLAKE2B b7bcf74012b240e5864298c82e18e5f1d3a52f0df16c90896b9d2ba295e396f757f10e3c4a14dd8359086acfde797013d68bcfae57f4105de933d16790d0fd24 SHA512 50c11d1925a65f4d9c307bc1a32fb615176b7c14dd4ec3b30b4080b30f93845b732f725cae2a6fc188ea43982396a44acaf6e4fc64c1f47b95a4070f39ef8913
-EBUILD digikam-6.1.0.ebuild 4175 BLAKE2B 0a961685332a190169cde6f672b4f61cc43192cbeb892b3775f38bad0a3c713efe45d1026ffa55c2a88ec35251aab69dfe7e2f528b1f6108f224db3830c60830 SHA512 3d9de925e7ee5e4b8aca9625a4960223a4c6010a2bfb91bb296d8f3f89d71deab43551a6e9be65e74cc797250a453d410aa4227549990d4bc3e9f2bd0c786e55
+EBUILD digikam-6.2.0.ebuild 4121 BLAKE2B 36f16c7a7168d1bedf989377b4886c94d7660d7f86f79287d688cb29db19c3cb8751beca6d68b4b47006c78b7aaf4623ee32d8a2e16138856de95e5fdbbc188c SHA512 f052bedfdbe74291228db64118db730314ac371dc06efe85485826638c385cf44e438aba9a91532b1f6b132957844ca707378dd4170cf83add81385ea74f8cd6
MISC metadata.xml 1256 BLAKE2B c3899279a6382ac2b2a12f5b94938db2324093bd63e0db8e3f82bb56ea9944d4369b793f7fa039c2c08af1887e4cc51d58f4e89a57c81b18cb5f896ef4cd0a5c SHA512 9b220b4271d0cb7b9fd5549fec165c4bc20c250cc66ce14ecb3cb16d0eb8355f35d0e585d9d800ed70437b3cd5434bcacc7dfd783f2a5683dbe1b1b3ce48356f
diff --git a/media-gfx/digikam/digikam-6.1.0.ebuild b/media-gfx/digikam/digikam-6.2.0.ebuild
index 9ea4daced62d..4478b85ae239 100644
--- a/media-gfx/digikam/digikam-6.1.0.ebuild
+++ b/media-gfx/digikam/digikam-6.2.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-CMAKE_MAKEFILE_GENERATOR="emake" # keep until CMAKE_MIN_VERSION=3.13.4
+CMAKE_MIN_VERSION=3.14.3
inherit kde5 toolchain-funcs
if [[ ${KDE_BUILD_TYPE} != live ]]; then
@@ -20,7 +20,7 @@ DESCRIPTION="Digital photo management application"
HOMEPAGE="https://www.digikam.org/"
LICENSE="GPL-2"
-IUSE="addressbook calendar dnn +imagemagick gphoto2 jpeg2k +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X"
+IUSE="addressbook calendar dnn +imagemagick gphoto2 +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X"
BDEPEND="
sys-devel/gettext
@@ -68,7 +68,6 @@ COMMON_DEPEND="
dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contrib_dnn] )
gphoto2? ( media-libs/libgphoto2:= )
imagemagick? ( media-gfx/imagemagick:= )
- jpeg2k? ( media-libs/jasper:= )
lensfun? ( media-libs/lensfun )
marble? (
$(add_frameworks_dep kbookmarks)
@@ -107,7 +106,10 @@ RDEPEND="${COMMON_DEPEND}
RESTRICT+=" test"
# bug 366505
-PATCHES=( "${FILESDIR}/${PN}-6.0.0-cmake.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-googlephoto-upload.patch"
+ "${FILESDIR}/${P}-cmake.patch"
+)
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
@@ -123,12 +125,12 @@ pkg_setup() {
src_configure() {
local mycmakeargs=(
-DENABLE_APPSTYLES=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
$(cmake-utils_use_find_package calendar KF5CalendarCore)
-DENABLE_FACESENGINE_DNN=$(usex dnn)
$(cmake-utils_use_find_package gphoto2 Gphoto2)
$(cmake-utils_use_find_package imagemagick ImageMagick)
- $(cmake-utils_use_find_package jpeg2k Jasper)
$(cmake-utils_use_find_package lensfun LensFun)
$(cmake-utils_use_find_package marble Marble)
-DENABLE_MEDIAPLAYER=$(usex mediaplayer)
diff --git a/media-gfx/digikam/files/digikam-6.2.0-cmake.patch b/media-gfx/digikam/files/digikam-6.2.0-cmake.patch
new file mode 100644
index 000000000000..f25dd6306afa
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-6.2.0-cmake.patch
@@ -0,0 +1,66 @@
+From d915828e4db2e7b40e799abc01a6fdb683d2b921 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 17 Feb 2019 23:51:03 +0100
+Subject: [PATCH] Un-break optional Qt5 detection
+
+---
+ core/CMakeLists.txt | 26 ++++++++++----------------
+ 1 file changed, 10 insertions(+), 16 deletions(-)
+
+diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
+index c04ee1a9c3..c3762437e6 100644
+--- a/core/CMakeLists.txt
++++ b/core/CMakeLists.txt
+@@ -136,16 +136,14 @@ find_package(Qt5 ${QT_MIN_VERSION}
+ )
+
+ if(ENABLE_QWEBENGINE)
+- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS WebEngineWidgets)
++ find_package(Qt5WebEngineWidgets ${QT_MIN_VERSION} NO_MODULE)
+ else()
+- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS WebKitWidgets)
++ find_package(Qt5WebKitWidgets ${QT_MIN_VERSION} NO_MODULE)
+ endif()
+
+-find_package(Qt5 ${QT_MIN_VERSION}
+- OPTIONAL_COMPONENTS
+- DBus
+- OpenGL
+-)
++find_package(Qt5DBus ${QT_MIN_VERSION})
++
++find_package(Qt5OpenGL ${QT_MIN_VERSION})
+
+ if(ENABLE_DBUS)
+ if(NOT Qt5DBus_FOUND)
+@@ -156,14 +154,10 @@ endif()
+ # Dependencies For unit tests and CLI test tools
+
+ if(BUILD_TESTING)
+- find_package(Qt5 ${QT_MIN_VERSION}
+- NO_MODULE COMPONENTS
+- Test
+- )
+- find_package(Qt5 ${QT_MIN_VERSION}
+- OPTIONAL_COMPONENTS
+- Qml WebView # Optional, for 'sialis' O2 library test tool.
+- )
++ find_package(Qt5Test ${QT_MIN_VERSION} NO_MODULE)
++ # Optional, for 'sialis' O2 library test tool.
++ find_package(Qt5Qml ${QT_MIN_VERSION} NO_MODULE)
++ find_package(Qt5WebView ${QT_MIN_VERSION} NO_MODULE)
+ endif()
+
+ find_package(KF5 ${KF5_MIN_VERSION}
+@@ -335,7 +329,7 @@ endif()
+ find_package(X11)
+
+ if(X11_FOUND)
+- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS X11Extras)
++ find_package(Qt5X11Extras ${QT_MIN_VERSION} NO_MODULE)
+ set(HAVE_X11 TRUE)
+ else()
+ set(HAVE_X11 FALSE)
+--
+2.22.0
+
diff --git a/media-gfx/digikam/files/digikam-6.2.0-googlephoto-upload.patch b/media-gfx/digikam/files/digikam-6.2.0-googlephoto-upload.patch
new file mode 100644
index 000000000000..1c182ed7c9e7
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-6.2.0-googlephoto-upload.patch
@@ -0,0 +1,25 @@
+From 19490eb10de0444219e8b525bb75513c046d184d Mon Sep 17 00:00:00 2001
+From: Maik Qualmann <metzpinguin@gmail.com>
+Date: Wed, 7 Aug 2019 19:52:13 +0200
+Subject: [PATCH] fix upload error to Google Photo when description contains
+ quotes BUGS: 410692 FIXED-IN: 6.3.0
+
+---
+ core/dplugins/generic/webservices/google/gswindow.cpp | 1 +
+ 1 files changed, 1 insertions(+)
+
+diff --git a/core/dplugins/generic/webservices/google/gswindow.cpp b/core/dplugins/generic/webservices/google/gswindow.cpp
+index a03e683e65..a80eac5cdb 100644
+--- a/core/dplugins/generic/webservices/google/gswindow.cpp
++++ b/core/dplugins/generic/webservices/google/gswindow.cpp
+@@ -594,6 +594,7 @@ void GSWindow::slotStartTransfer()
+ QStringList descriptions = QStringList() << info.title() << info.comment();
+ descriptions.removeAll(QLatin1String(""));
+ temp.description = descriptions.join(QLatin1String("\n\n"));
++ temp.description.replace(QLatin1Char('"'), QLatin1String("\\\""));
+ break;
+ }
+
+--
+2.22.0
+
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 796cd855539f..e34ea267defe 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,3 +1,3 @@
DIST eog-3.28.4.tar.xz 5732396 BLAKE2B 9adf7e6793add9298dd879a0fe5ea7c736854d3a40473b2def84851a1e5a78ef84316b20b172c85c85f070278a51b06c1019aef1e5e9c5f31a87243c9229a579 SHA512 57ccb6269b2829a0606cbae08fc376bcd13028d3affe03d76c929a95faf9106dfd497872a12019158aeff5e8e101640d912cae0cece435121319820df7262c00
-EBUILD eog-3.28.4.ebuild 1548 BLAKE2B 30a8e18db97f9bbe86308530aa943cb3d35eb611665fe704bb12b5ea3fcb78bb4602d5d3cfc3f60db98ac30b1191ec4264bbc7338428c1d1a16bbc15fb89fdee SHA512 ee8e69916c99e40d5855b98b3b9bb8ea62789116ad9d8dc98f1a6414acc450b47b8440adec382d164fecdbf6b5d3cd8e27fd5b673ab74b3d954134faadd01c80
+EBUILD eog-3.28.4.ebuild 1555 BLAKE2B e22cfc02eb83d4f8a33be1573f0976b0a4d0d7bc32d164d13f3aa147f20a66008747e98b43213c8b12103970d12fc5318d1d7d934ba9d216d1affa9456b5cba5 SHA512 eaa46f027cd9110e3243171dde0a0b94a9a1742700cdff0653fa90d20c8f7d1b2b238c94269faa2f40be4dc7b64a15c6e5ad2327281294c4c503593ff0aaa241
MISC metadata.xml 481 BLAKE2B 2c12b594b9a5b1e4ce3983131d1911f62026c5186d8f5c5af13842cfedfa4d20abdc5ee82e11db3a2e1b45e2b8d4d95fa1a62e668936956e8453b166daff00b4 SHA512 141ec1d6923697f744de806804279b602120ce3d5494257de36b8c8b71185d101692f2e438d7ba0e4a4c946d0aaba068117f16c8344abe891e0ddd4f768ded26
diff --git a/media-gfx/eog/eog-3.28.4.ebuild b/media-gfx/eog/eog-3.28.4.ebuild
index f63fb81652ee..df5e69ce3b14 100644
--- a/media-gfx/eog/eog-3.28.4.ebuild
+++ b/media-gfx/eog/eog-3.28.4.ebuild
@@ -14,7 +14,7 @@ SLOT="1"
IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
REQUIRED_USE="exif? ( jpeg )"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
RDEPEND="
>=dev-libs/glib-2.53.4:2
diff --git a/media-gfx/evoluspencil/Manifest b/media-gfx/evoluspencil/Manifest
index fa6f313d3c9f..52523e52d5af 100644
--- a/media-gfx/evoluspencil/Manifest
+++ b/media-gfx/evoluspencil/Manifest
@@ -1,6 +1,3 @@
-AUX launcher 324 BLAKE2B df3091670e3763886bc9ce099159e990adbbe99ee4084e8764bddbd9c86f7ae36881f2bc3f6b02df60edc7d513deba22fa9799531c11ff7e74c5328ead00a2db SHA512 4266eca92c9860a5bd73d14e3650729bf93e2b14525dfe6d7b36009273561404440395e3d494b924fc2f76372a97a17ee40f5e375f70157174783812b272fb72
DIST evoluspencil-3.0.4-49.rpm 55779457 BLAKE2B 7f74bf4d0ac4dcd6ef2e37d56e6b06eda72a34e6c4bc0e2fbb5b55727bb3ba0ecfe183e64ad5f6abe77d258dca2bfc7acca0d08c934a7700699690ff8d39e335 SHA512 72a17841d214523223d6f35ca8ba69076070baf83248ceb5747a23865ec955f8aafbb799eb01b3a3c99226a7bc1653e55be6f7292941b1a859598e016673f2ec
-DIST pencil-2.0.5.tar.gz 4810418 BLAKE2B 438bc868aa7e83434de4e5e7b196dce5e607b49590b4216e345c9df4999327ee75b9761a08de9bab47cb0d1e92a363af3b14985748cbbf203d8ff3f0246b97a2 SHA512 cb9ab75f69ca886c7b0579dd293e4c4b4279eac21f4301ad0299e55b27d998d59f7b9444916d306939e6c7f4603a8267aecd3dc0ab3efc41175659886e399b0d
-EBUILD evoluspencil-2.0.5.ebuild 934 BLAKE2B 200506c6fdd4b6e777500137d5c8075218a0f868253d70adfa3583db86a2886ce2204f178e29497b11c18ef8088474cc143bd90950f076e14af225c64ce0d394 SHA512 160de1770f26f0e46f114b91085c5d64230f9e891433e7f3c3f2e1cce9cc81ff6322eb95655d56d374a9235f673c06688b503ce5a31473e39dc00cce65104c66
-EBUILD evoluspencil-3.0.4.ebuild 1216 BLAKE2B 91c080c45f211a34018cc0e34903e8c61b68e4304d9883be8409a1991b72f948a673ec0a1934344c380f1f9aac184665cf578467dff31ebc7ae4f3424c637bfb SHA512 0ca218bce93d22612f9de46187395dd23775e651d3cd1b7646b48adb3bc42f275ad87dcd65947572443c86f58d29e3f1401ee1d0448539488eafb80180e74711
+EBUILD evoluspencil-3.0.4.ebuild 1214 BLAKE2B e1f6e703f422d56b9e8c7c88d5c92be1d31fd9f52e7a5693032169030684787066118bf78eee2887f26085cd491e0e1d33f1220bcd7827a4b3181c869251a505 SHA512 5171bedc17afcb591a5321766c676508ddc82525c54cfe036857bf3a9a368e49936042da78c6ffe74dcdbb56d4214f60f4daf7ead62399e6c25a8c468bc8991a
MISC metadata.xml 299 BLAKE2B 219ec05cbf4172c1097e96d59b6e6cee44ea19ebe827440b53493c1953bebe7c5a3f017b6d2ef0bb5300a3d9cd957e683461c4f3edc8bc4d17603c7d78ed59d9 SHA512 be27e090213278995ed73b5b85ef663921136f999def3608d1fdf79bd6537ba38d2424f204e228aa498fa85a2e327633c63b6ca01dae330cc37c4f6832ff861b
diff --git a/media-gfx/evoluspencil/evoluspencil-2.0.5.ebuild b/media-gfx/evoluspencil/evoluspencil-2.0.5.ebuild
deleted file mode 100644
index 9fd30e8fefa0..000000000000
--- a/media-gfx/evoluspencil/evoluspencil-2.0.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MY_P="pencil-${PV}"
-
-inherit fdo-mime
-
-DESCRIPTION="A simple GUI prototyping tool to create mockups"
-HOMEPAGE="http://pencil.evolus.vn/"
-SRC_URI="https://dev.gentoo.org/~kensington/distfiles/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="|| ( www-client/firefox www-client/firefox-bin )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- # avoid file collisions with media-gfx/pencil
- mv usr/bin/{pencil,${PN}} || die
- mv usr/share/{pencil,${PN}} || die
- mv usr/share/applications/{pencil,${PN}}.desktop || die
-
- sed -e "s/pencil/${PN}/" -i usr/bin/${PN} \
- -i usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
- insinto /
- doins -r usr
- newbin "${FILESDIR}"/launcher ${PN}
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
-}
diff --git a/media-gfx/evoluspencil/evoluspencil-3.0.4.ebuild b/media-gfx/evoluspencil/evoluspencil-3.0.4.ebuild
index 1b767001a144..10668457f52f 100644
--- a/media-gfx/evoluspencil/evoluspencil-3.0.4.ebuild
+++ b/media-gfx/evoluspencil/evoluspencil-3.0.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://pencil.evolus.vn/dl/V${PV}/${MY_PN^}-${PV}-49.x86_64.rpm -> ${P
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
dev-libs/atk
diff --git a/media-gfx/evoluspencil/files/launcher b/media-gfx/evoluspencil/files/launcher
deleted file mode 100644
index 4ac04e8c8c82..000000000000
--- a/media-gfx/evoluspencil/files/launcher
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ -x /usr/bin/firefox ] ; then
- /usr/bin/firefox --app "/usr/share/evoluspencil/application.ini"
-elif [ -x /usr/bin/firefox-bin ] ; then
- /usr/bin/firefox-bin --app "/usr/share/evoluspencil/application.ini"
-else
- echo Could not execute required /usr/bin/firefox or /usr/bin/firefox-bin
-fi
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index a65aca32b15d..eb77944e401d 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,6 +1,3 @@
-AUX exiv2-0.27.0-doc.patch 1024 BLAKE2B 102557142367e36a3632c8c742e35aa820bed92b2688e7b2fc575e6bc2cc18f79c23f5492f3486146cab639c90afd0ebedd53f9807d6db0ebfc77330df28425b SHA512 4e0ad52ecfc7c23ff59b97f165ec35d721a4395357983eaa7e7913387594cf6bae354e48e9b95652fb192b2d6044ecc931228cb2e6d225605adce5165fd81687
-AUX exiv2-0.27.0-fix-pkgconfig.patch 710 BLAKE2B eb4952dc49f3a464ee2041c19de9dee404197814086bef869d99d30acb3a0eb13faa716472926c69dc0b44bdcd8d60494aa06855d9eec183fe4920e728f33cfe SHA512 2eb56a1641efbdb5abb6ed62259850f4cc9630d60c213782fc1cf44a705ca9d0fbde22eb6503c9a06dafcaf4eced4d21704442626b6e8b082457de31ae49fcf8
-AUX exiv2-0.27.0-png-broken-icc-profile.patch 1699 BLAKE2B e9d019d3d885198e9945a387325435618f200dcac5a70cc96a6151f9ba8036609162fd93a7857cb8677bb7c1d3fe250f9750b8d7e660f34e31e50e3bc15e71a1 SHA512 8cb9b1f4129161861aee384e634433e3fa82aa933804d5f63de95475f6f6658f7b2f63fca1da624ea7b634f71cde5ee0de7e0466247d687494383d001df92ace
DIST exiv2-0.27.2-Source.tar.gz 27591236 BLAKE2B bd10d71356e4c8a465b71f8ceac07fbf2fd6cfb287cb22774568ad35eb38200be504e297224920af50a15ab4e9da98384ff4da7c33713f5346b33738380698b0 SHA512 39eb7d920dce18b275ac66f4766c7c73f7c72ee10e3e1e43d84c611b24f48ce20a70eac6d53948914e93242a25b8b52cc4bc760ee611ddcd77481306c1f9e721
EBUILD exiv2-0.27.2.ebuild 2441 BLAKE2B 9a856017ab543f6b2792ebb8bb1e633954c2db0197f19065999bf9b0dbbc1b8d845fe69845fa67e339662203e8dd53f9a1866d7b42262fe6f61629dd0c257f3a SHA512 4fcc8ae7c8ee1fa0359483d0ad3a701b519acbd8511bcd81af916bce9b6a68b3cb26900d52cd0ef87628aaa145091968746b0f08211f704b69bb871b3a12110a
MISC metadata.xml 612 BLAKE2B f98a074e9e3a4411baf8255cd8cab5be4257469463634218b664bb9e7f159c98615f0721bb4463c6183cecc8b2be00c34a031e7b99d745b9807634cbaab8d479 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5
diff --git a/media-gfx/exiv2/files/exiv2-0.27.0-doc.patch b/media-gfx/exiv2/files/exiv2-0.27.0-doc.patch
deleted file mode 100644
index a57da03199c4..000000000000
--- a/media-gfx/exiv2/files/exiv2-0.27.0-doc.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f8f63a8b4033549d47384c6e2b1972ae1a2775fc Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Wed, 2 Jan 2019 10:28:57 +0100
-Subject: [PATCH] cmake: Use correct installation dir for generated docs
-
-Fixes #623
-
-Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
----
- cmake/generateDoc.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/generateDoc.cmake b/cmake/generateDoc.cmake
-index a3aea727..16823946 100644
---- a/cmake/generateDoc.cmake
-+++ b/cmake/generateDoc.cmake
-@@ -21,7 +21,7 @@ macro(generate_documentation DOX_CONFIG_FILE)
- set(DOXY_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/doxy.config")
- add_custom_target(doc ${DOXYGEN_EXECUTABLE} ${DOXY_CONFIG})
-
-- install(DIRECTORY "${PROJECT_BINARY_DIR}/doc/html/" DESTINATION "share/doc/lib${PROJECT_NAME}")
-+ install(DIRECTORY "${PROJECT_BINARY_DIR}/doc/html/" DESTINATION ${CMAKE_INSTALL_DOCDIR})
-
- set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
- endmacro()
---
-2.20.1
-
diff --git a/media-gfx/exiv2/files/exiv2-0.27.0-fix-pkgconfig.patch b/media-gfx/exiv2/files/exiv2-0.27.0-fix-pkgconfig.patch
deleted file mode 100644
index 5fc430e915d2..000000000000
--- a/media-gfx/exiv2/files/exiv2-0.27.0-fix-pkgconfig.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e706cca19027dbdf53aeac2041ecce9ccb313c17 Mon Sep 17 00:00:00 2001
-From: Luis Diaz Mas <piponazo@gmail.com>
-Date: Sat, 12 Jan 2019 13:39:12 +0100
-Subject: [PATCH] Fixes in .pc file for being compatible with more
- distributions
-
----
- cmake/exiv2.pc.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/exiv2.pc.in b/cmake/exiv2.pc.in
-index e477696d5..9018472be 100644
---- a/cmake/exiv2.pc.in
-+++ b/cmake/exiv2.pc.in
-@@ -1,7 +1,7 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
--libdir=${prefix}/lib
--includedir=${prefix}/include
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
-
- Name: exiv2
- Description: @PROJECT_DESCRIPTION@
diff --git a/media-gfx/exiv2/files/exiv2-0.27.0-png-broken-icc-profile.patch b/media-gfx/exiv2/files/exiv2-0.27.0-png-broken-icc-profile.patch
deleted file mode 100644
index ae0a0ee30dce..000000000000
--- a/media-gfx/exiv2/files/exiv2-0.27.0-png-broken-icc-profile.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/src/pngimage.cpp b/src/pngimage.cpp
-index 90844d09..b5b0cd24 100644
---- a/src/pngimage.cpp
-+++ b/src/pngimage.cpp
-@@ -501,7 +501,20 @@ namespace Exiv2 {
- }
- else if (!memcmp(cheaderBuf.pData_ + 4, "iCCP", 4))
- {
-- zlibToDataBuf(cdataBuf.pData_ +12+1,dataOffset-13,iccProfile_); // +1 = 'compressed' flag
-+ // The ICC profile name can vary from 1-79 characters.
-+ uint32_t iccOffset = 0;
-+ while (iccOffset < 80 && iccOffset < dataOffset) {
-+
-+ const byte* profileName = cdataBuf.pData_ + iccOffset;
-+ ++iccOffset;
-+
-+ if (*profileName == 0x00)
-+ break;
-+ }
-+
-+ ++iccOffset; // +1 = 'compressed' flag
-+
-+ zlibToDataBuf(cdataBuf.pData_ +iccOffset,dataOffset-iccOffset,iccProfile_);
- #ifdef DEBUG
- std::cout << "Exiv2::PngImage::readMetadata: Found iCCP chunk length: " << dataOffset << std::endl;
- std::cout << "Exiv2::PngImage::readMetadata: iccProfile.size_ : " << iccProfile_.size_ << std::endl;
-@@ -662,6 +675,7 @@ namespace Exiv2 {
-
- // calculate CRC
- uLong tmp = crc32(0L, Z_NULL, 0);
-+ tmp = crc32(tmp, (const Bytef*)type ,typeLen);
- tmp = crc32(tmp, (const Bytef*)header ,headerLen);
- tmp = crc32(tmp, (const Bytef*)compressed.pData_,compressed.size_);
- byte crc[4];
diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest
index 4eb9d5111ef0..86d0ec41eec4 100644
--- a/media-gfx/fbida/Manifest
+++ b/media-gfx/fbida/Manifest
@@ -7,8 +7,8 @@ DIST fbida-2.12.tar.gz 294842 BLAKE2B f9de5957f9015e022868d2b14d0269951fccbe8f10
DIST fbida-2.13.tar.gz 296020 BLAKE2B 119be4103b53ab7e7d1791a22172e1311ced0db5e9c928faf22ab08dbe1670c91d30f7dafbf8873a9621c16a7902354f5e21e2a86d45c9572b30fe8e205bfc4d SHA512 a316776f381fac6ec6a5d085ece7a42e8e34b2c0f5ae1cc58ad5b5736dc83d8f2e7776779716abfc0ae9c51baacdf911df6a0be610d2b7b2e3ce6d0c81e1fdc3
DIST fbida-2.14.tar.gz 296826 BLAKE2B 0015b426c5deaf72737a52bddb065e7d0cb804ea97157dded522061d8fabb5c632d5e66b1ef1b4e75b355537ef4f4e603f3a877e2ef92d1581eaa4791ab5be99 SHA512 8f3596ad8a22497880ac698d3b324e038ac5ccae7481fe4a902fc6e8bf43ba1bb3a96af8c7a3347bea86c1988f35674e2647901ac256bd4e8261d467a6a343ec
DIST ida.png.bz2 11928 BLAKE2B 8a1c89fc5adfb16c69f9591a299beb62c84d66960b586fbc819e53f904c90beef821ecf3539236563644c28e3ad3c7dbf861b140c820be649305a658b3613433 SHA512 cf3c1bc8d25fe75f10c0a0414b5c082348df2fa94864ec4537c36e0b357cf35b68e2eca205bbf48578a41c27317701aee621c6dd176e0bf3857c52f895d6bfd3
-EBUILD fbida-2.12.ebuild 2413 BLAKE2B a13d6907d2363749e807b1d18a07ddb43bd0f0fe58f44226bb33a6a0b5fbbcb8fdd3508e49714043ae95d02c7e52ac9a5a93d3403aadcd50aaaae69f3674ecaf SHA512 a90449e66ffb678b4eee8013dc634db4e3cb1a933405aa6c6ba0dbe1ff5cbe4df49ebab421ce3e175160fe2f9617a2dc6a7ec3f5f213f38082f9727e47fa53e0
-EBUILD fbida-2.13-r1.ebuild 2396 BLAKE2B 426cfd4ba38a58edb391a4985f37d4e58d018e575b0a128c3506cc7835e5f2a7ca967482e53a9c71139d929ba80bc5d407c55d5ab3f2cd221e489ec3555dfb08 SHA512 163007a96ada9fbbc6937e82a53de1c7dc7d07b20faf68e3b2bfd94baef32541ecf6fa4deb8dc213200e767823950f0625da03c0c058a282e31246481b9ed71c
-EBUILD fbida-2.14.ebuild 2349 BLAKE2B be5d3538f93d23fd806f9a6488e13156907341cb93dad8a180d02bedf1986d6093d76ec55d4fc7a06fe0e60cb14f0638941b893edc592e2d7680f27c537d7e1e SHA512 18228be236b992885dbf5b9d04289cc36a2d8b348319b24735f9868cb0038cafeee508d87fa5a50c33c433a8c3b8c68ac1ebf28b0a8727336ec023762a38cd18
-EBUILD fbida-9999.ebuild 1233 BLAKE2B 56c7622721eee293c0ae8a87339ddc82bd4481ebaa7e79fb5801f4b5d1c0d7e097e6a66b7579495ceba6c771c81abcb01bb198d55cc5d5dce8aa08fb23254d6f SHA512 599f6af792c45c9f819d319f5d13232c4e9a793fa0d770742e1750c2a091c0e2a6054ff802c0d2640c7279e79be243139f1df4137662f5fad8fab0a723e96d7b
+EBUILD fbida-2.12.ebuild 2419 BLAKE2B a13946e0fa612c070e4478993bbe2679a0acf306eb328a707ccd8c75bec82f3f8f3ebb1172a0a33ad20c0f6197f65c0487a91e9c6e2fe12aaecde5e104ca379f SHA512 0ce6c45ca0cac7576dbd78187715570c2675aa3e974134fccc79b55f1ffb50d28fedd406bcd667fd30b8f48d7c6951f09d105b05f626f337f4897358f8b0868e
+EBUILD fbida-2.13-r1.ebuild 2402 BLAKE2B 22a7d44291b990a24e6fe92bf3cf7e210d9854af92c7bae76ac343dd975f41a5e1e790623abce9a29190120123a2d09bc963564f69cef084762e26a513a6c594 SHA512 de8c0bd27773aa0e33f155ed80e16c1cd6387a60cc5260472460e996d636efa58cabf38831f41c45a64c2473b6cfa111b9f47974457a5d0f5da9e57813d03c7f
+EBUILD fbida-2.14.ebuild 2355 BLAKE2B fdae71cabb570115f0898a00f60c6c7edd6913861c7108990dc62d8f3931bbfe621b7776362354dd456e6d5cc58fccd6a2a294a4430f9bf76cd1ebe3cf8c71bf SHA512 1acf426bf24d070b8207a8196871566dab72ebc49464b6a26a6afdb31d1f81b867969a11d53ef2e0bc129565694d0f8662a82233b4e059f731e866e44c0227b3
+EBUILD fbida-9999.ebuild 1239 BLAKE2B 78ae23ef4d8f11b72f9c426a35bbcb8d10cc4f2b566c7e13855e631c07d3cf05746c33cac3bd5c48028b1710b10f51f3af3db96fe09978906b460bc40ae2be29 SHA512 2c8aaa0ff740002b3b2b8c4f6de05f9e356d9848fbaf03b30cffa1a492580676494ef9aa2f67410d8f6982180b20c69ba9d96a847f4a8229a3a4a00458400db4
MISC metadata.xml 439 BLAKE2B 66a897b749b63e389153a97d84be2d4cf7e9c06c0b967ae715bd8202e038005ee724110d7d62ff99ef6ba21c8a365634f9350fc43e7dce44c81717cdeee85c54 SHA512 078e39413b3d63c3324c1f98e83b1b9747f2653108e34986dfc869cc3b65452d1b85ecefdaab17c0c53bd50cdb879f68c8b55a9da7d0cdee47ca329af10eec58
diff --git a/media-gfx/fbida/fbida-2.12.ebuild b/media-gfx/fbida/fbida-2.12.ebuild
index 60d4488e76c1..1a827276e2e1 100644
--- a/media-gfx/fbida/fbida-2.12.ebuild
+++ b/media-gfx/fbida/fbida-2.12.ebuild
@@ -25,7 +25,7 @@ CDEPEND="
>=media-libs/freetype-2.0
media-libs/libepoxy
media-libs/libexif
- media-libs/mesa
+ media-libs/mesa[X(+)]
virtual/jpeg:*
virtual/ttf-fonts
x11-libs/cairo[opengl]
diff --git a/media-gfx/fbida/fbida-2.13-r1.ebuild b/media-gfx/fbida/fbida-2.13-r1.ebuild
index d61d08b86254..64860913dbe4 100644
--- a/media-gfx/fbida/fbida-2.13-r1.ebuild
+++ b/media-gfx/fbida/fbida-2.13-r1.ebuild
@@ -25,7 +25,7 @@ CDEPEND="
>=media-libs/freetype-2.0
media-libs/libepoxy
media-libs/libexif
- media-libs/mesa
+ media-libs/mesa[X(+)]
virtual/jpeg:*
virtual/ttf-fonts
x11-libs/cairo[opengl]
diff --git a/media-gfx/fbida/fbida-2.14.ebuild b/media-gfx/fbida/fbida-2.14.ebuild
index 2783b914577e..7f663d4f3424 100644
--- a/media-gfx/fbida/fbida-2.14.ebuild
+++ b/media-gfx/fbida/fbida-2.14.ebuild
@@ -25,7 +25,7 @@ CDEPEND="
>=media-libs/freetype-2.0
media-libs/libepoxy
media-libs/libexif
- media-libs/mesa
+ media-libs/mesa[X(+)]
virtual/jpeg:*
virtual/ttf-fonts
x11-libs/cairo[opengl]
diff --git a/media-gfx/fbida/fbida-9999.ebuild b/media-gfx/fbida/fbida-9999.ebuild
index b1a1c6b1f620..417d2d86c1b6 100644
--- a/media-gfx/fbida/fbida-9999.ebuild
+++ b/media-gfx/fbida/fbida-9999.ebuild
@@ -24,7 +24,7 @@ CDEPEND="
media-libs/libexif
media-libs/libpng:*
media-libs/libwebp
- media-libs/mesa
+ media-libs/mesa[X(+)]
media-libs/tiff:*
net-misc/curl
virtual/jpeg:*
diff --git a/media-gfx/gnome-font-viewer/Manifest b/media-gfx/gnome-font-viewer/Manifest
index 21624e11ccbb..361e31a3e839 100644
--- a/media-gfx/gnome-font-viewer/Manifest
+++ b/media-gfx/gnome-font-viewer/Manifest
@@ -1,3 +1,3 @@
DIST gnome-font-viewer-3.30.0.tar.xz 139076 BLAKE2B 0c84b4e8550df6689f69da1f8b968d436721ba3a9cd97fd7f8f71ad7316af8146d368b65b0702bb7c25c4fd210cf8fb9634620b129505cb3f4f78e3e450c3718 SHA512 9ba3dffdd0152c9a1380b39f4f96de7e7d0281c675c0821d4c0be27b7aab9f23d3ca7497b70dcf47807be5cc7fcf252877e5cd0009f6cf1ec231d429477fe600
-EBUILD gnome-font-viewer-3.30.0.ebuild 668 BLAKE2B 86e474960a13944b1f003d94f032e0ce4c05ce4b53435cb8ec5271ed4a5815139808b76bc13d8fe19d85e1cfa6f009e322184ef68713bfeabb31bd24caad54dc SHA512 fbf8bf2a980ec5f5adb1be12253a3f3e04dcff2e67154032bdbe2826fccc02d5b3d10769109ca552316aa211c4d674650f1dca725b3802a468cebb5c3720a6f8
+EBUILD gnome-font-viewer-3.30.0.ebuild 675 BLAKE2B f9c9253d13c10402e288e790a2eb4d47079d4e112ec05ebe8bbb9f746d0135a240acc8b6e5ae5f254f6c43de670cfdfb6537a0ef76e81f940d6b78ed52461f86 SHA512 bc995c5d6faf2f55932d38be8fd02fa7b25d10cad0df7728c930a324258936de8426594691228f61e94b9177cd1646f55ba4eafff6e80ca23fa0dbee29bb89e4
MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.30.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.30.0.ebuild
index 5765b8624172..ffa6608c1d36 100644
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.30.0.ebuild
+++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.30.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-font-viewer"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
RDEPEND="
>=dev-libs/glib-2.35.1:2
diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest
index 5ba8cfe0f93e..a6f7fce9423b 100644
--- a/media-gfx/gnome-photos/Manifest
+++ b/media-gfx/gnome-photos/Manifest
@@ -1,3 +1,3 @@
DIST gnome-photos-3.30.1.tar.xz 1118728 BLAKE2B b3de35fb9c2ae7b731cf76a7b02b689997e3cf063037c49a51dbdf8bb37d9217c9bd5380bc872b984eca4e53c5996eb6370f3acc82a90e56dabe9d47999d5578 SHA512 4fa386c3d93f2b15468601e56bfcbdcc83a9e78ed5c4d0a1e51e9adf4ba313bb69e07aae52404026546dd68584e355c5e5100fc12f95fe078ccf2d6160a0a24b
-EBUILD gnome-photos-3.30.1-r1.ebuild 1942 BLAKE2B 2c206fea9e07bf866d6f889ac7ec07446b3b2e5dfbd309b647c9e411024fe15616e71efc1e029430815008bf12b00da815b83c4474bc687678571acf9cbe573a SHA512 158679fedb344ad0aa2e47e2148f7dba912e1ff420d725c4b73604bdcebf7472a51631040a92b6e6c249e42aef6dd64b8b402e9e2604f2a910b38ff2f251385f
+EBUILD gnome-photos-3.30.1-r1.ebuild 1949 BLAKE2B 8f5589d46c9d807dd7855e65b04309cd9bcfd85d80fb2d203f7ea7ccabb83e0e9467037ad53fcead3adebd731fedc854325b146994e715ec3df4007ae69511ae SHA512 dbb23890e3d1e3f31cbbecc524322d5c7840fded647ce281d763a9af126aeecefb46d1890bdb262c26446aa44875fc08cef9b6ead727dacfe399633e3a7e7164
MISC metadata.xml 992 BLAKE2B beda29ca65d25e5d68c014fbb70fb539cf17b55d64255d6d74305d710f3979b5156eda764d75992f057416f5eb96af899b988633dd8444fcf22c6a5f73fe9b9b SHA512 3c47be6c01072a0b4845dd42b6d3561d340eb703bd9cb5c727ec24b653ab76eee38e35ba63c4cd71b93514ab0cb8bd75663febeed1901cccedfd30f223e870df
diff --git a/media-gfx/gnome-photos/gnome-photos-3.30.1-r1.ebuild b/media-gfx/gnome-photos/gnome-photos-3.30.1-r1.ebuild
index fbe6be92bed9..7d25df358979 100644
--- a/media-gfx/gnome-photos/gnome-photos-3.30.1-r1.ebuild
+++ b/media-gfx/gnome-photos/gnome-photos-3.30.1-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
LICENSE="GPL-3+ LGPL-2+ CC0-1.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="flickr test upnp-av"
COMMON_DEPEND="
diff --git a/media-gfx/gnome-screenshot/Manifest b/media-gfx/gnome-screenshot/Manifest
index 378f1096bd5f..3d3ec18f3d3a 100644
--- a/media-gfx/gnome-screenshot/Manifest
+++ b/media-gfx/gnome-screenshot/Manifest
@@ -1,3 +1,3 @@
DIST gnome-screenshot-3.30.0.tar.xz 225244 BLAKE2B 69c75bb8e3d18578317343b549d4ad837b6e58420c6b49efbc01338697bc2251032d9158e658c9f4ae4e086a1c117eac818c18b6ed95d031c2b60c2ba62a56b6 SHA512 a42ff4f14bbb3a3feb438ee64f1dff3d3a792a6585fef92fde8546b9c3fc07013e8bd2ef42ddc880f2529cbc4241a50d441d4de2a4b26923036f1724aabafdba
-EBUILD gnome-screenshot-3.30.0.ebuild 1239 BLAKE2B a5c9c78fdc5bc13f32dafee5bb2a8f62a52865c9eda3eb2f0de34548b32a0a88836b36e481b0b8b3fa94c23abcbe2e0d2add7f529d91e8cc098866ecfeed01c4 SHA512 3d0e8916c5c447cab2b5bb78c2dfae89aa01dfddafe5f02c5b0d52128c209948e7e84479a73dedfab62f42ca1ac2f2510044a0ec790ab6ec20ee5b77b4393912
+EBUILD gnome-screenshot-3.30.0.ebuild 1246 BLAKE2B 68e9f5b62661e94eea246b85fffbe14e5695832af0f7cba59ebe08d6edccf39cc73234abac37c3585d0c68822d61eb0659b13364ee45d5c33fd50fdac34384a9 SHA512 f9cb864d02e8971ded0e22b9d1a937bb3486813fa3a1d93fb2616b4f05c023a36ae05e98999a605c9278345332266efd405752f7f8a8e393f4d88c7738392d36
MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.30.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.30.0.ebuild
index 065ab6f6f7b0..9147493f82aa 100644
--- a/media-gfx/gnome-screenshot/gnome-screenshot-3.30.0.ebuild
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-3.30.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-screenshot"
LICENSE="GPL-2+"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
# libcanberra 0.26-r2 is needed for gtk+:3 fixes
COMMON_DEPEND="
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index 39cb62100591..17fd156e0e8a 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -1,4 +1,4 @@
AUX gthumb-3.6.2-exiv2-0.27.patch 1004 BLAKE2B e351a67d8fbbfd0c13b26ca575a34528ef29f6d6b2a7ede9b0f16a5835f502bf24e8415f597146abde875e5dbd93fd1fec126a6bbb27d4b0f9881fe9c823ceb5 SHA512 e6f4549526d745d7fa0f42175508be7f6b5ffc9258a5b59a31f45e8c095870b13a0da55c50635723abe6235cf983b7730677906bbb16acf99e58447cc72d8c3d
DIST gthumb-3.6.2.tar.xz 3423044 BLAKE2B ff5fd805c07c969f8e50960cdd36df9b3ef9ddedcaca66578416fc4f602fedf4f1698fec54cda77521c88774e8e309b996123ade9a633df1ffc34bb60cef0ff5 SHA512 5fc5cc43b16b51438403fbb986286d5e66575162be7b4cf35931dd0c41273933f78c210aaf2379e0a2574df6f7f7b2d532d87ce37fbc6369b65331bac338a454
EBUILD gthumb-3.6.2.ebuild 2654 BLAKE2B 3f89993297e713e9b50875763ed9623bfbf740ffcfb43562ff119e494394d3f91443d1b5aae47d2c35148bd33a28ea1c7f8dfcc909c2d822f4ef43899477386f SHA512 003160b92864d1410cdc813d825e2ef32e496fccd8692494fd7bf53e48aaaedc2ccf3762236b29f2c7c31bec095b73ba6f7c4179005701eff2b923a2feea38da
-MISC metadata.xml 573 BLAKE2B 889924db658e5280c09c581c76fe0d90d7306a454f0ad462131d87164cc4791a0002f17a2eb191c11f61959d93539d4ea5dd22b66d8879ceee259f30e0a268c8 SHA512 e9daac77f6276d354005dc123ba92053139c264a19dedbf4b79b6d3df7aea00e95330bb182b960d2606a65f6c8d68e19e82cb699999b9ede4fad1dd8cbaab16e
+MISC metadata.xml 492 BLAKE2B 62ee03ca8c249d8ba7d9e6516ca44677ef14a84bd6c9f9d12e245fc053e5b76215e9f5db346e06b364552c911ab9b9ca63598da5098e89fbb2c6011f8e2b4f03 SHA512 f75dcc1e5ffc912b3e3d69335f98f7bd38af5d46de10cae326ef5569a4511a022fa1bfe6964fb8e5e4883dc09cbfcb5f7e58160ad4864ef1fe1cca1d8b66172d
diff --git a/media-gfx/gthumb/metadata.xml b/media-gfx/gthumb/metadata.xml
index 48b98345a820..0ba6dde6a358 100644
--- a/media-gfx/gthumb/metadata.xml
+++ b/media-gfx/gthumb/metadata.xml
@@ -6,7 +6,6 @@
<name>Gentoo GNOME Desktop</name>
</maintainer>
<use>
- <flag name="colord">Use <pkg>x11-misc/colord</pkg> for color management</flag>
<flag name="http">Enable webservice integration through <pkg>net-libs/libsoup</pkg></flag>
<flag name="json">Compile code that uses the libjson-glib library</flag>
<flag name="slideshow">Enable slideshow plugin</flag>
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index f962f5f8316f..30eff8c38195 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,12 +1,12 @@
AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
-DIST ImageMagick-6.9.10-50.tar.xz 8941584 BLAKE2B dcbbe4b0c25c281168088dd5b62a9d882088b9b57fc4127c6d233b049011ae3ede43e2629734fbd1ae2b21cd13f64690e6f6a3ea81a1e08736fbc1a29a5bccf9 SHA512 f288eb8ce40aafb3d099ae5ec10403902934d02440256ed2012f0b13456b237c3a903f92764b02378c27005fd65ad1251ff1663fce825890721fa93b18ad515d
DIST ImageMagick-6.9.10-56.tar.xz 8950748 BLAKE2B 5d1b4ad20ec3aa6f89aedf08ac91266be218464cd998ca950623c1a23954968f84b21bfc140c1a1dfdcd68c8420ddcd39f76cd31d3872d43bf631b5782980665 SHA512 e5d1dd4da8b361858ff2d7a4c7956280bd55053022c7b0ad27fac4a70e9d2cafb75299e7970e1b2091b83b3bedd2355d5752e9bff6999f9272619a92a8892c0f
-DIST ImageMagick-7.0.8-50.tar.xz 9453076 BLAKE2B a137fb353d32ce6914b5033ea4c02bc81cb1eb82c1dbb6d449f20e19b23ec1eeef628e27c497cb9eb5e7a23f9d4f9f2152e3c6e64dfb5c6f793358c174286e27 SHA512 78cee7463610b256b899cc9474924cefe2dc36ab238025c54688563c3e1aa4b86ebc739f22fb349ab8914b7ac0dc6c5073cca168b9cfc371fb4bbd7e3f51cfbc
+DIST ImageMagick-6.9.10-60.tar.xz 8939576 BLAKE2B a4b493838da9bfa183f55d19d9643dcd83fe533884b28d579b9586357af7d3ffba16f88e73ed42658a3b41ac47de9ebf7a7ddbefc0339bd90338a1f32dbd96a7 SHA512 cd34014322bd48b02d3680564756db58292fabd5487a187bb3913ec9f5ffd0b990a112a145a9be544cfc334cb917232683cdafc815baee85638a95a9a89f4604
DIST ImageMagick-7.0.8-56.tar.xz 9465124 BLAKE2B c31c66ae84e9bb91fc744673c07d12300a5e5a07729eaee9654e988efc46cc9d5321e6906325fe9fcfbeb81785a74a52e6059d2983c280b86d0ad305c0818b9d SHA512 22651b0f5b0b0821b7ae74a10671590d8ecfddcc95b60bf056ef7a7cbeab37beedaf49d0bcf97cb0ac2f1ec564192c15c7820c9593db965b4b192338abdaf5dc
-EBUILD imagemagick-6.9.10.50.ebuild 6883 BLAKE2B 1f0a8acce9f7c79171822ba87d131aa0457f1d9afa6621a29972b77958f9abc6150b8ce756065e9e51b2c399c78115393ab04c56b35074c2ff42cddb00f95c15 SHA512 b96f189b6b59ce49628ddc311fef7a7c21c8e81aa268b4958a71b832ecc329c6ce0ffd858f9b0d036c3f5d3de43926d2d2486c0313177362278b999b2ea91fa8
-EBUILD imagemagick-6.9.10.56.ebuild 6892 BLAKE2B 9a7579489c9e2ccd38b3ae9f91393680f13ebe29745ee90fef5e8a72059a731da47a8d8f0394621baf2261d9e848166783738c3fd881372630ce8bb82fd67de8 SHA512 83f54f846c25d858c8a093f5058b764690c1b15d69c09519ee492f0ec4d13555c191991f241fe75a5438fd421d6bc036b655d8d0febfba575897db979cd157bf
-EBUILD imagemagick-7.0.8.50.ebuild 7150 BLAKE2B 52a9342ec82c516f5bc3339c4f41f016448950bc7dd486babdc57d1a62ecc005dd0937073ebad7a4e170f050c11ed7ca4dca9ce39cd18d6498807259eeea643b SHA512 e9f3ab662260bc535d27a6d7166a52d8e29bd999923fa6995b2ffd3b5161de41e62d9e3774bfbdded2bc447b8c0087ed597a0c6a0a79954e06478d3113418a1f
-EBUILD imagemagick-7.0.8.56.ebuild 7160 BLAKE2B 276ed8dc19455db44ec6a14244f07070e5b9a8a6158e0d06ef2ab0ab4541e607244c216a7ffbaefcf166439edf4a00aab2a5f826a4fc917dade1f710f47b66cb SHA512 5c6f6ce5a3801c56b550c78f8ca5a1a2f812ea39db7fcd9eb65fa6e9130d3035102eef379e9fe5617ec62910ebff039fde9ce9f02eac96a62431d18b5b954245
+DIST ImageMagick-7.0.8-60.tar.xz 9464992 BLAKE2B 26a75c0df77459582b9025612c0f70b30bedf9fee7bdfe5b0083ca9f5a7184d19e849c8a18d3781ed39d1788a17d6b1de608424193c24ec5e11ab9b50bd64874 SHA512 4db1c24942b522cab1ff80c3eb3df7a81cfd2ec7f7f91dcd00b2d4867b2afe5026ffbeacbed83ddb9178448f1ded3dacb34002fc65892704e863794338ba6436
+EBUILD imagemagick-6.9.10.56.ebuild 6883 BLAKE2B 1f0a8acce9f7c79171822ba87d131aa0457f1d9afa6621a29972b77958f9abc6150b8ce756065e9e51b2c399c78115393ab04c56b35074c2ff42cddb00f95c15 SHA512 b96f189b6b59ce49628ddc311fef7a7c21c8e81aa268b4958a71b832ecc329c6ce0ffd858f9b0d036c3f5d3de43926d2d2486c0313177362278b999b2ea91fa8
+EBUILD imagemagick-6.9.10.60.ebuild 6892 BLAKE2B 9a7579489c9e2ccd38b3ae9f91393680f13ebe29745ee90fef5e8a72059a731da47a8d8f0394621baf2261d9e848166783738c3fd881372630ce8bb82fd67de8 SHA512 83f54f846c25d858c8a093f5058b764690c1b15d69c09519ee492f0ec4d13555c191991f241fe75a5438fd421d6bc036b655d8d0febfba575897db979cd157bf
+EBUILD imagemagick-7.0.8.56.ebuild 7150 BLAKE2B 52a9342ec82c516f5bc3339c4f41f016448950bc7dd486babdc57d1a62ecc005dd0937073ebad7a4e170f050c11ed7ca4dca9ce39cd18d6498807259eeea643b SHA512 e9f3ab662260bc535d27a6d7166a52d8e29bd999923fa6995b2ffd3b5161de41e62d9e3774bfbdded2bc447b8c0087ed597a0c6a0a79954e06478d3113418a1f
+EBUILD imagemagick-7.0.8.60.ebuild 7160 BLAKE2B 276ed8dc19455db44ec6a14244f07070e5b9a8a6158e0d06ef2ab0ab4541e607244c216a7ffbaefcf166439edf4a00aab2a5f826a4fc917dade1f710f47b66cb SHA512 5c6f6ce5a3801c56b550c78f8ca5a1a2f812ea39db7fcd9eb65fa6e9130d3035102eef379e9fe5617ec62910ebff039fde9ce9f02eac96a62431d18b5b954245
EBUILD imagemagick-9999.ebuild 7160 BLAKE2B 2435e94755e6e1a9d6ee4cab669b8564daaa06e7c75024463cf5df4f851f695afd2afdfb84930ff8886ceef6bed578365d7489d7febd877064621c4dd541f74b SHA512 c65b9cb286317eafefb96c63984f25850c835a81eb04fe452d8bd22bacded153c460716c06a2f924b7595925ecbb417ea809d737aa291bc174c125d97dc7cbba
MISC metadata.xml 1015 BLAKE2B 3fbe479f30575b11fa9e78de7bb00c231370aa4b2ca3b0e16924710189013ab91199db8c8cb7cff4611a2924c7fa01e4a43bfd9f7f61cfe45a4de3a254d4c8e2 SHA512 bf1479f91de5f8248c4a86d98017a332ab3d5eb153bb896ca1a39fce2fbff4e8248df92025987f6bfaf7e0d36677c167177c9c21969f1f0b8c2e0a53197efece
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.56.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.56.ebuild
index b09291336ccb..b6bca9ea8b20 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.56.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.56.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
LICENSE="imagemagick"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
RESTRICT="perl? ( userpriv )"
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.50.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.60.ebuild
index b6bca9ea8b20..b09291336ccb 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.50.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.60.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
LICENSE="imagemagick"
SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
RESTRICT="perl? ( userpriv )"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.56.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.56.ebuild
index 69c412db11b7..59c2b130c53d 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.8.56.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.56.ebuild
@@ -13,7 +13,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.50.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.60.ebuild
index 59c2b130c53d..69c412db11b7 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.8.50.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.60.ebuild
@@ -13,7 +13,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 44465f69709e..65c8b25c4f86 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -3,7 +3,7 @@ AUX krita-4.1.8-fix-pre-5.12-tablet-support.patch 1794 BLAKE2B d67cfe9a758e26416
AUX krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch 1591 BLAKE2B d11c8b3a7f5a70c40fe5c0f19bcb06c9a2b047e651a27ce3de9e8ecc41287171b50566b481a8ca49b7625aae1ffd0db0a507b1ad7928b6c959de15ec7b7c2dc5 SHA512 3d1d9c09abb2b72d6d7ef5061e7fdb4ca98a4d7f7d1356833fa518da6bce52f9959532f0417b7e30a305ef052acc59dd2b27ef71e1de5fa138fe4f107528517a
AUX krita-4.2.4-tests-optional.patch 12292 BLAKE2B a30463dcc6e02e877b308c4add529f0657d96ace7a13ba7424f4cdf260f3b636d03b2bac224d6239253393650163b622ac54d8d81bbdced2fb153bf216b5fb2d SHA512 1d5045b35981822bc16c4b23e573a299a8325353c8be347c56a4e2fc4e3cd9e937e8eb253f9c6cdc0197a3db7989b822fb41274afe3cd506b9c907daf1867df3
DIST krita-4.1.8.tar.gz 244065767 BLAKE2B ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157 SHA512 d027444415bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
-DIST krita-4.2.4.tar.gz 246227960 BLAKE2B 94513a835526ee79c0747ed8c6004666b549d7070c02ad82800555282f319e5aa4dc1f35dafc6b4179284b244c8c80367b453548f5c8cd585154259a0512222a SHA512 c778653f8e72724d16322405fffdff5b82418c5a19021ccbada6a15389afd58f9d9017bc562eb5d91b0d4e10587bca1e616fc7ecc9ec7dbf82fae5247b81ea5e
+DIST krita-4.2.5.tar.xz 170060232 BLAKE2B fba124653edad23826fd6d4d932cb1ea4c63450d460bebf2b2e2d9167e437331a31d76b19d57d9f15f603195c0eea367463ea6d9e610e74d0844bb80d21f0741 SHA512 5134c0a889cb039c5253759965acfba5cef0c431e8230236c1288e0253628feba52a493eaa42c93adb1716014c17818232294c1c90ade760ad89940833599d9e
EBUILD krita-4.1.8-r1.ebuild 3390 BLAKE2B 4cb6c211221e5a0e13ce674b7a10c984539a5e5f529a533d6e56f1facfe591e7d1b57707a84c8d87266221cb5445ad7fd15b57954d3a67b114c46c90329730a8 SHA512 14e135e8d6451489127ca1653179de82d7460d182ad6a18bd4fbabd81d16851fcaa783d06be2bbc8cef9ea435f90f5a3f799cf87a338888188acb26ee9b3564a
-EBUILD krita-4.2.4.ebuild 3127 BLAKE2B 559b3bb5a826cfc5e726c707c373bea713f7d89f811b373e53972782d436528974803957503e76197a2fb94526a3ae0ba6812017341aa81c3c65e80027a926d4 SHA512 f213a2a2b76c6374f550fbf933fa0317a11de9e94a1a522e9dadca8b345c1d3c92059dc77dc923ce6093c1cb96968036298cdfe46e5496233f959f57177aac29
+EBUILD krita-4.2.5.ebuild 3134 BLAKE2B 286e53a3758f23f90c0f972158d125779dc91d7d0ad2a552dacaf5447a14321dbaa81a59a6f5a2c263720641b9a146141f9571961db7ba7acc0a79c451f1f35d SHA512 e20075fb679c828347155280315f368faab8aafa5d25d35765ba2516fbcf868e1de54071c185cc7409806e3b39df08e969b0ff35743a8eb2887b3547bffeed26
MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/krita-4.2.4.ebuild b/media-gfx/krita/krita-4.2.5.ebuild
index 62966b4d812b..0cb6e37c9883 100644
--- a/media-gfx/krita/krita-4.2.4.ebuild
+++ b/media-gfx/krita/krita-4.2.5.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{5,6,7} )
inherit kde5 python-single-r1
if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
KEYWORDS="~amd64 ~x86"
fi
@@ -86,7 +86,7 @@ RDEPEND="${COMMON_DEPEND}
# bug 630508
RESTRICT+=" test"
-PATCHES=( "${FILESDIR}"/${P}-tests-optional.patch )
+PATCHES=( "${FILESDIR}"/${PN}-4.2.4-tests-optional.patch )
pkg_setup() {
python-single-r1_pkg_setup
diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index 5ceaa2897606..a5c54d4794df 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -1,5 +1,7 @@
+AUX librecad-2.1.3-gcc-9.patch 8494 BLAKE2B 85f7cfd7822d27c4b76b6cc9b71f9667b912ef80229e2a70110155d4b52f0e203b186ffb6a0be160d6d2aadcaf241994d7f78d81a096d7540c46b946ed7cb892 SHA512 5adb8086244ec18e78f503b7522ea79213b629d297bb07fad0c21ae1e205731fd544aff7e979f1cc5709542a23311c771d61f13f4ba09f34baff9a24deae5eed
AUX librecad-2.1.3-qt-5.11.patch 1396 BLAKE2B 80e637b724df81dce60c17354bed56a2329dd4c3f445b40ea18a4a49614f2ee34114e1b6cc008b29e2dbd7b65c53340aaa447173f6f4d23d80e1a8809131aae7 SHA512 5e4ae43ac89fc8acf779fec9e062cac3896f0e41b0bf7fdab91ef128ab1a20a4ecda71ef332d9af7403f11a813323cc509e0682e5ffdf97786599271a2711f25
DIST librecad-2.1.3.tar.gz 22415288 BLAKE2B fb920113a7e4b2e9e7e3425f77364c36f6be676a3cd109798786b06d31698fd11437bc7f50cb843ca02d761730e83db7fde475d1bce6a65336a845b5b0114918 SHA512 246cffcc1ea3389997b4a738ab5e3d78e8c1096817ecb1ca28f38d601bc5d1a95f60798ac82308914a34da7b5dbc302b8363cf8b58a97221fdc8ee63010adc6c
EBUILD librecad-2.1.3-r4.ebuild 1102 BLAKE2B 8f9a34ce4d164d741fd9c053a956eb28b289d2287f1a627ac11362b47799390753db65e32ace5b57bd2ad0c9f2b84223f86fd9fd77160c0f85a31915b7041c1b SHA512 907a94b6d98f6dfc49e33d2fcb1611b76cbb5f309b22c4ed5ae51ffaaefab146379b39e42849f7bcc97bb7a0f394e31b6df82bd720537ddc387aeaced110a40b
+EBUILD librecad-2.1.3-r5.ebuild 1132 BLAKE2B 1f2f4506ac904e51304f45ce788d4a1b610419297ea0666b481e6bb7f759777b6ad2dbaf777d17707ebe844fa525e76e2faad4e138883c917f5e1ab2688a7229 SHA512 dd4a522f66341db71ef068212781ce482d79220faa9e554c8f5c6e0ff4e95f754214d6e6e0e69ce0b0e151081750de164807d37d6c3d85a1d9602a50e7b87c98
EBUILD librecad-9999.ebuild 997 BLAKE2B c2f46819e1188ac08ff278385f696c578dac20c707b666d5fe297c2ff19b3f8c37f048e8c3083acacf4f7165378ed5f5de37209b6eff50fd73b8970dd7377b18 SHA512 8e8633998807024c30de31be9eb996b5a6abb1ab416247258e35b1497ea9824b7035556201b3a9c8c546cb3402406344353cfca37ce5d2fbe268bfaafe693b77
MISC metadata.xml 459 BLAKE2B 8b648b5abdd62d9df306c90d182164694c753231b16ad37319863ee37feac91b2e0fcc89212b5259a899287a638a68cb2e48fcc55af8a076d23b201e6b38ebb3 SHA512 108977904dfb070a16279d3306f40982a73b1cdddfa90e8ab22f83c4a75cd620a829fea9a56a0290d2d160b1d30fd0fb67e320f526726dd57a613e781c700b6c
diff --git a/media-gfx/librecad/files/librecad-2.1.3-gcc-9.patch b/media-gfx/librecad/files/librecad-2.1.3-gcc-9.patch
new file mode 100644
index 000000000000..f8214f29fab3
--- /dev/null
+++ b/media-gfx/librecad/files/librecad-2.1.3-gcc-9.patch
@@ -0,0 +1,209 @@
+diff --git a/librecad/src/actions/rs_actiondrawcircletan1_2p.cpp b/librecad/src/actions/rs_actiondrawcircletan1_2p.cpp
+index c14da00e4..f305408aa 100644
+--- a/librecad/src/actions/rs_actiondrawcircletan1_2p.cpp
++++ b/librecad/src/actions/rs_actiondrawcircletan1_2p.cpp
+@@ -36,11 +36,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ #include "rs_preview.h"
+ #include "rs_debug.h"
+
+-namespace{
+-//list of entity types supported by current action
+-auto enTypeList={RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle};
+-}
+-
+ struct RS_ActionDrawCircleTan1_2P::Points {
+ std::vector<RS_Vector> points;
+ RS_CircleData cData;
+diff --git a/librecad/src/actions/rs_actiondrawcircletan1_2p.h b/librecad/src/actions/rs_actiondrawcircletan1_2p.h
+index a6f40a6ea..b5976c9f6 100644
+--- a/librecad/src/actions/rs_actiondrawcircletan1_2p.h
++++ b/librecad/src/actions/rs_actiondrawcircletan1_2p.h
+@@ -79,6 +79,9 @@ class RS_ActionDrawCircleTan1_2P : public RS_PreviewActionInterface {
+ private:
+ struct Points;
+ std::unique_ptr<Points> pPoints;
++
++ //list of entity types supported by current action
++ const std::initializer_list<RS2::EntityType> enTypeList {RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle};
+ };
+
+ #endif
+diff --git a/librecad/src/actions/rs_actiondrawcircletan2.cpp b/librecad/src/actions/rs_actiondrawcircletan2.cpp
+index d0558f05b..820e42266 100644
+--- a/librecad/src/actions/rs_actiondrawcircletan2.cpp
++++ b/librecad/src/actions/rs_actiondrawcircletan2.cpp
+@@ -33,10 +33,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ #include "rs_preview.h"
+ #include "rs_debug.h"
+
+-namespace {
+-auto enTypeList={RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle};
+-}
+-
+ struct RS_ActionDrawCircleTan2::Points {
+ RS_CircleData cData;
+ RS_Vector coord;
+diff --git a/librecad/src/actions/rs_actiondrawcircletan2.h b/librecad/src/actions/rs_actiondrawcircletan2.h
+index bed568970..5b2040e90 100644
+--- a/librecad/src/actions/rs_actiondrawcircletan2.h
++++ b/librecad/src/actions/rs_actiondrawcircletan2.h
+@@ -77,6 +77,9 @@ class RS_ActionDrawCircleTan2 : public RS_PreviewActionInterface {
+ private:
+ struct Points;
+ std::unique_ptr<Points> pPoints;
++
++ //list of entity types supported by current action
++ const std::initializer_list<RS2::EntityType> enTypeList {RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle};
+ };
+
+ #endif
+diff --git a/librecad/src/actions/rs_actiondrawcircletan2_1p.cpp b/librecad/src/actions/rs_actiondrawcircletan2_1p.cpp
+index 324c16686..51cd29a19 100644
+--- a/librecad/src/actions/rs_actiondrawcircletan2_1p.cpp
++++ b/librecad/src/actions/rs_actiondrawcircletan2_1p.cpp
+@@ -35,10 +35,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ #include "rs_preview.h"
+ #include "rs_debug.h"
+
+-namespace {
+-auto enTypeList={RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle};
+-}
+-
+ struct RS_ActionDrawCircleTan2_1P::Points {
+ RS_Vector point;
+ RS_CircleData cData;
+diff --git a/librecad/src/actions/rs_actiondrawcircletan2_1p.h b/librecad/src/actions/rs_actiondrawcircletan2_1p.h
+index 40c239037..e44a56c36 100644
+--- a/librecad/src/actions/rs_actiondrawcircletan2_1p.h
++++ b/librecad/src/actions/rs_actiondrawcircletan2_1p.h
+@@ -73,6 +73,9 @@ class RS_ActionDrawCircleTan2_1P : public RS_PreviewActionInterface {
+ private:
+ struct Points;
+ std::unique_ptr<Points> pPoints;
++
++ //list of entity types supported by current action
++ const std::initializer_list<RS2::EntityType> enTypeList {RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle};
+ };
+
+ #endif
+diff --git a/librecad/src/actions/rs_actiondrawcircletan3.cpp b/librecad/src/actions/rs_actiondrawcircletan3.cpp
+index 026ed30e5..eaca13d63 100644
+--- a/librecad/src/actions/rs_actiondrawcircletan3.cpp
++++ b/librecad/src/actions/rs_actiondrawcircletan3.cpp
+@@ -35,10 +35,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ #include "rs_preview.h"
+ #include "rs_debug.h"
+
+-namespace {
+-auto enTypeList={RS2::EntityArc, RS2::EntityCircle, RS2::EntityLine, RS2::EntityPoint};
+-}
+-
+ struct RS_ActionDrawCircleTan3::Points {
+ std::vector<RS_AtomicEntity*> circles;
+ std::shared_ptr<RS_CircleData> cData{std::make_shared<RS_CircleData>()};
+diff --git a/librecad/src/actions/rs_actiondrawcircletan3.h b/librecad/src/actions/rs_actiondrawcircletan3.h
+index d0cabfa2d..3201c5f88 100644
+--- a/librecad/src/actions/rs_actiondrawcircletan3.h
++++ b/librecad/src/actions/rs_actiondrawcircletan3.h
+@@ -78,6 +78,8 @@ class RS_ActionDrawCircleTan3 : public RS_PreviewActionInterface {
+ struct Points;
+ std::unique_ptr<Points> pPoints;
+
++ //list of entity types supported by current action
++ const std::initializer_list<RS2::EntityType> enTypeList {RS2::EntityArc, RS2::EntityCircle, RS2::EntityLine, RS2::EntityPoint};
+ };
+
+ #endif
+diff --git a/librecad/src/actions/rs_actiondrawlinerelangle.cpp b/librecad/src/actions/rs_actiondrawlinerelangle.cpp
+index 8415dd604..b9ce996fe 100644
+--- a/librecad/src/actions/rs_actiondrawlinerelangle.cpp
++++ b/librecad/src/actions/rs_actiondrawlinerelangle.cpp
+@@ -38,11 +38,6 @@
+ #include "rs_preview.h"
+ #include "rs_debug.h"
+
+-namespace {
+-auto enTypeList={RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle,
+- RS2::EntityEllipse};
+-}
+-
+ RS_ActionDrawLineRelAngle::RS_ActionDrawLineRelAngle(
+ RS_EntityContainer& container,
+ RS_GraphicView& graphicView,
+diff --git a/librecad/src/actions/rs_actiondrawlinerelangle.h b/librecad/src/actions/rs_actiondrawlinerelangle.h
+index 1e102792d..71e5185b7 100644
+--- a/librecad/src/actions/rs_actiondrawlinerelangle.h
++++ b/librecad/src/actions/rs_actiondrawlinerelangle.h
+@@ -110,6 +110,9 @@ class RS_ActionDrawLineRelAngle : public RS_PreviewActionInterface {
+ * Is the angle fixed?
+ */
+ bool fixedAngle;
++
++ //list of entity types supported by current action
++ const std::initializer_list<RS2::EntityType> enTypeList {RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle,RS2::EntityEllipse};
+ };
+
+ #endif
+diff --git a/librecad/src/actions/rs_actiondrawlinetangent1.cpp b/librecad/src/actions/rs_actiondrawlinetangent1.cpp
+index 197b0cb6c..47a93c766 100644
+--- a/librecad/src/actions/rs_actiondrawlinetangent1.cpp
++++ b/librecad/src/actions/rs_actiondrawlinetangent1.cpp
+@@ -36,12 +36,6 @@
+ #include "rs_preview.h"
+ #include "rs_debug.h"
+
+-namespace{
+-auto circleType={RS2::EntityArc, RS2::EntityCircle,
+- RS2::EntityEllipse, RS2::EntitySplinePoints
+- };
+-}
+-
+ RS_ActionDrawLineTangent1::RS_ActionDrawLineTangent1(
+ RS_EntityContainer& container,
+ RS_GraphicView& graphicView)
+diff --git a/librecad/src/actions/rs_actiondrawlinetangent1.h b/librecad/src/actions/rs_actiondrawlinetangent1.h
+index 0f76b3684..d20d302dd 100644
+--- a/librecad/src/actions/rs_actiondrawlinetangent1.h
++++ b/librecad/src/actions/rs_actiondrawlinetangent1.h
+@@ -66,6 +66,12 @@ class RS_ActionDrawLineTangent1 : public RS_PreviewActionInterface {
+ std::unique_ptr<RS_Vector> point;
+ /** Chosen entity */
+ RS_Entity* circle;
++
++ //list of entity types supported by current action
++ const std::initializer_list<RS2::EntityType> circleType { RS2::EntityArc,
++ RS2::EntityCircle,
++ RS2::EntityEllipse,
++ RS2::EntitySplinePoints };
+ };
+
+ #endif
+diff --git a/librecad/src/actions/rs_actiondrawlinetangent2.cpp b/librecad/src/actions/rs_actiondrawlinetangent2.cpp
+index fed3545e0..0f1600e53 100644
+--- a/librecad/src/actions/rs_actiondrawlinetangent2.cpp
++++ b/librecad/src/actions/rs_actiondrawlinetangent2.cpp
+@@ -35,10 +35,6 @@
+ #include "rs_preview.h"
+ #include "rs_debug.h"
+
+-namespace{
+-auto circleType={RS2::EntityArc, RS2::EntityCircle, RS2::EntityEllipse};
+-}
+-
+ RS_ActionDrawLineTangent2::RS_ActionDrawLineTangent2(
+ RS_EntityContainer& container,
+ RS_GraphicView& graphicView)
+diff --git a/librecad/src/actions/rs_actiondrawlinetangent2.h b/librecad/src/actions/rs_actiondrawlinetangent2.h
+index b0d884cd7..95d82465d 100644
+--- a/librecad/src/actions/rs_actiondrawlinetangent2.h
++++ b/librecad/src/actions/rs_actiondrawlinetangent2.h
+@@ -68,6 +68,9 @@ class RS_ActionDrawLineTangent2 : public RS_PreviewActionInterface {
+ /** 2nd chosen entity */
+ RS_Entity* circle2;
+ bool valid;
++
++ //list of entity types supported by current action
++ const std::initializer_list<RS2::EntityType> circleType {RS2::EntityArc, RS2::EntityCircle, RS2::EntityEllipse};
+ };
+
+ #endif
diff --git a/media-gfx/librecad/librecad-2.1.3-r5.ebuild b/media-gfx/librecad/librecad-2.1.3-r5.ebuild
new file mode 100644
index 000000000000..5bb715ffa4ee
--- /dev/null
+++ b/media-gfx/librecad/librecad-2.1.3-r5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop qmake-utils
+
+DESCRIPTION="Generic 2D CAD program"
+HOMEPAGE="https://www.librecad.org/"
+SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="debug doc tools"
+
+RDEPEND="
+ dev-cpp/muParser
+ dev-libs/boost:=
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ media-libs/freetype:2"
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5
+ dev-qt/qthelp:5
+ dev-qt/qtxml:5
+"
+
+S="${WORKDIR}/LibreCAD-${PV}"
+
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" "${FILESDIR}/${P}-gcc-9.patch" )
+
+src_configure() {
+ eqmake5 -r
+}
+
+src_install() {
+ dobin unix/librecad
+ use tools && dobin unix/ttf2lff
+ insinto /usr/share/${PN}
+ doins -r unix/resources/*
+ use doc && docinto html && dodoc -r librecad/support/doc/*
+ insinto /usr/share/appdata
+ doins unix/appdata/librecad.appdata.xml
+ doicon librecad/res/main/${PN}.png
+ make_desktop_entry ${PN} LibreCAD ${PN} Graphics
+}
diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index 9de3a4c23da4..6e674047487d 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,3 +1,4 @@
+AUX nomacs-3.12-gcc9.patch 1098 BLAKE2B 70e4900d2670b9e4ca9f6ae12f4720a0bc25eabdf0ba09729801428cd6f12d5655db15c3ee3a9c2e5c6f5ae5cac6cf77fd6d1730a39ceda8a713a32f989bed8e SHA512 d653c666345f50c83f199aaeec61e4e481124787f5dad53d89ed06f920e0f20beebb4a56e550665c61af3b1718d6fb24092f98b7f0d99e6ab6eb98d5995093be
DIST nomacs-3.12.tar.gz 1736648 BLAKE2B 533e18dec4be5d945213ccd629262a2cbae1eba93599f43be0a98d32d0b54d9caad7d963809f2fc9bb5c1ba682a39f44763b5d04e50c6e86658f6cd84324f3d2 SHA512 4508354d48a6115cd40f701cc90cbbcb84490e99eaac0295db48f6fea99550d5e2b3e7365128d0c9cc4eeb621906f55e275603d84cb8b6bb164d0b5e2e192119
-EBUILD nomacs-3.12.ebuild 1273 BLAKE2B e16331ab550098f3f680672034e59d0d5667589bd54a929f381ea40df753d33486fde632f181cd5baeba819048bb2bf10b1828be3a7c491728697fb9fa8ff829 SHA512 cd0138e1e4701843355b2b48a8a989fc67cef0f45da2487297d2bfaa6003ddfb2e4927e40f35db86af6ed18243f33f63054e68b245ed36695d209d2cae65239f
+EBUILD nomacs-3.12.ebuild 1315 BLAKE2B aea9616d9268a710139f8018f21b6beb2f7f976b5f7d9ebc5bbf7a4f844867dc9b737bc8a1c3d0c56feef80289af2487a14468034cb2f5386443ab0ac9804a7d SHA512 5f6f2ca97866dd134dcb65884d5d83a61f85ce86c90b8ad3fcb0a274f300d7227a50f09a0050727b7abe5ce9ab43e2e6c869944abaf2dc06463a4686bf6fc05e
MISC metadata.xml 531 BLAKE2B fc54042c41205b0a44c1b2dcd266e1311b306ee928149b3806e16260be85a65bf0da0716706653f82ff3dc83351fca6a68ca47930a08f3d170d00416515e2eac SHA512 ac9d022d7b0883217b77513e6d913ed816e414402cd4028428f6b239d97c8f5eaab48d709821675529af8a5a3d945105997235dcb63b826fd669f1b5fb2660a4
diff --git a/media-gfx/nomacs/files/nomacs-3.12-gcc9.patch b/media-gfx/nomacs/files/nomacs-3.12-gcc9.patch
new file mode 100644
index 000000000000..ccf6ea31d9d5
--- /dev/null
+++ b/media-gfx/nomacs/files/nomacs-3.12-gcc9.patch
@@ -0,0 +1,39 @@
+From 37805e3bc8753970127db101f4aa0c061bc5a70d Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Sun, 9 Jun 2019 19:15:28 +1000
+Subject: [PATCH] Fix build with GCC9
+
+---
+ ImageLounge/src/DkCore/DkMetaData.cpp | 2 ++
+ ImageLounge/src/DkGui/DkNoMacs.cpp | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/ImageLounge/src/DkCore/DkMetaData.cpp b/ImageLounge/src/DkCore/DkMetaData.cpp
+index 7540f7b9..fe2bc7ec 100644
+--- a/src/DkCore/DkMetaData.cpp
++++ b/src/DkCore/DkMetaData.cpp
+@@ -42,6 +42,8 @@
+ #include <QApplication>
+ #pragma warning(pop) // no warnings from includes - end
+
++#include <iostream>
++
+ namespace nmc {
+
+ // DkMetaDataT --------------------------------------------------------------------
+diff --git a/ImageLounge/src/DkGui/DkNoMacs.cpp b/ImageLounge/src/DkGui/DkNoMacs.cpp
+index edda14cd..8fcdb59c 100644
+--- a/src/DkGui/DkNoMacs.cpp
++++ b/src/DkGui/DkNoMacs.cpp
+@@ -99,6 +99,8 @@
+
+ #include <assert.h>
+
++#include <iostream>
++
+ namespace nmc {
+
+ DkNomacsOSXEventFilter::DkNomacsOSXEventFilter(QObject *parent) : QObject(parent) {
+--
+2.21.0
+
diff --git a/media-gfx/nomacs/nomacs-3.12.ebuild b/media-gfx/nomacs/nomacs-3.12.ebuild
index 32fc7db491a3..17e8151bfcf1 100644
--- a/media-gfx/nomacs/nomacs-3.12.ebuild
+++ b/media-gfx/nomacs/nomacs-3.12.ebuild
@@ -45,6 +45,7 @@ BDEPEND="
S="${WORKDIR}/${P}/ImageLounge"
DOCS=( src/changelog.txt )
+PATCHES=( "${FILESDIR}/${P}-gcc9.patch" )
src_configure() {
local mycmakeargs=(
diff --git a/media-gfx/nvidia-cg-toolkit/Manifest b/media-gfx/nvidia-cg-toolkit/Manifest
index 4750666aa0e5..2f1587d312cf 100644
--- a/media-gfx/nvidia-cg-toolkit/Manifest
+++ b/media-gfx/nvidia-cg-toolkit/Manifest
@@ -4,6 +4,6 @@ AUX nvidia-cg-toolkit-gl.pc.in 278 BLAKE2B ef0bfb9b76386c078e36b700166069fd961b0
AUX nvidia-cg-toolkit.pc.in 242 BLAKE2B 45f19a2791310975169f8a31bf65d77a86b4e4487502c40101622070a28e316ae3bb910e7bb3d8af0073ac281ab4ca0786a081e1c1ff8955c125bd3fe1b5403b SHA512 601505a228eb4f70813d3ab6346a51c1552751278549c81b7721273dd58c053639cad49cfe82982455b1399d8b494f8351a0a479efbdb33171d28c3dd0b69073
DIST Cg-3.1_April2012_x86.tgz 23332348 BLAKE2B e8253cfd1b569e1eb083ca394ae969ca43677641763eb77c24381198914cb1508bd41489224d8cc1afefca2affb485320022bd35e7ffaa48aaadafcf42f89183 SHA512 7b2addad157e151eb42b320aea31ccddfd53ec5640cb97bc86a3d461c1b08a2dff280bfc3f7859d124c311e1710e39d40405c387e5724ebc82d95303b250837a
DIST Cg-3.1_April2012_x86_64.tgz 24829131 BLAKE2B f1425f391022aa57fe2b23581786576ab8762a48e9ffc875853d55399d3a996ac85debb099d0b906dcce6c95989a06c3980bfb59dc69edc16d1378ba5dc89c73 SHA512 591b51195193e7e3bbb9f1c2579336d24a179b0a88b955a01f4661bda55543fbccd73cac53033912f2eea8a1068e4c1394c6d286f195963cfb33a0d8b4428e27
-EBUILD nvidia-cg-toolkit-3.1.0013-r3.ebuild 3270 BLAKE2B 43cb73b6ea942446de89ee94686af08f53c33226b7eefb95e202d638576c69c5e6ace010f1aec63e45c27a8b062f5298de59c3b88508ff39ffbd415972cec600 SHA512 bda4e6a0e4793dae86a35d046760f0763ef5f92a962e6ab9af3a091f951b783a1c082746aa8c346f3cd31a43fdfa7cf44acd8b665cf23fd8699f088b4c4356f3
+EBUILD nvidia-cg-toolkit-3.1.0013-r3.ebuild 3276 BLAKE2B f220bfe2757030965ecb976888741e4b45e63092adef1295dfd2a7d1ce5e55b1c602986ee68d9c8d9752278eccde873ab959fd419fa67cd724a985ff7df43fe4 SHA512 0728caa22289a34db3f4ddc60f9ef8df8213e0d07d71e94f1bbe707c109a3a5fc493220d4db007c3a6c7aa7854dae216a3e1c3ddd4d89a1180182e77c1002a64
EBUILD nvidia-cg-toolkit-3.1.0013-r5.ebuild 3177 BLAKE2B 75152e6051dbe1fbb6c9c1f176b1733a7a7910fc47f4998e2e14ef109dd89cca1f21e20afd74b092078bd87154defb9a7269f9d1af51dbffce265ba1fe66a21b SHA512 194f642e56728a90c69115281ec7fdd0d346b50755ed337f8c1f31d4e877b1b6942cbf0ff562d3c05d478a8c20b32fdda9b82b6a25aa17b6d486ad7c18732dae
MISC metadata.xml 652 BLAKE2B 8bb1f448a07402e9de7b8265b50318595c3b7de92b8b444b92dce29ac428682ab856f6d4ed668579a8fcda48b8d17f975b69d08154a54cefe7dce8916db0e0a3 SHA512 cde9ca3c2c16c3a83593c4fbdd1b05f5b79596f42d77df5f20470d7e2cbca2e445fcac254dcc7f31e41938f756d1bd5b314c7aa1a2dc6a7bc19f170a4d7e1656
diff --git a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r3.ebuild b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r3.ebuild
index 2966f90aff37..93cd75d8d7ac 100644
--- a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r3.ebuild
+++ b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r3.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
x11-libs/libXmu
x11-libs/libXt
media-libs/glu
- media-libs/mesa
+ media-libs/mesa[X(+)]
media-libs/freeglut
amd64? ( abi_x86_32? (
>=media-libs/glu-9.0.0-r1[abi_x86_32(-)]
diff --git a/media-gfx/optipng/Manifest b/media-gfx/optipng/Manifest
index b361ab1a39d5..a578b2423b8e 100644
--- a/media-gfx/optipng/Manifest
+++ b/media-gfx/optipng/Manifest
@@ -4,5 +4,5 @@ AUX optipng-0.7.6-cve-2017-16938.patch 878 BLAKE2B 8ad045b58d4e9072576b50c2f3b20
DIST optipng-0.7.6.tar.gz 2202237 BLAKE2B f113027ff12f2fc97bd4dc43b8e62f5af8f86e251b43c0f86ffbd59366b329d1fc2a58103aa349cb18fb0c9d2e5f051517439c02aeb44ee435c6fff0c75efb7a SHA512 d31d7494c23413d87b601a706cc2faf82923156a818da66e0bfad11741aed065db8f1b0c088d2abd66899ac192408c05f594295ded2684c4549c5f03b140a184
DIST optipng-0.7.7.tar.gz 2329555 BLAKE2B af3e1c806522282ccbf9325c0b49f61a30d24b8e2db2dd8ec316a312d0dea595cbb6e8b5b38ef5ea90f1efe14244b81f85f88e11e7334fdd4b91b43b6dae8e7d SHA512 c33b7650143ab39944d2c066e07e10273c37024c5bfe7c00475bfb513af96afa081ff388164845d426d3bce624c0282dee574fa150e963f18d3683d821030280
EBUILD optipng-0.7.6-r2.ebuild 1421 BLAKE2B 70322d5447186354a43c2a0efe46fae53b6fae7ab0a7e47436d179c745857d9792c392a39a7a391319dcb83b26fd2e3a49ef746d7bfff4b412f0468e80b93a9d SHA512 f1805005c8dce16e50786721b84ff80609917edb0167423c253f608b250fa06540f4f524a41d2558ddb4f6a3f5791dac24d0b21d5e1b523fbc6f7fc8ba04aab8
-EBUILD optipng-0.7.7.ebuild 1293 BLAKE2B 1a16a8809a13617412e763106536811c5231f0582ed3b448793884070aec5c37510132d1dc47c322b7837fccb46388ea18fbb932f91a13f203feb947a2e0d12c SHA512 f2c8fc7225ca4fda3e347ed2db2032d0d18942577826b4bfc0d5b29a50e6df54ebf907b5608096a7275bbc0c773ee394772d6c9913e25fdf6a1172c4c314c8f6
+EBUILD optipng-0.7.7.ebuild 1289 BLAKE2B 056adeff112c68820bb1bed10ba3f9705b5ce3bc5aed2510c393333d16ab6e83ae59f02f1aa1ec20d1435c7098a9578eb73bf322ae2d853dd5ea0d168d65eb24 SHA512 701d10e6ac8bd6bf0cba74421dc592718ca9de3cc9acc5cc8911cd98cdefa0a8e904a90379cd396969c0a0d53f05b244ab62e7eb7980def90792b550d411db82
MISC metadata.xml 326 BLAKE2B aa1da3dfcfd0faa4d1bcc901659c15b3ce974eace4d7b1317c7fcfdac13939ca4e0ed9d58eb46e7921caefe63475fcffe3193ad138506c9e16b0d8d9abb73bb8 SHA512 57810d8957812cf02573aff451fb8248944bd100beaa06412deb4b5622161fca2ee466ad80050d68e94acf5e2e7963c6fa657416996c0503da6ac88f1f00efdb
diff --git a/media-gfx/optipng/optipng-0.7.7.ebuild b/media-gfx/optipng/optipng-0.7.7.ebuild
index 5f5144487284..7765ca76dae5 100644
--- a/media-gfx/optipng/optipng-0.7.7.ebuild
+++ b/media-gfx/optipng/optipng-0.7.7.ebuild
@@ -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-macos ~x86-solaris"
IUSE=""
RDEPEND="sys-libs/zlib
diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest
index 1d7cabd03e2b..5de6198adac0 100644
--- a/media-gfx/ristretto/Manifest
+++ b/media-gfx/ristretto/Manifest
@@ -1,5 +1,7 @@
+DIST ristretto-0.10.0.tar.bz2 586447 BLAKE2B 73e4be551879d58e0c43b7a039b3173e96df8a7c367bb1696dd27a6b20fc675465e6a78019e11498f0dc55286b605c7ab9545dd7d13e2607bc0fc05527947568 SHA512 1727025bbc056a71475d91505cc141661b011c3944cf4ca4d96b48a9ad7e1b28b8f4b0c856fa789cd2c877c1faa27aa57441e35e06f38fd2b81ddcd3284dc2b6
DIST ristretto-0.8.4.tar.bz2 581374 BLAKE2B 8d4dc91daa1aebf7d8193d8a48c3be29ad6fed86b7fbea68effb63f6a56d2d39898b5ab0c93933adf9d65cce327109dca5ecff96855c4311494de7cc4182213f SHA512 c5479cde66e4f0903b9b8d9b1b8f4c7cde35ebfa334e414c8202e783c332bd4bfec650f85d308c7151d31fe84b27a13bb4048290b0a82ce7b8ba4baf3e4088b8
DIST ristretto-0.8.5.tar.bz2 583736 BLAKE2B b2c0582eb7930eb3bdf9941dc086befd6a81f0d3aa8ea5ecdbedb00f7914287937e520c5257853d080dca4ebee08f1c40f8e8386a6de90856721a804462e9cab SHA512 48d2a68cd13e58c0f450fc674b031a4fc4495ece0ae00805f0564a5bd9cc2ac19c1c009726dd343bdfeffa59509f0ecc9cd069986af5a2ff2c2566c4490b5fbf
+EBUILD ristretto-0.10.0.ebuild 876 BLAKE2B 7b6130fd29611418ddb9a4b1a2231fdf16e1adc52f1a3897a5b4b24a7ac7b9b34ed7a41f44a306e99c584dba0cb5896bc5706c0fc8d807ef485ddcaea8d69ab3 SHA512 cd7c28b2514bb4f1c1972b682bce0ae9ef1e85f5f631849fd9643c2b3cdbd569aa88e8d47517e3545a2079b7996086b7500d4a1f56dcbec6fd82a17dce23c2cd
EBUILD ristretto-0.8.4.ebuild 876 BLAKE2B c950d825ab3ba23f9a0660a45c18874d591271a86e03c32d77be2908af0628cd1936290505f03a3b523ffd8932a453a8467d5c37062b6e19800635b8835c812f SHA512 42a4b7741c85d52878adc859fe4b9c9a7c5680c59be2c9c52bc9768371c2f39b89da1f01130c63aa4e66420b7d637531355c9eaea418d761b80024bfceb8c337
EBUILD ristretto-0.8.5.ebuild 859 BLAKE2B f78523b7231cc1539b258c3fefa5087702c85859c456d7bd3200c5edbb194deda98d7ba0fa3e5bed4ee37461f5990a7f77db5e68b6cc86724fc298317e6a302e SHA512 0a9dcd229aebc553cf39dc4b349b737eea6d30941e60b05c4c8236cba84de6af4532f26a9bd1f77b39d7dafdb25f7a7b6b596226f0191e2ab73eb684f6495e70
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/media-gfx/ristretto/ristretto-0.10.0.ebuild b/media-gfx/ristretto/ristretto-0.10.0.ebuild
new file mode 100644
index 000000000000..4fc93d04e8e5
--- /dev/null
+++ b/media-gfx/ristretto/ristretto-0.10.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="A fast and lightweight picture viewer for Xfce"
+HOMEPAGE="https://docs.xfce.org/apps/ristretto/start"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.42:2
+ media-libs/libexif:0=
+ sys-apps/file
+ x11-libs/cairo:0
+ >=x11-libs/gtk+-3.22:3
+ x11-libs/libX11:0=
+ >=xfce-base/libxfce4ui-4.10:0=
+ >=xfce-base/libxfce4util-4.10:0=
+ >=xfce-base/xfconf-4.12.1:0="
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ virtual/pkgconfig
+ sys-devel/gettext"
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+}
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index ae9e7684b6d0..e332c80d0ae7 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,3 +1,3 @@
DIST shotwell-0.30.2.tar.xz 6461648 BLAKE2B d54f34c05dcb092149129977bf59f0434ec4082929e3c87d9b4e774f85b47d73ecce1e80a6a29965194e9791eecb018405b43f082fb8b334c8d012f06a00b817 SHA512 ee74b9d3fbc5b2a5ca87cbc351fa99f6afaec4ce717166f55d79f41f1b039c272ed9028eb3919874f086f934197806738a54f428e790bca50dd8c9af61c21c36
-EBUILD shotwell-0.30.2.ebuild 1810 BLAKE2B 8bb8b28982edaf98722d1f49311e537aca0c27650c37af33aea7dd6c07658f15e88b6829480196e4b918e50ceb70c62ac1b1724fdd97cb90ea6c2814071ecbac SHA512 b7d9098bd1f37c4e86f7feab906ec4bed32c245972fa5bb6c359c529930cd295c7eb282cbf9871cbc03391520022a28d089e83e4bf14f1af5da6f4020790f563
+EBUILD shotwell-0.30.2.ebuild 1817 BLAKE2B d8ef0c824f1990ede37a4e2c81fd3fabcbf1a5809685076f3fdc90c0db62b05732d6c06e259781f6cfd953b8655fe4c796424202f7cee20226da46db49a51f63 SHA512 d91d0dcb6a3230bd109c3225c8f9c71cb294619058f09d74bbd7e461161094eb614545d058fa9f2a8ad13668e46b1c40bead4af849dfe453ec29dd0ad212584e
MISC metadata.xml 915 BLAKE2B 7f83fe936f9a575c6dd12b014007cd97c5a8ada9aa5e55ddeaddefa4eb05d724a068c81d2f6f41c5b1bae01ed2c4326eb5eba5d4bdccf48619edeb43a8eaabfd SHA512 1b226f7fabfd7f5ee4d82b28ce2998273225319b055c01509cc5e493fdc037941c0edd0099df5dada00228fb225bf5e35d0035d3cd244890ad0cbd929b84d214
diff --git a/media-gfx/shotwell/shotwell-0.30.2.ebuild b/media-gfx/shotwell/shotwell-0.30.2.ebuild
index ee9640e9a572..ccd5ad48e5f4 100644
--- a/media-gfx/shotwell/shotwell-0.30.2.ebuild
+++ b/media-gfx/shotwell/shotwell-0.30.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="opencv udev"
COMMON_DEPEND="
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 45246ee02049..7715a2fd3ba9 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -3,4 +3,4 @@ DIST simple-scan-3.30.2.tar.xz 512540 BLAKE2B 908af68fbd297e2cc0c0c5440166ebc706
DIST simple-scan-3.32.2.tar.xz 790800 BLAKE2B 98e502cbc280285dbe20a0c843d5f8d8b38707e973f2ba6aba2ccef9d739165371f5f30d7d6658853c5a6a280ba2919a98acd02b4757b4e881f96d5a7b53449b SHA512 10322ae72461efe43a4e230443c3aca24aff6f0cab07750c6eab9ebb718889e51d8c77ff722c337f333a8952ac84f69d03ad88eedfd4432ef11f7c7493170e14
EBUILD simple-scan-3.30.2.ebuild 1411 BLAKE2B 336efc46f57cc33f3522ea53a381a40aae08389ab0902d93b23ed5055bd648bf68d1b747e1d8df525f34da59fde2973e2a87f3aef8d4449c4e1d51b6036fc967 SHA512 c45ea9e8396fd2f216e0c7479691f43d6a8aad37a23ce260ec9974a991e30bc4d7d8a781970948fc87047e317f01a952a5fe4e5506562012b71d5e209479724f
EBUILD simple-scan-3.32.2.ebuild 1385 BLAKE2B 0f406f83606d4203dd0d7785b5330db5a0cf7d5a6c00d7a86b8d5768388d8de0016100184ce6afbd95e0e4ab9e598b8d635a8abbcad00024bf7dabe491dc9799 SHA512 6176fa51739f6975a17a0e7147a152464566d3192bc7414e6239351189674768a5d83bb80575f38968e8cc57266a028947c1e10a38c16697736853023e1449b0
-MISC metadata.xml 718 BLAKE2B 46e5929721e967a667f32a8993903b635599ae06c5b5179edf0579070b2b393f750a044bc280519b820f336843d1b98a795f73ef9500a27951a64b61794901e5 SHA512 82244c0dc32c4ded72048a387cee5f350a66148ecaa12a941e4a86d9d9079f1769f1f240ee564c7f991f9d53c050e9fd3e9113024fc8831a6766ec3d88b665ca
+MISC metadata.xml 616 BLAKE2B 576d986402f8cc708eae60f661640808751747c764d5fe729dd014f33758e0b484a2b80a214d9a3d1ed4bce7e455e34803a62048240e5de8e203184446cdc0df SHA512 6377cb9c20b1ce2db22ba959d386e4389939b72503d87da956d659144b8a6f8b521abdd19dd4c82ac0cb32e260ce6633b75136a353f63b86593f5e1f12394d47
diff --git a/media-gfx/simple-scan/metadata.xml b/media-gfx/simple-scan/metadata.xml
index a84032e4aaae..6c0216e15c75 100644
--- a/media-gfx/simple-scan/metadata.xml
+++ b/media-gfx/simple-scan/metadata.xml
@@ -11,9 +11,6 @@
You can print your scans, export them to pdf, or save them in a range
of image formats.
</longdescription>
- <use>
- <flag name="colord">Support color management using <pkg>x11-misc/colord</pkg></flag>
- </use>
<upstream>
<remote-id type="launchpad">simple-scan</remote-id>
</upstream>
diff --git a/media-gfx/symboleditor/Manifest b/media-gfx/symboleditor/Manifest
index af41558d442d..5e908a8a2576 100644
--- a/media-gfx/symboleditor/Manifest
+++ b/media-gfx/symboleditor/Manifest
@@ -1,7 +1,3 @@
-AUX symboleditor-2.0.0-cmake.patch 1248 BLAKE2B 09298608568c20dc29b8139abbd83544862fdcb84ac67ed6c1d3094b16fd864647d686b0685df0891ef74227038a61c40e42d0fa24ebe9e8faffa4729d39f2a8 SHA512 bfb9ae87492675cfcd19abfcf255aa720196129a8715b6315a9b6cd5cfa199b63be98a891d1c068c2feb789e6ec0bbc88a4f24cf23b766aec0953e39f6f7ecd0
-AUX symboleditor-2.0.0-doc-optional.patch 798 BLAKE2B d3ff8e71c6adc72f0cfb8914723eeaa7f4b80f07d5433638546536e018d4256b2d130e47b1963c5a11ca9338934c295019b7db8ea29475b9df2e4a7c01cce9e9 SHA512 2f84f7e772fe74dbc6733861d2f4a48adf95dab1ec33e4ef6e56c85123a190a17af1ed04ce554f95a5bd3ce80a402c6239c31ba20a8ac128c7362abc26a84281
-DIST SymbolEditor-2.0.0.tar.bz2 544789 BLAKE2B 2d0566d1e4b765e4cccec93def5fb184a27edbeb90bed8a76514e880e49a9c4139d4679f380c6c831c3f25a857af2df367d9ef96c56009189b2db9f964202e73 SHA512 8baee88fd8ff5f2b6334e80fe7c3fe8044ae521e5a8ffa2588f37dc4a8bf0495c902789bfaaed21a6eaf3c4f6380d18550aaed8046e84b396317104c8a49c993
DIST symboleditor-2.1.0.tar.xz 495416 BLAKE2B 5f5d5a60806ebf0dacce5dcff538ac0f2c4966b2f2bda79450f66515d8572dd61a67db5e4d0f91b548a62c14e4e14aea283b710dc2a7c84770eb35dd22e20699 SHA512 dc83f3f80b12d8217a230d8c951e90bcc6246c4460d987efb140c54c1e88a8f5d607ac7ebfe706399cd0917e22a2089df6742afadd28305d39ceeff0c55da535
-EBUILD symboleditor-2.0.0-r1.ebuild 1019 BLAKE2B a73fd66ba9ebdb1a95a5b69ed8e2da4ec67a4c8155785960b4bd70fd12f7ccec5b65e8e5289630183bdf346b2cfa8f8bbc5e665a240428b2a1c53efc596a4ea9 SHA512 a1c52dc93b696da3d8d94448d0af55cdedfa02f319d0a8f0e085df9266ff0667a0cce91111b0ecc009bed941f9df3f328a930669dc4a5f6a7ddef2b41fd1aea3
-EBUILD symboleditor-2.1.0.ebuild 880 BLAKE2B 4c250c242e781518b2e07e5e2fa9042a5431b04f025aaf32b0ea0428bf15fe56c4d68e4001e14736961c0faa05b9ad03be4500fbaa3ebf27ace2d005835e7b69 SHA512 3032c4f85a268bb19fe8a6ed458140e6ed1b5c90139d2ff04ccb639a87190ed9f057aefcc4be1a0de95b740b819635e90daebe148d46f184b7321bc02242aed2
+EBUILD symboleditor-2.1.0.ebuild 883 BLAKE2B 70944d0701dd56a8981b0e51aa120bbb6dbfb5bca1407b88960377f9745dd14e03229f623514e17e593cc7dd7c9271cd679da19979e1a7f91a50f9d1a7b7be60 SHA512 f687f83d98c0f3ca554b616439861a1d2c334cd9a3d38c103b65e94964e41d091665e48e4cf15a7e6b337644152b6bb5a050c070969fc4a31a5cd7073e09539c
MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-gfx/symboleditor/files/symboleditor-2.0.0-cmake.patch b/media-gfx/symboleditor/files/symboleditor-2.0.0-cmake.patch
deleted file mode 100644
index ab0bd049bef3..000000000000
--- a/media-gfx/symboleditor/files/symboleditor-2.0.0-cmake.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 8739cd6f5fe0f2ed0cf9913170573c62ee246c63 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Burkhard=20L=C3=BCck?= <lueck@hube-lueck.de>
-Date: Thu, 22 Sep 2016 21:17:07 +0200
-Subject: cleanup CMakeLists.txt
-
-remove qt5_wrap_ui wrong because the app uses xgettext and line 60 already has ki18n_wrap_ui
-remove add_definitions (-DTRANSLATION_DOMAIN=SymbolEditor), that is only for libraries
-and
-src/Main.cpp:84: KLocalizedString::setApplicationDomain(SymbolEditor);
-is used to load the translation catalog
-REVIEW:128126
----
- CMakeLists.txt | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d1016cb..d88174a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -64,10 +64,6 @@ add_subdirectory (doc)
-
- kconfig_add_kcfg_files (SymbolEditor_SRCS SymbolEditor.kcfgc)
-
--qt5_wrap_ui (SymbolEditor_SRCS
-- ui/EditorConfigPage.ui
--)
--
- ecm_install_icons (ICONS sc-apps-SymbolEditor.svgz DESTINATION ${ICON_INSTALL_DIR})
-
- add_executable (SymbolEditor ${SymbolEditor_SRCS})
-@@ -89,8 +85,6 @@ add_definitions (
- -DKDE_NO_COMPAT
- )
-
--add_definitions (-DTRANSLATION_DOMAIN="SymbolEditor")
--
- if (SILENCE_DEPRECATED)
- add_definitions( -Wno-deprecated-declarations )
- endif (SILENCE_DEPRECATED)
---
-cgit v1.1
diff --git a/media-gfx/symboleditor/files/symboleditor-2.0.0-doc-optional.patch b/media-gfx/symboleditor/files/symboleditor-2.0.0-doc-optional.patch
deleted file mode 100644
index 3434e90c6122..000000000000
--- a/media-gfx/symboleditor/files/symboleditor-2.0.0-doc-optional.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 2b809c68d40a3d0af2da668bad3f4d9ced86f56e Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Thu, 10 Mar 2016 20:26:57 +0100
-Subject: KF5DocTools is optional, so add doc subdir conditionally
-
-REVIEW: 127336
----
- CMakeLists.txt | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d88174a..da7458f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,7 +60,10 @@ file (GLOB SymbolEditor_UI ${CMAKE_CURRENT_SOURCE_DIR}/ui/*.ui)
- ki18n_wrap_ui (SymbolEditor_SRCS ${SymbolEditor_UI})
-
- add_subdirectory (icons)
--add_subdirectory (doc)
-+
-+if (KF5DocTools_FOUND)
-+ add_subdirectory (doc)
-+endif (KF5DocTools_FOUND)
-
- kconfig_add_kcfg_files (SymbolEditor_SRCS SymbolEditor.kcfgc)
-
---
-cgit v1.1
diff --git a/media-gfx/symboleditor/symboleditor-2.0.0-r1.ebuild b/media-gfx/symboleditor/symboleditor-2.0.0-r1.ebuild
deleted file mode 100644
index 3661330a67f4..000000000000
--- a/media-gfx/symboleditor/symboleditor-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="Application to create libraries of QPainterPath objects with rendering hints"
-HOMEPAGE="https://userbase.kde.org/SymbolEditor"
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- MY_P=SymbolEditor-${PV}
- SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${MY_P}.tar.bz2"
- S="${WORKDIR}"/${MY_P}
-fi
-
-LICENSE="GPL-2"
-KEYWORDS="amd64"
-IUSE=""
-
-BDEPEND="
- sys-devel/gettext
-"
-DEPEND="
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${P}-cmake.patch"
- "${FILESDIR}/${P}-doc-optional.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
- )
-
- kde5_src_configure
-}
diff --git a/media-gfx/symboleditor/symboleditor-2.1.0.ebuild b/media-gfx/symboleditor/symboleditor-2.1.0.ebuild
index 51277528791d..30fbc9684832 100644
--- a/media-gfx/symboleditor/symboleditor-2.1.0.ebuild
+++ b/media-gfx/symboleditor/symboleditor-2.1.0.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Application to create libraries of QPainterPath objects with render
HOMEPAGE="https://userbase.kde.org/SymbolEditor"
if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64"
+ KEYWORDS="amd64 x86"
fi
LICENSE="GPL-2"
diff --git a/media-gfx/xdot/Manifest b/media-gfx/xdot/Manifest
index ad953ff182f2..1f2ea7ab6dd8 100644
--- a/media-gfx/xdot/Manifest
+++ b/media-gfx/xdot/Manifest
@@ -1,6 +1,4 @@
-DIST xdot-1.0.tar.gz 131868 BLAKE2B 433d81913d19ae341c7168d9e22a2c8a54f49b0ad6b0da744cc3152766b333252b9ad7ba3831bdb17fc29a2408f8bdf3d929a438e89a78945f8edd7a8cd123b9 SHA512 52330380973ee122ac5d93f1be5b8f21b5719f537c93dd6f356a116207e366d16cf3cefcb9ec59b21b7170dc94e1f413307c3980e9ba2eaef5ce45340b50b311
DIST xdot-1.1.tar.gz 134215 BLAKE2B e241a4fb1ec69a8613f7813dc159761e6bffb82ea9f58876287d01946f4c93e66e5eef66e6844abb7738979412c2c7d2d26f76bc0563ad0c3c8550d9e8023b47 SHA512 d67c45c8c071013551f79d671a21ce546b680fac5997ba9631a882ffa3c44c15a69949643ed5e8211417006152575a1d99450ccfb6062427521d1e2bc0814f55
-EBUILD xdot-1.0.ebuild 899 BLAKE2B 5e4d6f4a69ad7a4abd6dd94b34fbbd1b1e06fbdd09818a7917e2f660d1dbb201b769fc8a366a30ed09d8f714bcd7433685b58c3133fd3019f98ca30174dac2f0 SHA512 2a7cc518a904f6d145c0377a9534a6134742e71d25699bb0ad623b9facf5bc21662b26da7f51971a5232f2a6960a96ec98e2b22ee8041b4dd85dfcaa5d0cd698
-EBUILD xdot-1.1.ebuild 1104 BLAKE2B e3e4fc6bfc97f72f48901173e8a8b477414afa78f619b36c3f1e6b418abe2af54534df4305a6e92db6fb18829ee53a94ed93826eaa031906fbde6d6c73c72133 SHA512 dca13c44f96d1e9ac3823b8583faa5ac56a3d69804410c282a612a6f0043d4b6e8019921225e0a3a90a94bcaea1391b7a5a2603aa003fb05e54cffeaf64a4b15
+EBUILD xdot-1.1.ebuild 1102 BLAKE2B b134331aa6c28073ed7c0f5b0cdeb4871623622ff8fb9d5b0cecf3e30c2e71f7a001f993c3c5a65a66c9d5feeb1afeca4c502f143ee5921c1e13b2fae7725cec SHA512 95130c58d8241786ac3e07f293829b20d0c1e0e979ede8dc095c2b5cf5881797d8919fe79a4bbd50814eebda34703797281f49f71a037d2b76429daf02cb77e7
EBUILD xdot-9999.ebuild 1104 BLAKE2B e3e4fc6bfc97f72f48901173e8a8b477414afa78f619b36c3f1e6b418abe2af54534df4305a6e92db6fb18829ee53a94ed93826eaa031906fbde6d6c73c72133 SHA512 dca13c44f96d1e9ac3823b8583faa5ac56a3d69804410c282a612a6f0043d4b6e8019921225e0a3a90a94bcaea1391b7a5a2603aa003fb05e54cffeaf64a4b15
MISC metadata.xml 483 BLAKE2B 50b03bb7d189da9bd6ca793f30c1ba3d13d12151533b42c99321a849515d7664398ec1b10720596c0453c48d35e2a6083b0559eb127199e1d6f4fc2a93aa04c4 SHA512 7e734dd60daa1e74b28f0932f508787e8deebc75a8f46c41f77007b6c8f96751cd6b07f6638cb89b38eb81d4fd2c6f7ba9f6d449f24f17ad25fb001d7f4f5ff7
diff --git a/media-gfx/xdot/xdot-1.0.ebuild b/media-gfx/xdot/xdot-1.0.ebuild
deleted file mode 100644
index ae5b3769694f..000000000000
--- a/media-gfx/xdot/xdot-1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_5 python3_6 )
-
-inherit distutils-r1
-
-MY_PN=xdot.py
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Interactive viewer for Graphviz dot files"
-HOMEPAGE="https://github.com/jrfonseca/xdot.py"
-SRC_URI="https://github.com/jrfonseca/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
- dev-python/pycairo[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- media-gfx/graphviz
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- eapply_user
-
- # Don't require graphviz python(2) supprt, which xdot doesn't use. This allows xdot to support python3.
- # For more info, see https://bugs.gentoo.org/643126
- sed -i "/install_requires=\['graphviz'\],/d" setup.py || die
-}
diff --git a/media-gfx/xdot/xdot-1.1.ebuild b/media-gfx/xdot/xdot-1.1.ebuild
index 8842ac3a99a5..b184e548ad6a 100644
--- a/media-gfx/xdot/xdot-1.1.ebuild
+++ b/media-gfx/xdot/xdot-1.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
GIT_ECLASS="git-r3"
SRC_URI=""
else
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 x86"
MY_P="${MY_PN}-${PV}"
S="${WORKDIR}/${MY_P}"
SRC_URI="https://github.com/jrfonseca/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"