summaryrefslogtreecommitdiff
path: root/media-gfx
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/Manifest.gzbin39646 -> 39802 bytes
-rw-r--r--media-gfx/darktable/Manifest2
-rw-r--r--media-gfx/darktable/darktable-3.0.2-r1.ebuild2
-rw-r--r--media-gfx/gimp/Manifest2
-rw-r--r--media-gfx/gimp/gimp-9999.ebuild14
-rw-r--r--media-gfx/graphicsmagick/Manifest2
-rw-r--r--media-gfx/graphicsmagick/graphicsmagick-1.3.35-r1.ebuild2
-rw-r--r--media-gfx/imagemagick/Manifest17
-rw-r--r--media-gfx/imagemagick/imagemagick-6.9.11.19.ebuild2
-rw-r--r--media-gfx/imagemagick/imagemagick-6.9.11.22.ebuild (renamed from media-gfx/imagemagick/imagemagick-6.9.11.16.ebuild)0
-rw-r--r--media-gfx/imagemagick/imagemagick-6.9.11.9.ebuild255
-rw-r--r--media-gfx/imagemagick/imagemagick-7.0.10.16-r2.ebuild268
-rw-r--r--media-gfx/imagemagick/imagemagick-7.0.10.19.ebuild2
-rw-r--r--media-gfx/imagemagick/imagemagick-7.0.10.22.ebuild (renamed from media-gfx/imagemagick/imagemagick-7.0.10.16.ebuild)1
-rw-r--r--media-gfx/imagemagick/imagemagick-7.0.10.9.ebuild267
-rw-r--r--media-gfx/meshlab/Manifest3
-rw-r--r--media-gfx/meshlab/files/2016.12/meshlab-2016.12-qt-5.15.patch33
-rw-r--r--media-gfx/meshlab/meshlab-2016.12-r4.ebuild66
-rw-r--r--media-gfx/monica/Manifest2
-rw-r--r--media-gfx/monica/monica-3.7.ebuild4
-rw-r--r--media-gfx/mypaint-brushes/Manifest2
-rw-r--r--media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild4
-rw-r--r--media-gfx/netpaint/Manifest3
-rw-r--r--media-gfx/netpaint/metadata.xml12
-rw-r--r--media-gfx/netpaint/netpaint-1.1.2.ebuild36
-rw-r--r--media-gfx/pngquant/Manifest2
-rw-r--r--media-gfx/pngquant/pngquant-2.12.6.ebuild2
-rw-r--r--media-gfx/sane-backends/Manifest5
-rw-r--r--media-gfx/sane-backends/files/sane-backends-1.0.30-add_hpaio_epkowa_dll.conf.patch11
-rw-r--r--media-gfx/sane-backends/files/sane-backends-1.0.30-bigendian-depth.patch14
-rw-r--r--media-gfx/sane-backends/files/sane-backends-1.0.30-missing-stdint-include.patch14
-rw-r--r--media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild346
-rw-r--r--media-gfx/scrot/Manifest3
-rw-r--r--media-gfx/scrot/files/scrot-9999-Xcursor.patch18
-rw-r--r--media-gfx/scrot/scrot-9999.ebuild5
-rw-r--r--media-gfx/shotwell/Manifest2
-rw-r--r--media-gfx/shotwell/shotwell-0.30.9.ebuild2
-rw-r--r--media-gfx/simple-scan/Manifest2
-rw-r--r--media-gfx/simple-scan/simple-scan-3.34.6.ebuild2
-rw-r--r--media-gfx/xdot/Manifest2
-rw-r--r--media-gfx/xdot/xdot-1.1.ebuild2
41 files changed, 572 insertions, 861 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 9a9a0f638c30..11d0915521a2 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
Binary files differ
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 8d90dccb1392..590997411d31 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -9,7 +9,7 @@ DIST darktable-3.0.2.tar.xz 3931240 BLAKE2B 5f86579a43e396c8116aba63c43e13d7312e
DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B a7a254e49dd57ee03480d52f4506a436210324cc4a2651f3c2fd70ca65cb7aa1735934a5e046ffa662b2aa1f081042d2d1e6ce0f70b6768719c52e2d14c358ce SHA512 e68005ee8706f2342755ce3e4dcd6c2907c1607bc9b750154dceb4b52dcccf50c581ab65212efc8ffb2447f5d828e0fdb61d0471c3d14938e098528e50f32e14
DIST darktable-usermanual-3.0.0.pdf 16237603 BLAKE2B ff5c24bb038deb37269a84389937740fa0ff77a9fb5bef4c484cdd903e39609588f632f577ce53c690d3abb832ace451d0d9d3f563ebdb6196ae8e2dac008a01 SHA512 2523b48e2baaa71561dc119340aed3bbf2ab4481dceb0c3ca2bbb7b0cacfaab894fa4eef82b667648cd7bb049304dbda09fa1a638f7734219b672b3ea8ee0eac
EBUILD darktable-2.6.2.ebuild 3879 BLAKE2B 58de04e0d0b727c939ece0f11a3fccf30f2cd7e81ef11e6a64a4857d2bdfe77592e2e748dc64f34bd27b20603f1a2270e1af0d78b5d280f5d8c98bc403c38e68 SHA512 176fc9b85a1c4d5c28032e435e92c59299c857731c4c1e01490ca57aca18704187e0b62c5d9b7dcca4ac760cbefdf7a00eb3b66b036902ff7c4a6e3769b27f80
-EBUILD darktable-3.0.2-r1.ebuild 3881 BLAKE2B 958ebc2d6d7b8057fbd2cea57708c415f7e17967705938d5178c705db3ab52a7684dd2aedc7d80f4603530d21bca5e536518f6ce67c83e25515764c92bb6c947 SHA512 5b9836520a9039fb06c68277e5dde1f4cf394aae92dd8fdb005d8cf0f6454148eaa769477247872c94152b2c132ad6d9a068b8e984c38c94216717f4d63798d7
+EBUILD darktable-3.0.2-r1.ebuild 3888 BLAKE2B e402484fa08d1bbb949ad7381d6b0f0a370fd5c644b9fcbf2e190f65b4eded72580a28decb556795ce7aec7a147a3a147ba601162484358925f6f61e69f826df SHA512 d8e34da86742f2fe5cf2e04023dd0ca2b2ec9d22cff984eefca8246fe5dc5dab4c9633e4aa0585376e5c943617e1808b7f04b9355c162652446f42f2b1783f24
EBUILD darktable-3.0.2.ebuild 3782 BLAKE2B 79f1f8dbb810a10274c40ff93ec59a74291dd7c3d9d7fad52b44b97a1b8211fb3ef314a4cb937d6886fb6ba150e7ba0c7d4244d3e6aef70bf4ea949dd8d0830e SHA512 8094322d7c29078718354d5fac8f9e9c8be01d4cddac4d30a033b42a1d5c757171e1a90e234170d81eaece1a1dc4d699850fc8ec02ed87fdcb10ee4df384cffc
EBUILD darktable-9999.ebuild 3262 BLAKE2B aeadead1b20cd782e263b4f67f20d18255034626b9898273827baa60fb528d632ecb831b584bb0c0ed71e1226a9e32049e2bcc96b4d03c2ee5a9a725ef3858d2 SHA512 c323d686bcd203fc58833fdb89429440c801015dab82f26dfb4133e048a2f59449f6120fb6d0165177aa30a7f7c1d6acad08016286d7b989e7731a9e2f0bc4af
MISC metadata.xml 1045 BLAKE2B 2094a1de028b4db282941604a3af2e608a4694b47d269293c09c1874594054a2457f44a94d9802eb84502c64c714a5af0499e2d2d67a71f61980906fc78acaf8 SHA512 1e0e67191daac03f5aebed02b7981a4944d4b0da4b00b8781fb79a1a362f260e51d182fdf10cf37494ab854cb7627ea4f7d279fad7191a53c0118e8d3c791166
diff --git a/media-gfx/darktable/darktable-3.0.2-r1.ebuild b/media-gfx/darktable/darktable-3.0.2-r1.ebuild
index a27d9ec520c6..5b83be05e128 100644
--- a/media-gfx/darktable/darktable-3.0.2-r1.ebuild
+++ b/media-gfx/darktable/darktable-3.0.2-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_P
LICENSE="GPL-3 CC-BY-3.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
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
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index b325b86ea5ee..922bee3cdd76 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -18,5 +18,5 @@ EBUILD gimp-2.10.14-r1.ebuild 6140 BLAKE2B df34bd1bc35873d51aaec12fba454170ce08b
EBUILD gimp-2.10.18-r1.ebuild 6157 BLAKE2B d877545e911f0d707447d885bb83b83dd1bd37cb3db79ee3afd23c52949d91e321ca748f7e632146b5b56264589f633a235b9b4fd9cea3783d29d2c6b5a2d503 SHA512 564dd35735219c97cb9b8caba0aa1aaf782231a6a1cc578596e06c5972bbaacbb0599bce9d8b1cb03ca95403db36bc3caa40cb934c957b2dd399b6d394857448
EBUILD gimp-2.8.22-r2.ebuild 5139 BLAKE2B 7e659b356107042884fddaff1622c20f1b1d627840556cdba0293fc80c43832fe02883d65ef6b338847b80d0cc041d95f6cce02ea230d071aa5545d89f55e8f8 SHA512 5b32326f52e21dd544c1f92e0f51612fb8a662ac6fa0addce482d3a3e1e9516a55b0c6a9e679407afee94b77c60a0224719ff37cd5aabcc7936a949629d4f189
EBUILD gimp-2.9.8-r1.ebuild 6068 BLAKE2B 86c853189f8a7aa5e6247d1f973337e3149ea44e13f4adc022b2e6f15eb51ecd4473e862721fd3ee841f5f36108230b2444039e5cb21898c274c97506a285800 SHA512 da7b01a4dafbd9d991ce050b3c8c5d1ce6b1f2d9cc8c4bde6463d5ebfcba2a8399c1f8f61062f1fb564c530acfea5036b6f8d5c3b4b1a291cd575a00df9deb28
-EBUILD gimp-9999.ebuild 6188 BLAKE2B 34635a209811691a453e984a089faf958ac048ddf63adb17b93a22807924021ef134281b824d378e6d57a5ce88b747e6c2a6150d55b04806b14acc592e83a815 SHA512 ed5727af778d9acc7b1c3b2851c4d25329bc706d2054ecbb61e960c2e45b6fc0ea35e4aeddd97c4c1d8a1b0b71598be3ea65b401a0a3345c83ae67ca59a800db
+EBUILD gimp-9999.ebuild 6314 BLAKE2B a0c08fcf0c8962d67b688a41d1beaf1469a83e55b4947062431a740379788a8d4f20216a7e176dcbe01a7f6d58a85de72ac0b870f3200da458f57b1b72870f55 SHA512 c1b8c2c627123aaf6164dd2c650d329c2824d52f40f29acb46ae0c052636d3ca7226fd812c307a1a54d76f254668ca51ae9c40304dfff9c62ffa740e40cc3d07
MISC metadata.xml 628 BLAKE2B f1326f51db692d6e64d1bb7b44dfada65799d7ab94279771e6bd729189145a8a4bbe7a83c776bfc46acf682ad9f34c84598d25fb0a3606aabfa30383b35a9694 SHA512 cec60cde9763bdb9012fec754b95018f09da5cf7ff2f577206417651df5c18251dd5c58b1e32fb45e7c2121e06c0a5b7dc86d08b9511da4cf103bcf2fa1b6e52
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index f73b18199f44..1ba63b659607 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -5,8 +5,10 @@ EAPI=6
PYTHON_COMPAT=( python3_{6,7,8} )
GNOME2_EAUTORECONF=yes
+VALA_MIN_API_VERSION="0.40"
+VALA_USE_DEPEND=vapigen
-inherit autotools git-r3 gnome2 python-single-r1 virtualx
+inherit autotools git-r3 gnome2 python-single-r1 vala virtualx
DESCRIPTION="GNU Image Manipulation Program"
HOMEPAGE="https://www.gimp.org/"
@@ -29,16 +31,16 @@ COMMON_DEPEND="
>=app-text/poppler-0.69[cairo]
>=app-text/poppler-data-0.4.9
>=dev-libs/atk-2.4.0
- >=dev-libs/glib-2.56.0:2
+ >=dev-libs/glib-2.56.2:2
>=dev-libs/json-glib-1.2.6
dev-libs/libxml2
dev-libs/libxslt
>=gnome-base/librsvg-2.40.6:2
>=media-gfx/mypaint-brushes-1.3.0
- >=media-libs/babl-0.1.74[introspection]
+ >=media-libs/babl-0.1.78[introspection,lcms,vala]
>=media-libs/fontconfig-2.12.4
>=media-libs/freetype-2.1.7
- >=media-libs/gegl-0.4.20:0.4[cairo,introspection]
+ >=media-libs/gegl-0.4.24:0.4[cairo,introspection,lcms,vala]
>=media-libs/gexiv2-0.10.6
>=media-libs/harfbuzz-0.9.19
>=media-libs/lcms-2.8:2
@@ -99,6 +101,7 @@ DEPEND="
>=dev-util/gtk-doc-1.0
dev-util/gtk-doc-am
)
+ $(vala_depend)
"
DOCS=( "AUTHORS" "HACKING" "NEWS" "README" "README.i18n" )
@@ -125,6 +128,8 @@ src_prepare() {
gnome2_src_prepare # calls eautoreconf
+ vala_src_prepare
+
sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
}
@@ -156,6 +161,7 @@ src_configure() {
--with-appdata-test
--with-bug-report-url=https://bugs.gentoo.org/
--with-xmc
+ --with-vala
--without-libbacktrace
--without-webkit
--without-xvfb-run
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 5aad2e1930e6..ccdfb79ccc1b 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -4,7 +4,7 @@ AUX graphicsmagick-1.3.35-CVE-2020-12672.patch 2753 BLAKE2B 864a77b650f5cec350d8
AUX graphicsmagick-1.3.35-oss-fuzz-20045-20318-21956.patch 988 BLAKE2B 4906fffe43150ef209c4d2f87d433cf78cd5e3c03a9db22426e3c3455028a5ff63c189ace1f46f47e1fa04fe8d78388b76dcabc288a9a75e57b7ebbb68f8c90d SHA512 95776534891eed617b09873fd70af020c6d6370a6765ba7aaf8185268e8b73b774ce2aeb1b284641fb12260ca0047c4543b17a18ed4ef28db725b75f988c7215
AUX graphicsmagick-1.3.35-oss-fuzz-23042.patch 1350 BLAKE2B 415bd540a7aa194235ce1e6482035dd9b8ee4d4f5192f4d898e178875d453fd8b481efcbe139db602d411f788e3067a95106ba128ab14af63d3848f92c035405 SHA512 d345b54570e3396db81f0f60980633e139f90a54b579ad953a36aa5e16c1edfe7a5186b4e2d5a2e02f759544b372981278b06d2b688324e6b091c841a5bae133
DIST GraphicsMagick-1.3.35.tar.xz 5543224 BLAKE2B 8a284d85341c10939fdece5c565d5b881276afb9b4c5dfb2221b780a01b99f78ee62761722c372baf9155c63f7ef176b67310aeedcab0368f4f26f5b0150bcce SHA512 baae92089d52147ef961f93495abc8a9d8b1a963af61d87a650c1ab105d46816aa38c83f654edcb5a0e1b7f07ccc06eaeaa443b9bde3a63a0b9bfb45f3ae144c
-EBUILD graphicsmagick-1.3.35-r1.ebuild 3223 BLAKE2B 2e61401a1673a4a093eb8cefb1bb95b26ddffe581cf808a0e7927cb62a5cf41ef4e74e68ae3b4dcc03850ee2992e2470631907a1e87b9df6ecb15b892f28980e SHA512 13e27a919eb6e2d04837015e6641eb3d8041772b033f3e1e38833a7b875237ea8c6acda2d1e7dacb126005383c4d96e03370c0be4d0b92f93073552787689419
+EBUILD graphicsmagick-1.3.35-r1.ebuild 3220 BLAKE2B d91dc85c76795d64082470c7c684ea7ffe1884586f32e729d75ecfe50c645e221ff0423ba7cc51738dc16c9d0e50f0f68d35b470921fbe0dbd12d5059d96421f SHA512 ce44e7ac94afeb81a5a8db285e20d149b1045b5165b99d2f58aa9fc9e853b98a526f6f62b19a8b73d3d43c8fe5c4184b276161c0477a4c519831362cbf9901e6
EBUILD graphicsmagick-1.3.35.ebuild 3085 BLAKE2B c0e6b0a3eae4087a3aa5130866629037ddeae03fb63dc0914b117ac9f7345f1f18c0ba2e41a9fe06fc80fe206013636f75d1a44c62e300487763bab2ed8f58ad SHA512 eeab4b3a5b8a8ffc5ee810125d5161b18339f06e10883a692592b9ec1f7c4296de9a56459f57f033d378a8638da4d8b30f1d04c5d16cff9d108ff99c8e2dc763
EBUILD graphicsmagick-9999.ebuild 3079 BLAKE2B 5683335f38a7d90554e705f65bc84ea44643bd6c18b5d7f48f2608d949efc4ecd8f562a6f7f989ee0dbc4e208efbc4a1190154f88baf69c89ad17da1d70ad5ae SHA512 13f6d72eb95a1be93d70d685fc3296885c7084536a951e9158e989169e5e5768c98591af22b0221bcb951ce4b4bbdeb90b21b93f3fa8589026316880d1dbe8cd
MISC metadata.xml 1057 BLAKE2B ced303553eccbba9ae91f30b3700b331149127c5a17a66bb166bff4139600cf208f3b15f8fa6fdb02594f3278ce7acd2bf6972df42c04dcb4f695710bb3870bf SHA512 9ac680de061b6dc0acd0d3a31587e0b53d3d7bcea7425909a3a4ef074fa0e32a999ecb1f48a64bb2ab55249fb5bbdc72974681fb26a879c4e5a4c9f3a04d0e82
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.35-r1.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.35-r1.ebuild
index 39851a6496d1..e2d3a8b1e668 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.35-r1.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.35-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
else
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
fi
IUSE="bzip2 +cxx debug fpx imagemagick jbig jpeg lcms lzma modules openmp
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index ce90e9c22385..a11aa00d319b 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,17 +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-16.tar.xz 9075792 BLAKE2B 7cfa4a071ee09b9658e302db963cdcc393395305bd96d04ddc5ce7941bd3b26fec74206525ffb1d93a423a970ee91dcd308041c8cb407c783195dc98a337db5c SHA512 ae4c56afdde8d62f80cfc32e208595f50b4e1d3cdfffbf1f18a5ad1f715998bcc917fe595369cda216d13ebd7121c060376a3ed6c0558dcd508f0142b108e2ff
DIST ImageMagick-6.9.11-19.tar.xz 9076632 BLAKE2B fb6e954052e4dc9b5db80fcb3868e627f3cbe5d9ccb02425fe3838dfef4deb1132360a30b561de28bf7d2051bc7c01ad5c4ebc0266b48f1d48d7af5ecae4b5e2 SHA512 fe8e7399b377c84155d3ad3c3963d58b8704233d9c858ff92ba1837e6e1f5d86846153660cc0973b8cd27917e4c8b4834874c510f00505142cd8165ae3e3526d
-DIST ImageMagick-6.9.11-9.tar.xz 9069640 BLAKE2B ab39f4723e4bc843a504ce29a840d24a0497d00ebaaf8a10589813d7bf13f5ef3774e9989dd38d667e1a9ad3dbc5357ca4a53533b5ef338781409c0b3bdde01a SHA512 8f8e6cdbbc4ff367304d29d3098dc208ac17e8037e31426e5e24d918ab13a292660e2944cb830fa814f297b69f8b2d693ac33b94f5ee4b8406cf52605ee00586
-DIST ImageMagick-7.0.10-16.tar.xz 9694880 BLAKE2B 6d0e0baeb99d9815255f10d04176b816694afb9d7e2169af60401eb57b13bc2dbf1223b1b3de6b67c2ed9f1581983801bfec017dee6f4b73319b68d0e16366fb SHA512 e1ba52cde03b1230789a9e538ea93bd8b0713b418cf268ab3c3be0c0da4b6144ff47479e554c27a9348d56b5e94a181944474f77568f502cf31885d871f2ea5e
+DIST ImageMagick-6.9.11-22.tar.xz 9084304 BLAKE2B 38df3e9535c23b246b6ededc1b9d083fc8c42f3abe85835d6ef29dffb06bbccaa7aae534efeaaf224b9f8495c1c116a6ce4c886e70fa0976cfbda0880a165e96 SHA512 9c6f4ab3f881b4aba4de3fde2d49ed66773b52dacbdc24c92eba6b8b1e97ea28b983cbd9fbcf4721f4b46ab8d249470f44e1cc7e173728d78f2ef049f4aa42c0
DIST ImageMagick-7.0.10-19.tar.xz 9685552 BLAKE2B e3d6ca1e16ad4bc346153372f1122731a750876650cdb705985ef29ef30c5ceb7f2f473ff2734a38c50e2e531094a08526678cfe1e8f58eef79d30ea18c363bf SHA512 ed577e48ca88d37c01d7e889fa1364af3398e94864b393fcc70711a3317c34adababe5ac0ea7995bd23e10aac554522ed69d290c4c11b946e8a0de86c6365e84
-DIST ImageMagick-7.0.10-9.tar.xz 9681168 BLAKE2B 0a26df054f6799dcc0cc576dc3d3e30689d3311ce658b220f4575d6ddf31063e8e9b1de57d5065171480dad5ae4f3a0bdde0d5ef7a5a7cdd267f2e76a210f30c SHA512 db19b39c41e3401ce454016a14c83d1188d38d7e4a31848c29344bd86ef14d4250208bcfb4b9e519f7d2d193a61724d980ce39e9d6e2388c872281e9383e2f54
-EBUILD imagemagick-6.9.11.16.ebuild 7056 BLAKE2B 31393b291f0d6bec7dc70d794b1a84039d54c1a12b7b4417caacea9bb2dc693a91d00273243a6450c1e7b7044e6b4c66a5fa8ccf28d1634d610a767775dd566a SHA512 72e95675a0102e46604bc1161c687465d2b2acf58a7096dd0637e2b9bdbc4a53ce2fb3490e6d32fd00ce5767540abe39b03a93c187f33b0c6c21f5c96a897d49
-EBUILD imagemagick-6.9.11.19.ebuild 7056 BLAKE2B 31393b291f0d6bec7dc70d794b1a84039d54c1a12b7b4417caacea9bb2dc693a91d00273243a6450c1e7b7044e6b4c66a5fa8ccf28d1634d610a767775dd566a SHA512 72e95675a0102e46604bc1161c687465d2b2acf58a7096dd0637e2b9bdbc4a53ce2fb3490e6d32fd00ce5767540abe39b03a93c187f33b0c6c21f5c96a897d49
-EBUILD imagemagick-6.9.11.9.ebuild 7049 BLAKE2B a55cac8280b047983a972159734711175d78840a6d29c75ed38366fc07aa4be312c75f523ef4185318f9734df496373e36b0c3170cd89e0859d282935ef3b566 SHA512 524f10eb990b5a5df4af8d0c39e6cf00d30f6d3bda40c0f609a16825d23b2b1b18d5ea10413df97aca1c6a26b0ac05d06c7c902f8a7c0ded4c33106b05566d2b
-EBUILD imagemagick-7.0.10.16-r2.ebuild 7220 BLAKE2B 12b0db73d15e5d9b5af68912ae1b2907919cc875d73536c261477534fa17363fb8f75b2d63501ab6f844eb9e976893107513968d9e89ccce9d3490cfe93389db SHA512 19ce4536488e465e744a5da210566112de83a6d2df48a1cf9cc44c32a2e9d4ab3a65909ce17ac47e0dc29ccb734a5b52e81f6585dc015a3ad89faa3d72667747
-EBUILD imagemagick-7.0.10.16.ebuild 7332 BLAKE2B 9af4bd9448c7e96550c356a964f988a2c785bb7f6714508a036968c3b229e91af2f2ef247366ac6e012477adada079fef7064fec1d4a29b4d9d0f9ad03d648f8 SHA512 03641bc41782f7de1c9b264697d159ed990c2e1aa18fe836391f1be86df3bb3f9a50c7f327730b6ff9ef50ca997636c72e2e03b21c0fa12a50dd68fb45ce9f00
-EBUILD imagemagick-7.0.10.19.ebuild 7220 BLAKE2B 12b0db73d15e5d9b5af68912ae1b2907919cc875d73536c261477534fa17363fb8f75b2d63501ab6f844eb9e976893107513968d9e89ccce9d3490cfe93389db SHA512 19ce4536488e465e744a5da210566112de83a6d2df48a1cf9cc44c32a2e9d4ab3a65909ce17ac47e0dc29ccb734a5b52e81f6585dc015a3ad89faa3d72667747
-EBUILD imagemagick-7.0.10.9.ebuild 7324 BLAKE2B 1d67b3846e05b04487a5e9f154de9d8d19afb024fc11d8c117ed4d2bdba8124414dc348b93c3c012ec6884a03e77e8e2f06bc90c448767998ff38486a92dd179 SHA512 a5df77b164a1c6ac1c6867d39afea790c3f69ff021a312abeb5d6476316d2e78caf1081235242559af1297fdb14a4add48514dd3bf611778123026fd7bc2e8bc
+DIST ImageMagick-7.0.10-22.tar.xz 9710504 BLAKE2B bfa35f9bf28629656d97ab03c1adf2641761f40d7bad284af2dc199b3ac4006e656356762d753d0b3992c78f0a4155423a27de632ee5e9594398164f20bde576 SHA512 5a7023eb8dfddc34c8378f338335e13e4b235e6c3e8e8b0476ae4ca31db78ef8bbdc457f7de1356994ea25d6eb94bb944d725d15aee038196bf7060c934d0926
+EBUILD imagemagick-6.9.11.19.ebuild 7049 BLAKE2B a55cac8280b047983a972159734711175d78840a6d29c75ed38366fc07aa4be312c75f523ef4185318f9734df496373e36b0c3170cd89e0859d282935ef3b566 SHA512 524f10eb990b5a5df4af8d0c39e6cf00d30f6d3bda40c0f609a16825d23b2b1b18d5ea10413df97aca1c6a26b0ac05d06c7c902f8a7c0ded4c33106b05566d2b
+EBUILD imagemagick-6.9.11.22.ebuild 7056 BLAKE2B 31393b291f0d6bec7dc70d794b1a84039d54c1a12b7b4417caacea9bb2dc693a91d00273243a6450c1e7b7044e6b4c66a5fa8ccf28d1634d610a767775dd566a SHA512 72e95675a0102e46604bc1161c687465d2b2acf58a7096dd0637e2b9bdbc4a53ce2fb3490e6d32fd00ce5767540abe39b03a93c187f33b0c6c21f5c96a897d49
+EBUILD imagemagick-7.0.10.19.ebuild 7338 BLAKE2B c5bd8fa410de6a1fec8a11c9f11d4bc527acf4502ef3d02dfd2f845ee0db2831de6a1734c860aacf224df0e13895aed104d238420b5021b947ba35b91b60149c SHA512 2ff4dc18a4fe408c0aead424af26225f8590607a48a60ac11906603f0cd808e23c0b6b50813f3463f570d3e5c3a9675fb60edc67b2bd8428d073c7ebe0778a17
+EBUILD imagemagick-7.0.10.22.ebuild 7346 BLAKE2B 6b3c2522969859e905afddcb92679bed0944d991831822d5bf6e967e0faafed369380f793aa337ac87b3a1af7a1b7290dc0f71094cf6346fdd63d57d49823d97 SHA512 a21b1d1bd706370b2c044c7cd55c290dd7a9ffac55c0c92b86c8f4ac969a14d2d3eca6b9e97decc61099d3f0842e9029f145e0adc4366c1ae153a0333869da74
EBUILD imagemagick-9999.ebuild 7220 BLAKE2B 12b0db73d15e5d9b5af68912ae1b2907919cc875d73536c261477534fa17363fb8f75b2d63501ab6f844eb9e976893107513968d9e89ccce9d3490cfe93389db SHA512 19ce4536488e465e744a5da210566112de83a6d2df48a1cf9cc44c32a2e9d4ab3a65909ce17ac47e0dc29ccb734a5b52e81f6585dc015a3ad89faa3d72667747
MISC metadata.xml 1106 BLAKE2B e77cabff89df6b98687290ef0ee06d85111a7ddca6f5e1e31f820e6d186a6510c2afd0b85ba31004f102fd7f7b88f46af101f4ba45011aac75afa40b0a714857 SHA512 68a5f9a80b1e3f2e3004252703f9b3176d7c59880a2724ae431fdfd97e8f2adcd7ff7ad2cd8ea8bd35645a3b559052f2c38713647ce7ae889ff1a6061e6b2d92
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.19.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.19.ebuild
index 02b0c9655fe7..f37a0010b4c8 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.11.19.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.19.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
LICENSE="imagemagick"
SLOT="0/6.9.11"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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.16.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.22.ebuild
index 02b0c9655fe7..02b0c9655fe7 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.11.16.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.22.ebuild
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.9.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.9.ebuild
deleted file mode 100644
index f37a0010b4c8..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.11.9.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-MY_PV="$(ver_rs 3 '-')"
-MY_P="ImageMagick-${MY_PV}"
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-
-LICENSE="imagemagick"
-SLOT="0/6.9.11"
-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 )
- test? ( corefonts )"
-
-RESTRICT="perl? ( userpriv )
- !test? ( test )"
-
-RDEPEND="
- dev-libs/libltdl:0
- bzip2? ( app-arch/bzip2 )
- corefonts? ( media-fonts/corefonts )
- djvu? ( app-text/djvu )
- fftw? ( sci-libs/fftw:3.0 )
- fontconfig? ( media-libs/fontconfig )
- fpx? ( >=media-libs/libfpx-1.3.0-r1 )
- graphviz? ( media-gfx/graphviz )
- heif? ( media-libs/libheif:= )
- jbig? ( >=media-libs/jbigkit-2:= )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
- lcms? ( media-libs/lcms:2= )
- lqr? ( media-libs/liblqr )
- opencl? ( virtual/opencl )
- openexr? ( media-libs/openexr:0= )
- pango? ( x11-libs/pango )
- perl? ( >=dev-lang/perl-5.8.8:0= )
- png? ( media-libs/libpng:0= )
- postscript? ( app-text/ghostscript-gpl )
- raw? ( media-libs/libraw:= )
- svg? (
- gnome-base/librsvg
- media-gfx/potrace
- )
- tiff? ( media-libs/tiff:0= )
- truetype? (
- media-fonts/urw-fonts
- >=media-libs/freetype-2
- )
- webp? ( media-libs/libwebp:0= )
- wmf? ( media-libs/libwmf )
- X? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libXext
- x11-libs/libXt
- )
- xml? ( dev-libs/libxml2:= )
- lzma? ( app-arch/xz-utils )
- zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
- !media-gfx/graphicsmagick[imagemagick]
- virtual/pkgconfig
- X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-#S="${WORKDIR}/ImageMagick6-${MY_PV}"
-
-src_prepare() {
- default
-
- # Apply hardening #664236
- cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
- sed -i -e '/^<policymap>$/ {
- r policy-hardening.snippet
- d
- }' \
- config/policy.xml || \
- die "Failed to apply hardening of policy.xml"
- einfo "policy.xml hardened"
-
- elibtoolize # for Darwin modules
-
- # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
- local mesa_cards ati_cards nvidia_cards render_cards
- shopt -s nullglob
- ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
- if test -n "${ati_cards}"; then
- addpredict "${ati_cards}"
- fi
- mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
- if test -n "${mesa_cards}"; then
- addpredict "${mesa_cards}"
- fi
- nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
- if test -n "${nvidia_cards}"; then
- addpredict "${nvidia_cards}"
- fi
- render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
- if test -n "${render_cards}"; then
- addpredict "${render_cards}"
- fi
- shopt -u nullglob
- addpredict /dev/nvidiactl
-}
-
-src_configure() {
- local depth=16
- use q8 && depth=8
- use q32 && depth=32
-
- local openmp=disable
- use openmp && { tc-has-openmp && openmp=enable; }
-
- use perl && perl_check_env
-
- [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
- local myeconfargs=(
- $(use_enable static-libs static)
- $(use_enable hdri)
- $(use_enable opencl)
- --with-threads
- --with-modules
- --with-quantum-depth=${depth}
- $(use_with cxx magick-plus-plus)
- $(use_with perl)
- --with-perl-options='INSTALLDIRS=vendor'
- --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
- $(use_with bzip2 bzlib)
- $(use_with X x)
- $(use_with zlib)
- --without-autotrace
- $(use_with postscript dps)
- $(use_with djvu)
- --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
- $(use_with fftw)
- $(use_with fpx)
- $(use_with fontconfig)
- $(use_with truetype freetype)
- $(use_with postscript gslib)
- $(use_with graphviz gvc)
- $(use_with heif heic)
- $(use_with jbig)
- $(use_with jpeg)
- $(use_with jpeg2k openjp2)
- $(use_with lcms)
- $(use_with lqr)
- $(use_with lzma)
- $(use_with openexr)
- $(use_with pango)
- $(use_with png)
- $(use_with raw)
- $(use_with svg rsvg)
- $(use_with tiff)
- $(use_with webp)
- $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
- $(use_with wmf)
- $(use_with xml)
- --${openmp}-openmp
- --with-gcc-arch=no-automagic
- )
- CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
- # Install default (unrestricted) policy in $HOME for test suite #664238
- local _im_local_config_home="${HOME}/.config/ImageMagick"
- mkdir -p "${_im_local_config_home}" || \
- die "Failed to create IM config dir in '${_im_local_config_home}'"
- cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
- die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
- local im_command= IM_COMMANDS=()
- IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
- IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
- IM_COMMANDS+=( "emake check" ) # Run tests
-
- for im_command in "${IM_COMMANDS[@]}"; do
- eval "${S}"/magick.sh \
- ${im_command} || \
- die "Failed to run \"${im_command}\""
- done
-}
-
-src_install() {
- # Ensure documentation installation files and paths with each release!
- emake \
- DESTDIR="${D}" \
- DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
- install
-
- rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
- dodoc {AUTHORS,README}.txt ChangeLog
-
- if use perl; then
- find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
- find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
- fi
-
- find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
- # .la files in parent are not needed, keep plugin .la files
- rm "${ED}"/usr/$(get_libdir)/*.la || die
-
- if use opencl; then
- cat <<-EOF > "${T}"/99${PN}
- SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
- EOF
-
- insinto /etc/sandbox.d
- doins "${T}"/99${PN} #472766
- fi
-
- insinto /usr/share/${PN}
- doins config/*icm
-}
-
-pkg_postinst() {
- local _show_policy_xml_notice=
-
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # This is a new installation
- _show_policy_xml_notice=yes
- else
- local v
- for v in ${REPLACING_VERSIONS}; do
- if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
- # This is an upgrade
- _show_policy_xml_notice=yes
-
- # Show this elog only once
- break
- fi
- done
- fi
-
- if [[ -n "${_show_policy_xml_notice}" ]]; then
- elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
- elog "which will prevent the usage of the following coders by default:"
- elog ""
- elog " - PS"
- elog " - PS2"
- elog " - PS3"
- elog " - EPS"
- elog " - PDF"
- elog " - XPS"
- fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.16-r2.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.16-r2.ebuild
deleted file mode 100644
index eb7593072ecd..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.10.16-r2.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
- inherit git-r3
- MY_P="imagemagick-9999"
-else
- MY_PV="$(ver_rs 3 '-')"
- MY_P="ImageMagick-${MY_PV}"
- SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/7.0.10"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="corefonts? ( truetype )
- svg? ( xml )
- test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
- dev-libs/libltdl:0
- bzip2? ( app-arch/bzip2 )
- corefonts? ( media-fonts/corefonts )
- djvu? ( app-text/djvu )
- fftw? ( sci-libs/fftw:3.0 )
- fontconfig? ( media-libs/fontconfig )
- fpx? ( >=media-libs/libfpx-1.3.0-r1 )
- graphviz? ( media-gfx/graphviz )
- heif? ( media-libs/libheif:= )
- jbig? ( >=media-libs/jbigkit-2:= )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
- lcms? ( media-libs/lcms:2= )
- lqr? ( media-libs/liblqr )
- opencl? ( virtual/opencl )
- openexr? ( media-libs/openexr:0= )
- pango? ( x11-libs/pango )
- perl? ( >=dev-lang/perl-5.8.8:0= )
- png? ( media-libs/libpng:0= )
- postscript? ( app-text/ghostscript-gpl )
- raw? ( media-libs/libraw:= )
- svg? (
- gnome-base/librsvg
- media-gfx/potrace
- )
- tiff? ( media-libs/tiff:0= )
- truetype? (
- media-fonts/urw-fonts
- >=media-libs/freetype-2
- )
- webp? ( media-libs/libwebp:0= )
- wmf? ( media-libs/libwmf )
- X? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libXext
- x11-libs/libXt
- )
- xml? ( dev-libs/libxml2:= )
- lzma? ( app-arch/xz-utils )
- zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
- !media-gfx/graphicsmagick[imagemagick]
- X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
-
- # Apply hardening #664236
- cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
- sed -i -e '/^<policymap>$/ {
- r policy-hardening.snippet
- d
- }' \
- config/policy.xml || \
- die "Failed to apply hardening of policy.xml"
- einfo "policy.xml hardened"
-
- elibtoolize # for Darwin modules
-
- # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
- local ati_cards mesa_cards nvidia_cards render_cards
- shopt -s nullglob
- ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
- if test -n "${ati_cards}"; then
- addpredict "${ati_cards}"
- fi
- mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
- if test -n "${mesa_cards}"; then
- addpredict "${mesa_cards}"
- fi
- nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
- if test -n "${nvidia_cards}"; then
- addpredict "${nvidia_cards}"
- fi
- render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
- if test -n "${render_cards}"; then
- addpredict "${render_cards}"
- fi
- shopt -u nullglob
- addpredict /dev/nvidiactl
-}
-
-src_configure() {
- local depth=16
- use q8 && depth=8
- use q32 && depth=32
-
- local openmp=disable
- use openmp && { tc-has-openmp && openmp=enable; }
-
- use perl && perl_check_env
-
- [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
- local myeconfargs=(
- $(use_enable static-libs static)
- $(use_enable hdri)
- $(use_enable opencl)
- --with-threads
- --with-modules
- --with-quantum-depth=${depth}
- $(use_with cxx magick-plus-plus)
- $(use_with perl)
- --with-perl-options='INSTALLDIRS=vendor'
- --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
- $(use_with bzip2 bzlib)
- $(use_with X x)
- $(use_with zlib)
- --without-autotrace
- $(use_with postscript dps)
- $(use_with djvu)
- --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
- $(use_with fftw)
- $(use_with fpx)
- $(use_with fontconfig)
- $(use_with truetype freetype)
- $(use_with postscript gslib)
- $(use_with graphviz gvc)
- $(use_with heif heic)
- $(use_with jbig)
- $(use_with jpeg)
- $(use_with jpeg2k openjp2)
- --without-jxl
- $(use_with lcms)
- $(use_with lqr)
- $(use_with lzma)
- $(use_with openexr)
- $(use_with pango)
- $(use_with png)
- $(use_with raw)
- $(use_with svg rsvg)
- $(use_with tiff)
- $(use_with webp)
- $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
- $(use_with wmf)
- $(use_with xml)
- --${openmp}-openmp
- --with-gcc-arch=no-automagic
- )
- CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
- # Install default (unrestricted) policy in $HOME for test suite #664238
- local _im_local_config_home="${HOME}/.config/ImageMagick"
- mkdir -p "${_im_local_config_home}" || \
- die "Failed to create IM config dir in '${_im_local_config_home}'"
- cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
- die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
- local im_command= IM_COMMANDS=()
- if [[ ${PV} == "9999" ]] ; then
- IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
- else
- IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
- fi
- IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
- IM_COMMANDS+=( "emake check" ) # Run tests
-
- for im_command in "${IM_COMMANDS[@]}"; do
- eval "${S}"/magick.sh \
- ${im_command} || \
- die "Failed to run \"${im_command}\""
- done
-}
-
-src_install() {
- # Ensure documentation installation files and paths with each release!
- emake \
- DESTDIR="${D}" \
- DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
- install
-
- rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
- dodoc {AUTHORS,README}.txt ChangeLog
-
- if use perl; then
- find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
- find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
- fi
-
- find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
- # .la files in parent are not needed, keep plugin .la files
- rm "${ED}"/usr/$(get_libdir)/*.la || die
-
- if use opencl; then
- cat <<-EOF > "${T}"/99${PN}
- SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
- EOF
-
- insinto /etc/sandbox.d
- doins "${T}"/99${PN} #472766
- fi
-
- insinto /usr/share/${PN}
- doins config/*icm
-}
-
-pkg_postinst() {
- local _show_policy_xml_notice=
-
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # This is a new installation
- _show_policy_xml_notice=yes
- else
- local v
- for v in ${REPLACING_VERSIONS}; do
- if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
- # This is an upgrade
- _show_policy_xml_notice=yes
-
- # Show this elog only once
- break
- fi
- done
- fi
-
- if [[ -n "${_show_policy_xml_notice}" ]]; then
- elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
- elog "which will prevent the usage of the following coders by default:"
- elog ""
- elog " - PS"
- elog " - PS2"
- elog " - PS3"
- elog " - EPS"
- elog " - PDF"
- elog " - XPS"
- fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.19.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.19.ebuild
index eb7593072ecd..f54a5b0369e3 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.10.19.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.19.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="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+ 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.16.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.22.ebuild
index 4d2561accf79..ac9609f64eff 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.10.16.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.22.ebuild
@@ -25,6 +25,7 @@ IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg
RESTRICT="!test? ( test )"
REQUIRED_USE="corefonts? ( truetype )
+ svg? ( xml )
test? ( corefonts )"
RESTRICT="!test? ( test )"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.9.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.9.ebuild
deleted file mode 100644
index 386e11f90ca1..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.10.9.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
- inherit git-r3
- MY_P="imagemagick-9999"
-else
- MY_PV="$(ver_rs 3 '-')"
- MY_P="ImageMagick-${MY_PV}"
- SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~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"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/7.0.10"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="corefonts? ( truetype )
- test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
- dev-libs/libltdl:0
- bzip2? ( app-arch/bzip2 )
- corefonts? ( media-fonts/corefonts )
- djvu? ( app-text/djvu )
- fftw? ( sci-libs/fftw:3.0 )
- fontconfig? ( media-libs/fontconfig )
- fpx? ( >=media-libs/libfpx-1.3.0-r1 )
- graphviz? ( media-gfx/graphviz )
- heif? ( media-libs/libheif:= )
- jbig? ( >=media-libs/jbigkit-2:= )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
- lcms? ( media-libs/lcms:2= )
- lqr? ( media-libs/liblqr )
- opencl? ( virtual/opencl )
- openexr? ( media-libs/openexr:0= )
- pango? ( x11-libs/pango )
- perl? ( >=dev-lang/perl-5.8.8:0= )
- png? ( media-libs/libpng:0= )
- postscript? ( app-text/ghostscript-gpl )
- raw? ( media-libs/libraw:= )
- svg? (
- gnome-base/librsvg
- media-gfx/potrace
- )
- tiff? ( media-libs/tiff:0= )
- truetype? (
- media-fonts/urw-fonts
- >=media-libs/freetype-2
- )
- webp? ( media-libs/libwebp:0= )
- wmf? ( media-libs/libwmf )
- X? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libXext
- x11-libs/libXt
- )
- xml? ( dev-libs/libxml2:= )
- lzma? ( app-arch/xz-utils )
- zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
- !media-gfx/graphicsmagick[imagemagick]
- X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
-
- # Apply hardening #664236
- cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
- sed -i -e '/^<policymap>$/ {
- r policy-hardening.snippet
- d
- }' \
- config/policy.xml || \
- die "Failed to apply hardening of policy.xml"
- einfo "policy.xml hardened"
-
- elibtoolize # for Darwin modules
-
- # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
- local ati_cards mesa_cards nvidia_cards render_cards
- shopt -s nullglob
- ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
- if test -n "${ati_cards}"; then
- addpredict "${ati_cards}"
- fi
- mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
- if test -n "${mesa_cards}"; then
- addpredict "${mesa_cards}"
- fi
- nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
- if test -n "${nvidia_cards}"; then
- addpredict "${nvidia_cards}"
- fi
- render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
- if test -n "${render_cards}"; then
- addpredict "${render_cards}"
- fi
- shopt -u nullglob
- addpredict /dev/nvidiactl
-}
-
-src_configure() {
- local depth=16
- use q8 && depth=8
- use q32 && depth=32
-
- local openmp=disable
- use openmp && { tc-has-openmp && openmp=enable; }
-
- use perl && perl_check_env
-
- [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
- local myeconfargs=(
- $(use_enable static-libs static)
- $(use_enable hdri)
- $(use_enable opencl)
- --with-threads
- --with-modules
- --with-quantum-depth=${depth}
- $(use_with cxx magick-plus-plus)
- $(use_with perl)
- --with-perl-options='INSTALLDIRS=vendor'
- --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
- $(use_with bzip2 bzlib)
- $(use_with X x)
- $(use_with zlib)
- --without-autotrace
- $(use_with postscript dps)
- $(use_with djvu)
- --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
- $(use_with fftw)
- $(use_with fpx)
- $(use_with fontconfig)
- $(use_with truetype freetype)
- $(use_with postscript gslib)
- $(use_with graphviz gvc)
- $(use_with heif heic)
- $(use_with jbig)
- $(use_with jpeg)
- $(use_with jpeg2k openjp2)
- --without-jxl
- $(use_with lcms)
- $(use_with lqr)
- $(use_with lzma)
- $(use_with openexr)
- $(use_with pango)
- $(use_with png)
- $(use_with raw)
- $(use_with svg rsvg)
- $(use_with tiff)
- $(use_with webp)
- $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
- $(use_with wmf)
- $(use_with xml)
- --${openmp}-openmp
- --with-gcc-arch=no-automagic
- )
- CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
- # Install default (unrestricted) policy in $HOME for test suite #664238
- local _im_local_config_home="${HOME}/.config/ImageMagick"
- mkdir -p "${_im_local_config_home}" || \
- die "Failed to create IM config dir in '${_im_local_config_home}'"
- cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
- die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
- local im_command= IM_COMMANDS=()
- if [[ ${PV} == "9999" ]] ; then
- IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
- else
- IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
- fi
- IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
- IM_COMMANDS+=( "emake check" ) # Run tests
-
- for im_command in "${IM_COMMANDS[@]}"; do
- eval "${S}"/magick.sh \
- ${im_command} || \
- die "Failed to run \"${im_command}\""
- done
-}
-
-src_install() {
- # Ensure documentation installation files and paths with each release!
- emake \
- DESTDIR="${D}" \
- DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
- install
-
- rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
- dodoc {AUTHORS,README}.txt ChangeLog
-
- if use perl; then
- find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
- find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
- fi
-
- find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
- # .la files in parent are not needed, keep plugin .la files
- rm "${ED}"/usr/$(get_libdir)/*.la || die
-
- if use opencl; then
- cat <<-EOF > "${T}"/99${PN}
- SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
- EOF
-
- insinto /etc/sandbox.d
- doins "${T}"/99${PN} #472766
- fi
-
- insinto /usr/share/${PN}
- doins config/*icm
-}
-
-pkg_postinst() {
- local _show_policy_xml_notice=
-
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # This is a new installation
- _show_policy_xml_notice=yes
- else
- local v
- for v in ${REPLACING_VERSIONS}; do
- if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
- # This is an upgrade
- _show_policy_xml_notice=yes
-
- # Show this elog only once
- break
- fi
- done
- fi
-
- if [[ -n "${_show_policy_xml_notice}" ]]; then
- elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
- elog "which will prevent the usage of the following coders by default:"
- elog ""
- elog " - PS"
- elog " - PS2"
- elog " - PS3"
- elog " - EPS"
- elog " - PDF"
- elog " - XPS"
- fi
-}
diff --git a/media-gfx/meshlab/Manifest b/media-gfx/meshlab/Manifest
index 76273534c942..70a5ab19f699 100644
--- a/media-gfx/meshlab/Manifest
+++ b/media-gfx/meshlab/Manifest
@@ -17,6 +17,7 @@ AUX 2016.12/meshlab-2016.12-align2.patch 624 BLAKE2B 342231146ef2efc52ae4295d909
AUX 2016.12/meshlab-2016.12-asString.patch 2309 BLAKE2B 8ff58d9a247e530e7965d186dfffc2e88bd4594a366439f9a8433269e3f20e33825673447a5ebac39929f02927a20cfa8d3dad0fae5787d6855de5653023ff31 SHA512 3ad05b637ad12a88a6e32f437cf6105b09c50eef16e815f11f3a1fbd6afdb3b01d9a0d31f08eaba26d075f6f2cba6c4694ca1afa2cc1e3973350294bc41f815b
AUX 2016.12/meshlab-2016.12-fix-plugins-path.patch 509 BLAKE2B 3a4327b41743704255039f2c06713975c2d842a3af5077385d982107289d33a5a04473f68e21769ca97e45514ca1119244c2b66b5709b99a0b772324e1b0884f SHA512 613b3cec1c50c3d4d6fd3006b80fd4cb3b66a97c1493872d76f95c5ed16ee9c2a9aba5c1a5d021a302114e8e0e172619c4d344306004f109a1f211ee6a14e102
AUX 2016.12/meshlab-2016.12-qprintable.patch 898 BLAKE2B 1a4802e758f8c7d29839eae49d5450b4d199011544223da7d7791045d44f2b2d71f7189d0cb655204d77736e63988079eeb64876411c62f09646887dae30aff8 SHA512 12836928f1848048afe769188285cc5a0a4e23b7d63f9c12ebae0298296607167d8e6198ea779cc475ca2cd39903c4a37dc77b20c928c49cddae1b4ee2fe2a7f
+AUX 2016.12/meshlab-2016.12-qt-5.15.patch 930 BLAKE2B d9bc0073c309006206411bcc48b3db65496aed4b32e5b8d30d582174f46038d34cac669e754516be4e07f51d448d92358666dded59a0ecc38cbbc78701a57a38 SHA512 c5c529c262d036346730247735c19f15eb11bf55dc2b876b230d81e3968941019b6dc6d8a64458b3da398b8ce4cb48a7bbfada375bac06ef73df9a25d827d820
AUX 2016.12/meshlab-2016.12-qt-includes.patch 521 BLAKE2B 44d8cd045180d25810beb74da2a916fb6a8a01354be819d43fd960913f96863d8d3696a23440e8857081560326b78538446426d676f6d0c52b42fe3bc20ae1ca SHA512 ad9613bdafa1f812f4fd6b36a215b78416b2143af6ae96bc6c40d81eee47e16c0d2e62a7b292367333ff99b09f84630f1a9b5ba59d9a1ef3209a3caa28f1f5f6
AUX 2016.12/meshlab-2016.12-remove-header.patch 1481 BLAKE2B c52f2eb980ebec98a534d2f5f6eadb9b89719e1d28d6fdc2912348fbe715103f2ca67684e29d1fa77b9b305cf552c12eb667634bfa22a0fad0312012e9b7b99d SHA512 ea0e24aa94d2595ed340c91c7a17e4028b2792bf316dfea0d8062324583dde62c03bb2d6af74317b9e448c657e5418100f40b18b172344697fe53e36657a45fc
AUX 2016.12/remove-edit_mutualcorrs.patch 475 BLAKE2B 925756e7bed4fd9474b2a011f95118e00159457b91d04820166efae55d27eb19006af9ae92555b46adcd817646fcfcef82937221d59fef41899f94df1925a237 SHA512 03b4907fc484941d17d208d028b63cc0a1d1740fbdac8a6dd2b9ac8161efc5899d820cd0ec59b28ba1c39562ecd93c5e11e7b7af5564ee9aa429cb8745a4a5b9
@@ -25,5 +26,5 @@ DIST meshlab-2016.12.tar.gz 94194402 BLAKE2B 53dda75b51198d529d35ae64e1b9d8ec240
DIST vcglib-1.0.1.tar.gz 9063634 BLAKE2B 91fba7ebf1ac18d0dfb33d3e26656e546b7c35ae753777730c44ebdf327413dfe94dd5e84907eb7e1644d70bfdf7d00ae8ecd0a81587d790a31354f7db09d626 SHA512 55d1854054744abae2d41e7b5041df89253bae108df5fc1cfe777013de7192dce04bc474475cb11a1d0343ebcab1ea61b381d9d9c36c452528043e85e75bc211
EBUILD meshlab-2016.12-r2.ebuild 3497 BLAKE2B 9e3de165ab7cb48eec6289e55f2e1df0f88c9476ee0b67b7d99fdf052d0255143d48fac4002b3554d36ba967493ae3754fddd0a8c617b3aa30860cb887e6d547 SHA512 50433f5f61a00c4ecf33f901300156845ddc404ee427af7214fb42edd292cfe91cf26f5dc96d9cb7316e6b97d3934d9534a513c8d278d327fb82ff82df49712a
EBUILD meshlab-2016.12-r3.ebuild 3539 BLAKE2B ce73969c0caf822ce458b4e3e40c591479f032fe9780b61bb2eb852cf9ae12eb933fb4b355b36b2af70f201a6a29135d8cba814be87af2369366b0fa798a6684 SHA512 a1df95a5610db88be56ed83e16ba4fd4fc71a7ff138435f1cfbaefe71d8dd9a56c193bdc32f9f7affd303c6ac4db4ffc244452cb20571e350d2f0a6dde6246f9
-EBUILD meshlab-2016.12-r4.ebuild 3628 BLAKE2B 4a8b4b1890378d70d4fa282d9814c9d39333c9b2b0cdd51e9ccf50f56d53b3bb5e9c723721f1e09bdff8728243266cd89f76af6b059197828ad2f99c6bedf547 SHA512 00166cb5e1f9ed0196ed6f96d8579be126a5778de93840545b5c536641204bac75365ea5f2430abc2f812090bca6ad18fe532e874d843c9de2861eba75cd27b7
+EBUILD meshlab-2016.12-r4.ebuild 3652 BLAKE2B 5ea94dd176d7229e6e07ea102b130d8e97907edbcd630258f704b14f47179ba02fe5ae44485132372b2bdfeef14317e2e10904b027b1f1d0081ba23e9cdccf82 SHA512 5bc637d6299fa057dd4549d6559c20e0a8e91d441794fa54de5963288a067fa8f435f8f38b172c8869659b334c313a2b05f4ecbe6433a37f8a69bc14b9abb130
MISC metadata.xml 729 BLAKE2B 5c89ef346791f1aaecf313a580c18e32d37a116e87aa5955d21445816fd7a9fae30af5763dafe32f019fcda1333b3bfe48280abb1845fe096f223642badb9629 SHA512 f1d3b39a1c612b895463f0cb674411fce2614ff55855b964dee1b9c999aa1ad4bb6ec0a000cab9a1767f54474597836a92fda48722a3d8a90d21f412316e2b71
diff --git a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qt-5.15.patch b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qt-5.15.patch
new file mode 100644
index 000000000000..ab052cd69eb9
--- /dev/null
+++ b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qt-5.15.patch
@@ -0,0 +1,33 @@
+From c57222e79f1c7840e1ed01a4abd17d089f5e5185 Mon Sep 17 00:00:00 2001
+From: alemuntoni <muntoni.alessandro@gmail.com>
+Date: Tue, 26 May 2020 12:35:03 +0200
+Subject: [PATCH] missing include
+
+---
+ meshlab/glarea.cpp | 1 +
+ meshlab/meshlab.pro | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/meshlab/glarea.cpp b/meshlab/glarea.cpp
+index 6c0421062..dfd7af229 100644
+--- a/meshlab/glarea.cpp
++++ b/meshlab/glarea.cpp
+@@ -34,6 +34,7 @@
+ #include <QFileDialog>
+ #include <QClipboard>
+ #include <QLocale>
++#include <QPainterPath>
+
+ #include <wrap/gl/picking.h>
+ #include <wrap/qt/trackball.h>
+diff --git a/meshlab/meshlab.pro b/meshlab/meshlab.pro
+index 26ef88d00..842eb5ea5 100644
+--- a/meshlab/meshlab.pro
++++ b/meshlab/meshlab.pro
+@@ -1,5 +1,6 @@
+ # You have to copy the file by hand into the meshlab.app/Contents/Resources directory.
+ # ICON += images/meshlab_obj.icns
++QT += gui
+ QT += opengl
+ QT += xml
+ QT += xmlpatterns
diff --git a/media-gfx/meshlab/meshlab-2016.12-r4.ebuild b/media-gfx/meshlab/meshlab-2016.12-r4.ebuild
index bea9e2857554..505a20ab0b58 100644
--- a/media-gfx/meshlab/meshlab-2016.12-r4.ebuild
+++ b/media-gfx/meshlab/meshlab-2016.12-r4.ebuild
@@ -1,21 +1,22 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit qmake-utils
+inherit desktop qmake-utils
-DESCRIPTION="the open source system for processing and editing 3D triangular meshes"
+DESCRIPTION="The open source system for processing and editing 3D triangular meshes"
HOMEPAGE="http://www.meshlab.net"
VCG_VERSION="1.0.1"
SRC_URI="https://github.com/cnr-isti-vclab/meshlab/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/cnr-isti-vclab/vcglib/archive/v${VCG_VERSION}.tar.gz -> vcglib-${VCG_VERSION}.tar.gz
+ https://github.com/cnr-isti-vclab/vcglib/archive/v${VCG_VERSION}.tar.gz -> vcglib-${VCG_VERSION}.tar.gz
"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="-minimal"
+
DEPEND="dev-cpp/eigen:3
dev-cpp/muParser
dev-qt/qtcore:5
@@ -35,33 +36,34 @@ RDEPEND="${DEPEND}"
S="${WORKDIR}/meshlab-${PV}/src"
PATCHES=(
- "${FILESDIR}/${PV}/0001-set-shader-and-texture-paths.patch"
- #remove ot working plugins
- "${FILESDIR}/${PV}/remove-edit_mutualcorrs.patch"
- "${FILESDIR}/${PV}/remove-io_TXT.patch"
- #since structure synth doesn't seem to be compiling
- "${FILESDIR}/${PV}/0001-disable-filter-ssynth.patch"
- #this has been fixed in the tree
- "${FILESDIR}/${PV}/0001-disable-edit-quality.patch"
- #this causes segfaults
- "${FILESDIR}/${PV}/0001-disable-filter-layer.patch"
- #for when we use minimal
- "${FILESDIR}/${PV}/0001-compile-server.patch"
- "${FILESDIR}/${PV}/0001-use-external-lib3ds.patch"
- "${FILESDIR}/${PV}/0001-use-external-openctm.patch"
- "${FILESDIR}/${PV}/0001-use-external-muParser.patch"
- "${FILESDIR}/${PV}/0001-use-external-bzip.patch"
- "${FILESDIR}/${PV}/0001-use-external-jhead.patch"
- "${FILESDIR}/${PV}/0001-use-external-glew.patch"
- #cause gnu stack quickstart related qa
- "${FILESDIR}/${PV}/0001-remove-not-sane-plugins.patch"
- "${FILESDIR}/${PV}/${P}-fix-plugins-path.patch"
- "${FILESDIR}/${PV}/${P}-align1.patch"
- "${FILESDIR}/${PV}/${P}-align2.patch"
- "${FILESDIR}/${PV}/${P}-asString.patch"
- "${FILESDIR}/${PV}/${P}-qprintable.patch"
- "${FILESDIR}/${PV}/${P}-qt-includes.patch"
- )
+ "${FILESDIR}/${PV}/0001-set-shader-and-texture-paths.patch"
+ #remove ot working plugins
+ "${FILESDIR}/${PV}/remove-edit_mutualcorrs.patch"
+ "${FILESDIR}/${PV}/remove-io_TXT.patch"
+ #since structure synth doesn't seem to be compiling
+ "${FILESDIR}/${PV}/0001-disable-filter-ssynth.patch"
+ #this has been fixed in the tree
+ "${FILESDIR}/${PV}/0001-disable-edit-quality.patch"
+ #this causes segfaults
+ "${FILESDIR}/${PV}/0001-disable-filter-layer.patch"
+ #for when we use minimal
+ "${FILESDIR}/${PV}/0001-compile-server.patch"
+ "${FILESDIR}/${PV}/0001-use-external-lib3ds.patch"
+ "${FILESDIR}/${PV}/0001-use-external-openctm.patch"
+ "${FILESDIR}/${PV}/0001-use-external-muParser.patch"
+ "${FILESDIR}/${PV}/0001-use-external-bzip.patch"
+ "${FILESDIR}/${PV}/0001-use-external-jhead.patch"
+ "${FILESDIR}/${PV}/0001-use-external-glew.patch"
+ #cause gnu stack quickstart related qa
+ "${FILESDIR}/${PV}/0001-remove-not-sane-plugins.patch"
+ "${FILESDIR}/${PV}/${P}-fix-plugins-path.patch"
+ "${FILESDIR}/${PV}/${P}-align1.patch"
+ "${FILESDIR}/${PV}/${P}-align2.patch"
+ "${FILESDIR}/${PV}/${P}-asString.patch"
+ "${FILESDIR}/${PV}/${P}-qprintable.patch"
+ "${FILESDIR}/${PV}/${P}-qt-includes.patch"
+ "${FILESDIR}/${PV}/${P}-qt-5.15.patch"
+)
src_prepare() {
mv "${WORKDIR}/vcglib-${VCG_VERSION}" "${WORKDIR}/vcglib" || die "vcglib mv failed"
@@ -93,7 +95,7 @@ src_configure() {
src_install() {
dobin distrib/{meshlab,meshlabserver}
- dolib distrib/libcommon.so.1.0.0
+ dolib.so distrib/libcommon.so.1.0.0
dosym libcommon.so.1.0.0 /usr/$(get_libdir)/libcommon.so.1
dosym libcommon.so.1 /usr/$(get_libdir)/libcommon.so
exeinto /usr/$(get_libdir)/meshlab/plugins
diff --git a/media-gfx/monica/Manifest b/media-gfx/monica/Manifest
index 123961384147..86280a884b1c 100644
--- a/media-gfx/monica/Manifest
+++ b/media-gfx/monica/Manifest
@@ -1,5 +1,5 @@
AUX monica-3.6-makefile-cleanup.patch 907 BLAKE2B 13cf4d1a4950074f8909045fc0acd337482e343b51a800dbb87a585311ff776d4f87f8d0250b059e99b328a470e99bae23412646a5d8d89d09a4380e50bbd372 SHA512 cc151e238e89db9d3873133e1a637d5e2959c2460251fe7fe8feb62ef22c64963cec5b2533607996b2cf7d33abdfd1f42a59f5a769cad0bf2194e8d751da3bf6
AUX monica-3.7-gcc44.patch 341 BLAKE2B c534884cca357cbc37a0092bb42faa9a3f29165e0e5622d811d08f4238a2d716f91a8ce731438a33323dd350e3b9da79e743b7d3f46fc5ba9eb084b14f359bd4 SHA512 837f3fc2c77d415067460f1aae80807daa9882b814494f2305be711db920a750ae183ec7b456527956b60ca3cf022729524990cd0febafeaab41bd1dbb080bfb
DIST monica-3.7.tar.bz2 18330 BLAKE2B 26c5539d00867fd6ee80255a41fa363ee8cd3a720637b1b83546bfe9bf877f5b521ea47da456d965b65f57d7a351bc7c5dfe310ab9608b67a8db7b2b4d9cd1af SHA512 87565f33f3c3492b196905e5b8e17bd45a7eb8eb0a0281f02e23337eec888af82571ac6f2d229256ee97012d402b7f1b217cd56a8b87ff9c9296931bf63cb153
-EBUILD monica-3.7.ebuild 708 BLAKE2B 60d813aac6f40d7753c4dfbe038faada9b9ba5cbfa32dc9b020c01d5c6e09ccda57b7d70112593e8de808afaaa1eee257c8338e79ebe6a5072042ce3e1c46376 SHA512 a31da9af50f86ab6e4c45a4d32008ede5d6fcb992e2fe3205e9acd0a40904cfe0d367f766b78a67f8b3c4edfabd26311eaa81e9dc1271fe938d6e6920be69d77
+EBUILD monica-3.7.ebuild 718 BLAKE2B 50a1d50df2df9ff18ff9735b542b85cd5e5748f3e4dad8dcb66e03f4f76684d74e7899e130820eabd46cb31a29707ecc3822c930700370a704336d5868d6466f SHA512 56aaedd0adea9b91c69162ef8837caa4a1ddb472cf6b1e5aba251f30f11e8f9926b18902f8c1cd9ed7ce8393dea363162f6837cb10a906e0daef0d42fd891d96
MISC metadata.xml 629 BLAKE2B 90f781b587a61b126e78d8d7e11bb2aacc1db7c58d5891f4781bcca8d9531d5b1373ffd35b0771ea8dcfab81493807742598846919fd9b657270d46f8265c1c2 SHA512 30f91e05861aa50f5d0af624459ea92cd2649fbad374bed1b0dc30c2ab2532df8bd6b27f42f23bc7e77480141bcd5760a5804c46d121b3fa1170a90fd1d0acd0
diff --git a/media-gfx/monica/monica-3.7.ebuild b/media-gfx/monica/monica-3.7.ebuild
index 7afd8b96e53f..08697029c232 100644
--- a/media-gfx/monica/monica-3.7.ebuild
+++ b/media-gfx/monica/monica-3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
inherit toolchain-funcs
DESCRIPTION="Monica is a Monitor Calibration Tool"
-HOMEPAGE="http://freecode.com/projects/monica"
+HOMEPAGE="http://freshmeat.sourceforge.net/projects/monica"
SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="BSD"
diff --git a/media-gfx/mypaint-brushes/Manifest b/media-gfx/mypaint-brushes/Manifest
index bddb650f7cda..ee3c9876b08b 100644
--- a/media-gfx/mypaint-brushes/Manifest
+++ b/media-gfx/mypaint-brushes/Manifest
@@ -1,3 +1,3 @@
DIST mypaint-brushes-1.3.0.tar.gz 2447093 BLAKE2B 26fc22ef7669f5d88b1cb2bbc4562baffe257c112baf4a782f5045becd17a0bea577f79f290ae51b38cb3030478ea9d2e251033cc95101caacc823d139fe4ce1 SHA512 f8e0050cd700358d75cd25e40acd73905e2a53f21c6177cf67e8012aa4fbba8dc445109f07601c3846f95532a40feff4441081c0aa4e958049fc0ed8008fb414
-EBUILD mypaint-brushes-1.3.0-r1.ebuild 554 BLAKE2B c0cc90e2c42672b96cc734918fe5222a71e7973ab303e1d9794e7fea8d9355c8016774b165134d8cac95cf29f0d8389f608b9f4387c3304c03a8b7943e3ed949 SHA512 3649d53e9012acec908e2441bfc9b7e2c7a5b8c89a890ac6d38b6b1c418167dab459796a1f3f6482e8795606b1473759154f9fc5a7dbd37868ed709114de1f86
+EBUILD mypaint-brushes-1.3.0-r1.ebuild 548 BLAKE2B f216508dd44e7d4a657e8dd30a0b136ad895b326cedaf0bc68c3c19537c22907d253ea0390a7c18363d2e097f7f348d8dc751400849cf21da5fe9b882fa34c55 SHA512 80d06275b8428302f71d29626847ec3b69cfa87f12fcac34a8e3d91d57119ba7a85eff76dbdbac8aec580fa28713ebe15def07259aff98898279483b9a851dda
MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
index 62c440f74456..fa662603aa5c 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
@@ -6,8 +6,8 @@ EAPI=6
inherit autotools
DESCRIPTION="Default MyPaint brushes"
-HOMEPAGE="https://github.com/Jehan/mypaint-brushes"
-SRC_URI="https://github.com/Jehan/mypaint-brushes/archive/v1.3.0.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/mypaint/mypaint-brushes"
+SRC_URI="https://github.com/mypaint/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="CC0-1.0"
SLOT="1.0" # due to pkgconfig name "mypaint-brushes-1.0"
diff --git a/media-gfx/netpaint/Manifest b/media-gfx/netpaint/Manifest
new file mode 100644
index 000000000000..38b8c9795317
--- /dev/null
+++ b/media-gfx/netpaint/Manifest
@@ -0,0 +1,3 @@
+DIST netpaint-1.1.2.tar.gz 427241 BLAKE2B 7884dadf63849bf45caf84bc009da818bdf3277660411c486b32333bf0caf9e0e03ab6f56f77add68456896e4d16520b803c51e19c4dc6b01ef1227f0bd90a28 SHA512 f998714fe176c84074aaa710e2950c83d5c3ac0819e69c6bbbd93e19f6415a66f8ef21e0799d3112a7c468c1a99383a878ac1837157b079089aaf072c664ee53
+EBUILD netpaint-1.1.2.ebuild 756 BLAKE2B 4894fb73fdf76bf78ed6cea19604c029efdc229b4181a1679e53647d6c218b57c2bd8aca7e3f7d734fde1615aa81efb9932c89b8bec0ad949d4d383f921a9520 SHA512 fa56666e8024f58d14e041ff4ff8bae3c7d850fde6d6cca84d5699dc4b1fbf31a8a9b6458b9c31e85fb21330db37ca5cebc775fc015ea852fb806661b0c9d8a7
+MISC metadata.xml 413 BLAKE2B 0376b5f01922a8bd36d48d3525c9fdd1659ff1a936a7fda8fe0af3ce7ff669b603d80e560bb02bf690cf77f5fc6ddd830c1cf4d76942fee38e6fa3e6c539c861 SHA512 88efad0cf6e816ef512ca7d821cba3bcfdb3c81f2e54d26458a139a876631703f2a147077b077ab7c1dca74fd05a58a8b003db14625175bd3fb9e9545f6c103b
diff --git a/media-gfx/netpaint/metadata.xml b/media-gfx/netpaint/metadata.xml
new file mode 100644
index 000000000000..b09023bbc390
--- /dev/null
+++ b/media-gfx/netpaint/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>monsieurp@gentoo.org</email>
+ <name>Patrice Clement</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/media-gfx/netpaint/netpaint-1.1.2.ebuild b/media-gfx/netpaint/netpaint-1.1.2.ebuild
new file mode 100644
index 000000000000..36c3bcd4fe2a
--- /dev/null
+++ b/media-gfx/netpaint/netpaint-1.1.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="curses-based drawing tool"
+HOMEPAGE="https://github.com/SyntheticDreams/NetPaint"
+SRC_URI="https://github.com/SyntheticDreams/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+MY_PN="NetPaint"
+MY_P="${MY_PN}-${PV}"
+
+RDEPEND="
+ dev-python/urwid[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]"
+
+DEPEND="
+ ${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+ mv netpaint.py netpaint || die
+ sed -e 's#netpaint\.py#netpaint#g;' \
+ -i setup.py || die "can't patch setup.py"
+}
diff --git a/media-gfx/pngquant/Manifest b/media-gfx/pngquant/Manifest
index 4aa8bcd32389..65e22a973f7a 100644
--- a/media-gfx/pngquant/Manifest
+++ b/media-gfx/pngquant/Manifest
@@ -2,5 +2,5 @@ AUX pngquant-2.12.2-respect-CFLAGS.patch 449 BLAKE2B fb3679a05e024a276b5ae1070f9
DIST pngquant-2.12.3-src.tar.gz 143572 BLAKE2B 6f4cc9f36c9148f36734d9afa3765e206c09e833064cff5d98494d0d71610e857d7c605bc5673eb9fd5b38029ade60c9c1ffc18e745a3dfe5dbde6d39a81d0c7 SHA512 cf39f56750a49b2818fb86b168845e54f3797b664c3f49535ee93a3dc899299192a692039396ffcddc5988d040a778006c5f701f8bcd9f5c73583a47b711b01c
DIST pngquant-2.12.6.tar.gz 69074 BLAKE2B 3573d54d94b0085de9ffd4dd34a8fd46c49a1e02d0a6419271c17bc7ac7ab6c05d811336a3a8a8ab21d4dea774c93ee1baae141b42c255838fb1eef9cdb1a871 SHA512 8ffff346df67edf1000c71b6d26371826bc4d236b3f57ef1ec73b3b61668cff9c3ca7d541417c39bc6c89e00176c91eb28867b7a91945ac84292ca0ac54984e9
EBUILD pngquant-2.12.3.ebuild 1169 BLAKE2B 56452f5fa0d76b47151583ef5c4684781eeee2ad12736845790af6ac1a1bb06516c692156a54aa08bcafe5d9df3f5175e3be34e9564e79970ca43cb65428275f SHA512 648727074119405019a00eb3f252ff86e0157874821f3fb9e6025183937cb4639a8b15c19974ee31bb27313cf791a45c8569490e885f0a92b88b1b2d62eada44
-EBUILD pngquant-2.12.6.ebuild 1329 BLAKE2B 0dacb67b6294e461c2b8f098c1064a580e9c47f66de1bf7d38bb346c69aff6cf8b62e87908b2fd908f31385ebc5559549963d9eca8a5954257656d0d7b8dba1e SHA512 b07dc65fb7e5a6cefeff41c6ae48906cac8ff1a548d67309d4f35f38da9033af1111d2dc47d448acf9741d39e6af53c8e28b24d1599d6a8ff3bd0f945a5dfa44
+EBUILD pngquant-2.12.6.ebuild 1328 BLAKE2B 3fe65dc071f8f993c440ad318473eb71deccd0ad62ff635b5c57f8cef1fee1a7c4f85ac6332e92076962e2655e98c1cb16a5fee38ff80af9469feccd00ffe797 SHA512 afbea31a05dbe254316f102b47eae79a29123c5a535fe7d254bc6d3f9a95ec69cb2421499454491ca6fb8e1734c651e79dee6c61583d33d307c741ebe28affea
MISC metadata.xml 260 BLAKE2B 5eb8d87919aaab2f101cfc899ccb00b8efb723b67cb102ce580e0e69781639708cb8523b8967f9fb169e00455c548cff19d2827ce711c3f36d5ae58a1d3777ee SHA512 b6369aad1615446c9a4e1740a51a49d843868e114e49bc526e7b00cefdc795a601b9c508d866b065cc4ed750b85f48f136ee5925b9511a80f4056d7ef832eab2
diff --git a/media-gfx/pngquant/pngquant-2.12.6.ebuild b/media-gfx/pngquant/pngquant-2.12.6.ebuild
index 2fed8ebcbef0..26e19714bec4 100644
--- a/media-gfx/pngquant/pngquant-2.12.6.ebuild
+++ b/media-gfx/pngquant/pngquant-2.12.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/kornelski/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3 HPND rwpng"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
IUSE="cpu_flags_x86_sse2 debug lcms openmp test"
REQUIRED_USE="test? ( lcms )"
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 5d33c27ebd1c..37e088e58901 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -4,11 +4,16 @@ AUX sane-backends-1.0.27-disable-usb-tests.patch 336 BLAKE2B 00fd225a4426405d515
AUX sane-backends-1.0.27-network.patch 1022 BLAKE2B bcc929635fe62af4201f474cddd141b95bf1b7520f7279b713771ed9614990b3331ec1b42f309d88e375d6c9cffacb7195e7e3f063e491bb9cd6e4ae39f79eea SHA512 04b65a06d2c76dde6fce501ba823e999eb89ea41573f887f9e7d5347f3aa5e35310fad69313e99f873640e29a9849372d2ff995678593a0781fba73b464bec0d
AUX sane-backends-1.0.27-revert-samsung.patch 14137 BLAKE2B ec41dcc9862a50f09518207b0db83f37d14f7e3ba6b101800144a8bc7059eb9c0fb5fcbab42dc8ec68001f61b304baa628c3f2ac73be9031b946fe8088e5cf37 SHA512 70e8d86291fbb21c7c9c5fa9ba5df54c808e5e75e3155af33ab9c18c768bc1eaa05890802c52daa3e60619fa8961b7162cac4c51e2dd2dd6c7114986d3a6136f
AUX sane-backends-1.0.27-uninitialized-variable.patch 902 BLAKE2B 6f2e86d6d79f85f73d564bc1877667c1278108d876f61551cc89abb159dee68e6b454bec190cb44eee61255fa648010293382f5575d208dd7c1e33c1492be3e9 SHA512 b3c5675e5ec3a92345832d081025dae72bcfda9854f79565fc2801e6ea710a83e953a9f075ef9754c6d893fb099544989b4aaabf8a177d5c52b8a4b9c6eac052
+AUX sane-backends-1.0.30-add_hpaio_epkowa_dll.conf.patch 459 BLAKE2B d127c054b3e4f8aca5de54888e7a37c986515350aac84bb66ca195fca57138cbe3ac3f29b0982e4019b5b599b81984dceacd5523f794a04cfb5d416a051a1e61 SHA512 d9bcce33482db2f15ee094a244359fafdce196984a799509d9b16e24f46feb3aecd419520e65ca9513b40ff4975d793bec05924bfdd69586d9a6f3feb42cccc3
+AUX sane-backends-1.0.30-bigendian-depth.patch 372 BLAKE2B f93f510496f1234c586f57b4814ad45ea3dd0bf78a934edd6ab951c5423be235560e54d871d8f9edef6fe51b4d9e18ecf33367635cefa1e500f8ed29a722e0bd SHA512 0cfe593471be5a89666ad9bb112999368d9195f0bf3aa13597251b3a5ebf645eeb776b29df04291f4fda6e330f2bdfbbbc04865588d9af54c5f610b9e923d9fb
+AUX sane-backends-1.0.30-missing-stdint-include.patch 374 BLAKE2B e20005c96096a228126b7e1d414ae2c127bf7ad16894defc8e3c65230380449e61f75b3cd63bd80b16bf8b1ebc08e5f974eb621d16f9c6b994105bb9d95e1a89 SHA512 521a3275879e84f6727ebc3b8e5ae4fbbb1495d2c41cb6880e170c62f684da2af7ea47b0a89d0806687f8a48791f2562959158a31a30dd240880757b6c81a321
AUX saned 150 BLAKE2B 306d57a0c09856b387c3c50eb27aaafdb194972c2fdb5d1cb7de3118f0c71cf234898ce958f0d6bd17a5e1f2b5bde458e014a7bfdec52403a6204ebf51aee039 SHA512 26f3d66c6b1e75d87d7d430518aa878c77d5ab8d76a45847cef3ff15566341938eedf46c50d0fa8cdeef828df9cddefdd6fdd767c5de30d3aa7d64ed1911d910
AUX saned.confd 76 BLAKE2B cac74b6f117f7f78a71b951433bc6b155f8641e2cf1bd747871165764e97ed368d10551075761c34ff01f51f7cae1b8a9c5692fb9666a300b45134fe255ea3c1 SHA512 8f4a99ef24c19b3a7213b3d25ea16f5bca8623735cf25d21e3a706e9e0135ac8cce5d0b8fb8728845977f41dcefe6bd858076d755515fc91b00e05ee5817d751
AUX saned.initd 294 BLAKE2B 571bd4032b2330c627a31459a18baf2044852ec1b40f0216bd5b5a546d61133522cdc98c7011669feaadc2d030ffeb49a86130075f22a18edab5f4c925780681 SHA512 655200141339f14bf7fc6f4fff3403cf9504809b7f023aa5425aad691c5baa65772100da0a6311669f83ed1dce73b7d65ca20aa31345b13c48dfdb1b30ce5dbd
AUX saned.socket 132 BLAKE2B 5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3cecdae79111fb1db1cfe3b4933eca15af5f985fc6b89e4d9af3844b6e9cfd542828b6b9e57ed9 SHA512 a23ceeeb02bd9e214702003a3165886858ecbdd93df89cd37ad5f00581745454548ccda0ab656f2dc0acbf2896a8781568c786797e64a07014be003d6140a093
AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71faad18edaf71b920584366ac988d354f45bc07607ea64a97ea480fe152ac9a1cd896df99ff457cbf7 SHA512 891c751261107676f8159f403e0f4d4254099b709b9ba0ac9f2af97a9ed30f677411ad6bc316c2e6e673c616ba988253479d5e30c9617e3ae279beb79f70e965
+DIST backends-1.0.30.tar.gz 5721262 BLAKE2B 139d3ca908d54b94d14ef4145d44a89b939807c15870be03c3c028cf95351bf9a4abd3ea115b84396366bb054f37ade883f429467dceb0663c2855b92e0a4fa5 SHA512 19127c8109c1587d60d8cba713f73b1a24242df44fa49c3e59320f48022783f05d26d3242a3f87478e583a807d88b446ef7a51afb33b674be29656496c435d7b
DIST sane-backends-1.0.27.tar.gz 6430188 BLAKE2B 90f910311e31a436eaa0ca0fedd998aac3331f89a346f31613776ebc860a10cc37055fd15db8de8d743498914ea0c16e4153dbaa101380eb6e36857d730c3456 SHA512 c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5
EBUILD sane-backends-1.0.27-r3.ebuild 8101 BLAKE2B e6ff1e73fad9d33c8b9d4a475de311b5ddf60a66fe2604f6c8573bfd593688292a84ac554dc06d0c9d1181f443f31e0e9fc6e6e520a0e76fe62f373129f92388 SHA512 1434b237b354d84eecfab48624805dcbd8dcaaf42e5315ca25c980942551a2cb0cae39453907982d96ffe2a4042def9eb7d44b9ad768750aa35d65a18057c06c
+EBUILD sane-backends-1.0.30-r2.ebuild 8153 BLAKE2B 4a837163fb0ca438814f3ecb54f5a9d1ab6e229b243dc8348b624c2e28ecc489897f728252410e0409d0885d8fcbf6801a5bb5a67479a52284368aa25699ac96 SHA512 6f6ce83f0b66c15eb193c19916fc2978f49b19068efa6dbaa7e6ed9b414c71ecf6513978a725cb95d27a4f304cbc8f377e837aa42af6aeaa16495fd29fbc1f25
MISC metadata.xml 266 BLAKE2B c76ad15982ba5b341a41155c75a5fda95a99ef658ed972c452bfb7b0968aafe33f83cc5bd0f2effb1c2b4f9721a8f61987f2fb7906855b3869e7787226f2b385 SHA512 67d43b02a8c1aab418ca79b30d88af0e78f9df9b95c93887cfed5976290e714409e7dc400f09170d7e7844a411aa3e3202f49f31f39b7f580a8c0b6f3d4db659
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.30-add_hpaio_epkowa_dll.conf.patch b/media-gfx/sane-backends/files/sane-backends-1.0.30-add_hpaio_epkowa_dll.conf.patch
new file mode 100644
index 000000000000..b92e14b67791
--- /dev/null
+++ b/media-gfx/sane-backends/files/sane-backends-1.0.30-add_hpaio_epkowa_dll.conf.patch
@@ -0,0 +1,11 @@
+diff -Naur backends-1.0.30/backend/dll.conf.in backends-1.0.30-r1/backend/dll.conf.in
+--- backends-1.0.30/backend/dll.conf.in 2020-05-17 14:16:28.000000000 +0300
++++ backends-1.0.30-r1/backend/dll.conf.in 2020-06-27 08:24:18.378856341 +0300
+@@ -98,3 +98,7 @@
+ #umax_pp
+ v4l
+ xerox_mfp
++# Add support for the HP-specific backend. Needs net-print/hplip installed.
++hpaio
++# Add support for the Epson-specific backend. Needs media-gfx/iscan installed.
++epkowa
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.30-bigendian-depth.patch b/media-gfx/sane-backends/files/sane-backends-1.0.30-bigendian-depth.patch
new file mode 100644
index 000000000000..bac06593b9e6
--- /dev/null
+++ b/media-gfx/sane-backends/files/sane-backends-1.0.30-bigendian-depth.patch
@@ -0,0 +1,14 @@
+Correct overlooked bigendian case. This has been fixed upstream in a different
+way since the 1.0.30 release.
+
+--- a/backend/genesys/low.cpp
++++ b/backend/genesys/low.cpp
+@@ -539,7 +539,7 @@
+ }
+
+ #ifdef WORDS_BIGENDIAN
+- if (depth == 16) {
++ if (session.params.depth == 16) {
+ dev->pipeline.push_node<ImagePipelineNodeSwap16BitEndian>();
+ }
+ #endif
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.30-missing-stdint-include.patch b/media-gfx/sane-backends/files/sane-backends-1.0.30-missing-stdint-include.patch
new file mode 100644
index 000000000000..14c97ae95bf6
--- /dev/null
+++ b/media-gfx/sane-backends/files/sane-backends-1.0.30-missing-stdint-include.patch
@@ -0,0 +1,14 @@
+https://gitlab.com/sane-project/backends/-/issues/314
+https://gitlab.com/sane-project/backends/-/commit/6bb87fdf1f3dc190cfc4b7d64b0c8c8c3d10151b.diff
+--- a/sanei/sanei_usb.c
++++ b/sanei/sanei_usb.c
+@@ -48,6 +48,9 @@
+
+ #include "../include/sane/config.h"
+
++#ifdef HAVE_STDINT_H
++# include <stdint.h>
++#endif
+ #include <stdlib.h>
+ #include <ctype.h>
+ #include <sys/types.h>
diff --git a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
new file mode 100644
index 000000000000..d81a991ad811
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils flag-o-matic multilib-minimal systemd toolchain-funcs udev user
+
+# gphoto and v4l are handled by their usual USE flags.
+# The pint backend was disabled because I could not get it to compile.
+IUSE_SANE_BACKENDS="
+ abaton
+ agfafocus
+ apple
+ artec
+ artec_eplus48u
+ as6e
+ avision
+ bh
+ canon
+ canon630u
+ canon_dr
+ canon_pp
+ cardscan
+ coolscan
+ coolscan2
+ coolscan3
+ dc210
+ dc240
+ dc25
+ dell1600n_net
+ dmc
+ epjitsu
+ epson
+ epson2
+ escl
+ fujitsu
+ genesys
+ gt68xx
+ hp
+ hp3500
+ hp3900
+ hp4200
+ hp5400
+ hp5590
+ hpljm1005
+ hpsj5s
+ hs2p
+ ibm
+ kodak
+ kodakaio
+ kvs1025
+ kvs20xx
+ kvs40xx
+ leo
+ lexmark
+ ma1509
+ magicolor
+ matsushita
+ microtek
+ microtek2
+ mustek
+ mustek_pp
+ mustek_usb
+ mustek_usb2
+ nec
+ net
+ niash
+ p5
+ pie
+ pixma
+ plustek
+ plustek_pp
+ pnm
+ qcam
+ ricoh
+ ricoh2
+ rts8891
+ s9036
+ sceptre
+ sharp
+ sm3600
+ sm3840
+ snapscan
+ sp15c
+ st400
+ stv680
+ tamarack
+ teco1
+ teco2
+ teco3
+ test
+ u12
+ umax
+ umax1220u
+ umax_pp
+ xerox_mfp"
+
+IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf"
+
+for GBACKEND in ${IUSE_SANE_BACKENDS}; do
+ case ${GBACKEND} in
+ # Disable backends that require parallel ports as no one has those anymore.
+ canon_pp|hpsj5s|mustek_pp|\
+ pnm|mustek_usb2|kvs40xx)
+ IUSE+=" sane_backends_${GBACKEND}"
+ ;;
+ *)
+ IUSE+=" +sane_backends_${GBACKEND}"
+ esac
+done
+
+REQUIRED_USE="
+ sane_backends_escl? ( zeroconf )
+ sane_backends_kvs40xx? ( threads )
+ sane_backends_mustek_usb2? ( threads )
+"
+
+MY_PN=${PN//sane-/}
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Scanner Access Now Easy - Backends"
+HOMEPAGE="http://www.sane-project.org/"
+SRC_URI="https://gitlab.com/sane-project/backends/-/archive/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
+RDEPEND="
+ gphoto2? (
+ >=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
+ >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
+ )
+ sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+ sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+ sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+ sane_backends_dell1600n_net? (
+ >=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}]
+ >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
+ )
+ sane_backends_escl? (
+ net-dns/avahi[${MULTILIB_USEDEP}]
+ net-misc/curl[${MULTILIB_USEDEP}]
+ )
+ sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+ sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+ sane_backends_pixma? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+ snmp? ( net-analyzer/net-snmp:0= )
+ systemd? ( sys-apps/systemd:0= )
+ usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] )
+ v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+ xinetd? ( sys-apps/xinetd )
+ zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+ dev-libs/libxml2
+ v4l? ( sys-kernel/linux-headers )
+"
+BDEPEND="
+ sys-devel/autoconf-archive
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch
+ "${FILESDIR}"/${PN}-1.0.27-disable-usb-tests.patch
+ "${FILESDIR}"/${P}-missing-stdint-include.patch
+ "${FILESDIR}"/${PN}-1.0.30-add_hpaio_epkowa_dll.conf.patch
+ "${FILESDIR}"/${PN}-1.0.30-bigendian-depth.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/sane-config
+)
+
+pkg_setup() {
+ enewgroup scanner
+ enewuser saned -1 -1 -1 scanner
+}
+
+src_prepare() {
+ default
+
+ # Patch out the git reference so we can run eautoreconf
+ sed -i -e "s/m4_esyscmd_s(\[git describe --dirty\])/${PV}/" configure.ac || die
+ eautoreconf
+
+ # Fix for "make check". Upstream sometimes forgets to update this.
+ local ver=$(./configure --version | awk '{print $NF; exit 0}')
+ sed -i \
+ -e "/by sane-desc 3.5 from sane-backends/s:sane-backends .*:sane-backends ${ver}:" \
+ testsuite/tools/data/html* || die
+
+}
+
+src_configure() {
+ # From Fedora
+ append-flags -fno-strict-aliasing
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ # the blank is intended - an empty string would result in building ALL backends.
+ local lbackends=" "
+
+ use gphoto2 && lbackends="gphoto2"
+ use v4l && lbackends="${lbackends} v4l"
+ for backend in ${IUSE_SANE_BACKENDS}; do
+ if use "sane_backends_${backend}" && [ ${backend} != pnm ]; then
+ lbackends="${lbackends} ${backend}"
+ fi
+ done
+
+ local myconf=(
+ $(use_with usb)
+ $(multilib_native_use_with snmp)
+ )
+
+ # you can only enable this backend, not disable it...
+ if use sane_backends_pnm; then
+ myconf+=( --enable-pnm-backend )
+ fi
+ if use sane_backends_mustek_pp; then
+ myconf+=( --enable-parport-directio )
+ fi
+ if ! { use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp; }; then
+ myconf+=( sane_cv_use_libieee1284=no )
+ fi
+
+ # relative path must be used for tests to work properly
+ # All distributions pass --disable-locking because /var/lock/sane/ would be a world-writable directory
+ # --without-api-spec to not automagically depend on tons of stuff
+ # that break in many ways, bug #636202, #668232, #668350
+ # People can refer to the "Programmer's Documentation" at http://www.sane-project.org/docs.html
+ ECONF_SOURCE=${S} \
+ SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
+ BACKENDS="${lbackends}" \
+ econf \
+ --disable-locking \
+ --without-api-spec \
+ $(use_with gphoto2) \
+ $(multilib_native_use_with systemd) \
+ $(use_with v4l) \
+ $(use_enable ipv6) \
+ $(use_enable threads pthread) \
+ $(use_enable zeroconf avahi) \
+ "${myconf[@]}"
+}
+
+multilib_src_compile() {
+ emake VARTEXFONTS="${T}/fonts"
+
+ if tc-is-cross-compiler; then
+ pushd "${BUILD_DIR}"/tools >/dev/null || die
+
+ # The build system sucks and doesn't handle this properly.
+ # https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366
+ tc-export_build_env BUILD_CC
+ ${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \
+ -I. -I../include -I"${S}"/include \
+ "${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \
+ "${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die
+ local dirs=( hal hotplug hotplug-ng udev )
+ local targets=(
+ hal/libsane.fdi
+ hotplug/libsane.usermap
+ hotplug-ng/libsane.db
+ udev/libsane.rules
+ )
+ mkdir -p "${dirs[@]}" || die
+ emake "${targets[@]}"
+
+ popd >/dev/null || die
+ fi
+
+ if use usb; then
+ sed -i -e '/^$/d' \
+ tools/hotplug/libsane.usermap || die
+ fi
+}
+
+multilib_src_install() {
+ emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \
+ docdir="${EPREFIX}"/usr/share/doc/${PF}
+
+ if multilib_is_native_abi; then
+ if use usb; then
+ insinto /etc/hotplug/usb
+ doins tools/hotplug/libsane.usermap
+ fi
+
+ udev_newrules tools/udev/libsane.rules 41-libsane.rules
+ insinto "/usr/share/pkgconfig"
+ doins tools/sane-backends.pc
+ fi
+}
+
+multilib_src_install_all() {
+ keepdir /var/lib/lock/sane
+ fowners root:scanner /var/lib/lock/sane
+ fperms g+w /var/lib/lock/sane
+ dodir /etc/env.d
+
+ if use systemd; then
+ systemd_newunit "${FILESDIR}"/saned_at.service "saned@.service"
+ systemd_newunit "${FILESDIR}"/saned.socket saned.socket
+ fi
+
+ if use usb; then
+ exeinto /etc/hotplug/usb
+ doexe tools/hotplug/libusbscanner
+ newdoc tools/hotplug/README README.hotplug
+ fi
+
+ dodoc NEWS AUTHORS PROBLEMS README README.linux
+ find "${D}" -name '*.la' -delete || die
+
+ if use xinetd; then
+ insinto /etc/xinetd.d
+ doins "${FILESDIR}"/saned
+ fi
+
+ newinitd "${FILESDIR}"/saned.initd saned
+ newconfd "${FILESDIR}"/saned.confd saned
+}
+
+pkg_postinst() {
+ elog "Optional backends:"
+ optfeature "Epson-specific backend" media-gfx/iscan
+ optfeature "HP-specific backend" net-print/hplip
+
+ if use xinetd; then
+ elog "If you want remote clients to connect, edit"
+ elog "/etc/sane.d/saned.conf and /etc/hosts.allow"
+ fi
+
+ if ! use systemd; then
+ elog "If you are using a USB scanner, add all users who want"
+ elog "to access your scanner to the \"scanner\" group."
+ fi
+}
diff --git a/media-gfx/scrot/Manifest b/media-gfx/scrot/Manifest
index fe63cc331577..0aaccb32ac24 100644
--- a/media-gfx/scrot/Manifest
+++ b/media-gfx/scrot/Manifest
@@ -1,4 +1,5 @@
AUX scrot-1.2.bash-completion 1990 BLAKE2B 6c99578185f7d69581854372344088398279af8227fccccff07dcb590ae1a90d6ef9122ba3cf02b0db634fe68554818e63d1cfa54bae0fb1ccb65cf0f84769b4 SHA512 76880911e6799894d68aae78313a114fc18c6bf2f0411a0fdce3f30d33c8ff266290aed9570a546c3a05a71503a130c5cbe2cb6e0f92c240edbc8e9f19362db4
+AUX scrot-9999-Xcursor.patch 594 BLAKE2B 6687cb0cb3640dabf7fa949639c908be2375a191a18872ed300a0524ec00b8a24e049583e367b470615025ba794ea0e1caef2b41e41959cf870211a0b15be1f6 SHA512 afcb6ffef4239c9a21d7e104efaa318261ee2600596c1762472078b41bd713dc1111428904fcb7329fde84f535d99eb334a169a5cd502bf85a7a514d2f291955
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
@@ -7,5 +8,5 @@ DIST scrot_0.8.orig.tar.gz 74324 BLAKE2B 56facc81c29f101279ffc6d5d323a0cecd32b1f
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-9999.ebuild 893 BLAKE2B b294cc0496f809a4066f2ddc84687a71b0dc5967dc09460e1dc1477f1d0a519051da24f6504afbdd2d57d66377e8d07178356c261fff7d7a9233b1d6795a1ef7 SHA512 10ee5b7d2afce6b7cf006575b25c71727854899032591725a22c9594e33821ceb2294398153eec59e5e7ff826b0f570e70ff676c5b0f292ea87ae3d6654eb00d
+EBUILD scrot-9999.ebuild 948 BLAKE2B 2a136ad3c3791d8d7a189f0becd731cdb87737f0574897813dd12084d8567b71a80a31c07a5d21b178327a6e283c065eac715d4dab0132600649ee0fd095756d SHA512 2bef97380ce7621fca3fc0af655baf3e47df4f4b73674d26000c4636cbc95f090bb0f4dbb655cba6ba88711282f8784100c1738fff9445adfc68217aee955087
MISC metadata.xml 211 BLAKE2B 3e8296d37e4cf92be5d17d7f263807fad2fc9685607894f9f269f3123987c3baeff7fce17f80480419fb68f2eac48919541cd7aaa21de659d95dd647e05ade48 SHA512 58d7fc7dd62d18c69c3b30062d76c291bc795b7a53804d1380fc49ed6f6a4389805c327633297b9c56c40cbae9a6e5608e12d8a64c01e370954e551246c4b486
diff --git a/media-gfx/scrot/files/scrot-9999-Xcursor.patch b/media-gfx/scrot/files/scrot-9999-Xcursor.patch
new file mode 100644
index 000000000000..dbb935219b35
--- /dev/null
+++ b/media-gfx/scrot/files/scrot-9999-Xcursor.patch
@@ -0,0 +1,18 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -34,4 +34,4 @@
+ bin_PROGRAMS = scrot
+ scrot_SOURCES = main.c getopt.c getopt1.c getopt.h scrot.h \
+ options.c options.h debug.h imlib.c structs.h note.c note.h
+-scrot_LDADD = -lX11 -lXfixes -lXcursor -lXcomposite @GIBLIB_LIBS@
++scrot_LDADD = -lX11 -lXfixes -lXcomposite @GIBLIB_LIBS@
+--- a/src/scrot.h
++++ b/src/scrot.h
+@@ -40,7 +40,6 @@
+ #include <X11/cursorfont.h>
+ #include <X11/extensions/Xfixes.h>
+ #include <X11/extensions/Xcomposite.h>
+-#include <X11/Xcursor/Xcursor.h>
+
+ #include <stdio.h>
+ #include <string.h>
diff --git a/media-gfx/scrot/scrot-9999.ebuild b/media-gfx/scrot/scrot-9999.ebuild
index a3ef577a9be9..82d865e83c56 100644
--- a/media-gfx/scrot/scrot-9999.ebuild
+++ b/media-gfx/scrot/scrot-9999.ebuild
@@ -15,7 +15,7 @@ KEYWORDS=""
RDEPEND="
>=media-libs/giblib-1.2.3
x11-libs/libX11
- x11-libs/libXcursor
+ x11-libs/libXcomposite
x11-libs/libXfixes
|| (
media-libs/imlib2[gif]
@@ -31,6 +31,9 @@ DEPEND="
DOCS=(
AUTHORS ChangeLog CONTRIBUTING.md README.md TODO
)
+PATCHES=(
+ "${FILESDIR}"/${PN}-9999-Xcursor.patch
+)
src_prepare() {
sed -i -e 's#-g -O3##g' src/Makefile.am || die
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index 109002185826..8f7a3a62d20d 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,5 +1,5 @@
DIST shotwell-0.30.8.tar.xz 6460512 BLAKE2B aecdfa8d90bcce19c38a55872671f6521d8808fa46decba4e9910392f9f8907dd99aaecc825f4e3f6ae747ab151bf5bfa3a807364d571db0fc2ddcaad9a492f5 SHA512 dccd496a083145283c79250329f88fdfe526a98ce84b6d1c52a9c48c9e52a4749bdf2449f3102474c994ef1e687e06767b9bcda03ea97d1168d3417743a6e866
DIST shotwell-0.30.9.tar.xz 6465508 BLAKE2B 9b302d156b350d5cfa961afaa5d75e71db8b34a65a27de0d3b298841ca9be96d502dc98c85c681ca336965fce72db8034609f3f9c6c04fea1127db6c397e6499 SHA512 a232d717356d7e9f0a6b1ad825f4182dd9f6ee4cca9745717e3bd18ded03cdaba94c32256d055389ce2b0cda0c5828b25d1448c10598a474dc3ea0817fc303ee
EBUILD shotwell-0.30.8-r1.ebuild 1783 BLAKE2B ea068d6335d7b5d4af0fef2bb571275f0218d384fb118706a948e79177814d6062cb2990ecb43fcf62352986d9f8fae0d02c0318c3481b1277d24524573f90d6 SHA512 c90464d3bd7749d57b3a36aa6352cea07ac47a487c0e7317d1717fb53cfc183dbcb438a22f0314b73d43a31b9555f08acad4eb27d73046d030ef6f3e041d6be4
-EBUILD shotwell-0.30.9.ebuild 1782 BLAKE2B 84211b71a3a4747a7cc42f7d8b2b5e873bdea2ef8abe7fd7b4ae1e3ac9cab0fdafe1de78a7ab09ae7b40d0591c78f715fb447ce3df86c7dbae80a2d758229bbf SHA512 02cb56548ebe4d6fe3efbedf31a5c6d02cb7f5424bc595f46dde6be8390bfb99dd58eb68b1b147bdb3d64cd893d083bbf877fa75ed2c9ec582b00865fe03fa9c
+EBUILD shotwell-0.30.9.ebuild 1781 BLAKE2B 32ec5d04a0b5050020cbe21753e780d67ae4ab47bd328d5b22136bd5c7215de6fc37b08e1b3f73508526b81d823ef40b699412048e34be11f7c6f041b00462f9 SHA512 210eeeac54dd43f26b7129f7d6ada56ffa823d526181823cb7729e8ff33101c22385588eb9a99ebb0c0fbb6003d4721683df9bfa8447e37ad7702ecfbe92bac5
MISC metadata.xml 795 BLAKE2B 4b5da2cc205b128a0cb9d10a50c3743b8d12302d266e37d5e0479915824af75af8c22b7b12ffca57146aa0a999e2bff3d7c4969af9e19f317a70b9195b02333f SHA512 d3ceceeed90fd4cadd5e212d047b3d6f7882860d145cb80521a4db8e9baaf461910ff70cb5bb2c1cda991939bf2c8917bb7f252bf68c7487d40271b0419c6322
diff --git a/media-gfx/shotwell/shotwell-0.30.9.ebuild b/media-gfx/shotwell/shotwell-0.30.9.ebuild
index 905397252718..e79822b715c4 100644
--- a/media-gfx/shotwell/shotwell-0.30.9.ebuild
+++ b/media-gfx/shotwell/shotwell-0.30.9.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
IUSE="opencv udev"
DEPEND="
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 682352083089..c1651a3bbec7 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -2,5 +2,5 @@ AUX 3.26-add-control-optional-deps.patch 2773 BLAKE2B e6c3faa98ecda13c926752defe
DIST simple-scan-3.34.4.tar.xz 795228 BLAKE2B b6f185bfbc1954ae2573fd1dcfa54f67e26290654c1019bfd34c229235e27cfc1eb40de0e6d5249f97b73c57745e1133fbd6fd1c3f9bdedb795b61068d5ed25d SHA512 b16b653e0a8ce399ecbdb88c4663d7780793518809eb73681c9c6281b9cde784167090c41720b21c184b9fdece28b07ba61fe8a97f10d792cc7326a458741ba4
DIST simple-scan-3.34.6.tar.xz 801064 BLAKE2B 94c6bc386c2d7701bd13067e384eb294ce145d2e02d66e366e76a2c85fb5e3ac4e9bae0efa37fe13d3fc857b57c1730bf01961f7968d6744a4ea4dc47308cb23 SHA512 7b2d0eab13f08d4110d2143c4572e249297891e3868e6eb178a7a765b2d56960820931fbda538ede318014c578871657aa0e27518d184f861efc18ad4fdd900c
EBUILD simple-scan-3.34.4.ebuild 1322 BLAKE2B b6359d130e933254fa3e5350ebb2ac562d4682f5c1af219f07321202e3deab61adf6dc9cd34e1dbbc3a04b0211ed091273e494692fadceca6a52bfebd1383c04 SHA512 16e305af51c31b4f775de7b4afe58cbe7ca51622dfa073c890a3e179b83a5f5853d333042aad26a738fbb19253621cc347e7b8a0984717fa2d04629443a9d219
-EBUILD simple-scan-3.34.6.ebuild 1329 BLAKE2B 21944ee06e8464b55a1ff8240f6e0c8816fb736093614b698ba7a964e013214aec8c3c010867dc7c3d5ac6688d8a21cb2d0a457dcbfd033d0e41bc203551d908 SHA512 accbc4335878c4c83b2e9dd98821fd5594683456750f3f169d38c261f6c4410f9b09856cd2c78d84df50787f1aa70446704f5ef567a145a252569b2d7af19362
+EBUILD simple-scan-3.34.6.ebuild 1328 BLAKE2B dc23bc08fb3b54ca3493340fc40a10482f496d23e5311320369c9c5cf69268b0e037190fd6b853beddb5a3edc171b50093da9f14347e0cdc437292bbb9d8618a SHA512 1df4ff44d691a37f51ea67782cdd23594aaaa0aa5bf294c793652817d5ebea3115a15900ff0c5a83ee31011db19aa7a52421119b9a43ebe09c047046d73ba4b8
MISC metadata.xml 616 BLAKE2B 576d986402f8cc708eae60f661640808751747c764d5fe729dd014f33758e0b484a2b80a214d9a3d1ed4bce7e455e34803a62048240e5de8e203184446cdc0df SHA512 6377cb9c20b1ce2db22ba959d386e4389939b72503d87da956d659144b8a6f8b521abdd19dd4c82ac0cb32e260ce6633b75136a353f63b86593f5e1f12394d47
diff --git a/media-gfx/simple-scan/simple-scan-3.34.6.ebuild b/media-gfx/simple-scan/simple-scan-3.34.6.ebuild
index a7a3d720bbeb..7735d1a8248f 100644
--- a/media-gfx/simple-scan/simple-scan-3.34.6.ebuild
+++ b/media-gfx/simple-scan/simple-scan-3.34.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 x86"
IUSE="colord webp"
DEPEND="
diff --git a/media-gfx/xdot/Manifest b/media-gfx/xdot/Manifest
index cf4651d403c0..fc97c960363f 100644
--- a/media-gfx/xdot/Manifest
+++ b/media-gfx/xdot/Manifest
@@ -1,4 +1,4 @@
DIST xdot-1.1.tar.gz 134215 BLAKE2B e241a4fb1ec69a8613f7813dc159761e6bffb82ea9f58876287d01946f4c93e66e5eef66e6844abb7738979412c2c7d2d26f76bc0563ad0c3c8550d9e8023b47 SHA512 d67c45c8c071013551f79d671a21ce546b680fac5997ba9631a882ffa3c44c15a69949643ed5e8211417006152575a1d99450ccfb6062427521d1e2bc0814f55
-EBUILD xdot-1.1.ebuild 1130 BLAKE2B 643ba4bae26a1f433b26709c4dd8761ac8bc8b0d44295d805e927fa5babf3a21ca7b805091f58f2c43570ddc293750b14d8d314643a055a65b7bd7ec759256b8 SHA512 1da4a96976c1d0928648e4c99a774366025373368b6e45a1500557cb63b3fc384d18432c906bb63565303f2fc5470941b2343f4f25ffa254630c06587ce81f73
+EBUILD xdot-1.1.ebuild 1129 BLAKE2B 6316813447e8d0588018c93955c2bed5012df4669ce17b885122d267b512cdc65b2196a443a3398591e7b4063b58d0faed989f1d0ede51c269ecd333e81af031 SHA512 c73f5b741eac3a227435408eb57bb73dd832bb6e62217edd01a41ad9b285f2dccebed50ca976043053dd115568d7db8622e7e23576fe5bba6bad83e7cff613fe
EBUILD xdot-9999.ebuild 1102 BLAKE2B 154a7034a320211af04a977697e0e8fd7ea53ab37de9ef0e5d34fc60f13ab8c7e8861c1d4e24ae8a0a2a2e727ab3cd57070338ce058f693946eacfc98e7b2ef7 SHA512 86d2c030cadded62e64e90466ade5733919487fb07e816b089e6cd98f88345ad5f0d00460e47dac10dbe536c84292b347e3b916e12fafa6c97448759ca92daed
MISC metadata.xml 483 BLAKE2B 50b03bb7d189da9bd6ca793f30c1ba3d13d12151533b42c99321a849515d7664398ec1b10720596c0453c48d35e2a6083b0559eb127199e1d6f4fc2a93aa04c4 SHA512 7e734dd60daa1e74b28f0932f508787e8deebc75a8f46c41f77007b6c8f96751cd6b07f6638cb89b38eb81d4fd2c6f7ba9f6d449f24f17ad25fb001d7f4f5ff7
diff --git a/media-gfx/xdot/xdot-1.1.ebuild b/media-gfx/xdot/xdot-1.1.ebuild
index e7945acb3221..ab6cb8df3ba5 100644
--- a/media-gfx/xdot/xdot-1.1.ebuild
+++ b/media-gfx/xdot/xdot-1.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
GIT_ECLASS="git-r3"
SRC_URI=""
else
- KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
+ KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
MY_P="${MY_PN}-${PV}"
S="${WORKDIR}/${MY_P}"
SRC_URI="https://github.com/jrfonseca/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"