summaryrefslogtreecommitdiff
path: root/media-gfx
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/Manifest.gzbin38610 -> 38612 bytes
-rw-r--r--media-gfx/chafa/Manifest2
-rw-r--r--media-gfx/chafa/chafa-1.4.1.ebuild41
-rw-r--r--media-gfx/digikam/Manifest2
-rw-r--r--media-gfx/digikam/digikam-7.2.0.ebuild147
-rw-r--r--media-gfx/exact-image/Manifest7
-rw-r--r--media-gfx/exact-image/exact-image-0.8.1-r3.ebuild95
-rw-r--r--media-gfx/exact-image/exact-image-1.0.2-r1.ebuild (renamed from media-gfx/exact-image/exact-image-1.0.2.ebuild)24
-rw-r--r--media-gfx/exact-image/files/exact-image-0.7.5-libpng14.patch69
-rw-r--r--media-gfx/exact-image/files/exact-image-0.8.1-gcc6.patch139
-rw-r--r--media-gfx/exact-image/files/exact-image-0.8.1-libpng15.patch34
-rw-r--r--media-gfx/fontforge/Manifest2
-rw-r--r--media-gfx/fontforge/fontforge-20201107.ebuild2
-rw-r--r--media-gfx/geeqie/Manifest1
-rw-r--r--media-gfx/geeqie/geeqie-1.5.1.ebuild94
-rw-r--r--media-gfx/graphicsmagick/Manifest4
-rw-r--r--media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild7
-rw-r--r--media-gfx/graphicsmagick/graphicsmagick-9999.ebuild7
-rw-r--r--media-gfx/imagemagick/Manifest12
-rw-r--r--media-gfx/imagemagick/imagemagick-6.9.12.3.ebuild2
-rw-r--r--media-gfx/imagemagick/imagemagick-6.9.12.4.ebuild (renamed from media-gfx/imagemagick/imagemagick-6.9.12.2.ebuild)2
-rw-r--r--media-gfx/imagemagick/imagemagick-7.0.11.3.ebuild2
-rw-r--r--media-gfx/imagemagick/imagemagick-7.0.11.4.ebuild (renamed from media-gfx/imagemagick/imagemagick-7.0.11.2.ebuild)2
-rw-r--r--media-gfx/imv/Manifest8
-rw-r--r--media-gfx/imv/imv-4.1.0-r1.ebuild94
-rw-r--r--media-gfx/imv/imv-4.2.0.ebuild11
-rw-r--r--media-gfx/imv/imv-9999.ebuild11
-rw-r--r--media-gfx/imv/metadata.xml1
-rw-r--r--media-gfx/krita/Manifest2
-rw-r--r--media-gfx/krita/krita-4.4.3.ebuild128
-rw-r--r--media-gfx/lximage-qt/Manifest2
-rw-r--r--media-gfx/lximage-qt/lximage-qt-0.15.0.ebuild52
-rw-r--r--media-gfx/mypaint-brushes/Manifest2
-rw-r--r--media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild7
-rw-r--r--media-gfx/scour/Manifest4
-rw-r--r--media-gfx/scour/scour-0.37.ebuild25
-rw-r--r--media-gfx/scour/scour-0.38.1.ebuild25
37 files changed, 336 insertions, 733 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index f16c55e2d910..6af727c616bd 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
Binary files differ
diff --git a/media-gfx/chafa/Manifest b/media-gfx/chafa/Manifest
index 1974d3ce5b7a..fb0f8ca12c31 100644
--- a/media-gfx/chafa/Manifest
+++ b/media-gfx/chafa/Manifest
@@ -1,5 +1,3 @@
-DIST chafa-1.4.1.tar.xz 389428 BLAKE2B 8ed6c6d57953d784763f10c274bd8b7acf7857b095bae58c476d2e17418a7112f1ec000d667eebfc2eda712c9588e686ad4021da017f4d187a5461c0435c5476 SHA512 f0bd1911fd544f93afadbb2105f151dc77e31a2f3af4c7f8441a06f547a7ebe0674664721b18c3a35a7c4e745dda666713adc1dfbe5e97dfdc54856a13bd5063
DIST chafa-1.6.0.tar.xz 417888 BLAKE2B f9837a9062396f92974088ea2e59e050089b462442ac01af17dc7f47f4c3a24542facd4c977cac2ee9db3c4af9bae2349cea9186f9d0362cf7bb74f4e83d345b SHA512 47843b8bf1b0555ae3570f688229e9f848e2e30c80aa277278230196f6fdb583b7f9170d1740171f2f4c5d5d915e00df407722067bcf6f2dc888804b7bd074da
-EBUILD chafa-1.4.1.ebuild 866 BLAKE2B 24e4c50c2a29e9f3d5451f7b4ec9f4cc176dec6a2b5d4636e8de26e72f514b358957f78946ba0cd9cd9bde26d3c73c6677cac957d8db82733c45ba51e34c7165 SHA512 179ac5f28de859623651bfc30539d2242c2aeb949fd6398dd809a65ca7d4df80430dc1af7d2004f1a8852231d4666da29ed2ea3b404a9e43eb87a3055fd359a3
EBUILD chafa-1.6.0.ebuild 764 BLAKE2B ce21bd3bc7e46e99b53e6f9ae564cc1171a1a270dee7069e86fb680ccecedfbeba030611f485b68e7c1761d7eb9d90bad7fd9d753bd37e31279be2c9d2952aa7 SHA512 ce16aca3d3019961a6cbee7b2f78661dfdfc58218839ac5992a66bc9b2649c62d7d0bb5d5c3a0d3507d050f77c8a56203cef16403ee6140023614e91a21b5123
MISC metadata.xml 546 BLAKE2B 9a2ccaaa61addeef86ae9c684d1030c1396c36a87b45df6e0af8b5e70ed4c25cfe808cf854758882e0fc5e265624f4e86b0ddeb1a7e495f8a2fb353b054e9978 SHA512 8ca7185a73da0bcaf78cfbc33bdb7546832877829e5ec6ac227c76b037623915e862e661ea14bfe5cae31deefd3af70698c8a4d8b34c7764652d0b7f4dec4541
diff --git a/media-gfx/chafa/chafa-1.4.1.ebuild b/media-gfx/chafa/chafa-1.4.1.ebuild
deleted file mode 100644
index 153953749e3d..000000000000
--- a/media-gfx/chafa/chafa-1.4.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="versatile and fast Unicode/ASCII/ANSI graphics renderer"
-HOMEPAGE="https://hpjansson.org/chafa/ https://github.com/hpjansson/chafa"
-SRC_URI="https://hpjansson.org/chafa/releases/${P}.tar.xz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="static-libs +tools"
-
-RDEPEND="
- dev-libs/glib:2
- media-gfx/imagemagick:0=
- tools? ( >=media-libs/freetype-2.0.0 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
- local econfargs=(
- $(use_enable static-libs static)
- # install manpage manually
- --disable-man
- $(use_with tools)
- )
-
- econf "${econfargs[@]}"
-}
-
-src_install() {
- local DOCS=( AUTHORS NEWS README TODO )
- default
-
- use tools && doman docs/chafa.1
-
- find "${ED}"/usr/lib* -name '*.la' -delete || die
-}
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index a62386f26021..c7db3f04fa3a 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,3 +1,5 @@
DIST digikam-7.1.0.tar.xz 593501044 BLAKE2B dcd124a18299a75c02b51642cc33d2a053f1fce4abd82b3f50ea93cc17e8b302b73284106ed716e815741cc38326695f1303e018998a6687f8cd92ab539faeb0 SHA512 df7138a45ff8de6c1e32cb0eea83e1cd4b67f027b149a696d8feb8008ceaae55934c1f1d9625c1ba29de850ad70aa01dc73f1b7517253ca6aa99f0f97b84a3a4
+DIST digikam-7.2.0.tar.xz 255278796 BLAKE2B 5ccc6c6d1f3ce8d83746a1022dcf22b11b87af354f93f0b872a713f438d1bd2ee3f8e59d6206cd83dbbcaf1a8f2568ad0920d887b11d65864802f7eb2b02ba90 SHA512 2908a802fda84caf6b398a5dc328d2e9c00ab68776bde4620db1cb981995879e89d590520bf855471c968f065951280f863620641ccf945c43704e6cf3c0abd7
EBUILD digikam-7.1.0-r1.ebuild 4000 BLAKE2B ab10f960037cb269d0dd758624e2c263e8697f4c1c9ba8b1d88a4bd1684b364555b6704b765d003eca271626fe352e8dff0fa115154ce6762287ac23905800ad SHA512 2111860137feff79c9812f2aede64069ad4a68c0180063722e43b0c74ce7f3316fb44f59a4820671944f965329409932fe4e0c71fbbee76ce1c6cf2c9d85636a
+EBUILD digikam-7.2.0.ebuild 4001 BLAKE2B 64dafd1f1414923d7dabc0549bfb599fb6f9300804073c72b4c354470995e86bc0958424593e14ea30dc77c12b54d2e09659487aca804b17c43c363fb08d8922 SHA512 ce910cfbba0988e6241b83c8cff61e26cef20509f370f728800d62656f05ea149b34212ef34945dab5acc2896070b00c0aa87b90a5ec8f0b685699a57a8a2c17
MISC metadata.xml 1097 BLAKE2B 1870f4bef0643db48fa2e6241f25d33c718010556b79bb54339f4ff9a13d7d005cea8e358e83d54ee94860b191969c834b9e5fd8152a17d7a5cc464a6813000e SHA512 25c2fcb533b644cf4aa376518a77f35bab0676c6f8853998f50e1eebbb2de20ca49e02fc110b1d6f55d2502f4e353803f12a2b336b98d85321b891a42ba16ccd
diff --git a/media-gfx/digikam/digikam-7.2.0.ebuild b/media-gfx/digikam/digikam-7.2.0.ebuild
new file mode 100644
index 000000000000..c7406e0e9cf7
--- /dev/null
+++ b/media-gfx/digikam/digikam-7.2.0.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.74.0
+QTMIN=5.15.2
+inherit ecm kde.org toolchain-funcs
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ MY_P=${PN}-${PV/_/-}
+ if [[ ${PV} =~ rc[0-9]*$ ]]; then
+ SRC_URI="mirror://kde/unstable/${PN}/"
+ else
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/"
+ fi
+ SRC_URI+="${MY_P}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Digital photo management application"
+HOMEPAGE="https://www.digikam.org/"
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop X"
+
+# bug 366505
+RESTRICT+=" test"
+
+BDEPEND="
+ >=dev-util/cmake-3.14.3
+ sys-devel/gettext
+ panorama? (
+ sys-devel/bison
+ sys-devel/flex
+ )
+"
+COMMON_DEPEND="
+ dev-libs/expat
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5[-gles2-only]
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5[mysql?]
+ >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=dev-qt/qtxmlpatterns-${QTMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/solid-${KFMIN}:5
+ >=media-gfx/exiv2-0.27:=
+ media-libs/lcms:2
+ media-libs/liblqr
+ media-libs/libpng:0=
+ >=media-libs/opencv-3.3.0:=[contrib,contribdnn]
+ media-libs/tiff:0
+ virtual/jpeg:0
+ addressbook? (
+ >=kde-apps/akonadi-contacts-19.04.3:5
+ >=kde-frameworks/kcontacts-${KFMIN}:5
+ )
+ calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 )
+ gphoto2? ( media-libs/libgphoto2:= )
+ heif? ( media-libs/x265:= )
+ imagemagick? ( media-gfx/imagemagick:= )
+ lensfun? ( media-libs/lensfun )
+ marble? (
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=kde-apps/marble-19.04.3:5
+ >=kde-frameworks/kbookmarks-${KFMIN}:5
+ )
+ mediaplayer? (
+ media-libs/qtav[opengl(+)]
+ media-video/ffmpeg:=
+ )
+ opengl? (
+ >=dev-qt/qtopengl-${QTMIN}:5
+ virtual/opengl
+ )
+ panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
+ scanner? ( >=kde-apps/libksane-19.04.3:5 )
+ semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libX11
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-cpp/eigen:3
+ dev-libs/boost[threads]
+"
+RDEPEND="${COMMON_DEPEND}
+ mysql? ( virtual/mysql[server(+)] )
+ panorama? ( media-gfx/hugin )
+"
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+ ecm_pkg_pretend
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+ ecm_pkg_setup
+}
+
+# FIXME: Unbundle libraw (libs/rawengine/libraw)
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_TESTING=OFF # bug 698192
+ -DENABLE_APPSTYLES=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
+ -DENABLE_QWEBENGINE=ON
+ -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
+ $(cmake_use_find_package calendar KF5CalendarCore)
+ $(cmake_use_find_package gphoto2 Gphoto2)
+ $(cmake_use_find_package heif X265)
+ $(cmake_use_find_package imagemagick ImageMagick)
+ $(cmake_use_find_package lensfun LensFun)
+ $(cmake_use_find_package marble Marble)
+ -DENABLE_MEDIAPLAYER=$(usex mediaplayer)
+ $(cmake_use_find_package mediaplayer QtAV)
+ -DENABLE_MYSQLSUPPORT=$(usex mysql)
+ -DENABLE_INTERNALMYSQL=$(usex mysql)
+ $(cmake_use_find_package opengl OpenGL)
+ $(cmake_use_find_package panorama KF5ThreadWeaver)
+ $(cmake_use_find_package scanner KF5Sane)
+ $(cmake_use_find_package semantic-desktop KF5FileMetaData)
+ $(cmake_use_find_package X X11)
+ )
+
+ ecm_src_configure
+}
diff --git a/media-gfx/exact-image/Manifest b/media-gfx/exact-image/Manifest
index 56195e8efe57..e8e6476edf7e 100644
--- a/media-gfx/exact-image/Manifest
+++ b/media-gfx/exact-image/Manifest
@@ -1,12 +1,7 @@
-AUX exact-image-0.7.5-libpng14.patch 2435 BLAKE2B ca832920ad7bd1b2f1def6faa04e0b7d70d177f859966ef44223ab6c26813d857456e8adc70367c4275338a778e23dd158694ef826da47070abe3e789c5f0df6 SHA512 4f216f96c4190c4f04991368d92e685592f694cb3c9f5dab90281a9bc1f06c9fcaa817494fb15412f5dc427750558019b6e2aeef8769ed932e974e201776bd48
-AUX exact-image-0.8.1-gcc6.patch 6101 BLAKE2B 3dba7f2688a5c59282486f492131edaf104c3c9e7d335f1893467ef6d968b466e344ae1c1992ea080cee4d267001dd6555aaea3a23dfbb0a5748c5262d364fbb SHA512 e11a9dca3c5c6ac4ca5557e6ca212354346b307c38abe77ceaea9f15ef35f5a8de8d24628b290c4ecfdaf84dee44af49414d57c89b067e78b60a02d4e09a5dd4
-AUX exact-image-0.8.1-libpng15.patch 754 BLAKE2B 81b47c6198103f37cc5f0a382001129a10140bead8f98119eb52079ed97d67d9bfd56b60278023f680d66107aaa6f2dea4a035a194c404e33e548f2e37f90f49 SHA512 7f3d271d908e55e3731b38e072dcadcb0d99cbf3de327d5bd486e232c2827055b8f712052e04c9bc81b20fd42d27cc18627a6bc118c9d1ece58b91c18fa9bf13
AUX exact-image-1.0.2-dcraw.patch 496 BLAKE2B d9d86facb3b0f9721d3f5791d4744bbf71d3802c094e4d1f20de44898d817a8319b78c0cd011670d53beec35bbf9efb477c9b3e20ac2724a48017c5d0746c634 SHA512 409cf7ad9963b5e6f4997ad5b466a86c5c3179bbfe63f14311a1297c9e87423f7d838b2b037109029a8dfa6125d7bbacd53f069d8634c1ffdd2c946d40e70b99
AUX exact-image-1.0.2-g++.patch 936 BLAKE2B 6ab787c1393228bb1671c8a2d7b76969fcd11d26f0c14ca08a95cee7241422205d8cb398f2a6b711e884c476cba662718705848a818b1944428b2a207133fede SHA512 44fafd62c713bc59c1cb774924394ad32a13c33b79696a4762e3730108650ccd3033f554fc8b0d7cf9b71126367bce5b90074f2c954ca57c8389975b57eac5e1
AUX exact-image-1.0.2-gcc6.patch 2795 BLAKE2B 17282b91baa020b94654c92d87611001584f82360303a56e70cb8f081caf400394a367982e115bff094dfe11a0798503a606de106f1bf6427b57a9ede1cd6ed5 SHA512 ef42fccab6d0958df2dcf86578f9df1f84254515c2bea611f256e23227b9d6dc917467f2d8f54230f9386e9726152c6bbe4ab4f3d117e0da5a3e99b00e93e348
AUX exact-image-1.0.2-php.patch 481 BLAKE2B bf9a3935813098c5248bac843c580d61266b60cf7063824c90e5b87df552d2b0fa125648f4ebcba46acc29d72f9bcd0a0c647467ebdc0d433616da5d8c16225f SHA512 b984095cc071558ce8b7d4b7db2915f793ed8d468f38757d2faab0f7ffc9e866a06838a5d0c578f67e9cc3e88f2bd07b0cde00ce95d909cdc07e5fbf24f3e62e
-DIST exact-image-0.8.1.tar.bz2 283660 BLAKE2B 49aa68640b785da59fd0e04d0a0892ad06adbc286a98bf908e60e77cfd273263e83dce3c9eb75c30f422c2b6eef2178dd0585aada63f992291abf298b369f3aa SHA512 0adc51c5a29415e236a963cfdaf8f5527e628e9a645e87d00c69a7185e60639cfcd9b1c2b4c3abe1826c5364f0c5d45a0ebb8923cfed53d041d1d36b2604b565
DIST exact-image-1.0.2.tar.bz2 322174 BLAKE2B 67afefb4c5a52416459cd4ac6198012eb6d7895a73ea8363fae05286c7e7f62aa1a02166985f53b5638c7dc7b23b4dc1fb1c7b2272a9dc595ce329a7083ee1b9 SHA512 8ba5a198a236ddf5fa58f40c80f32ba9d300376c637a13a7acf3d2db7906fced373b33a7ecff9cff4d09d8b21de9ce1fb9f5bfb1f4522557bd01af0e3d6dcc65
-EBUILD exact-image-0.8.1-r3.ebuild 2290 BLAKE2B 543ab982fd8d0bb5ac38fe1ac133e364645d694743287de7bf02cb0e33585b00c6dd59e2a1cf7510043b9392377537f62b6efe2d8ba2441ac7b8f96b5f709cca SHA512 4973535733d4c6f2e85728dd427a6a1c66545a157771bfcf5d4cc593e09130b2a2ed15fc8c4b5ee4733b41390998b32539f5a85e2e6dfac0b87c81ada901697f
-EBUILD exact-image-1.0.2.ebuild 2324 BLAKE2B 0da8eef95756a95f25fbea7dcab3515d5f3ff670cd574e1261140f92d0bd006c87150b9f076e32ea23a1f532a98968c76f380f247f55ab612b9bc3a2d5704977 SHA512 fc77e2926823610078d4b31d28f1b8153dc92d993eca3fea28be4ffe6b708b2564b1e5d18feedebf877f095b3154f800994620d8f9c48189d50d0a736f463039
+EBUILD exact-image-1.0.2-r1.ebuild 2411 BLAKE2B f758dde0d8d6698ae8a201d284b6741332043f0b6d82a1da3bc4e187cb5a6ccb040a64acc7577caf94d08270f25d8cb5a6b41e6b030c6f7926b39be5ec246127 SHA512 91969b5b8243222439d3aee8078546dc4370cdca470582596881950d5a003f0b4f805bd39ee61f35eb28a4788c5d4a926afa424d94afdba9407e13b2293c85c6
MISC metadata.xml 329 BLAKE2B ceb9ef8fb31cd43ccaeec69b64fe88a4894da38dd2c45a1b74dde46161daa3d437fc9e2d7a699c8ca57acd8bb6ad06dbbbe173eefcf243ee2f78233046a7006b SHA512 eb4d23c96cd7e20afb64bf80075a0cfcdb27c69ca075261d54676c47044ca6d120dd5b80cb2217787b71a9db02688764b0b3f2147c6a6e652954e43cafaebf57
diff --git a/media-gfx/exact-image/exact-image-0.8.1-r3.ebuild b/media-gfx/exact-image/exact-image-0.8.1-r3.ebuild
deleted file mode 100644
index 54e1fbe7f7f8..000000000000
--- a/media-gfx/exact-image/exact-image-0.8.1-r3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="A fast, modern and generic image processing library"
-HOMEPAGE="http://www.exactcode.de/site/open_source/exactimage/"
-SRC_URI="http://dl.exactcode.de/oss/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="expat jpeg lua openexr php perl png ruby swig tiff truetype X"
-
-RDEPEND="x11-libs/agg[truetype]
- sys-libs/zlib
- expat? ( dev-libs/expat )
- jpeg? ( virtual/jpeg )
- lua? ( dev-lang/lua:0= )
- openexr? ( media-libs/openexr )
- php? ( dev-lang/php:* )
- perl? ( dev-lang/perl )
- png? ( >=media-libs/libpng-1.2.43 )
- ruby? ( dev-lang/ruby:* )
- tiff? ( media-libs/tiff )
- truetype? ( >=media-libs/freetype-2 )
- X? (
- x11-libs/libXext
- x11-libs/libXt
- x11-libs/libICE
- x11-libs/libSM
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- swig? ( dev-lang/swig )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.7.5-libpng14.patch
- "${FILESDIR}"/${P}-libpng15.patch
- "${FILESDIR}"/${P}-gcc6.patch
-)
-
-src_prepare() {
- default
-
- # Respect user CFLAGS/CXXFLAGS.
- sed -i \
- -e '/C\(XX\)\?FLAGS =/s/-O2//' \
- -e "\$aCFLAGS += ${CFLAGS}\nCXXFLAGS += ${CXXFLAGS}" \
- Makefile || die
-
- # Show commands. Use qualified CC/CXX.
- sed -i \
- -e '/^Q =/d' \
- -e '/^\t@echo /d' \
- -e "\$aCC:=$(tc-getCC)\nCXX:=$(tc-getCXX)" \
- build/bottom.make || die
-
- # The copied string fits exactly. Use memcpy to reflect that a null
- # terminator is not needed.
- sed -i \
- -e 's/strcpy(\([^,]*\)\(,["a-zA-Z -]*\))/memcpy(\1\2, sizeof(\1))/' \
- codecs/tga.cc || die
-}
-
-src_configure() {
- # evas -> enlightenment overlay
- # bardecode -> protected by custom license
- # libungif -> not supported anymore
- # python -> allegedly not python3, but python2 only
-
- ./configure \
- --prefix=/usr \
- --libdir=/usr/$(get_libdir) \
- $(use_with X x11) \
- $(use_with truetype freetype) \
- --without-evas \
- $(use_with jpeg libjpeg) \
- $(use_with tiff libtiff) \
- $(use_with png libpng) \
- --without-libungif \
- --without-jasper \
- $(use_with openexr) \
- $(use_with expat) \
- --without-lcms \
- --without-bardecode \
- $(use_with lua) \
- $(use_with swig) \
- $(use_with perl) \
- --without-python \
- $(use_with php) \
- $(use_with ruby) || die
-}
diff --git a/media-gfx/exact-image/exact-image-1.0.2.ebuild b/media-gfx/exact-image/exact-image-1.0.2-r1.ebuild
index de0d4b8a5af2..91b8519e19bc 100644
--- a/media-gfx/exact-image/exact-image-1.0.2.ebuild
+++ b/media-gfx/exact-image/exact-image-1.0.2-r1.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit eutils multilib toolchain-funcs
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit eutils lua-single multilib toolchain-funcs
DESCRIPTION="A fast, modern and generic image processing library"
HOMEPAGE="http://www.exactcode.de/site/open_source/exactimage/"
@@ -13,12 +15,14 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="expat jpeg lua openexr php perl png ruby swig tiff truetype X"
+REQUIRED_USE="lua? ( swig )"
-RDEPEND="x11-libs/agg[truetype]
+RDEPEND="
+ x11-libs/agg[truetype]
sys-libs/zlib
expat? ( dev-libs/expat )
jpeg? ( virtual/jpeg )
- lua? ( dev-lang/lua:0= )
+ lua? ( ${LUA_DEPS} )
openexr? ( media-libs/openexr )
php? ( dev-lang/php:* )
perl? ( dev-lang/perl )
@@ -31,10 +35,14 @@ RDEPEND="x11-libs/agg[truetype]
x11-libs/libXt
x11-libs/libICE
x11-libs/libSM
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- swig? ( dev-lang/swig )"
+ )
+"
+DEPEND="
+ ${RDEPEND}
+ swig? ( dev-lang/swig )
+"
+
+BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${P}-gcc6.patch
diff --git a/media-gfx/exact-image/files/exact-image-0.7.5-libpng14.patch b/media-gfx/exact-image/files/exact-image-0.7.5-libpng14.patch
deleted file mode 100644
index 7c62a6cbd726..000000000000
--- a/media-gfx/exact-image/files/exact-image-0.7.5-libpng14.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- a/codecs/png.cc
-+++ b/codecs/png.cc
-@@ -71,7 +71,7 @@
- /* Allocate/initialize the memory for image information. REQUIRED. */
- info_ptr = png_create_info_struct(png_ptr);
- if (info_ptr == NULL) {
-- png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
-+ png_destroy_read_struct(&png_ptr, NULL, NULL);
- return 0;
- }
-
-@@ -82,7 +82,7 @@
-
- if (setjmp(png_jmpbuf(png_ptr))) {
- /* Free all of the memory associated with the png_ptr and info_ptr */
-- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
-+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
- /* If we get here, we had a problem reading the file */
- return 0;
- }
-@@ -99,7 +99,7 @@
- png_read_info (png_ptr, info_ptr);
-
- png_get_IHDR (png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
-- &interlace_type, int_p_NULL, int_p_NULL);
-+ &interlace_type, NULL, NULL);
-
- image.w = width;
- image.h = height;
-@@ -132,7 +132,7 @@
- #if 0 // no longer needed
- /* Expand grayscale images to the full 8 bits from 2, or 4 bits/pixel */
- if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth > 1 && bit_depth < 8) {
-- png_set_gray_1_2_4_to_8(png_ptr);
-+ png_set_expand_gray_1_2_4_to_8(png_ptr);
- image.bps = 8;
- }
- #endif
-@@ -196,11 +196,11 @@
- for (int pass = 0; pass < number_passes; ++pass)
- for (unsigned int y = 0; y < height; ++y) {
- row_pointers[0] = image.getRawData() + y * stride;
-- png_read_rows(png_ptr, row_pointers, png_bytepp_NULL, 1);
-+ png_read_rows(png_ptr, row_pointers, NULL, 1);
- }
-
- /* clean up after the read, and free any memory allocated - REQUIRED */
-- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
-+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-
- /* that's it */
- return true;
-@@ -224,7 +224,7 @@
- /* Allocate/initialize the memory for image information. REQUIRED. */
- info_ptr = png_create_info_struct(png_ptr);
- if (info_ptr == NULL) {
-- png_destroy_write_struct(&png_ptr, png_infopp_NULL);
-+ png_destroy_write_struct(&png_ptr, NULL);
- return false;
- }
-
-@@ -244,7 +244,6 @@
- else if (quality > Z_BEST_COMPRESSION) quality = Z_BEST_COMPRESSION;
- png_set_compression_level(png_ptr, quality);
-
-- png_info_init (info_ptr);
-
- /* Set up our STL stream output control */
- png_set_write_fn (png_ptr, stream, &stdstream_write_data, &stdstream_flush_data);
diff --git a/media-gfx/exact-image/files/exact-image-0.8.1-gcc6.patch b/media-gfx/exact-image/files/exact-image-0.8.1-gcc6.patch
deleted file mode 100644
index 4871c99205a2..000000000000
--- a/media-gfx/exact-image/files/exact-image-0.8.1-gcc6.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-Bug: https://bugs.gentoo.org/600380
-
---- a/bardecode/code25i.hh
-+++ b/bardecode/code25i.hh
-@@ -20,6 +20,12 @@
-
- #include "scanner_utils.hh"
-
-+#if __cplusplus >= 201103L
-+#define STATIC_CONST_DOUBLE static constexpr double
-+#else
-+#define STATIC_CONST_DOUBLE static const double
-+#endif
-+
- namespace BarDecode
- {
- struct code25i_t
-@@ -37,11 +43,11 @@
- #define w_hq 1.5
- #define tol 0.2
- #else
-- static const double n_lq = 15;
-- static const double n_hq = 5.3;
-- static const double w_lq = 5.2;
-- static const double w_hq = 1.5;
-- static const double tol = 0.2;
-+ STATIC_CONST_DOUBLE n_lq = 15;
-+ STATIC_CONST_DOUBLE n_hq = 5.3;
-+ STATIC_CONST_DOUBLE w_lq = 5.2;
-+ STATIC_CONST_DOUBLE w_hq = 1.5;
-+ STATIC_CONST_DOUBLE tol = 0.2;
- #endif
- static const usize_t min_quiet_usize = 5;
- //static const usize_t min_quiet_usize = 10;
---- a/codecs/bmp.cc
-+++ b/codecs/bmp.cc
-@@ -473,7 +473,7 @@
- std::cerr << "scanline " << row << " Seek error: " << stream->tellg() << " vs " << offset << std::endl;
- }
-
-- if (stream->read ((char*)row_data, file_stride) < 0) {
-+ if (!static_cast<bool>(stream->read ((char*)row_data, file_stride))) {
- std::cerr << "scanline " << row << ": Read error\n";
- }
-
---- a/codecs/dcraw.h
-+++ b/codecs/dcraw.h
-@@ -3958,22 +3958,22 @@
- -2,+0,+0,-1,0,0x06, -2,+0,+0,+0,1,0x02, -2,+0,+0,+1,0,0x03,
- -2,+1,-1,+0,0,0x04, -2,+1,+0,-1,1,0x04, -2,+1,+0,+0,0,0x06,
- -2,+1,+0,+1,0,0x02, -2,+2,+0,+0,1,0x04, -2,+2,+0,+1,0,0x04,
-- -1,-2,-1,+0,0,0x80, -1,-2,+0,-1,0,0x01, -1,-2,+1,-1,0,0x01,
-- -1,-2,+1,+0,1,0x01, -1,-1,-1,+1,0,0x88, -1,-1,+1,-2,0,0x40,
-+ -1,-2,-1,+0,0,(signed char) 0x80, -1,-2,+0,-1,0,0x01, -1,-2,+1,-1,0,0x01,
-+ -1,-2,+1,+0,1,0x01, -1,-1,-1,+1,0,(signed char) 0x88, -1,-1,+1,-2,0,0x40,
- -1,-1,+1,-1,0,0x22, -1,-1,+1,+0,0,0x33, -1,-1,+1,+1,1,0x11,
- -1,+0,-1,+2,0,0x08, -1,+0,+0,-1,0,0x44, -1,+0,+0,+1,0,0x11,
- -1,+0,+1,-2,1,0x40, -1,+0,+1,-1,0,0x66, -1,+0,+1,+0,1,0x22,
- -1,+0,+1,+1,0,0x33, -1,+0,+1,+2,1,0x10, -1,+1,+1,-1,1,0x44,
- -1,+1,+1,+0,0,0x66, -1,+1,+1,+1,0,0x22, -1,+1,+1,+2,0,0x10,
- -1,+2,+0,+1,0,0x04, -1,+2,+1,+0,1,0x04, -1,+2,+1,+1,0,0x04,
-- +0,-2,+0,+0,1,0x80, +0,-1,+0,+1,1,0x88, +0,-1,+1,-2,0,0x40,
-+ +0,-2,+0,+0,1,(signed char) 0x80, +0,-1,+0,+1,1,(signed char) 0x88, +0,-1,+1,-2,0,0x40,
- +0,-1,+1,+0,0,0x11, +0,-1,+2,-2,0,0x40, +0,-1,+2,-1,0,0x20,
- +0,-1,+2,+0,0,0x30, +0,-1,+2,+1,1,0x10, +0,+0,+0,+2,1,0x08,
- +0,+0,+2,-2,1,0x40, +0,+0,+2,-1,0,0x60, +0,+0,+2,+0,1,0x20,
- +0,+0,+2,+1,0,0x30, +0,+0,+2,+2,1,0x10, +0,+1,+1,+0,0,0x44,
- +0,+1,+1,+2,0,0x10, +0,+1,+2,-1,1,0x40, +0,+1,+2,+0,0,0x60,
-- +0,+1,+2,+1,0,0x20, +0,+1,+2,+2,0,0x10, +1,-2,+1,+0,0,0x80,
-- +1,-1,+1,+1,0,0x88, +1,+0,+1,+2,0,0x08, +1,+0,+2,-1,0,0x40,
-+ +0,+1,+2,+1,0,0x20, +0,+1,+2,+2,0,0x10, +1,-2,+1,+0,0,(signed char) 0x80,
-+ +1,-1,+1,+1,0,(signed char) 0x88, +1,+0,+1,+2,0,0x08, +1,+0,+2,-1,0,0x40,
- +1,+0,+2,+1,0,0x10
- }, chood[] = { -1,-1, -1,0, -1,+1, 0,+1, +1,+1, +1,0, +1,-1, 0,-1 };
- ushort (*brow[5])[4], *pix;
-@@ -6341,11 +6341,11 @@
- { 10793,-3791,-1146,-7498,15177,2488,-1390,1577,7321 } },
- { "OLYMPUS C80", 0, 0,
- { 8606,-2509,-1014,-8238,15714,2703,-942,979,7760 } },
-- { "OLYMPUS E-10", 0, 0xffc0,
-+ { "OLYMPUS E-10", 0, (short) 0xffc0,
- { 12745,-4500,-1416,-6062,14542,1580,-1934,2256,6603 } },
-- { "OLYMPUS E-1", 0, 0xfff0,
-+ { "OLYMPUS E-1", 0, (short) 0xfff0,
- { 11846,-4767,-945,-7027,15878,1089,-2699,4122,8311 } },
-- { "OLYMPUS E-20", 0, 0xffc0,
-+ { "OLYMPUS E-20", 0, (short) 0xffc0,
- { 13173,-4732,-1499,-5807,14036,1895,-2045,2452,7142 } },
- { "OLYMPUS E-300", 0, 0,
- { 7828,-1761,-348,-5788,14071,1830,-2853,4518,6557 } },
-@@ -6353,7 +6353,7 @@
- { 8961,-2473,-1084,-7979,15990,2067,-2319,3035,8249 } },
- { "OLYMPUS E-3", 0, 0xf99,
- { 9487,-2875,-1115,-7533,15606,2010,-1618,2100,7389 } },
-- { "OLYMPUS E-400", 0, 0xfff0,
-+ { "OLYMPUS E-400", 0, (short) 0xfff0,
- { 6169,-1483,-21,-7107,14761,2536,-2904,3580,8568 } },
- { "OLYMPUS E-410", 0, 0xf6a,
- { 8856,-2582,-1026,-7761,15766,2082,-2009,2575,7469 } },
-@@ -6399,23 +6399,23 @@
- { 9186,-2678,-907,-8693,16517,2260,-1129,1094,8524 } },
- { "PENTAX K2000", 0, 0,
- { 11057,-3604,-1155,-5152,13046,2329,-282,375,8104 } },
-- { "Panasonic DMC-FZ8", 0, 0xf7f0,
-+ { "Panasonic DMC-FZ8", 0, (short) 0xf7f0,
- { 8986,-2755,-802,-6341,13575,3077,-1476,2144,6379 } },
- { "Panasonic DMC-FZ18", 0, 0,
- { 9932,-3060,-935,-5809,13331,2753,-1267,2155,5575 } },
- { "Panasonic DMC-FZ28", 15, 0xfff,
- { 10109,-3488,-993,-5412,12812,2916,-1305,2140,5543 } },
-- { "Panasonic DMC-FZ30", 0, 0xf94c,
-+ { "Panasonic DMC-FZ30", 0, (short) 0xf94c,
- { 10976,-4029,-1141,-7918,15491,2600,-1670,2071,8246 } },
-- { "Panasonic DMC-FZ50", 0, 0xfff0, /* aka "LEICA V-LUX1" */
-+ { "Panasonic DMC-FZ50", 0, (short) 0xfff0, /* aka "LEICA V-LUX1" */
- { 7906,-2709,-594,-6231,13351,3220,-1922,2631,6537 } },
- { "Panasonic DMC-L10", 15, 0xf96,
- { 8025,-1942,-1050,-7920,15904,2100,-2456,3005,7039 } },
-- { "Panasonic DMC-L1", 0, 0xf7fc, /* aka "LEICA DIGILUX 3" */
-+ { "Panasonic DMC-L1", 0, (short) 0xf7fc, /* aka "LEICA DIGILUX 3" */
- { 8054,-1885,-1025,-8349,16367,2040,-2805,3542,7629 } },
- { "Panasonic DMC-LC1", 0, 0, /* aka "LEICA DIGILUX 2" */
- { 11340,-4069,-1275,-7555,15266,2448,-2960,3426,7685 } },
-- { "Panasonic DMC-LX1", 0, 0xf7f0, /* aka "LEICA D-LUX2" */
-+ { "Panasonic DMC-LX1", 0, (short) 0xf7f0, /* aka "LEICA D-LUX2" */
- { 10704,-4187,-1230,-8314,15952,2501,-920,945,8927 } },
- { "Panasonic DMC-LX2", 0, 0, /* aka "LEICA D-LUX3" */
- { 8048,-2810,-623,-6450,13519,3272,-1700,2146,7049 } },
---- a/codecs/raw.cc
-+++ b/codecs/raw.cc
-@@ -66,7 +66,7 @@
- if (!image.getRawData())
- return false;
-
-- return stream->write ((char*)image.getRawData(), image.stride()*image.h)
-+ return static_cast<bool>(stream->write ((char*)image.getRawData(), image.stride()*image.h))
- /* ==
- (size_t) image.stride()*image.h*/;
- }
diff --git a/media-gfx/exact-image/files/exact-image-0.8.1-libpng15.patch b/media-gfx/exact-image/files/exact-image-0.8.1-libpng15.patch
deleted file mode 100644
index 94c8906a874a..000000000000
--- a/media-gfx/exact-image/files/exact-image-0.8.1-libpng15.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/codecs/png.cc
-+++ b/codecs/png.cc
-@@ -16,6 +16,7 @@
- */
-
- #include <stdlib.h>
-+#include <zlib.h>
- #include <png.h>
-
- #include <iostream>
-@@ -104,7 +105,7 @@
- image.w = width;
- image.h = height;
- image.bps = bit_depth;
-- image.spp = info_ptr->channels;
-+ image.spp = png_get_channels(png_ptr, info_ptr);
-
- png_uint_32 res_x, res_y;
- res_x = png_get_x_pixels_per_meter(png_ptr, info_ptr);
-@@ -120,10 +121,13 @@
- // png_set_packswap(png_ptr);
-
- /* Expand paletted colors into true RGB triplets */
-+
-+ int num_trans;
-+
- if (color_type == PNG_COLOR_TYPE_PALETTE) {
- png_set_palette_to_rgb(png_ptr);
- image.bps = 8;
-- if (info_ptr->num_trans)
-+ if (num_trans)
- image.spp = 4;
- else
- image.spp = 3;
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 52ef4df0cbb8..a32eb57ace5b 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -7,5 +7,5 @@ AUX fontforge-doc-no-warn-error.patch 834 BLAKE2B c8bd1cfcf320b7831cc64d67d8de52
DIST fontforge-20200314.tar.xz 13850076 BLAKE2B 5e6ae3b7940a5b3b08811abdfc9d151f231e6d457b219eb0c666e1b831db815b696f345eda0d4d423b7e340f56fca67205734ae19903b3815381080d34b5e95c SHA512 09f5dc93f87ca63668d72d108690604489d6b3cec7eedff1c07ad6d1ce5eae442ab60e79e71ae8b99e9808f3551011788025a86ffc3a9738518d99761d849975
DIST fontforge-20201107.tar.xz 14163424 BLAKE2B 8ce9148eef6e5b7206ab5c70310ff36fac67c392117e3c0b28060803a54306bf21c179b62b98734e11253739eac29e2ea8bcf3014c09432bb3a0b2b0f3ec631a SHA512 cf9666395405ab02943f0160959f04251bd2a80e279a8f60431089ad19a4c5a232efd42097050ed9f6c1fb39d01488176262949fd81f5f0960fe853b497437dc
EBUILD fontforge-20200314.ebuild 3058 BLAKE2B 94968a4ca991a47bb10ed96bd636fe0930df065c5d8d18348b50cfcf7b5710b8aea7f4b981410b3f041bd942a7544002c1c1100fb75bf94945b6893dc2948437 SHA512 3a7af2adbee535f5589145d7e41e1fe627558bb672da9979842d5917ff0c59496c7ec5c4f1d56b0f82553d3bf83bac0fee526674da017875b49e07aae2f7bd7a
-EBUILD fontforge-20201107.ebuild 2865 BLAKE2B 2537b1de8b9cd70d292bf9be9b95dce8d374c89fcb0fe1e92a1da872327d89506338e3d98204e2e3d7232135041b7ba30cd04e0bd9b1824b5f5872f5b6e36d4f SHA512 a9d66a3f496a50451f8775c19f114e65d37e4af2fdec3b8797e6c33b62e235ed9272877d3a992634f17b3bf115655c47d764b10b825ebc718a39b28481d43bbb
+EBUILD fontforge-20201107.ebuild 2858 BLAKE2B ab21f8e1d9bf605cd3676130da35a0afc3ec9faf2c1fa34614b50c5eb6b0c291621041d3e5c91079834cc8b71dc044c6c004020d217db5e517d3ce0432292ed4 SHA512 c13614e750bde83c367c3491a1b10411b6df77767fb1aea42e0c274311b47cc9d41189f83cc6103f8ce9fd6e429c769748ac2b6f276e3435f8df2aac51f78d03
MISC metadata.xml 861 BLAKE2B 124399e55210b51cd13640775c816694e8ac20aa897984124bb6b62491494bf754e8ad772f0c322044853c8000ba882491193213a749dc696bf0d63d781cd8df SHA512 cde1be6966688ea55af73b02cf4fbffae5141bdfebf45211ca84c0f3651e39916b9abeb6bab652663ff5a68ed0b359df35e0420447a5f1c9a0ab16368f74e479
diff --git a/media-gfx/fontforge/fontforge-20201107.ebuild b/media-gfx/fontforge/fontforge-20201107.ebuild
index 671629d19938..47fd33f66d96 100644
--- a/media-gfx/fontforge/fontforge-20201107.ebuild
+++ b/media-gfx/fontforge/fontforge-20201107.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforg
LICENSE="BSD GPL-3+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="doc truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode woff2 X"
RESTRICT="!test? ( test )"
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index be7c7ebb2329..f2aa82b3b072 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -2,7 +2,6 @@ AUX geeqie-1.5.1-no_common.patch 2168 BLAKE2B 3949807b4bdd99a9283ca1ff1108fbfcc6
DIST geeqie-1.5.1.tar.xz 1587116 BLAKE2B f8742a88eefd90fb1e7e1d1365058cef190b6231fcb001faa9f110676e8403c8e5959f9af398d6fa1ddc4e4c62439728904c6c39f5095f476014a5b7b74b4d16 SHA512 265eade90afe45856855e856c5f640786ca2e3add57c3ade8ca380d075297f96bf44c6e0c4fd6eabbc2666a37f898b50d37dd2e01d77875b8a622d72d8a0e6ac
DIST geeqie-1.6.tar.xz 1693488 BLAKE2B ee5369884c4c0e60fe827d43ef336c5aaa89d55aec8905bb8cdd4edb2ee12e15d525577a3c85403e2e8955a08c817007b72d1d1e3614063377a21aaba317acee SHA512 4acd05c6012c80581e9c594c7dc7d12265528aa8d3868afef9def36798945afb851da9376bbe5f205ac3c5e1e2362188cc0e2891b49f3ea4396bbc6974c143ef
EBUILD geeqie-1.5.1-r1.ebuild 2280 BLAKE2B 9653c0f0ac69e5a18812a86534e5ff6025e754545f2d53e3f06e538f59a600c98b27fff34f425e1d342a3c0ac8ef229f58ef8da99b9cd4c5f1f54e91246eead9 SHA512 26a4d709e1c8c6f3a6db159d4e912def9ce7ed7cb7a7d1a261d2428b46440aad882d450b1f8d54f513fd02a1f637bd0328403c9c143281b889dc3f34dfca7a31
-EBUILD geeqie-1.5.1.ebuild 2222 BLAKE2B c725f6902608cd0483fcfb056c7328cc3ecbc0b010da93970c14e1f0400fa2f2577c00622e773b9531ee1472d58b9d319bb0f54c870762c852f9f1e8abf1f871 SHA512 69a7e41f601ffba26e13d42fb2b63325293aee00f8c5838d171b26e2c09738a87b4c6c95debbc433b6e357ae202098eeef4e9b9d660d04ce2458696c7280bda1
EBUILD geeqie-1.6.ebuild 2235 BLAKE2B cf7aff0c366ba4399c5f6622bdb6d1d5c9e74fbd8b29be0526d12a24ce8a577fc160c0388f4c5718bef6ca91cf0070e03a8c32aadea7fd3841eba2e202dcaf93 SHA512 3ba5b3cca3da8b7d14560628983d2a39650cd714df97295ef809f573aa9789f92db3966a517760d5806b4482abf3294d4922c25d2c81d6d36512dc5aaa9bd53b
EBUILD geeqie-9999.ebuild 2330 BLAKE2B 5663c258cc045098f835f35484648755e87b7223f4caee2bacc746c78bbeaa683e3fa5b7ad8bef4198853bb1628c09e103df94e8d0a98b2961d2a1a36fbbc104 SHA512 e911efd079f9b6c8455302d2f02f55de4050ecda2a17beb2ab945753c8e1c6ce0fb1947f107e4218354441b912970d5687c0ac5c72b5e87346dfc06668a6c2b2
MISC metadata.xml 923 BLAKE2B 49de6dd7b0380b1cc74ccabbc8f84e2c55144b80612e04c4e55c82d052027882cc293a70a52f857bded73246ccbb5351df53dc1e1e08b8c2c08e630bc24f9882 SHA512 752280a5fefc097c5ca8b1fc2e9f05220aa809e45484560edca7baa68d95b0d91fa14973c321aefcdb76052dc02e405e2fb4a32e6322f04cd8223afaa6734d58
diff --git a/media-gfx/geeqie/geeqie-1.5.1.ebuild b/media-gfx/geeqie/geeqie-1.5.1.ebuild
deleted file mode 100644
index 4e7557f90024..000000000000
--- a/media-gfx/geeqie/geeqie-1.5.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools xdg
-
-DESCRIPTION="A lightweight GTK image viewer forked from GQview"
-HOMEPAGE="http://www.geeqie.org"
-SRC_URI="http://www.geeqie.org/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map nls pdf tiff xmp"
-
-RDEPEND="
- virtual/libintl
- doc? ( app-text/gnome-doc-utils )
- ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
- gpu-accel? ( media-libs/clutter-gtk )
- gtk3? ( x11-libs/gtk+:3 )
- !gtk3? ( x11-libs/gtk+:2 )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( media-libs/lcms:2 )
- lirc? ( app-misc/lirc )
- lua? ( >=dev-lang/lua-5.1:0= )
- map? ( media-libs/libchamplain:0.12 )
- pdf? ( >=app-text/poppler-0.62[cairo] )
- tiff? ( media-libs/tiff:0 )
- xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
- !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/glib-utils
- dev-util/intltool
- virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-REQUIRED_USE="gpu-accel? ( gtk3 )
- map? ( gpu-accel )"
-
-PATCHES=( "${FILESDIR}"/${P}-no_common.patch )
-
-src_prepare() {
- default
-
- # Remove -Werror (gcc changes may add new warnings)
- sed -e '/CFLAGS/s/-Werror //g' -i configure.ac || die
-
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --with-readmedir="${EPREFIX}"/usr/share/doc/${PF}
- $(use_enable debug debug-log)
- $(use_enable ffmpegthumbnailer)
- $(use_enable gpu-accel)
- $(use_enable gtk3)
- $(use_enable jpeg)
- $(use_enable lcms)
- $(use_enable lua)
- $(use_enable lirc)
- $(use_enable map)
- $(use_enable nls)
- $(use_enable pdf)
- $(use_enable tiff)
- )
-
- if use exif || use xmp; then
- myeconfargs+=( --enable-exiv2 )
- else
- myeconfargs+=( --disable-exiv2)
- fi
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- rm -f "${D}/usr/share/doc/${PF}/COPYING"
- # Application needs access to the uncompressed file
- docompress -x /usr/share/doc/${PF}/README.md
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- elog "Some plugins may require additional packages"
- elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)"
- elog "- RAW images plugin: media-gfx/ufraw"
-}
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index ac6e0560b5ca..037422d73bf8 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -1,6 +1,6 @@
AUX graphicsmagick-1.3.19-perl.patch 491 BLAKE2B 6a6465162d9a4d7d09b1edb425cc7114cd4e0fc65e48f15c8c2a854fe835fd1fe94c56611c6d2744d9e26884c57b1f67353bfd32abe2f25a145dd7abbf5479f0 SHA512 da114b891ec923253048d90ee14f136742072bcb70e512e8d2838bbcac57b5fe6ea580cdccfd1bba5156777623c43e946ce2a8661f88612d4c24849bef0fb865
AUX graphicsmagick-1.3.36-flags.patch 2009 BLAKE2B 1d58f03cfeac9be92e2e85a2b6274ec22e3cb2c65d62e3095f2bb3da8f817ae52fdd6fe70e5da30bb8110202ec8c8268ffef7069c34d55ef7f7ccc3e53785418 SHA512 205694ea04e7b65c5519c564bbfa1ebd33ef4fa7800aec1a91439ed90794629dd54ab42c1c7f4f2f5ce3b7b078b3fffe76ce37c61643087f5cca244931b5bd3a
DIST GraphicsMagick-1.3.36.tar.xz 5600712 BLAKE2B 069ab4f9bb5beea3321860bf8e43c8a1b51ab102054e92486375209a86fd3c1c1fb44d4b2c43a65c78f36e9f37e09316fe77b4f261bfb0af3b2c2a86ff8b5aa5 SHA512 27ed5fcbfb0303436bdcb0f11d18257a967d471251b51e633e2c655b0a7e5ed01f61a61f9702cc7d4c02714e005ac18ca9ba0f690c0580e41d07947a03c5cbb4
-EBUILD graphicsmagick-1.3.36.ebuild 3164 BLAKE2B cae9c965cfac059d0c065866f117f49761e0b0f49c0cd1d718d5cbf195f30f0eabea216f9cfaafe549ea4ab437ec97c5ab21d5cc0afdca17ea9952b9334668e0 SHA512 caea74a3f09a26518841fffa306ecd62ca50f6be8de25014ae649cbfa3465c8742b11c69109a5335b544670865ea7592639ffd2f69064ba4016c97b65fd2e80c
-EBUILD graphicsmagick-9999.ebuild 3171 BLAKE2B 7ec34831b9d3297e7fe1acf566f735fb733874da436d0a5346b40021e7a6485c08fd8b112ed149a26d8c8276ffdf2eaa75c34c8f19dc9198904b239c0213197e SHA512 a931780d798844c966fdf35afe2698da6085cee5bec3882349947d7c29c08770272918fe47e615ac68267f916f5ef626db0383400977fe6bf33e07bfcae84109
+EBUILD graphicsmagick-1.3.36.ebuild 3168 BLAKE2B 62214202bfa98ed92b9bdf622d00a51d0d99915b3b45e7f367f20775645689e7f1f1e759611305cc0eb5fbfbb3078e535f8db72ab23bb774902d1f5c9a0d9c63 SHA512 c90d3ced676401b7ed5fed30fdf205fc2cf10bb20781a06dbc1534bb2ba0bca796d99b746b28c2b314c99090d212706bc28b6d9e0100ec974c723442e6742d4e
+EBUILD graphicsmagick-9999.ebuild 3175 BLAKE2B 9b39a8d32a89f5fc9cff2d287fa1a050b24d15b9c221a831d17fca73818b00144788da809527592c43fd1285084ddf32e3560cadaa7a654a68465aa215fd2e57 SHA512 a3cfb09b529178980f5c54005cd9ba82e1a4284df6345600be7ddce9567bbb262babe15a1d8a5080905a53ef917a55b22db3d653b7de97b9017bd2a1656c5e1d
MISC metadata.xml 1276 BLAKE2B 4784c9dbeb0760b1b0b8f83672a85dc318d2829dcfbe547b0e25da66128194db0662efc77bdced2c12e0219df3f6a660273d7966c8b2f320b320cbb3c210b814 SHA512 17efe89b6dcc8e93b7b4849af215210faf64e95ec34f39accf58bc2c9397818389126fe7de7ea0f2091a9e24cf282dc33b4c65b69545e8a8c19b2de57280325f
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
index 61f1c141918b..22f9ab4a3d52 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
@@ -24,7 +24,8 @@ IUSE="bzip2 +cxx debug dynamic-loading fpx imagemagick jbig jpeg lcms lzma
openmp perl png postscript q16 q32 static-libs svg threads tiff truetype
webp wmf X zlib"
-RDEPEND="dev-libs/libltdl:0
+RDEPEND="
+ dev-libs/libltdl:0
bzip2? ( app-arch/bzip2 )
fpx? ( media-libs/libfpx )
imagemagick? ( !media-gfx/imagemagick )
@@ -66,7 +67,7 @@ src_configure() {
use q32 && depth=32
local openmp=disable
- if use openmp && tc-has-openmp; then
+ if use openmp && tc-has-openmp ; then
openmp=enable
fi
@@ -121,7 +122,7 @@ src_test() {
src_install() {
default
- if use perl; then
+ if use perl ; then
emake -C PerlMagick DESTDIR="${D}" install
find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die
find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die
diff --git a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
index 029471742cac..71a6c9e5bbc5 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
@@ -24,7 +24,8 @@ IUSE="bzip2 +cxx debug dynamic-loading fpx imagemagick jbig jpeg lcms lzma
openmp perl png postscript q16 q32 static-libs svg threads tiff truetype
webp wmf X zlib"
-RDEPEND="dev-libs/libltdl:0
+RDEPEND="
+ dev-libs/libltdl:0
bzip2? ( app-arch/bzip2 )
fpx? ( media-libs/libfpx )
imagemagick? ( !media-gfx/imagemagick )
@@ -66,7 +67,7 @@ src_configure() {
use q32 && depth=32
local openmp=disable
- if use openmp && tc-has-openmp; then
+ if use openmp && tc-has-openmp ; then
openmp=enable
fi
@@ -121,7 +122,7 @@ src_test() {
src_install() {
default
- if use perl; then
+ if use perl ; then
emake -C PerlMagick DESTDIR="${D}" install
find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die
find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 9e892e19a2db..b3c877b02c03 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.12-2.tar.xz 9168640 BLAKE2B b0ce3b8ac5ff27f6d6fd0995d0f214f791fdce6c881e6b58579aaa22a7e87ca8d441185f69ba9d50a9aea501f28f06564ac76f7d1d5b1760206eeaf17560a8a7 SHA512 105d11d23457050c9f94223d524230ab62cdf457fe17630179c92f53a6bb60b8c04fa0f60f388303a90e2106aea6e0f1863a9a49a8fdfefd5d15d13eca58a770
DIST ImageMagick-6.9.12-3.tar.xz 9174208 BLAKE2B 5ee9ab5196cb2dcbb2d210dfb71fbb63956bdfc33e97fa03a51f6884736dffc1227ec94d44a46c19eeb216a1896c06b0927678410e0171d855b77e13ab10c51e SHA512 c117fd1fe57478f66fb2b3bab1d6d908a643519a0e4b8026f138ba77778f29bb83e15a78a3b58b461a16cf2dcf66db84d6cc9e77532aab14f776dabf2eb8f24a
-DIST ImageMagick-7.0.11-2.tar.xz 10145568 BLAKE2B 2edc25dfeda99fee1d4fec4a90fcd48b350c93317082239b243874b0394cefe154ca7553fb1d688971c5352d896ff6327f31ca708a2000427601c53d0ce5c7ea SHA512 29ddf675bde3165d86f786eebfe8443cb4205d6218cb3cfa78be26d18fb30ad13913db32124377030c283156f4aa81cc28acef5cd7c1a873a66d5f563e5152ac
+DIST ImageMagick-6.9.12-4.tar.xz 9169012 BLAKE2B 2c1229907d14f60315f9ca2baf8c54380855119df4b4d00f01736a0c8c5c880f85e911c02767957f009cd60da12d86025637e3dfcfe296c9874e284eee70c332 SHA512 301637b0fc2b4f4b1ba79e3f6ed7e24e55dc749b3adf3afd408c750220647df17f4f5e70869d503c53feb7ef15b94159e4e92b5ba09ec50f9e7902d7fa261b84
DIST ImageMagick-7.0.11-3.tar.xz 10151644 BLAKE2B f32234fd1f89dfd4ead816f06984b6f673235f368cebbdc19704e677e2a1802ef2212d489346e7f48239a6aa14e7a089b45259645879b5010773d6565e5b0a1e SHA512 9a5cf4fc2c325d435a04c54bec3502bfa86d8bfa0b91efc53e34f364de039bcea5318ea3ebdb10e0bd49767f29ce44ca209bcefb51c2676a6a55a2e97c6ebf9b
-EBUILD imagemagick-6.9.12.2.ebuild 7059 BLAKE2B 15ee8b4d1965bbae05ff93a7ccbbf2e40aa70f8111984895c85e1e78941f8b8403f94c423ed439e2ff3593f48964a481aa02f96e436f0f4bbc93e197018f3c45 SHA512 a868f2837298bd861abf52e88d1ead03c533a5f68a080ed2367748a409bb90ceb68415f9837be68f8f03d859e31aef34347594a22ba4250196e259a64be82126
-EBUILD imagemagick-6.9.12.3.ebuild 7066 BLAKE2B 1a8c103b4b74ec48f1d1a985e35315043f5e9306ca54183c457935279ad2e54038e65d20ac92b5d0ce3ad94d6a636179fb9b59eae087d1ea351ac12adf68e28b SHA512 443cc02aa96ba19fc040add6f56a099d2deedb72c1c2c074031dde18322c866e764d232de4d73dbf0189dc0a6777970ea5c2471d5b4e25f9bdae827f53431903
-EBUILD imagemagick-7.0.11.2.ebuild 7367 BLAKE2B 574aee956d82d649ff633bece498d743a3edec70f641da61565143572823c124e2cae9250214f8c9058490e52fffbdb2952eb385971134ba576a8f3c1208ac6b SHA512 ffaac421781cec3c38473b2398c57691cb33d0708afd1fb3918ad3007a2ebb9d0e1c48c6e81e2b49374066cc855bfffab3c7945a827a328b044f661eb20682d3
-EBUILD imagemagick-7.0.11.3.ebuild 7375 BLAKE2B 7654a1366679222fc571f074f0c7b5369e5cc9e0f5b10d29283c9ad2bbc43587aeddbad38a83961bff1fe64c69b295f2611324cfea4c09a66bbe45acd0d0366f SHA512 c082496c8c8e08f3d6d4e02cca1b8936ef0573a962f49449967dfd68d3b038405488887cf004627e3748478aa5f7ccfde44d2c93e1defd840baac931ee172c08
+DIST ImageMagick-7.0.11-4.tar.xz 10155508 BLAKE2B 914da94cfa933e21d01d31f57273989674a42171404ad10ba731f0c054d23ebb7ff66585b590535b01600c212c0039761d5dff36ce23dd79b6747fbbfd08acb1 SHA512 fedd0b01cc3b7d13429b2765d2bc8b4800fb228bbaaff35a5206ee52edc71a3fcd12d0832213eb9218804b3ca898b5de4594b98f77d7de8302087f350b4f028b
+EBUILD imagemagick-6.9.12.3.ebuild 7059 BLAKE2B 15ee8b4d1965bbae05ff93a7ccbbf2e40aa70f8111984895c85e1e78941f8b8403f94c423ed439e2ff3593f48964a481aa02f96e436f0f4bbc93e197018f3c45 SHA512 a868f2837298bd861abf52e88d1ead03c533a5f68a080ed2367748a409bb90ceb68415f9837be68f8f03d859e31aef34347594a22ba4250196e259a64be82126
+EBUILD imagemagick-6.9.12.4.ebuild 7066 BLAKE2B 1a8c103b4b74ec48f1d1a985e35315043f5e9306ca54183c457935279ad2e54038e65d20ac92b5d0ce3ad94d6a636179fb9b59eae087d1ea351ac12adf68e28b SHA512 443cc02aa96ba19fc040add6f56a099d2deedb72c1c2c074031dde18322c866e764d232de4d73dbf0189dc0a6777970ea5c2471d5b4e25f9bdae827f53431903
+EBUILD imagemagick-7.0.11.3.ebuild 7367 BLAKE2B 574aee956d82d649ff633bece498d743a3edec70f641da61565143572823c124e2cae9250214f8c9058490e52fffbdb2952eb385971134ba576a8f3c1208ac6b SHA512 ffaac421781cec3c38473b2398c57691cb33d0708afd1fb3918ad3007a2ebb9d0e1c48c6e81e2b49374066cc855bfffab3c7945a827a328b044f661eb20682d3
+EBUILD imagemagick-7.0.11.4.ebuild 7375 BLAKE2B 7654a1366679222fc571f074f0c7b5369e5cc9e0f5b10d29283c9ad2bbc43587aeddbad38a83961bff1fe64c69b295f2611324cfea4c09a66bbe45acd0d0366f SHA512 c082496c8c8e08f3d6d4e02cca1b8936ef0573a962f49449967dfd68d3b038405488887cf004627e3748478aa5f7ccfde44d2c93e1defd840baac931ee172c08
EBUILD imagemagick-9999.ebuild 7375 BLAKE2B 7654a1366679222fc571f074f0c7b5369e5cc9e0f5b10d29283c9ad2bbc43587aeddbad38a83961bff1fe64c69b295f2611324cfea4c09a66bbe45acd0d0366f SHA512 c082496c8c8e08f3d6d4e02cca1b8936ef0573a962f49449967dfd68d3b038405488887cf004627e3748478aa5f7ccfde44d2c93e1defd840baac931ee172c08
MISC metadata.xml 1226 BLAKE2B 09876ac633363817b503a307e2cc0a500cfdcc1256cbb3b3e595600a0c913aa7ad252eb4dbe18b911bfcc9f06ec7b8046e0c2e3882eec305e471080bd76de906 SHA512 da1bb41d877614a237ea14379614a509fb58d58f4e93e56500e6aa0007c0515e6d90731c5df9e387f36632a210276a6983784cede64119453c965a9fc7e2ea4d
diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.3.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.3.ebuild
index 7ff90f249dff..923c0a8e8415 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.12.3.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
LICENSE="imagemagick"
SLOT="0/6.9.11-60"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
REQUIRED_USE="corefonts? ( truetype )
diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.2.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.4.ebuild
index 923c0a8e8415..7ff90f249dff 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.12.2.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
LICENSE="imagemagick"
SLOT="0/6.9.11-60"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
REQUIRED_USE="corefonts? ( truetype )
diff --git a/media-gfx/imagemagick/imagemagick-7.0.11.3.ebuild b/media-gfx/imagemagick/imagemagick-7.0.11.3.ebuild
index 5256a3f29d2f..8f1725c766d6 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.11.3.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.11.3.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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.11.2.ebuild b/media-gfx/imagemagick/imagemagick-7.0.11.4.ebuild
index 8f1725c766d6..5256a3f29d2f 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.11.2.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.11.4.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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/imv/Manifest b/media-gfx/imv/Manifest
index 71ea7c5ae0ae..7266f2684743 100644
--- a/media-gfx/imv/Manifest
+++ b/media-gfx/imv/Manifest
@@ -1,8 +1,6 @@
AUX imv-4.2.0-add-string-inc.patch 275 BLAKE2B 40e46bd1e7531477d6701ac14013405ee37562305286223a4b5800f3f644f63d366bb1ae08a0ee575b088351013605c9ecaf0356a046976d6a520d55dcaaf2c0 SHA512 2ef9ae3e8a6543476000a2e19fee4f383e01a25b5ed6ffb674f12f843761f9d8fa6ae394e2043260ba88d88fa300ebe3bb03027a02aa3afde5d4cdf897174958
AUX imv-4.2.0-wayland-roundtrip-after-scale.patch 583 BLAKE2B b71b428bc7c3fd566ab9fa650cb714a2abc455df0512aa7372f82e1c331530bf8515cd0f005d54aa9d20de2156eddf7a0fb3b892775825a4a8af64a0bc66735a SHA512 c081fa2656d2611ef78df072826718ccca56fc376860277f74a9248e0b9771547af28e9379dbf820c4e67f33ffad021c10b5e178f1da2c309e33d25692a38218
-DIST imv-4.1.0.tar.gz 77341 BLAKE2B d6735feba4d3e958db70eddea72bbbeb60731cf550680320448ba226ba74eb467617ad295f9094995e0bf31c99473f067ff41f16689ce21fb87d7a9fd2e0946a SHA512 92d7551bda55185b29724e90230dac608a82f4a45cd3cb9c7a5d261f65eede6dcdde78f5c16eecfc1242533ec8e155204189fab3cacf31ddc088707af5131b2a
DIST imv-4.2.0.tar.gz 77809 BLAKE2B a0c8aeb4d50d252818f4a4bedc145a8e2ffffa3ae14d888ef4623fe17a714bd17397399064019b32a48e6ebe3613f592428b075988ed533166c06c2b885d245b SHA512 7b64c6d4e5e484fd2ef4e28e2ba5cc74e4d28f8e2fa329ae7c744bd77ce8a345123f9cc3c77e015ff780938d5add97cfe9ed4e5a3a52b03a91b7bb6bb50e7115
-EBUILD imv-4.1.0-r1.ebuild 1767 BLAKE2B fe2541d3bce172e6fc1c559ed0593a4c52b1536b907459d2e5842db5c14ec356e7523cf3d91225ab6b5d3261b8ff3fa4ab9724c8d95979e88078b5b7617d897f SHA512 7484d434a44818bd131ccecd484bd88e6ed8867eacf48f94e863b9dc480f197005a5f8bc519207afd82f3fca7d02416dbd7fc7ff966520b7a57c726317af4cdd
-EBUILD imv-4.2.0.ebuild 1897 BLAKE2B 8fa164e9e1eb6b8856774c7e863a725749b4316ff3dda0a8906540910c371625406a2ef0b0b4fd281032970f07e764bb7feb899d819c30e1bc35839cdfd031cb SHA512 611ad4cdc876fa7e36a84ffad250d76e291df8fdb0dc4b1f78b9ded7c097708f41a2f9f9ab6fa5e3536a98acd80940b1cf46e6163f1e120abedafd2da6ad73d5
-EBUILD imv-9999.ebuild 1773 BLAKE2B 8e12bc1176341dd3aeafc8cc3347d673e79f154e699fd423967f0841930fa02efd17d601220b3688791cb9d753a69da25ca007c130967e4bfab94c5d08c75cbe SHA512 b5be092d1e4b1acd2542e5a19881f2a4c836e040df6bedbade6022e06db2af21971c167e9162ee72c61c27bd83ce258ff7aa353c711c438960e056afd5816c9d
-MISC metadata.xml 692 BLAKE2B 075c4adcd3f302d2aa23e6e67213baf23ebf4665b1fb40b6e3de390715bbbde163ff3e596785b74840db74f3cdf24324c2e718de19d4ea5f280130320fe586d9 SHA512 65f74a9aac990f9977534b2ea39fbdf1499f5b5645bda71ea26cb78efa3cd92f22ba38261b272bd64176e1d8528a8639aedc24e96e4a1444d00ca6c6936e24b3
+EBUILD imv-4.2.0.ebuild 1934 BLAKE2B 923576182f4d8756bd7d9afc2c718674fbd9c95a386b99d2bac370a87c9cc03558f8e1f8833ccefa735fc0299984dd3d7f2823be51a1fa0ad915756a87d2c6a5 SHA512 ba9014b318ecc18b2473dfe92b25c208b6f8ce4cd329f0482c925e3fd86b3cab7aef43a71ccaa89e01294b5d877ba42617b70b7dc27d7f7da21e90648418faa8
+EBUILD imv-9999.ebuild 1810 BLAKE2B e3601453c416eb35d202cfef4916bd8a6e078ed3a6c9aec7a1871b3ba70522f35a67356842b164ed3f721298ee0c9bf9bf63237ca5f777188d7d0a1677b18bbc SHA512 b618911f0c0797be3cacc06474b4d87ffb975aec79b9439f7530dbcd127db01a110fffdc539c666aaccbcbe71c66d09623745027168f489fe01cbda461f6e046
+MISC metadata.xml 636 BLAKE2B 0baddac56141b71f8534e57dfdfc2a2e5bb3b31516712c259e48aa1bc31403011272176dc80aa734e8f225bb025c8d2ce51199cfef8c18be38bdf4d9493309ac SHA512 8028f1ee17864d3eb3c6ca4b53ca980e927689d77a8b396caa543533f3c61f09767eb16128840899e17c7c1e5057c711362d64d35422138723882b9dc8da1823
diff --git a/media-gfx/imv/imv-4.1.0-r1.ebuild b/media-gfx/imv/imv-4.1.0-r1.ebuild
deleted file mode 100644
index eb2681a4e709..000000000000
--- a/media-gfx/imv/imv-4.1.0-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs xdg-utils
-
-DESCRIPTION="Minimal image viewer designed for tiling window manager users"
-HOMEPAGE="https://github.com/eXeC64/imv"
-SRC_URI="https://github.com/eXeC64/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT-with-advertising"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X +freeimage jpeg libnsgif png +svg test tiff wayland"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
- || ( X wayland )
-"
-
-RDEPEND="
- !sys-apps/renameutils
- dev-libs/icu:=
- media-libs/fontconfig
- media-libs/libsdl2
- media-libs/sdl2-ttf
- X? (
- virtual/glu
- x11-libs/libX11
- x11-libs/libxcb
- x11-libs/libxkbcommon[X]
- x11-libs/pango
- )
- freeimage? ( media-libs/freeimage )
- jpeg? ( media-libs/libjpeg-turbo )
- libnsgif? ( media-libs/libnsgif )
- png? ( media-libs/libpng )
- svg? ( gnome-base/librsvg )
- tiff? ( media-libs/tiff )
- wayland? ( dev-libs/wayland )
-"
-BDEPEND="
- app-text/asciidoc
- test? ( dev-util/cmocka )
-"
-DEPEND="
- ${RDEPEND}
-"
-
-src_prepare() {
- default
- sed -i -e 's|pkg-config|$(PKG_CONFIG)|g' Makefile || die
-}
-
-src_configure() {
- tc-export PKG_CONFIG
- local WINDOWS
- if use X; then
- if ! use wayland; then
- WINDOWS=x11
- else
- WINDOWS=all
- fi
- else
- if use wayland; then
- WINDOWS=wayland
- fi
- fi
-
- BACKENDS=(
- BACKEND_FREEIMAGE=$(usex freeimage)
- BACKEND_JPEG=$(usex jpeg)
- BACKEND_LIBNSGIF=$(usex libnsgif)
- BACKEND_LIBPNG=$(usex png)
- BACKEND_LIBRSVG=$(usex svg)
- BACKEND_LIBTIFF=$(usex tiff)
- WINDOWS=${WINDOWS}
- )
-}
-
-src_compile() {
- emake ${BACKENDS[@]}
-}
-
-src_install() {
- emake ${BACKENDS[@]} DESTDIR="${D}" install
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/media-gfx/imv/imv-4.2.0.ebuild b/media-gfx/imv/imv-4.2.0.ebuild
index 25863200b0b2..c3beeda396a8 100644
--- a/media-gfx/imv/imv-4.2.0.ebuild
+++ b/media-gfx/imv/imv-4.2.0.ebuild
@@ -2,7 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit xdg meson
+
+inherit meson xdg
if [[ ${PV} == 9999 ]]; then
inherit git-r3
@@ -39,15 +40,13 @@ RDEPEND="
svg? ( >=gnome-base/librsvg-2.44 )
tiff? ( media-libs/tiff )
wayland? ( dev-libs/wayland )
- !sys-apps/renameutils
-"
+ !sys-apps/renameutils"
DEPEND="
${RDEPEND}
- test? ( dev-util/cmocka )
-"
+ test? ( dev-util/cmocka )"
BDEPEND="
app-text/asciidoc
-"
+ wayland? ( dev-util/wayland-scanner )"
PATCHES=(
"${FILESDIR}/${PN}-4.2.0-add-string-inc.patch"
diff --git a/media-gfx/imv/imv-9999.ebuild b/media-gfx/imv/imv-9999.ebuild
index 735366ed5332..9b3b3c026ab9 100644
--- a/media-gfx/imv/imv-9999.ebuild
+++ b/media-gfx/imv/imv-9999.ebuild
@@ -2,7 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit xdg meson
+
+inherit meson xdg
if [[ ${PV} == 9999 ]]; then
inherit git-r3
@@ -39,15 +40,13 @@ RDEPEND="
svg? ( >=gnome-base/librsvg-2.44 )
tiff? ( media-libs/tiff )
wayland? ( dev-libs/wayland )
- !sys-apps/renameutils
-"
+ !sys-apps/renameutils"
DEPEND="
${RDEPEND}
- test? ( dev-util/cmocka )
-"
+ test? ( dev-util/cmocka )"
BDEPEND="
app-text/asciidoc
-"
+ wayland? ( dev-util/wayland-scanner )"
src_prepare() {
default
diff --git a/media-gfx/imv/metadata.xml b/media-gfx/imv/metadata.xml
index f403e4f5cf5f..3cca373fbbad 100644
--- a/media-gfx/imv/metadata.xml
+++ b/media-gfx/imv/metadata.xml
@@ -12,7 +12,6 @@
<use>
<flag name="freeimage">Use <pkg>media-libs/freeimage</pkg> for additional image support</flag>
<flag name="heif">Add HEIF/HEIC image support</flag>
- <flag name="libnsgif">Add animated GIF support</flag>
</use>
<upstream>
<remote-id type="github">eXeC64/imv</remote-id>
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 7adfbf4bddbe..6e1a28672215 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -2,5 +2,7 @@ AUX krita-4.3.1-tests-optional.patch 2583 BLAKE2B 0b5e577bc17ef6b6487ce82ff4b4bc
AUX krita-4.4.2-quazip1.patch 1422 BLAKE2B 917bf30f1dc702276b524713b1ec01a4807f967bc974c0c9896e6972fc56554a4da954c690a0743a4d92d86e57d32028c809418cbf10b30294bf1412a1a08beb SHA512 7c55e371f4c6a5e6d3d275298bf22810b58cb845bf4abcdd3cecdd84cb228499c59e8f7e9902319009dc52ea4dde575de77668ab2d1e9cf076e8ffa6fba582b5
DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
DIST krita-4.4.2.tar.xz 174168244 BLAKE2B 95f22853ee31c8121b7d54e6771f8fbb708b19a106bf78026344ac6f2cb02ffbd446d291601359042579ba0e89d6d0a641015e95070c17369a2a8e9e01560660 SHA512 a75925e9690eaea03900cdb8da20dc25f1bf22fdb4515f685111f3503bf7c334acf79e6668b55a70464c77a04229ca34d6f160d5490987592af783ca9fc7d7ef
+DIST krita-4.4.3.tar.gz 254855083 BLAKE2B 5ffc5d7c887d409c2669a2c75f2dae3d6b1c6e83f30d330c37c6e8eb96e590c4abb7b26aea82a18f13b01ed2f053d2a4ddca780cab2995c10c9c0c07d67ee689 SHA512 44052f5bc02c31b8e5eb7990192c1b1d6a4ca9d91117b0b8e9ddf794df83cfdde233754064ad6692516bc8d756871bf4b34190653f04956cb851333b8d15645f
EBUILD krita-4.4.2.ebuild 3422 BLAKE2B 24bccfde1e16491f69fe31dc97f73274784d61ef6d99d5b9e8ecc94fd9138dfed8a63c070bbe598f3eb10c2243c4ae3ec9e090bf8c3843fda22f6e245e8b8354 SHA512 feb195f53e9fbf9a9a29e79811b327091d3fc6aa5e5071b0ffcd1c86bee8dbeb0848e0d03d9db89359fab55309f6e4fd9a95454b2895a6ca335b14a240bdba93
+EBUILD krita-4.4.3.ebuild 3430 BLAKE2B b2ad1f66c14b6cbc70eb63ee688c885c7e5ed4eb3203cd100fcf1375915eff8771043e2e6ec40f668778b391c263f04bf13069f3880adc2cddf04b4a23be26e6 SHA512 56c142d4971d025c157e5b8218c123b46f0f2c168f114abc439920d0d529eddb9fca7951b451f332dffa7727fcef4d2f72775447f7d1c1985c842cce2affbe14
MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/krita-4.4.3.ebuild b/media-gfx/krita/krita-4.4.3.ebuild
new file mode 100644
index 000000000000..b82ee9f73995
--- /dev/null
+++ b/media-gfx/krita/krita-4.4.3.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+PYTHON_COMPAT=( python3_{7,8,9} )
+KFMIN=5.74.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz
+ https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
+HOMEPAGE="https://apps.kde.org/en/krita https://krita.org/en/"
+
+LICENSE="GPL-3"
+SLOT="5"
+IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# bug 630508
+RESTRICT+=" test"
+
+BDEPEND="
+ dev-cpp/eigen:3
+ dev-lang/perl
+ sys-devel/gettext
+"
+RDEPEND="${PYTHON_DEPS}
+ dev-libs/boost:=
+ dev-libs/quazip:0=
+ $(python_gen_cond_dep '
+ dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
+ dev-python/sip[${PYTHON_MULTI_USEDEP}]
+ ')
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5=[-gles2-only]
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kitemmodels-${KFMIN}:5
+ >=kde-frameworks/kitemviews-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ media-gfx/exiv2:=
+ media-libs/lcms
+ media-libs/libpng:0=
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/libX11
+ x11-libs/libXi
+ color-management? ( media-libs/opencolorio )
+ fftw? ( sci-libs/fftw:3.0= )
+ gif? ( media-libs/giflib )
+ gsl? ( sci-libs/gsl:= )
+ jpeg? ( virtual/jpeg:0 )
+ heif? ( media-libs/libheif:= )
+ openexr? (
+ media-libs/ilmbase:=
+ media-libs/openexr
+ )
+ pdf? ( app-text/poppler[qt5] )
+ qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
+ raw? ( media-libs/libraw:= )
+ tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${RDEPEND}
+ vc? ( >=dev-libs/vc-1.1.0 )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
+ "${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch
+ "${FILESDIR}"/${PN}-4.4.2-quazip1.patch
+)
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+ ecm_pkg_setup
+}
+
+src_prepare() {
+ ecm_src_prepare
+ sed -e "/CMAKE_CXX_STANDARD/s/11/14/" -i CMakeLists.txt || die
+}
+
+src_configure() {
+ # Prevent sandbox violation from FindPyQt5.py module
+ # See Gentoo-bug 655918
+ addpredict /dev/dri
+
+ local mycmakeargs=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged
+ $(cmake_use_find_package color-management OCIO)
+ $(cmake_use_find_package fftw FFTW3)
+ $(cmake_use_find_package gif GIF)
+ $(cmake_use_find_package gsl GSL)
+ $(cmake_use_find_package heif HEIF)
+ $(cmake_use_find_package jpeg JPEG)
+ $(cmake_use_find_package openexr OpenEXR)
+ $(cmake_use_find_package pdf Poppler)
+ $(cmake_use_find_package qtmedia Qt5Multimedia)
+ $(cmake_use_find_package raw LibRaw)
+ $(cmake_use_find_package tiff TIFF)
+ $(cmake_use_find_package vc Vc)
+ )
+
+ ecm_src_configure
+}
diff --git a/media-gfx/lximage-qt/Manifest b/media-gfx/lximage-qt/Manifest
index 83b705ee5c01..e2689fbc9c3a 100644
--- a/media-gfx/lximage-qt/Manifest
+++ b/media-gfx/lximage-qt/Manifest
@@ -1,5 +1,3 @@
-DIST lximage-qt-0.15.0.tar.xz 91444 BLAKE2B a5ccd9afdd4ed1ec60a5da8ec3390e5d93f018209ce62a1fbf929c6984a056539751f576a15e0b81e4f1ba003d35379791066832f02a45de1a5d5e8e8eb8f0b2 SHA512 980fc401b31c5d937877ef35211892984def150a6db6072d9752fa78588ea8ca0827beb5880d46775092c42e93358d3e494e045a50756931129402ded4ecab23
DIST lximage-qt-0.16.0.tar.xz 100920 BLAKE2B 17a41013b7d7e599662a698fa24b6b15a550b2211dd818fbfda19b0fb9439bf77b63b2d8248ad8a65605fee8fc73c78d294ae86401d5660f6d798aa775273709 SHA512 2da46d23567cff7044a884e14b30de36b3a19d802768585b7c3332897b0af2fc42993ed9bb9d062db7988a0526cc7357a09fbac5f283a615b109ea8dfbf474b5
-EBUILD lximage-qt-0.15.0.ebuild 959 BLAKE2B 4c3c897be70d6fc8742774536ce838d2d06860530bcf15ee893892aebdad64a90d13d16f2ca259113539233996041ff9d2b86bdf3c6fb88f67c9f9766054bc95 SHA512 9353543981a42e1574c82b146c6bbed904bb2fd57cff2e251ad347c8ce8d2a7e6964dd2bc745f09e7f5107833464bf82c11d81bf4452f5430efd87289672a630
EBUILD lximage-qt-0.16.0.ebuild 959 BLAKE2B 3a34d5641750e187e535301f03c17e1658c05e8601eae6d29f3b93be0767cc5961a8880a8653a90ecd90ee92947169bc42687f2c5c3acf8c92dd064dd86ff5eb SHA512 d3bf56b433b6a1350d6c721dad015a336f6f3c5614f5c9b86e4856fd131e45592d744beaa9266c5b84e1e16da3655076ee51cb20b4734600fcacc09ad2566763
MISC metadata.xml 316 BLAKE2B 4efdea74e716c40a0a63878d175f612e550669866bada61cbc0b22d5320a7bbb6a7158796bd5337e71c8aa70d42a977142d9466ac42fbb91f5eb2adcd83fb714 SHA512 b3cad1b8550e54a57940f2cea14c38bd714da71dc772ae073065c6c56c5d4d02a7258dc3ffc226a194d290e7b968a198fa07b02f6c011282896f9ba7173c3c53
diff --git a/media-gfx/lximage-qt/lximage-qt-0.15.0.ebuild b/media-gfx/lximage-qt/lximage-qt-0.15.0.ebuild
deleted file mode 100644
index d798b41b727c..000000000000
--- a/media-gfx/lximage-qt/lximage-qt-0.15.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Qt Image Viewer"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
- SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-
-BDEPEND="
- dev-qt/linguist-tools:5
- >=dev-util/lxqt-build-tools-0.7.0
- virtual/pkgconfig
-"
-DEPEND="
- dev-libs/glib:2
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- media-libs/libexif
- >=x11-libs/libfm-qt-0.15.0:=
- x11-libs/libX11
- x11-libs/libXfixes
-"
-RDEPEND="${DEPEND}
- !lxqt-base/lxqt-l10n
-"
-
-pkg_postinst() {
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/media-gfx/mypaint-brushes/Manifest b/media-gfx/mypaint-brushes/Manifest
index 56be7e5e13ff..8388de9f9013 100644
--- a/media-gfx/mypaint-brushes/Manifest
+++ b/media-gfx/mypaint-brushes/Manifest
@@ -1,3 +1,3 @@
DIST mypaint-brushes-2.0.2.tar.gz 1564926 BLAKE2B 68a244f42cd5d9b1f96466f5409f0c7ebae257f6dbbfdc5139cb9fda86ee4898ce8fda2a35e96f3a65f41333f7f689edb85445bcd88dc0fc4b428d05ba2870fe SHA512 89cecd9d78f4de84ada97a3e33fd67b86dfd259880da15c0ecbfad0fceb8c3b0e93790f3c0bff0cc375959bdf6921b01d1f3646e27c3f961715219a349017556
-EBUILD mypaint-brushes-2.0.2.ebuild 549 BLAKE2B 1f74b819805240361e6217da37aa5c8945b55cd420dd9bef7f5d1241a8509d1f228c25f0b5b8f54d3940613f560082ca6b4b9af4d4cac8efdf5a3e7ec1b7055f SHA512 bd107f540acbca1e910bcbff4a976a6d146492c6e71621a43c840e2e23dd5924d918ad086931fc95444d34fd22e4e0528d0c538b38d21ac87ba606d8d21c1bca
+EBUILD mypaint-brushes-2.0.2.ebuild 551 BLAKE2B c84ea71fb2fb4f158643c0c22f74eb3d5c306373d8ab423c01cad479c6149c6e46fb8fb954548796c307520d5439e84b817160941032717722d3f7036e2f4751 SHA512 44dd8836a69eee5840abdccb33d5b471199779e233f3c37a02b21648177beae4e3fecb33ce0d9c6a13f842fde1d1c10d80d185f8f33308fb48bf9202b15ddb1c
MISC metadata.xml 263 BLAKE2B 3674e5c7d5dedc501574b523bf09a9f2d8f2e066edffa5649d59afba65ef3d9c36f3fd909f196f676b5b1266e5edce6ba6c44cf11fdca73b02b30cebcb662a3e SHA512 2f82b95119eb592f8edd7468010dbdc6863b235a0827586114fca02d01d45ce32a2be24077edfa497b0692f2f14447ad070c15b8a951b87091806750b8b0b862
diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild
index 635c072998e9..c4f8c08f0726 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,9 +13,10 @@ LICENSE="CC0-1.0"
SLOT="2.0" # due to pkgconfig name "mypaint-brushes-2.0"
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
-DOCS=( AUTHORS NEWS README.md ) # to exclude README symlink
+# Chosen to exclude README symlink
+DOCS=( AUTHORS NEWS README.md )
src_prepare() {
- eapply_user
+ default
eautoreconf
}
diff --git a/media-gfx/scour/Manifest b/media-gfx/scour/Manifest
index 1bde36cbb9e5..daf64f4379a2 100644
--- a/media-gfx/scour/Manifest
+++ b/media-gfx/scour/Manifest
@@ -1,7 +1,3 @@
-DIST scour-0.37.tar.gz 95478 BLAKE2B f3037b691b110f84266c742ac1212a8069e0ac1260f818610dfecc7ee64a257d9e0772c7c675e4062286cf4b719fe48782c416a0cb85a136ea315b22da58c460 SHA512 ffc9bd33eec038126d781dac50c89e4275d0d5e14ec2b2247a7727af91ac2ffe5522c69b5386f75df67a0b88f8ed62cb6a2ad47d600e55b123d937ba33e9e501
-DIST scour-0.38.1.tar.gz 99693 BLAKE2B 33c344bd68f54352723b769e289c0caf90d8de11e1a5ecc054b24cc2c26845d56602d4201961eebc406c95e6c1ac3334cb8302e800f66572297291b166b98505 SHA512 e25fc0313739c34a940133ddaa24bf07fad348e79d64250f4ee85cab726abf66d9caf9bed44a61ab9c55c8dc8ebe465a887d6192f8405b30fdc2a5985da92fe8
DIST scour-0.38.2.tar.gz 99910 BLAKE2B 4273287b201ecea64cb2be666bb7de4fbadc3483935515de92ec8dfb39f3b856584e35ac877958efd798bb5840baba4fc4d40a376d2c9f3b0c52a679d7ded6df SHA512 a2c418e25283af399be032322b3af0c336c2392ba361681d4b133b64ebc441ac5beeed2b920f42316cef376c971b230681e306687786a875162d33b659d3fdeb
-EBUILD scour-0.37.ebuild 708 BLAKE2B 7dbe3acdeafbefd2e6aedf82c0e35f7e71120e3e38177de000bdc6bb041abea462d63a964f21ac880ef9d6eb51a36a9068c4d27ad2aac904e53c97999cda6a0a SHA512 83ce00ec2d673775044cc603bffb8f7a7ea5d50c5f88d59bfd4f3bdcc0dc6a4dd951327c8c3e22d7a46f1115e227be9e3e89652bb6e204c4aa74ac11a9dd4992
-EBUILD scour-0.38.1.ebuild 714 BLAKE2B f09043bafb520eee23e55ab3f5ecc42a23ebd9fa3f1bb9e945f3f6c25dd019eb4327c92b4e1f0cfcf63d260750f7f6b22f5d8afe39f67d073a941b4509761249 SHA512 a9de06121e07ccf862115429f1901c12980c25b4a09dd4b1ae0da47387ab2d86a454ed2a246e3225eda8d35bb0c90e8ae9660abfb7531b9428d307640acd245e
EBUILD scour-0.38.2.ebuild 709 BLAKE2B d91839546133e6cf088d15186564d367ab3706b52258104f6191cb4c7b2b5748b79194112db2b14bd9a8d4a52ab2332fc97172ea9b7738a8f26cb3192ec17500 SHA512 1ae91e01a60e683209fdbc19ab8426156f586518acc48c52efc672290044bf07c7c8c44ec36aa1b4bc3267cc8ab4c961053976522a24582446e28a95c5a829ba
MISC metadata.xml 193 BLAKE2B 7acb137a1e8618cd92414ef5f9b789a55acfd26c37e7cf00181c62dd8471e217e97670719fd5d6c00834cadb75a5ad8c8cac7fd06c87ea61551d77eb8af1e6e2 SHA512 e34d92e02e423c37397982d7865e381b6eacd66dec5dd4e360697cb8ea326638ca3b2b88c23277f7fa6248ed31081e2938fbe6fc5178ffc52bdc4798c027341b
diff --git a/media-gfx/scour/scour-0.37.ebuild b/media-gfx/scour/scour-0.37.ebuild
deleted file mode 100644
index a3eb277e38e7..000000000000
--- a/media-gfx/scour/scour-0.37.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Take an SVG file and produce a cleaner and more concise file"
-HOMEPAGE="https://github.com/scour-project/scour"
-SRC_URI="https://github.com/scour-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
-IUSE=""
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-python_test() {
- "${EPYTHON}" testscour.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/media-gfx/scour/scour-0.38.1.ebuild b/media-gfx/scour/scour-0.38.1.ebuild
deleted file mode 100644
index 35fa3bd50df3..000000000000
--- a/media-gfx/scour/scour-0.38.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Take an SVG file and produce a cleaner and more concise file"
-HOMEPAGE="https://github.com/scour-project/scour"
-SRC_URI="https://github.com/scour-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-python_test() {
- "${EPYTHON}" test_scour.py -v || die "Tests fail with ${EPYTHON}"
-}