gentoo resync : 13.05.2018

15 files changed, 146 insertions, 139 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 60137676995c..bd3f00f1329e 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/curaengine/Manifest b/media-gfx/curaengine/Manifest
index 93464d8decba..c3c9888c311b 100644
--- a/media-gfx/curaengine/Manifest
+++ b/media-gfx/curaengine/Manifest
@@ -1,4 +1,6 @@
 AUX curaengine-0.15.04.6-cflags.patch 750 BLAKE2B dfa1e1a0c855768387375ac3c0caa16de43a1b4009b68b4b54ca5cd5666818e863570ddebbeccf6a7c5f14dcabc1bd12c87738278cd78fa29b3409f7e85e11e6 SHA512 2109a1d1b07b97769347af7af58921b6d234c4a4bdc8ab8ab1aa0a0f3aac08b3f5e9f99fbb99001e1d505cee89fff30be40a20ba853ee6a3cdcdd98f5ad7058c
+AUX curaengine-2.3.1-fix-stringtest-int-types.patch 1440 BLAKE2B 1b82117e0d13bcd2c7f480bc2b8816cae8298faa3a026b955082a14adf795e41405adc88f8f08f990fc8fd2e04e072788718f9773ba3c9040bea1395c5896135 SHA512 88e5465a5dc04726c9646672d6781f2e78bdf3ab9786bad0fb7b9cb390b611aabc663328fd2724081587d3c0c568733295c22101e2f8224e7b4df332dd4f4e6c
+AUX curaengine-2.3.1-make-stringtest-64bit-safe.patch 645 BLAKE2B b36b556fb7d58ef771bbbf6f8314f61460e3bb436ec0178809992625cd96e71e006ec35995a209b46408d8c831e444f985f394fd2d90b99839509c28b79cb9de SHA512 364ae3575ff70bf6a1d2a12a3709b07b061e6c158ec3594d2ab8cb99dc059ef00036a79c2d6888ab91b001efc9004d3e26409cf7ea634561bbb4af84345f6fe3
 AUX curaengine-2.3.1-remove-gcodeplannertest.patch 370 BLAKE2B fbc5ed6858fe3e951a3eba93ecfef792d5f36e5e863793bff022a9591156c407ae4a1fff13042d9eee7dae3b4ab88b878d8a1904ad240bc7775114772d483b56 SHA512 f4a57be7e472b637635f035999d370c7bd09449f530d8f34d61c0a1fa353233b7f8c8578ebca582f5dbee8b714c7f67b09a8823da3d9360c6034acb1202c39f1
 DIST curaengine-0.15.04.6.tar.gz 107970 BLAKE2B cf72d74acbc5df4e46c066e27c36957380dee8a40301f0d489b23c0ab2f231bf4f3b7d953964fa7eb073c816a7f7aff755f25380d86bee37a61e1d0bd2ae3b68 SHA512 150e93dca08c57bc37af4c3232c0d18aed93347657d7261f89d7d8352d2774ac7a2a944c3b1efce432b507674f5e99981844823b792ec3fbe47799d2487e899d
 DIST curaengine-2.1.0_beta.tar.gz 33322580 BLAKE2B dac6b108caddb006348b184465727fba311ee6b35c992db44bef1a0a129c8b5daebc8315ac1654120404a30c4a4851ee37d0c12e17886539f8f57572a26fa520 SHA512 23b1e1116fad8e75354a92b8320a228a0b7acb03bcdffa175b8b6f47af0b8af099efdc3c75f840d172fc157d432a05c741a5028f3b8da1e7fc1dd8cf158115fb
@@ -7,6 +9,7 @@ DIST curaengine-2.6.0.tar.gz 828387 BLAKE2B db3db01a4c66d4a6ca7c6da1997c0a725087
 EBUILD curaengine-0.15.04.6.ebuild 1023 BLAKE2B a30c9939fecc1e1a58dd91f9e21137ccb9c9234da1b0bfc800698585806917cbc8cdf9e598e3dbf9be4c6d283c30b6f39849bc6821342d78ca4d20b0539892cb SHA512 21dcd8a630df89c8c89e70fc21b3509b1e7972985ba72afcc961d90990e382fe9d07d63c8013315b6afe14650e8e58134d74123e5920a019cfd0293a4192485e
 EBUILD curaengine-2.1.0_beta.ebuild 883 BLAKE2B 30fa9f20814894981f4428ae61988dba2486790393a5c3652f251cdd2e35aa0677a8e21edfdbc694697aab948da4a34ae3b39af7e97308fce9273230accf36ad SHA512 2ef7bc68b8e893ef30704fddcf4c0740e9ed74c320313acc9a7f88bfd4346731f2c140a3b2038d833ed9f5d43b2a32df6006c2da9629c887b7b0eab88d56a16f
 EBUILD curaengine-2.3.1-r1.ebuild 1015 BLAKE2B 146e167fe405ce0aa4dbb77bf52899bbde55113e5248b8f6654c663628c9e8f07ce89ede7b815b5bfcaa13f2279bb8f8e6c353ef8dd172ec209bb5658af95e73 SHA512 db7d3bb6818af0d9c6121348cb6bfbc256135cb42b1677893b891d3970e20e1b0729f382ef3d7f3c5965efb86193fa8eb18d5b5f73023ca6cb35912e70da9765
+EBUILD curaengine-2.3.1-r2.ebuild 1123 BLAKE2B a63ee7dcea38d7b22009d4d27f0b9e119ea3c85fe1ab4468ba5436fba1d731866351b142d3e04174f00e165a8c64fb4ec419f5d086eb6a746d2b05e2398fd2bb SHA512 d8de8a03fa3b1b0281b5bcc40d6d37237cbe01a00348df44ea98dec7fda288085a53940c1ba8ab990e6dc3274ad26766343a7d328716c05e7291c6cdc8898f9e
 EBUILD curaengine-2.3.1.ebuild 883 BLAKE2B 30fa9f20814894981f4428ae61988dba2486790393a5c3652f251cdd2e35aa0677a8e21edfdbc694697aab948da4a34ae3b39af7e97308fce9273230accf36ad SHA512 2ef7bc68b8e893ef30704fddcf4c0740e9ed74c320313acc9a7f88bfd4346731f2c140a3b2038d833ed9f5d43b2a32df6006c2da9629c887b7b0eab88d56a16f
 EBUILD curaengine-2.6.0-r1.ebuild 954 BLAKE2B a7f9f5739a50032a9f4f3aad2cf891cc2d5ac0076d1df49f72e94c354587b82690b7d6b57584990aafa54ba84ff14d75b3f02614cf61794a273412016fb2da3b SHA512 c7daaee08dc5db670f02c8fdf104f8c331ee0ec1d7db11a57ebae52e7626abd6f8ece20c6510b2a43509229dd5cd18979e80478516ce53169064bfe42eb2be70
 EBUILD curaengine-2.6.0.ebuild 883 BLAKE2B fc00d7c53904e98a422867a41a5864205d66ff7ef423564226be2eb7bd8f111c41bf8bc8e31b0e937b97305141e4e12b2e4d2bcd51b3b7ee127127d053830660 SHA512 8e29ef18e30c7c3383aabe2bfc98c3eaf2299d83a5824150baacad8a48257873705ce850a9a7cecb5f6669a9fcd15986e1411ad060137713d5253d8df670b623
diff --git a/media-gfx/curaengine/curaengine-2.3.1-r2.ebuild b/media-gfx/curaengine/curaengine-2.3.1-r2.ebuild
new file mode 100644
index 000000000000..caa04ad6c138
--- /dev/null
+++ b/media-gfx/curaengine/curaengine-2.3.1-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils
+
+MY_PN=CuraEngine
+MY_PV=${PV/_beta}
+
+DESCRIPTION="A 3D model slicing engine for 3D printing"
+HOMEPAGE="https://github.com/Ultimaker/CuraEngine"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="AGPL-3"
+SLOT="0"
+IUSE="doc test"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/libarcus:=
+	>=dev-libs/protobuf-3"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen
+	       media-gfx/graphviz )
+	test? ( dev-util/cppunit )"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+DOCS=( "README.md" )
+PATCHES=( "${FILESDIR}/${P}-remove-gcodeplannertest.patch"
+	  "${FILESDIR}/${P}-make-stringtest-64bit-safe.patch"
+	  "${FILESDIR}/${P}-fix-stringtest-int-types.patch" )
+
+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
+		HTML_DOCS=( html/. )
+	fi
+}
diff --git a/media-gfx/curaengine/files/curaengine-2.3.1-fix-stringtest-int-types.patch b/media-gfx/curaengine/files/curaengine-2.3.1-fix-stringtest-int-types.patch
new file mode 100644
index 000000000000..e30bde4de451
--- /dev/null
+++ b/media-gfx/curaengine/files/curaengine-2.3.1-fix-stringtest-int-types.patch
@@ -0,0 +1,43 @@
+From fe45e504ace024d920fe18b4f55d6aa07b2f929b Mon Sep 17 00:00:00 2001
+From: Ghostkeeper <rubend@tutanota.com>
+Date: Mon, 20 Nov 2017 10:46:09 +0100
+Subject: [PATCH] Use ints instead of int64_t to test writing ints
+
+Because sprintf doesn't accept anything more.
+---
+ tests/utils/StringTest.cpp | 4 ++--
+ tests/utils/StringTest.h   | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tests/utils/StringTest.cpp b/tests/utils/StringTest.cpp
+index 5bd16c5d3..980d2145f 100644
+--- a/tests/utils/StringTest.cpp
++++ b/tests/utils/StringTest.cpp
+@@ -71,12 +71,12 @@ void StringTest::writeInt2mmTestMax()
+ }
+ 
+ 
+-void StringTest::writeInt2mmAssert(int64_t in)
++void StringTest::writeInt2mmAssert(int in)
+ {
+     std::ostringstream ss;
+     writeInt2mm(in, ss);
+     std::string str = ss.str();
+-    int64_t out = MM2INT(strtod(str.c_str(), nullptr));
++    int out = MM2INT(strtod(str.c_str(), nullptr));
+ 
+     char buffer[200];
+     sprintf(buffer, "The integer %d was printed as '%s' which was interpreted as %d rather than %d!", in, str.c_str(), out, in);
+diff --git a/tests/utils/StringTest.h b/tests/utils/StringTest.h
+index 58be00642..da1da793a 100644
+--- a/tests/utils/StringTest.h
++++ b/tests/utils/StringTest.h
+@@ -68,7 +68,7 @@ class StringTest : public CppUnit::TestFixture
+      * 
+      * \param in the integer to check
+      */
+-    void writeInt2mmAssert(int64_t in);
++    void writeInt2mmAssert(int in);
+ };
+ 
+ }
diff --git a/media-gfx/curaengine/files/curaengine-2.3.1-make-stringtest-64bit-safe.patch b/media-gfx/curaengine/files/curaengine-2.3.1-make-stringtest-64bit-safe.patch
new file mode 100644
index 000000000000..a9b447fe8528
--- /dev/null
+++ b/media-gfx/curaengine/files/curaengine-2.3.1-make-stringtest-64bit-safe.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/utils/StringTest.cpp b/tests/utils/StringTest.cpp
+index aa369f3da..b1a084587 100644
+--- a/tests/utils/StringTest.cpp
++++ b/tests/utils/StringTest.cpp
+@@ -79,7 +79,7 @@ void StringTest::writeInt2mmAssert(int64_t in)
+     int64_t out = MM2INT(strtod(str.c_str(), nullptr));
+ 
+     char buffer[200];
+-    sprintf(buffer, "The integer %ld was printed as '%s' which was interpreted as %ld rather than %ld!", in, str.c_str(), out, in);
++    sprintf(buffer, "The integer %d was printed as '%s' which was interpreted as %d rather than %d!", in, str.c_str(), out, in);
+     CPPUNIT_ASSERT_MESSAGE(std::string(buffer), in == out);
+ }
+ 
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index eddd7fb6c63c..62a7ccd464b7 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -5,5 +5,5 @@ AUX exiv2-0.26_p20180319-CVE-2018-4868.patch 1694 BLAKE2B c288075acac8c2335da2b0
 DIST exiv2-0.26_p20171104.tar.gz 28368697 BLAKE2B 50013cf0bf30a2a476b02d5db4027fca268a4b38733762eb4c08e5f3bdfaf737038e9a62f7ef471fecb10250d8ae686ef683f9b0ea4ccc5d109440ba534371e4 SHA512 6f6a884d7978e54dceb9ce45248cd0425ff469887c85ef52b0e38cb755970f69fce96b4b5317c8e8070b833f72ca214696042aac71292a6f9c3440f6a369d474
 DIST exiv2-0.26_p20180319.tar.gz 28383543 BLAKE2B 753a2ebdb2033490c0f66cb1fb2574f02125f17813f6cbaf5eca66e053af9a2cdbc1266f0a033f0706ec22b31acd6e87271e426a335a58ee947757b52d283489 SHA512 852ce2cffcc0a2d902a939933127fdf5fa0b50020e1faf3ab0a375b129b9f61c7b97b76d4f39e376e7288d7cc045867bd1a96ae15dd0b7c0bcd1ba15259628e1
 EBUILD exiv2-0.26_p20171104.ebuild 3086 BLAKE2B 72739b426e741582b3f167f973b250333d37bd68a9a4d381eada321670ff3c41e33f344e759c47641510c724ad4da8b27ee8e2805f4be075a1de9c808b7a2baf SHA512 ddabecf71aef6461442b77ae3afed3581d13a8155b232aa3e946e043853cc8f79bd5866febbd1ca38a4c9a2b6c08afdc1b37b079a30b3d01b358da06cc08db58
-EBUILD exiv2-0.26_p20180319.ebuild 3312 BLAKE2B 4eef458b95a18f757e4f3b43a47f98c295085ac20cb4c02de05608378aec24a7f28ccc6fa2d64efff439e0bfc5191c6c0ce42bf87ca42976a88c8de15a786b32 SHA512 498bc3283cc742400994b623833d96334daf4c7738ffb2a2e884ad781d532223c996f840f6aabf08697731a9f869d5695ab8b1afbfa0ae5cbdb9129c06635b0c
+EBUILD exiv2-0.26_p20180319.ebuild 3311 BLAKE2B f41979eff2786fe37a9d9e405d6a4d01cd86de70f6b8bca519a2a0c674c9c26481d701ab2bc72901b45f0068f9d84f90948499bb73d83a90b01570843c41d124 SHA512 e8179f7415c248b826b70fe664bf912bdc5d44a194a9b958cc98fb9e0288a86d151b2cf11c2ab81752c28b9f39268d38031126c7945fbc29291666b307f664eb
 MISC metadata.xml 612 BLAKE2B f98a074e9e3a4411baf8255cd8cab5be4257469463634218b664bb9e7f159c98615f0721bb4463c6183cecc8b2be00c34a031e7b99d745b9807634cbaab8d479 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5
diff --git a/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild b/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild
index 1ef0804ccac8..47fba8ffa82a 100644
--- a/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild
+++ b/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999 ]]; then
 else
 	COMMIT=876b1314ab892cbfa6672b6b94adbeb90db4211f
 	SRC_URI="https://github.com/Exiv2/${PN}/tarball/${COMMIT} -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 fi
 inherit cmake-multilib python-any-r1
 
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index f89e6f516d6e..a385fd22987b 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -2,7 +2,5 @@ AUX freecad-0.14.3702-install-paths.patch 1143 BLAKE2B bbf14f29381fa7d808af53c51
 AUX freecad-0.17_pre-no-webkit.patch 1353 BLAKE2B c1a3b1cfea471cd027aaf921eabaaa036bda8fc5f6569358aa5990b1d400e0868429fb19c9d19013f93f8143a044961bf3e914a442f47a2ebbad0c0433819f78 SHA512 aa109102d428a7160538bbf53a05d335b44a8aca8bcdc3d43a258f2f30d1c8a4fb4f46021bc472ca3aa5c4fb3b26675222894b595c3e0e5a321cbfab348a928c
 AUX freecad.sharedmimeinfo 312 BLAKE2B 731f28f904bebac03c8a64778d5e36f9b26fa33c347fa0b67113752aea12568f5a19968e730a53da89a7c7d08db6f8d80f11ab30d011e6b4db973c8549f710bd SHA512 bb55cad8387032af0e06ce7f1b4cab4354a34a915b9f550de25e05bf24d4161d9ea152d5692d65df4b362622f76a11d78894deaf7fee60c7a3fc0bfec38fa10c
 DIST freecad-0.16.6712.tar.gz 111706423 BLAKE2B ef6386fb953a9acfc51856b4a898aaefd1c24750b5eb07e5266392e54e357252327d594311030c3cc19144ead6e7f274710b532f7cd4993008850a3af6ec31c2 SHA512 ea8214b37f7a10a3e3e558e6c1223d9212d6c2906b79961c8cb9211edff97a41e2da0ce6cf64cdc7a22610f6ff13495163c46573b5dd84d4a7cc0260f15e371e
-DIST freecad-0.17_pre.tar.gz 111704401 BLAKE2B 790462beef989b7a3db69d7412cd1076738579906873c8ce6c152b175f6b8305c2949087c9d719d884839e2966088c23309dc2617b3469bc5fa3296d2131e375 SHA512 a826a549d842ba322f7ec5f786d402e81f5b916008be450bacefb7ee976e203427130938c036cc6fca6ea11a8df0ab9b4a39f3bdfedc3cc1a7d31e7a5d11e142
 EBUILD freecad-0.16.6712.ebuild 3537 BLAKE2B 91c4bebaee48dbfbe209e36693616e8e70676c0e6e9e186cec582ee3ccbaa7ed54f6ce438bc1e498035e438e94f3cb3a18f1c5679da433b3fe9db899a984bf95 SHA512 80d0044bf5d12175353aedf8b05a3e9811013390fccc66cc071ae2c9564e7994e519ee86edc1456861654f57045b85b6ebbe54b36197af6d20414c69c721c991
-EBUILD freecad-0.17_pre-r1.ebuild 3527 BLAKE2B d50cbd1e2958e5ca3203494d8aa042263f9450b9b308291087de177f3eb06774a54dd12989670df09797990d65a3fd966a8863b0790083065b0f70ce020d5762 SHA512 0aae95df7cc528f3fd1defca5be34da26b03b73c21627fd510115e1a19668135db365cbd5a275edef8dc8c6a389c151a67786a6b7bfb8d896a5602e7e5fb4204
 MISC metadata.xml 376 BLAKE2B a1e6c119bd4edce1e1e39c3ef95ed00c8d48f2b3391c2ead629b1936cf1570501de97988163b786669ef9d5cdea20d7ded01286dd1633278c703a5efd5813f0a SHA512 2b159882b18f33adc78ede30133528a915130d21fcfd111a099861b2ee719b59338cd81af63a289bb5812ce04dee238a6eb4596a95a5abedbc453f631e827f53
diff --git a/media-gfx/freecad/freecad-0.17_pre-r1.ebuild b/media-gfx/freecad/freecad-0.17_pre-r1.ebuild
deleted file mode 100644
index 3b3624752c5b..000000000000
--- a/media-gfx/freecad/freecad-0.17_pre-r1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils desktop xdg-utils fortran-2 python-single-r1
-
-DESCRIPTION="Qt based Computer Aided Design application"
-HOMEPAGE="https://www.freecadweb.org/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git"
-else
-	SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-cpp/eigen:3
-	dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	dev-libs/xerces-c[icu]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/pyside:0[X,svg,${PYTHON_USEDEP}]
-	dev-python/shiboken:0[${PYTHON_USEDEP}]
-	dev-qt/designer:4
-	dev-qt/qtgui:4[-egl]
-	dev-qt/qtopengl:4[-egl]
-	dev-qt/qtsvg:4
-	media-libs/coin
-	media-libs/freetype
-	sci-libs/opencascade:*[vtk(+)]
-	sci-libs/orocos_kdl
-	sys-libs/zlib
-	virtual/glu"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pivy[${PYTHON_USEDEP}]
-	dev-qt/assistant:4"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/swig-2.0.4-r1:0
-	dev-python/pyside-tools:0[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.14.3702-install-paths.patch
-	"${FILESDIR}"/${P}-no-webkit.patch
-)
-
-# https://bugs.gentoo.org/show_bug.cgi?id=352435
-# https://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
-RESTRICT="mirror"
-
-# TODO:
-#   DEPEND and RDEPEND:
-#		salome-smesh - science overlay
-#		zipio++ - not in portage yet
-
-S="${WORKDIR}/FreeCAD-${PV}"
-
-DOCS=( README.md ChangeLog.txt )
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python-single-r1_pkg_setup
-
-	[[ -z ${CASROOT} ]] && die "empty \$CASROOT, run eselect opencascade set or define otherwise"
-}
-
-src_configure() {
-	export QT_SELECT=4
-
-	#-DOCC_* defined with cMake/FindOpenCasCade.cmake
-	#-DCOIN3D_* defined with cMake/FindCoin3D.cmake
-	#-DSOQT_ not used
-	local mycmakeargs=(
-		-DOCC_INCLUDE_DIR="${CASROOT}"/inc
-		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
-		-DCMAKE_INSTALL_DATADIR=share/${P}
-		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
-		-DCMAKE_INSTALL_INCLUDEDIR=include/${P}
-		-DFREECAD_USE_EXTERNAL_KDL=ON
-		-DBUILD_WEB=OFF
-	)
-
-	# TODO to remove embedded dependencies:
-	#
-	#	-DFREECAD_USE_EXTERNAL_ZIPIOS="ON" -- this option needs zipios++ but it's not yet in portage so the embedded zipios++
-	#                (under src/zipios++) will be used
-	#	salomesmesh is in 3rdparty but upstream's find_package function is not complete yet to compile against external version
-	#                (external salomesmesh is available in "science" overlay)
-
-	cmake-utils_src_configure
-	einfo "${P} will be built against opencascade version ${CASROOT}"
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	make_desktop_entry FreeCAD "FreeCAD" "" "" "MimeType=application/x-extension-fcstd;"
-
-	# install mimetype for FreeCAD files
-	insinto /usr/share/mime/packages
-	newins "${FILESDIR}"/${PN}.sharedmimeinfo "${PN}.xml"
-
-	# install icons to correct place rather than /usr/share/freecad
-	pushd "${ED%/}"/usr/share/${P} || die
-	local size
-	for size in 16 32 48 64; do
-		newicon -s ${size} freecad-icon-${size}.png freecad.png
-	done
-	doicon -s scalable freecad.svg
-	newicon -s 64 -c mimetypes freecad-doc.png application-x-extension-fcstd.png
-	popd || die
-
-	python_optimize "${ED%/}"/usr/{,share/${P}/}Mod/
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-}
diff --git a/media-gfx/gifsicle/Manifest b/media-gfx/gifsicle/Manifest
index 073da422d8f3..ba120c1ecbd6 100644
--- a/media-gfx/gifsicle/Manifest
+++ b/media-gfx/gifsicle/Manifest
@@ -1,5 +1,7 @@
 DIST gifsicle-1.86.tar.gz 563638 BLAKE2B b42065c11822542b75161f34054c3208ad5425570f025fa6bc3c842e759ed84156e6cf202a73f0efd57afc0dff5b9fc7ca8463b6304b97d3888b5e2b0f885b2e SHA512 d55609e5d71f63ec13c1eed6a9071d756f07c765d2496d468cc7291e3b9e29304be1c3a5b0e822d9dc2df29ac489bafca2650d226d5b3c51dad74dd22c725a13
 DIST gifsicle-1.90.tar.gz 571910 BLAKE2B 607f8ff93818c3ab9d3d74bd7735bcf1bb6412c0607c07cc33bdf9c20d9fa56a004e5aeb66d6fd49bafc12dcb9daf32736597d0377b3dfa1ff665a49f1b47180 SHA512 a5fd815c3aa1388690199edc16c0d5c0c32257cefd1cf8a1b660024b8e2324a6b4a54e19013984f905549df42d7719cdb1a875979b77729723f70d8e43f9bab7
+DIST gifsicle-1.91.tar.gz 571588 BLAKE2B be3973141e57618d50efb5205f79e485a4450ceed02d6c718e49305250941656f0d220c91d2056554348d14348ed1ddf03f0aa9c47e22589994c5e80046422f6 SHA512 49b89e6f99bffd0dd732c920b936c2430a2f4f595d46e41654e5f39f180acaf9b0a4aec6cf52597c470d7c60265f16b730f6ce82e08701a2054fc3d08754c6da
 EBUILD gifsicle-1.86.ebuild 653 BLAKE2B 2df49285519d1948d5d49f1f5957bf77d25be210057f605e3bb4c79ae9187bcb47f189e0a388384459c78f8d44571d7f72d5cbadaf5b92cecb84afbd597170f2 SHA512 c79392cae433fb0ab41486f8587a50c342c76b899e43a0024ab4ceb1ffda7b6d1fb09faaa0d48335e815368ef3b72b05a37feed56820ba07d406c7d9bc3afe1f
 EBUILD gifsicle-1.90.ebuild 626 BLAKE2B c10efe658d8b7bfe90d776ce3dd30e0d253812201a06479a387363d24c73ea915e4d7a161be1c45f1a63b6f996a44a140baa3b2fee3df2d15100d59df85157f0 SHA512 d4edb761f196afad242d81c50f963402248ec8a499fb867136be58fbfbe86556ae876bc5e07883fe010a99f5045e1b8f7707e13dc1a8e00a65f14107b383cecb
+EBUILD gifsicle-1.91.ebuild 667 BLAKE2B c1da2485a991fbae8c124d448da362cae8ee52fe40f0f51d0f99205a1a8719c3516d9aedfac6b6bcfb741a6a7a58d202a544b1b318721f8b89f4a6155edb7323 SHA512 847ad145ff72390ef55ae89af80f10a9757739da88650f01ce43dce635e1659c8058c496cfb5c86ff53b97ce4d2fcfa73042c797e786c80254cf90857bb05800
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/gifsicle/gifsicle-1.91.ebuild b/media-gfx/gifsicle/gifsicle-1.91.ebuild
new file mode 100644
index 000000000000..178513885a6f
--- /dev/null
+++ b/media-gfx/gifsicle/gifsicle-1.91.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Create, manipulate, and optimize GIF images and animations"
+HOMEPAGE="https://www.lcdf.org/~eddietwo/gifsicle/ https://github.com/kohler/gifsicle"
+SRC_URI="https://www.lcdf.org/~eddietwo/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="X"
+
+RDEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+"
+DEPEND="
+	${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+DOCS=(
+	NEWS.md
+	README.md
+)
+
+src_configure() {
+	econf $(usex X "" "--disable-gifview")
+}
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 6e0e85099253..69f715c205b9 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,6 +1,6 @@
 AUX krita-3.2.0-tests-optional.patch 8806 BLAKE2B 90355102edb82e69539dbbedae83a9bb51f98a34fdfd85758e4b4427ed5ec058cfe28931fb6a1c604a9631ff1b3b5c86651a7d6fde80d2002d7e7a2ef6f6aa69 SHA512 aeba8043f7a31a24fad6b515608a881b34bffd0f05502ddd7591f8bb7a7c82eae5ec21bcab4c17091255f94422817ca5e89d97836ab0ce9298f29350a1666b34
 DIST krita-3.3.3.tar.gz 207582956 BLAKE2B 36fd2978956fbba870ff8d8c28c31db0731742385620d6b5fd0cc275d74bf6352635c4fd4a537a87b7994fa41d140ee05000593d5a95cd288fd07959e8ef1693 SHA512 b6dc30809e0d6c19fee4bbb240aa53c65e88361ebe273c73c2f24f43904c3cd51719dadb9c11fb7f691f17d75732374295ce904810d8893b7f95b45f859901e0
-DIST krita-4.0.1.tar.gz 237493152 BLAKE2B 4029ac08ec17a2f56524404c8d4d61bf73d52d0aae7e783d02899eab9a47750bf19ff201a58cbb3c9a062d55742676d829938b7c456bd7c4ab96988ae5c113f2 SHA512 51ec8bfa7936a081bd62ef7020b16f534042fc50abc1218a5d40721f6b6672791700cb09d006a4975491fddc23358d5ef64322231dd7e3284f943bbabc16a980
+DIST krita-4.0.3.tar.gz 241332929 BLAKE2B 222a3425f64c98d964f421c84f48295d5cb72e622631e9b1cb5a2ac9980a6f59cbf12b0815df68a09daf138efc2d4e2e83cb46034c8e12ddd621cb49f1117b72 SHA512 13b3263a09dbb955dea435e97bf12b6f0670fce68c4c2c9e97e7b45b480301119f317e72fac63eec07caff295885b7d62ac7c6255545a139e1e5f4b1106989e8
 EBUILD krita-3.3.3.ebuild 2553 BLAKE2B a1d97fa3af8a79da72fa2dbdddd73135892d9df066f9316359036eed49d0bf21cc57ff2aab2d9e43549bab839d3949e0623aea9fc946337fbd1004ef10df6404 SHA512 c750f5904eddcee56469a463c0421250d905d9d6bb3f97711e19ee98b1e3b614c07e6fd68cc46597b4e500d8c8b51f9b10401cdb54622243cdc6491807657662
-EBUILD krita-4.0.1.ebuild 3027 BLAKE2B 32d9132b221c68d5e22fff6a7e234f1f34099a3aec054fc5d3becc4dc69f7ed205ba2f3468945346fc5890e10ad0f7301da5833d70b1039ac9993d697c0e0a21 SHA512 103fddb1bdbdfb47cd2dd04403c1840e5108d16ef7c43f7e6462bfc26cd33202603df51f0f94ad17b4c006643a386989aa887bd2302ea3a0ece807e9c265ed7a
+EBUILD krita-4.0.3.ebuild 3027 BLAKE2B 32d9132b221c68d5e22fff6a7e234f1f34099a3aec054fc5d3becc4dc69f7ed205ba2f3468945346fc5890e10ad0f7301da5833d70b1039ac9993d697c0e0a21 SHA512 103fddb1bdbdfb47cd2dd04403c1840e5108d16ef7c43f7e6462bfc26cd33202603df51f0f94ad17b4c006643a386989aa887bd2302ea3a0ece807e9c265ed7a
 MISC metadata.xml 569 BLAKE2B 7609e8cfc1f63fd04b3306a37a9b429eddaf56bf4bcca32d707b529d0267d7f63979a850edf8fcb5b1043134b1baa7210e849903a65243ac300596ccbdb473bd SHA512 44b2dc2f5d0e737a780e16f4d88cb3c2ff1dbab8b1878ae3561659c3a191040ef0f0f2ef0e7325b16ca6c149e29d417c10bec18bfcf06d8e847000e1e8279b27
diff --git a/media-gfx/krita/krita-4.0.1.ebuild b/media-gfx/krita/krita-4.0.3.ebuild
index 432b5ebc2692..432b5ebc2692 100644
--- a/media-gfx/krita/krita-4.0.1.ebuild
+++ b/media-gfx/krita/krita-4.0.3.ebuild
diff --git a/media-gfx/uniconvertor/Manifest b/media-gfx/uniconvertor/Manifest
index 57eafe504bb7..f28bcf54f14f 100644
--- a/media-gfx/uniconvertor/Manifest
+++ b/media-gfx/uniconvertor/Manifest
@@ -5,5 +5,5 @@ AUX uniconvertor-2.0_pre379-libimg.patch 1201 BLAKE2B d25aa6bb28c6328ade007da102
 AUX uniconvertor-2.0_pre379-test.patch 1544 BLAKE2B 16e8b1ddd6d0ca064a2f1be12ac97bf75dccd3d73fffb252253154779d0175ac292a08f4bb38deeb815a5e6cf624a9ff80654627e46d02655c315fd7b2a640ce SHA512 760ea5ced19040d0d29230f9d6fdafafd7f6fcdd727e18261730b7696d0e9a85037cdceab8e20f202a79bd7b8c84edfa7f21619bfde1320bbdc1e1d0c6d298db
 DIST uniconvertor-2.0_pre379.tar.xz 1844780 BLAKE2B 51698d88941be700dd31e5527a8ffc8b2548d9f1323242e8f31a3ad00f2e4a2c5617be87443b130d664aeceea8b96ff17b72dfe32964854cc8f121351a918ec3 SHA512 3a0dd8e52addb391225ae148a673e3464a04e0d36e5955e496ef78e91597408706e5cbc06113b3e959446c6dd89aefa821f32ef81a5d1837a2a3d405a5a63dea
 EBUILD uniconvertor-2.0_pre379-r1.ebuild 1521 BLAKE2B 6a4e8fde4ba0b892d015ec6532abb47e5621877ec10288f28b3205886554f76b22600ee3eab80f21524bf8b613804fe0a83fa14f37d0b283f140a0641daf955c SHA512 d72469c1adde2df12506e8fc7f221d11163f17b7a2ddd0d4a9b7c2d7b86a9210b6b3082957312eef343bd1f487d975e67afe02095cd93723f875a31a39987eaa
-EBUILD uniconvertor-2.0_pre379-r2.ebuild 1845 BLAKE2B 1aced9345e276a31787548441bbc34e5032edea082a75224bab83df14b4aaa1636bd3e6687704738f37f74a945d13d6af4f6f93a93a800f1a002cf9dff1a0dd2 SHA512 0bd47f649deb80b213f87a34ae1e53abd937b7abdccd3dc86f3066f54c0c138f10933c52e80fb7207aabc8bc300510ce85e8de16262f62d5c52c1765e69a22a1
+EBUILD uniconvertor-2.0_pre379-r2.ebuild 1844 BLAKE2B ea4762b78ea72f59308e166134f39f390e51eb9f4f94d4387f2f9dad79b83a2b4e7b3d84a002d3ea5547b8401ffaa84cf45ced680a8a5cb05ab201b24d740ef1 SHA512 3479ec984b845b974c4971f48bc449a6128d6a821eef9d161d0cfef2c012e21bdf595897324962078eb7b5eff9f78b01bd3877e245bdcb5fafb7251c895e5f14
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r2.ebuild b/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r2.ebuild
index 2a5d72d35690..104e72153941 100644
--- a/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r2.ebuild
+++ b/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Convert vector graphic file formats like .cdr, .svg, wmf and more."
 HOMEPAGE="https://sk1project.net/modules.php?name=Products&product=uniconvertor"
 SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
 
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="GPL-2 LGPL-2"
 IUSE=""