gentoo resync : 03.11.2019

51 files changed, 299 insertions, 428 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 874b973e5a18..7d6c24b37527 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 9c7e0a740320..7b29e00ff00b 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -3,7 +3,9 @@ AUX cura-4.2.1-fix-install-paths.patch 1824 BLAKE2B 423ee2da55c69fa7fda2d93931f0
 DIST cura-3.4.1.tar.gz 21720836 BLAKE2B 228ad51d189f83d2a34c2af7a6edcbe468bc32ee6ac012141eac1b7332046790e2e85c4e643c1ebb13ceded6024cd52aeab2bcd0db555db8f355a7b568bed728 SHA512 5d1935c923173a5ea6d3a95181d61c8deffbb51f3ee4f3e4cb2c5a58f79581d3dd9adc6a9583e6ca0ab5da4c36b63695d7479e67d1237c132354616aa990e3c1
 DIST cura-3.6.0.tar.gz 23388945 BLAKE2B bd2f2e688306e7ef060141abae22c858e9fbb9385e49110079b48e69955c3f6630f8f69ad67fdf2d9e5c1ac0c969cd2d2f416642fc61a63867f79f88985c5c86 SHA512 b56e5575cb0eb15d759999dcd2f4c33873a0a57805a8ba0ec7860811a2137658a656216c969c6e3316d65fbd5e43f2def10a6385ccbf4fc306d15098569ef279
 DIST cura-4.2.1.tar.gz 29288696 BLAKE2B 1332030e63d7056dcb8dd680208b0da8dd33e5c7809957779849bac808fccad9a222505ddbe80d4071474d10ace842aa4459f14560198a9f3eebb5be53f923e1 SHA512 4f47f3f5597d1a56d88207eacacece49edb766c75ae18ddc9fb8689b76c16fd4decc9c8af7cab485aac3c9cffe13095aaad34e1c60634249ae2923ead771ac52
+DIST cura-4.3.0.tar.gz 30433646 BLAKE2B 8490d703cfd4ad07fd5b30d5f776d978baa17ad8751dad53870714596998becebc85cc2fe49fa05eab37b95106315ace97eaa0bbed65b488b522ebbbcba488dc SHA512 3f4ae11e4e28b151e9587c197f814bc97bc225fb2819f4dabaab392ef9896bb119d6fab0df48c9eb4a390a815815d27045eefa933e2e4a9d53331db8d79ea815
 EBUILD cura-3.4.1.ebuild 1678 BLAKE2B 5c05b4777d95bf1427f4314e7cd6790a0879ce55da89a8b04cc2a7a991f55cdd1b6fd61f454a59986e743ff7209cb8437382b92ac689245687b82da155c71ea9 SHA512 25c727be6b867f5af5baadc1718ea3492aa80679a0bb5331794fb8ea19af10af6e2da5d6a7908d9e8e0ba4aca2d9cda46baf2c2abd5c5bbe5fef95933ac2ecdb
 EBUILD cura-3.6.0.ebuild 1675 BLAKE2B 2ba6d31604abc1bd1a6e9f128b0d892c7dc12b0ad65210a8d504104fff2662d28a2f0df5d4825826e53b7b88ce78ef9c690fe64cd866f7db2741e4d7432c11e1 SHA512 43e21fbf81985e482fbccab4d679bc5d3e2539f7b6b2cf585ad4cb7b207246efa3fdca59a0ef2d2a999c6491c071deafe418a0c9de372a9df9a9e15791c5f840
 EBUILD cura-4.2.1.ebuild 1385 BLAKE2B c1f6c35fac146da9338befb41a4d7cd71b3ff20df9a1a18f742671393b782384639612997c84167ef3b8327b08dd06fe83be7eb3e880d57396cb375787db0f78 SHA512 8dfb2a1fcb402f797aa760453b25cec10d4fe6fc0e9b6295c57248f0f61949d9a56e3b2aacdeaff4a4cef8e02f432baf519a7130088d2c9f1b3b194d69d1fdc6
+EBUILD cura-4.3.0.ebuild 1385 BLAKE2B c1f6c35fac146da9338befb41a4d7cd71b3ff20df9a1a18f742671393b782384639612997c84167ef3b8327b08dd06fe83be7eb3e880d57396cb375787db0f78 SHA512 8dfb2a1fcb402f797aa760453b25cec10d4fe6fc0e9b6295c57248f0f61949d9a56e3b2aacdeaff4a4cef8e02f432baf519a7130088d2c9f1b3b194d69d1fdc6
 MISC metadata.xml 924 BLAKE2B 98684c30170538865b264d21a025a558b66ef0f5b46dd4cc291dacd71367cf775135d66fc379bf6bf0edfacab6e33c939a750fdcc8f036cedb7d9daf5b442072 SHA512 b09e1e1251f3171721bea6ea7ace38beed877525b1a83282035bb34fa871123c0995674d899a486b3ff67ac34429cabc12f9e90ffd1b1e3f60257389a900e483
diff --git a/media-gfx/cura/cura-4.3.0.ebuild b/media-gfx/cura/cura-4.3.0.ebuild
new file mode 100644
index 000000000000..aed51febac2c
--- /dev/null
+++ b/media-gfx/cura/cura-4.3.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+inherit cmake-utils desktop python-single-r1 xdg
+
+MY_PN=Cura
+
+DESCRIPTION="A 3D model slicing application for 3D printing"
+HOMEPAGE="https://github.com/Ultimaker/Cura"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+usb zeroconf"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="sys-devel/gettext"
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/uranium-${PV:0:3}[${PYTHON_USEDEP}]
+	>=media-gfx/curaengine-${PV:0:3}
+	>=media-gfx/fdm-materials-${PV:0:3}
+	>=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_USEDEP}]
+	>=dev-libs/libcharon-${PV:0:3}[${PYTHON_USEDEP}]
+	usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
+	zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )"
+
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+PATCHES=( "${FILESDIR}/${PN}-4.2.1-fix-install-paths.patch" )
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	sed -i "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	doicon icons/*.png
+	python_optimize "${D}${get_libdir}"
+}
diff --git a/media-gfx/curaengine/Manifest b/media-gfx/curaengine/Manifest
index d7405f30d7c0..7a776d2a7ccd 100644
--- a/media-gfx/curaengine/Manifest
+++ b/media-gfx/curaengine/Manifest
@@ -1,7 +1,9 @@
 DIST curaengine-3.4.1.tar.gz 949312 BLAKE2B 4902575c40002ab49e3ef13c94c8531b6975ff62e58012dc48744e2d27e9d1767e8f7768250179a374ed24da5a5e2085e9c194068ad6ffb98fff0595a314f7b0 SHA512 51c75e299ef7728101a4c61aa033c9b07112b0955d2ec72ba6173684513ed3c503a744fab487efe2c19da01eb97bd1297b5b8724b4f767639c8e82eefcdd01be
 DIST curaengine-3.6.0.tar.gz 1390109 BLAKE2B a0a6b8016bb5fa2f772634a671fc391df45875fc36cdf100f00ce34b9d5495f32986c473b1ba4c184cb77e50a64e2648c5d4f31053790182e657b0c981e1412c SHA512 340dad4c697fb0d7b633091715a904ae7df8973626e217ae2528d0121723c07a6cf0bbc740b9ad9980f3b288fa690c9c3ee43d90914264855dace007bbb334c8
 DIST curaengine-4.2.0.tar.gz 1654657 BLAKE2B c11f77a126e49c1c63550accd42c3616ab647d2575de0f11e64cb2188e7c565a54f3613e296c3f19e8534a7a758162fe29cdd62e8d62d691a7d9c9e6430545ce SHA512 6c3edac5a21068b50a31d3ab37dac58b986e18be2d24711d77cf210da62b521d62dc92a1b4e8865a26e5c394119349f03b3816d19d67ebee670424cc4a7b2500
+DIST curaengine-4.3.0.tar.gz 1656780 BLAKE2B 9b93e3f294a8a67c2cd4f2d4462a4047e6860e0c391e7ff550b24c498faa82fd2af4fd044845f00f93fb01d38ca3fa1511bfe65a7456b5a6e0b919821be5ab8f SHA512 60ca0ce586c0cf5f1516f803b2a05a20299ef8193f065acd6e11a0054903189225f9c60be1b536ffe5a9a22652097acd3a4aae2833920a468071b78f213f7572
 EBUILD curaengine-3.4.1.ebuild 875 BLAKE2B 943c5d77bb91f833a42005edff60824935bc9cc0d6707035ee5ab2fe29d8d631c51fc7678b96dbebf468ea2e5bbb9cfb233999ffaadcf9f196ec824ba2f3d83f SHA512 4ec5e4cb05f236ff9052ecf6455967d05ae668002d255af0d8435960080882ec687de6d7547074d4fee1fd435a04796a26dc4bcdd595ad5748e8d3b0c052f39e
 EBUILD curaengine-3.6.0.ebuild 875 BLAKE2B 943c5d77bb91f833a42005edff60824935bc9cc0d6707035ee5ab2fe29d8d631c51fc7678b96dbebf468ea2e5bbb9cfb233999ffaadcf9f196ec824ba2f3d83f SHA512 4ec5e4cb05f236ff9052ecf6455967d05ae668002d255af0d8435960080882ec687de6d7547074d4fee1fd435a04796a26dc4bcdd595ad5748e8d3b0c052f39e
 EBUILD curaengine-4.2.0.ebuild 1507 BLAKE2B fc44669821417480266caea7e305b363f60042b0d6d5f5c440e327f05f12fcef151d80e0cc2d1652ee79976866225b95cbc55ee255c30139c16f98e4153669c9 SHA512 12ff9ce73c0c1471bd9ea9fc1d3cd83198ae5a83c5fa42a41d2dbdd6a28b3763c80539f8b2bd6b01a96723473a1a62aab4ee179db613203ff56ef1d35de53290
+EBUILD curaengine-4.3.0.ebuild 946 BLAKE2B 54b40c2c7c4f6a2d85a001164551b8e4618e07900a158f2eff01a4027e5ba3bdb3abab2b1470e7c4c2508d250fa254f8af8fc7f21992b18effe3e658f6cb41dd SHA512 b802b25700787ca33b94b10ab12eaa0c2444e8c7bbeaa21e486783632df3f1121421a23e227bd2f751076bc30d0235a8fdb16bad2266c4f32896621e0a37ea33
 MISC metadata.xml 862 BLAKE2B 233eef15a865c598451d8a6100a8dc99f4c9a4c4ae4f8692a473ad2b8de5c2bc5216052b2bbf698e98f1c7f8156512084beaebc6148b9bc333d5c09d9bfda3ba SHA512 92e4cf75b949ac201537780bc5acf295720da8a342f6d882e2ca3b36aaa5691a3df31e6cf79e44b25f88d2f1177a1b6227165cbe8b9da8762b35560927239382
diff --git a/media-gfx/curaengine/curaengine-4.3.0.ebuild b/media-gfx/curaengine/curaengine-4.3.0.ebuild
new file mode 100644
index 000000000000..f42d62c313c5
--- /dev/null
+++ b/media-gfx/curaengine/curaengine-4.3.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils toolchain-funcs
+
+MY_PN="CuraEngine"
+
+DESCRIPTION="A 3D model slicing engine for 3D printing"
+HOMEPAGE="https://github.com/Ultimaker/CuraEngine"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+BDEPEND="|| ( sys-devel/gcc sys-devel/clang )
+	doc? ( app-doc/doxygen )"
+RDEPEND="${PYTHON_DEPS}
+	~dev-libs/libarcus-${PV}:*
+	dev-libs/protobuf
+	dev-libs/stb"
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_configure() {
+	local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" )
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_make
+	if use doc; then
+		doxygen || die
+		mv docs/html . || die
+		find html -name '*.md5' -or -name '*.map' -delete || die
+		DOCS+=( html )
+	fi
+}
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 2afd4571d0b3..bdd607008fcc 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -6,5 +6,5 @@ AUX digikam-6.3.0-googlephoto-import-crash.patch 2815 BLAKE2B e39efa7815aef3f7b1
 DIST digikam-6.2.0.tar.xz 339472960 BLAKE2B 0db48839474d599a364fba73cad751b889fe6f37c88323d1feddce67acb0ecad306c67976e1524328e6aaf33464c9dd35b1b85cf3c41ba72be9cef664e30d520 SHA512 05667c91af290df0eabd3b18a7c6741ded3f1b01b0a9cb572d6df79f25787d0291624760d6c0fa23bd36665a94bc7ccba845c117ee381de7edff97d1d4158e56
 DIST digikam-6.3.0.tar.xz 335641824 BLAKE2B 1ecddeee653d6b97570aa3616c6dd0a951210983400fe8aca19ee9e01aef29820f0ab32e3cbc2e92e833868f0f652c5bdd0809324437b6fa778dfdaf04ea3c83 SHA512 9463d7a8351acae32e2fa77c96026d1cb60e56fcc20ad2b71ac7461ff1e5e2e02ca0ef8a12e4d5ae2324aa66e185cdf5b237d6330f4741691876977e773511ce
 EBUILD digikam-6.2.0.ebuild 4166 BLAKE2B 7dda2079c57b887ba01a6243c6f5d4506baa4eb285b218d05c2ee6de84f1d1014154a621bcfc4c4980ec1dd5d4d1c2d3d6c80a33187b1e52638e9c67fb041ac5 SHA512 ee99c9c55687aa28283179c92e6e9fc1e19027206fe0ff3a51541da23bb024297c1d03c9ab59039f481820856ae44de03f4958db26333f3a9f0976c3729d8ea0
-EBUILD digikam-6.3.0-r1.ebuild 4222 BLAKE2B 82d92ebfce1947d6b7950e8089a905861ad0eaae570eb8a4aec01ee60469dfdebe289285766448fbc40adec244d9f39ddc1351746829a0ad7f0c80a575383d07 SHA512 5e7b5357bb0815157a02cc039df8d06ac0cdb754c62ba3315a8fa96790f5764851d37ac397144c76846c32b55e628bd14c54c5842302df5946c8fc01dcf32130
+EBUILD digikam-6.3.0-r1.ebuild 4258 BLAKE2B bff44f4ffbc3a535aaab5182d92f069bd4feb05e5f1b8a64f175792e05b7dafa1cbf7f09aaaa1c5563671df02731746a858561e486fb297e1f7f976a68932fe4 SHA512 3d5564fbad31fc8e16edad3afed3ede2f7e50f92899660364a4914d99cc60b18d06bddf77546812e2f54637815b2bc5176d65a944d77d8279535d7da8ae3e7ac
 MISC metadata.xml 1256 BLAKE2B c3899279a6382ac2b2a12f5b94938db2324093bd63e0db8e3f82bb56ea9944d4369b793f7fa039c2c08af1887e4cc51d58f4e89a57c81b18cb5f896ef4cd0a5c SHA512 9b220b4271d0cb7b9fd5549fec165c4bc20c250cc66ce14ecb3cb16d0eb8355f35d0e585d9d800ed70437b3cd5434bcacc7dfd783f2a5683dbe1b1b3ce48356f
diff --git a/media-gfx/digikam/digikam-6.3.0-r1.ebuild b/media-gfx/digikam/digikam-6.3.0-r1.ebuild
index df968b3029c2..6ba0fe7a630e 100644
--- a/media-gfx/digikam/digikam-6.3.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-6.3.0-r1.ebuild
@@ -130,6 +130,7 @@ pkg_setup() {
 # FIXME: Unbundle libraw (libs/rawengine/libraw)
 src_configure() {
 	local mycmakeargs=(
+		-DBUILD_TESTING=OFF # bug #698192
 		-DENABLE_APPSTYLES=ON
 		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
 		-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
diff --git a/media-gfx/displaycal/Manifest b/media-gfx/displaycal/Manifest
index c0eb66c1423b..f48d826f2b24 100644
--- a/media-gfx/displaycal/Manifest
+++ b/media-gfx/displaycal/Manifest
@@ -1,11 +1,5 @@
-DIST DisplayCAL-3.7.2.0.tar.gz 10536990 BLAKE2B c3e0c1b75c10911b1624d56f4e5d612eba8c257b5abd8a4632f13d91285283d870d928ad3eb17a9cd620b7fed4b9e5414495e12227fb2b94e3da2551d14042bd SHA512 f516376a84680daa2baffa0b4738f52e5dc6df374ae5d97ed385430e2744a087e044faa4929fdc84b01d79878b44e15eda5fa75b40b8a78e6962f66fc06876d4
-DIST DisplayCAL-3.8.1.1.tar.gz 10611516 BLAKE2B 797c20aa7d26014ce5d039de352639b6d9f045eb06701044a0cb4a1b34c9744b0ca4f659a33cd23d16fe918e5d7e270def4ecd5007ddfc82682b486d3a413e44 SHA512 75d4ff038ad4f98b2d234b99d473a9e951983a607c28bc4eadcaa89bcfaa02ca13ed18fca8d4608cd881f215cbb37c36f91f7862a8c83541423524aca35b4688
-DIST DisplayCAL-3.8.3.0.tar.gz 10602825 BLAKE2B f74df1b9c1c9a63c84c3f78e1d38324075a65c54e289fe6c1a1871af69046f49e2b893f82db0542ad6062cd5bab4c3ffa98a25f21f428a9cb50483337a84e3c6 SHA512 8ede8200910dbef3d81e7d3aee89dd67f1f7ee3f22a8205780c63a05673ca7273e9e4138c418c7bc1e6c57240aab79453949d97a0651fbbbc4926b80cd50a8cd
-DIST DisplayCAL-3.8.5.0.tar.gz 10605505 BLAKE2B fa268780e34f485e7c90caccc5a76b70131520730be41b74f7b855e843c32ee10af1aad64412842dc85c9a1fbe28e74b9062f23183fa7cf3cde0381c64c8b7d4 SHA512 8c44a4524796174755d306a93e9f03c06b1c219b5173c081ed6456d6bcbb725a8e9c424acdf420dc444f10eedcff935bc93e399f1609b6d8a454e486e8207974
 DIST DisplayCAL-3.8.7.0.tar.gz 10619677 BLAKE2B 9b697d3548bd3a2a7a5f2bb38589bdd7e67ff964b613371a83ae11ec1a114874283d67a442f4336a1d50e86fe127ae755ea68865de112ea83520def404a6e715 SHA512 f47cda64648ef59c211aa54993ee423e80caf26f8942de88672e430bec7976d83f15c58fe9df8217217be48a1b36e8c3342fc3baf862077fe229da214fd38400
-EBUILD displaycal-3.7.2.0-r1.ebuild 1597 BLAKE2B b916779c94482492e7c5afb4c14df42112e57aacc9abd225ff6734aa1b826329a60077dfcf4f36ca2a0d423036e16126a151226b47a992770b1048735c7a07d0 SHA512 6be4e0594baa19567b31f7a1daeabcfc1bb6a9a21c8212003de604588dfcff97ec97c17f18c2dd7ab910e6dcf69697c0f50a1e4be623e3f798bc8661bceb3e82
-EBUILD displaycal-3.8.1.1.ebuild 1597 BLAKE2B b916779c94482492e7c5afb4c14df42112e57aacc9abd225ff6734aa1b826329a60077dfcf4f36ca2a0d423036e16126a151226b47a992770b1048735c7a07d0 SHA512 6be4e0594baa19567b31f7a1daeabcfc1bb6a9a21c8212003de604588dfcff97ec97c17f18c2dd7ab910e6dcf69697c0f50a1e4be623e3f798bc8661bceb3e82
-EBUILD displaycal-3.8.3.0.ebuild 1597 BLAKE2B b916779c94482492e7c5afb4c14df42112e57aacc9abd225ff6734aa1b826329a60077dfcf4f36ca2a0d423036e16126a151226b47a992770b1048735c7a07d0 SHA512 6be4e0594baa19567b31f7a1daeabcfc1bb6a9a21c8212003de604588dfcff97ec97c17f18c2dd7ab910e6dcf69697c0f50a1e4be623e3f798bc8661bceb3e82
-EBUILD displaycal-3.8.5.0.ebuild 1597 BLAKE2B b916779c94482492e7c5afb4c14df42112e57aacc9abd225ff6734aa1b826329a60077dfcf4f36ca2a0d423036e16126a151226b47a992770b1048735c7a07d0 SHA512 6be4e0594baa19567b31f7a1daeabcfc1bb6a9a21c8212003de604588dfcff97ec97c17f18c2dd7ab910e6dcf69697c0f50a1e4be623e3f798bc8661bceb3e82
+DIST DisplayCAL-3.8.7.1.tar.gz 10621039 BLAKE2B be4e350a63efb615a363aea36e4e92bc837d0021088ab28f78e92ba0743af5e3930812c1154d32ff06d301461d44b50b483ea15e6954943204974cc264918057 SHA512 67f49b3ae85620f9e9c7e9d4162538f78ab160a590e6cb95f78203045e0d2d8d604abe3ab533030e9359d70292a8b7dd02174c99b3143fabd7ca27a3b07a5626
 EBUILD displaycal-3.8.7.0.ebuild 1597 BLAKE2B b916779c94482492e7c5afb4c14df42112e57aacc9abd225ff6734aa1b826329a60077dfcf4f36ca2a0d423036e16126a151226b47a992770b1048735c7a07d0 SHA512 6be4e0594baa19567b31f7a1daeabcfc1bb6a9a21c8212003de604588dfcff97ec97c17f18c2dd7ab910e6dcf69697c0f50a1e4be623e3f798bc8661bceb3e82
+EBUILD displaycal-3.8.7.1.ebuild 1597 BLAKE2B b916779c94482492e7c5afb4c14df42112e57aacc9abd225ff6734aa1b826329a60077dfcf4f36ca2a0d423036e16126a151226b47a992770b1048735c7a07d0 SHA512 6be4e0594baa19567b31f7a1daeabcfc1bb6a9a21c8212003de604588dfcff97ec97c17f18c2dd7ab910e6dcf69697c0f50a1e4be623e3f798bc8661bceb3e82
 MISC metadata.xml 342 BLAKE2B e74a7767c5b6e82bd35776606de555f9d4f26a25727decc6b0216fa3ea27cee8f28a7749e46b842c52e403c5150b24b4e33e0b971bd49077814e7945ee8cc290 SHA512 f9d5979fc8525c40af8d4e64afb8264873b0ae7cda1e9c4f3b3f30957c2a4f7fcbab76002783213a896395e8b5ef78e315441c28872589a91a0035d5f346d317
diff --git a/media-gfx/displaycal/displaycal-3.8.1.1.ebuild b/media-gfx/displaycal/displaycal-3.8.1.1.ebuild
deleted file mode 100644
index 6d9baac97b2a..000000000000
--- a/media-gfx/displaycal/displaycal-3.8.1.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 gnome2-utils xdg
-
-MY_PN="DisplayCAL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Display calibration and characterization powered by Argyll CMS"
-HOMEPAGE="https://displaycal.net/"
-SRC_URI="mirror://sourceforge/dispcalgui/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=media-gfx/argyllcms-1.1.0
-	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-	>=x11-libs/libX11-1.3.3
-	>=x11-apps/xrandr-1.3.2
-	>=x11-libs/libXxf86vm-1.1.0
-	>=x11-libs/libXinerama-1.1
-"
-RDEPEND="${DEPEND}
-	dev-python/faulthandler[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.2.1[${PYTHON_USEDEP}]
-"
-
-# Just in case someone renames the ebuild
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Do not generate udev/hotplug files
-	sed -e '/if os.path.isdir/s#/etc/udev/rules.d\|/etc/hotplug#\0-non-existant#' \
-		-i DisplayCAL/setup.py || die
-	# Prohibit setup from running xdg-* programs, resulting to sandbox violation
-	sed -e '/if which/s#xdg-icon-resource#\0-non-existant#' \
-		-e '/if which/s#xdg-desktop-menu#\0-non-existant#' \
-		-i DisplayCAL/postinstall.py || die
-
-	# Remove deprecated Encoding key from .desktop file
-	sed -e '/Encoding=UTF-8/d' -i misc/*.desktop  || die
-
-	# Remove x-world Media Type
-	sed -e 's/x\-world\/x\-vrml\;//g' \
-		-i misc/displaycal-vrml-to-x3d-converter.desktop || die
-
-	distutils-r1_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/displaycal/displaycal-3.8.3.0.ebuild b/media-gfx/displaycal/displaycal-3.8.3.0.ebuild
deleted file mode 100644
index 6d9baac97b2a..000000000000
--- a/media-gfx/displaycal/displaycal-3.8.3.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 gnome2-utils xdg
-
-MY_PN="DisplayCAL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Display calibration and characterization powered by Argyll CMS"
-HOMEPAGE="https://displaycal.net/"
-SRC_URI="mirror://sourceforge/dispcalgui/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=media-gfx/argyllcms-1.1.0
-	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-	>=x11-libs/libX11-1.3.3
-	>=x11-apps/xrandr-1.3.2
-	>=x11-libs/libXxf86vm-1.1.0
-	>=x11-libs/libXinerama-1.1
-"
-RDEPEND="${DEPEND}
-	dev-python/faulthandler[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.2.1[${PYTHON_USEDEP}]
-"
-
-# Just in case someone renames the ebuild
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Do not generate udev/hotplug files
-	sed -e '/if os.path.isdir/s#/etc/udev/rules.d\|/etc/hotplug#\0-non-existant#' \
-		-i DisplayCAL/setup.py || die
-	# Prohibit setup from running xdg-* programs, resulting to sandbox violation
-	sed -e '/if which/s#xdg-icon-resource#\0-non-existant#' \
-		-e '/if which/s#xdg-desktop-menu#\0-non-existant#' \
-		-i DisplayCAL/postinstall.py || die
-
-	# Remove deprecated Encoding key from .desktop file
-	sed -e '/Encoding=UTF-8/d' -i misc/*.desktop  || die
-
-	# Remove x-world Media Type
-	sed -e 's/x\-world\/x\-vrml\;//g' \
-		-i misc/displaycal-vrml-to-x3d-converter.desktop || die
-
-	distutils-r1_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/displaycal/displaycal-3.8.5.0.ebuild b/media-gfx/displaycal/displaycal-3.8.5.0.ebuild
deleted file mode 100644
index 6d9baac97b2a..000000000000
--- a/media-gfx/displaycal/displaycal-3.8.5.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 gnome2-utils xdg
-
-MY_PN="DisplayCAL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Display calibration and characterization powered by Argyll CMS"
-HOMEPAGE="https://displaycal.net/"
-SRC_URI="mirror://sourceforge/dispcalgui/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=media-gfx/argyllcms-1.1.0
-	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-	>=x11-libs/libX11-1.3.3
-	>=x11-apps/xrandr-1.3.2
-	>=x11-libs/libXxf86vm-1.1.0
-	>=x11-libs/libXinerama-1.1
-"
-RDEPEND="${DEPEND}
-	dev-python/faulthandler[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.2.1[${PYTHON_USEDEP}]
-"
-
-# Just in case someone renames the ebuild
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Do not generate udev/hotplug files
-	sed -e '/if os.path.isdir/s#/etc/udev/rules.d\|/etc/hotplug#\0-non-existant#' \
-		-i DisplayCAL/setup.py || die
-	# Prohibit setup from running xdg-* programs, resulting to sandbox violation
-	sed -e '/if which/s#xdg-icon-resource#\0-non-existant#' \
-		-e '/if which/s#xdg-desktop-menu#\0-non-existant#' \
-		-i DisplayCAL/postinstall.py || die
-
-	# Remove deprecated Encoding key from .desktop file
-	sed -e '/Encoding=UTF-8/d' -i misc/*.desktop  || die
-
-	# Remove x-world Media Type
-	sed -e 's/x\-world\/x\-vrml\;//g' \
-		-i misc/displaycal-vrml-to-x3d-converter.desktop || die
-
-	distutils-r1_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/displaycal/displaycal-3.7.2.0-r1.ebuild b/media-gfx/displaycal/displaycal-3.8.7.1.ebuild
index 6d9baac97b2a..6d9baac97b2a 100644
--- a/media-gfx/displaycal/displaycal-3.7.2.0-r1.ebuild
+++ b/media-gfx/displaycal/displaycal-3.8.7.1.ebuild
diff --git a/media-gfx/entangle/Manifest b/media-gfx/entangle/Manifest
index ae00c16cfd18..36e8389882cd 100644
--- a/media-gfx/entangle/Manifest
+++ b/media-gfx/entangle/Manifest
@@ -1,5 +1,5 @@
 DIST entangle-0.6.0.tar.gz 906858 BLAKE2B 18a35ef7e077f5929846127e06bff2d07b61c5409d2957b421d8ec5466f29483b6fc7d5567cd057e2b44ef4147ed962e267e7e5509ef6640582b5d291a7f79f3 SHA512 f96718f01286eb0dbf1fafd4d51258bda876a5b22a6167173f0f60b4fe00683baff3d4c8f9866a5dc1eec493e2b25fd932794a63a8a8d102cb220b1d6ea8e960
 DIST entangle-2.0.tar.xz 501912 BLAKE2B b7e1c393dc95d66bf4389c607c0eb6eb70161ceb2c845135c7c99313a1ec13388c6b00fd6ed7f38ad6f9f18d8c97eba0aadab7964d1be8ec03373e5598374796 SHA512 be8b75c5dd0bdd7cd380f35b5d46d7be9f7caa2be257ce954cf9516ebd5601071ac8b50838f9c40470b6e3e5f95083c3671af68ac43eb345a60d674636a0fe86
-EBUILD entangle-0.6.0.ebuild 991 BLAKE2B b2e7b5d920568738ce62ee83c72ec89d96d8f5d5a3e89211a11f92ec618adcc85ab036097a3d256f18c1098ca6a97e668a505a24df271cbdfa6cd1a8f21e6485 SHA512 eb5c262a859934b1b22298dd4cabdf65e64b903dae4c78223a56a73b0286916cc4ff163b60f5af8fa5244e93ed577aba0c09c79726264731849006720f78dbb5
-EBUILD entangle-2.0.ebuild 1394 BLAKE2B e6b738c209f4e34b48e9b579046df773088d40c30896ffd5c8a187245efeaeff768b17e856959a30485018b138f152a661b3a14c68f410b83a316afc9a73cf44 SHA512 73fb905c8fab176b8b9a8f9a53034c52b6a3e35500ddb87c6a5d4c3e8a13446074de50a150dc8e54bda3bcec1a603d8a03626bc86022df4e62b6830041df4c17
+EBUILD entangle-0.6.0.ebuild 989 BLAKE2B f122100e8892a4ee256e0e2cda1b3c243a20c68058b6778ebb20509b53395998cd8b6c273131289690408f28b1bc04767a023dbfce404eecf6cb9272eca7cd5e SHA512 cc78f9327578e7ef13d29d0547bb76144f4d4a4b2698a7457014441a044dd2afbf1dbf157185cd9c681a7d486935369c099fcc2a04e8ce871892f4a1b34e5d2b
+EBUILD entangle-2.0.ebuild 1395 BLAKE2B 2210087e4f41847b80680a20564f47f7972e4a28640550b8a6f02e611c7e63f3f940b20eca61bf9d8ab49439336912b1a069a12a575e9a2b4df662ae81bac0c3 SHA512 c486b1bacd394cd714f74e12995509445bed330dd1a5095a554035cb33e534a28a22d4026a572eb0d8c334a61bbd09039092f932edfa3f8048ad9994bedcacd6
 MISC metadata.xml 446 BLAKE2B 1c466f17b5df47045169784918723e953945eaad2eb5879cde6f099feec4cb419e867f77879927933fe3daec259184a361f464b968b19bdf3463b01b7371589d SHA512 555966a8638a027288abdc7ba6d625c15c18792c3401d399a12dc256ec75f14882fce3e70596a3f3e2ed6729e471af04b14d520b8e2e70206a172f98b9967dae
diff --git a/media-gfx/entangle/entangle-0.6.0.ebuild b/media-gfx/entangle/entangle-0.6.0.ebuild
index 83e81921d62d..70933e3d62fe 100644
--- a/media-gfx/entangle/entangle-0.6.0.ebuild
+++ b/media-gfx/entangle/entangle-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ IUSE=""
 DEPEND=">=dev-libs/glib-2.26:2
 	>=x11-libs/gdk-pixbuf-2.12.0:2
 	>=x11-libs/gtk+-3.3.18:3[introspection]
-	virtual/libgudev:=
+	dev-libs/libgudev:=
 	>=dev-libs/dbus-glib-0.60
 	>=dev-libs/gobject-introspection-0.9.3
 	>=media-libs/libgphoto2-2.4.11:=
diff --git a/media-gfx/entangle/entangle-2.0.ebuild b/media-gfx/entangle/entangle-2.0.ebuild
index 1d719a1b3d2d..ebb4c3d3cf09 100644
--- a/media-gfx/entangle/entangle-2.0.ebuild
+++ b/media-gfx/entangle/entangle-2.0.ebuild
@@ -20,6 +20,7 @@ DEPEND="
 	${PYTHON_DEPS}
 	>=dev-libs/glib-2.36:2
 	>=dev-libs/gobject-introspection-1.54.0
+	dev-libs/libgudev:=
 	>=dev-libs/libpeas-1.2.0[gtk,${PYTHON_USEDEP}]
 	>=media-libs/gexiv2-0.10[introspection]
 	>=media-libs/libgphoto2-2.5.0:=
@@ -30,8 +31,7 @@ DEPEND="
 	>=x11-libs/gdk-pixbuf-2.12.0:2
 	>=x11-libs/gtk+-3.22:3[introspection]
 	>=x11-libs/libXext-1.3.0
-	x11-themes/adwaita-icon-theme
-	virtual/libgudev:="
+	x11-themes/adwaita-icon-theme"
 RDEPEND="${DEPEND}"
 
 # perl for pod2man
diff --git a/media-gfx/evoluspencil/Manifest b/media-gfx/evoluspencil/Manifest
index 52523e52d5af..d88ef1579cbb 100644
--- a/media-gfx/evoluspencil/Manifest
+++ b/media-gfx/evoluspencil/Manifest
@@ -1,3 +1,6 @@
+AUX pencil.desktop 196 BLAKE2B 68f39a50bb5fc78ab4add930c95fce0408488e878a33577cc906e1f81e65ce7be433ae305156cfbbb221de7ad146a1ff2085d955b69ee1b6ae8ccaada6659867 SHA512 f392b155602b99234fab97c49ddc5646a4f2a9cf06748519b45b3d61759bfd6c2b4c6cf33b93980d31e738cbcc5f9842b0dc08f1961b200565d0c61cf62b1736
 DIST evoluspencil-3.0.4-49.rpm 55779457 BLAKE2B 7f74bf4d0ac4dcd6ef2e37d56e6b06eda72a34e6c4bc0e2fbb5b55727bb3ba0ecfe183e64ad5f6abe77d258dca2bfc7acca0d08c934a7700699690ff8d39e335 SHA512 72a17841d214523223d6f35ca8ba69076070baf83248ceb5747a23865ec955f8aafbb799eb01b3a3c99226a7bc1653e55be6f7292941b1a859598e016673f2ec
+DIST evoluspencil-3.1.0-1.rpm 88059338 BLAKE2B 905f37968815be8daf37f60197f33636094c1007553d917f4098e09de9943bbd027bb21cf216df64145206ac968b48fff7a91fcb3acbb1b5d01a897375e31e99 SHA512 3a9a451563f499d918b36b48482a13107e18de0f7fcb786b20a88ffd8f487cf07cfdc279bcf6d4db3b8bbde89a424352d7e1fa1d8eeaa4972d830ec22883a15f
 EBUILD evoluspencil-3.0.4.ebuild 1214 BLAKE2B e1f6e703f422d56b9e8c7c88d5c92be1d31fd9f52e7a5693032169030684787066118bf78eee2887f26085cd491e0e1d33f1220bcd7827a4b3181c869251a505 SHA512 5171bedc17afcb591a5321766c676508ddc82525c54cfe036857bf3a9a368e49936042da78c6ffe74dcdbb56d4214f60f4daf7ead62399e6c25a8c468bc8991a
+EBUILD evoluspencil-3.1.0.ebuild 1600 BLAKE2B 98e6e379b7161a6976121ae09a54b8be2536f692b7b1d71700238cae9b6fbe4218b0863727d91880d24a1b85f5f0f67b3114ef8b35092388380993e8d8ab7e93 SHA512 27db14562b9e1e5832af6cbce38a932dad8cf4768eb681414a23da7f934cf9d011b169f271cfec31cedcb9ccda116351dea32ae25fbb4b8c40a23df7c7995e5c
 MISC metadata.xml 299 BLAKE2B 219ec05cbf4172c1097e96d59b6e6cee44ea19ebe827440b53493c1953bebe7c5a3f017b6d2ef0bb5300a3d9cd957e683461c4f3edc8bc4d17603c7d78ed59d9 SHA512 be27e090213278995ed73b5b85ef663921136f999def3608d1fdf79bd6537ba38d2424f204e228aa498fa85a2e327633c63b6ca01dae330cc37c4f6832ff861b
diff --git a/media-gfx/evoluspencil/evoluspencil-3.1.0.ebuild b/media-gfx/evoluspencil/evoluspencil-3.1.0.ebuild
new file mode 100644
index 000000000000..199a2b8ec46d
--- /dev/null
+++ b/media-gfx/evoluspencil/evoluspencil-3.1.0.ebuild
@@ -0,0 +1,82 @@
+# 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/}"
+MY_PV="${PV}.ga"
+
+DESCRIPTION="A simple GUI prototyping tool to create mockups"
+HOMEPAGE="https://pencil.evolus.vn/"
+SRC_URI="https://pencil.evolus.vn/dl/V${MY_PV}/${MY_PN}-${MY_PV}-1.x86_64.rpm -> ${P}-1.rpm"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk
+	app-accessibility/at-spi2-core
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libxcb
+	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}/chrome-sandbox
+	opt/${MY_PN}/pencil
+"
+
+src_prepare() {
+	default
+	rm opt/${MY_PN}-${MY_PV}/${MY_PN}.desktop || die
+}
+
+src_install() {
+	insinto /opt/${MY_PN}
+	doins -r opt/${MY_PN}-${MY_PV}/*
+
+	fperms 755 /opt/${MY_PN}/${MY_PN}
+	dosym ../../opt/${MY_PN}/${MY_PN} /usr/bin/${MY_PN}
+
+	insinto /usr/share/applications
+	doins "${FILESDIR}"/${MY_PN}.desktop
+
+	mkdir -p "${D}"/usr/share/icons/hicolor/256x256/apps/ || die
+	mv "${D}"/opt/${MY_PN}/${MY_PN}.png "${D}"/usr/share/icons/hicolor/256x256/apps/ || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-gfx/evoluspencil/files/pencil.desktop b/media-gfx/evoluspencil/files/pencil.desktop
new file mode 100644
index 000000000000..4a3354ddfd9e
--- /dev/null
+++ b/media-gfx/evoluspencil/files/pencil.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Pencil
+Comment=An open-source GUI prototyping tool that is available for ALL platforms.
+Exec="/usr/bin/pencil"
+Terminal=false
+Type=Application
+Icon=pencil
+Categories=Graphics
diff --git a/media-gfx/fdm-materials/Manifest b/media-gfx/fdm-materials/Manifest
index b3ca9b82f5a9..2ad973ce369c 100644
--- a/media-gfx/fdm-materials/Manifest
+++ b/media-gfx/fdm-materials/Manifest
@@ -1,7 +1,9 @@
 DIST fdm-materials-3.4.1.tar.gz 20852 BLAKE2B 7ad125e62c1a1cf2a05440c6ef593bf5115e6998d1a2d190063eaaadf8b9d0d93a1c98a1f2fdf672657e2c47159cc49ba6402e47ef5b55b880a8f0a7bffc9969 SHA512 c635bb3d3875e10abdc8f54c22ee74abf678cf8409ebeda6f083ac368025f90bd1871f9b13ad94c843f80073e0ae20d1dc08e80bed37ea7e2bfb3161d8ee8f0d
 DIST fdm-materials-3.6.0.tar.gz 23037 BLAKE2B 842edbbef94dbf8a775d81bae3b6621dfeff9ba5cc8d9986ad672f95fe864007c931ef37d38c8702201d286c1cdb9770ab5709e364335833fd40c8c1e4c0f68f SHA512 1f868b716135a3b81495ed6445794c4d5cddc618dbf7a19b29ccdddbcd1d6f9d49190be7cea99c6dd2b8c07f1126973f1c43b223ff213ce04b6fe8811c71a577
 DIST fdm-materials-4.2.0.tar.gz 29011 BLAKE2B cd167506070e5609b0e464cb547271008b9f500312e378c9d8a16ae71cdcbde0efbd91bc0149f56ea9d9c9cf97f4a946810c542a4a0d8350344b48393dacc070 SHA512 02981374d4abcbfbcbace5b6b5d5542d4a5cc65ddf3a47569e34ad94284df56fdcc5f674801ee74c12034c502df8e5cca84a077f648f81557067f0044bf7bf9c
+DIST fdm-materials-4.3.0.tar.gz 33208 BLAKE2B 5505a885e03130757134557525e30ecda7091d3238aa5be753065c8bf81dd08914acf22ba85b95f3c78818bf5defedf97ea083d22f1886fc5113d692d70b14e6 SHA512 420accb4ff3eba754e96ceecda4980f121cab22ca3aeefe0781be47cce2ed64cd93df2a2bd974ea611e71ea45a944692e7b27bfbb6f9b0e9dd971e7621e4ff58
 EBUILD fdm-materials-3.4.1.ebuild 427 BLAKE2B f0c2ffd1704db661214fadee859f5ecb9a1653c7921649d5f75a7d90d1c22a5441cc614fc664943b4e2b1805d6d2a9e38a48c1ec6de8f029ff3df78ffed6587b SHA512 3ddb73a72ae39f3061c813f367cc5088b11617fde22acb7c77d43977174b4f00b156e1cf923ebe231c3a261e3684e9bbfecdc7bb9f08c08de3398a83b8c7ac44
 EBUILD fdm-materials-3.6.0.ebuild 424 BLAKE2B 86abac9f2f32f709c5e2dde549df6758108d22945a55fff32f4be6c2bf3842c210af686f00a6c403f0ae13611062e300cb4e235d4bd8fd25c0cf281fcda31f7e SHA512 aaaf876fe1c373061e94067ba1c89af62fb4836c44c7115c55d7684f01be6f11653850b94b029fdc56e70fc861eb44325aa946feac81d1ac0f06c3d48d8a7264
 EBUILD fdm-materials-4.2.0.ebuild 424 BLAKE2B 8caa956e8d16c27729c9f36acacdeba194635770824e8f110ff642b38bd7d37b958fa197aed9cd991c71f5fd696597329f872771a403c5df3715917465bdf1ac SHA512 9815bdcb1df46f6b37ef20761bfe9e8b9a954773072ac9eb316bc34e3320ca8bc3714d42c7de06bbba6ec9a45c0476187701943de93e3e275cedd6bad97c08f2
+EBUILD fdm-materials-4.3.0.ebuild 424 BLAKE2B 8caa956e8d16c27729c9f36acacdeba194635770824e8f110ff642b38bd7d37b958fa197aed9cd991c71f5fd696597329f872771a403c5df3715917465bdf1ac SHA512 9815bdcb1df46f6b37ef20761bfe9e8b9a954773072ac9eb316bc34e3320ca8bc3714d42c7de06bbba6ec9a45c0476187701943de93e3e275cedd6bad97c08f2
 MISC metadata.xml 865 BLAKE2B faf20efb80033c67c5b6cacbb3679368e6f7e8a63587aebb6a5e1569a2594620d3b657f14baee3bc39046993a0e285ccd3a02e888bd19bd885735f5a731b16fc SHA512 a083d711722c5896ebe0b9f2f8d5084e3e8fb2456c8b201eb2aae775c2e6a0b8a596a6e37f8b0e2015ed0e5095b05331257f916a77ca4df739af82d9a3802738
diff --git a/media-gfx/fdm-materials/fdm-materials-4.3.0.ebuild b/media-gfx/fdm-materials/fdm-materials-4.3.0.ebuild
new file mode 100644
index 000000000000..e2cea43f6d83
--- /dev/null
+++ b/media-gfx/fdm-materials/fdm-materials-4.3.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+MY_PN="fdm_materials"
+
+DESCRIPTION="FDM materials for media-gfx/cura"
+HOMEPAGE="https://github.com/Ultimaker/fdm_materials"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 9afbbf7a7b9f..c44e57747804 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -14,10 +14,10 @@ DIST gimp-2.10.12.tar.bz2 32614932 BLAKE2B 93e0c6c3ac58335920a9ebcfa81c970f0c657
 DIST gimp-2.10.8.tar.bz2 31954568 BLAKE2B 11f88b1068fa1fe216a54bed27b26b94c3fdb2cbc67e1e444df74a080d00b678f8c81897a6c5fb5956fa107842b0a853ada44d15d51c2e58db7435ddd0f8e999 SHA512 b458dd710b786152f95a8e48a0727b71cac549fccb31ac9e1e6ac3c617652079773ce7076401f8ade750ed38bdc78dfdec3317423f4c4e9c931f78002bd7454e
 DIST gimp-2.8.22.tar.bz2 20873278 BLAKE2B 673246fd2354f1cecc74bf389df698f594b7553cc88a1d2679ae410ad39923abae843dfe9623ec195b4f967b5eccd199769a6300bf028ae04b8df4932df11505 SHA512 84a78d428282538b606b3cd1ff571e52c3d828fceade171b2012bc1cdcb85919fc7734e7e6c45ed3a8683657fa580412b32c1b511b8a512172a8c1df930493e6
 DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26423a2b567cd8372258f87b44ae1ad812f2b3ee9a093b919d022e8b71ef518d40b76ab94c616f9916b3d1effec SHA512 897092aa823961e6ed5dac47eaadd3a25c419364d6ca791987d99e495d0d4eba1d75e08c809dfa305e8feec9da606193b608e3470e0ef18fcfaa98ee8aedfe02
-EBUILD gimp-2.10.10-r1.ebuild 6019 BLAKE2B 95f0b465a05852fa14ee4ec2ba24cd9e950a3f8ca177934ad44a557612eb05401c83bb178d76d82993fce4fd4d44ff07ba6c49b67c1474a42a1ead89aa4303e7 SHA512 67daa7288ced9a24f25be60b66774a3a62c9b65625b00b7928a3de80dec36e1bd951614e32c55df47a1f48a7a5997961b435f96a95b0afd17b37e8a3d3ff8f68
-EBUILD gimp-2.10.12.ebuild 6019 BLAKE2B aa9cfa85ba3ac683e7ca56565f15faf6487fc59824ab6d7127b86f10e93277e14fda86aee22cdb81c4f864c0cf8158df13257519f323ab5e96deed817f7b2805 SHA512 43865076a7ce5fe24c732fd95d3e12ca70b712fd0b87a8a96c0377eb73a5ae395b4407c5edfdf69923d9d71ec6db1b3093476ac07d96ef5d6a183787208859ae
-EBUILD gimp-2.10.8-r1.ebuild 6103 BLAKE2B 6425ca47c627119df035049ad207952a63a73db746d5a0555c039db4005eeb50c43751957eacbf47e75ec7ecd2d76a07194241fff733126bc9c0a13eb9bb94f2 SHA512 ff9dc9525d10911d121e44e8c613497771d74f7f271642f58a8c2381c41aae1ef3dc8430161035f551db1a570ee59859a94ed23816d21f9f5a4f405de0b2844c
-EBUILD gimp-2.8.22-r1.ebuild 5123 BLAKE2B e3bc8adfa913bccfdf030ef2a12529a4ca130f033b5cdd0fcb435b99e2a8b0d33ee8ddc73a79e23e031d9474fff35ea8e69fe31568189c5f8a6c2dc605e14744 SHA512 255a75d03da42e7685790dec17afe29185341a7393fe4f5c2166f5dfa0f3eef470f014ccd04d00803a3fc1b1da46402c41773a18019bae05e4e0e1d88531d7e9
-EBUILD gimp-2.9.8-r1.ebuild 5660 BLAKE2B 7ec76e1a703cd5534741651016f86f2d1eb4787f3a93cc52e02b1337c0730b1e08ec7c6a033b96d9e6172754fa8da14ef0e5511d872e09dfe3dcc0016f89a54a SHA512 9266ba66630e65f58c3eb36cb17299ce7bc548e3c9a8f1583160d942d6bfdd59a4284ee7e2d6a7205bf66f3140caecb0e8ad11af3a22727d6866275de93741ea
-EBUILD gimp-9999.ebuild 6006 BLAKE2B 32d782ef463075d2d38662dfba2b04efc4ca2cffa68daecac66cafd496d7466ee5c16ca0dd6ef23b2907562d2297b55265588773745630810e34baca105f7dae SHA512 662bf161d64551f1ce1727ea7be016cb6bbd4ab354c1b3734c87eb3f18d41255158f68cf17a55094791542ea41b6a05537f4ace9f1ba326e919ff02b827e9479
-MISC metadata.xml 474 BLAKE2B 7beaaa52a35415b9460b23f5031f71464008417e589105db607f0f86519cb7f19c9621dc77acea9aa9e67a1bf8f5887415761a69a29eb77aa205a89cc8b586ac SHA512 f1a58ab4fc0c7a4257648f35027d0860ee7b088ebd61703dde7622078bcc345168f3b747e79d71206ae36c479334925aac137e96c0d2134413f9e62aa27cee53
+EBUILD gimp-2.10.10-r1.ebuild 6020 BLAKE2B 1b0c8bcd5a31c22686b7afb56ec23f50f25829073f357f3a898d2b93077967a27ddb55fc03f8efdb5beeef1f1e7c42c8bc48fc8481c18d52c8274a5c7680a8c7 SHA512 8b3cf0c9780ba21f4e2f95526be76784c97a442beb2c8e3636410836ba93f6760a59f16dca6c6eaf7cc51fa86727e113a77ae76a4a1d95e9d45df6d22b99be46
+EBUILD gimp-2.10.12.ebuild 6022 BLAKE2B 9ae48bd4b1a5bbdb5240d3b42fe7d1407a10e96991b92f4300f7ea57da359809250783a531f02327db37e4b5f4db7a1cad2a002e6191142ab1da0d1a7f9fbcc7 SHA512 912dd6614fd5f239078856b9bad3dbe191294fbdd8fc87dd98755b3772871b05663180b846902224081cecc03a50444f304bd4cf6510d44d179263aeb5389d56
+EBUILD gimp-2.10.8-r1.ebuild 6104 BLAKE2B bec6521e91558be2f2282baf131598c519f92c93267f687dedcac78fe70d27851c09307eb438009d35f9307c2ae78a77411cb6238cdde84b0ace9165399308cd SHA512 20f59e5aa3a8d5424b65ed9f947123feee6723dd16f946991022b17ac964be37c6aa0a71022928293fc51c542f3a3ad24ad3432fc6680d7214393d87d5159db2
+EBUILD gimp-2.8.22-r1.ebuild 5124 BLAKE2B b2fb64d49da0796f6eb2245eceade1ea5b5e2c5da2af918dba9c87a0fa4cb7f4c6dbe7688a6d7fe08b085c569413c06ffd4d22bf1cfa3a9f8c00277f634a11ac SHA512 e8cec3990a151e13c606498f5ebc4e685a28d5fb10919ec6bbb71b1f60d814b13722530f8737aff9e18065093800b8ebbe56d5f3844555accc475d2b74acf18d
+EBUILD gimp-2.9.8-r1.ebuild 5661 BLAKE2B 0617f1c469d09aa5df2884bf54db4338a2ff851a301a3ee7b2daf229c1308aa4818b9693b3f757f23052a857eb6a584d37fbe98e4b2390687dbfb83740c2bb95 SHA512 a10f751e97fd8a1b8e3fb1cc8d4fda72f040aa6631ed22f72c10c29b3b57954fc062518572715643fb7da61bfd501bf0dc6226db49130e3efdb8cb4afe610eed
+EBUILD gimp-9999.ebuild 6009 BLAKE2B f254cda756f2e1c0de1013012c45748ae32739b18a23d4245833fc6994e01afd2cb77ef115200b8c8f6699cbcdfd1e66c89f6d767547dffa8ae0ff34d510629c SHA512 adb32cf41ed3af0aefe82cc3ff53fa40cdca552dafbf38fec508de1452bfb2eda24cfc5f96f8163e9a505b1a04527a12d12b113761a592722b86022c8dac246a
+MISC metadata.xml 425 BLAKE2B 3b3206df95f94e2ee61a5139b3c146c323348653803d8e7150aa2a56f01e46afcf91cee68286a2d86012fb990991012c6b7fa4150100fe45a21130d0ce3cab6d SHA512 0aa8538d2d93e5241dae2c14ffe416a448c4e1de7275dd2c81408bfd1e4dcd773474ade257f333ea2bd34555486c25768779132d37c1a44241318058c1f8d13d
diff --git a/media-gfx/gimp/gimp-2.10.10-r1.ebuild b/media-gfx/gimp/gimp-2.10.10-r1.ebuild
index 988122916d6f..faa127d6d835 100644
--- a/media-gfx/gimp/gimp-2.10.10-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.10.10-r1.ebuild
@@ -63,7 +63,7 @@ RDEPEND=">=dev-libs/glib-2.56.0:2
 	app-arch/bzip2
 	>=app-arch/xz-utils-5.0.0
 	postscript? ( app-text/ghostscript-gpl )
-	udev? ( virtual/libgudev:= )
+	udev? ( dev-libs/libgudev:= )
 	unwind? ( sys-libs/libunwind:= )
 	heif? ( >=media-libs/libheif-1.1.0:= )"
 DEPEND="${RDEPEND}
diff --git a/media-gfx/gimp/gimp-2.10.12.ebuild b/media-gfx/gimp/gimp-2.10.12.ebuild
index 54808a41fa88..c50fc2d19f7f 100644
--- a/media-gfx/gimp/gimp-2.10.12.ebuild
+++ b/media-gfx/gimp/gimp-2.10.12.ebuild
@@ -27,7 +27,7 @@ RDEPEND=">=dev-libs/glib-2.56.0:2
 	>=media-libs/freetype-2.1.7
 	>=media-libs/harfbuzz-0.9.19
 	>=media-libs/gexiv2-0.10.6
-	>=media-libs/libmypaint-1.3.0
+	>=media-libs/libmypaint-1.3.0:=
 	>=media-gfx/mypaint-brushes-1.3.0
 	>=media-libs/fontconfig-2.12.4
 	sys-libs/zlib
@@ -63,7 +63,7 @@ RDEPEND=">=dev-libs/glib-2.56.0:2
 	app-arch/bzip2
 	>=app-arch/xz-utils-5.0.0
 	postscript? ( app-text/ghostscript-gpl )
-	udev? ( virtual/libgudev:= )
+	udev? ( dev-libs/libgudev:= )
 	unwind? ( sys-libs/libunwind:= )
 	heif? ( >=media-libs/libheif-1.1.0:= )"
 DEPEND="${RDEPEND}
diff --git a/media-gfx/gimp/gimp-2.10.8-r1.ebuild b/media-gfx/gimp/gimp-2.10.8-r1.ebuild
index 51958b923c8d..c69d663e35e1 100644
--- a/media-gfx/gimp/gimp-2.10.8-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.10.8-r1.ebuild
@@ -66,7 +66,7 @@ RDEPEND=">=dev-libs/glib-2.56.0:2
 	app-arch/bzip2
 	>=app-arch/xz-utils-5.0.0
 	postscript? ( app-text/ghostscript-gpl )
-	udev? ( virtual/libgudev:= )
+	udev? ( dev-libs/libgudev:= )
 	unwind? ( sys-libs/libunwind:= )
 	heif? ( >=media-libs/libheif-1.1.0:= )"
 DEPEND="${RDEPEND}
diff --git a/media-gfx/gimp/gimp-2.8.22-r1.ebuild b/media-gfx/gimp/gimp-2.8.22-r1.ebuild
index 34511189e6a0..f44e399afa46 100644
--- a/media-gfx/gimp/gimp-2.8.22-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.8.22-r1.ebuild
@@ -54,7 +54,7 @@ RDEPEND=">=dev-libs/glib-2.30.2:2
 	sys-libs/zlib
 	bzip2? ( app-arch/bzip2 )
 	postscript? ( app-text/ghostscript-gpl )
-	udev? ( virtual/libgudev:= )"
+	udev? ( dev-libs/libgudev:= )"
 DEPEND="${RDEPEND}
 	sys-apps/findutils
 	virtual/pkgconfig
diff --git a/media-gfx/gimp/gimp-2.9.8-r1.ebuild b/media-gfx/gimp/gimp-2.9.8-r1.ebuild
index 1898a4be6a86..162fd88fc46e 100644
--- a/media-gfx/gimp/gimp-2.9.8-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.9.8-r1.ebuild
@@ -60,7 +60,7 @@ RDEPEND=">=dev-libs/glib-2.40.0:2
 	app-arch/bzip2
 	>=app-arch/xz-utils-5.0.0
 	postscript? ( app-text/ghostscript-gpl )
-	udev? ( virtual/libgudev:= )"
+	udev? ( dev-libs/libgudev:= )"
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5.10.0
 	dev-libs/appstream-glib
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 7c23c4d716d6..e5e13bd8d9a8 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -28,7 +28,7 @@ RDEPEND=">=dev-libs/glib-2.56.0:2
 	>=media-libs/freetype-2.1.7
 	>=media-libs/harfbuzz-0.9.19
 	>=media-libs/gexiv2-0.10.6
-	>=media-libs/libmypaint-1.3.0
+	>=media-libs/libmypaint-1.3.0:=
 	>=media-gfx/mypaint-brushes-1.3.0
 	>=media-libs/fontconfig-2.12.4
 	sys-libs/zlib
@@ -64,7 +64,7 @@ RDEPEND=">=dev-libs/glib-2.56.0:2
 	app-arch/bzip2
 	>=app-arch/xz-utils-5.0.0
 	postscript? ( app-text/ghostscript-gpl )
-	udev? ( virtual/libgudev:= )
+	udev? ( dev-libs/libgudev:= )
 	unwind? ( sys-libs/libunwind:= )
 	heif? ( >=media-libs/libheif-1.1.0:= )"
 DEPEND="${RDEPEND}
diff --git a/media-gfx/gimp/metadata.xml b/media-gfx/gimp/metadata.xml
index f16562de25f4..e615a07f9cf7 100644
--- a/media-gfx/gimp/metadata.xml
+++ b/media-gfx/gimp/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>sping@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="smp">
 			Enable support for multiprocessors
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index cc487335e7b6..3370acaa5a24 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -1,8 +1,8 @@
 AUX graphicsmagick-1.3.19-flags.patch 1800 BLAKE2B 50f4f0de0cb3842fb84e136038bc0c9714a776868303bda17af26cca8f3c4160d7f9060d0a8a116ad30a17b416ddd2963da0e66d4ca76fdc351507c51ae30998 SHA512 fa1bdbe718ae8ae49a58f6fc1728f1bb6b869a907f77e41eec92c452f86e05cf821548409f2a5d55dcdb38b8a80d7ef2b1d37d2111c3fd5088a118626479ad2c
 AUX graphicsmagick-1.3.19-perl.patch 491 BLAKE2B 6a6465162d9a4d7d09b1edb425cc7114cd4e0fc65e48f15c8c2a854fe835fd1fe94c56611c6d2744d9e26884c57b1f67353bfd32abe2f25a145dd7abbf5479f0 SHA512 da114b891ec923253048d90ee14f136742072bcb70e512e8d2838bbcac57b5fe6ea580cdccfd1bba5156777623c43e946ce2a8661f88612d4c24849bef0fb865
-DIST GraphicsMagick-1.3.30.tar.xz 5496116 BLAKE2B 408f68334b290ae30d06e4b0efa6e11e89ffa9c00781e2f0ceb25cd6fc308f1be86b5ed9bd52f594e1abd3351f1b7dbfb12e87117ba85f4b4c01d07d7480772a SHA512 4f04245b8abef85de96a1527ad4adc1fadea144a1917db3ea21632a9fe732bdaa7021ffdbbeb7c2ead814ca7b6a14e81bb68a962bbfb64fa6809a235f1b0be5c
 DIST GraphicsMagick-1.3.32.tar.xz 5535224 BLAKE2B 96fd7bfe62b4b1b25f9ffc0ff8e2ac023f0528b9af857fc27a5a9cd1123eeb6533b868c7bad8dca5b58e114a674dda009a62904df64622d7b5f3c0d72156283d SHA512 f84cdb9318962aed1dc25d70db4d0ca102e4f88748f468f8a56b77d228fd315b772afa48e90a396d32e8226eba9105717bcb94166bbe43723afeec58ead53e09
-EBUILD graphicsmagick-1.3.30.ebuild 3189 BLAKE2B c352fe587cce7000d3f533977e7ce3cf275e54cc65d2388dfa9394b69f222186bace9785b97bf5d230cbaa16caf675bf3569e26b77ea6b78de02a6f43a404a49 SHA512 5f10a7f6abd3a6f972bc628a604457b225e2a21d7518e986567390112062fcf597e397bcf07bcec201b49fbc9c1309f529972f86ebd451622a789d6eaa1896b1
+DIST GraphicsMagick-1.3.33.tar.xz 5558348 BLAKE2B 9c3747ee63d94bc6d16c06c04c7fad2ca93e849df7ae4391523b416111b5569c7493226f6b967a5ff80e0ff2ccbe7f6de5a7223e935024fd66a96be401fdf26b SHA512 8afeb461d1a9dab9b88b9bc7c2d50b5c409463b369e6b0ba7ee39b0ece32da9393d7a5a4d18faf8f72a529346a3477bae61b802bac2af81aeae79d95c9d6cd13
 EBUILD graphicsmagick-1.3.32.ebuild 3068 BLAKE2B 97ee3150595a43fb4f44d4f256b353ae30d43576b2a24f217df31998c69f3a1d09546315ecf9b43374e862b75e72e6a8e751131454e8630db35663608e350d97 SHA512 f00e4612b5ed1728ad326694488e598112599ad4c106ebe2a3512558516b5241ea969808c081926bf0eec8c39c4366ecb2f767937dc8a8f3cf0e09004947034c
+EBUILD graphicsmagick-1.3.33.ebuild 3076 BLAKE2B 8e54ac0ab1ad928cbabe6417580535f88f7cc3dff4149e3b6db8133a7c9eb053a3eed15553fa61c295c2629e4b1ec814a04edf2fe5d88895a5c3726a8d79345c SHA512 951d0a0a215b3523c396c089fe57090e37686eb97b3fed899e5ce66988b90e7ef73f58e57de87f2d8127d819b45bfb4bb53776340448e756176f15be57a4db41
 EBUILD graphicsmagick-9999.ebuild 3076 BLAKE2B 8e54ac0ab1ad928cbabe6417580535f88f7cc3dff4149e3b6db8133a7c9eb053a3eed15553fa61c295c2629e4b1ec814a04edf2fe5d88895a5c3726a8d79345c SHA512 951d0a0a215b3523c396c089fe57090e37686eb97b3fed899e5ce66988b90e7ef73f58e57de87f2d8127d819b45bfb4bb53776340448e756176f15be57a4db41
 MISC metadata.xml 1154 BLAKE2B f94864df05c239bd37ec05d00068e934e60e8dcbe03e52020df7d830842be94c08dbf339eca919c4e7fe18d5ad62bf3077ac9877b18ef6f09fd2b9f52c31aba0 SHA512 9bdbcace99fd11f192bea183b5d84bc9b2d06979db21d1a9a3e57677a4438f24a5812619c73a0becfc7fb81140414199fde3d0e8811abf1a92322535529f5d2c
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.30.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.33.ebuild
index ed0736e0f226..b7015389b707 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.30.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.33.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit autotools toolchain-funcs
 
 MY_P=${P/graphicsm/GraphicsM}
@@ -16,11 +16,11 @@ if [[ ${PV} == "9999" ]] ; then
 	EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
 else
 	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg lcms lzma modules openmp
-	perl png postscript q16 q32 static-libs svg test threads tiff truetype
+	perl png postscript q16 q32 static-libs svg threads tiff truetype
 	webp wmf X zlib"
 
 RDEPEND="dev-libs/libltdl:0
@@ -32,7 +32,7 @@ RDEPEND="dev-libs/libltdl:0
 	lcms? ( media-libs/lcms:2 )
 	lzma? ( app-arch/xz-utils )
 	perl? ( dev-lang/perl )
-	png? ( media-libs/libpng:0 )
+	png? ( media-libs/libpng:0= )
 	postscript? ( app-text/ghostscript-gpl )
 	svg? ( dev-libs/libxml2 )
 	tiff? ( media-libs/tiff:0 )
@@ -47,9 +47,7 @@ RDEPEND="dev-libs/libltdl:0
 		x11-libs/libXext
 		)
 	zlib? ( sys-libs/zlib )"
-# corefonts are required because needed arial font (bug #588398).
-DEPEND="${RDEPEND}
-	test? ( media-fonts/corefonts )"
+DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
@@ -91,7 +89,6 @@ src_configure() {
 		$(use_with bzip2 bzlib)
 		$(use_with postscript dps)
 		$(use_with fpx)
-		--without-gslib
 		$(use_with jbig)
 		$(use_with webp)
 		$(use_with jpeg)
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index b0348f2c435b..9a59ec800364 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -5,5 +5,5 @@ AUX graphviz-2.42.1-math.patch 843 BLAKE2B 3ceeeec968dd45478f4bb07d819cb5a4b5a21
 DIST graphviz-2.40.1.tar.gz 25633455 BLAKE2B 96ba5a8cb94d93cf4ecd424bf29c1bf67099e39e582be97fca088de0aad6bbbb46b00af55c197894e0b63f1a96177894b6cd23498295bb524fe19a75661cbc59 SHA512 a3f358a7050523a39b91a259563a95925b37853ffec799e571211af5b686d3af42457c937882954482785745d90416b1abd945caf05f8abb52b3876e07aa70f5
 DIST graphviz-2.42.1.tar.gz 25543401 BLAKE2B e64044923a823f6fbe91b498b04fffe3e5b6803c55c5ce29a60b16a38d97260061b013e8bd13bc99f360d035c840f18a01301b29ca1cb73c4be87843f18c45fc SHA512 ac263df086eea6faf682f493756b79a0af8bae3f515cd8c09238e89f295226baf743a3fd22d977ef6f223388769ef11241dfb2fdb6087305ce4fdd3fa8ed2f78
 EBUILD graphviz-2.40.1-r1.ebuild 7929 BLAKE2B 954fb0e307df7e28ae4cf0806aa5b1969615c542416532d11930b3327075977be13b38eb127639fe153bac3819f28a7ef1c0be926391331d3f01e60a4ebdbba8 SHA512 c0cf4c8aa2954391a46b3698c445b2dc100db6c8194cd191c8ecc4ea3b2ac2616b47ec8117b180abae6c8dd9edbde9c2e8731af78bccd6364932447c6a289a72
-EBUILD graphviz-2.42.1.ebuild 7939 BLAKE2B 5cdfb438c292463ce91f68a94c5f698ac0e630132537ddcce901c9d3cf6e39eb422e9d3dda3a45789e86205b4ac5b9ec97adf506ee5f401e3f7b2dbfcb68cc58 SHA512 ed38830d9a1130a572879a44705c6598bfb1a77e9cd361c0266557f7ed0c178c7a6e2924a2c0ce802d244a5edb1a631027c5d2cd79876a958f6c6ae985f88e04
+EBUILD graphviz-2.42.1.ebuild 7935 BLAKE2B 78ee86e3d9612b52fa9ca8015e01aff88a0f118548a9e426843c6e18805dd7829f999ae1c620c1f2b2b2ca9537183c7b0bba33ff5532f6f30287556a9de90445 SHA512 69478964dbfeb4a9d73268bfaeebdc9a44ae5af8668863dec6a163ca146da155fac09f17aafe74c99ca185035cdf9e1ae95eb20c9e30b83430ee4f9a8399bbab
 MISC metadata.xml 2211 BLAKE2B 1c39235c1d8c2efce0596cda2d20bf1cf2e81643068f68215f31462b6320f7f31533877630aa3c2b2bc9a7f7856f7b27354a97bb2c61d7e63a6de86f569ed192 SHA512 f7689fe65e46905d48fb2e45c3ad2a1e8f4fcb572515fdd7dfa26cdd21ed1eaf52d8ecaab9c297f5e8df69a205337b8526e0304ddbdb8c4b3e82cb1e428a1e71
diff --git a/media-gfx/graphviz/graphviz-2.42.1.ebuild b/media-gfx/graphviz/graphviz-2.42.1.ebuild
index b980139601c6..ddd69f3e377b 100644
--- a/media-gfx/graphviz/graphviz-2.42.1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.42.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www2.graphviz.org/Packages/stable/portable_source/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD"
 
 REQUIRED_USE="
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index 17fd156e0e8a..f2ed81945be7 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -1,4 +1,4 @@
 AUX gthumb-3.6.2-exiv2-0.27.patch 1004 BLAKE2B e351a67d8fbbfd0c13b26ca575a34528ef29f6d6b2a7ede9b0f16a5835f502bf24e8415f597146abde875e5dbd93fd1fec126a6bbb27d4b0f9881fe9c823ceb5 SHA512 e6f4549526d745d7fa0f42175508be7f6b5ffc9258a5b59a31f45e8c095870b13a0da55c50635723abe6235cf983b7730677906bbb16acf99e58447cc72d8c3d
 DIST gthumb-3.6.2.tar.xz 3423044 BLAKE2B ff5fd805c07c969f8e50960cdd36df9b3ef9ddedcaca66578416fc4f602fedf4f1698fec54cda77521c88774e8e309b996123ade9a633df1ffc34bb60cef0ff5 SHA512 5fc5cc43b16b51438403fbb986286d5e66575162be7b4cf35931dd0c41273933f78c210aaf2379e0a2574df6f7f7b2d532d87ce37fbc6369b65331bac338a454
-EBUILD gthumb-3.6.2.ebuild 2654 BLAKE2B 3f89993297e713e9b50875763ed9623bfbf740ffcfb43562ff119e494394d3f91443d1b5aae47d2c35148bd33a28ea1c7f8dfcc909c2d822f4ef43899477386f SHA512 003160b92864d1410cdc813d825e2ef32e496fccd8692494fd7bf53e48aaaedc2ccf3762236b29f2c7c31bec095b73ba6f7c4179005701eff2b923a2feea38da
+EBUILD gthumb-3.6.2-r1.ebuild 2690 BLAKE2B ae853fc2f1a55a17626b589c7aab46e19441a52299a3fd829347eb30358bb2e8e030303154674c7ed91933845333dc4e79c40a560c0ad74f0527fcc9d2aef6e3 SHA512 38ef0e0adbc136339941de2f7e67d801c80013d3606f06eb3cb43445c60d987771ef5c2ac9e88f2f52e988a0bb902b32f92c10a017278cc21545e658011c60e7
 MISC metadata.xml 492 BLAKE2B 62ee03ca8c249d8ba7d9e6516ca44677ef14a84bd6c9f9d12e245fc053e5b76215e9f5db346e06b364552c911ab9b9ca63598da5098e89fbb2c6011f8e2b4f03 SHA512 f75dcc1e5ffc912b3e3d69335f98f7bd38af5d46de10cae326ef5569a4511a022fa1bfe6964fb8e5e4883dc09cbfcb5f7e58160ad4864ef1fe1cca1d8b66172d
diff --git a/media-gfx/gthumb/gthumb-3.6.2.ebuild b/media-gfx/gthumb/gthumb-3.6.2-r1.ebuild
index b8cf22ade78b..c06bbec3e549 100644
--- a/media-gfx/gthumb/gthumb-3.6.2.ebuild
+++ b/media-gfx/gthumb/gthumb-3.6.2-r1.ebuild
@@ -23,7 +23,8 @@ RDEPEND="
 		>=media-libs/clutter-gtk-1:1.0 )
 	gstreamer? (
 		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0 )
+		media-libs/gst-plugins-base:1.0
+		media-plugins/gst-plugins-gtk:1.0 )
 	raw? ( >=media-libs/libraw-0.14:= )
 	http? ( >=net-libs/libsoup-2.42.0:2.4 )
 	gnome-keyring? ( >=app-crypt/libsecret-0.11 )
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index a99635011a51..884ac9cc40e1 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -5,5 +5,5 @@ DIST libimagequant-2.12.2.tar.gz 75611 BLAKE2B 23f5d3666fd21696d4f4dab9db3669642
 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 1451 BLAKE2B c2864c295cca60262bd47c613d60fafa2f6f5cb3f3fdf6db13c334fd7470d8109fff3a75b2fa95ba267dd528e25ac5ffa0cb5c32ea241e179d76108b56a2e010 SHA512 132f76b9be03b93143f7117de9923f2f79d8e1b05843320bcfc57cffc5ee5f8b89890a4edc964f08d389c801f4f9be298548be297c4507e001f555602901a378
-EBUILD libimagequant-2.12.3.ebuild 1452 BLAKE2B 724ee1fd478102d98b2ca30b9d313543f8d13b08c6bd5facddb9054cb601476b263d00efebff786e093c3d22801ef0aa3c4c1a8b1c2176f32d2f94b3da242215 SHA512 097eb0ebb716ff5472ef406a3c028289cb315921b5ceece89befa1f2eeb9c0fd71e3d1767425a906739f64e3006cbda79e4ad796fbdd9ad4ef0d7f9ac454c383
+EBUILD libimagequant-2.12.3.ebuild 1451 BLAKE2B c2864c295cca60262bd47c613d60fafa2f6f5cb3f3fdf6db13c334fd7470d8109fff3a75b2fa95ba267dd528e25ac5ffa0cb5c32ea241e179d76108b56a2e010 SHA512 132f76b9be03b93143f7117de9923f2f79d8e1b05843320bcfc57cffc5ee5f8b89890a4edc964f08d389c801f4f9be298548be297c4507e001f555602901a378
 MISC metadata.xml 527 BLAKE2B c3fa42153fa6cfede4de3d59e12063aeb44f67ce89d36be63c7df4671c57ecfdd43d08aee89bd96387ecbee2e41b1d5921e9ad2486b4dd8f06e6e93529afb0a8 SHA512 82b458b27288b6b49df16d5778f6c75b492d958bcc1c2f2950dee741bfddc82f561be50f590d3f891bf736ee67e5325ae297bf49f99c769ca97ac68042beee11
diff --git a/media-gfx/libimagequant/libimagequant-2.12.3.ebuild b/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
index 93d8dbed832b..3b54e4177a1b 100644
--- a/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.12.3.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/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest
index a3fbaf7036f3..644794e97688 100644
--- a/media-gfx/luminance-hdr/Manifest
+++ b/media-gfx/luminance-hdr/Manifest
@@ -10,5 +10,5 @@ AUX luminance-hdr-2.6.0-no-git.patch 377 BLAKE2B 454a9973831aa3ba312926190a84622
 DIST luminance-hdr-2.5.1.tar.bz2 10238826 BLAKE2B 02cc275e2433281e9305e07efb6f77a611ca8e8167ca478a0c4a4c16feab260203aeef501b24b52b54ff9ad92923fd52b2c6925d81e60b492f0ac2465e65b604 SHA512 5d2165ca69080b67426cbc7e30c3ad5545f1a9dacf09e76684c619633cd40b03ed2d0e32181a5dce9463addf20dce1afb58cbf4c0710688e143112687448be2c
 DIST luminance-hdr-2.6.0.tar.bz2 11556372 BLAKE2B 0026768202d35126b82101eb2dc7cdc2917728b519c1cadc62ffb6470204077b4b6ae220ebf09c7f903839fe0c714715efe796ee4830cc92174370cd2741d576 SHA512 6cfb21b1ddc9cac612e3d176323e34c5181333f1b52953c02ad5aec28cc86bf519ecede248847082085879c5c2fd2c5570b05f5d3bffa96ba3781ff8cd1967d1
 EBUILD luminance-hdr-2.5.1-r1.ebuild 2163 BLAKE2B ca1aea6abad91acadef5b7d729ef87d750dd81c48db728bb31a4c62b3daa051b2d745ad0bf019c7096fcc757c43c7801816d1f23b39403c0858e3f23924ce80b SHA512 814852444ee4f41218a20e4b7eb9e29bd61ec9bac8f0cd5cc6ccb4183ad0d265ea8cce05baa649e1fdc3efceb1ce8e9440e641d2e97aaa650f89e9f10944883b
-EBUILD luminance-hdr-2.6.0.ebuild 1835 BLAKE2B 1b03d602459cceeb2b78a93cb89142ecaad7fd6c9b4392da66e8e3bf0fa394683243229da1e78351deb39998bbefc4e5a92db3dadf833620282a764ff5b62fcc SHA512 ac7d21ee788f40dfc7fcae217d311c27ee096ad522ee7a9d00ca0cacfbbe816ed9cbe0d23ee398ae5d8d72961cba4e06ba4dbb9599891c960bbf95ed59be2cd8
+EBUILD luminance-hdr-2.6.0.ebuild 1834 BLAKE2B 9244091ac7adeb579930597cee3681b65858b1edf58c00949ccc4a61ce020046b0a27dbdca99401abeda47eb16a83ac1b6eff9e7e14ae6a00e7080ab569ba604 SHA512 878d4b5d5a0700449257362e022a84c03c3a30d37dcc45f79bc3a7e2305751a5ecf4cc87659c2b5592dcd20f35ae0fe97765501a7e331810249ce7bf339aa6c5
 MISC metadata.xml 1276 BLAKE2B 5b913b3c342f4d5a6fc67c30008d8eb9469c61cea7f6a10b8c29d1e60324da71e662a4f4d16a0d4a20c7431f5bab3dc9e157efbeae5dacbdadf4b2f5989e9058 SHA512 f1c9daadf3632c1f22297fe5987484a72cb7f0fa3f0758883c7d3c4fe798a6cad7838b855267b1ccc4ca74574692d915e725940c77e9891652a7cc80604a2597
diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.6.0.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.6.0.ebuild
index 7ac7a23ce19b..ffed4bc47e6c 100644
--- a/media-gfx/luminance-hdr/luminance-hdr-2.6.0.ebuild
+++ b/media-gfx/luminance-hdr/luminance-hdr-2.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/qtpfsgui/${P/_/.}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cpu_flags_x86_sse2 fits openmp test"
 
 BDEPEND="
diff --git a/media-gfx/mypaint-brushes/Manifest b/media-gfx/mypaint-brushes/Manifest
index 56ff6399e855..07745695523e 100644
--- a/media-gfx/mypaint-brushes/Manifest
+++ b/media-gfx/mypaint-brushes/Manifest
@@ -1,3 +1,3 @@
 DIST mypaint-brushes-1.3.0.tar.gz 2447093 BLAKE2B 26fc22ef7669f5d88b1cb2bbc4562baffe257c112baf4a782f5045becd17a0bea577f79f290ae51b38cb3030478ea9d2e251033cc95101caacc823d139fe4ce1 SHA512 f8e0050cd700358d75cd25e40acd73905e2a53f21c6177cf67e8012aa4fbba8dc445109f07601c3846f95532a40feff4441081c0aa4e958049fc0ed8008fb414
 EBUILD mypaint-brushes-1.3.0-r1.ebuild 529 BLAKE2B 9af6371367e26d41172a7f88dcf9135c726772989260448b97fb5a10a038164a0c2083b8e32253fe1300b5c1d39f8ab02bef32ac1d0c2bf0e7ceb7c47f1e6276 SHA512 4a3f706de354ef2a33b465a729fce1d16db19358626ee6d0d8e8093dbde9e2ab756fbd79d6133547a8c32d56bca54cc5c222bca575617d648d9c8b447d98a998
-MISC metadata.xml 216 BLAKE2B a7f17874d9514cafd0bbab739d143a00ac66ad8446bce8e05932d122c1631d29ad8077c2bcda021bc92b7e89b77c03d55e8997cf250f3bb55f8a1aca046bb2a7 SHA512 1de1c9f4b223876125a0321126f2d7b1b564a113d24ae86b380c4d67bdf58ed4f2ae1a1f5d686211ccf4851eea8e970c20109977abbc79d0cd855164b6474e23
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-gfx/mypaint-brushes/metadata.xml b/media-gfx/mypaint-brushes/metadata.xml
index 82b7b7953794..7a38bb900964 100644
--- a/media-gfx/mypaint-brushes/metadata.xml
+++ b/media-gfx/mypaint-brushes/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>sping@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-gfx/potrace/Manifest b/media-gfx/potrace/Manifest
index c5fd10431532..d0d77a0ebbcb 100644
--- a/media-gfx/potrace/Manifest
+++ b/media-gfx/potrace/Manifest
@@ -1,3 +1,5 @@
 DIST potrace-1.15.tar.gz 650840 BLAKE2B 1a2074ff0ff958e1c9cbcd35a6267ef7f4bdfa5ba9b511413fa2c5db16a7263ed27291a0bf7c76feb25abd59db099e1096b736eab28a6397accfce88f42fdeff SHA512 c9a8edd4f3339da587b9b32e12c83c8f7b993c7c23f551fa267545d9411679bc024924e23596ed1c83985693fc894b65dfa9f860275de395d9e0a88da37a4f02
+DIST potrace-1.16.tar.gz 657314 BLAKE2B ee6b04f355d593dd1ebcc4833b244e25eaaa69c91f90987d530a4e5a454668dff6ecfb7a5d8270ebbd9e7c177fd447d1b3fe2a343fc4b9413dd3f507c0c6e417 SHA512 10d85ed3fada80951223c65e923b5e6ee3e76e071575971d5b09b996b477ec5ff2403e0337c44963c6b441cc3ba6c4f7009541124a25c16b7721fdebd1f774b9
 EBUILD potrace-1.15.ebuild 802 BLAKE2B 90ab4ca18a92cad6e0249210767b3b47925f2dc1a307ab1bb93533647b8d000ccddb8d311b8057f09d30f124abdca51f1cea335396c6186d758d34ddc0360bd1 SHA512 e8079aae16749a380bea1278dfd0c521d55615be793a885d26389e8ea31d9f278ff1f607b1a0c196473652031f28f8ad8e74095456e4dcdafbe53bc69a2c354a
+EBUILD potrace-1.16.ebuild 810 BLAKE2B 2dc8008fe2cd0b65e308e819b7ff04b9c9dd743b7e7e889f6fe99425da94206b4a4048edb47ee780e1a7b865c15f65761fde93b60336678888ce2349c6da0539 SHA512 00779894c3f2178015cdbc51491a016fea978750f2afa02bb41cc0115982129332e97523089ff40323972a3a45ab3f092e76a510678f3c61283adf43c03d964b
 MISC metadata.xml 534 BLAKE2B 04a21e1af300190548959fc595c0f0ca4918bcc949bb6f5ac6747f79806b3c2f3e57ecf25076e8d8a876ff1ee45b8b816e89c957f8ca4e05292ef390c5de32e0 SHA512 00f7a8a90caa7e7d9920929733f084d41baf72c45dc998255c54964eb50f6ec70d6af8666463fdefca27f95156834f1c4e9676f115bbb86538e979967a73b6c3
diff --git a/media-gfx/potrace/potrace-1.16.ebuild b/media-gfx/potrace/potrace-1.16.ebuild
new file mode 100644
index 000000000000..ac56cfcdbd3e
--- /dev/null
+++ b/media-gfx/potrace/potrace-1.16.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Transforming bitmaps into vector graphics"
+HOMEPAGE="http://potrace.sourceforge.net/"
+SRC_URI="http://potrace.sourceforge.net/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="metric static-libs"
+
+RDEPEND="sys-libs/zlib:="
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_configure() {
+	tc-export CC # bug 610098
+	local myeconfargs=(
+		--enable-shared
+		--enable-zlib
+		--with-libpotrace
+		$(use_enable metric a4)
+		$(use_enable metric)
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest
index cba76a72a173..802f2ef8a546 100644
--- a/media-gfx/ristretto/Manifest
+++ b/media-gfx/ristretto/Manifest
@@ -1,7 +1,3 @@
 DIST ristretto-0.10.0.tar.bz2 586447 BLAKE2B 73e4be551879d58e0c43b7a039b3173e96df8a7c367bb1696dd27a6b20fc675465e6a78019e11498f0dc55286b605c7ab9545dd7d13e2607bc0fc05527947568 SHA512 1727025bbc056a71475d91505cc141661b011c3944cf4ca4d96b48a9ad7e1b28b8f4b0c856fa789cd2c877c1faa27aa57441e35e06f38fd2b81ddcd3284dc2b6
-DIST ristretto-0.8.4.tar.bz2 581374 BLAKE2B 8d4dc91daa1aebf7d8193d8a48c3be29ad6fed86b7fbea68effb63f6a56d2d39898b5ab0c93933adf9d65cce327109dca5ecff96855c4311494de7cc4182213f SHA512 c5479cde66e4f0903b9b8d9b1b8f4c7cde35ebfa334e414c8202e783c332bd4bfec650f85d308c7151d31fe84b27a13bb4048290b0a82ce7b8ba4baf3e4088b8
-DIST ristretto-0.8.5.tar.bz2 583736 BLAKE2B b2c0582eb7930eb3bdf9941dc086befd6a81f0d3aa8ea5ecdbedb00f7914287937e520c5257853d080dca4ebee08f1c40f8e8386a6de90856721a804462e9cab SHA512 48d2a68cd13e58c0f450fc674b031a4fc4495ece0ae00805f0564a5bd9cc2ac19c1c009726dd343bdfeffa59509f0ecc9cd069986af5a2ff2c2566c4490b5fbf
 EBUILD ristretto-0.10.0.ebuild 874 BLAKE2B e07b94b57833859413826556f0b18150b2fada428c24b6fa33a57c1f0b4188bd2bc29ec1a3b2ead30d5b9c68192b4d29f62c11582e94322dcf8d0d5be8e40f92 SHA512 9d8917e11a0d27ba3f975c007b6e8661ce5cd2727b82990b80436495d34209df5d0e7f47581d1f53493524fd3898592f5322f829a4a634d0fe4b1c269acfcb1a
-EBUILD ristretto-0.8.4.ebuild 876 BLAKE2B c950d825ab3ba23f9a0660a45c18874d591271a86e03c32d77be2908af0628cd1936290505f03a3b523ffd8932a453a8467d5c37062b6e19800635b8835c812f SHA512 42a4b7741c85d52878adc859fe4b9c9a7c5680c59be2c9c52bc9768371c2f39b89da1f01130c63aa4e66420b7d637531355c9eaea418d761b80024bfceb8c337
-EBUILD ristretto-0.8.5.ebuild 859 BLAKE2B f78523b7231cc1539b258c3fefa5087702c85859c456d7bd3200c5edbb194deda98d7ba0fa3e5bed4ee37461f5990a7f77db5e68b6cc86724fc298317e6a302e SHA512 0a9dcd229aebc553cf39dc4b349b737eea6d30941e60b05c4c8236cba84de6af4532f26a9bd1f77b39d7dafdb25f7a7b6b596226f0191e2ab73eb684f6495e70
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/media-gfx/ristretto/ristretto-0.8.4.ebuild b/media-gfx/ristretto/ristretto-0.8.4.ebuild
deleted file mode 100644
index b7c14b8a7667..000000000000
--- a/media-gfx/ristretto/ristretto-0.8.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="A fast and lightweight picture viewer for Xfce"
-HOMEPAGE="https://docs.xfce.org/apps/ristretto/start"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.24:2
-	media-libs/libexif:0=
-	x11-libs/cairo:0
-	>=x11-libs/gtk+-2.20:2
-	x11-libs/libX11:0=
-	>=xfce-base/libxfce4ui-4.10:0=
-	>=xfce-base/libxfce4util-4.10:0=
-	>=xfce-base/xfconf-4.10:0="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/ristretto/ristretto-0.8.5.ebuild b/media-gfx/ristretto/ristretto-0.8.5.ebuild
deleted file mode 100644
index f41ef692e684..000000000000
--- a/media-gfx/ristretto/ristretto-0.8.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="A fast and lightweight picture viewer for Xfce"
-HOMEPAGE="https://docs.xfce.org/apps/ristretto/start"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.24:2
-	media-libs/libexif:0=
-	x11-libs/cairo:0
-	>=x11-libs/gtk+-2.20:2
-	x11-libs/libX11:0=
-	>=xfce-base/libxfce4ui-4.10:0=
-	>=xfce-base/libxfce4util-4.10:0=
-	>=xfce-base/xfconf-4.10:0="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index b32bf6823754..103f4f8cf221 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,5 +1,5 @@
 DIST shotwell-0.30.2.tar.xz 6461648 BLAKE2B d54f34c05dcb092149129977bf59f0434ec4082929e3c87d9b4e774f85b47d73ecce1e80a6a29965194e9791eecb018405b43f082fb8b334c8d012f06a00b817 SHA512 ee74b9d3fbc5b2a5ca87cbc351fa99f6afaec4ce717166f55d79f41f1b039c272ed9028eb3919874f086f934197806738a54f428e790bca50dd8c9af61c21c36
 DIST shotwell-0.30.7.tar.xz 6455860 BLAKE2B 81da055e1092b9aed8c635e3e18e9c4bfa5820bb915c17cbb26942ce627179ed6b158c0785f54a2e15049150c3569035f58916483505449d55a2b3822276c44d SHA512 960574212d622c29d7617b874466e639d5a292eefdd2cac00ebcbf96d7db06002b9423440ee47ed84da7064d3eb70ba388b573a94c9e44c07d3b8f87faf09c58
-EBUILD shotwell-0.30.2.ebuild 1842 BLAKE2B 28a6d7ed2ed68e1e95cd331bd57fc159022292b50d0a8c32e9deb17dbda3ea283646b8726558b74b6a7401be34e2e64d1e4acf7e0039c16f66ce1654ede2b4f1 SHA512 5b3a7be65f11ce5a0b35a3188c75532e5646334db0666bca15e19a6be05ee45fb5a66792b5b9ee00914cc53339560e791f08f5b623dfb36e693d53dbf5bdc36e
-EBUILD shotwell-0.30.7.ebuild 1762 BLAKE2B e2c724c7875d59fadb9fc73566998e77e0918b5b79f507ae416682fe4390dd625ef508de3f6018301545d41fd13351d9c8e30a3a4e719e9cb8dd284fc95ccc5c SHA512 c5a3d2ce382ae02d84e1b9bc0ae0138cc5f081a35c2c075376156ddb4392dabb249764dabdc1aed886768a9d8606a4e140dbdc17df3aae17e72fb4e68ecd0e27
+EBUILD shotwell-0.30.2.ebuild 1843 BLAKE2B 7b68e790e6d8204788de6392a1493f3777e687b185aa42104192ed57676376aed1690c77d0ca0a1961b0eecf888b0e0432e793da4863189f62f322986da980c2 SHA512 fa8ac278e4de4f1c23e2381250b98cc781ccc1ddb8d9b15b8bf7b9562d16f01eaa6b772a8613db84c397b3870528df7f6f8fa1b590dff13df9ac185068163387
+EBUILD shotwell-0.30.7.ebuild 1763 BLAKE2B 01e3d39505853eeeeb9331825af3acc97eb5e0e5f6a293f503df67c7d0d499d814614a8d821f04f5402614ef8de4a5ea80c2ba4e06609108728513d13d644919 SHA512 674da637aa376f31270d1a7690a610b57f71c6b67770a2c63fbd6a7c8204f30768213525974bd79331063c71f6db21789ee3dde8dd4b4eed2512d856fff45c2d
 MISC metadata.xml 915 BLAKE2B 7f83fe936f9a575c6dd12b014007cd97c5a8ada9aa5e55ddeaddefa4eb05d724a068c81d2f6f41c5b1bae01ed2c4326eb5eba5d4bdccf48619edeb43a8eaabfd SHA512 1b226f7fabfd7f5ee4d82b28ce2998273225319b055c01509cc5e493fdc037941c0edd0099df5dada00228fb225bf5e35d0035d3cd244890ad0cbd929b84d214
diff --git a/media-gfx/shotwell/shotwell-0.30.2.ebuild b/media-gfx/shotwell/shotwell-0.30.2.ebuild
index 0856b633805b..e5da9071bf82 100644
--- a/media-gfx/shotwell/shotwell-0.30.2.ebuild
+++ b/media-gfx/shotwell/shotwell-0.30.2.ebuild
@@ -27,7 +27,7 @@ COMMON_DEPEND="
 	media-libs/gstreamer:1.0
 	media-libs/gst-plugins-base:1.0
 	>=media-libs/libgphoto2-2.5:=
-	udev? ( >=virtual/libgudev-145:= )
+	udev? ( >=dev-libs/libgudev-145:= )
 	>=media-libs/gexiv2-0.10.4
 	<media-libs/gexiv2-0.11
 	>=media-libs/libraw-0.13.2:=
diff --git a/media-gfx/shotwell/shotwell-0.30.7.ebuild b/media-gfx/shotwell/shotwell-0.30.7.ebuild
index 84cb2d000fea..b5bd37671121 100644
--- a/media-gfx/shotwell/shotwell-0.30.7.ebuild
+++ b/media-gfx/shotwell/shotwell-0.30.7.ebuild
@@ -26,7 +26,7 @@ DEPEND="
 	media-libs/gstreamer:1.0
 	media-libs/gst-plugins-base:1.0
 	>=media-libs/libgphoto2-2.5:=
-	udev? ( >=virtual/libgudev-145:= )
+	udev? ( >=dev-libs/libgudev-145:= )
 	>=media-libs/gexiv2-0.10.4
 	>=media-libs/libraw-0.13.2:=
 	>=media-libs/libexif-0.6.16:=
diff --git a/media-gfx/ufraw/Manifest b/media-gfx/ufraw/Manifest
index bef1fe6ccdb3..a70e24fce622 100644
--- a/media-gfx/ufraw/Manifest
+++ b/media-gfx/ufraw/Manifest
@@ -9,6 +9,5 @@ AUX ufraw-0.22-gcc9.patch 3569 BLAKE2B ce417eb79994190666b842f6017f18eadead284bb
 AUX ufraw-0.22-jasper-automagic.patch 613 BLAKE2B 100e6b31540030a20c8cff8e99329a738378788b2ab11665c0c8ab2f3246c821a176dba8b26cea354e8b0d127d2c601c21b0ac94f5264327916d0f8779618165 SHA512 855337bf109ebc0ea7b9bd429bcc429bd9caa561e2a815352c51e860a6e405d500913b70414ded7f47e053332c89b964d1817c8f22627504cf157f1565f3c7a4
 AUX ufraw-0.22-jpeg9.patch 1076 BLAKE2B 84448c537706d7b29f54d4735a75bf9501eac7927529c6d8e43d6cd746763ab753715d54cf943bb8bb5ddd8a29891f7522a680426acd2eb52af450492656ae3e SHA512 520e9351d7b8aa84f79a7c2841c2f56eaca849e67e448dc9503d248e31c1aa9fecaa64a332c0a155b6ba1ab7debec8734f3f2ef710bcb534a5fca34e9b5c8f7c
 DIST ufraw-0.22.tar.gz 1103554 BLAKE2B 5ffa4c660602553853221d7b31bfb78b02644bfeb4461cf752186d83ed8087b7905e414c7d741916ca9460c05849ab679b2f3098c99e5246f54a49b6a915268f SHA512 a42eff5052c18afec90245cf97ceeade78e3f288186cf697ac4abf2e8290d4081db8ac4de3ae47b3774f30a6cb4cbda392099e6fd2125fe751abb40d9b065ad2
-EBUILD ufraw-0.22-r2.ebuild 1939 BLAKE2B 7262c313dbcc14685c90969a9c88ebadadf9b721a86bc309c5f667b17230c73b7e7d9d72acc9b8af8727e3e5cb27c8769a26146e554796a67b0c59f26d4405c1 SHA512 c8eb3ea3142f28efefe2f16c771af54f2834a39600b8f64428cfab01774ae67f344489aac415f0816b14065ea0ab17b9ca7a34126bffc0d91a8eaa18f25e1c9e
-EBUILD ufraw-0.22-r3.ebuild 2076 BLAKE2B 37b67ff3a94eb222a3d61d368d3013919f4eb57de0da6943439bec39437494570f8024c1b4ff1eabcd7398935c5903b00340f04d5c694cce4855a5826cb2ee91 SHA512 9ade02ae32b3b0cdbf2aa52579781dfa77f3424421ef32c5f1e56e370b921a2101474d81688573355145cd5f8bb27559e88e55e9f1ceb10649674bea9473d832
+EBUILD ufraw-0.22-r3.ebuild 2075 BLAKE2B c4784ef9a9e28f169890b50925ea48af92e14956fbdb861e3476449c483d2af1edc9ec6aee84b1188e877359bada9d9169a9801aeed9baee0cfb18c03123b833 SHA512 dbc4cab64e2a0a242221b8924bd77c46a3e53d6e3c943b6d238779d98888a67867d8d9d36a32da03e6d7ddfbb76c5fe17033795d7e8bd59ad52e8e94946398db
 MISC metadata.xml 588 BLAKE2B 3e6ec0c8b11a3c30d1b20b5df4303fc1bc10b4e6459a24358ac50bcfaa414b307efe6d392d23fd7ce1443917865deae0dfa89cc7a068567f227cdc387f99d1cb SHA512 3d161ddfe0da5620312603d66acbc24244317da4dcb905558eddda9d54bf96024881ffbdcaa49f9daf73d779d5e7dbb47a523e05cc6c614756b468f14ef66ab9
diff --git a/media-gfx/ufraw/ufraw-0.22-r2.ebuild b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
deleted file mode 100644
index 0b2b7c889c2a..000000000000
--- a/media-gfx/ufraw/ufraw-0.22-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="RAW Image format viewer and GIMP plugin"
-HOMEPAGE="http://ufraw.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="contrast fits gimp gnome gtk openmp timezone"
-
-REQUIRED_USE="gimp? ( gtk )"
-
-RDEPEND="
-	dev-libs/glib:2=
-	>=media-gfx/exiv2-0.11:0=
-	media-libs/lcms:2=
-	>=media-libs/lensfun-0.2.5:=
-	media-libs/libpng:0=
-	media-libs/tiff:0=
-	virtual/jpeg:0=
-	fits? ( sci-libs/cfitsio:0= )
-	gimp? ( >=media-gfx/gimp-2 )
-	gnome? ( >=gnome-base/gconf-2 )
-	gtk? (
-		>=media-gfx/gtkimageview-1.5
-		>=x11-libs/gtk+-2.6:2
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.17-cfitsio-automagic.patch
-	"${FILESDIR}"/${P}-jasper-automagic.patch
-	"${FILESDIR}"/${P}-crashfix.patch
-	"${FILESDIR}"/${P}-drop_superfluous_abs.patch
-	"${FILESDIR}"/${P}-fix-unsigned-char.patch
-	"${FILESDIR}"/${P}-jpeg9.patch
-	"${FILESDIR}"/${P}-exiv2-0.27.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable contrast) \
-		$(use_with fits cfitsio) \
-		$(use_with gimp) \
-		$(use_enable gnome mime) \
-		$(use_with gtk) \
-		--disable-jasper \
-		$(use_enable openmp) \
-		$(use_enable timezone dst-correction)
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" schemasdir=/etc/gconf/schemas install
-	einstalldocs
-}
-
-pkg_preinst() {
-	if use gnome; then
-		gnome2_gconf_savelist
-	fi
-}
-
-pkg_postinst() {
-	if use gnome; then
-		xdg_mimeinfo_database_update
-		xdg_desktop_database_update
-		gnome2_gconf_install
-	fi
-}
-
-pkg_postrm() {
-	if use gnome; then
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/media-gfx/ufraw/ufraw-0.22-r3.ebuild b/media-gfx/ufraw/ufraw-0.22-r3.ebuild
index 165cf72d2144..364bb452b7e3 100644
--- a/media-gfx/ufraw/ufraw-0.22-r3.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="contrast fits gimp gnome gtk openmp timezone"
 
 REQUIRED_USE="gimp? ( gtk )"