summaryrefslogtreecommitdiff
path: root/media-gfx
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-12-25 23:06:25 +0000
committerV3n3RiX <venerix@redcorelinux.org>2020-12-25 23:06:25 +0000
commit441d1370330332b7d78f238d2f5e13f7aed5e4e0 (patch)
tree6a5171dd615dfeee62a45044144c66e864738fb0 /media-gfx
parentab3da91fb6c91a9df52fff8f991570f456fd3c7a (diff)
gentoo christmass resync : 25.12.2020
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/Manifest.gzbin38497 -> 38511 bytes
-rw-r--r--media-gfx/cairosvg/Manifest2
-rw-r--r--media-gfx/cairosvg/cairosvg-2.5.0.ebuild2
-rw-r--r--media-gfx/darktable/Manifest9
-rw-r--r--media-gfx/darktable/darktable-3.0.2.ebuild149
-rw-r--r--media-gfx/darktable/darktable-3.4.0.ebuild (renamed from media-gfx/darktable/darktable-3.2.1.ebuild)23
-rw-r--r--media-gfx/darktable/files/darktable-3.0.2_cmake-opencl-kernel-loop.patch28
-rw-r--r--media-gfx/darktable/metadata.xml2
-rw-r--r--media-gfx/eog/Manifest2
-rw-r--r--media-gfx/eog/eog-3.36.4.ebuild70
-rw-r--r--media-gfx/graphviz/Manifest2
-rw-r--r--media-gfx/graphviz/graphviz-2.44.1-r1.ebuild2
-rw-r--r--media-gfx/grub-splashes/Manifest2
-rw-r--r--media-gfx/grub-splashes/grub-splashes-20091109.ebuild2
-rw-r--r--media-gfx/hugin/Manifest4
-rw-r--r--media-gfx/hugin/hugin-2020.0.0-r1.ebuild (renamed from media-gfx/hugin/hugin-2020.0.0.ebuild)14
-rw-r--r--media-gfx/hugin/hugin-9999.ebuild21
-rw-r--r--media-gfx/imagemagick/Manifest12
-rw-r--r--media-gfx/imagemagick/imagemagick-6.9.11.46.ebuild2
-rw-r--r--media-gfx/imagemagick/imagemagick-6.9.11.52.ebuild (renamed from media-gfx/imagemagick/imagemagick-6.9.11.44.ebuild)2
-rw-r--r--media-gfx/imagemagick/imagemagick-7.0.10.46.ebuild2
-rw-r--r--media-gfx/imagemagick/imagemagick-7.0.10.52.ebuild (renamed from media-gfx/imagemagick/imagemagick-7.0.10.44.ebuild)2
-rw-r--r--media-gfx/krita/Manifest2
-rw-r--r--media-gfx/krita/krita-4.4.1.ebuild2
-rw-r--r--media-gfx/openvdb/Manifest2
-rw-r--r--media-gfx/openvdb/openvdb-7.1.0-r1.ebuild2
-rw-r--r--media-gfx/pstoedit/Manifest4
-rw-r--r--media-gfx/pstoedit/files/pstoedit-3.60-libdl.patch13
-rw-r--r--media-gfx/pstoedit/files/pstoedit-3.70-pkgconfig.patch14
-rw-r--r--media-gfx/pstoedit/pstoedit-3.70-r1.ebuild63
-rw-r--r--media-gfx/scrot/Manifest10
-rw-r--r--media-gfx/scrot/files/scrot.bash-completion40
-rw-r--r--media-gfx/scrot/scrot-0.8_p13-r1.ebuild38
-rw-r--r--media-gfx/scrot/scrot-1.2.ebuild44
-rw-r--r--media-gfx/scrot/scrot-1.3-r1.ebuild45
-rw-r--r--media-gfx/scrot/scrot-1.4.ebuild2
-rw-r--r--media-gfx/simple-scan/Manifest2
-rw-r--r--media-gfx/simple-scan/simple-scan-3.36.7.ebuild70
38 files changed, 207 insertions, 500 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index bab3faf1a77d..2ab8b3b8b3ed 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
Binary files differ
diff --git a/media-gfx/cairosvg/Manifest b/media-gfx/cairosvg/Manifest
index 6c31df9f7c6c..a50b277fe601 100644
--- a/media-gfx/cairosvg/Manifest
+++ b/media-gfx/cairosvg/Manifest
@@ -1,5 +1,5 @@
DIST CairoSVG-2.4.2.tar.gz 38715 BLAKE2B 3c8f77561e13e0fdec371a601f09f0d107f972955c8e8fbc34f5092a7ff5f65b24338c20ae8e21b428eea083925a36b3e5635a9b0010c569d013169d919b7a35 SHA512 0d6dd22d9569fd3849cf7f6594c86bed719169dac1f0f3219e88d82f9d245bf29d51715159085cb26c0340c8f0dcb88412d141ec0ee3710b1477626f5a578441
DIST CairoSVG-2.5.0.tar.gz 40481 BLAKE2B d177570710f54a7d64446de81a700a6ebe5dd475ab75e268575ee2d3a45cb1da14a349d6a5516ef965191093f12ba916a1919fe115fa4b6e4dc0f9a22657946b SHA512 9387273a5531f2e055871d3ccc3b770a46e549dceb443d9d7dbf3635f44da4a752f06ece2f86582f57eac08d59d78f833e1ed2e7badea340d5a0f1eb31beb24c
EBUILD cairosvg-2.4.2.ebuild 872 BLAKE2B 4f326bdcaa5571e152cd438654fa0ffe4f9aa9465f0e88dce89f00c683506e932fd58fcd075d75f94f634e33d152c8b14a8dbdd8b467e087a6eb2c38d654a0fd SHA512 8bb35201de54b9f633516fa768925ac9b77245a8f8a89ddfea5ed12f01cf0ce57bb39deb24d3b3c11d8c0a59ace7fee30292b2ea175c29f88476e777b43935cf
-EBUILD cairosvg-2.5.0.ebuild 873 BLAKE2B 14c9f7bc21c36ccfa7c8af5dfc202a8c224022f6c1fa8e9097776ceb5a04cbf9039d80fffbf614d45fd220beec61b0dd9a3bf704454ce5a69ad0061bfb75d18a SHA512 2f97dcf15a076d968296625cd1af14d0781f7f9bd18197aeb9910e88572dd5d6ea5f74d9f3c94180a6fe40b93c1a1b9d846c439c08131f737fc9c50659bf9c63
+EBUILD cairosvg-2.5.0.ebuild 871 BLAKE2B 6e87fe608e0f1b9e86b72004b826338948762f087cc57042212e75f9e7f0d3928f7be13f071bfffebaa8a3b01236d067376244593359425c2759df888bfa2d87 SHA512 4d009897e43100a958ee7ffade1b4df3f2cf9a658228ba8931deb136f14d3bd1e09d3db690e05b538e0b6fae4fa22d63b0a0284366b8a930c58b4e0e7baf3262
MISC metadata.xml 328 BLAKE2B 168e60e4dbd12e2b99ba4ad8a6f8f42ef5a4de12f8f1edc68ba4d1d4252b24995da5d0e4ef9e1db09b3934ba42b042685db625439425a6e98cde2f52050c4af1 SHA512 ebb7d9d27e014fd083d0abe9508040730f980ba8a0bc89670ee5418af2c3af036d0ec16b5607a8805944d3b7eeb835e8806ab059fed68c52268df1cd10d7bbb0
diff --git a/media-gfx/cairosvg/cairosvg-2.5.0.ebuild b/media-gfx/cairosvg/cairosvg-2.5.0.ebuild
index a0513821d46b..6bb86bcba458 100644
--- a/media-gfx/cairosvg/cairosvg-2.5.0.ebuild
+++ b/media-gfx/cairosvg/cairosvg-2.5.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
dev-python/cairocffi[${PYTHON_USEDEP}]
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 23078950aa0a..a6fa2c7e1f57 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,18 +1,17 @@
AUX darktable-2.6.2-exiv2-0.27.patch 598 BLAKE2B 724290bb5c1344c0113abde04688009b3db10f530684f3f53e0fcc935a9ebef4b3680a36cb5d005e8826ea1512f0ec505b06e404d144006848601699d33d1416 SHA512 77fc92bf8d373552fc82de1927a1708b989caf0b080c8ef279692c0b9f2e95526a70d2bf4af5f62abb68ccb733af08237f9e143773cc8a75d72dfb6ba434df6c
AUX darktable-3.0.2_cmake-march-autodetection.patch 908 BLAKE2B aa1c0cedfe1f267332f11b9a8f38ce368af02b7e4f9751b128b7af91dcdfb066a0529ae126d41a34bc3fc66f336924f3376f270674bcc7e0912d2e23d46ec83b SHA512 da1f10e86b7b9e2a3f317d620a58ebed156a5c6e0f22f429da617cb176d1c18d6d1b6706c1444c9007ccb776bc6b951e3560214e89e95b4050899ec692b74dde
-AUX darktable-3.0.2_cmake-opencl-kernel-loop.patch 952 BLAKE2B 15839776c3b03bd5aee0e71115c7e2522dd56a773bd8ab34d1953671b336a6aca5cd9b1041327ead6d4f89aaef20ee3dad7772bc949010e1059c6be680fe17cf SHA512 cdf4ae76ebf5d90e761e187f0c5d82284e77c93c8d087352a0638ba4559fd22a6de4b0dc46e6c383ca7b196585d3cfce971909f5d911f34bbff507c5d7e8f522
AUX darktable-3.0.2_jsonschema-automagic.patch 729 BLAKE2B fdf306a513cc78fbd2b377d55baa4631b0feb885312252a784b06477afb08f8b43b742b4acfb9da7cb52c20eecf997668ff17444020690671136e17573dc75e9 SHA512 7b2f17827ad099c476f3272d9ffc41dbd3d1e1bdea482beaddb4d654d3555677212ed50df1fd83f94e1274670baecd951878280e1a052f327fce47b12ad720e5
AUX darktable-find-opencl-header.patch 601 BLAKE2B 0102ea562ec0addb619f06b59cc73834d734c454a7c561654bc27f052de55db6c62f454927b2c701b7f4f6c52d5d2fac0b7c230b90ef89bdc9431856bd4ae69a SHA512 93023a318158850a5bac4a1d871ea6e69a3c9f2bc57f8af47bc83bb131f96e8972c23b07945df2eddfb05bffdd950e8250da77c47d1543b776a7e9405adad020
DIST darktable-2.6.2-gcc9.patch.tar.xz 25864 BLAKE2B 857803d4c46b47b1e06e962533c231621fa23e72dffae617bc4e078316fc22c5883df404b30e63d7ed2111078d0d7b54bfa3510524c92fa739238904e2ec17f0 SHA512 29b208fa0b04aa11a2c45312763ba471785b2d0f669c07a6092b82adc0284428d7dc9ea8ebae7bd851414f04191e6aafb434fcc127f062ef66d075208c7d49cb
DIST darktable-2.6.2.tar.xz 3512572 BLAKE2B ee3070ac0f6b6b1c401865801631fb28397f484f30778065b7f899204813530a47ff6e752504b645f59bc29f868e1498e39f5f4e70f8259d8fecf5abc3f15cd6 SHA512 e7a90535747a8615fa2dbd1eb05f81314cc61c689a8a85fda0e2be40208ab0248e6f6ef296bb0894d3d527ed47c6cf6640538029c0c2d58a38d2d5ce10f6f5c0
-DIST darktable-3.0.2.tar.xz 3931240 BLAKE2B 5f86579a43e396c8116aba63c43e13d7312e5c3a569f9c242fe9a7882f02c5e0ebd7e4b9bbd34576eb83b3b78298038bf0d87bf4786dd19d0fa73ed30de21f67 SHA512 ee2d83f60621586f9e1be958f4b0c3d2214fbf30338837dbd07b901641c32d565cd29f814f5ff75a450495acee2383aa62ba3da3873009077704c925bab501f1
DIST darktable-3.2.1.tar.xz 3920728 BLAKE2B 79ef5df93d6c4728d19bc8bf01d018f071efe1ea94a68be53fced7217df608e5362b9905e2e633af4d0a11574ca3e42eac9d97fd3bfaf3a22b45b61213f60070 SHA512 0c76f7c145b470d0b129e4565727cef0c7509c1cb7f2405e41b20c81411741513cfc2976c7b8fe168bc1b017e7bfc292bb2d824c3beddce6432ee7143513bdc7
+DIST darktable-3.4.0.tar.xz 4444452 BLAKE2B 98b717aafe940a6916a2c2c42577be4956a171e7b445d69d20cb6aa1db35a255919524e8547c229461c64022fa3df5ace57a9e7a5ed32304820d5f263c3acbfc SHA512 b0a1e58f9af4007b22bacd7c61c75bdd036db9b1bbb6bd0ed785759d1a7a5a095a49a2a68c1555c661c4fff2549fcd35d2db2d9d4c16fc035bb37939804c749f
DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B a7a254e49dd57ee03480d52f4506a436210324cc4a2651f3c2fd70ca65cb7aa1735934a5e046ffa662b2aa1f081042d2d1e6ce0f70b6768719c52e2d14c358ce SHA512 e68005ee8706f2342755ce3e4dcd6c2907c1607bc9b750154dceb4b52dcccf50c581ab65212efc8ffb2447f5d828e0fdb61d0471c3d14938e098528e50f32e14
DIST darktable-usermanual-3.0.0.pdf 16237603 BLAKE2B ff5c24bb038deb37269a84389937740fa0ff77a9fb5bef4c484cdd903e39609588f632f577ce53c690d3abb832ace451d0d9d3f563ebdb6196ae8e2dac008a01 SHA512 2523b48e2baaa71561dc119340aed3bbf2ab4481dceb0c3ca2bbb7b0cacfaab894fa4eef82b667648cd7bb049304dbda09fa1a638f7734219b672b3ea8ee0eac
+DIST darktable-usermanual-3.4.0.pdf 16241791 BLAKE2B d6fc232c3eddb5474e36ce1fbc02c3472291e5ebdf2eae09c419215263f615546a79f88ee9d252b387fc5e4f2c9714398deab8de176b3d928b6a17c2878cef56 SHA512 fd154c02d5e0c63d9698b2f80a7439a191f4582b717b2f163923eda40aae1ebe8aeaf1a70efdc423eb8c8269d74fc0e23df8c9c0269ee8f5a357611501c3547e
EBUILD darktable-2.6.2.ebuild 3475 BLAKE2B 447c7330f1721443008a4794458d2365c5459a17e9257e4b2ae9a218824b78481ac66f37b230689035021d345908815135d71bfffad40e5c7d28bc7687cfcaa6 SHA512 23cf95b35f5445d7b21f13f11304e1eed211adb738d6d4389123b82596a77bcd8c8412b89c793d93fe1f6ab5dfde104618903ec35ab1e59a784eb7e43328362b
-EBUILD darktable-3.0.2.ebuild 3776 BLAKE2B 2148441c564365ed0cf732ca101f7ebbcfb99812bf01170164b8ebcd1d77dcc345ce08784fb3a9c2d8eefc27b9a410d449c45a5ce93449bb87295829156c4e2b SHA512 8cde8a2a1b6fbec34d918f5380068801be7b8cb4a8e8bc8d47bf51281c8f333aaefd63418769beec9b72efb8a9fac59422fe35ef570f25606a2d789e415f988e
EBUILD darktable-3.2.1-r1.ebuild 4250 BLAKE2B 6b29ac0b75ea866c64f8ee57ace0c85d315537f1df46b705b357b477528917f732e927cb14ce6465d5787b19e113030f62fac68cc1f0d42f626108cbb4ecf4ce SHA512 6f86a3688b660a76af91dd5124540af6333df5625b304f33b4fc3b0d668ea127592bdaf5b6b705420fef905b7e16dc09a9d130f3d96f4938f5a2ad9421147ce0
EBUILD darktable-3.2.1-r2.ebuild 4128 BLAKE2B ce99fb9f3320b7f1dd9fe4b2fe9da5a8faf623bc8a77c10872ff54590a6da1c971a4c688ffb0c657f33e2bc11f47e55fec9269eaea99f3e6eb97d0ebe53d75fb SHA512 d55d5a17ff0e0122ac06eb970c238c824755b8e464b219b758203e2eeef849c185a6fd5535819d8f11514f16b4c8210491a5e86beac39232ad2e5536ddaaf23c
-EBUILD darktable-3.2.1.ebuild 3810 BLAKE2B edeaeaeb1d291965a30e95177c39716952572640aeb7dcd42d7ad153cbb4c46c7c9dbafc1961ab32d42863f5c0ada9214d40c9ac41e4eb6b6529863749036224 SHA512 a6427900ba11b3c9acd249c7e14383dd8525e01f8a1baead0a39af8ab75af801a223a4e7613cba341d9ae94ea4b3be9b2f5c24f1270b22cccad81846bada28a0
+EBUILD darktable-3.4.0.ebuild 4143 BLAKE2B 7f84937e11acb786d28aba040b5f53a321f8918a6c818f4e6c3403574c11caf310bc93045332e33fccb5b2d598579cd14013aaaf4565ad857716b65e56a2b053 SHA512 dede5f52a89a3e86a11caad7caf23dd80a14482f0a6bc2e3284634577f8693e07b5773b6bda890f8b9ca45264d22c3b114171da444752d36d17390ee9d78d84d
EBUILD darktable-9999.ebuild 3314 BLAKE2B 6b768625082d82fe0cb4eb92b3a66cc6fc6d19d525bd25c9a00fc83e80336ea576e5dbd6b6133bffaf4f188d6ca5c6591793d12bec98af2a75e2c90217ad7485 SHA512 05b8dc06351cb42b9b10e906dfeaf595197c8bb398577384868550630e393d4bb8e3e6280b4249d4658f8ebefd0e7d8b013ca5a650251766e5efb12a460089e0
-MISC metadata.xml 1214 BLAKE2B 1a3dfda02a96ea7115bd06b3bbcc7ffe283b4e0fb4a68bffa56aed7064c2f6584984f083e8fabae0af7e9a363a7d7fa528f53ae45e585060d005fe6bc6291ee8 SHA512 1e5cdbf0f8c8669c2fc8b6988beca291b73b8457442f005acada1856049f545302a4ceeacdbf9c7faa9658a9f28532dbe915a697b7576d87a8a3b9820b1cf9aa
+MISC metadata.xml 1225 BLAKE2B 0ecba5279d318553ec1c4beb6b2dfc0c1386de48f92ed289051aac0938284d82b7be66985fb071d93808fc086260937ebdf440df83864d324d0d8aa1158db502 SHA512 73ebe5709000bfa8cfe3ec6992b021d85d80e0200bbf1ce8d19153632e835f2c8dbb3afc283eeecd4b95be087d17bf73f0de9c4b6ce89ce4b37c90413e4b970e
diff --git a/media-gfx/darktable/darktable-3.0.2.ebuild b/media-gfx/darktable/darktable-3.0.2.ebuild
deleted file mode 100644
index 4fd99f7da34f..000000000000
--- a/media-gfx/darktable/darktable-3.0.2.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic toolchain-funcs xdg
-
-DOC_PV="3.0.0"
-MY_PV="${PV/_/}"
-MY_P="${P/_/.}"
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="https://www.darktable.org/"
-SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
- doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
-
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-KEYWORDS="amd64"
-LANGS=" ca cs da de es fr he hu it ja nb nl pl ru sl"
-# TODO add lua once dev-lang/lua-5.2 is unmasked
-IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
- nls opencl openmp openexr tools webp
- ${LANGS// / l10n_}"
-
-BDEPEND="
- dev-util/intltool
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
-"
-COMMON_DEPEND="
- dev-db/sqlite:3
- dev-libs/json-glib
- dev-libs/libxml2:2
- >=dev-libs/pugixml-1.8:0=
- gnome-base/librsvg:2
- >=media-gfx/exiv2-0.25-r2:0=[xmp]
- media-libs/lcms:2
- >=media-libs/lensfun-0.2.3:0=
- media-libs/libpng:0=
- media-libs/tiff:0
- net-libs/libsoup:2.4
- net-misc/curl
- sys-libs/zlib:=
- virtual/jpeg:0
- x11-libs/cairo
- >=x11-libs/gtk+-3.22:3
- x11-libs/pango
- colord? ( x11-libs/colord-gtk:0= )
- cups? ( net-print/cups )
- flickr? ( media-libs/flickcurl )
- geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
- gnome-keyring? ( >=app-crypt/libsecret-0.18 )
- gphoto2? ( media-libs/libgphoto2:= )
- graphicsmagick? ( media-gfx/graphicsmagick )
- jpeg2k? ( media-libs/openjpeg:2= )
- opencl? ( virtual/opencl )
- openexr? ( media-libs/openexr:0= )
- webp? ( media-libs/libwebp:0= )
-"
-DEPEND="${COMMON_DEPEND}
- opencl? (
- >=sys-devel/clang-4
- >=sys-devel/llvm-4
- )
-"
-RDEPEND="${COMMON_DEPEND}
- kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
-"
-
-PATCHES=(
- "${FILESDIR}"/"${PN}"-find-opencl-header.patch
- "${FILESDIR}"/${PN}-3.0.2_cmake-opencl-kernel-loop.patch
- "${FILESDIR}"/${PN}-3.0.2_jsonschema-automagic.patch
-)
-
-S="${WORKDIR}/${P/_/~}"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- # Bug #695658
- if tc-is-gcc; then
- test-flags-CC -floop-block &> /dev/null || \
- die "Please switch to a gcc version built with USE=graphite"
- fi
-
- if use openmp ; then
- tc-has-openmp || die "Please switch to an openmp compatible compiler"
- fi
- fi
-}
-
-src_prepare() {
- use cpu_flags_x86_sse3 && append-flags -msse3
-
- sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_CURVE_TOOLS=$(usex tools)
- -DBUILD_NOISE_TOOLS=$(usex tools)
- -DBUILD_PRINT=$(usex cups)
- -DCUSTOM_CFLAGS=ON
- -DUSE_CAMERA_SUPPORT=$(usex gphoto2)
- -DUSE_COLORD=$(usex colord)
- -DUSE_FLICKR=$(usex flickr)
- -DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
- -DUSE_KWALLET=$(usex kwallet)
- -DUSE_LIBSECRET=$(usex gnome-keyring)
- -DUSE_LUA=OFF
- -DUSE_MAP=$(usex geolocation)
- -DUSE_NLS=$(usex nls)
- -DUSE_OPENCL=$(usex opencl)
- -DUSE_OPENEXR=$(usex openexr)
- -DUSE_OPENJPEG=$(usex jpeg2k)
- -DUSE_OPENMP=$(usex openmp)
- -DUSE_WEBP=$(usex webp)
- )
- CMAKE_BUILD_TYPE="RELWITHDEBINFO"
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
-
- if use nls ; then
- for lang in ${LANGS} ; do
- if ! use l10n_${lang}; then
- rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
- fi
- done
- fi
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- elog
- elog "When updating a major version,"
- elog "please bear in mind that your edits will be preserved during this process,"
- elog "but it will not be possible to downgrade any more."
- elog
- ewarn "It will not be possible to downgrade!"
- ewarn
-}
diff --git a/media-gfx/darktable/darktable-3.2.1.ebuild b/media-gfx/darktable/darktable-3.4.0.ebuild
index 49e44beeb082..ffafc687cb4b 100644
--- a/media-gfx/darktable/darktable-3.2.1.ebuild
+++ b/media-gfx/darktable/darktable-3.4.0.ebuild
@@ -3,9 +3,11 @@
EAPI=7
-inherit cmake flag-o-matic toolchain-funcs xdg
+LUA_COMPAT=( lua5-3 )
-DOC_PV="3.0.0"
+inherit cmake flag-o-matic lua-single toolchain-funcs xdg
+
+DOC_PV="3.4.0"
MY_PV="${PV/_/}"
MY_P="${P/_/.}"
@@ -17,12 +19,13 @@ SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_P
LICENSE="GPL-3 CC-BY-3.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64"
-LANGS=" de es fr he it pl pt-BR ru sl"
-# TODO add lua once dev-lang/lua-5.2 is unmasked
-IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
- lto nls opencl openmp openexr tools webp
+LANGS=" af cs de es fi fr he hu it pl pt-BR ru sk sl"
+IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
+ lto lua nls opencl openmp openexr system-lua tools webp
${LANGS// / l10n_}"
+REQUIRED_USE="system-lua? ( lua ${LUA_REQUIRED_USE} )"
+
BDEPEND="
dev-util/intltool
virtual/pkgconfig
@@ -50,12 +53,14 @@ COMMON_DEPEND="
cups? ( net-print/cups )
flickr? ( media-libs/flickcurl )
geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+ gmic? ( media-gfx/gmic )
gnome-keyring? ( >=app-crypt/libsecret-0.18 )
gphoto2? ( media-libs/libgphoto2:= )
graphicsmagick? ( media-gfx/graphicsmagick )
jpeg2k? ( media-libs/openjpeg:2= )
opencl? ( virtual/opencl )
openexr? ( media-libs/openexr:0= )
+ system-lua? ( ${LUA_DEPS} )
webp? ( media-libs/libwebp:0= )
"
DEPEND="${COMMON_DEPEND}
@@ -99,19 +104,23 @@ src_prepare() {
}
src_configure() {
+ # As of darktable-3.2.1, AVIF support is not compatible with >=media-libs/libavif-0.8.0; see Bug #751352.
local mycmakeargs=(
-DBUILD_CURVE_TOOLS=$(usex tools)
-DBUILD_NOISE_TOOLS=$(usex tools)
-DBUILD_PRINT=$(usex cups)
-DCUSTOM_CFLAGS=ON
+ -DDONT_USE_INTERNAL_LUA=$(usex system-lua)
-DRAWSPEED_ENABLE_LTO=$(usex lto)
+ -DUSE_AVIF=no
-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-DUSE_COLORD=$(usex colord)
-DUSE_FLICKR=$(usex flickr)
+ -DUSE_GMIC=$(usex gmic)
-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
-DUSE_KWALLET=$(usex kwallet)
-DUSE_LIBSECRET=$(usex gnome-keyring)
- -DUSE_LUA=OFF
+ -DUSE_LUA=$(usex lua)
-DUSE_MAP=$(usex geolocation)
-DUSE_NLS=$(usex nls)
-DUSE_OPENCL=$(usex opencl)
diff --git a/media-gfx/darktable/files/darktable-3.0.2_cmake-opencl-kernel-loop.patch b/media-gfx/darktable/files/darktable-3.0.2_cmake-opencl-kernel-loop.patch
deleted file mode 100644
index c1fd701fb9a4..000000000000
--- a/media-gfx/darktable/files/darktable-3.0.2_cmake-opencl-kernel-loop.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 767d48e0f60e7f858e8b31a88dd8cc1258e7ee9e Mon Sep 17 00:00:00 2001
-From: Marcus Haehnel <marcus@mh-development.info>
-Date: Sat, 21 Mar 2020 09:14:45 +0100
-Subject: [PATCH] Fix invalid CMake syntax
-
-The syntax of the foreach statement in data/kernels/CMakeLists.txt
-was invalid. This lead to errors when running cmake.
-
-Use correct syntax to make the build work.
----
- data/kernels/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/data/kernels/CMakeLists.txt b/data/kernels/CMakeLists.txt
-index ce947bef9c..f605c18b7e 100644
---- a/data/kernels/CMakeLists.txt
-+++ b/data/kernels/CMakeLists.txt
-@@ -31,8 +31,8 @@ macro (testcompile_opencl_kernel IN)
- endmacro (testcompile_opencl_kernel)
-
- if (TESTBUILD_OPENCL_PROGRAMS)
-- foreach(IN ${DT_OPENCL_KERNELS})
-- testcompile_opencl_kernel(${IN})
-+ foreach(KERNEL IN ITEMS ${DT_OPENCL_KERNELS})
-+ testcompile_opencl_kernel(${KERNEL})
- endforeach()
- endif()
-
diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
index f7f953454f3a..5661ac61bfdc 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -16,7 +16,7 @@
<flag name="kwallet">Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg></flag>
<flag name="lto">Enable link-time optimisations in the RawSpeed library</flag>
<flag name="opencl">Enable opencl support</flag>
- <flag name="system-lua">Use dev-lang/lua instead of the bundled liblua</flag>
+ <flag name="system-lua">Use <pkg>dev-lang/lua</pkg> instead of the bundled liblua</flag>
<flag name="tools">Install tools for generating base curves and noise profiles</flag>
</use>
<upstream>
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 237892175ba7..d30ee77610e0 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,3 +1,5 @@
DIST eog-3.36.3.tar.xz 3651556 BLAKE2B 6224b21342b24bed8cfed5702c440547423a7c0db36278c082f336f274ebabea401700c418eafced814fb33043362963055acbcacc81edff8b0f202898c09542 SHA512 90205561dbc49aa42e60f636ce23d04dcd05513d28176ffa4c1dd6602889c4b2c920bd299086d3d7bfee72fcc6a029e2d34e14eb80ba5f91573161fbd1b85aea
+DIST eog-3.36.4.tar.xz 3651632 BLAKE2B f971ab236422a875ea8d91a661c6c653ba2ef4834b282dcce7d5c53e9c23bedf49610c0a8ff1bedb2af1821610ab29de8476a2b13b6cb1b82e58c3309b56b7dd SHA512 d1f4aa2e225a8147507cbed74a74bd435887884a2431f3ea0d1c569217a291f93c1440bede1c6abf03660ad8df46530e8b2195399ac8faaac36b1e31e8e93daf
EBUILD eog-3.36.3.ebuild 1556 BLAKE2B 6ba5e5184a6916dcc56b4879ca3abf4e5eff4711fcdc97c3a56a415f3564d1b02ec74dbf270b0586e9496ba421b9bae052591a40aeebb789e22867b1d6443dba SHA512 c59d6e36cec5e04be93567fe493f62885effd1a828240aed0e4d5afe04d31a1615d237294814eef7c774ac009cccf0cadea8c86881908df08a1a312a774f9e06
+EBUILD eog-3.36.4.ebuild 1558 BLAKE2B fc7954cbc8763a3d4037bfc445576b8a1e0b7f5db72e59e5d5f35879a59c12a0ce96d1ae68fd2af8eeb4218082c0af2bd9f9d47f8ea68a8080ee1b317de636f9 SHA512 f2527c036b67ff6cd1d9047014117f65b6497ecf4fe09398301d32ae97b9ff8ae21665138e4565cec2d747e83815f9312ca08a50546dcf7ca3144f9321c37dfd
MISC metadata.xml 481 BLAKE2B 2c12b594b9a5b1e4ce3983131d1911f62026c5186d8f5c5af13842cfedfa4d20abdc5ee82e11db3a2e1b45e2b8d4d95fa1a62e668936956e8453b166daff00b4 SHA512 141ec1d6923697f744de806804279b602120ce3d5494257de36b8c8b71185d101692f2e438d7ba0e4a4c946d0aaba068117f16c8344abe891e0ddd4f768ded26
diff --git a/media-gfx/eog/eog-3.36.4.ebuild b/media-gfx/eog/eog-3.36.4.ebuild
new file mode 100644
index 000000000000..75800455eb94
--- /dev/null
+++ b/media-gfx/eog/eog-3.36.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="The Eye of GNOME image viewer"
+HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome"
+
+LICENSE="GPL-2+"
+SLOT="1"
+
+IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
+REQUIRED_USE="exif? ( jpeg )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+ >=dev-libs/glib-2.53.4:2
+ >=dev-libs/libpeas-0.7.4:=[gtk]
+ >=gnome-base/gnome-desktop-2.91.2:3=
+ >=gnome-base/gsettings-desktop-schemas-2.91.92
+ >=x11-misc/shared-mime-info-0.20
+ >=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?]
+ >=x11-libs/gtk+-3.22.0:3[introspection,X]
+ sys-libs/zlib
+
+ exif? ( >=media-libs/libexif-0.6.14 )
+ lcms? ( media-libs/lcms:2 )
+ xmp? ( media-libs/exempi:2 )
+ jpeg? ( virtual/jpeg:0 )
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+ svg? ( >=gnome-base/librsvg-2.44.0:2 )
+
+ x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ gtk-doc? ( >=dev-util/gtk-doc-1.16
+ app-text/docbook-xml-dtd:4.1.2 )
+ dev-util/glib-utils
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use exif libexif)
+ $(meson_use lcms cms)
+ $(meson_use xmp)
+ $(meson_use jpeg libjpeg)
+ $(meson_use svg librsvg)
+ $(meson_use gtk-doc gtk_doc)
+ $(meson_use introspection)
+ -Dinstalled_tests=false
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 1bbf9a5cc225..157b66ab16dd 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -3,5 +3,5 @@ AUX graphviz-2.34.0-Xaw-configure.patch 2445 BLAKE2B fc1b3820fd72821ac431f5d93d0
DIST graphviz-2.42.3.tar.gz 26246717 BLAKE2B 71c61dcd056c9a2e2655c3be995d1da17b3af0d3374e74400fc38da11ab81849f7b5e528f99fc2046294958a4bab0a411ab204e434360f316a5367403472e8a1 SHA512 e03ca6da0ddb1162bd179d159d7dbb379d55012d63bb922aa800260fce52b65beb1a9b5ca1a5199ad3537201b0b4841efc9facee6e03065c6bd02e840f8a29c9
DIST graphviz-2.44.1.tar.gz 34079677 BLAKE2B 90183afa6affedb097eab237fae148a9c085c3a724fb74d370f7c042b53d09b44ba0cb755a2ac74175d89d3a45687b60f0e210bdd404fc72da98bdf61b9eaa8d SHA512 42e6137c7cce18daf6f17e6fcbbdfe8e0a531de1bdd3ac7b8751445214aa0d85713b65ba896a234a02670827b0d608bd64b758ef60a4d0384ffa3355ee0dbc42
EBUILD graphviz-2.42.3-r1.ebuild 7864 BLAKE2B 4390c7d22ec3e914d25445eda9ffab4bd879c5a1316355a69cd0cea756a3d85c15c3dc31bcbf97161de877eb70605e230b7a43b2c3201d980387f49653231278 SHA512 9105485fa2e67399edd207249ad80ed7b16c2f9378b33e2f844f402a4e7cbef53868ef8fb4800d06672deb75f62a51ec68949fd2d16c2cf345846116c0e68b74
-EBUILD graphviz-2.44.1-r1.ebuild 7837 BLAKE2B eb30898121035261a7bf7bd92d1ec865acf862228777562db4ff2598113cf2a427264ba6bf0beedd599a8105e5bc988e86400b08aa1022a9e90506b2876d331e SHA512 1b209908a66e85ea977d5aebff2d4e9aaaae7ed60d855d38bbb7a2a117033b8d56d1cee9d4e501c33854f1803e7439a93ea18219c3428066236c134580b56ca3
+EBUILD graphviz-2.44.1-r1.ebuild 7829 BLAKE2B 53dad08039b054f939c31df70d12b4c95bf976ed1702276b6910a276391f8afef0e738d219690f77cbbfbddc40749ad7e90c61d75b9f212ab315103fadfe7525 SHA512 60e4e77103b821c119d9baed123ad407e4de0d703ef818297e23397449dcde5d1e931e76e1281a8292cffd488a9c9d1dde6b4e457a3964117b6d8b4877498171
MISC metadata.xml 2244 BLAKE2B 61cc818a6f736cee316c026bef8f02dc03ffa3c63f620832fd063f00111178b07be4c5224f5d4fc0f1cddbfc3180e31ac277d493107e0d716d0d2f05c7272633 SHA512 e8c8d5b2abf9c21c6fe8dd7e3489210275065a2f0f64023f5aa52fac2b2646b974fc36c60aa189be022728384ff223aae5856095846dc5ea85638d1b882ad7e0
diff --git a/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild b/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
index 99dae78ef38b..f2bc8c49bae3 100644
--- a/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www2.graphviz.org/Packages/stable/portable_source/${P}.tar.gz"
LICENSE="CPL-1.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="+cairo devil doc examples gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD"
REQUIRED_USE="
diff --git a/media-gfx/grub-splashes/Manifest b/media-gfx/grub-splashes/Manifest
index 7b9d85576203..f429d4d3788b 100644
--- a/media-gfx/grub-splashes/Manifest
+++ b/media-gfx/grub-splashes/Manifest
@@ -1,5 +1,5 @@
DIST 49074-natural_gentoo-8.0.tar.gz 278632 BLAKE2B 3318f98c80cc9be652fae4e6f1152dc01692c40e5fd4144009407bca176266e408787f12f2f304873fb84c7c3522905cfcdafc8a3c3e9bd70174d3b1e8f714f0 SHA512 49ede8f41139e2b0e88e173ac9157566c71abec567275aa582db81b3455eddeb3c48b61a66a10ff93bd421c9b45527278debd03c1c93040aa74c81356f280870
DIST 98478-gentoo-splash.xpm.gz 18681 BLAKE2B 65969e247cd7c348c4a1c3cd4de5e4d3c4e888eefa11166b1be75272c66b2c7d88beda3bd25581c52d3f7325dc4821f15350bd826f5974444b48ccca19424ea0 SHA512 ea3b6d284e5d41462dede7705a2aa5b6655c1f6aae630cd508dc653391c741cf0a3f487e5694e50769e23696c16279280f89325cfdb47994d8d7210eb447117d
DIST grub-splashes-0.1.tar.gz 180413 BLAKE2B 4007da6ee3ce221ca6027354c611bdfe54645b484bedeaa84664a82fccadb46a4de2b3bd0b3c9a8eef4af2fce9df23481e9e2f9a18e1999be28245a4a50a3e37 SHA512 af96ff45778ccf062d26ac1fd0ea9cf47678faf9c0891040580e0563ef5591fc9b2c34d338568b77c0683d7c8814b89ff7d62dec582fb714ae503a86ff6b84be
-EBUILD grub-splashes-20091109.ebuild 1018 BLAKE2B d6de69050ad2bff9aadf8de3bda78be792428c4289bbf5666f3229a01f50307049bf45f1ceb3f9eff088fdabb6705ed7665f61efc1e045ed2ef75e01872d66d4 SHA512 ec9ab1f189473f71d65652a32aafdbee502203be6e1f359d5cb7a154eefa7163d9fb3b859091e6967df777a70410364e2a154d201cfc1cce54f26d314919abb6
+EBUILD grub-splashes-20091109.ebuild 1015 BLAKE2B 78d7cd7d98a7de4ed8b82d0748e5d47c273735d87c8bbc9d69b676d00928c8293aaf6fa980a2810e9c1c7c87ba7f12cda35e016efaf3b5aa7cd5ab0198395183 SHA512 88af3374c4833e15088be50d699e186d3e65bb92d4f324afa30f6bb37d36d3b6e173585e3e464f2110f6d29917adda63bd71558e5a15aedcba7d545a74ce30d9
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/grub-splashes/grub-splashes-20091109.ebuild b/media-gfx/grub-splashes/grub-splashes-20091109.ebuild
index bfae4f9cf8e5..f9e3edde5ce0 100644
--- a/media-gfx/grub-splashes/grub-splashes-20091109.ebuild
+++ b/media-gfx/grub-splashes/grub-splashes-20091109.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 805405e2e5ca..20e995cbd026 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,6 +1,6 @@
DIST hugin-2019.2.0.tar.bz2 10335030 BLAKE2B 4fbcb974eea01dbd8d722f64b5cadfd1b3fe101e5e7849d069c531e55e1ea71c226bcb1550b59374bbe8adf111b7c0bc5e48c14f45bdb685486cbeccde5add70 SHA512 2ddfe7468a474c385ef66a88c3a5a2491183765ae431e5044f504d2e95ec3cb99c0b97b98dda282ba7950f6f2001f46b2f2ea39b9025718c2a329dea967685c1
DIST hugin-2020.0.0.tar.bz2 10371301 BLAKE2B f5092dfe3c61344f8b03e14dd85903ae6f5170989b6824578bd3350408d7a11be2c2f9cd83d030a3967b81e4125cf97af075d79136a93e06de3fac8901859c6d SHA512 4c55767c630ea03faf359bda606e5e9e7709a47ab41e821772da8c6da0cf658b1d31d7d8e96ea1c41ec61bdeb2da8c86c92b5d6964a9301732a13137178ec04e
EBUILD hugin-2019.2.0.ebuild 2337 BLAKE2B 9ca08518fef5bb7d3167cc01caa64da8bd076142174e000cd3881f855644e8e95021149104d86ef82973c6d073eddbaccaf7ea0e8621e3a8e458562d4b7f5b6f SHA512 a17162e5db9fad823f35f867f96e13bb443e2150da84b54d71577a4c33cdbf9497da3d1b3cc0ee051ee7ed607a877133dd6e4483e2a86f150f27f7558e8627cc
-EBUILD hugin-2020.0.0.ebuild 2144 BLAKE2B 3d5e2cd2a531552be99fce17f722f71fc24ff513293b6ee53faf7b2e673bce44c56257eb1903317396aabc47929c68ba9653053099240d934855d7f008175320 SHA512 9e4f95d87863101cd67a21aa5c78d58fbde97b63b8a255f8c23bac5f607e42a884e43a43037d07a81b26838c25b6f84bec4bfdba1e5da56965ab4f702e5835b1
-EBUILD hugin-9999.ebuild 2058 BLAKE2B d7f7ab9b065dcc31cc85033a044b3e8da912779069709e2c1c02c3958744896c9c84cfb2bbf9c802b444e92ce6f6cd86d402254d3b2e5eb5f2b2b766eef069e0 SHA512 65ead2eab2416af88e8529704ee0c936901d3512558e1433eaff5ec3b3db5ba8659b2f72fd4613cc305afb9461003841ce7e3c04b8bbd201c8842ab7ddb5c5c7
+EBUILD hugin-2020.0.0-r1.ebuild 2125 BLAKE2B 7fed3491685573cf5288d91c1bd8287372eb1b93fd729028a3fdca9d4cbbaf247ece8376eb91ebb4a7ac6bd3af66fcc69f710e714a90e5f42bc7415d838753fa SHA512 d013ac7b751f6d624db2744349fa100fe240b40d106b29c443bc37b2ce30738423da5096babe7d4e37abb17b377b1741a612a40cee58eea8b8aec017b534a4ac
+EBUILD hugin-9999.ebuild 2065 BLAKE2B f64cb2ca7c5eadade0e76545a7f3fe778e41e22509eb8a2149bd2e45efc0de33193dbbcb52820878b85e08b1b977c38ca99b62163196334fc5ca5d90d8eb8f77 SHA512 eeb41148cd7ca8cca9429fa2e231007ba99885790563a266c05730a62ee3be1a513927d632aede8e1e2f10c1965bfc03d66cb6326c0f1a1a239d5c61a194b90b
MISC metadata.xml 546 BLAKE2B efad9c27562890b23594411333a0ef827b7e54acde132ffdec4f664eae37fb3ab270950ef650e6caaea4bd3b69a7bed469e794dce51d59850cd06ff844e08836 SHA512 0d096754e2f6ef1468e6bdf7464e6f5cc1de06f20136b68be7aaf199cd78a10e4213678d875ff61d829f692dbd5b0728d50bb35eefb1de6af4e5e0fd7d91d350
diff --git a/media-gfx/hugin/hugin-2020.0.0.ebuild b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
index 7c7d2c57f260..60bec67bbd97 100644
--- a/media-gfx/hugin/hugin-2020.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-WX_GTK_VER="3.0"
+WX_GTK_VER="3.0-gtk3"
PYTHON_COMPAT=( python3_{6,7,8} )
-inherit python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
+inherit python-single-r1 wxwidgets cmake xdg
DESCRIPTION="GUI for the creation & processing of panoramic images"
HOMEPAGE="http://hugin.sf.net"
@@ -39,7 +39,7 @@ CDEPEND="
virtual/glu
virtual/jpeg:0
virtual/opengl
- x11-libs/wxGTK:3.0=[X,opengl]
+ x11-libs/wxGTK:${WX_GTK_VER}=[X,opengl]
lapack? ( virtual/blas virtual/lapack )
python? ( ${PYTHON_DEPS} )
sift? ( media-gfx/autopano-sift-C )"
@@ -68,7 +68,7 @@ src_prepare() {
-e "/COMMAND.*GZIP/d" \
-e "s/\.gz//g" \
"${S}"/doc/CMakeLists.txt || die
- cmake-utils_src_prepare
+ cmake_src_prepare
}
src_configure() {
@@ -76,11 +76,11 @@ src_configure() {
-DBUILD_HSI=$(usex python)
-DENABLE_LAPACK=$(usex lapack)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
use python && python_optimize
local lang
diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild
index 3eb92a7c66c7..0c9e3ac20a0f 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+WX_GTK_VER="3.0-gtk3"
+PYTHON_COMPAT=( python3_{6,7,8} )
-inherit mercurial python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
+inherit mercurial python-single-r1 wxwidgets cmake xdg
DESCRIPTION="GUI for the creation & processing of panoramic images"
HOMEPAGE="http://hugin.sf.net"
@@ -19,7 +19,7 @@ SLOT="0"
KEYWORDS=""
LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW"
-IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
+IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
CDEPEND="
!!dev-util/cocom
@@ -41,12 +41,13 @@ CDEPEND="
virtual/glu
virtual/jpeg:0
virtual/opengl
- x11-libs/wxGTK:3.0=[X,opengl]
+ x11-libs/wxGTK:${WX_GTK_VER}=[X,opengl]
lapack? ( virtual/blas virtual/lapack )
python? ( ${PYTHON_DEPS} )
sift? ( media-gfx/autopano-sift-C )"
RDEPEND="${CDEPEND}
- media-libs/exiftool"
+ media-libs/exiftool
+ raw? ( media-gfx/dcraw )"
DEPEND="${CDEPEND}
dev-cpp/tclap
sys-devel/gettext
@@ -65,7 +66,7 @@ pkg_setup() {
}
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
}
src_configure() {
@@ -73,11 +74,11 @@ src_configure() {
-DBUILD_HSI=$(usex python)
-DENABLE_LAPACK=$(usex lapack)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
use python && python_optimize
local lang
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 3c3b1e778bb6..4b36c628ec24 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.11-44.tar.xz 9155096 BLAKE2B efd52ca6d30a385f29f0fda102c58d89dff6b80d702391a39d52cb59835fe258a21b171a64dfefd91f15d377177219de1a1db1b2e8bb2e3337119497a38b272e SHA512 dcf2965f1751c50649c74160b29f6909b6fa2dfdf64520d0f55be9fe0eef02aac32f9c376756295c90b9c89b2947890249ca0e41f0cc56e2ec4b37678bc92372
DIST ImageMagick-6.9.11-46.tar.xz 9165256 BLAKE2B 5fb2c7ef90c165388bf9c9b42d752823e62b94a631f8dd8161d8c71b718154b5f577474a7074f42644e994af1aec99f28c4d69913be3045865cbc87533c05fca SHA512 63022225e694dccbfb52eec3793332bc92ff2d6a51a6ed161d63e044a33c8d13f0a2630afc1935cb139ca2d0e141d99a9bec23f5eac82a488a461ed30baf85f5
-DIST ImageMagick-7.0.10-44.tar.xz 9649740 BLAKE2B b721532e267c2832252519b52fd6f88795e0bc22cc165020478dc80164784a0407e0eec066ecf8db68409e04a48e877d16f882e773f34c50797784ba771ec997 SHA512 246567c84ecaaba4f7742c215b2d79f181fedd3ba953d318f177916e5a3757ddbae111837657a5df4b420da3b1337b1ec78c871c57b3e738585ee847a7b9d768
+DIST ImageMagick-6.9.11-52.tar.xz 9152084 BLAKE2B bc50767e3eacc06ccf6168d9cac5666a2836e3b2085ee834594da419c2912cafce7dee84573f1a2062e051afb066529ae79b7bea25242fb055fdd11e734ee0d7 SHA512 79e6ab62722060601283f4c172f7a27b7d3c00f5dbdfaea4c1f5c1940a681ab3fd53e4ea4b736adc3e0662ecccba13f7f86baada3d319733191eda37abee38a1
DIST ImageMagick-7.0.10-46.tar.xz 9649132 BLAKE2B 8083aa4fa26d59c4bea4bd9a45ab5b1a46d3fe0ecdbb0090588d16bcc31ad044171a59dc7e8681c878e885d83c7b34a4bbfa21273d5711181bbefdee457ac895 SHA512 7008286a05a1794a3061bd598bf6acc70dcfe1aec3a6b5632dce9dd87bb6c28385af0d469b47996d5576c4b39c5d48a4fcd7752b9353ec28b7f7d8160f4c5023
-EBUILD imagemagick-6.9.11.44.ebuild 7047 BLAKE2B c8a589ac24fb824399cdf0459e46d52fa5aa08b184befdb8d7c991778e41fa91a30e89d6e1cab206969c47d9d438977528c6ad533da242398c380c434b0cf8db SHA512 ea9007174ea7d0eb0c583e659e761f25904f63981d88c41e03ffb6680e58885f8cc6faa6bb2f63686e69137b1ad0acd815e646993fe6b2ec7d25be51b6c5e3c9
-EBUILD imagemagick-6.9.11.46.ebuild 7054 BLAKE2B c1f4280b7d3380b01a44f33af60b062eeb2c98f0850dcd3d4fe88ebe292ad5c2e299c018983724b96f18461c0acdb6f9807ccaf8b233328a5ff2c00582734255 SHA512 9aa1c7e617fe258be2eb1f7f0f9d462a51d6d0884edab102fbfa70936891b3371e1d86fa059648fccfb52a25645fb6376171d55ce20f7d6de267445c0f958b97
-EBUILD imagemagick-7.0.10.44.ebuild 7356 BLAKE2B d2f907df96ed9c207652de11dc4178b3ac6c6ced8ee759a78bfeb7d8c8e152a73dbd03ff146a1dd8eb66155cc09612621c0c5aaee394461127b2f80707e20eab SHA512 26ee49e6b467c1c777ef2acfa5740601ae529b1a4aed6dd07c287ad2246d21edfa72285a63c4f27e1241e81b485b3ccad14ddf9aa58eea63949cb6f68c7e9c1b
-EBUILD imagemagick-7.0.10.46.ebuild 7364 BLAKE2B 5067a5a79b93c7ea8364940352cc4988393ceb86a08e617dd95a309022be37b60dd9ffd1621c1a799cb372608f75c213d7fc1ddb13340225ad4643c408630bc4 SHA512 85560f10889069420c6459e696aa96d7306486bea2410d8f3bdc9160995eaad65b10ca171c2a39a170ba21043bb4cd84f5e6e0776e020ecf1286b84611430981
+DIST ImageMagick-7.0.10-52.tar.xz 9642352 BLAKE2B c1a86214978da88d66ef90b91516482fe67ee5e215fd5d76c79dbbcd9e33cc2d417d8f5d8e29056743737dd2275fe7a8d891b6ad2f3c8d7d5ab0adfd83f60dd1 SHA512 da1a8d53af0dc8f0dc8f71a7d41c5277c1e17f81e03a3c54852ced65d5d379577989e274bac66926c8a10f4d2f2834f7456b79635007252308ca593e98ef6d43
+EBUILD imagemagick-6.9.11.46.ebuild 7047 BLAKE2B c8a589ac24fb824399cdf0459e46d52fa5aa08b184befdb8d7c991778e41fa91a30e89d6e1cab206969c47d9d438977528c6ad533da242398c380c434b0cf8db SHA512 ea9007174ea7d0eb0c583e659e761f25904f63981d88c41e03ffb6680e58885f8cc6faa6bb2f63686e69137b1ad0acd815e646993fe6b2ec7d25be51b6c5e3c9
+EBUILD imagemagick-6.9.11.52.ebuild 7054 BLAKE2B c1f4280b7d3380b01a44f33af60b062eeb2c98f0850dcd3d4fe88ebe292ad5c2e299c018983724b96f18461c0acdb6f9807ccaf8b233328a5ff2c00582734255 SHA512 9aa1c7e617fe258be2eb1f7f0f9d462a51d6d0884edab102fbfa70936891b3371e1d86fa059648fccfb52a25645fb6376171d55ce20f7d6de267445c0f958b97
+EBUILD imagemagick-7.0.10.46.ebuild 7356 BLAKE2B d2f907df96ed9c207652de11dc4178b3ac6c6ced8ee759a78bfeb7d8c8e152a73dbd03ff146a1dd8eb66155cc09612621c0c5aaee394461127b2f80707e20eab SHA512 26ee49e6b467c1c777ef2acfa5740601ae529b1a4aed6dd07c287ad2246d21edfa72285a63c4f27e1241e81b485b3ccad14ddf9aa58eea63949cb6f68c7e9c1b
+EBUILD imagemagick-7.0.10.52.ebuild 7364 BLAKE2B 5067a5a79b93c7ea8364940352cc4988393ceb86a08e617dd95a309022be37b60dd9ffd1621c1a799cb372608f75c213d7fc1ddb13340225ad4643c408630bc4 SHA512 85560f10889069420c6459e696aa96d7306486bea2410d8f3bdc9160995eaad65b10ca171c2a39a170ba21043bb4cd84f5e6e0776e020ecf1286b84611430981
EBUILD imagemagick-9999.ebuild 7364 BLAKE2B 5067a5a79b93c7ea8364940352cc4988393ceb86a08e617dd95a309022be37b60dd9ffd1621c1a799cb372608f75c213d7fc1ddb13340225ad4643c408630bc4 SHA512 85560f10889069420c6459e696aa96d7306486bea2410d8f3bdc9160995eaad65b10ca171c2a39a170ba21043bb4cd84f5e6e0776e020ecf1286b84611430981
MISC metadata.xml 1106 BLAKE2B e77cabff89df6b98687290ef0ee06d85111a7ddca6f5e1e31f820e6d186a6510c2afd0b85ba31004f102fd7f7b88f46af101f4ba45011aac75afa40b0a714857 SHA512 68a5f9a80b1e3f2e3004252703f9b3176d7c59880a2724ae431fdfd97e8f2adcd7ff7ad2cd8ea8bd35645a3b559052f2c38713647ce7ae889ff1a6061e6b2d92
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.46.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.46.ebuild
index 671132b9e8fb..2093cc705f7b 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.11.46.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.46.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
LICENSE="imagemagick"
SLOT="0/6.9.11-37"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
REQUIRED_USE="corefonts? ( truetype )
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.44.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.52.ebuild
index 2093cc705f7b..671132b9e8fb 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.11.44.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.52.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
LICENSE="imagemagick"
SLOT="0/6.9.11-37"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
REQUIRED_USE="corefonts? ( truetype )
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.46.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.46.ebuild
index c476290b8c6a..e5576b5108a8 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.10.46.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.46.ebuild
@@ -13,7 +13,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.44.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.52.ebuild
index e5576b5108a8..c476290b8c6a 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.10.44.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.52.ebuild
@@ -13,7 +13,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index e1b71f99f0d5..2d7aef44ad56 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,5 +1,5 @@
AUX krita-4.3.1-tests-optional.patch 2583 BLAKE2B 0b5e577bc17ef6b6487ce82ff4b4bc34064c659a3cf48d12a539c3029dd70f17b0b48a7398b68de6a937adff3af0c2d4a47d0f84fdc7746ec612fb05272d963f SHA512 f16885a72cd5f8f250b03903062c70190367ed409c2582d579bfb1e6ab09514df7f96214ce236e33bb8eec2f3872d887f9c3152f4e524b1719250a9064bf719c
DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
DIST krita-4.4.1.tar.xz 169788052 BLAKE2B fe0cbba0e63a3873578c54055b0a11941518a52a9fab17e54f13d26325717a5d6e7f0d6c79d29df2bcc91c39174bc992d2e1e14e1012a5fdd8c447f224e3a190 SHA512 8832202384bae5c73715087b1b3230e459eb780cfa71b7c7bfb92ba4498b8b78575a7b3437aa4b88f396cec47080ccaaaadbc1b1f8bcbcdeb607909fee710afe
-EBUILD krita-4.4.1.ebuild 3378 BLAKE2B cb688076e24516790628ca8e9220d9bd4f6096fc53a0c2ed975edda112583ac4621f84dc28317518eac63e7d51c010576c7bcea6532e57d16a4d7fd219efcf68 SHA512 477c8ca1d6b694f3fb72c976b4ed478a615cbd108aa1a671427e84827f415ad264d4f5b4aa533831dc9f01cd05fdf6868b200f8133856a7741a3a8fb91184bae
+EBUILD krita-4.4.1.ebuild 3385 BLAKE2B 63a617f770915621fb9550298de444c0973ecf7acfa65c2b15e0e974ef8781c250499ca7fbae02a19987cf03c3d90638f0289e9ab3029e127dac01a3d55cea21 SHA512 3c29c5e00b87e0c4f256c8d26407e42832d72643ff287799667df673bf6dc6936415e1146f65341e28c00e939635654aef53d97d1199bda0e414377cc2c6eab9
MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/krita-4.4.1.ebuild b/media-gfx/krita/krita-4.4.1.ebuild
index c33ac85cc1b7..14f14250e7c1 100644
--- a/media-gfx/krita/krita-4.4.1.ebuild
+++ b/media-gfx/krita/krita-4.4.1.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org python-single-r1
if [[ ${KDE_BUILD_TYPE} = release ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz"
- KEYWORDS="amd64 ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
fi
DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index 16d5cca4d8ca..edf22fb397af 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -17,5 +17,5 @@ EBUILD openvdb-4.0.2-r4.ebuild 2621 BLAKE2B bbaafee76eeea4aab92cb434043d069de3b9
EBUILD openvdb-5.2.0-r2.ebuild 2419 BLAKE2B 13838290e15d9cfa3f592dcc840fb08d4ee29a03362a23c5dd4df44af4c1c61e3b512485bfd1ba4487dda38edb58171d1457dd24c4c081c69d2b0afa0050e416 SHA512 0fe29028f37bb9a62cfebba9e4048dbd72b54d368d66ff055bbf6f722f2abc06dc115c33bc613cd5c6776d061f9904513c5fa989c9436b55ef7d884d823d378c
EBUILD openvdb-6.2.1-r1.ebuild 2295 BLAKE2B d80285cba57899fbe0813eaecffcc0eae412bff68001067e35573389497c4117e8378396675fd94e7ac4d0b79119769a07d2cdcdf97fa252981fbed27da0584a SHA512 3c561ff41a27aa0f843afbb6d2031ecef94927e8f6be6f9c2b3a03eea467fbfb62dba25f6fbed65c34bc4b5605f916a8dc24d6414804bbecdd47a510f3e1ad99
EBUILD openvdb-7.0.0-r1.ebuild 2795 BLAKE2B 440272791f4a53f323eee0f4050614d05f989d57c5dc315d0a640a909943472b4a35c108aed40af92809401cf57458cf9a8ce4c891f097dd2bf95bd2af33d38a SHA512 6a2791a989bcc851a1f250da50dc118502029be02e6fe7dc6965c8595644d4921f7622b1e08b029514573163148e5a4df3aecbde2258e1ded373313a70bae910
-EBUILD openvdb-7.1.0-r1.ebuild 2725 BLAKE2B d89bc3fa321c0d6f29427d94e6f1d77e7e2f4ae6e4a13361f205cbc3eb5e84dc22ee5c06bfade5ca357b924291781871518aa92189dabadf1f7205779d6b836b SHA512 bc7d8a1a282ea3a0c4f4ec862cb36bd52841828c4977ac5ac69114f4b0550548993f196f021eb04dc04dd705e822a2f33451885d832ca2f926156e64c982f9d1
+EBUILD openvdb-7.1.0-r1.ebuild 2732 BLAKE2B 271a8d6e6bd1a900c42d6042598d62def51febaa5a472bbbcd915252eb4a7dd6d8a4798e0d52c568b59b13b4f03e2731a9bb0fa2ab7fcb03f5a8ac1476874ac7 SHA512 c67742bee3b499f32c616e5d07f2452e37ae6dcfd55729de40fa6e0e4318dc1505b7438a7f818e0a1a61de73abda3c2a0c0642d9930d59e3e59bf4a003f497e1
MISC metadata.xml 1660 BLAKE2B 56a7113ef4e645a3a508d025f36129c78be342117583f9cc8ba3ffda2518b04bba3d928ad1fa9e78a601a0f1d216bc1744795c170a6cd3421f22c8754f192a98 SHA512 f5e21ebf80b7179b6bd041bcdf5cc53c4aab3cf99f829d9e26e56f3eea40a9d67edf8ec09d63a39b5e1a231df9d2e57b40e008786d25ee00e8ff2ca0ab0c399d
diff --git a/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild b/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild
index 1b5f48159d43..50f2feb253b5 100644
--- a/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild
+++ b/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.g
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 doc numpy python static-libs test utils abi6-compat +abi7-compat"
RESTRICT="!test? ( test )"
diff --git a/media-gfx/pstoedit/Manifest b/media-gfx/pstoedit/Manifest
index c8423757e4d0..ba986832aa8e 100644
--- a/media-gfx/pstoedit/Manifest
+++ b/media-gfx/pstoedit/Manifest
@@ -1,8 +1,4 @@
-AUX pstoedit-3.60-libdl.patch 428 BLAKE2B 8ed39e1a13da74ccecaa2aeec57447fc75b682c9ea5a8fe6586052fd766bc9ab23cb76bdc56bb613cb43672f6d10a05cfaa8bc860865d2586673ab4a9c8642aa SHA512 dc29caf4b1bf1e6ce7cc73fd5ae1682f0aba8a798f632d29cca450bf3883afe54142ea06fbe6d9aa07f2580450780afe1c671cb1c37f1dd800582b2036797f73
-AUX pstoedit-3.70-pkgconfig.patch 627 BLAKE2B 00412e11239e49f12babc35f2225c7ac2a25ce62e59d8b3088c0d7284b867c8919dc70c61bc60cea06e75dee84698eaf223861ad8db09cd36dfdf5ee813aee9c SHA512 8edfc9f0c0db6371405ff16641294c8aebb7dc09e9bc8b9114c7506f4fd494f0361b90abceddad68c351baa2d2917b6212056ed69c0a6dde0d914a2c801888ec
AUX pstoedit-3.75-libdl.patch 432 BLAKE2B 19d6b192c7fa1497f40baff8c039139248be34bbd7f1858e4731da4e631a46dfa8a7e5a9041a5e991a44fb049b0399fad763c65b9a27437d7bcd1d61631fd760 SHA512 010263020e07b57fdde3fa6478cf5865877d71d015a446d8111326d69ce7138467e384bb5f48baa149932a0c4a42d9a60552ff8616125cbc1dabf613cd78df79
-DIST pstoedit-3.70.tar.gz 1013949 BLAKE2B ec459dc56851d942076adf4352ef974188b0b8273a6f9150c8767c1d63c3c9b6d993ea8c0b1a0b59663b31652eb7a4b8697e4c38c23d5aa0572d554120a5e900 SHA512 63668ea039fdf988ba007bafb8dc1f23f06d4eb430a92b97fb93c71b819f63e2708b99476ec9b096598db2ddd30d29a69101f078e7d4fdfec314677f50293cf9
DIST pstoedit-3.75.tar.gz 1290057 BLAKE2B 607a265ea6f058e1ba432d55c4602452cd52a48302441ecee542a113d90b090ce888cc6fa5e3a8e3a2fdbf94dce9b1ab1f7f5ba58ab81f1f509eea9052a3cd82 SHA512 54b8cf7e78e52027d45e7550821476d9a9c4df4f63af83792b6a2909bc62236450ba6b619f95eede9f61a715f4937f1fbaf2ce4ae4b486daa0294c396a882a28
-EBUILD pstoedit-3.70-r1.ebuild 1298 BLAKE2B 050683e34422597851f06393dc58d17c2b30a30e55afc1b35f73011d316f034ac328f644defcb73fbf5e64db47cd553bb41fd2c92bbff3542cae6346fd67ed73 SHA512 a4c08a36a6b7135e482d679a4310536612a09904f668eef29ad07115425d2b0c3c85fc6f20ede32a1c91df1b6566dc44423a86cf6d777e2c0e6c34ff1a334b37
EBUILD pstoedit-3.75.ebuild 1293 BLAKE2B f549f1af21a983957a6101676632123994fa7c57014ef76133f05bcfec37cd37d9c4e5d620688746fddad0577d4077406f5e4639253fa5d8b803f2e35932e2e4 SHA512 d01f29f8263591a0aee8996d17575163c4602f07443c855230da9323d998a068aabffb406d73e5bedd3268c407472da278c587cd6bdf0cc9222140ce188b1427
MISC metadata.xml 633 BLAKE2B 3a142022d38aaf0e5bd5d6df58b8a6e2f94589992eba8a48d875138af60bb44d8893ed91a7dcb169246ff2d2405940c406d5d37f84bfc9c621b8771b96678f05 SHA512 6d62633c23d2b45c5bdf75e8e09e3f58def09a2512e540699857809ea79ddc41c823cc382a9a412b6dc061e02c3b5574c8addc7bebd6e7bb10caa2c2408162a6
diff --git a/media-gfx/pstoedit/files/pstoedit-3.60-libdl.patch b/media-gfx/pstoedit/files/pstoedit-3.60-libdl.patch
deleted file mode 100644
index 279ed715f53a..000000000000
--- a/media-gfx/pstoedit/files/pstoedit-3.60-libdl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 6b33220..30c9f2e 100755
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -139,7 +139,7 @@ libpstoedit_la_SOURCES = \
- genericints.h \
- version.h
-
--libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} -ldl -lm
-+libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} ${LIBLD_LDFLAGS} -lm
- libpstoedit_la_LDFLAGS = -no-undefined
-
- pstoedit_SOURCES = cmdmain.cpp
diff --git a/media-gfx/pstoedit/files/pstoedit-3.70-pkgconfig.patch b/media-gfx/pstoedit/files/pstoedit-3.70-pkgconfig.patch
deleted file mode 100644
index c101077431e5..000000000000
--- a/media-gfx/pstoedit/files/pstoedit-3.70-pkgconfig.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-LIBPNG_LDFLAGS is never substituted...
-https://bugs.gentoo.org/show_bug.cgi?id=551208
-
-Index: pstoedit-3.70/config/pstoedit.pc.in
-===================================================================
---- pstoedit-3.70.orig/config/pstoedit.pc.in
-+++ pstoedit-3.70/config/pstoedit.pc.in
-@@ -7,5 +7,5 @@ Name: pstoedit
- Description: converts PostScript(TM) and PDF files to other vector graphic formats
- Version: @VERSION@.0
- Requires:
--Libs: -L@libdir@ -lpstoedit @LIBPNG_LDFLAGS@ @CXX_STD_LIB@ @CXX_RUNTIME_LIB@ @LIBLD_LDFLAGS@
-+Libs: -L@libdir@ -lpstoedit @CXX_STD_LIB@ @CXX_RUNTIME_LIB@ @LIBLD_LDFLAGS@
- Cflags: -I@includedir@
diff --git a/media-gfx/pstoedit/pstoedit-3.70-r1.ebuild b/media-gfx/pstoedit/pstoedit-3.70-r1.ebuild
deleted file mode 100644
index 23d9052cacf5..000000000000
--- a/media-gfx/pstoedit/pstoedit-3.70-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Translate PostScript and PDF graphics into other vector formats"
-HOMEPAGE="https://sourceforge.net/projects/pstoedit/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="emf imagemagick plotutils pptx static-libs"
-
-RDEPEND="
- >=media-libs/gd-2.0.35-r1:=
- >=app-text/ghostscript-gpl-8.71-r1
- emf? ( >=media-libs/libemf-1.0.3 )
- imagemagick? ( >=media-gfx/imagemagick-6.6.1.2:=[cxx] )
- plotutils? ( media-libs/plotutils )
- pptx? ( dev-libs/libzip )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.60-libdl.patch
- "${FILESDIR}"/${PN}-3.70-pkgconfig.patch
-)
-
-src_prepare() {
- default
-
- sed -i \
- -e '/CXXFLAGS="-g"/d' \
- -e 's:-pedantic::' \
- configure.ac || die
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable static-libs static) \
- $(use_with emf) \
- $(use_with imagemagick magick) \
- $(use_with plotutils libplot) \
- $(use_with pptx) \
- --without-swf
-}
-
-src_install() {
- default
- doman doc/pstoedit.1
- dodoc doc/*.txt
- docinto html
- dodoc doc/*.htm
-
- find "${ED}" -name '*.la' -delete
-}
diff --git a/media-gfx/scrot/Manifest b/media-gfx/scrot/Manifest
index 3a19240da80d..ac574d9355f2 100644
--- a/media-gfx/scrot/Manifest
+++ b/media-gfx/scrot/Manifest
@@ -1,14 +1,6 @@
AUX ax_prefix_config_h.m4 8195 BLAKE2B d2eb17b7730a216f8fa88585b7dce51d641fb9e801a77d8059329a3838a8ce0d4eac02e1229cd087cdbac9f47c7bcfe99bfe0a14e8c4db233c6c4e066ea09b81 SHA512 cf70c3e909da9379ebed51a66fe94cbd7a068574e0ba0da5690f917523b090f29eb23f0464849d6364adc28411258483b0d773ed3488c9e9328d5a1f732427c4
AUX scrot-1.2.bash-completion 1990 BLAKE2B 6c99578185f7d69581854372344088398279af8227fccccff07dcb590ae1a90d6ef9122ba3cf02b0db634fe68554818e63d1cfa54bae0fb1ccb65cf0f84769b4 SHA512 76880911e6799894d68aae78313a114fc18c6bf2f0411a0fdce3f30d33c8ff266290aed9570a546c3a05a71503a130c5cbe2cb6e0f92c240edbc8e9f19362db4
-AUX scrot.bash-completion 1063 BLAKE2B ab03add49bb68db845d1cb599e62dfd4070a8110b5bbf03584fec395a3b0c60262bf3f4fc0ddc1a35c17996a8986107ae3bad053a8974da7c456bdfe7410b424 SHA512 ce8df63bb5b10dbf19f465f2629ebe7045d84105f3da70a49f2bde6a0a416a8f14a02ba3e7d3a8aeba144a592b45a770929b56f6ae7ac867222213ac8f923a0f
-DIST scrot-1.2.tar.gz 36839 BLAKE2B 26ca05fb3c8fa9069ad87bdd5cc93791994e44e2f5cd7a4b729a6c9e3035c349049500b9627fd31532c280465f77f839370d095f1b0f2ccc10649b3e6fa01edb SHA512 b89e7a94e6317fdb7bd260190c6d68a2dfefc08691b4574337afdfff84f55b8b9c955a6ac60642ae9749c1deaa16bee7b855fbd15833a95f602536693daf8c37
-DIST scrot-1.3.tar.gz 141726 BLAKE2B 1972edfa3b61c95fd786d0b4db13633778293b2c671c395939ea0b77d49714e644abd60cfae5656f03fd1c701185d2c8961c45d62989e882f2cd8f4a824dee57 SHA512 45828824701c7574676d0746d01f3dc8313ea91a272fa169b616765442e8842b67d8aa73f47009a66d34dd6b89a230fd9fb42bc598e88baae70fc45345c13a4c
DIST scrot-1.4.tar.gz 157779 BLAKE2B ba844f8bc500c468d028ce62ae57bd6a9fa0e403df6f05dd217722a9115456b70a38aabd7ccb0da53d855b9971d0f5948f82545ca0c8cceb75ede0d4546e27c1 SHA512 8423e7b2658f3e0ccf30f61e122016469226328adf8b1e511aeb031dd2655ae66582651e2d046c7c35d23efb98656369a02b59e711980481ddc4db24c299ee11
-DIST scrot_0.8-13.debian.tar.gz 7943 BLAKE2B 6c58c76f3a8dcf61a8ca4c31f5845cb27b4d0ed2bf9619cc8ea5824b5e42c66ee5163c7f4e76308763947b933003dbd3df6e641b0596ed342993343fd5418a75 SHA512 3f6d0a8e592088af38a3d90394b6b7246430479f5b0c8451af5eae383725d1896dc4bbf595495f9f2b546f00ef38780123c4ee0e3f06971c55a6ac2dfa5b7d53
-DIST scrot_0.8.orig.tar.gz 74324 BLAKE2B 56facc81c29f101279ffc6d5d323a0cecd32b1ff6d1d4bb2052a90703353a9ad5b6ab46c8840ed20834f976badab4258fbb0f031645d9689eef1b838ebd4b1a0 SHA512 cba8f589e45758ddbfe4e276399a1ecb0dbe29569be5d85d97733e7f64de2911bd2d03e62700ad0c718a1fc886c2e3def9dee1de5cac884f9e65e772cebe838c
-EBUILD scrot-0.8_p13-r1.ebuild 975 BLAKE2B 4f0920e23cada110c426fcd1ef874379f8ae3d9ed272dc5fd8a8cc4ffa0253066ee1f26428cad4d771bc5875fc205daea8d3e5fa381a204e5d13edcec2bab881 SHA512 b26b4f5aaa5a522a602404197697b17cd04d53d23229c7d1078e851400019c2fc506b96ba72b6aa36c9fe084711c67b9a57f4b75113e0b3ebb64289fd03fbf75
-EBUILD scrot-1.2.ebuild 920 BLAKE2B b00fcbdf7665347b42716ce8ab78b8f6965f90b4b1f1a88acd2fffacd2978145208965afd206012c837ab22126ba7e78990b8760c5a58cccef373d2715991918 SHA512 341f2fbb5f4824b38d4c42e18929173cad358faf4b9b475d0c735ddc1a681962019c3a8a35892c5120afc42895ac1ac654c1faeb7a7fee5010725a61251bc7cd
-EBUILD scrot-1.3-r1.ebuild 971 BLAKE2B f4daabaf37c8e2d6ea724d1b96f12928b4f5ece6301a0fa44dcffbbfdf00d4b213f56b5b066116b64eb45bb78100c9b9fd2fb451e2e8d9da664b9624c7f67c63 SHA512 552252c5ca01774197b34dd862a458399004f5be2f78b5d889176c0ebf072b05b08cfa842953205dc64da4ed3d4d011f81fb964a071992ea5b772c0ae69fcacd
-EBUILD scrot-1.4.ebuild 1037 BLAKE2B 39024a3ce576bbf8720b1c62b81dfe979f7f8ac7f10ea7713b336a6d646c8d89cff95b1fc265b4b9d9a85c9f8089def8160a9d9b586f37d745ed111c0aa975fc SHA512 b611214d14f56006c73eb41905cf62a2a9b261ff917636aeb0538fe5cc574959f104b6e859d87e6dfcb5528eb91ee70788f63087bbae2feab6daa7e9fa5863e7
+EBUILD scrot-1.4.ebuild 1034 BLAKE2B 4a10c46323e28c44908d11c99c107b9061266e469d8488afbbc4cfd591b673eb71487f0cc812325f4e7f25e89d78ec85ffe589c886303a8b1f8848924595bb36 SHA512 2681c19f15ac74efcf30071dcf78efa4220e792b630a9415eba314f310d490aa473cb9b1f63ea54ac6185669aeb859502d0b62c6fd3fcb87c1fe90d63b567689
EBUILD scrot-9999.ebuild 962 BLAKE2B bd263137adf2fa88b029f8b38b92d86219308cdf290b775334fd28bd0f4e51b2a10bb6726b8f6c568a5fa5b309ec7b71199958b7030374bdfb6cb83ede7a0121 SHA512 2eddd1a3086c9b834ead426e1df2c0aa84a85021aa7606d30d92a23ad0e2869a99a9ff248f6af960a28082555f68a823d448837a9f70892c49ec9a8ea5bd9903
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/scrot/files/scrot.bash-completion b/media-gfx/scrot/files/scrot.bash-completion
deleted file mode 100644
index d7e5729cd849..000000000000
--- a/media-gfx/scrot/files/scrot.bash-completion
+++ /dev/null
@@ -1,40 +0,0 @@
-# bash-completion script for scrot
-# place this in /etc/bash_completion.d
-
-_scrot() {
- local cur prev opts
- COMPREPLY=()
- cur=${COMP_WORDS[COMP_CWORD]}
- prev=${COMP_WORDS[COMP_CWORD-1]}
- opts="-h --help -v --version -b --border -c --count -d --delay -e --exec \
- -q --quality -m --multidisp -s --select -t --thumb"
-
- if [[ "${cur}" == -* ]] || [[ ${COMP_CWORD} -eq 1 ]]; then
- COMPREPLY=($(compgen -W "${opts}" -- "${cur}"))
- fi
-
- case "${prev}" in
- -e|--exec)
- COMPREPLY=($(compgen -A command -- "${cur}"))
- ;;
- -h|--help)
- COMPREPLY=($(compgen -W "${opts/-h --help}" -- "${cur}"))
- ;;
- -v|--version)
- COMPREPLY=($(compgen -W "${opts/-v --version}" -- "${cur}"))
- ;;
- -b|--border)
- COMPREPLY=($(compgen -W "${opts/-b --border}" -- "${cur}"))
- ;;
- -c|--count)
- COMPREPLY=($(compgen -W "${opts/-c --count}" -- "${cur}"))
- ;;
- -m|--multidisp)
- COMPREPLY=($(compgen -W "${opts/-m --multidisp}" -- "${cur}"))
- ;;
- -s|--select)
- COMPREPLY=($(compgen -W "${opts/-s --select}" -- "${cur}"))
- ;;
- esac
-}
-complete -F _scrot scrot
diff --git a/media-gfx/scrot/scrot-0.8_p13-r1.ebuild b/media-gfx/scrot/scrot-0.8_p13-r1.ebuild
deleted file mode 100644
index 94d6392391df..000000000000
--- a/media-gfx/scrot/scrot-0.8_p13-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PV=${PV/_p/-}
-
-inherit bash-completion-r1 eutils
-
-DESCRIPTION="Screen capture utility using imlib2 library"
-HOMEPAGE="http://scrot.sourcearchive.com/"
-SRC_URI="http://${PN}.sourcearchive.com/downloads/${MY_PV}/${PN}_0.8.orig.tar.gz
- http://${PN}.sourcearchive.com/downloads/${MY_PV}/${PN}_${MY_PV}.debian.tar.gz"
-
-LICENSE="feh LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=media-libs/imlib2-1.0.3
- >=media-libs/giblib-1.2.3
- || ( media-libs/imlib2[gif] media-libs/imlib2[jpeg] media-libs/imlib2[png] )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}-0.8
-
-src_prepare() {
- local d=${WORKDIR}/debian/patches
- EPATCH_SOURCE=${d} epatch $(<"${d}"/series)
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- rm -r "${ED}"/usr/doc || die
- dodoc AUTHORS ChangeLog
-
- newbashcomp "${FILESDIR}"/${PN}.bash-completion ${PN}
-}
diff --git a/media-gfx/scrot/scrot-1.2.ebuild b/media-gfx/scrot/scrot-1.2.ebuild
deleted file mode 100644
index 234442c4fbc2..000000000000
--- a/media-gfx/scrot/scrot-1.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools bash-completion-r1
-
-DESCRIPTION="Screen capture utility using imlib2 library"
-HOMEPAGE="https://github.com/resurrecting-open-source-projects/scrot"
-SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="feh LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
- >=media-libs/giblib-1.2.3
- x11-libs/libX11
- x11-libs/libXcursor
- x11-libs/libXfixes
- || (
- media-libs/imlib2[gif]
- media-libs/imlib2[jpeg]
- media-libs/imlib2[png]
- media-libs/imlib2[tiff]
- )
-"
-DEPEND="
- ${RDEPEND}
- x11-base/xorg-proto
-"
-DOCS=(
- AUTHORS ChangeLog CONTRIBUTING.md README TODO
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_install() {
- default
-
- newbashcomp "${FILESDIR}"/${PN}-1.2.bash-completion ${PN}
-}
diff --git a/media-gfx/scrot/scrot-1.3-r1.ebuild b/media-gfx/scrot/scrot-1.3-r1.ebuild
deleted file mode 100644
index 61281f19b1fb..000000000000
--- a/media-gfx/scrot/scrot-1.3-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools bash-completion-r1
-
-DESCRIPTION="Screen capture utility using imlib2 library"
-HOMEPAGE="https://github.com/resurrecting-open-source-projects/scrot"
-SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="feh LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
- >=media-libs/giblib-1.2.3
- x11-libs/libX11
- x11-libs/libXcursor
- x11-libs/libXfixes
- || (
- media-libs/imlib2[gif]
- media-libs/imlib2[jpeg]
- media-libs/imlib2[png]
- media-libs/imlib2[tiff]
- )
-"
-DEPEND="
- ${RDEPEND}
- x11-base/xorg-proto
-"
-DOCS=(
- AUTHORS ChangeLog CONTRIBUTING.md README.md TODO
-)
-
-src_prepare() {
- sed -i -e 's#-g -O3##g' src/Makefile.am || die
- default
- eautoreconf
-}
-
-src_install() {
- default
-
- newbashcomp "${FILESDIR}"/${PN}-1.2.bash-completion ${PN}
-}
diff --git a/media-gfx/scrot/scrot-1.4.ebuild b/media-gfx/scrot/scrot-1.4.ebuild
index 0ddd01558b2b..741754ad3601 100644
--- a/media-gfx/scrot/scrot-1.4.ebuild
+++ b/media-gfx/scrot/scrot-1.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/${PV
LICENSE="feh LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86"
RDEPEND="
>=media-libs/giblib-1.2.3
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 7e680490bdf5..224530d69c5c 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,4 +1,6 @@
AUX 3.26-add-control-optional-deps.patch 2773 BLAKE2B e6c3faa98ecda13c926752defef389fd155f615df2010d8499aba7870b929f520662f5c718f457edd5f14f68c26d63ab58a5ee1a583af9f5721d4cf4141385a8 SHA512 e786172609ca64afa85663077794cb146edf7f59bd6187bc253d2ab682f5cf244f5238df18648641f7450ce6add97f2db1adfa11b52a3ba5e29c16356e9fac08
DIST simple-scan-3.36.4.tar.xz 914688 BLAKE2B ae972cf6b5085d0e79fdfa9250aed655051b97239988b410e175b3058dda3ed5dc19b6574c015dd9a7afcbefd4d05cce6120b3648c061ff1e52043f866769a62 SHA512 780eeabd9593f14b2b04b9474bb1faebe3a32a7fd7e6b067c144fe44ad9b880f307bf80a8a925fb2549ca0b8172357c9a393146dfabd4b68bfc4396c32de4fa8
+DIST simple-scan-3.36.7.tar.xz 914572 BLAKE2B dee363c08b0454bc6a4990fc14831069162f74365549a081421c286658cce130957b91030558d1232c979601be00e955996f702e8bafeeeb30710b89ee3e42c0 SHA512 ff0dd82d0db30dbfacfd8b04d7bcbc0599c1b1b47f845e1176ec7ffce0aa44253735431c2c531ef428dae0cee80818acfbba4fb2514f501623c0c0242aa8a7a2
EBUILD simple-scan-3.36.4.ebuild 1325 BLAKE2B d7a8eb204425d66cd2fb1aaad25a91a8d8c2ae153066f1a828bdd416c37d204f747119cb252e7f778d05be51fef3ea290e737bfcbc1f7c78e994ac9b933890d9 SHA512 6d211475e250bcaa86eb452669062a5727cfcc6285927b6ba61cba7c68e07a0c9d1dd826c5b2b9b43cc7861e21af090750641aaf53a8f97b4298fbad19a00e62
+EBUILD simple-scan-3.36.7.ebuild 1329 BLAKE2B 21944ee06e8464b55a1ff8240f6e0c8816fb736093614b698ba7a964e013214aec8c3c010867dc7c3d5ac6688d8a21cb2d0a457dcbfd033d0e41bc203551d908 SHA512 accbc4335878c4c83b2e9dd98821fd5594683456750f3f169d38c261f6c4410f9b09856cd2c78d84df50787f1aa70446704f5ef567a145a252569b2d7af19362
MISC metadata.xml 616 BLAKE2B 576d986402f8cc708eae60f661640808751747c764d5fe729dd014f33758e0b484a2b80a214d9a3d1ed4bce7e455e34803a62048240e5de8e203184446cdc0df SHA512 6377cb9c20b1ce2db22ba959d386e4389939b72503d87da956d659144b8a6f8b521abdd19dd4c82ac0cb32e260ce6633b75136a353f63b86593f5e1f12394d47
diff --git a/media-gfx/simple-scan/simple-scan-3.36.7.ebuild b/media-gfx/simple-scan/simple-scan-3.36.7.ebuild
new file mode 100644
index 000000000000..a7a3d720bbeb
--- /dev/null
+++ b/media-gfx/simple-scan/simple-scan-3.36.7.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_MIN_API_VERSION="0.34"
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Simple document scanning utility"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="colord webp"
+
+DEPEND="
+ >=dev-libs/glib-2.38:2
+ >=x11-libs/gtk+-3.22:3
+ >=sys-libs/zlib-1.2.3.1:=
+ x11-libs/cairo:=
+ x11-libs/gdk-pixbuf:2
+ >=dev-libs/libgusb-0.2.7
+ colord? ( >=x11-misc/colord-0.1.24:=[udev] )
+ webp? ( media-libs/libwebp )
+ >=media-gfx/sane-backends-1.0.20:=
+
+ virtual/jpeg:0=
+"
+# packagekit? ( >=app-admin/packagekit-base-1.1.5 )
+RDEPEND="${DEPEND}
+ x11-misc/xdg-utils
+"
+BDEPEND="
+ $(vala_depend)
+ dev-libs/libxml2:2
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ dev-libs/libgusb[vala]
+ colord? ( x11-misc/colord[vala] )
+"
+
+PATCHES=(
+ # Add control for optional dependencies
+ "${FILESDIR}"/3.26-add-control-optional-deps.patch
+)
+
+src_prepare() {
+ vala_src_prepare
+ xdg_src_prepare
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use colord)
+ -Dpackagekit=false
+ $(meson_use webp)
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}