gentoo resync : 08.06.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-06-08 09:04:53 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-06-08 09:04:53 +0100
commit: 73c318acdaf6f8309d68bd266051e6dd1f1bd787 (patch)
tree: 2878053f3e7faed19a1f82c733d3bd29df69991e /media-gfx
parent: 2018227e9344edb9da15fc6a4a8298086cc2aa77 (diff)
50 files changed, 132 insertions, 1491 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 7b17b5da7d6f..3eba255158e2 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/album/Manifest b/media-gfx/album/Manifest
index 828c953603e3..0e26f276d9c5 100644
--- a/media-gfx/album/Manifest
+++ b/media-gfx/album/Manifest
@@ -2,5 +2,5 @@ DIST album-4.07.tar.gz 619238 BLAKE2B 2d3ddfc08fbc5852f9d49ef687fb5360f832588de9
 DIST album-4.13.tar.gz 667760 BLAKE2B fa4bd75147d708c18f183787fb62d55a068956204dab249ca2652583421fd444ff6fbbce54e16f02072534050c52c67dabe3c4e6fc977c6aff7317a0df9357d4 SHA512 c22bbc5ad154f35d50d28e5331911d0fd32c5e7f25b659e48274baa1ccc9e3e8b9f771a1bfdf39078c9e959c3fd84b3ccd8528f20f7a80baa7c59bc579579756
 DIST data-4.05.tar.gz 6468036 BLAKE2B 3e11911dabcf024934653f5fb5c3c3b65bd2ad5e6607c67ee1dade392540bb0b7c90de521effa5d72d2f40dc6c02016e23d373f714a3b62c15af53ebb4d438d3 SHA512 a7c577df6d10dc2db53fa6d469d2cf9c5115de99df47e79f31ecc0b009bd12e654e4ca7b9e6e78abe90a8a87d5f52ca9946a2d632e3f219d9bcb5ab7838ce42e
 EBUILD album-4.07.ebuild 898 BLAKE2B 7bd2dd060bed7655f159eaa858da473f9b40da8886777cd22ca3302a26ab3c9d378d0501ccf7eff792c3abd837a904878f6901f7e36392981127c3d6a54c3062 SHA512 ad9aae9a19a84cfe0afb7ad39950025e435abfc3d3ff7d09122801975ea70c436973ecab74ec2fe9bc4717ae216c062d17aefce86e6520db4ae5b4fae90a0964
-EBUILD album-4.13-r1.ebuild 900 BLAKE2B d982adcf646ef7dd78dc44ce145320f25835a616057a6a06e85273da38e0028d1c2152d92f704aa471a810e9e2fd56ed1a8329d3f7f85844bd72feeec4e1b96a SHA512 73f631c122bc6656a9039b770047111a75d5bab9d535d95ab3106661844f842a9292eb14157b420e7fec3e128952cfc2e3ce55d486debd578f2d26af27f4b6e3
+EBUILD album-4.13-r1.ebuild 899 BLAKE2B ec2ec1d85335f477a07fdb0b5d5c69cea71593db8515e9d28d41514601c4accc23fc9719b018d03ff313390109824413517d491337a3d9facd99ef22e935b6e1 SHA512 459d5f73f0229da36a2ad154acbb4afc6c7b93e7a0691672c07a9bff297a50ee926c7e641bdd7219bdf541243fcf60777e6f81ad58892d8384bc567cd5025fea
 MISC metadata.xml 374 BLAKE2B 05c713b2922350914356e8a0073f22c635b6c1b84bd6d0dd8031b0515fba8580da54636e1e75dd4bfd903fd10b3f465cfbda325e4e826bffee3a40badd9cf8e8 SHA512 b0e38d10966a2d98b1f8d8235e9f8c96c294037e503179531e795ffedcf8517ddcab991d692fc7dae7d64e354510a36e07671fb216b94a62b3d78c938667d530
diff --git a/media-gfx/album/album-4.13-r1.ebuild b/media-gfx/album/album-4.13-r1.ebuild
index f80081ce44d4..8b5500e20dd0 100644
--- a/media-gfx/album/album-4.13-r1.ebuild
+++ b/media-gfx/album/album-4.13-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://marginalhacks.com/bin/album.versions/${P}.tar.gz
 
 LICENSE="marginalhacks"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="doc ffmpeg plugins themes"
 
 DEPEND=""
diff --git a/media-gfx/apngasm/Manifest b/media-gfx/apngasm/Manifest
index 0990a5ef2c50..076960af9f7b 100644
--- a/media-gfx/apngasm/Manifest
+++ b/media-gfx/apngasm/Manifest
@@ -3,5 +3,5 @@ AUX apngasm-2.91-makefile.patch 585 BLAKE2B 8972e2c3b59f4d128f522309496ed643046a
 DIST apngasm-2.7-src.zip 11448 BLAKE2B 848a5c9be65bacb3297c9f0b54235f2143be91840c5f0730c0c7bd1c6d273855d730eb9722860f7543eb6e57e8ace5b775f73f5789ee6814f5d62fec02bd2b14 SHA512 28ec70a4ac02021ff85390ad6863aaca5451937209345128ecd5baf76bef9495168c3c4ee5d823afbeb569ca673328673a81b807e7985c3d5d1843c056af7810
 DIST apngasm-2.91-src.zip 597267 BLAKE2B a34a765fef49aa0ac29973b8dc450bfcdfe7aa83dffe19919f916a136db3d0bfebf3c1fac79bfb81a3900cee87afd888469e5432500d181a9539696b4573a42b SHA512 2415389a989f7a7ff7f3e1328f7920c7515c9a492c89ef216ff53db68fe2f1a674ff60d5f4bfd5a8c710f625456557ae7d5b25f486ac826e3113976cd9fc11dc
 EBUILD apngasm-2.7.ebuild 716 BLAKE2B 4107ecdef38e348c4df536a50b4d5646082d7dd19f801326f312d3e6bb13867a4f33cf72a24fe1d0c88df236d911d1d137a41d546fb484caa29485516e6ed714 SHA512 52952bcdc1e070979037174b0477ec6f51c661368f436282eb3556db4a10b63c593e607b284d52ad7ba29ef6732d8b6714a56ed4b2ee310c4b728b6698d09df1
-EBUILD apngasm-2.91.ebuild 975 BLAKE2B 24f0a278d33b6c7c3290ad761e73f693c71da0907277c0e6128638c111bbf2547dd156698d2b233aa16cc89dc414720c0a56a04270004a9e04b196fbbd00930c SHA512 33936f15560a7ff38f6c902a201d6ff6c5afba3617da5bd822d5825e517531753a8f987615ca71bf11e9687ea1739a302fbcbcfdf75f9a3aa0d84a04bdc5d962
+EBUILD apngasm-2.91.ebuild 974 BLAKE2B 40fa7aad5e2fde3388968668a956a1adc6a161de1e32271334a4f938f82adf5665e37ff77db5c56f97e757bb1f5c326cccb1f6085fa6d82e80e1f66625802480 SHA512 0f5a60881ca232d9efea50d3feda4501e5394a52e0411addc61171d248e8b8b309936c8e59ba10bc2104138268f5b9418a7408852861f013d254fc3f63b0bd55
 MISC metadata.xml 479 BLAKE2B 9307c8ff6da1b0010362d8bdb070e6de22c15ba492e71890882adb87c849bd7e3a639bdf8b0d278b0c2df3894f50a71ade73970daba7573b1b4ea968baa5e2e0 SHA512 a630460ee809f9bb4e7ac231cf5d53b9b560926eb515d9a698a1e2d5f6f4318f771cf77e3f47f256b7458a9b1dba67bbc654cf6f9d4bd9e194490b2cd32c8e31
diff --git a/media-gfx/apngasm/apngasm-2.91.ebuild b/media-gfx/apngasm/apngasm-2.91.ebuild
index 166900714da3..f9c2fdf64fb9 100644
--- a/media-gfx/apngasm/apngasm-2.91.ebuild
+++ b/media-gfx/apngasm/apngasm-2.91.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-src.zip"
 
 LICENSE="ZLIB 7z? ( LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="7z zopfli"
 
 RDEPEND="media-libs/libpng:0=[apng]
diff --git a/media-gfx/argyllcms/Manifest b/media-gfx/argyllcms/Manifest
index 21cba16065e3..1094b91d7a32 100644
--- a/media-gfx/argyllcms/Manifest
+++ b/media-gfx/argyllcms/Manifest
@@ -9,5 +9,5 @@ EBUILD argyllcms-2.0.0.ebuild 2042 BLAKE2B 2d8c8f9bdaffd551fd69ccd2ba9d7ec26055f
 EBUILD argyllcms-2.0.1.ebuild 2042 BLAKE2B f9560bb31b6f74a37bb7fbe3927ffe8d7435a8057f109f976e9fe8dd433703393a7ca5ffdb086e287ace418093a01ba89d720a6e90aea68819d9d485a0031b4a SHA512 825b1047f6a2c8b49e175442b1cd6f85831527d852ddddee12f0e8bdf119a3234afd672c19b96583f8c18f06e70bbfe19feef9a04ff81eef9398c9261a3d31e7
 EBUILD argyllcms-2.1.0.ebuild 2032 BLAKE2B ab27af1801046c31cce2b24267e3ad372ec5fce441cf4a42b5981bb278d6499178c76c188c935b12db27f0138019a68a4366de7891f0c3a8eb2106696b9a0200 SHA512 430d091e3421deee3fc1a5ab53ba549f677d143cbc5ccfffbc7434bf2b24d5017554b4eaf06895d0124a5c28adb19acf88401d974b2d385057054af0557b596b
 EBUILD argyllcms-2.1.1-r1.ebuild 2113 BLAKE2B 7491a7a5fccb9ca0675dced451e2d8c88b804f279e19eb53c0e6afe8a64c415ae0d9b954428f490d1050e86ff01ad8ff74bbc133b6a189951336c65a6c44cbb3 SHA512 f4180c02dcc2997607ffea5e174626609809a08346b6c65c7f51cb79c2e57eff5de83909855a35712b9d5f055d2ece7cfdafc6af2b9ed0c63ab9570f3cd7bd44
-EBUILD argyllcms-2.1.1.ebuild 2052 BLAKE2B 6812bdc9650f94cb577b901a513849bfedd7403069f4e013991aed46aeddcf80942bb989500a9cae5ce91a49a6fbac54142c525a14d0623c892a4d67eb2615a1 SHA512 267a3532a37275bea029f42f690c10f2776d9aea50b53431354b89d449e8f88d5c7308f4d707f9a158680d5666e044f61bb4b611e90374024fdfa3410c17c62e
+EBUILD argyllcms-2.1.1.ebuild 2050 BLAKE2B 92204e6e2a427224c77fe4762bb7d138861c870f1a8c8761a1295baafa1473ac562c0f3bc99fde43440819b526fb6bfe7c0a4b574073e052e7a610d0807b6413 SHA512 57a0ad600bc0ca92258732d368920b8b94b1e2dd3e13a452d06a6a12a04a82f954b18e33e7dfe99b6bbe03b5a7d3240e27782893bdc96ea10c98bc05c2421238
 MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/media-gfx/argyllcms/argyllcms-2.1.1.ebuild b/media-gfx/argyllcms/argyllcms-2.1.1.ebuild
index 13a4b210e34c..b3844f4daa87 100644
--- a/media-gfx/argyllcms/argyllcms-2.1.1.ebuild
+++ b/media-gfx/argyllcms/argyllcms-2.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 hppa ~x86"
+KEYWORDS="amd64 ~arm64 hppa x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 36ed0c13b794..7dcd6f304e21 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,10 +1,6 @@
-AUX blender-2.79-fix-build-with-OSL-1.9.x.patch 1119 BLAKE2B f0289707d5383ee11af257b7d77a725e83aba3c086c12a4a2fb390bb5e02a27c4f3376083ddfd827e3ff3ca24212df4ea463062c6bea524aaee373847837986e SHA512 0a02efdcc6710d34e57ff99ff5c999cebeb7cf130fba76fa82ba29f0827ee63c97448eb01aa10982096d22b61fbc1751be5e1fe3154792e266b0c9dd04c54f42
 AUX blender-2.79b-ffmpeg-4-compat.patch 2052 BLAKE2B 3e9f341416a3dc629d950623cc54da4c2984c7f73b6565cb7cb0aa00bf86eec725f0fdc503a517b29282596669de108d1dbe2c9783c8a0da412a6d14834d5cdf SHA512 afd90ee52a2a7d955417450e92642e2169c1f0e6d20d96a1f08521db718bc224941c15d23152eb3fcde1b4dc84ffb52162d77b23252ef8250a6b5ddbcd8ca67d
 AUX blender-2.79b-gcc-8.patch 1259 BLAKE2B 7d204a953c71e656fb309e0560e2de03a9316a95e67a76ecdeb303fadeeca14338ba823d6780a50b62bf4686477a962030b42b15ceae12d48ab21034b0358cc1 SHA512 df0a6a0543a7feac22e6082652792e59ce675dcea99a821c480d5c13e42e9df4d7ab43c71d296a22dd195771714e630757b1e220177d3713f409ea21e9251504
 AUX blender-fix-install-rules.patch 518 BLAKE2B 178929de7adb1b4a0063134da93248af8c2c42fe0d3e9730833272b4fe8387075ce592ee65668cc9862a1ad10c9857a31b3f1c0614c9e69f937998ccb5c86a17 SHA512 5343f0e9e6bba2d15a38cb5db95a1aeff0a704c0762e558b9b74d88dd58e2fb5077289f0d8f25a61fa092d083f7db916d27c4642dfd7cf84d4c989258c3253ec
-DIST blender-2.79.tar.gz 50145270 BLAKE2B 5c11b36840d4bf4a414f01d1f8efcbfb2879ce56c9e2ebe32d8bb0be3ce29fd194dec8b3aa5bca9bf664804c1be57d01394494fdfebc7a4d8257bd2c47866338 SHA512 9b81c41882f4e150476ebda5b301b78c2d35ea918394c8a01671fc031f7cb7a34b5a3d68b6a345f6d23fd9ecedd25bc0bd24f9f9b3ec771237ac4496bbde7d2f
 DIST blender-2.79b.tar.gz 50204270 BLAKE2B 78bda294df783ee9bcbcf32f9a112737b2947da5146fd4351b8b36d81c6630ed0ea302b2fb539642cfbdcc4b64df35af5c8545a3bbf50b1cf87dcf3a60eb4ac0 SHA512 2db21ace446168dd683cdb5aad9dec001f8888ae4e9603a04ddb44fb78489ded827deb07e83712b0f1118a0e7bf66f2a5d935dc4ebb3a6703d72672ff414367f
-EBUILD blender-2.79-r1.ebuild 8100 BLAKE2B 7c077c8d3847fa0d7b881b5f5989e42339574b7104bc78869c8e481073b1e6ca062e5a74233f0b96b9ff6b1390f1cc0f203038e733223ddf21b796e696ba508b SHA512 9af0b9f17969a6601c3945fbe3d3d10dc6707df0c88e86e1c2f1617e9b750019a21d05cecab5e726069b9908ba6345d2e190732d3960bbb87674d1f983e311ee
-EBUILD blender-2.79.ebuild 8049 BLAKE2B b4effa99e23ee172e685dff46235c88aecf129a40ab4e01a7b8dd0fb4993e52849c5ebbc712ff63999176644ea9027e572b1f21f4838d31845a525d09d396bbd SHA512 7b660679c69df11a108e58e76cc2e950843bf0285e962cf1f776b3cabf8e7b187ab65984ff6e4bd85120347489d10853ab163d916a4f1c833d890112dd2692c6
 EBUILD blender-2.79b-r1.ebuild 8163 BLAKE2B cfa1181a4044655d55606a1ab20105aa41b629671e6c6ae7ab501f7de199a4369b07a100a33ff9a0caa33869e57ceadeb5ec0976aa32e7f0fb336efa2b8de4b3 SHA512 705967cd0c67a2185f17fb335320dfc5b69c605c6e6615a1b84aa7073a3bf9c34adbf0b43d90707e54bba1219b5472eb320aa22f6897afa1a9ac0b6fcb1860eb
 MISC metadata.xml 2642 BLAKE2B 9575416eeb3ef81373e60263e095b5dcd441b710945775ae3a79c1bfd5b511e15751d37c0e9f6833d2e7de9f39d628a1e3c6c91707b3ee1573e64e8e1ae4b874 SHA512 0bc219e6065e76753c1dbe1aeee7c277d29e6574db388994e2dac13ecf4837233155e4c319bf41f484c7341a074dc2b60dd0b86a350ac438504205c555761b4f
diff --git a/media-gfx/blender/blender-2.79-r1.ebuild b/media-gfx/blender/blender-2.79-r1.ebuild
deleted file mode 100644
index 2db487bd238b..000000000000
--- a/media-gfx/blender/blender-2.79-r1.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6} )
-
-inherit check-reqs cmake-utils xdg-utils flag-o-matic gnome2-utils \
-	pax-utils python-single-r1 toolchain-funcs versionator
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="https://www.blender.org"
-
-SRC_URI="https://download.blender.org/source/${P}.tar.gz"
-
-# Blender can have letters in the version string,
-# so strip of the letter if it exists.
-MY_PV="$(get_version_component_range 1-2)"
-
-SLOT="0"
-LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="amd64 ~x86"
-IUSE="+bullet +dds +elbeem +game-engine +openexr collada colorio \
-	cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k libav \
-	llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb \
-	osl player sdl sndfile test tiff valgrind"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	player? ( game-engine !headless )
-	cuda? ( cycles )
-	cycles? ( openexr tiff openimageio )
-	opencl? ( cycles )
-	osl? ( cycles llvm )"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/boost-1.62:=[nls?,threads(+)]
-	dev-libs/lzo:2
-	>=dev-python/numpy-1.10.1[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	media-libs/freetype
-	media-libs/glew:*
-	media-libs/libpng:0=
-	media-libs/libsamplerate
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg:0=
-	virtual/libintl
-	virtual/opengl
-	collada? ( >=media-libs/opencollada-1.6.18:= )
-	colorio? ( media-libs/opencolorio )
-	cuda? ( dev-util/nvidia-cuda-toolkit:= )
-	ffmpeg? ( <media-video/ffmpeg-4.0:=[x264,mp3,encode,theora,jpeg2k?] )
-	libav? ( >=media-video/libav-11.3:=[x264,mp3,encode,theora,jpeg2k?] )
-	fftw? ( sci-libs/fftw:3.0= )
-	!headless? (
-		x11-libs/libX11
-		x11-libs/libXi
-		x11-libs/libXxf86vm
-	)
-	jack? ( virtual/jack )
-	jemalloc? ( dev-libs/jemalloc:= )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	llvm? ( sys-devel/llvm:= )
-	ndof? (
-		app-misc/spacenavd
-		dev-libs/libspnav
-	)
-	nls? ( virtual/libiconv )
-	openal? ( media-libs/openal )
-	opencl? ( virtual/opencl )
-	openimageio? ( >=media-libs/openimageio-1.7.0 )
-	openexr? (
-		>=media-libs/ilmbase-2.2.0:=
-		>=media-libs/openexr-2.2.0:=
-	)
-	opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] )
-	openvdb? (
-		<media-gfx/openvdb-5.0.0:=[${PYTHON_USEDEP},abi3-compat]
-		dev-cpp/tbb
-		>=dev-libs/c-blosc-1.5.2
-	)
-	osl? ( media-libs/osl:= )
-	sdl? ( media-libs/libsdl2[sound,joystick] )
-	sndfile? ( media-libs/libsndfile )
-	tiff? ( media-libs/tiff:0 )
-	valgrind? ( dev-util/valgrind )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-cpp/eigen-3.2.8:3
-	nls? ( sys-devel/gettext )
-	doc? (
-		app-doc/doxygen[-nodot(-),dot(+),latex]
-		dev-python/sphinx[latex]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-fix-install-rules.patch"
-	"${FILESDIR}/${P}-fix-build-with-OSL-1.9.x.patch"
-)
-
-blender_check_requirements() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-
-	if use doc; then
-		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
-	fi
-}
-
-pkg_pretend() {
-	blender_check_requirements
-}
-
-pkg_setup() {
-	blender_check_requirements
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# we don't want static glew, but it's scattered across
-	# multiple files that differ from version to version
-	# !!!CHECK THIS SED ON EVERY VERSION BUMP!!!
-	local file
-	while IFS="" read -d $'\0' -r file ; do
-		sed -i -e '/-DGLEW_STATIC/d' "${file}" || die
-	done < <(find . -type f -name "CMakeLists.txt")
-
-	# Disable MS Windows help generation. The variable doesn't do what it
-	# it sounds like.
-	sed -e "s|GENERATE_HTMLHELP      = YES|GENERATE_HTMLHELP      = NO|" \
-	    -i doc/doxygen/Doxyfile || die
-}
-
-src_configure() {
-	# FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
-	# shadows, see bug #276338 for reference
-	append-flags -funsigned-char
-	append-lfs-flags
-	append-cppflags -DOPENVDB_3_ABI_COMPATIBLE
-
-	local mycmakeargs=(
-		-DPYTHON_VERSION="${EPYTHON/python/}"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DWITH_INSTALL_PORTABLE=OFF
-		-DWITH_PYTHON_INSTALL=OFF
-		-DWITH_PYTHON_INSTALL_NUMPY=OFF
-		-DWITH_STATIC_LIBS=OFF
-		-DWITH_SYSTEM_GLEW=ON
-		-DWITH_SYSTEM_OPENJPEG=ON
-		-DWITH_SYSTEM_EIGEN3=ON
-		-DWITH_SYSTEM_LZO=ON
-		-DWITH_C11=ON
-		-DWITH_CXX11=ON
-		-DWITH_BOOST=ON
-		-DWITH_BULLET=$(usex bullet)
-		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
-		-DWITH_CODEC_SNDFILE=$(usex sndfile)
-		-DWITH_CUDA=$(usex cuda)
-		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
-		-DWITH_CYCLES=$(usex cycles)
-		-DWITH_CYCLES_OSL=$(usex osl)
-		-DWITH_LLVM=$(usex llvm)
-		-DWITH_FFTW3=$(usex fftw)
-		-DWITH_GAMEENGINE=$(usex game-engine)
-		-DWITH_HEADLESS=$(usex headless)
-		-DWITH_X11=$(usex !headless)
-		-DWITH_IMAGE_DDS=$(usex dds)
-		-DWITH_IMAGE_OPENEXR=$(usex openexr)
-		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
-		-DWITH_IMAGE_TIFF=$(usex tiff)
-		-DWITH_INPUT_NDOF=$(usex ndof)
-		-DWITH_INTERNATIONAL=$(usex nls)
-		-DWITH_JACK=$(usex jack)
-		-DWITH_MOD_FLUID=$(usex elbeem)
-		-DWITH_MOD_OCEANSIM=$(usex fftw)
-		-DWITH_OPENAL=$(usex openal)
-		-DWITH_OPENCL=$(usex opencl)
-		-DWITH_OPENCOLORIO=$(usex colorio)
-		-DWITH_OPENCOLLADA=$(usex collada)
-		-DWITH_OPENIMAGEIO=$(usex openimageio)
-		-DWITH_OPENMP=$(usex openmp)
-		-DWITH_OPENSUBDIV=$(usex opensubdiv)
-		-DWITH_OPENVDB=$(usex openvdb)
-		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
-		-DWITH_PLAYER=$(usex player)
-		-DWITH_SDL=$(usex sdl)
-		-DWITH_CXX_GUARDEDALLOC=$(usex debug)
-		-DWITH_ASSERT_ABORT=$(usex debug)
-		-DWITH_GTESTS=$(usex test)
-		-DWITH_DOC_MANPAGE=$(usex man)
-		-DWITH_MEM_JEMALLOC=$(usex jemalloc)
-		-DWITH_MEM_VALGRIND=$(usex valgrind)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		# Workaround for binary drivers.
-		addpredict /dev/ati
-		addpredict /dev/dri
-		addpredict /dev/nvidiactl
-
-		einfo "Generating Blender C/C++ API docs ..."
-		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
-		doxygen -u Doxyfile || die
-		doxygen || die "doxygen failed to build API docs."
-
-		cd "${CMAKE_USE_DIR}" || die
-		einfo "Generating (BPY) Blender Python API docs ..."
-		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
-
-		cd "${CMAKE_USE_DIR}"/doc/python_api || die
-		sphinx-build sphinx-in BPY_API || die "sphinx failed."
-	fi
-}
-
-src_test() {
-	if use test; then
-		einfo "Running Blender Unit Tests ..."
-		cd "${BUILD_DIR}"/bin/tests || die
-		local f
-		for f in *_test; do
-			./"${f}" || die
-		done
-	fi
-}
-
-src_install() {
-	# Pax mark blender for hardened support.
-	pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender
-
-	if use doc; then
-		docinto "html/API/python"
-		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
-
-		docinto "html/API/blender"
-		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
-	fi
-
-	cmake-utils_src_install
-
-	# fix doc installdir
-	docinto "html"
-	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
-	rm -r "${ED%/}"/usr/share/doc/blender || die
-
-	python_fix_shebang "${ED%/}/usr/bin/blender-thumbnailer.py"
-	python_optimize "${ED%/}/usr/share/blender/${MY_PV}/scripts"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	elog
-	elog "Blender uses python integration. As such, may have some"
-	elog "inherit risks with running unknown python scripts."
-	elog
-	elog "It is recommended to change your blender temp directory"
-	elog "from /tmp to /home/user/tmp or another tmp file under your"
-	elog "home directory. This can be done by starting blender, then"
-	elog "dragging the main menu down do display all paths."
-	elog
-	ewarn
-	ewarn "This ebuild does not unbundle the massive amount of 3rd party"
-	ewarn "libraries which are shipped with blender. Note that"
-	ewarn "these have caused security issues in the past."
-	ewarn "If you are concerned about security, file a bug upstream:"
-	ewarn "  https://developer.blender.org/"
-	ewarn
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-
-	ewarn ""
-	ewarn "You may want to remove the following directory."
-	ewarn "~/.config/${PN}/${MY_PV}/cache/"
-	ewarn "It may contain extra render kernels not tracked by portage"
-	ewarn ""
-}
diff --git a/media-gfx/blender/blender-2.79.ebuild b/media-gfx/blender/blender-2.79.ebuild
deleted file mode 100644
index 7a99f994dd2f..000000000000
--- a/media-gfx/blender/blender-2.79.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6} )
-
-inherit check-reqs cmake-utils xdg-utils flag-o-matic gnome2-utils \
-	pax-utils python-single-r1 toolchain-funcs versionator
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="https://www.blender.org"
-
-SRC_URI="https://download.blender.org/source/${P}.tar.gz"
-
-# Blender can have letters in the version string,
-# so strip of the letter if it exists.
-MY_PV="$(get_version_component_range 1-2)"
-
-SLOT="0"
-LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bullet +dds +elbeem +game-engine +openexr collada colorio \
-	cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k libav \
-	llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb \
-	osl player sdl sndfile test tiff valgrind"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	player? ( game-engine !headless )
-	cuda? ( cycles )
-	cycles? ( openexr tiff openimageio )
-	opencl? ( cycles )
-	osl? ( cycles llvm )"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/boost-1.62:=[nls?,threads(+)]
-	dev-libs/lzo:2
-	>=dev-python/numpy-1.10.1[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	media-libs/freetype
-	media-libs/glew:*
-	media-libs/libpng:0=
-	media-libs/libsamplerate
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg:0=
-	virtual/libintl
-	virtual/opengl
-	collada? ( >=media-libs/opencollada-1.6.18:= )
-	colorio? ( media-libs/opencolorio )
-	cuda? ( dev-util/nvidia-cuda-toolkit:= )
-	ffmpeg? ( <media-video/ffmpeg-4.0:=[x264,mp3,encode,theora,jpeg2k?] )
-	libav? ( >=media-video/libav-11.3:=[x264,mp3,encode,theora,jpeg2k?] )
-	fftw? ( sci-libs/fftw:3.0= )
-	!headless? (
-		x11-libs/libX11
-		x11-libs/libXi
-		x11-libs/libXxf86vm
-	)
-	jack? ( virtual/jack )
-	jemalloc? ( dev-libs/jemalloc:= )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	llvm? ( sys-devel/llvm:= )
-	ndof? (
-		app-misc/spacenavd
-		dev-libs/libspnav
-	)
-	nls? ( virtual/libiconv )
-	openal? ( media-libs/openal )
-	opencl? ( virtual/opencl )
-	openimageio? ( >=media-libs/openimageio-1.7.0 )
-	openexr? (
-		>=media-libs/ilmbase-2.2.0:=
-		>=media-libs/openexr-2.2.0:=
-	)
-	opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] )
-	openvdb? (
-		<media-gfx/openvdb-5.0.0:=[${PYTHON_USEDEP},abi3-compat]
-		dev-cpp/tbb
-		>=dev-libs/c-blosc-1.5.2
-	)
-	osl? ( media-libs/osl:= )
-	sdl? ( media-libs/libsdl2[sound,joystick] )
-	sndfile? ( media-libs/libsndfile )
-	tiff? ( media-libs/tiff:0 )
-	valgrind? ( dev-util/valgrind )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-cpp/eigen-3.2.8:3
-	nls? ( sys-devel/gettext )
-	doc? (
-		app-doc/doxygen[-nodot(-),dot(+),latex]
-		dev-python/sphinx[latex]
-	)"
-
-PATCHES=( "${FILESDIR}/${PN}-fix-install-rules.patch" )
-
-blender_check_requirements() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-
-	if use doc; then
-		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
-	fi
-}
-
-pkg_pretend() {
-	blender_check_requirements
-}
-
-pkg_setup() {
-	blender_check_requirements
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# we don't want static glew, but it's scattered across
-	# multiple files that differ from version to version
-	# !!!CHECK THIS SED ON EVERY VERSION BUMP!!!
-	local file
-	while IFS="" read -d $'\0' -r file ; do
-		sed -i -e '/-DGLEW_STATIC/d' "${file}" || die
-	done < <(find . -type f -name "CMakeLists.txt")
-
-	# Disable MS Windows help generation. The variable doesn't do what it
-	# it sounds like.
-	sed -e "s|GENERATE_HTMLHELP      = YES|GENERATE_HTMLHELP      = NO|" \
-	    -i doc/doxygen/Doxyfile || die
-}
-
-src_configure() {
-	# FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
-	# shadows, see bug #276338 for reference
-	append-flags -funsigned-char
-	append-lfs-flags
-	append-cppflags -DOPENVDB_3_ABI_COMPATIBLE
-
-	local mycmakeargs=(
-		-DPYTHON_VERSION="${EPYTHON/python/}"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DWITH_INSTALL_PORTABLE=OFF
-		-DWITH_PYTHON_INSTALL=OFF
-		-DWITH_PYTHON_INSTALL_NUMPY=OFF
-		-DWITH_STATIC_LIBS=OFF
-		-DWITH_SYSTEM_GLEW=ON
-		-DWITH_SYSTEM_OPENJPEG=ON
-		-DWITH_SYSTEM_EIGEN3=ON
-		-DWITH_SYSTEM_LZO=ON
-		-DWITH_C11=ON
-		-DWITH_CXX11=ON
-		-DWITH_BOOST=ON
-		-DWITH_BULLET=$(usex bullet)
-		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
-		-DWITH_CODEC_SNDFILE=$(usex sndfile)
-		-DWITH_CUDA=$(usex cuda)
-		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
-		-DWITH_CYCLES=$(usex cycles)
-		-DWITH_CYCLES_OSL=$(usex osl)
-		-DWITH_LLVM=$(usex llvm)
-		-DWITH_FFTW3=$(usex fftw)
-		-DWITH_GAMEENGINE=$(usex game-engine)
-		-DWITH_HEADLESS=$(usex headless)
-		-DWITH_X11=$(usex !headless)
-		-DWITH_IMAGE_DDS=$(usex dds)
-		-DWITH_IMAGE_OPENEXR=$(usex openexr)
-		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
-		-DWITH_IMAGE_TIFF=$(usex tiff)
-		-DWITH_INPUT_NDOF=$(usex ndof)
-		-DWITH_INTERNATIONAL=$(usex nls)
-		-DWITH_JACK=$(usex jack)
-		-DWITH_MOD_FLUID=$(usex elbeem)
-		-DWITH_MOD_OCEANSIM=$(usex fftw)
-		-DWITH_OPENAL=$(usex openal)
-		-DWITH_OPENCL=$(usex opencl)
-		-DWITH_OPENCOLORIO=$(usex colorio)
-		-DWITH_OPENCOLLADA=$(usex collada)
-		-DWITH_OPENIMAGEIO=$(usex openimageio)
-		-DWITH_OPENMP=$(usex openmp)
-		-DWITH_OPENSUBDIV=$(usex opensubdiv)
-		-DWITH_OPENVDB=$(usex openvdb)
-		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
-		-DWITH_PLAYER=$(usex player)
-		-DWITH_SDL=$(usex sdl)
-		-DWITH_CXX_GUARDEDALLOC=$(usex debug)
-		-DWITH_ASSERT_ABORT=$(usex debug)
-		-DWITH_GTESTS=$(usex test)
-		-DWITH_DOC_MANPAGE=$(usex man)
-		-DWITH_MEM_JEMALLOC=$(usex jemalloc)
-		-DWITH_MEM_VALGRIND=$(usex valgrind)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		# Workaround for binary drivers.
-		addpredict /dev/ati
-		addpredict /dev/dri
-		addpredict /dev/nvidiactl
-
-		einfo "Generating Blender C/C++ API docs ..."
-		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
-		doxygen -u Doxyfile || die
-		doxygen || die "doxygen failed to build API docs."
-
-		cd "${CMAKE_USE_DIR}" || die
-		einfo "Generating (BPY) Blender Python API docs ..."
-		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
-
-		cd "${CMAKE_USE_DIR}"/doc/python_api || die
-		sphinx-build sphinx-in BPY_API || die "sphinx failed."
-	fi
-}
-
-src_test() {
-	if use test; then
-		einfo "Running Blender Unit Tests ..."
-		cd "${BUILD_DIR}"/bin/tests || die
-		local f
-		for f in *_test; do
-			./"${f}" || die
-		done
-	fi
-}
-
-src_install() {
-	# Pax mark blender for hardened support.
-	pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender
-
-	if use doc; then
-		docinto "html/API/python"
-		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
-
-		docinto "html/API/blender"
-		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
-	fi
-
-	cmake-utils_src_install
-
-	# fix doc installdir
-	docinto "html"
-	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
-	rm -r "${ED%/}"/usr/share/doc/blender || die
-
-	python_fix_shebang "${ED%/}/usr/bin/blender-thumbnailer.py"
-	python_optimize "${ED%/}/usr/share/blender/${MY_PV}/scripts"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	elog
-	elog "Blender uses python integration. As such, may have some"
-	elog "inherit risks with running unknown python scripts."
-	elog
-	elog "It is recommended to change your blender temp directory"
-	elog "from /tmp to /home/user/tmp or another tmp file under your"
-	elog "home directory. This can be done by starting blender, then"
-	elog "dragging the main menu down do display all paths."
-	elog
-	ewarn
-	ewarn "This ebuild does not unbundle the massive amount of 3rd party"
-	ewarn "libraries which are shipped with blender. Note that"
-	ewarn "these have caused security issues in the past."
-	ewarn "If you are concerned about security, file a bug upstream:"
-	ewarn "  https://developer.blender.org/"
-	ewarn
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-
-	ewarn ""
-	ewarn "You may want to remove the following directory."
-	ewarn "~/.config/${PN}/${MY_PV}/cache/"
-	ewarn "It may contain extra render kernels not tracked by portage"
-	ewarn ""
-}
diff --git a/media-gfx/blender/files/blender-2.79-fix-build-with-OSL-1.9.x.patch b/media-gfx/blender/files/blender-2.79-fix-build-with-OSL-1.9.x.patch
deleted file mode 100644
index 6b22f9335fd7..000000000000
--- a/media-gfx/blender/files/blender-2.79-fix-build-with-OSL-1.9.x.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d089875c4c753f084e02849462ec1bd6f785eadf Mon Sep 17 00:00:00 2001
-From: Brecht Van Lommel <brechtvanlommel@gmail.com>
-Date: Sat, 18 Nov 2017 06:11:17 +0100
-Subject: [PATCH] Fix build with OSL 1.9.x, automatically aligns to 16 bytes
- now.
-
----
- intern/cycles/kernel/osl/osl_closures.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/intern/cycles/kernel/osl/osl_closures.cpp b/intern/cycles/kernel/osl/osl_closures.cpp
-index e3e85705ebc..597d25e9f30 100644
---- a/intern/cycles/kernel/osl/osl_closures.cpp
-+++ b/intern/cycles/kernel/osl/osl_closures.cpp
-@@ -232,7 +232,11 @@ static void register_closure(OSL::ShadingSystem *ss, const char *name, int id, O
- 	/* optimization: it's possible to not use a prepare function at all and
- 	 * only initialize the actual class when accessing the closure component
- 	 * data, but then we need to map the id to the class somehow */
-+#if OSL_LIBRARY_VERSION_CODE >= 10900
-+	ss->register_closure(name, id, params, prepare, NULL);
-+#else
- 	ss->register_closure(name, id, params, prepare, NULL, 16);
-+#endif
- }
- 
- void OSLShader::register_closures(OSLShadingSystem *ss_)
diff --git a/media-gfx/dcraw/Manifest b/media-gfx/dcraw/Manifest
index d2500039c2d4..ab8cd558420a 100644
--- a/media-gfx/dcraw/Manifest
+++ b/media-gfx/dcraw/Manifest
@@ -4,6 +4,6 @@ AUX dcwrap 437 BLAKE2B ec88784e059ab07990acf3a47517f243502a140b451040c77f9320bd7
 DIST dcraw-9.28.0.tar.gz 194193 BLAKE2B d39a2d76dbbe74a2aed21c6b132ac25c9dd17312813e7f640a4a6d4abd4e8f1868ad596296ca9bfe61427b8b4764821e32679128747ff5a9452988814b77c638 SHA512 04609c4ddd5d1c9fa0ee1617d2ef25efdc22451e1fa6cf669d93abb1fa630a18198b30a289400f1814c8dca285547da8b081a1b00b085c00bb9318ad25c48a30
 DIST parse-1.73.tar.bz2 8186 BLAKE2B 4d7d69bbaad3fd69caeae24e4dfc77fa580d969f903c925f76cf0a7bdb13ff34c96ab6dc9917609ce886365f6971290b3af63aec9fed43b1876aa44dd951521d SHA512 06ffaf72695dc86bfc2bdd10d4f732bc428b72d427f4c10e93fc58536513477cf297adb56fb9cfc5ba5fd5b6b4cd197c33d8dac957a0a1bbe65b23393b64278c
 DIST rawphoto-1.32.tar.bz2 3841 BLAKE2B db7a80af4b06fc3709a9ae69d9f166c3323097821bb561af4e0ac9a1ef677cab6cfd5cd7896d1e1fce85e6fab545ced7d00ce809f97332bec594b94a27f77e23 SHA512 6ee5b6c4e4266c8e04221c894c4e737f8a6d2c6f0cc9c82db73064afd68488bd60de19b86b2d7b82780283bbb9f8156ef3149c1c730f09a00dce632744b44d56
-EBUILD dcraw-9.28.0-r1.ebuild 3082 BLAKE2B 8cd5f249dc113c6e64e46a3c5c4ee857a4375f35e0f87db711ee31dba4b9694a084f32b2a9861ed53c4b3eca44f6b1e778d0535253aab8949cbfa0220fd59434 SHA512 28068a2df93a3be7d535fa12fd4e2aa022afecbcfc9077873713bf49469b9f71e06c2ca7043d7e3574aca1fe526406d39a6a8dc78e2e7bcf9d15665743321d2b
+EBUILD dcraw-9.28.0-r1.ebuild 3081 BLAKE2B 49aef9bd9403a4d932f28c1ea3161c7d5b52f96b13be0bc577e70b82d84afce0bc103371f2c06c7c9be88ad1a84147f27798a056f899dc750eb120d6e235cbc3 SHA512 9da641206d34ad5faa6394722a64d0d5477d66913b7a8638e95cc41800ad2c3e80b912cf24a40c676df0b760954d8d5790655516e62d0fab10aeab6c77712452
 EBUILD dcraw-9.28.0.ebuild 2963 BLAKE2B 7ba95ebd63edcf718d263183ec26860ee7e7a2d9a835a01028a5b7cc29ee6ca8a9af3f2c0f411eebcf88c168a2891b87cedcbd7517ff415cb674f1121f2c7194 SHA512 f2082082748c6006cf81fd7888d9ed0a9b9373aaf1855ae8f699d7c51eb79cde748b3a702792f0bcd0a40b6c8eb4e8c0e8e838847c70a6841997b01d40a844e4
 MISC metadata.xml 701 BLAKE2B ad6e3ac7425a35fb16cfde74a0d540ab47676008f1de56cdf3ca101e3724e3c8147cf76f548f22a38862b09c67f34411f44718359e6467bdf8b94b9d041cf82a SHA512 0758eece42b5007b53e04f0ddb6385fbdea360afc8a4cfd94d3f5234e4a677819cbebdca3a78c7f3765770e6ccb5b2d74f20199b7c167137fd15554cc14d0755
diff --git a/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild b/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild
index aceec1823dd6..0ec0faab0d99 100644
--- a/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild
+++ b/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.cybercom.net/~dcoffin/dcraw/archive/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 LANGS=" ca cs de da eo es fr hu it nl pl pt ru sv zh_CN zh_TW"
 IUSE="nls gimp jpeg jpeg2k lcms"
 
diff --git a/media-gfx/evoluspencil/Manifest b/media-gfx/evoluspencil/Manifest
index 7bd650c48aee..fa6f313d3c9f 100644
--- a/media-gfx/evoluspencil/Manifest
+++ b/media-gfx/evoluspencil/Manifest
@@ -1,4 +1,6 @@
 AUX launcher 324 BLAKE2B df3091670e3763886bc9ce099159e990adbbe99ee4084e8764bddbd9c86f7ae36881f2bc3f6b02df60edc7d513deba22fa9799531c11ff7e74c5328ead00a2db SHA512 4266eca92c9860a5bd73d14e3650729bf93e2b14525dfe6d7b36009273561404440395e3d494b924fc2f76372a97a17ee40f5e375f70157174783812b272fb72
+DIST evoluspencil-3.0.4-49.rpm 55779457 BLAKE2B 7f74bf4d0ac4dcd6ef2e37d56e6b06eda72a34e6c4bc0e2fbb5b55727bb3ba0ecfe183e64ad5f6abe77d258dca2bfc7acca0d08c934a7700699690ff8d39e335 SHA512 72a17841d214523223d6f35ca8ba69076070baf83248ceb5747a23865ec955f8aafbb799eb01b3a3c99226a7bc1653e55be6f7292941b1a859598e016673f2ec
 DIST pencil-2.0.5.tar.gz 4810418 BLAKE2B 438bc868aa7e83434de4e5e7b196dce5e607b49590b4216e345c9df4999327ee75b9761a08de9bab47cb0d1e92a363af3b14985748cbbf203d8ff3f0246b97a2 SHA512 cb9ab75f69ca886c7b0579dd293e4c4b4279eac21f4301ad0299e55b27d998d59f7b9444916d306939e6c7f4603a8267aecd3dc0ab3efc41175659886e399b0d
 EBUILD evoluspencil-2.0.5.ebuild 934 BLAKE2B 200506c6fdd4b6e777500137d5c8075218a0f868253d70adfa3583db86a2886ce2204f178e29497b11c18ef8088474cc143bd90950f076e14af225c64ce0d394 SHA512 160de1770f26f0e46f114b91085c5d64230f9e891433e7f3c3f2e1cce9cc81ff6322eb95655d56d374a9235f673c06688b503ce5a31473e39dc00cce65104c66
+EBUILD evoluspencil-3.0.4.ebuild 1216 BLAKE2B 91c080c45f211a34018cc0e34903e8c61b68e4304d9883be8409a1991b72f948a673ec0a1934344c380f1f9aac184665cf578467dff31ebc7ae4f3424c637bfb SHA512 0ca218bce93d22612f9de46187395dd23775e651d3cd1b7646b48adb3bc42f275ad87dcd65947572443c86f58d29e3f1401ee1d0448539488eafb80180e74711
 MISC metadata.xml 299 BLAKE2B 219ec05cbf4172c1097e96d59b6e6cee44ea19ebe827440b53493c1953bebe7c5a3f017b6d2ef0bb5300a3d9cd957e683461c4f3edc8bc4d17603c7d78ed59d9 SHA512 be27e090213278995ed73b5b85ef663921136f999def3608d1fdf79bd6537ba38d2424f204e228aa498fa85a2e327633c63b6ca01dae330cc37c4f6832ff861b
diff --git a/media-gfx/evoluspencil/evoluspencil-3.0.4.ebuild b/media-gfx/evoluspencil/evoluspencil-3.0.4.ebuild
new file mode 100644
index 000000000000..1b767001a144
--- /dev/null
+++ b/media-gfx/evoluspencil/evoluspencil-3.0.4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rpm xdg-utils
+
+MY_PN="${PN/evolus/}"
+
+DESCRIPTION="A simple GUI prototyping tool to create mockups"
+HOMEPAGE="https://pencil.evolus.vn/"
+SRC_URI="https://pencil.evolus.vn/dl/V${PV}/${MY_PN^}-${PV}-49.x86_64.rpm -> ${P}-49.rpm"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gconf
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/pango
+"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="
+	opt/${MY_PN^}/*.so
+	opt/${MY_PN^}/pencil
+"
+
+src_install() {
+	doins -r usr
+	doins -r opt
+
+	exeinto /opt/${MY_PN^}
+	doexe opt/${MY_PN^}/{pencil,libffmpeg.so,libnode.so}
+	dosym ../${MY_PN^}/pencil /opt/bin/pencil
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-gfx/gnofract4d/Manifest b/media-gfx/gnofract4d/Manifest
index 7cfe448b6b84..ea0f682106f3 100644
--- a/media-gfx/gnofract4d/Manifest
+++ b/media-gfx/gnofract4d/Manifest
@@ -3,5 +3,5 @@ AUX gnofract4d-3.14-manual.patch 914 BLAKE2B 20be2e073ba3fb8fe06647b091e152a5d29
 DIST gnofract4d-3.14.1.tar.gz 4660808 BLAKE2B f5125be0414b847f506686734e9234c3d88732be6f7cd0feb9cbe759d6e0584f8ce143d64de17a5fcca9b28d75ae922e00993140f0ccb793d10faadb3221b990 SHA512 bcec1d12c589cdee2f0da5555a075db511debd21d4536db66793f6a28be35656258daffd8cbaaff4b5af041b18ca77c94d910ec4d0c7e14960412c580fd56725
 DIST gnofract4d-3.14.tar.gz 862499 BLAKE2B dcca058b6a625b4d2f0153f896ed029b27b8e6135a310942c4b58bf5a6396977f5ca065061918e99034b6303a5634c5288cac90c887a8dfa87286d24f9f1d04f SHA512 cf3614f60a43f7ab20208fb1a62d3823495c84060d177d2926bad20a475e661d7ec45a7bc14e826229656027fe7c0f68aac093b6b0dc7912e84d8d8ec8ff81e5
 EBUILD gnofract4d-3.14-r1.ebuild 838 BLAKE2B faf89e7b8110f981fc500a83b10985e71bd60320a3ae1ff4048d9ecef5866399369e13c35904df5d0474afceab7e29c16d69322aac55bf0a7b12500ca97fc6f5 SHA512 639bbddf911d9314e99142e4f55ab968b0898293d8ddeabd286010faa9304a35cb280f39790028360b78e64c8722581239913b37e15e196631a5011b9fb6950a
-EBUILD gnofract4d-3.14.1.ebuild 1143 BLAKE2B 43052e5ed9bd0e7570cf38e8a88d283287d4a3f2a9333d40390745b6471a47e778b1c94e837192e602129a481fe6da567ffa414072a191476396ac2eac2bfbba SHA512 82d6d0861bf4671764d5616d92883961873b8c897ead24f69181247d75b0cda839b7a9bdd58226800c94f436baa12e6d4174277952210f6a3c89cdad0d9eb162
+EBUILD gnofract4d-3.14.1.ebuild 1142 BLAKE2B b6ff0697afc901a6e4ce549f2c5a6012a191ccec2b36c26e9ca428e753f422e9759a87b3dad612d715f2f4647eb46a63c2ebf6855c077765c8f4f88b7f00ef06 SHA512 63e621da4294d0b18023ff8f6df66d657ca1fff0af0156d226f19ceaa675f75640798b0c5dca34ce9da19769fe355dbe5268b6fc61bbde26236e7b651bfc9ad5
 MISC metadata.xml 397 BLAKE2B 0df3e1527627657309017673cc4557df01f71016eec2b6daaa16aee959534600be9a9292e966783ed9e14bf076ae57de0904a901c9f9e80a9bedf4ec7e113ec7 SHA512 9f2efdbbb8eefe3d2d7b42287f233db308e24b9ef825522e650b98857de963171870460a1a5c8ad2e9f65272db6bd176a552587e38d877fcad2afd6be2b0e6e6
diff --git a/media-gfx/gnofract4d/gnofract4d-3.14.1.ebuild b/media-gfx/gnofract4d/gnofract4d-3.14.1.ebuild
index 627a3fcf439d..45040d6819ae 100644
--- a/media-gfx/gnofract4d/gnofract4d-3.14.1.ebuild
+++ b/media-gfx/gnofract4d/gnofract4d-3.14.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/edyoung/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index a7b297e36096..3a737a0fd95d 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -1,6 +1,4 @@
 AUX 0001-Fix-unwanted-automagic-activation-of-aalib-support.patch 1049 BLAKE2B 62afe72d6630420fa0068e652cdfbfde3c4e73541e53154627ad1cc23ad10f72ac85cf5ae317d2b0bf4127e474af2ca2268e57011eb835d57d88e2d6fa65a85f SHA512 252390cfb2533e9c15d1f881f6729660e2f6cd737a9257c5dec7f06f72f2960c3b5fe940e7fc774c862e6156f517357ca7b933822c23a466ef39fbfc2f14bf8c
-DIST gphoto2-2.5.15.tar.bz2 790513 BLAKE2B e8a22d014ebd33f5e0976d72c5df8373e29106def5da575b69d21f2a58e9408c6ce399476135909e57111196d6e61ead953f66a00c9f440b7cf92e0da0f4a0f6 SHA512 46058a12a81379f3311911e103cf934b6eb616d7f81180615b385d01e855bf6ce998eb12811b9d032328ebed6acfc4456f3a383cfedb93c6967c9699654d4f40
 DIST gphoto2-2.5.20.tar.bz2 790065 BLAKE2B 6e10aa468696bc3eff51aaa3e886ad2373997f91597e42b33777ac56bf668f918c2fa0cb8b70eb8f7cb45507e67c9cfc3a46a7408449ad35cc3b743daf74859d SHA512 0350c38c264e5ba858ee14952fbf6ad271e7fef05e3f5f8eb3d45102099ae435fec63b09881efa99af60d4e086a9c2f69be92a7e49617643ab13146a5e4655f3
-EBUILD gphoto2-2.5.15.ebuild 1389 BLAKE2B dfdf84cdcd5c2305ee92572633308fd7f861677dfa98fe708b76b4ca6983014854e27f8c21456a9b1db806d2a160a0f45fe4bea13b5227290c0d6edeed444b1d SHA512 353294fbc29fb2c3f948e51906b91f5214948e2c6172a171a0a9a6ae19d318b215865bea8212c63cbfcfd5d54134acd9ab35b7cf8eba8c6677c9727833fd6ad0
 EBUILD gphoto2-2.5.20.ebuild 1326 BLAKE2B a015935a02dc2013b1de40ccbdc459615151ea2279d22fa996700dde299d9c9045877b1d546ed84bd8803bd757bb703286e6d7c071fe9c21c0a117f4deacb235 SHA512 2b463c8106f657aa93f48b297a8897729a2a1b4fc8de8a6331fc94d501540d0a3ec1b9f137000412a62ed072256c9847939af200a4ee4e5e849f0622207d4118
 MISC metadata.xml 449 BLAKE2B 324e2ea46a0f8199033bf628d6719a51968a02af01fa3e8abcd1caaf7a4dcd892bfb6b8347a030edf4b2e8529aba47d7103789103a3b03adaa538338ab2ec91f SHA512 f938819a203e0119b1d81aa1dc812717d6ef02c3012f8ed667db452c7712bb7b142cee36d519ec33f4cf65ebcba7a660e2f67f6b66087ec6be832a4987e10c53
diff --git a/media-gfx/gphoto2/gphoto2-2.5.15.ebuild b/media-gfx/gphoto2/gphoto2-2.5.15.ebuild
deleted file mode 100644
index f3f04bd08f16..000000000000
--- a/media-gfx/gphoto2/gphoto2-2.5.15.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="Free, redistributable digital camera software application"
-HOMEPAGE="http://www.gphoto.org/"
-SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="aalib exif ncurses nls readline"
-
-# aalib -> needs libjpeg
-RDEPEND="
-	dev-libs/popt
-	>=media-libs/libgphoto2-2.5.10:=[exif?]
-	aalib? (
-		media-libs/aalib
-		virtual/jpeg:0 )
-	exif? (	media-libs/libexif )
-	ncurses? ( dev-libs/cdk:0= )
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.14.1 )
-"
-
-src_prepare() {
-	default
-	if ! use exif ; then
-		# Remove tests that require EXIF to pass, bug 610024
-		rm "${S}"/tests/data/test0{35,36,37,40}* || die
-	fi
-	# Leave GCC debug builds under user control
-	sed -r '/(C|LD)FLAGS/ s/ -g( |")/\1/' \
-		-i configure{.ac,} || die
-	eautoreconf
-}
-
-src_configure() {
-	CPPFLAGS="-I/usr/include/cdk" \
-		econf \
-			$(use_with aalib) \
-			$(use_with aalib jpeg) \
-			$(use_with exif libexif auto) \
-			$(use_with ncurses cdk) \
-			$(use_enable nls) \
-			$(use_with readline)
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		HTML_DIR="${D}"/usr/share/doc/${PF}/sgml \
-		install
-
-	einstalldocs
-	rm -rf "${D}"/usr/share/doc/${PF}/sgml/gphoto2
-}
diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest
index 1f2b5e2f14ce..19fbbaf73b3a 100644
--- a/media-gfx/gscan2pdf/Manifest
+++ b/media-gfx/gscan2pdf/Manifest
@@ -1,7 +1,7 @@
 DIST gscan2pdf-1.8.11.tar.xz 409212 BLAKE2B 37cb716f13818eaffc39c210b810b845368cc5e323569e8f9d5603b5b412c4182520798321358e4c21339fdbd5f15026a0acd6421a49e7db79ecca86633c3ab0 SHA512 1ea09b8768771be4a1700cb8a6523d5f74fcbf0ebe459d97796032b56f896fd0c50e5ca1ed4c96aedef7e61f6952a92986153cc70173dd5ad91ccfb72461c565
-DIST gscan2pdf-2.4.0.tar.xz 437096 BLAKE2B 947c1d3c4c726254ba61be4f7a34ae867d0af9b6ebf53e4594aeb908dfda43ff1e85791641b42e9e13b978a56cfe523a6fa23566e14ad130278d05e7836d34d8 SHA512 90ec9d8cc56a2fe9d7a77c928f548c87a81bdfb62f1caa491b32a42600c5677974ec613b0bf384bd806953a9a5d29ccf3077df7c0b3dd73d06866003c3a01791
 DIST gscan2pdf-2.5.1.tar.xz 440484 BLAKE2B 375434ee633f895da29d69672faa6da5247e6f45e25b7fe1111394c03c2a6a6e482973365733a7d123c2a94ef40d2d7ce8666b5c632a6465f31ef09f237100fa SHA512 677f9081fb4f6ecd064f965399be20802e10f470d40ef00da5afd6de37ed9914c856fe01e28daedf900e8c8bd75a798f1579a7970509fc789382bbe2b1923804
+DIST gscan2pdf-2.5.3.tar.xz 447188 BLAKE2B e34441c4680fbe2a03bafb12c754df143c800ca6aa56c33623ff5e26fc86d08e120794d84c1e33aa25d76498138098249ace4a7f79023fc1ff97372dcf7e76a7 SHA512 d8f798eadc3c2fbc8a1553bbf542f2636861aba793ab61b66449938bbe115d5e765e018f6afdcd7280b34ccadeb77febda924334f35cf5b7459f93f93c58e782
 EBUILD gscan2pdf-1.8.11.ebuild 1731 BLAKE2B 0b0f7cdfef98e666e20e44882584e0636e490429186e441d87f965e74071f5076693896e17e68184319dfaf3a1fd4487140209ef3b49603c9496cc936516333d SHA512 b94b73d3396208a8c67c2aad407815329501717c364d60189b21d96f652846e554d59a2a36f4b58383d7f49ab728d4fe251bce9ab1944befb667a9e0c09237b3
-EBUILD gscan2pdf-2.4.0.ebuild 1609 BLAKE2B 0804b57945439bc55cc55d2b73b56cc4a892f9f72555ee74c0f1fe5203e0ac452659e1988dd55e59eee4f1791fd05e2d408b8f4b0ac7a2e77aea3f353ef0ee19 SHA512 7173ce075f21c158db8d964144073028275e6cea2346bf6275c4ca4a34a6e6a59f7da110f71ce988a5e033e92c5f0eedbb4661f2539613111891abd363845bb4
 EBUILD gscan2pdf-2.5.1.ebuild 1609 BLAKE2B 0804b57945439bc55cc55d2b73b56cc4a892f9f72555ee74c0f1fe5203e0ac452659e1988dd55e59eee4f1791fd05e2d408b8f4b0ac7a2e77aea3f353ef0ee19 SHA512 7173ce075f21c158db8d964144073028275e6cea2346bf6275c4ca4a34a6e6a59f7da110f71ce988a5e033e92c5f0eedbb4661f2539613111891abd363845bb4
+EBUILD gscan2pdf-2.5.3.ebuild 2240 BLAKE2B 1e7091ea3be2653e55f1dcc27f5303ee63d6054e74b02b1257c85a6b2bdc3ab6e9250a78245f53b987397b3c4dd854cfe0519d4916321199d26c1278992025dc SHA512 1a6ae1f8dc0f7752161b08e5cf1e407a8c7b598263c7f256be160a21aa757d904fbab90ae9280b6ad846a932580a453489c3d0ab9fbfa0f2a777861b8fbf6a98
 MISC metadata.xml 439 BLAKE2B 835480b0d68a079941e94f2646d0136dfb8a8e750e0279f8a5a2e23e6690242582ffe660798f5e80ebfb4378a576aa5715332b53230555866391a99ec28f54ff SHA512 af1cc05ac693899586df81036d2fa11af187edbb3c9449862298ba05efd0dbd0c4c5b008a1a21328c1f9a27a690671bd7a9967d2e457efb31561044e45984401
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.4.0.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.5.3.ebuild
index d19c0627489d..9c77f58fad76 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-2.4.0.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-2.5.3.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=6
 
-inherit eutils perl-module
+DIST_TEST="do"
+
+inherit eutils perl-module virtualx
 
 DESCRIPTION="Scan documents, perform OCR, produce PDFs and DjVus"
 HOMEPAGE="http://gscan2pdf.sourceforge.net/"
@@ -12,9 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-
-# OCR tests fail with tesseract[opencl], not fixed by addpredict
-RESTRICT="test"
+IUSE="test"
 
 RDEPEND="
 	dev-perl/Config-General
@@ -46,6 +46,22 @@ RDEPEND="
 	media-gfx/sane-backends
 	media-libs/tiff"
 
+DEPEND="test? (
+		${RDEPEND}
+		dev-perl/Sub-Override
+		media-libs/fontconfig
+
+		app-text/djvu[tiff]
+		app-text/poppler[utils]
+		app-text/tesseract[-opencl,osd,tiff]
+		app-text/unpaper
+		media-gfx/imagemagick[djvu,png,tiff,perl]
+		media-gfx/sane-backends[sane_backends_test]
+		media-gfx/sane-frontends
+	)"
+
+PERL_RM_FILES=( t/{90_MANIFEST,91_critic,99_pod}.t )
+
 mydoc="History"
 
 pkg_postinst() {
@@ -57,3 +73,15 @@ pkg_postinst() {
 	optfeature "automatic document feeder support" media-gfx/sane-frontends
 	optfeature "sending PDFs as email attachments" x11-misc/xdg-utils
 }
+
+src_test(){
+	local confdir="${HOME}/.config/ImageMagick"
+	mkdir -p "${confdir}" || die
+	cat > "${confdir}/policy.xml" <<-EOT || die
+		<policymap>
+			<policy domain="coder" rights="read|write" pattern="PDF" />
+			<policy domain="coder" rights="read" pattern="PS" />
+		</policymap>
+	EOT
+	virtx perl-module_src_test
+}
diff --git a/media-gfx/iscan-data/Manifest b/media-gfx/iscan-data/Manifest
index 05db1e52c771..ca882c3ef078 100644
--- a/media-gfx/iscan-data/Manifest
+++ b/media-gfx/iscan-data/Manifest
@@ -1,7 +1,3 @@
-DIST iscan-data_1.36.0-1.tar.gz 100218 BLAKE2B 7731266ae58b44541ca9e39621026aa667707cb46774e8199711e627d773fc1029fecb401de2df7746a476a162774ec1eeec75b9d0bfda82567ccef706547baa SHA512 a9711264c852dd4bdcdb10c1153f725a111bd74b03705c99265b6692bf47236c6e4f5e7e4813991eb5991deb198adeee272c8c3eb53da641ba189d923916d3cb
-DIST iscan-data_1.37.0-3.tar.gz 100499 BLAKE2B 8710a69702306b50bb4d9a21a924dd9bf14748b5310ecbe53d7b4ba24bf47122da9c4bfb57a0769f166aa1ce9c732a943703fe1bfafb9500636654f480026f28 SHA512 051b5a3de2af3d621a3ebc181314809edd25598d3d2dc3868abd3423562aa5c2c00808c5e22ada6253588036b4072644dcf979012645c1ae580e9f701544bd40
 DIST iscan-data_1.39.0-1.tar.gz 100793 BLAKE2B 690ce06ed82e817658bd05611a66f9bf6d895bdc17185c585c83c0a8b9c020f0354f782bf991dd4913336799a75d3d424085624e488ca4a77f797088a327fda6 SHA512 15e456d5e64bfe9bea77c3f2a349a2e50c4d8a8cbd1347dfac4ef1f692793561d0d3d32fb3cec10176f013d3b0e46f62d6d24f0870c199088e2e65ec82b4326a
-EBUILD iscan-data-1.36.0.1.ebuild 1265 BLAKE2B 9309392140cf44bbe93ea0f5cf917dcb58656080b8b5cd3088aa080f310f422bb4998c66e532c7dd23bf10da9ed498b83f2446982c7158019df0f37a48ccf0b7 SHA512 4dd435ffc75204b5a87d7dbd144cffe96ee92a25e6bbd5fb19680eac5cf192404d252c5582b4acaf24cb2fe764f25611ab2bd16a4cf63b58ab758166b3315c1a
-EBUILD iscan-data-1.37.0.3.ebuild 1072 BLAKE2B 3aa8ea569f8bfbe597f80cd3ac63437fdcc9a3e3fb19ac3b729c866e366b64719fe99d1913ef8dbcb5b0d848c64114c4f80ebe588308db1d2ac7185c521f4be0 SHA512 0212c3a6f9e5cdab4915c274f06fc7c61392d7a22426184ab8ec5b7f38fc79c32d08ee0949136c2637c863fd9f873c8482ada9f7103647f0b0a99e4378e8f478
-EBUILD iscan-data-1.39.0.1.ebuild 1007 BLAKE2B 22c069c47f9dcfa983a67668f20f978011d2454da7cd5c63ac09ef82739c183eea4b217e97f0d2d62ff05e3503c52440b9e030fd4ff91a05c7288f7bfa91c9d2 SHA512 c1e204c115d8068ce0fd485b7a32c0ba9df59bd5a40f63ccee278233317bd77aba9b7dd9707ea421e1dadf643c8cb652300d830b8df1207f5a9b3e0e56ab451a
+EBUILD iscan-data-1.39.0.1.ebuild 1006 BLAKE2B ee7e6b83dd81edd9fa0a63e2887468caf230765dd4c26e8566c133e39dc12ac693ba41d0720a5c2209bfd9a4b99ab1654a0067c6ec75e3f18db909dea431d663 SHA512 73305c191e0c80aa7b842745fa03902a739de29c21bea228d76e65acde60bc75db88972e744ba75aa5d2b3caa7735c991869d5ebeb06eeb1c0b8debf16f618fd
 MISC metadata.xml 609 BLAKE2B e0c2521d9bd70daf3bca54713178819db98aea387bc4a6b41c682d044656229ab5cdf2bd3212bd61faabdb5d600dfeb8fa445f57eb0247d694a59b35a663b6b2 SHA512 32ede245d749b0be045e45a5c8a6f68f9487d807f8777c0da84fd93b20ca11aa1ec3d132d2b24a7a58802a112b71ace82fa03f3e618a9d66bc99101eefb7b5df
diff --git a/media-gfx/iscan-data/iscan-data-1.36.0.1.ebuild b/media-gfx/iscan-data/iscan-data-1.36.0.1.ebuild
deleted file mode 100644
index 8cb288324b4a..000000000000
--- a/media-gfx/iscan-data/iscan-data-1.36.0.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils versionator udev multilib
-
-MY_PV="$(get_version_component_range 1-3)"
-MY_PVR="$(replace_version_separator 3 -)"
-
-DESCRIPTION="Image Scan! for Linux data files"
-HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-# Use a gentoo hosted url since upstream uses a session based url that causes the
-# files to no longer be available after the session expires.
-SRC_URI="https://dev.gentoo.org/~idella4/tarballs//${PN}_${MY_PVR}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="amd64 x86"
-IUSE="udev"
-
-DEPEND="udev? (
-		dev-libs/libxslt
-		media-gfx/sane-backends
-	)"
-RDEPEND=""
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DOCS=( NEWS SUPPORTED-DEVICES KNOWN-PROBLEMS )
-
-src_install() {
-	ewarn ""; ewarn "Some profiles automatically enable udev which will cause install to fail"
-	ewarn "if media-gfx/sane-backends is not already installed."; ewarn ""
-	default
-
-	if use udev; then
-	# create udev rules
-		local rulesdir=$(get_udevdir)/rules.d
-		dodir ${rulesdir}
-		"${D}usr/$(get_libdir)/iscan-data/make-policy-file" \
-			--force --mode udev \
-			-d "${D}usr/share/iscan-data/epkowa.desc" \
-			-o "${D}${rulesdir}/99-iscan.rules" || die
-	fi
-}
diff --git a/media-gfx/iscan-data/iscan-data-1.37.0.3.ebuild b/media-gfx/iscan-data/iscan-data-1.37.0.3.ebuild
deleted file mode 100644
index b6288026a6cf..000000000000
--- a/media-gfx/iscan-data/iscan-data-1.37.0.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit udev multilib
-
-MY_PV="$(ver_cut 1-3)"
-MY_PVR="$(ver_rs 3 -)"
-
-DESCRIPTION="Image Scan! for Linux data files"
-HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-SRC_URI="http://support.epson.net/linux/src/scanner/iscan/${PN}_${MY_PVR}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="udev"
-
-DEPEND="udev? (
-		dev-libs/libxslt
-		media-gfx/sane-backends
-	)"
-RDEPEND=""
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DOCS=( NEWS SUPPORTED-DEVICES KNOWN-PROBLEMS )
-
-src_install() {
-	ewarn ""; ewarn "Some profiles automatically enable udev which will cause install to fail"
-	ewarn "if media-gfx/sane-backends is not already installed."; ewarn ""
-	default
-
-	if use udev; then
-	# create udev rules
-		local rulesdir=$(get_udevdir)/rules.d
-		dodir ${rulesdir}
-		"${D}/usr/$(get_libdir)/iscan-data/make-policy-file" \
-			--force --mode udev \
-			-d "${D}/usr/share/iscan-data/epkowa.desc" \
-			-o "${D}${rulesdir}/99-iscan.rules" || die
-	fi
-}
diff --git a/media-gfx/iscan-data/iscan-data-1.39.0.1.ebuild b/media-gfx/iscan-data/iscan-data-1.39.0.1.ebuild
index 096330222826..cb64d7bca5c9 100644
--- a/media-gfx/iscan-data/iscan-data-1.39.0.1.ebuild
+++ b/media-gfx/iscan-data/iscan-data-1.39.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://support.epson.net/linux/src/scanner/iscan/${PN}_$(ver_rs 3 -).ta
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="udev"
 
 DEPEND="
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index dc6218206be8..82a68d62770c 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -4,11 +4,8 @@ AUX iscan-2.29.1-png-libs.patch 1309 BLAKE2B debdebb6753d3f71ec5af8a16082dcb8b9f
 AUX iscan-2.30.1-fix-g++-test.patch 1394 BLAKE2B 6ff018b0be888d4415a40f0d94ab3482590a4b3f627b00f6f1fdd17cbf2aea57b52715eebda678833ec2ea9543470a4b7a5c9f07fced84808b337edd43c11c5e SHA512 b11667e6698955b482c9cffd88413180d77b700ca040bf70969ce10be652cfa38fe2fb3de930519bdfe098f18ce258f24859ab79a93032dbe5052e0e1059ce63
 AUX iscan-2.30.1.1-gcc6.patch 564 BLAKE2B a80e24742c9d142ea88c2884c061efda09391aaa75885ac53de85594c5fa0c5f4b3b8f008165b647647658bbd420bcfb9a631deae3211b01f4848e3d7e22a390 SHA512 4c0ef22323f26282596d5705b0a3982bc8bca17e84f54ad9b1a23290cadbc617ae55492fd3d25e9edd283509e0a8ea1de047b18fd98fdfaf8bb22fd90c096e32
 AUX iscan-2.30.3.1-fix-x86-unknown-types.patch 362 BLAKE2B c791249488661dbe3fcf3301cfd46c04cda85ad95f8e21bae8e8f87e63e787ea69d494d7ae152dbce368ccb9fda44781201d1630e1c487cb9ad0d5d2a33e6d77 SHA512 723c3d5b6522da913ed93abaa1797f661e7eecc3974faa2bf730ced27c6a4adb3ffc87bfb38d42c4929b5afafb3cfe3e9111870aa796ea4872a053302b29ec6f
-DIST iscan_2.30.2-2.tar.gz 1216875 BLAKE2B 73a0de2b8432df026c5755df610205085c351ef586c1225d17f3f1ceb1404dae0449aaf2e6f0dbe18b98c0c1dc793fb184c17479fa08b195e6342d53bea3512e SHA512 bc5e871fa5e3baa62eee7b8b0a73abf2640a38f71f98248b1c9e1cace17c2a32de2f64c2a7527e8618f20e9913a16d0f55a8a94b3aea88ae8a157339e8bcf8e9
 DIST iscan_2.30.3-1.tar.gz 1216848 BLAKE2B 8a5f485c1dd814248c46aec6accedd331105c3ccc0f70a582e60dfb62b1cc1f1ebab358f0896b15cbf842ea06f8a35447d91f76391b10bad07df371512856c32 SHA512 5f68b2f7b7c1d1b5d3d65a55c3a80538fda5d2bdf9cd50fbf942e0eb49dcb84983ede66ed2f6354f9591692808df54415400fe02ed47e7373082869612a47872
 DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1d0914116f7ec4ae002d896853b99488eec71e5f8cb150e6b63d353efb9be11977de26d017701bc051014a SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc
 DIST userg_revQ_j.pdf 734920 BLAKE2B ed2cffdc2dbf0a2403dcbd93cef3349b9e35afb305f9b36f92b8f11bd42b5281fc7bfbec108703f327fb538868c530418406d37505e6eb6afa621d2d49d007ba SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90
-EBUILD iscan-2.30.2.2-r1.ebuild 4489 BLAKE2B ed29cfe8ed1f9394e12051b00ed32b86def372a6b04a185bf827e4851e3b386cbf892dd4e5ec82b17658964de8d3a9d2288daaff09955ac7179989b3d1c6405f SHA512 adb0808b9a1be643d18913b08d207cef5f732ee233628446772452dadf99967c1e339018029804cc7d967e52d77232a85146144a055272cb6b5336bc8497d7e0
-EBUILD iscan-2.30.2.2.ebuild 4582 BLAKE2B 27c48a10f7e146aa94e90b8827ac1fc08044e2a2fb38bddfa56946ea2c7ab5631da428b17a6e19c1537caec096c60ed360c9f489a15b6a32b032f35192848df2 SHA512 42aee5ac19f6c46d4d59bfd32db3a43235013a53d8205089401c6459069d474df1e967bc03a2e08a9bff8fbf6e4f48cbb03f847ea031dadd963724cb4a6480ae
-EBUILD iscan-2.30.3.1.ebuild 3518 BLAKE2B b7cd9cf83354897d50768d8458e1f7900d8d39296530b19df42a3ef2116cdb88975525ded7e0143bf3d055f6a33d402e556a44e718e1e5776b1c8ef28fc8e37c SHA512 d5abd277cdede2a204a0c86ae3bb1e16f54710495ce8928f039e94c448b75931967ad29cf0c96f98219478ad175a24f8fca4bbd4069d1205611481adcd155926
+EBUILD iscan-2.30.3.1.ebuild 3517 BLAKE2B 2c9aa0bf5e12e34c1637951936db597ea0d5fe70509355bf28cef8d7c0c917ed07e940632eae42f2903e00780dc05cead627a90f733ea2f532fc2b5e6d8acc9d SHA512 1331ded32c9d88312c517e5ba5447e87471a0223747d46c22ded7c3a185f715b3a9b4d2d905bb0239cbe31edc1197c7a71a5626af0bf8084b0834124d7745de1
 MISC metadata.xml 779 BLAKE2B 715d705e7775dc8aefea2c58afaf0520819abe2508ee9dde67298a2acdd847b953ac46750bc711e018eea5ddceef2ef3e7f16308c32fade334622cb9a16f745e SHA512 9ead68d2de8d4b5e09e2d478b6f198d8a83985eaa779e941189f1017beb081910fcc6c7d3c1f41db84b91df55399e5e005c326c7bb2841b2ef745d735aef562f
diff --git a/media-gfx/iscan/iscan-2.30.2.2-r1.ebuild b/media-gfx/iscan/iscan-2.30.2.2-r1.ebuild
deleted file mode 100644
index be96146638b0..000000000000
--- a/media-gfx/iscan/iscan-2.30.2.2-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools desktop flag-o-matic versionator
-
-# HINTS:
-# -> non-free modules are x86 and amd64 only
-# -> iscan frontend needs non-free modules
-# -> sane-epkowa should be usable on every arch
-# -> ${P}-${SRC_REV}.tar.gz    (for gcc 3.2/3.3)
-# -> ${P}-${SRC_REV}.c2.tar.gz (for gcc 3.4 or later)
-
-# FIXME:
-# Make jpeg/png optional. The problem is, that the configure script ignores --disable-*,
-# if the corresponding lib is found on the system.
-# Furthermore, iscan doesn't compile w/o libusb, this should be fixed somehow.
-
-# TODO:
-# (re)add closed-source binary modules which are needed for some scanners.
-
-MY_PV="$(get_version_component_range 1-3)"
-MY_PVR="$(replace_version_separator 3 -)"
-MY_DOC="userg_revQ"
-
-DESCRIPTION="EPSON Image Scan! for Linux (including sane-epkowa backend)"
-HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-SRC_URI="http://support.epson.net/linux/src/scanner/iscan/${PN}_${MY_PVR}.tar.gz
-	doc? (
-		https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_e.pdf
-		l10n_ja? ( https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_j.pdf )
-	)"
-
-LICENSE="GPL-2 AVASYS"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X doc gimp jpeg png tiff l10n_ja"
-REQUIRED_USE="gimp? ( X )
-	jpeg? ( X )
-	png? ( X )
-	tiff? ( X )"
-# Upstream ships broken sanity test
-RESTRICT="test"
-
-RDEPEND="dev-libs/libxml2
-	media-gfx/iscan-data
-	media-gfx/sane-backends
-	virtual/udev
-	virtual/libusb:1
-	X? ( x11-libs/gtk+:2 )
-	gimp? ( media-gfx/gimp )
-	jpeg? ( virtual/jpeg:= )
-	png? ( media-libs/libpng:= )
-	tiff? ( media-libs/tiff:= )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	X? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}"/iscan-2.29.1-drop-ltdl.patch
-	"${FILESDIR}"/iscan-2.28.1.3+libpng-1.5.patch
-	"${FILESDIR}"/iscan-2.29.1-png-libs.patch
-	"${FILESDIR}"/iscan-2.30.1-fix-g++-test.patch
-	"${FILESDIR}"/iscan-2.30.1.1-gcc6.patch
-)
-
-QA_PRESTRIPPED="usr/lib*/libesmod.so.*"
-QA_TEXTRELS="${QA_PRESTRIPPED}"
-QA_FLAGS_IGNORED="${QA_PRESTRIPPED}"
-
-src_prepare() {
-	local i
-
-	# convert japanese docs to UTF-8
-	if use l10n_ja; then
-		for i in {NEWS,README}.ja non-free/*.ja.txt; do
-			if [[ -f ${i} ]]; then
-				elog ">>> Converting ${i} to UTF-8"
-				iconv -f eucjp -t utf8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~"
-			fi
-		done
-	fi
-
-	# disable checks for gtk+
-	if ! use X; then
-		sed -i -e "s:PKG_CHECK_MODULES(GTK,.*):AC_DEFINE([HAVE_GTK_2], 0):g" \
-			-e "s:\(PKG_CHECK_MODULES(GDK_IMLIB,.*)\):#\1:g" configure.ac || die
-	fi
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -D_GNU_SOURCE  # needed for 'strndup'
-	# Fix selector box bug 388073
-	replace-flags "-O[0-9s]" "-O1"
-
-	local myconf=(
-		--enable-dependency-reduction
-		--disable-static
-		$(use_enable X frontend)
-		$(use_enable gimp)
-		$(use_enable jpeg)
-		$(use_enable png)
-		$(use_enable tiff)
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	local MY_LIB="${EPREFIX}/usr/$(get_libdir)"
-	emake DESTDIR="${D}" install
-
-	# install docs
-	dodoc AUTHORS NEWS README
-	use l10n_ja && dodoc NEWS.ja README.ja
-
-	# install sane config
-	insinto /etc/sane.d
-	doins backend/epkowa.conf
-
-	# install extra docs
-	use doc && dodoc "${DISTDIR}"/${MY_DOC}_$(usex l10n_ja j e).pdf
-
-	# link iscan so it is seen as a plugin in gimp
-	if use X && use gimp; then
-		local plugindir
-		if [[ -x ${EPREFIX}/usr/bin/gimptool ]]; then
-			plugindir="$(gimptool --gimpplugindir)/plug-ins" || die "Failed to get gimpplugindir"
-		elif [[ -x ${EPREFIX}/usr/bin/gimptool-2.0 ]]; then
-			plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins" || die "Failed to get gimpplugindir"
-		else
-			die "Can't find GIMP plugin directory."
-		fi
-		dodir "${plugindir}"
-		dosym /usr/bin/iscan "${plugindir}"/iscan
-	fi
-
-	# install desktop entry
-	if use X; then
-		make_desktop_entry iscan "Image Scan! for Linux ${PV}" scanner
-	fi
-}
-
-pkg_postinst() {
-	local i
-	local DLL_CONF="${EPREFIX}/etc/sane.d/dll.conf"
-	local EPKOWA_CONF="${EPREFIX}/etc/sane.d/epkowa.conf"
-
-	elog
-	if grep -q "^[ \t]*\<epkowa\>" ${DLL_CONF}; then
-		elog "Please edit ${EPKOWA_CONF} to suit your needs."
-	elif grep -q "\<epkowa\>" ${DLL_CONF}; then
-		elog "Hint: to enable the backend, add 'epkowa' to ${DLL_CONF}"
-		elog "Then edit ${EPKOWA_CONF} to suit your needs."
-	else
-		echo "epkowa" >> ${DLL_CONF} || die
-		elog "A new entry 'epkowa' was added to ${DLL_CONF}"
-		elog "Please edit ${EPKOWA_CONF} to suit your needs."
-	fi
-}
diff --git a/media-gfx/iscan/iscan-2.30.2.2.ebuild b/media-gfx/iscan/iscan-2.30.2.2.ebuild
deleted file mode 100644
index 3cf3ccb4a96d..000000000000
--- a/media-gfx/iscan/iscan-2.30.2.2.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic autotools versionator
-
-# HINTS:
-# -> non-free modules are x86 and amd64 only
-# -> iscan frontend needs non-free modules
-# -> sane-epkowa should be usable on every arch
-# -> ${P}-${SRC_REV}.tar.gz    (for gcc 3.2/3.3)
-# -> ${P}-${SRC_REV}.c2.tar.gz (for gcc 3.4 or later)
-
-# FIXME:
-# Make jpeg/png optional. The problem is, that the configure script ignores --disable-*,
-# if the corresponding lib is found on the system.
-# Furthermore, iscan doesn't compile w/o libusb, this should be fixed somehow.
-
-# TODO:
-# (re)add closed-source binary modules which are needed for some scanners.
-
-KEYWORDS="amd64 x86"
-
-MY_PV="$(get_version_component_range 1-3)"
-MY_PVR="$(replace_version_separator 3 -)"
-MY_DOC="userg_revQ"
-
-DESCRIPTION="EPSON Image Scan! for Linux (including sane-epkowa backend)"
-HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-SRC_URI="http://support.epson.net/linux/src/scanner/iscan/${PN}_${MY_PVR}.tar.gz
-	doc? (
-		https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_e.pdf
-		l10n_ja? ( https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_j.pdf )
-	)"
-LICENSE="GPL-2 AVASYS"
-SLOT="0"
-
-IUSE="X doc gimp jpeg png tiff l10n_ja"
-
-REQUIRED_USE="gimp? ( X )
-	jpeg? ( X )
-	png? ( X )
-	tiff? ( X )"
-
-QA_PRESTRIPPED="usr/lib*/libesmod.so.*"
-QA_TEXTRELS="${QA_PRESTRIPPED}"
-QA_FLAGS_IGNORED="${QA_PRESTRIPPED}"
-
-# Upstream ships broken sanity test
-RESTRICT="test"
-
-RDEPEND="dev-libs/libxml2
-	media-gfx/iscan-data
-	media-gfx/sane-backends
-	virtual/udev
-	virtual/libusb:1
-	X? ( x11-libs/gtk+:2 )
-	gimp? ( media-gfx/gimp )
-	jpeg? ( virtual/jpeg:= )
-	png? ( media-libs/libpng:= )
-	tiff? ( media-libs/tiff:= )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	X? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	eapply_user
-	local i
-
-	# convert japanese docs to UTF-8
-	if use l10n_ja; then
-		for i in {NEWS,README}.ja non-free/*.ja.txt; do
-			if [ -f "${i}" ]; then
-				echo ">>> Converting ${i} to UTF-8"
-				iconv -f eucjp -t utf8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~"
-			fi
-		done
-	fi
-
-	# disable checks for gtk+
-	if ! use X; then
-		sed -i -e "s:PKG_CHECK_MODULES(GTK,.*):AC_DEFINE([HAVE_GTK_2], 0):g" \
-			-e "s:\(PKG_CHECK_MODULES(GDK_IMLIB,.*)\):#\1:g" configure.ac || die
-	fi
-
-	epatch "${FILESDIR}"/iscan-2.29.1-drop-ltdl.patch
-	epatch "${FILESDIR}"/iscan-2.28.1.3+libpng-1.5.patch
-	epatch "${FILESDIR}"/iscan-2.29.1-png-libs.patch
-	epatch "${FILESDIR}"/iscan-2.30.1-fix-g++-test.patch
-	epatch "${FILESDIR}"/iscan-2.30.1.1-gcc6.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -D_GNU_SOURCE  # needed for 'strndup'
-	# Fix selector box bug 388073
-	replace-flags "-O[0-9s]" "-O1"
-
-	local myconf=(
-		--enable-dependency-reduction
-		--disable-static
-		$(use_enable X frontend)
-		$(use_enable gimp)
-		$(use_enable jpeg)
-		$(use_enable png)
-		$(use_enable tiff)
-	)
-	econf ${myconf[@]}
-}
-
-src_install() {
-	local MY_LIB="/usr/$(get_libdir)"
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# install docs
-	dodoc AUTHORS NEWS README
-	use l10n_ja && dodoc NEWS.ja README.ja
-
-	# install sane config
-	insinto /etc/sane.d
-	doins backend/epkowa.conf
-
-	# install extra docs
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		if use l10n_ja; then
-			doins "${DISTDIR}/${MY_DOC}_j.pdf"
-		else
-			doins "${DISTDIR}/${MY_DOC}_e.pdf"
-		fi
-	fi
-
-	# link iscan so it is seen as a plugin in gimp
-	if use X && use gimp; then
-		local plugindir
-		if [ -x /usr/bin/gimptool ]; then
-			plugindir="$(gimptool --gimpplugindir)/plug-ins" || die "Failed to get gimpplugindir"
-		elif [ -x /usr/bin/gimptool-2.0 ]; then
-			plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins" || die "Failed to get gimpplugindir"
-		else
-			die "Can't find GIMP plugin directory."
-		fi
-		dodir "${plugindir}"
-		dosym /usr/bin/iscan "${plugindir}"/iscan
-	fi
-
-	# install desktop entry
-	if use X; then
-		make_desktop_entry iscan "Image Scan! for Linux ${PV}" scanner
-	fi
-}
-
-pkg_postinst() {
-	local i
-	local DLL_CONF="/etc/sane.d/dll.conf"
-	local EPKOWA_CONF="/etc/sane.d/epkowa.conf"
-
-	elog
-	if grep -q "^[ \t]*\<epkowa\>" ${DLL_CONF}; then
-		elog "Please edit ${EPKOWA_CONF} to suit your needs."
-	elif grep -q "\<epkowa\>" ${DLL_CONF}; then
-		elog "Hint: to enable the backend, add 'epkowa' to ${DLL_CONF}"
-		elog "Then edit ${EPKOWA_CONF} to suit your needs."
-	else
-		echo "epkowa" >> ${DLL_CONF}
-		elog "A new entry 'epkowa' was added to ${DLL_CONF}"
-		elog "Please edit ${EPKOWA_CONF} to suit your needs."
-	fi
-}
diff --git a/media-gfx/iscan/iscan-2.30.3.1.ebuild b/media-gfx/iscan/iscan-2.30.3.1.ebuild
index 39e701ef3778..bc1a2e5b8a03 100644
--- a/media-gfx/iscan/iscan-2.30.3.1.ebuild
+++ b/media-gfx/iscan/iscan-2.30.3.1.ebuild
@@ -29,7 +29,7 @@ SRC_URI="http://support.epson.net/linux/src/scanner/iscan/${PN}_$(ver_rs 3 -).ta
 
 LICENSE="GPL-2 AVASYS"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc gimp l10n_ja X"
 
 REQUIRED_USE="gimp? ( X )"
diff --git a/media-gfx/jhead/Manifest b/media-gfx/jhead/Manifest
index 587fd91aa744..52dd9749f6cc 100644
--- a/media-gfx/jhead/Manifest
+++ b/media-gfx/jhead/Manifest
@@ -3,6 +3,6 @@ AUX jhead-2.90-mkstemp_respect_flags.patch 892 BLAKE2B 3a0c4ae7bf32391b32a405541
 DIST jhead-2.97.tar.gz 68361 BLAKE2B ed13d637dc491ad1c6ed7f9a5b0b526c80f69b8c521e3618289b16523ebb12690fa53a0a273f3f5793f970f390430d56c8504bed30fb45c5e9e2a9ac248f7667 SHA512 9b33451546e5ad3b82fe6001515fd572925a1e2c11af763ae32d71ad2cb056ffa8d97abe14bd48ae5f6144da9d8322965387537d61e22d22b02624ebf351c230
 DIST jhead-3.00.tar.gz 69151 BLAKE2B 23522718f07cd0b52b3d7fbd6d0f69ca5ecd5499174b06c6572be1319b275dc93eacd270f33cd7b3380ef85e6615aa79adf1fa9a1a86404876b35c31cdb0c95e SHA512 daedfe7ea6be051f769e9a1e0946ea0fa741f387bbc5ba55eec394fb3f37b18a66aa8826190c790eb50a5b9d445ee0d5a28a08d181db3be469686b0675540fbe
 EBUILD jhead-2.97.ebuild 745 BLAKE2B 41bee772b4941cba460549b464f24758b716d4ed3012a544e2277deea5cd651ef0fa3519d6b7c77a3b0512320b7936294c0ea4a8b574ce5c7141cbb82f566a9d SHA512 690547b5b0b4eb36153ff782f6e55e8b67155e677cba2ace3a0ec6cdd0f3d1eda313dcaea5e33a417e98c1c113cfb22de011a88117f31dcea7ab7858e229bb67
-EBUILD jhead-3.00-r2.ebuild 712 BLAKE2B 553ff5f7d3782219a5f1d101139ef5e7969615bd6592ce4e21b1fa0977500dfe4029654c397034a5f7df78e70626be9143b0fd4cf436d95f152aba86eef1a093 SHA512 cec895df2fddd9ddb33bfbaba45136951f11de3a79b1e6b1899aef557d8dd982be053807f60eb8c28a8c7f3dd731bf8059ae8568749cdf8a3ecaf1a8bb23f0eb
+EBUILD jhead-3.00-r2.ebuild 711 BLAKE2B fd9cd6299a0a6d4955e58e4f5ee3af77f14155aff3687fcff8c3a6b91cd4095cf950987893f3d30fdeb6936fc4f081c877c52e0c868120e2392e0436e9fa3347 SHA512 98ba55bf301b2cdcd5ab8b53e1e1612b62da19aa5c41f884eb1e72936487b747b45ab06375489d8999a91d549a57c816079f0d219c6ac929bc9164d425a27e84
 EBUILD jhead-3.00.ebuild 746 BLAKE2B 576096a432b63a988861a85e05ebb92f1a4346bd012f74269629a2b868254a372699a4ed3be74ae78cb90df792ee61e77842da6da46ec98ae6a570faedf3fb89 SHA512 2f711c62175a02cc968fc698fffff784743a8befe3c315d294e78978357de5df3ee0c665ae70baf64091db4c3744f1c2aa3853fcae87754eb8a67d0a08ebe4a5
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/jhead/jhead-3.00-r2.ebuild b/media-gfx/jhead/jhead-3.00-r2.ebuild
index 09eacfbb60c7..bdd27b31809c 100644
--- a/media-gfx/jhead/jhead-3.00-r2.ebuild
+++ b/media-gfx/jhead/jhead-3.00-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.sentex.net/~mwandel/${PN}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 src_prepare(){
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 4580ba67bc9e..114a3faa7fdf 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -3,7 +3,7 @@ AUX krita-4.1.8-fix-pre-5.12-tablet-support.patch 1794 BLAKE2B d67cfe9a758e26416
 AUX krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch 1591 BLAKE2B d11c8b3a7f5a70c40fe5c0f19bcb06c9a2b047e651a27ce3de9e8ecc41287171b50566b481a8ca49b7625aae1ffd0db0a507b1ad7928b6c959de15ec7b7c2dc5 SHA512 3d1d9c09abb2b72d6d7ef5061e7fdb4ca98a4d7f7d1356833fa518da6bce52f9959532f0417b7e30a305ef052acc59dd2b27ef71e1de5fa138fe4f107528517a
 AUX krita-4.2.0-tests-optional.patch 9915 BLAKE2B 3f63d2b30630e42413e58d23429c3df917c926d793c570be87bf59b83af9ec5740b220bbac433c928748dededf6714936c041433bc723c9612a45372311e6dc5 SHA512 72c62152ef767daedee84da58f179b34b0dc38adb03e63433c2870e0de93d30d2e929e65d7a8c8cd968b200ca0d87e570ab3c13f5be8b78b1c328dc3489ccb3b
 DIST krita-4.1.8.tar.gz 244065767 BLAKE2B ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157 SHA512 d027444415bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
-DIST krita-4.2.0.tar.gz 240015177 BLAKE2B 09992b50dfa4e244c809dd576c3b7c0d1cb09b19fde0985c3d72b57543e5a06aa863b9011d655432a089fb6869e2e7fdb23939877b0c4ee6aaf44a1c88e7084c SHA512 a6f373839e47c4e97f5680d266d1ea9f438db6636d3f8749f7fbf6d93b5329e1d46f7233af901dd224722c08100c4fc3b162a163c721299ebfa2d4939032ae44
+DIST krita-4.2.1.tar.gz 245929278 BLAKE2B 06544424bae7965be2fbf7a0e9d4fc260de80f16e6f8beba600432139e20f4c9bde24244d5b8ce5573fbc354ee0461c6930255f47798618998b895828a682390 SHA512 879d1efe2e3f888a5f37a843ae739f6441d142f0a2831f15b11e7a86e1c4df99fee0bda9accc7a41d374f3df16cff60ac17e490b4f656db0b480fd32a5bca3f1
 EBUILD krita-4.1.8-r1.ebuild 3390 BLAKE2B 4cb6c211221e5a0e13ce674b7a10c984539a5e5f529a533d6e56f1facfe591e7d1b57707a84c8d87266221cb5445ad7fd15b57954d3a67b114c46c90329730a8 SHA512 14e135e8d6451489127ca1653179de82d7460d182ad6a18bd4fbabd81d16851fcaa783d06be2bbc8cef9ea435f90f5a3f799cf87a338888188acb26ee9b3564a
-EBUILD krita-4.2.0.ebuild 3147 BLAKE2B 6238662d22d67a15503dd4c63b9e8c41c4c14144a50c33737b7b1777dc49c961102794a71f22a987fc706b01e5eaab091d78db172d207be0fe176296b1df61db SHA512 b8f6035e84083790fb1000f991daafde41a2c7423dd586d1493ba1157e11587dba39b20dbc3ebf8aa8bc14b04fb41d09114d9655c53eb1ca3af661a6f7dd0e41
+EBUILD krita-4.2.1.ebuild 3154 BLAKE2B 671e4a47b6485efff0ee69b74ef05030be2d93ce282a9b554ddbcb6d7abcd46c198710d007f38a132fada4719611f3f72726d598e09bd9fc6fad1d6a909f4968 SHA512 667a9f2b187e98fdb2e3aeadd52e6f5e1c321cca003969294147566008c02361f2ddd1f618fdfb6c5453de729141218d1a94762260e17b27ef5b49ac87f7e7c9
 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/krita-4.2.0.ebuild b/media-gfx/krita/krita-4.2.1.ebuild
index 3153c3eba368..f9b39e3a7afa 100644
--- a/media-gfx/krita/krita-4.2.0.ebuild
+++ b/media-gfx/krita/krita-4.2.1.ebuild
@@ -87,7 +87,7 @@ RDEPEND="${COMMON_DEPEND}
 # bug 630508
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" )
+PATCHES=( "${FILESDIR}/${PN}-4.2.0-tests-optional.patch" )
 
 pkg_setup() {
 	python-single-r1_pkg_setup
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index 8883306138be..673496a8aa02 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -4,6 +4,6 @@ DIST libimagequant-2.11.7.tar.gz 74311 BLAKE2B 204fbe794014c11d767991a03e729b234
 DIST libimagequant-2.12.2.tar.gz 75611 BLAKE2B 23f5d3666fd21696d4f4dab9db3669642a9e3f6ca971804b914e845018df538136c3db900419ac35230be9fd487b48e0ab672b653e2ee82387c19569b49d6cfc SHA512 7e7bfcffd163d8b73a46d523dc441e4a4726f5dde804f306f13900f74afae6f6e7cf780bf157b5823a71c790bcdd0e9c9c34cf43f84a21289e470fc78835d8d8
 DIST libimagequant-2.12.3.tar.gz 75866 BLAKE2B 857a0e3f0187251e37e0c7f4f5f5cbf49266e4eb9f684118705778d9469330cf95780ea11b83d19e28251f047a7e9b8e7ac32ac4d9554cb5d9e1b3230d39e796 SHA512 4818b00b6f154407f3e402d56f4891c2d7594c8056fada0402d7fa0024ae50127340dd8295da5f5dca13fe1829670a3fa8793aa528f3e74a2294c9a7e37b7257
 EBUILD libimagequant-2.11.7.ebuild 1191 BLAKE2B 61db0687381d1ad9c124e94be50b93bba3d70a3758dfdde81bbf3fe2a9a9ffd26cc73ef29ee1fc7bbd3fdab8947b7316c76622ca1c5f28f923212c63ca2c81fa SHA512 38db43ddfb6c4e8aad817dde0cc20ccf5397f4bcc4a3183a33d1256122a42a79ba6b079677746b31d17625b275f2e3d9e346e314a1311981b86d4add48238dce
-EBUILD libimagequant-2.12.2.ebuild 1453 BLAKE2B cc36b27f971c7bdbbfb22a9b14ad70d00129aa90b1cc248cb512040d9a36f6e290acf5a5e6b34f672fc0b0cd95597569ee3d38e0cee57dbdfaa0be4dbc54c19b SHA512 c58252bd015bf0949df83f2781525b94578b19e9827837f50382db171c169af3c5239cb67bf68959411c1d6c231b3182b3ebeeac1ba0ef309514ff535a4eee4d
+EBUILD libimagequant-2.12.2.ebuild 1451 BLAKE2B c2864c295cca60262bd47c613d60fafa2f6f5cb3f3fdf6db13c334fd7470d8109fff3a75b2fa95ba267dd528e25ac5ffa0cb5c32ea241e179d76108b56a2e010 SHA512 132f76b9be03b93143f7117de9923f2f79d8e1b05843320bcfc57cffc5ee5f8b89890a4edc964f08d389c801f4f9be298548be297c4507e001f555602901a378
 EBUILD libimagequant-2.12.3.ebuild 1458 BLAKE2B b700b2e73c2a8429d9c8f171fb0279c2644baced6ed32b00c11af4f77bfaeb1b52ff09474ab91c1eed67aec08cb8c4d85299fa58dc6584e396891076f9c34092 SHA512 9a36392be28772244fc8785d919a91e1d7cef28815808c804d4ec40c862c895cdd7bc659eea278a7ace57153079cff914ad632930602d910548ef0f86795f7ff
 MISC metadata.xml 527 BLAKE2B c3fa42153fa6cfede4de3d59e12063aeb44f67ce89d36be63c7df4671c57ecfdd43d08aee89bd96387ecbee2e41b1d5921e9ad2486b4dd8f06e6e93529afb0a8 SHA512 82b458b27288b6b49df16d5778f6c75b492d958bcc1c2f2950dee741bfddc82f561be50f590d3f891bf736ee67e5325ae297bf49f99c769ca97ac68042beee11
diff --git a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
index 29794caf1359..3b54e4177a1b 100644
--- a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_sse2 debug openmp static-libs"
 
 DEPEND=""
diff --git a/media-gfx/llgal/Manifest b/media-gfx/llgal/Manifest
index 09cb6e4cb5ae..f732b278459b 100644
--- a/media-gfx/llgal/Manifest
+++ b/media-gfx/llgal/Manifest
@@ -3,5 +3,5 @@ DIST llgal-0.13.18.tar.bz2 81674 BLAKE2B 96b48e9d6ad91ad2b11cd898563c7640f047ddb
 DIST llgal-0.13.19.tar.gz 96675 BLAKE2B b306eed900a1071898ebe2d0dcbfeb9c505271ec8d5889e75fcf189dee22489fb8d671ede05a1af74a7761b604d8af8e3b26b8771ec50c8e49036000e90258fd SHA512 24f247071678f21c79e37002a443ff222e9e99e9bf04363fc123c5d9538a35db100ea814408e2bcc9e20781982145301df3337e521413651547828654a92d169
 EBUILD llgal-0.13.17-r2.ebuild 914 BLAKE2B d52a3d2ae2de6da933bbd651fa215dfd7609bf6e34afcda0b753f5be1dd5a5cf269ceb508c0c50f2b2497f6f8998904ded0f51d639a16f207da495f99d1cd05e SHA512 c7150f19b551b77c7934f4a12fe9b60c0ec2ef96eacdc0e4de192b0d8ba088609373436499ef2351983f8d279fb269908479ee12da26bcb1dbf3b50110cf419f
 EBUILD llgal-0.13.18.ebuild 916 BLAKE2B 0b6156409e0440708cd37e45d7e16c326c643c5ef35090de4e40fa8c802ee5d457db139ffb0149e59d4f80417a6c6b408deea06a1e9802f9589b3eaa67d7a690 SHA512 9960069fcf88897ddbfd5cc026ca9dea6f1bbcfa0fd5ab437af970a260db06bf52268730ea425af451fb0847c070ec07305de126884c8f550f0329c266d52b9a
-EBUILD llgal-0.13.19.ebuild 1072 BLAKE2B 637838ea6919ac4aaa892e605320eb4a985696c55bba4b57b0d5b5984a389276c575245bffad3625f28ccd1aa7fac03513bd0b73c91f8ac03ab7ebe9cd91d47e SHA512 3ad5caf2d360216a34fc14e4900fde19564e9bee8ce9da745b235a7f118f5b36742c2bc8e92d887166b9463de478148366dc5c0fc29197a64f22270d461e8dba
+EBUILD llgal-0.13.19.ebuild 1071 BLAKE2B b5b2c4b2b548880a68f9bd77bfd50f2e479042fd50578273fc9bc390fc1c832ed726dbb02c81ed9c5aa15de9939daa1012bcb7a3c171f9d579d2b3b3246b2851 SHA512 aecc703b62a977357ba104b11713476f07a6e3982f3c879d2620f7da2bdafc45d1ed47cf913052ab50f018991e2026d35be114e060e1e651380eb75883b0d9a6
 MISC metadata.xml 365 BLAKE2B 91e30c99cee02f64efac65038cd7e3e04b37f466b83d423cef36a31a071ee9ffd38fc1d46b71f736ee87d846d9787348720b49c83fd2aa6e402dd2817b18fec3 SHA512 2abbab6015809e7c8f484a40cfd646173763f54cec04f2aa71a550dcc8c4dde96f8d692d03de6280411b480a0597708da655eaf0005e3f8b4b87e65cbc44f04a
diff --git a/media-gfx/llgal/llgal-0.13.19.ebuild b/media-gfx/llgal/llgal-0.13.19.ebuild
index b65d69d63edc..e42d2ab056a7 100644
--- a/media-gfx/llgal/llgal-0.13.19.ebuild
+++ b/media-gfx/llgal/llgal-0.13.19.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/bgoglin/llgal/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 # Package warrants IUSE doc and possibly examples
 IUSE="exif"
 
diff --git a/media-gfx/nvidia-cg-toolkit/Manifest b/media-gfx/nvidia-cg-toolkit/Manifest
index 704303f962f1..4750666aa0e5 100644
--- a/media-gfx/nvidia-cg-toolkit/Manifest
+++ b/media-gfx/nvidia-cg-toolkit/Manifest
@@ -5,5 +5,5 @@ AUX nvidia-cg-toolkit.pc.in 242 BLAKE2B 45f19a2791310975169f8a31bf65d77a86b4e448
 DIST Cg-3.1_April2012_x86.tgz 23332348 BLAKE2B e8253cfd1b569e1eb083ca394ae969ca43677641763eb77c24381198914cb1508bd41489224d8cc1afefca2affb485320022bd35e7ffaa48aaadafcf42f89183 SHA512 7b2addad157e151eb42b320aea31ccddfd53ec5640cb97bc86a3d461c1b08a2dff280bfc3f7859d124c311e1710e39d40405c387e5724ebc82d95303b250837a
 DIST Cg-3.1_April2012_x86_64.tgz 24829131 BLAKE2B f1425f391022aa57fe2b23581786576ab8762a48e9ffc875853d55399d3a996ac85debb099d0b906dcce6c95989a06c3980bfb59dc69edc16d1378ba5dc89c73 SHA512 591b51195193e7e3bbb9f1c2579336d24a179b0a88b955a01f4661bda55543fbccd73cac53033912f2eea8a1068e4c1394c6d286f195963cfb33a0d8b4428e27
 EBUILD nvidia-cg-toolkit-3.1.0013-r3.ebuild 3270 BLAKE2B 43cb73b6ea942446de89ee94686af08f53c33226b7eefb95e202d638576c69c5e6ace010f1aec63e45c27a8b062f5298de59c3b88508ff39ffbd415972cec600 SHA512 bda4e6a0e4793dae86a35d046760f0763ef5f92a962e6ab9af3a091f951b783a1c082746aa8c346f3cd31a43fdfa7cf44acd8b665cf23fd8699f088b4c4356f3
-EBUILD nvidia-cg-toolkit-3.1.0013-r5.ebuild 3178 BLAKE2B 3428f817af215a1c4b8c83e6f1849768bfbc15379920654cb8c5d2a1808a6abd19ce95a8372dae98cec7d22b96078040bb07d7f1216d777b0c75c81c711d9f75 SHA512 db6ef0aebb9f2e5516448e5ac58c1297f4feaa8e68531c739d0ce8f00e633b4f7c2ff94b2eeb503886b1322eddb459555750b7ff4cc4646fc86c1de1835300da
+EBUILD nvidia-cg-toolkit-3.1.0013-r5.ebuild 3177 BLAKE2B 75152e6051dbe1fbb6c9c1f176b1733a7a7910fc47f4998e2e14ef109dd89cca1f21e20afd74b092078bd87154defb9a7269f9d1af51dbffce265ba1fe66a21b SHA512 194f642e56728a90c69115281ec7fdd0d346b50755ed337f8c1f31d4e877b1b6942cbf0ff562d3c05d478a8c20b32fdda9b82b6a25aa17b6d486ad7c18732dae
 MISC metadata.xml 652 BLAKE2B 8bb1f448a07402e9de7b8265b50318595c3b7de92b8b444b92dce29ac428682ab856f6d4ed668579a8fcda48b8d17f975b69d08154a54cefe7dce8916db0e0a3 SHA512 cde9ca3c2c16c3a83593c4fbdd1b05f5b79596f42d77df5f20470d7e2cbca2e445fcac254dcc7f31e41938f756d1bd5b314c7aa1a2dc6a7bc19f170a4d7e1656
diff --git a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r5.ebuild b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r5.ebuild
index 7f8c81f2e733..9b989032fff8 100644
--- a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r5.ebuild
+++ b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r5.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="NVIDIA-r1"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples multilib"
 
 RESTRICT="strip"
diff --git a/media-gfx/openexr_viewers/Manifest b/media-gfx/openexr_viewers/Manifest
index 8abb49104bff..d4d877ea25c8 100644
--- a/media-gfx/openexr_viewers/Manifest
+++ b/media-gfx/openexr_viewers/Manifest
@@ -1,14 +1,5 @@
-AUX openexr_viewers-2.0.0-nvidia-automagic.patch 434 BLAKE2B adf9fb0455af68739344527f5119ef31976ce1f078f445900567e9afbb23bf233c3890b669db931d33114bf2e497f4550882747730803147e271441416992e90 SHA512 6c05ec9708822559e8f84f601f8ede89d4e9820cbbe4b49b93ac6d0ba228fa602b699f13540d2169ce16b144ec85db63d06262001bfa391e80f2febfa66ceec7
-AUX openexr_viewers-2.2.0-Remove-nVidia-automagic.patch 869 BLAKE2B 5a3576eaa7c5cc87e885e75fd13e5cf00386be0473fec7655278ddacb8b4084570cbe821097ec32036d9e37f8d8414e391171a8efd511114a6c1c285e236aa93 SHA512 232f990857bfbac7c8417e818e2efe0926a3d5fc20d7392c90a79a4762f26bf3044cc46729feafe407c73c75372ef52af8fa22247d82a4eb982fe538ac71de40
 AUX openexr_viewers-2.3.0--with-cg-libdir.patch 811 BLAKE2B 0f2789e55efd1cd25308abfde02bb67fe77a099a509a4bac78eca078de6b18e326705718db061338b4881414e688fa307d70d132a0ba0ff72eaade127234b732 SHA512 02f579d246936f1ebb8e6afa36e21c10cc6fc7eb1a24e168b75c27aafc6a6abccead8e9879d1128a1d6f22ddab4162c97c2df5940c6b71cc6d6fc2cb89527bda
 AUX openexr_viewers-2.3.0-fix-configure.patch 2449 BLAKE2B 226728e4183784337ab684b9245f74110772156fea1b4be8441c7bb14fe2887484691c200e05604f9308204c9221d5b7e7f3c343e5db3cdf0a8896fb13fc5590 SHA512 29a22fee7f88ce1359e74185f8baffa9e734f20555943cced71c198f5c716ab8f8aa5686f11f40e5ebc10911cb82453b784eeac06632f6700d8f4fd3a9ec5e1a
-DIST openexr_viewers-2.0.1.tar.gz 495240 BLAKE2B 4cccdcca362c59f77eb73c03c4300e64d2df9456b0108908fac96e0ae5d5c804525f9fe321ac159043b18c05727addb5e318ed0ba002132c3e2a5728256838a5 SHA512 75af19e4a06d31bbb21217bc75a800852d2817dd9d120b879c377316e8aa64f75c49dccbb0d2a4d11d949f48b8fac40249692d1286a77e4812e43b3e8e303235
-DIST openexr_viewers-2.1.0.tar.gz 497290 BLAKE2B 15d8c23e8a738788f7aeb896b671a42005569a8cf177fbe193d9dbe4df418302be2beabc86344a88137a3a0e6b7b8bbfd66ec213882e52d4df5788157e182163 SHA512 fd3b08ad91b1b2299d01d56c7a17694538fd912302db3472a8d8621b49a699a42604de8d816288399b31207304c7684de198acecd2c8a9825d35b827b8a2ddaf
-DIST openexr_viewers-2.2.0.tar.gz 486235 BLAKE2B db1ebc95dfb7d5b9b1ead3cd3d1eeb4406e4ad5704c90b080d3929c7dea7a2be631e74e2cb597803f55e05783fda43fdb33edc64ba63522d31122f96a4675608 SHA512 ab2f15d0352fa4e9daf76c7317312dad6cfe7b65a86affaf057c8eceb48d2637fc0df58125ea2ec5ad3b7251eed392a8eccff1001cfeced969bbb66fe92284f8
 DIST openexr_viewers-2.3.0.tar.gz 532154 BLAKE2B 353c69a6efbdab6ef7669f531be22b34c11cce3cc790b513eb99d323fc5e1827cb4b0656eab2db61ee89f01c02169c3c855cc4222275964156f31928ae08e015 SHA512 2b7ce7c75733f390bec5c3f9c49edc08da2631e3a45ae20a732dddf9fd813137c3124d0c6e90450fa2b9068f0c40c76374ee7ff9cf0d8697080b2b180c624c5d
-EBUILD openexr_viewers-2.0.1.ebuild 1227 BLAKE2B aa225ae704ef4614127f47817b812bb9975435a9b5015a2e5596e9d9aee54f45202d90f3970dba6bde7ca88a97b3d5270d67890d317a437ebfb7ee456f16d962 SHA512 cf7faacc6078a1e6d4f75aec1ce45b55b9811e012a71e4f6c5efda9e689fb35be1935adc078bd43b43aa7042103e9ea2de381f9cfe7fdb49d4fe3f16d166a818
-EBUILD openexr_viewers-2.1.0.ebuild 1220 BLAKE2B d3eece43d3c4c80570fe7a385e5f353d91414d5bfb2573a0f155c7d842e7da23c67633f6d967af1a5b2f2b4486ba8d6491f3ce5bc80f27b6a7da87369f67067b SHA512 f2132a37c732990c3043fdbbc2db64ef46e4fc4b87938233c6c96d95224665c28b6e6171a98eff1b80852717850224a0c042600cbb63beb0054c3a0d49287fce
-EBUILD openexr_viewers-2.2.0-r1.ebuild 1228 BLAKE2B 6406bb6f15b05d1ae4b0a4aeba3eeb149a0860fd371673fbb2ddb8a597b071fb93274aaf361e067ce4c037d7c4d017c4dbfc232b6d0791688832596bfc52e6ff SHA512 5a2f7c5b8978e32e766cf5da6f089db8cdedc5522e44a619faca728d73398fefa11924ab34e3dd7a5eb0b4f6d0595b442d6dcca9e3fc66491bf58cce134cd6ce
-EBUILD openexr_viewers-2.2.0.ebuild 1227 BLAKE2B aa225ae704ef4614127f47817b812bb9975435a9b5015a2e5596e9d9aee54f45202d90f3970dba6bde7ca88a97b3d5270d67890d317a437ebfb7ee456f16d962 SHA512 cf7faacc6078a1e6d4f75aec1ce45b55b9811e012a71e4f6c5efda9e689fb35be1935adc078bd43b43aa7042103e9ea2de381f9cfe7fdb49d4fe3f16d166a818
 EBUILD openexr_viewers-2.3.0.ebuild 1307 BLAKE2B 6486e650eb12a71f9525542f37052da5c9e5888f0bee7dba5bd1d192cc9c0d25995d35b0675b2d2abc467f302a595fcb28d6709be78780939ef21d5c8d78fc1e SHA512 b86ba68608e36b3b67384cfb62f7e51c7d190799fdb9d624833749634ed917c646add678eef1eac5746a775a61cee2df4e005e35f98c4e98f96daa44b813c794
 MISC metadata.xml 379 BLAKE2B 3f58950f3fccc797478abbd2b60325904cc3288586e4a180a366e0b99bb7ffa4a08022138c658b3e0db861a720232b44b7bf4bb2b2bdb7f59856272961e1c6c8 SHA512 97d3ed7e0ee8f419d36df6b6ccc3b3e704445935b76fab412b4287ac1b88688591f775927e1cc333a85a64818cbe1c9c3e760d2ab734215c0f558639ca033b6a
diff --git a/media-gfx/openexr_viewers/files/openexr_viewers-2.0.0-nvidia-automagic.patch b/media-gfx/openexr_viewers/files/openexr_viewers-2.0.0-nvidia-automagic.patch
deleted file mode 100644
index 1ea9f869a671..000000000000
--- a/media-gfx/openexr_viewers/files/openexr_viewers-2.0.0-nvidia-automagic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -192,7 +192,10 @@
- dnl
- dnl check for Cg
- dnl
--if test "${have_fltk}" = yes; then
-+AC_ARG_ENABLE(cg, AC_HELP_STRING([--enable-cg],
-+  [enable nvidia cg support [[default=check]]]), [want_cg="${enableval}"], [want_cg=yes])
-+
-+if test "${have_fltk}" = yes -a "${want_cg}" != "no"; then
-   AM_PATH_CG(have_cg=yes, have_cg=no)
-   if test "${have_cg}" = yes; then
-     AC_DEFINE(HAVE_FRAGMENT_SHADERS)
diff --git a/media-gfx/openexr_viewers/files/openexr_viewers-2.2.0-Remove-nVidia-automagic.patch b/media-gfx/openexr_viewers/files/openexr_viewers-2.2.0-Remove-nVidia-automagic.patch
deleted file mode 100644
index 41fba94523a9..000000000000
--- a/media-gfx/openexr_viewers/files/openexr_viewers-2.2.0-Remove-nVidia-automagic.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From e8d26df2a888f307e61584367f5dc14894d8be82 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Sat, 23 Sep 2017 13:39:34 +0100
-Subject: [PATCH] OpenEXR_Viewers: Remove nVidia automagic
-
----
- OpenEXR_Viewers/configure.ac | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 94c88cd..1de94f6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -194,7 +194,10 @@ AM_PATH_FLTK(have_fltk=yes, have_fltk=no)
- dnl
- dnl check for Cg
- dnl
--if test "${have_fltk}" = yes; then
-+AC_ARG_ENABLE(cg, AC_HELP_STRING([--enable-cg],
-+  [enable nvidia cg support [[default=check]]]), [want_cg="${enableval}"], [want_cg=yes])
-+
-+if test "${have_fltk}" = yes -a "${want_cg}" != "no"; then
-   AM_PATH_CG(have_cg=yes, have_cg=no)
-   if test "${have_cg}" = yes; then
-     AC_DEFINE(HAVE_FRAGMENT_SHADERS)
--- 
-2.14.1
-
diff --git a/media-gfx/openexr_viewers/openexr_viewers-2.0.1.ebuild b/media-gfx/openexr_viewers/openexr_viewers-2.0.1.ebuild
deleted file mode 100644
index 55ed1bb8c3a6..000000000000
--- a/media-gfx/openexr_viewers/openexr_viewers-2.0.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="OpenEXR Viewers"
-HOMEPAGE="https://openexr.com"
-SRC_URI="https://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="cg opengl"
-
-RDEPEND=">=media-libs/ilmbase-${PV}:=
-	>=media-libs/openexr-${PV}:=
-	media-libs/ctl:=
-	>=media-libs/openexr_ctl-1.0.1-r2:=
-	opengl? (
-		virtual/opengl
-		x11-libs/fltk:1[opengl]
-		cg? ( media-gfx/nvidia-cg-toolkit )
-		)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
-	epatch "${FILESDIR}"/${PN}-2.0.0-nvidia-automagic.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if use cg; then
-		myconf="--with-cg-prefix=/opt/nvidia-cg-toolkit"
-		append-flags "$(no-as-needed)" # binary-only libCg is not properly linked
-	fi
-
-	econf \
-		$(use_enable cg) \
-		$(use_with opengl fltk-config /usr/bin/fltk-config) \
-		${myconf}
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		docdir=/usr/share/doc/${PF}/pdf \
-		install
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/media-gfx/openexr_viewers/openexr_viewers-2.1.0.ebuild b/media-gfx/openexr_viewers/openexr_viewers-2.1.0.ebuild
deleted file mode 100644
index 650319596225..000000000000
--- a/media-gfx/openexr_viewers/openexr_viewers-2.1.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="OpenEXR Viewers"
-HOMEPAGE="https://openexr.com"
-SRC_URI="https://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="cg opengl"
-
-RDEPEND=">=media-libs/ilmbase-${PV}:=
-	>=media-libs/openexr-${PV}:=
-	media-libs/ctl:=
-	>=media-libs/openexr_ctl-1.0.1-r2:=
-	opengl? (
-		virtual/opengl
-		x11-libs/fltk:1[opengl]
-		cg? ( media-gfx/nvidia-cg-toolkit )
-		)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
-	epatch "${FILESDIR}"/${PN}-2.0.0-nvidia-automagic.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if use cg; then
-		myconf="--with-cg-prefix=/opt/nvidia-cg-toolkit"
-		append-flags "$(no-as-needed)" # binary-only libCg is not properly linked
-	fi
-
-	econf \
-		$(use_enable cg) \
-		$(use_with opengl fltk-config /usr/bin/fltk-config) \
-		${myconf}
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		docdir=/usr/share/doc/${PF}/pdf \
-		install
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/media-gfx/openexr_viewers/openexr_viewers-2.2.0-r1.ebuild b/media-gfx/openexr_viewers/openexr_viewers-2.2.0-r1.ebuild
deleted file mode 100644
index a141f777a8ea..000000000000
--- a/media-gfx/openexr_viewers/openexr_viewers-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic
-
-DESCRIPTION="OpenEXR Viewers"
-HOMEPAGE="https://openexr.com"
-SRC_URI="https://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="cg opengl"
-
-RDEPEND="~media-libs/ilmbase-${PV}:=
-	~media-libs/openexr-${PV}:=
-	>=media-libs/ctl-1.5.2:=
-	x11-libs/fltk:1[opengl]
-	opengl? (
-		virtual/opengl
-		x11-libs/fltk:1[opengl]
-		cg? ( media-gfx/nvidia-cg-toolkit )
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${P}-Remove-nVidia-automagic.patch" )
-
-src_prepare() {
-	default
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if use cg; then
-		myconf="--with-cg-prefix=/opt/nvidia-cg-toolkit"
-		append-flags "$(no-as-needed)" # binary-only libCg is not properly linked
-	fi
-
-	econf \
-		$(use_enable cg) \
-		$(use_with opengl fltk-config /usr/bin/fltk-config) \
-		${myconf}
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		docdir=/usr/share/doc/${PF}/pdf \
-		install
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/media-gfx/openexr_viewers/openexr_viewers-2.2.0.ebuild b/media-gfx/openexr_viewers/openexr_viewers-2.2.0.ebuild
deleted file mode 100644
index 55ed1bb8c3a6..000000000000
--- a/media-gfx/openexr_viewers/openexr_viewers-2.2.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="OpenEXR Viewers"
-HOMEPAGE="https://openexr.com"
-SRC_URI="https://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="cg opengl"
-
-RDEPEND=">=media-libs/ilmbase-${PV}:=
-	>=media-libs/openexr-${PV}:=
-	media-libs/ctl:=
-	>=media-libs/openexr_ctl-1.0.1-r2:=
-	opengl? (
-		virtual/opengl
-		x11-libs/fltk:1[opengl]
-		cg? ( media-gfx/nvidia-cg-toolkit )
-		)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
-	epatch "${FILESDIR}"/${PN}-2.0.0-nvidia-automagic.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if use cg; then
-		myconf="--with-cg-prefix=/opt/nvidia-cg-toolkit"
-		append-flags "$(no-as-needed)" # binary-only libCg is not properly linked
-	fi
-
-	econf \
-		$(use_enable cg) \
-		$(use_with opengl fltk-config /usr/bin/fltk-config) \
-		${myconf}
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		docdir=/usr/share/doc/${PF}/pdf \
-		install
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index 9a3c00175b0a..075ce3b00505 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -1,11 +1,9 @@
 AUX openvdb-4.0.2-findboost-fix.patch 747 BLAKE2B a9dbded82960113bc3e4f623636d446a3877abf117980abc3660703e513bbebfe70b153d5b216afbebee9ccb7edda0902cbfb88c0e702e0282b9798910e965a3 SHA512 e29ee68ffd907da86d67cf7ca8e2adb955acc1725d5d22be7e1851f2c387e17fb51b46630964e897c3b536be3f05705f86ddd70be53c2329a171a8d23dd7fd4e
 AUX openvdb-5.2.0-use-gnuinstalldirs.patch 10981 BLAKE2B 5ffdb1ec77280bc926d57fdccf9aa74db470e6031025a79e9503196bf4e4fa1984401eea8e5a7cb386545417014735a17bcf7dfc31aff79b8ef639ec82111255 SHA512 7ec960e07f1b1a81b32445e4cfc3769abb1d75d68076b825857fc12410525875bf50ba316da37d2a189d62162ad28c12530905d6c8696d1caa11b6d6752500a1
 AUX openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch 2990 BLAKE2B d6508d578fb8be689f0a6af41b54f0d8ff158a52c2b0a3fe5940cf8cbce0707f2dee8ce228e8a3a80866f6702121849f15e20af281343ff574aecfdb95eef5cc SHA512 ce91505ca64326457caea3036ff899ff58b2aac4787b7bf84581a4ee55978179f93b57bb8a82a59fcf85d90cb85679fb2ec5e2d95e8b20760159ba55d590d5d5
-DIST openvdb-4.0.2-patchset-01.tar.xz 16420 BLAKE2B 2f825532d83d3a6756454f164a0608cfa776c1d4472cb4b25e4dad20d3c9648a952deef87ed0e24ce5f7c927c02da8cca76c829eafe1e2bb47fca061541668b3 SHA512 e9399d245d5e2b4130576d688691ac965f031b957df7803b8859f863634b27987c33aabadc5fb463b9d3eec333be84b89cb619dce5bc81c0390d8fb19da830c3
 DIST openvdb-4.0.2-patchset-02.tar.xz 12428 BLAKE2B 2684ddf010df975912fcfc8c4f944d9a9ba447b48750140b6c46db31d49297f7495e5c77e9d5b85af0b2e1d0c4987184865642dc95f1fb3e463e85ee5987d203 SHA512 04377d552e218a8eb31c43381ba32263ba206a0870dccda1bcc031863dfdbcc953da7ea89fd420dc1a338fbd6123ac30bac2039c0a2a01c1fa9253a3fdd0b54d
 DIST openvdb-4.0.2.tar.gz 1689119 BLAKE2B dbc8d4ab44990440e201327d76bbf9bfe3e8f597505b1d008dedb95dc540277513f465d455079c59820acc5056c9a2edf56235e1097b6c73a1f7dd8c59609c15 SHA512 8e3e12583b81f9b9303b309e839c8321c67b67ff8a0e61bb56c87276bf25c0deff22f5a73c7c5b661b8e5df345bfdabfa6b0aea9bf16fce57d9c53a76751c75d
 DIST openvdb-5.2.0.tar.gz 1788969 BLAKE2B d146b78dd7db4936779ca214b1f7957d4868bf76aedb95c9a98e21d25983b750337a63bf4bc9ccb438b683988af7a3d708676dcf7b4662c84e4926e8000ceb68 SHA512 69e21190c27a055e476a319b0c2d961303fa2f3fec30bec93ed44072d01816ef89e5e8f0abfc3a22d1c73742aa31284c664596747b49cd985fea1a751776506e
 EBUILD openvdb-4.0.2-r2.ebuild 2050 BLAKE2B 019c4b6ba119dff7aff5cc3b41846f03e65f6680274199c89be04cc573e85af95a28e5d81b6f6d4a62fc1ecdcc733aba9911f4f97abb40128215147ca006a640 SHA512 c806cbdfd23bc085c032212672686e3ff19a1d414e9003570090373d82382a309f3f8d5673de2a791bd6a54a1f491e318e97cef982b03d15a51d21b5392af396
-EBUILD openvdb-4.0.2.ebuild 1935 BLAKE2B 8b25b6a5a55f91cb50c9b79b732d79921eab1ea4cbfa84f47431b1b5256142d489f38cd4da3946bd8d12ad471cb776d6fcf894b12263669138c453624d487868 SHA512 6fdb9ada5f4630e0f1b917b2d9c9467af7e8ba335dcba04866dc7cef3191aab606f5495d36f92e1500c53b1eca1b1471e8f182a470ad495e1290b659a56c10a9
 EBUILD openvdb-5.2.0.ebuild 1785 BLAKE2B b16a9beabf0e755da3daf1213703eb1103bc4a93681c5686842cfd814c1ac13753a8380d4a432772977f328fc5f4ba0e7eb5422142e9c11771952b7ef2b3de0c SHA512 e9ac1a52a478e9bd4108ef78eb124934a22310b9ec96239bf6e796abb873f1a36c527416b68d99e5fea077def2edbb4949198ef0e733532dc9a8daecf86e09a0
 MISC metadata.xml 1028 BLAKE2B a6d852019e2bf507aa175846fc1687f101df9fc498b7dd2c7de25d860f419e86eb37549e3a2b742c32d0a2f5c6fc0450b3c82da18ef96c65fc81e547f3e7e944 SHA512 2f9d7a4271998fd9fef7a0c4fbd9d77187ba0fe41d31a807e88b19554cc5b624686e3dca44a47e8e69edc71fa89a06fcd89de59f09bccf3378418500b268d287
diff --git a/media-gfx/openvdb/openvdb-4.0.2.ebuild b/media-gfx/openvdb/openvdb-4.0.2.ebuild
deleted file mode 100644
index cfd305eed6cf..000000000000
--- a/media-gfx/openvdb/openvdb-4.0.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit cmake-utils flag-o-matic python-single-r1
-
-DESCRIPTION="Libs for the efficient manipulation of volumetric data"
-HOMEPAGE="https://www.openvdb.org"
-SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/dracwyrm/gentoo-patches/raw/master/${PN}/${P}-patchset-01.tar.xz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="+abi3-compat doc python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="sys-libs/zlib:=
-	>=dev-libs/boost-1.62:=[python?,${PYTHON_USEDEP}]
-	media-libs/openexr:=
-	media-libs/glfw:=
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXinerama
-	x11-libs/libXcursor
-	dev-libs/jemalloc
-	>=dev-libs/c-blosc-1.5.0
-	dev-libs/log4cplus
-	python? (
-		${PYTHON_DEPS}
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-cpp/tbb
-	doc? ( app-doc/doxygen[latex] )"
-
-PATCHES=(
-	"${WORKDIR}/0001-Change-hardcoded-paths-to-GNUInstallDirs-variables.patch"
-	"${WORKDIR}/0002-Use-PkgConfig-to-find-IlmBase-and-OpenEXR.patch"
-	"${WORKDIR}/0003-Boost-1.65-NumPy-support.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local myprefix="${EPREFIX}/usr/"
-
-	# To stay in sync with Boost
-	append-cxxflags -std=c++14
-
-	local mycmakeargs=(
-		-DOPENVDB_BUILD_UNITTESTS=OFF
-		-DOPENVDB_BUILD_DOCS=$(usex doc)
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-		-DOPENVDB_BUILD_PYTHON_MODULE=$(usex python)
-		-DOPENVDB_ENABLE_3_ABI_COMPATIBLE=$(usex abi3-compat)
-		-DOPENVDB_ENABLE_RPATH=OFF
-		-DUSE_GLFW3=ON
-		-DBLOSC_LOCATION="${myprefix}"
-		-DGLEW_LOCATION="${myprefix}"
-		-DGLFW3_LOCATION="${myprefix}"
-		-DTBB_LOCATION="${myprefix}"
-	)
-
-	use python && mycmakeargs+=( -DPYOENVDB_INSTALL_DIRECTORY=${python_get_sitedir} )
-
-	cmake-utils_src_configure
-}
diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest
index 2399c7582305..7f6ad0a66bde 100644
--- a/media-gfx/rawtherapee/Manifest
+++ b/media-gfx/rawtherapee/Manifest
@@ -2,6 +2,6 @@ DIST rawtherapee-5.4.tar.xz 11991988 BLAKE2B 625b4e04b82f34d994e0f23f6aea6af4b0a
 DIST rawtherapee-5.5.tar.xz 12163556 BLAKE2B 6251655b5bcc8b805eda584e386771b14dec15a2d8a96518bdb79d7e31354c78eb263f6964d7f6ffaeb35a127d3f775c9c39dfebf072a0bfc14d284358acd03c SHA512 fcb546ad6e420200a821c89555ec259140995a3bc69429d2ecb648632c02e10ffceebbd7296e879c93b53ad8efa45ea71336d936cd90cead723e70e8932a413a
 DIST rawtherapee-5.6.tar.xz 12083264 BLAKE2B a0eb09e98e1041b393ad3aa671641a2a4855379cef6245ca3cca2588ff5f50fedf8becd88bad1ab70f63dfb575f5f22c141040defa10b47268947415999d8e79 SHA512 2c751c7631ea2ef65c334fa0baab16d4c3161fae66487870c476f07f1ea3604a5e28a251fd98d9688cafc088302af7aa6e28e9b27a37f916715708ed5e731f0f
 EBUILD rawtherapee-5.4.ebuild 1626 BLAKE2B c85d316a1e741e3bb34b278429c35a01312bfb33ff413fdca05d3d14b329ed57f207ba56537711943c9afef4c3177c421af9f46bcf1d95a96a361cef5c3bac7b SHA512 f9645dfa2bda00054821956bc1a9de57066c06c8f74ec1d8ebdaf0b1ed2e4453b253fb66ae4ff7a8f0e55d8a455176cea71b5502e76a8004f435a65bc877bcf9
-EBUILD rawtherapee-5.5.ebuild 1631 BLAKE2B 4bb476be966428d80824b7c9245acb9fa528534b45feac35e6b9e35ef9513342b115224331bed6bbfecf6d51f569f641337592f4611eb14998b477c8b5177890 SHA512 4be114ac1158e205c607bd551c87cbe271567cf8fedc82b6ef3581f30e977533660ecc790fe6a149e0b73a6821ddcb1da7afefd6927372ae5274df9dc64357e6
+EBUILD rawtherapee-5.5.ebuild 1630 BLAKE2B e97a9f3cd46273c7eb61006f7d9f7225792838a3b4465705103ad9d5f13e40348d0c7d691dd899daeb24a1ac568e303be150aad3319d555b502ae0664a88c842 SHA512 34b18eddacacad43a444eca19556a4e1ab237b56ae85fe82344464cebe6148921feb28771979242d09b8585cf3993338ba0ae89b561241b9963362c540b84fb8
 EBUILD rawtherapee-5.6.ebuild 1623 BLAKE2B bf3e2d94b876c48aeedcbb2030d282753a78da2a4c905b5565446ede991e854277fb2ccd99f409d52ccdb5df986f50525cccaf42e0b1124f68a22c0ca7311865 SHA512 4aeee80c36f123d97d55ff343dc326428f597f74d282f1186cbb9255d0ef2f29dab7ad56cb886e7b20dcbe1353a1988ff205b7d2cc3fc2c1580bbf18b8c6d8c4
 MISC metadata.xml 484 BLAKE2B 672746e8291016ad6467a9b3c9baa84abac42df9f7de4b4bdb79374bba8e84f7cbfe140a076ebee49ec50587154612b73c6a7022461d01fd7fbdc63a6ddfcd98 SHA512 91f11609c7472bb7cebff5d440ee3d4b0560e0832e1bfb6ffd5b239e8e60647e067894d77ccb6e40a379680775f80b91250c3feab5cd2ce32d7991e0776d0cd9
diff --git a/media-gfx/rawtherapee/rawtherapee-5.5.ebuild b/media-gfx/rawtherapee/rawtherapee-5.5.ebuild
index a47d21b7863e..707036915c1b 100644
--- a/media-gfx/rawtherapee/rawtherapee-5.5.ebuild
+++ b/media-gfx/rawtherapee/rawtherapee-5.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://rawtherapee.com/shared/source/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="openmp"
author	V3n3RiX <venerix@redcorelinux.org>	2019-06-08 09:04:53 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-06-08 09:04:53 +0100
commit	73c318acdaf6f8309d68bd266051e6dd1f1bd787 (patch)
tree	2878053f3e7faed19a1f82c733d3bd29df69991e /media-gfx
parent	2018227e9344edb9da15fc6a4a8298086cc2aa77 (diff)