gentoo resync : 25.01.2018

25 files changed, 298 insertions, 169 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 00f631b1944a..34d066c3011a 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 2b274f918caf..eb1f15e96dfa 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,8 +1,10 @@
 AUX darktable-find-opencl-header.patch 601 BLAKE2B 0102ea562ec0addb619f06b59cc73834d734c454a7c561654bc27f052de55db6c62f454927b2c701b7f4f6c52d5d2fac0b7c230b90ef89bdc9431856bd4ae69a SHA512 93023a318158850a5bac4a1d871ea6e69a3c9f2bc57f8af47bc83bb131f96e8972c23b07945df2eddfb05bffdd950e8250da77c47d1543b776a7e9405adad020
 DIST darktable-2.2.5.tar.xz 3092540 BLAKE2B 8196ed501c96e6738057ee593c6437257b917907a02c365bd011cbf8ba258178e2915e097d373a2dca6a03ea6920df48b8f16f477e7479959371ef19937ceed9 SHA512 fbc79398660b51e580d22dbdfc9a74d213f69335d6058e2844ef397951a1e840264b6d03d1b52b424319fb647a274ac14ff23ee9a9c60071f71497988bdf989b
 DIST darktable-2.4.0.tar.xz 3387972 BLAKE2B 9583dfac379430d21de798da922f747e066e237b87cc5f1f5934fad9cede181f1817ef451ddcb7790ca632d78c577d6651cd301083cbf1342003d9f413b31c4d SHA512 7bd73915f575e837aeee68e791280df01940daccb7efa14e78e38c53dd3f62dcbd1a7cea6ae86af05dfa31b0ed1a8ccbcdb108788668249d13bb7e55ec5ad5db
+DIST darktable-2.4.1.tar.xz 3396372 BLAKE2B 916a39b117c3af8bd81a1c6177929bdc0f756c79fef4e4994236569d46e2b770c85303e07c6937f670d0b657ba826cc7b0f1b8b713cdf66b11cd625865db525f SHA512 50de282d26b345deeca19ebacfd9eebcc8b1ef3eec4d73d7853e918eef0d23b5ddba96695e7084b808891f0778b5765dc6bf718b9f25c5e1ce5ed393c1421c94
 DIST darktable-usermanual-2.2.0.pdf 14998142 BLAKE2B 68332239b4d2e34a0cd9f9e9bc26a18149ef1a8c033e3d5a7a7c150e952546669d74d0eeb97ad6793955d65a3259df51932829aca3d46f5c3ce7e01b59ee709b SHA512 5408193b442a7f60783aace507d8dd39c638f5f58d8b5fb5ab68eca03ce9853477b0cbe14184375d58cd6a648de18e9ecae586376698571222be755159cc0b20
-EBUILD darktable-2.2.5.ebuild 3861 BLAKE2B 425ceb4384274b4a8c59b2aca784097c7171a3e871c5816b8c6905ec4edf02299372ffc227103a20b9895fcb8a285f7ccb19c0098273183db906b9cac7e9a7c2 SHA512 689144ba9ddc485a23285c157b55999b62fdabe0b356cc7e08a6f7a732d3e96d4bd141d2e1e0dd7e64813f5918f5ae0482f842616750b4a2de3b537a0cc93556
-EBUILD darktable-2.4.0.ebuild 3995 BLAKE2B 3746489a294b22909bd231d219bfd1cb60c494beca6a9f8ef1b3b22bb660ab98724b14990b4b0a21b9788aafe15476496a7e6a654fbe7df34c3d1407b70467ac SHA512 00c1a43c39695a653a31beded947baffdd33f24b4873642b021a414ba49946a24990870f44644bbb3e6ca3e12451020cc3f4425e499d019aa6616bc0d94dc42c
-EBUILD darktable-9999.ebuild 3296 BLAKE2B 9a1410977c2093469a7324098787189364cf5bdd7b6e67c415dd54b608dc2db6f7bc7efe591f907c66a32600e5d5329022d1bcd539c6a5bdc8c14c5f23c3254f SHA512 2c04ee7ccc6a191bbeb0a75212e027838f6a5f4cdeeeff5ac638cd36cbf10e221d0d0a4ff58344723c8694b01dfde4c2774ba51d54a9c19c61565180fd8d6a62
+EBUILD darktable-2.2.5.ebuild 3829 BLAKE2B 67c3aa78c0173080e13a1d501a3fb01a07fd76f40ba1b1e956b5a51541c04d8bc98a806dce9d0efcf94aafb616fd43fe72bb8c031ead93452e80c026e33845c2 SHA512 f97928203c082af404054f9f0c36379f6103401ed8a7ffe6463c26656364ce373522175513ad6890b0884c8cd6bfb5447236c9b98c7771ba4ec868bcf77f091b
+EBUILD darktable-2.4.0.ebuild 3963 BLAKE2B 7e5e439bb852372d18e48e9650ea6923f59a91ca5ee6701d1167aabf7fc0d0f2e325e678805af7a96bc8194495c2f2e4bca08db5e688fdf65f5c80fdb149d6e8 SHA512 bd51102f6d4cfbcae7bc68a70a70351010955642f0d2605e7d7eacaf58ebf59db2479d874dbff50f67aff19fdb6a73afb8cd3796c1bb68a9e88bf1d2ed737b24
+EBUILD darktable-2.4.1.ebuild 3963 BLAKE2B 7e5e439bb852372d18e48e9650ea6923f59a91ca5ee6701d1167aabf7fc0d0f2e325e678805af7a96bc8194495c2f2e4bca08db5e688fdf65f5c80fdb149d6e8 SHA512 bd51102f6d4cfbcae7bc68a70a70351010955642f0d2605e7d7eacaf58ebf59db2479d874dbff50f67aff19fdb6a73afb8cd3796c1bb68a9e88bf1d2ed737b24
+EBUILD darktable-9999.ebuild 3264 BLAKE2B 06aef5e59ed8218739fbf1ed9588aa0d0d22199352155445f6956eb8cefb3e1877741e9dddc373c241a48cd3ebac8793be07bc1a71ac5d83194ba6b5905b92cc SHA512 ed17c0d301da505e15616729189a6a1381850fcd4d77df157337b211b422b5ef680b2edf94eeaf0575ed7af8ea25813c4b9a4877b553b7f31649e853baa49ae8
 MISC metadata.xml 1001 BLAKE2B 7da2598419c82747ec5d95f1454c86ac276ee2df931c4e61d0f6c1b52e112d1f49944ed0c1fb7dc8d7390d1fab5117cf734e6a1fec70d31af01d28c9c50d580e SHA512 6d5d277e74c9c97a57a1cdb80c6b8ea300e90cb65a937fb69e682d8117acb4b6048fb4d0895769c5b5d84545f4ccad4edbfedc7b898bbb8292b161cea5588c88
diff --git a/media-gfx/darktable/darktable-2.2.5.ebuild b/media-gfx/darktable/darktable-2.2.5.ebuild
index 6c47755767e9..7c7b70ce4474 100644
--- a/media-gfx/darktable/darktable-2.2.5.ebuild
+++ b/media-gfx/darktable/darktable-2.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -57,10 +57,7 @@ CDEPEND="
 	openexr? ( media-libs/openexr:0= )
 	webp? ( media-libs/libwebp:0= )"
 RDEPEND="${CDEPEND}
-	kwallet? ( || (
-		>=kde-frameworks/kwallet-5.34.0-r1
-		kde-apps/kwalletd:4
-	) )"
+	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
 DEPEND="${CDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig
diff --git a/media-gfx/darktable/darktable-2.4.0.ebuild b/media-gfx/darktable/darktable-2.4.0.ebuild
index c32deff305a7..db708727b58a 100644
--- a/media-gfx/darktable/darktable-2.4.0.ebuild
+++ b/media-gfx/darktable/darktable-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -56,10 +56,7 @@ CDEPEND="
 	openexr? ( media-libs/openexr:0= )
 	webp? ( media-libs/libwebp:0= )"
 RDEPEND="${CDEPEND}
-	kwallet? ( || (
-		>=kde-frameworks/kwallet-5.34.0-r1
-		kde-apps/kwalletd:4
-	) )"
+	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
 DEPEND="${CDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig
diff --git a/media-gfx/darktable/darktable-2.4.1.ebuild b/media-gfx/darktable/darktable-2.4.1.ebuild
new file mode 100644
index 000000000000..db708727b58a
--- /dev/null
+++ b/media-gfx/darktable/darktable-2.4.1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils xdg-utils pax-utils eutils
+
+DOC_PV="2.2.0"
+MY_PV="${PV/_/}"
+MY_P="${P/_/.}"
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="https://www.darktable.org/"
+SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+	doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
+
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LANGS=" ca cs da de es fr he hu it ja nl pl ru sk sl sv uk"
+# TODO add lua once dev-lang/lua-5.2 is unmasked
+IUSE="colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kwallet libsecret
+nls opencl openmp openexr pax_kernel webp
+${LANGS// / l10n_}"
+
+# sse3 support is required to build darktable
+REQUIRED_USE="cpu_flags_x86_sse3"
+
+CDEPEND="
+	dev-db/sqlite:3
+	dev-libs/json-glib
+	dev-libs/libxml2:2
+	dev-libs/pugixml:0=
+	gnome-base/librsvg:2
+	>=media-gfx/exiv2-0.25-r2:0=[xmp]
+	media-libs/lcms:2
+	>=media-libs/lensfun-0.2.3:0=
+	media-libs/libpng:0=
+	media-libs/tiff:0
+	net-libs/libsoup:2.4
+	net-misc/curl
+	sys-libs/zlib:=
+	virtual/jpeg:0
+	x11-libs/cairo
+	>=x11-libs/gtk+-3.14:3
+	x11-libs/pango
+	colord? ( x11-libs/colord-gtk:0= )
+	cups? ( net-print/cups )
+	flickr? ( media-libs/flickcurl )
+	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+	gphoto2? ( media-libs/libgphoto2:= )
+	graphicsmagick? ( media-gfx/graphicsmagick )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	libsecret? ( >=app-crypt/libsecret-0.18 )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	webp? ( media-libs/libwebp:0= )"
+RDEPEND="${CDEPEND}
+	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
+DEPEND="${CDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	opencl? (
+		>=sys-devel/clang-4
+		>=sys-devel/llvm-4
+	)"
+
+PATCHES=( "${FILESDIR}"/"${PN}"-find-opencl-header.patch )
+
+S="${WORKDIR}/${P/_/~}"
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	use cpu_flags_x86_sse3 && append-flags -msse3
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_PRINT=$(usex cups)
+		-DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}"
+		-DCUSTOM_CFLAGS=ON
+		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
+		-DUSE_COLORD=$(usex colord)
+		-DUSE_FLICKR=$(usex flickr)
+		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DUSE_KWALLET=$(usex kwallet)
+		-DUSE_LIBSECRET=$(usex libsecret)
+		-DUSE_LUA=OFF
+		-DUSE_MAP=$(usex geo)
+		-DUSE_NLS=$(usex nls)
+		-DUSE_OPENCL=$(usex opencl)
+		-DUSE_OPENEXR=$(usex openexr)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENMP=$(usex openmp)
+		-DUSE_WEBP=$(usex webp)
+	)
+	CMAKE_BUILD_TYPE="RELWITHDEBINFO"
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
+
+	for lang in ${LANGS} ; do
+		use l10n_${lang} || rm -r "${ED}"/usr/share/locale/${lang/-/_}
+	done
+
+	if use pax_kernel && use opencl ; then
+		pax-mark Cm "${ED}"/usr/bin/${PN} || die
+		eqawarn "USE=pax_kernel is set meaning that ${PN} will be run"
+		eqawarn "under a PaX enabled kernel. To do so, the ${PN} binary"
+		eqawarn "must be modified and this *may* lead to breakage! If"
+		eqawarn "you suspect that ${PN} is broken by this modification,"
+		eqawarn "please open a bug."
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+
+	elog "when updating from the currently stable 1.6 series,"
+	elog "please bear in mind that your edits will be preserved during this process,"
+	elog "but it will not be possible to downgrade from 2.0 to 1.6 any more."
+	echo
+	ewarn "It will not be possible to downgrade!"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild
index 295cc2e5bade..0a707bfeba93 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,10 +53,7 @@ CDEPEND="
 	openexr? ( media-libs/openexr:0= )
 	webp? ( media-libs/libwebp:0= )"
 RDEPEND="${CDEPEND}
-	kwallet? ( || (
-		>=kde-frameworks/kwallet-5.34.0-r1
-		kde-apps/kwalletd:4
-	) )"
+	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
 DEPEND="${CDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index 311af5d1d891..4d1a7f0e9ee3 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -1,3 +1,5 @@
 DIST gphoto2-2.5.14.tar.bz2 784442 BLAKE2B 185bd0d18e0b8d280c0ec366738850bd1fe2d1405179700fe25678c04a88b2092820aa5f049bcc6f97c964b5875bd32e3f8c7c5240ef3a71f2af04d6bfdaadb9 SHA512 47cb0d212673c9c0dbc996e0a67191a307599c844293a67184bd1529d9e3b417e154c6de64f4563f6f7e599a1bd6b127266f85f5baa97bd7d86922405bf45331
+DIST gphoto2-2.5.15.tar.bz2 790513 BLAKE2B e8a22d014ebd33f5e0976d72c5df8373e29106def5da575b69d21f2a58e9408c6ce399476135909e57111196d6e61ead953f66a00c9f440b7cf92e0da0f4a0f6 SHA512 46058a12a81379f3311911e103cf934b6eb616d7f81180615b385d01e855bf6ce998eb12811b9d032328ebed6acfc4456f3a383cfedb93c6967c9699654d4f40
 EBUILD gphoto2-2.5.14.ebuild 1392 BLAKE2B d9dad5be797d3f5e2f789c42060c62499d59f8f8aa5129608eea7f023b0257a38d1d3e2d54b4889128f0a867368a3abcac4e3f47bddf98c675049f0b9f24f314 SHA512 6ef5220aaf64e480a95e71d5596093179a41d93912c1d17614034e4814832ba8788a1e282a8711096482eb94c284a65365fb85c67a748fb060a38ef921349a8c
+EBUILD gphoto2-2.5.15.ebuild 1399 BLAKE2B b49450a5c5695f093ef6cc2f8396e861320a12c7dac9edc1f0a2399c9b3347b5fc02e197e220d1f7ebc97cde4b81d382c0b5c601ba88ca47d4137f1c3f46562a SHA512 a1352287960faed91dcba03af16b7127b574442bdf9182646327081668c35e7c6dfe26cad16dc09af18c35660207b6963dddaa7660edae6e89bf183d0ae5d98c
 MISC metadata.xml 449 BLAKE2B 324e2ea46a0f8199033bf628d6719a51968a02af01fa3e8abcd1caaf7a4dcd892bfb6b8347a030edf4b2e8529aba47d7103789103a3b03adaa538338ab2ec91f SHA512 f938819a203e0119b1d81aa1dc812717d6ef02c3012f8ed667db452c7712bb7b142cee36d519ec33f4cf65ebcba7a660e2f67f6b66087ec6be832a4987e10c53
diff --git a/media-gfx/gphoto2/gphoto2-2.5.15.ebuild b/media-gfx/gphoto2/gphoto2-2.5.15.ebuild
new file mode 100644
index 000000000000..8353fefc1836
--- /dev/null
+++ b/media-gfx/gphoto2/gphoto2-2.5.15.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="Free, redistributable digital camera software application"
+HOMEPAGE="http://www.gphoto.org/"
+SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="aalib exif ncurses nls readline"
+
+# aalib -> needs libjpeg
+RDEPEND="
+	dev-libs/popt
+	>=media-libs/libgphoto2-2.5.10:=[exif?]
+	aalib? (
+		media-libs/aalib
+		virtual/jpeg:0 )
+	exif? (	media-libs/libexif )
+	ncurses? ( dev-libs/cdk:0= )
+	readline? ( sys-libs/readline:0= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.14.1 )
+"
+
+src_prepare() {
+	default
+	if ! use exif ; then
+		# Remove tests that require EXIF to pass, bug 610024
+		rm "${S}"/tests/data/test0{35,36,37,40}* || die
+	fi
+	# Leave GCC debug builds under user control
+	sed -r '/(C|LD)FLAGS/ s/ -g( |")/\1/' \
+		-i configure{.ac,} || die
+	eautoreconf
+}
+
+src_configure() {
+	CPPFLAGS="-I/usr/include/cdk" \
+		econf \
+			$(use_with aalib) \
+			$(use_with aalib jpeg) \
+			$(use_with exif libexif auto) \
+			$(use_with ncurses cdk) \
+			$(use_enable nls) \
+			$(use_with readline)
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		HTML_DIR="${D}"/usr/share/doc/${PF}/sgml \
+		install
+
+	einstalldocs
+	rm -rf "${D}"/usr/share/doc/${PF}/sgml/gphoto2
+}
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index fe6a341a7d29..e713f3c630e3 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -4,7 +4,7 @@ AUX graphviz-2.38.0-ghostscript-9.18.patch 753 BLAKE2B f9469184e815ddb153ba01a7c
 AUX graphviz-2.40.1-qt5.patch 4140 BLAKE2B d0d92dddd6ae1efb7e24e22ac0f32025b16ad1aab5182ec410dfd527732fefdf335cda392f1036409ac3a6b86be15794b80546ff9cbfd47454bd01266d861945 SHA512 bd1d51ae10d17ef321bba7dfa619054642debbb02ea1458b0597e6c62471e7750bf5d2cfc68ccb6fd2964b0fbe072b2e7642dd8b097c7e046f8877a2e36d3f44
 DIST graphviz-2.38.0.tar.gz 25848858 BLAKE2B 2c35e7bde3824d7b99008d7879c08ee15bbf4c31272bfccc2be18e6ebf81622030fd856a6d48f7c62a03c8807c181593918f2841d8c0fd393e3b1c868dce81bd SHA512 0e51a97dae595f4e80bc9e4a12ba3c48485fab19941a28d522f5a0624b6a767e0ba720e9e55bff8efe8308dd1cd3793e2c99cb5fdfceb2d5cafb0cbee907e531
 DIST graphviz-2.40.1.tar.gz 25633455 BLAKE2B 96ba5a8cb94d93cf4ecd424bf29c1bf67099e39e582be97fca088de0aad6bbbb46b00af55c197894e0b63f1a96177894b6cd23498295bb524fe19a75661cbc59 SHA512 a3f358a7050523a39b91a259563a95925b37853ffec799e571211af5b686d3af42457c937882954482785745d90416b1abd945caf05f8abb52b3876e07aa70f5
-EBUILD graphviz-2.38.0-r1.ebuild 7875 BLAKE2B c6db8f9f8fe5ad4f824e5d4a7f2fe97bed36a955ef63988969ba04e1ffa062845610a8a38c1d841ca5218750f3cd2c4f553e809fa18a6d27b6491b9d0180f19f SHA512 2f149be71d6b6713b554ed345c4b792e5af143413efe5d66893545cbbc62b83e427ae458a81ee2567f1001e8c3a4ad2efff644d4174a873411daf4cf7cce34fc
-EBUILD graphviz-2.40.1-r1.ebuild 7939 BLAKE2B ee07f5de29111ab5a00634da81c63a409de991219887f5769adf8c5e18ecfb7bf58ce3765a9005491b70495f873f2c869c07638a576a31ffbd64f06949e1039e SHA512 9f8eeabf2c62e81b41735e2793f4b32d3344b0c49c5819b7593de6ab71f3e886941682cdb245413eb093340fb74cfd8417736b833776f6c7a1b35f69f4fc9f6d
-EBUILD graphviz-2.40.1.ebuild 7792 BLAKE2B aa1a463791808a989f06a044d88c0f68f4bab6a6072d50114d59c35e39b083445898b6b8b086661ff32c84acf549014a06796ef279aa9090b23a132ca2a28c8d SHA512 25c9d1358f48f8ef0fea4040ca36d450b4ff7e29083407aa7b117a6792a330d7d0b2f2da1271eafcbeb16b2b1cd1d651a6d96898b2ae7c2e9abf3f712aa7ecfc
+EBUILD graphviz-2.38.0-r1.ebuild 7863 BLAKE2B 838148d8be4b0c860c4686fd7415846e2e71edcf3a47595fa88550dcfe739c64dc999494b6571d6830207a8286d3bd58aa71e54bace259f28152745546bf66ba SHA512 2ba52aa50713c7a54318ac96ad60382eb389c94407203f6f96a85aafdb74c904d83b96a8d6174d8458d1686f956fa3e1bda41b96f38b23ed73d1a949d9ccc983
+EBUILD graphviz-2.40.1-r1.ebuild 7927 BLAKE2B 3dec5ef445546063ed1bf45dd8a3d75793bca09095f458cbbcfaf864e39404dfb72987c7da014d9492540c2524101443b4ef7d3e2880495addf62373b7ec33ec SHA512 aee2a8455ea962e819d0bbf1dc9d89ed3ad2c4bc3d39a6dc2fe2248211f1a8b043276e7e468769b80b435f818409277ed9beef71b809f90f1f842f93df5082bb
+EBUILD graphviz-2.40.1.ebuild 7780 BLAKE2B d881286b10f52fd2167119ca979dcdd35e584262a0e324a71aece5a87d0b1280166f1d6b791c7f6dc511daf5e6ad8682027afd246e6558821a4adb7d649ae693 SHA512 222e64973188fe8287d764a7ae68e69ced364afd18393790b0e253030ba41783d1058814911f13099bc0dbef72855f4de169bd6ea4dd17215ebabdb1e428e874
 MISC metadata.xml 2204 BLAKE2B cc6012ca977a477d6a557df8343e980e926f1e67f737064f3fea406db213e53c416db5fc50692b1132ebcd5b5ce52d4bb2f5a2cec91b0af846b905d36748e48c SHA512 cd26813c5d7d6341ae9a21be50ca4451657c9813e25b2d0d69cd972fbdecdacf63e763ecd1f1a56fee10f07a25e1063822f7b2e9a96df48e3bcf8c7d1d05de3a
diff --git a/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild b/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild
index 722663a0e684..4c02f369ce20 100644
--- a/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 qt4 ruby svg static-libs tcl X elibc_FreeBSD"
 
 # Requires ksh
diff --git a/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild b/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild
index 1f4bd01a6b18..d26dec591e7b 100644
--- a/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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-fbsd ~x86-fbsd ~amd64-linux ~arm-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/graphviz/graphviz-2.40.1.ebuild b/media-gfx/graphviz/graphviz-2.40.1.ebuild
index 16193a1e4ee3..955db7b461fb 100644
--- a/media-gfx/graphviz/graphviz-2.40.1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.40.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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-fbsd ~x86-fbsd ~amd64-linux ~arm-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 qt4 ruby svg static-libs tcl X elibc_FreeBSD"
 
 # Requires ksh
diff --git a/media-gfx/icoutils/Manifest b/media-gfx/icoutils/Manifest
index 9585c0524d14..874b43efc289 100644
--- a/media-gfx/icoutils/Manifest
+++ b/media-gfx/icoutils/Manifest
@@ -1,13 +1,7 @@
 AUX icoutils-0.29.1-gettext.patch 354 BLAKE2B f165b759526678524344a516a0953c028c70941c776f53c780597f17a241c1469b6b6b3ce409153f045470ce4d9d896a44cbcf3b0557950f9138e08bd95ee451 SHA512 d5efb49f9ba8411b682047fc5de3a9605c89c5d8f9a0fa67b7de52719630187f36abf7ffc7cc1e53481c7474c0b7e5d8b3074a81fca02061c4685053c9cb221f
 AUX icoutils-0.29.1-locale.patch 831 BLAKE2B c24a99e4c186759f3c40e1635f919a9f802af28971c803b31a67b4e990206b0aaf4f7787204599b45888a6615c4bfd7c777bfbada6d67248c6e8e4cf033bdf07 SHA512 bcb0ef117c7f1434e63e411d270a2cad8e4d0ad214c7bd516494c7718b605234ad5920b9e16c5627c98e8e1065bc2550e55b1e2e8b846a5854999419c999107b
-DIST icoutils-0.31.0.tar.bz2 559836 BLAKE2B 3f2c0607cb2be5aa7772ca741e7bffbbec4dba23d9e18e5a3d1015482b8587602627694dd69fe091cce24ae17fa63a40f5a4c18fed36700a75fbe22d649b6680 SHA512 f6ee954784abd9f6cf1f6a2424b89e917de2e3950a5411c6790f1a7a34522e067308677ab00bd34781d179fde1192ec91dcd400207edb09bdb20d503507b5cca
-DIST icoutils-0.31.1.tar.bz2 573484 BLAKE2B c49e486f57e1b3acfadf2f764a5520d085caa07149a705a82cecac532076839db836e10d202543d82c1f55733cf40ea41f4c4282009180bc081e494cd218c826 SHA512 47fe41429cee73b6aff90e2b385b621314700dedfe09989318e439b19a484d806a9428652008be2db70598ba1337e860fba30b6d8104525f9e0bcbb4dc61dc56
-DIST icoutils-0.31.3.tar.bz2 593403 BLAKE2B d444290f97cf754a5d69cd1ff4b905b141b6482bf4c12fc547a10063070a35e7e580f9642ba270a8df88cceb1469b488e44340fba78b85b8014e78794985239a SHA512 3c25dfff0d947ad4688e57871888b7d03ecc1d5aaf2dd957bbfd5d034cbde03238a03446a719b637d2f0c309af424359435d98bddfbdf1ea9d4c08bb23f154d8
 DIST icoutils-0.32.0.tar.bz2 593699 BLAKE2B 5a2dbe67468c1bc0380b94f4ecf707c5e1019539e959c0692d195599ff402c4e5496f46883cdd898abb319d8545b76afe32b172d3f74f674c008c69de5a93463 SHA512 35fb584611edefe4445784e61e9cc10bdc039fc4106b7dca7faf66ca1a252ad6dc6e3511b4a5aba744ba74b51315a757addce2f8d5b20a1d7e38886e3eecd878
 DIST icoutils-0.32.1.tar.bz2 594036 BLAKE2B cc3e9071ed6b4e4d783831a180eeae60cadac53e7cfc4cc3c2b5db842680500f04a42f9610e71fd52bbaf3b9d8dc0aacfe16ea0605b809df566fa65328abb32c SHA512 e235cbf0e30f7833babd3aba182cf32b8b76ee757d0d44597c21567a6f960943ec187423727cc33016f6b4d4b0367b9bee7da9dc12807551b38bb4fbe14c37f6
-EBUILD icoutils-0.31.0.ebuild 985 BLAKE2B 2d2ad1ec40ee132c49367994a1cd97a0ca4324244266d447b075f6ee0f131251560d3522d132d7fabbb9eb383943e77cf3225e2efe3afa81c54714f2f045c3cc SHA512 917a7ad7167a16b4c661d0849d7dc443c409d1e0909e2c48cbcbb11d9a3aa8ed150da4ff47969f2f51268d83efc73518e17856ea8a39cf11000f8d6ca3b9923f
-EBUILD icoutils-0.31.1.ebuild 988 BLAKE2B fc0be3aa6de5c5e677a71e301ee33ebfe6b7bf3a1f6f311d618e04f760232557318e92e79115d2f8117ccaed6a1d7d9d12103ea71da8ed43fd32462a95824cc2 SHA512 45be7bd50364f423c1cedefebf6e80afd854899f7f85084c0819ed9d3d7103c48c93243d9e80ae60992c80d6d428cc3da28120107f249b0b7152dd09120de326
-EBUILD icoutils-0.31.3.ebuild 1019 BLAKE2B dad0396fcff50fbc67869b1cecf3acf90f15145dae4bd8d6072fda006879289dddf9c3165472da8f6f460a1fdcb4dd9e21111fdd402cf176cdb2d250e5d8c842 SHA512 0cd637de98d94afca95ed61ccf7bdb1ef331cc19eef08c7c13a568013a5cb3aa90b3c15c8c399b4ced503cf6d82b2a6b4bc41f55bf46caf3c69b501ae32b4bc7
 EBUILD icoutils-0.32.0.ebuild 1023 BLAKE2B bd59b621178f0a056a360ef55359ffe0e1cb7c85164382333b5527661ea33646536a9a53bc572aa3f5bf7ab58fb197e090286631a08ef2d8fb50be54212b31a6 SHA512 6d61698ff5051941507c585158f03fcf1809f5b98f48be1d3a5b704fb803faf9ae8943bd9ee9a78a0078c4d2641a1faf99be7d339cd601aec4c70fc3568e38d2
 EBUILD icoutils-0.32.1.ebuild 1026 BLAKE2B 98d0e225dd1e91554a16004fcc184fd558ea56e9920dcce878c924f375e1a89679560f460e1631dee16445c3c93abb8744464e2ec97b538124ba47ec1041af87 SHA512 57f6adc89ece356040261ca24dea89b79e5c11489f901547e12a0f7c9e4939e6a082d903e86da3aa3ec6f6a0a464fec9c3f9276eef48003d186a3c3f7e274b96
 MISC metadata.xml 243 BLAKE2B cf24db59438ad12e7ee962da70fbbae676aa42a24a62e49c915a1ba728c08c74d10bc144ce79b91258c66f5523edb3c15941cb1b20a968bbed2e156a83eebf9b SHA512 3b619672a798fcaa808248ae187a6e6253bf1f693d2d9808ffb5b60d4d909130299512b623f7c9dbe6971ad15af7dbb6dd51e4b80f512abe0966dc46861fb775
diff --git a/media-gfx/icoutils/icoutils-0.31.0.ebuild b/media-gfx/icoutils/icoutils-0.31.0.ebuild
deleted file mode 100644
index 5e675e469406..000000000000
--- a/media-gfx/icoutils/icoutils-0.31.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="Tools to extract and convert images in icon and cursor files (.ico, .cur)"
-HOMEPAGE="http://www.nongnu.org/icoutils/"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="nls"
-
-RDEPEND=">=dev-lang/perl-5.6
-	>=dev-perl/libwww-perl-5.64
-	media-libs/libpng:0
-	sys-libs/zlib
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.29.1-{locale,gettext}.patch
-	rm m4/po.m4* || die
-	cp /usr/share/aclocal/po.m4 m4/
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	[[ ${CHOST} != *-linux-gnu* ]] && use nls && append-libs -lintl
-	econf $(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" mkinstalldirs="mkdir -p" install
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/media-gfx/icoutils/icoutils-0.31.1.ebuild b/media-gfx/icoutils/icoutils-0.31.1.ebuild
deleted file mode 100644
index 07c8686f4234..000000000000
--- a/media-gfx/icoutils/icoutils-0.31.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="Tools to extract and convert images in icon and cursor files (.ico, .cur)"
-HOMEPAGE="http://www.nongnu.org/icoutils/"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="nls"
-
-RDEPEND=">=dev-lang/perl-5.6
-	>=dev-perl/libwww-perl-5.64
-	media-libs/libpng:0
-	sys-libs/zlib
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.29.1-{locale,gettext}.patch
-	rm m4/po.m4* || die
-	cp /usr/share/aclocal/po.m4 m4/
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	[[ ${CHOST} != *-linux-gnu* ]] && use nls && append-libs -lintl
-	econf $(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" mkinstalldirs="mkdir -p" install
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/media-gfx/icoutils/icoutils-0.31.3.ebuild b/media-gfx/icoutils/icoutils-0.31.3.ebuild
deleted file mode 100644
index 853d0d254623..000000000000
--- a/media-gfx/icoutils/icoutils-0.31.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic
-
-DESCRIPTION="Tools to extract and convert images in icon and cursor files (.ico, .cur)"
-HOMEPAGE="http://www.nongnu.org/icoutils/"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="nls"
-
-RDEPEND="
-	>=dev-lang/perl-5.6
-	>=dev-perl/libwww-perl-5.64
-	media-libs/libpng:0
-	sys-libs/zlib
-	nls? ( virtual/libintl )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.29.1-{locale,gettext}.patch
-)
-
-src_prepare() {
-	default
-	rm m4/po.m4* || die
-	cp /usr/share/aclocal/po.m4 m4/
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	[[ ${CHOST} != *-linux-gnu* ]] && use nls && append-libs -lintl
-	econf $(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" mkinstalldirs="mkdir -p" install
-	einstalldocs
-}
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index b40bdf2c839f..d07f406b4bb4 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -14,5 +14,5 @@ DIST inkscape-0.92.2.tar.bz2 31224100 BLAKE2B c0a7b01220d1b0b0863f71f3e1c8ba7bdb
 EBUILD inkscape-0.91-r3.ebuild 3976 BLAKE2B 6109a0638f125b59ce3a01681290a44371016d72ce9fa8147792f106180437b823969981f1fe8cda95c8bc26c9f70c09025aa32f60117ff594c7168491145e3c SHA512 4b9fc5881cd58b4a5e32adc416564e7943c520f8add50673013f6c953080cbccddcd0690742d938df81d93252d5ad3ce4e41f6bf6191c9d018ebc2667c93dca0
 EBUILD inkscape-0.91-r4.ebuild 4051 BLAKE2B 5ccbbd94230ebb9aa4b6ebbd455b260a2b680247091a760d1556d9e4ad8c897441dda1a1edf90eb3846f42cb3885684863389ca067c11a4d7dde51bd6a74a2ee SHA512 93d3af17489e4a2230931cd53690cdf5bc8ffe9d0f5225b9539ba896cd14976c9c5345925e3974a1b57ac0ce0517333eae3b6a641017c94c37334dc35f9a8188
 EBUILD inkscape-0.92.1-r1.ebuild 3755 BLAKE2B 9c16cd19ad761248ffcaf7f4b4c28ee8a7acac0e33ed7c0b58077904cf5c9dbab2069102363fdb1068b29a1a02c4f903324195ecbd6238f88b447225143501da SHA512 7dc891b411af3f5af45df67707db758deb0265b76e3d6d14fc55d20b0de73f9e4188cdf38f30667d7ecaeea69b799976b64551c33aabd242b4503e658cddc26e
-EBUILD inkscape-0.92.2.ebuild 3879 BLAKE2B 086718507185ac24023279ece38978a33bb7a4bf3c153cec7b5f51f87deb579c892d8b21c3bb32403b925e40cd7652cec39e9ac4a7e578dc17f53a01e9d64158 SHA512 e711d9c2c7f43973ba4be09c4368610986c3dfb6efbd200053b99431edf32c5adadfa507a7ed35aa954cf4745f1e3ff17efe6662001766d3b9bb34d632ebc130
+EBUILD inkscape-0.92.2.ebuild 3878 BLAKE2B 3791bcd7a9407ee698be33e1877467de1d073c59bfe3c5b7248849a71e15973769dfb7c165513bf8481d8fa3e636303801d537e3df6e7f1b287f5537ab96d471 SHA512 41016b56b3392cc765fcde4e43baf0739fbd504eeb08d0e9718593dbab9759697104199cb9b17d09f7c123c489de86b1e0759ee326b57bda4b895f6441307d16
 MISC metadata.xml 812 BLAKE2B 9b06a44ec7ded4b7b4618813bb4b2b5deed3bbc45fd43cffcf435594f3141943a45e592bf2947b00895f0f40d40b0fbe51109daa63f73f3276f50afec620d9fa SHA512 dbe4bb2e918a4c8a20c9a273cef29976d8cfe74e6c2ae1ba8cb77f592c885e8353b7bc3ca8f529e00629f6a0ac7627877cdef68fe07472fc1f417abba5d0268b
diff --git a/media-gfx/inkscape/inkscape-0.92.2.ebuild b/media-gfx/inkscape/inkscape-0.92.2.ebuild
index b64b94f2b343..5aee47f5f692 100644
--- a/media-gfx/inkscape/inkscape-0.92.2.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.2.ebuild
@@ -16,7 +16,7 @@ https://dev.gentoo.org/~jstein/dist/inkscape-0.92.1-poppler.patch"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
 IUSE+=" lcms nls spell static-libs visio wpg"
 
diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index 520ed904515e..372ce08e3065 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -1,4 +1,5 @@
 DIST librecad-2.1.3.zip 26086377 BLAKE2B 7f137c1f6c80f10b803ffbe8a739c230664d81003e47dc0f7b82509fdf0534e5fe046cbc6efaa75149daeaf6f0fa217c1fd08e4de83c74361c99108b6b8fd53a SHA512 9a41c17b512ccbc1a0ebb0e6da8e7297663490479f042fadaffda819e371afc7fa49b789449df9fd4e36a2e2b6f95b9b5be19df47cf3c4252111db2a7ed7f009
 EBUILD librecad-2.1.3-r2.ebuild 1238 BLAKE2B 4d8663d5bd9897969121283c5d272dfea333dd23e58dac53ee284721a50fc19ebf3ddb915bafa08bf07fb9e649e562256d476cd799c9ab9b2a6f33b30e25daf6 SHA512 ac694a6f1d02179250898479ee0cd0d819793ec4c9747d3f062ee72e2b13438174008cf507aa55f741371de42d1f18c06cb11f0f5edf5e237f88612071cac0a8
-EBUILD librecad-9999.ebuild 1183 BLAKE2B 0cb201b0865a6698ad8cc905c23487caabc22255a4bf2167080f4a7e06ca356f6a350e279c9b115a2a48c329402d4cc81e222a162ad8d86815b7e0f28afc85d3 SHA512 0eacdcb74fbef5864e20db36d7006d1e080a1dd9fc9197ba874e4724add193b8a6b95c31ad9a0ffaf4c71738a6ad5f406bd4ad08ae001e8623d2fdce2a1d8083
+EBUILD librecad-2.1.3-r3.ebuild 1240 BLAKE2B 58aabdf88496e831a36dccf809ff69c334bacb15245dfbd3b94fe44ff3968a4eb8330f2fb64828ed507378053a10b2642bb5896336f9ed557bc406db001f9bef SHA512 eea97966207d444a19c95f83e94420af6e9287d82528a70bdd5fe45bedf83c301e3784d5504d0dbfdcabd5307d76de3b45fce9c8ead0a4dbcac86cbe7095338d
+EBUILD librecad-9999.ebuild 1183 BLAKE2B 9b1ac89fa4d9bf2b29408b3588779fcfc99951bc884f1f68f7964bf78a8d10a907a84c78d8b12b5925f0a89a49ed4e5ec8307a8d2b0f4a272ad86ae790274421 SHA512 b6297b5e9686f35e0fd3efaf52a0e551cec321936cd0009370f17fdabcab61fdf501f505a427748d9af88130653997d7100b6c58d94db16562183205926f4676
 MISC metadata.xml 459 BLAKE2B 8b648b5abdd62d9df306c90d182164694c753231b16ad37319863ee37feac91b2e0fcc89212b5259a899287a638a68cb2e48fcc55af8a076d23b201e6b38ebb3 SHA512 108977904dfb070a16279d3306f40982a73b1cdddfa90e8ab22f83c4a75cd620a829fea9a56a0290d2d160b1d30fd0fb67e320f526726dd57a613e781c700b6c
diff --git a/media-gfx/librecad/librecad-2.1.3-r3.ebuild b/media-gfx/librecad/librecad-2.1.3-r3.ebuild
new file mode 100644
index 000000000000..20902c58015f
--- /dev/null
+++ b/media-gfx/librecad/librecad-2.1.3-r3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils qmake-utils
+
+DESCRIPTION="Generic 2D CAD program"
+HOMEPAGE="http://www.librecad.org/"
+SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="3d debug doc tools"
+
+DEPEND="
+	dev-cpp/muParser
+	dev-libs/boost:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qthelp:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/freetype:2"
+
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/LibreCAD-${PV}"
+
+src_prepare() {
+# 	epatch "${FILESDIR}/iota-fix-2.1.1.patch"
+
+	# currently RS_VECTOR3D causes an internal compiler error on GCC-4.8
+	if ! use 3d; then
+		sed -i -e '/RS_VECTOR2D/ s/^#//' librecad/src/src.pro || die
+	fi
+}
+
+src_configure() {
+	eqmake5 -r
+}
+
+src_install() {
+	dobin unix/librecad
+	use tools && dobin unix/ttf2lff
+	insinto /usr/share/${PN}
+	doins -r unix/resources/*
+	use doc && docinto html && dodoc -r librecad/support/doc/*
+	insinto /usr/share/appdata
+	doins unix/appdata/librecad.appdata.xml
+	doicon librecad/res/main/${PN}.png
+	make_desktop_entry ${PN} LibreCAD ${PN} Graphics
+}
diff --git a/media-gfx/librecad/librecad-9999.ebuild b/media-gfx/librecad/librecad-9999.ebuild
index de157dedc9ef..efb61a9472a1 100644
--- a/media-gfx/librecad/librecad-9999.ebuild
+++ b/media-gfx/librecad/librecad-9999.ebuild
@@ -47,7 +47,7 @@ src_install() {
 	doins -r unix/appdata
 	insinto /usr/share/${PN}
 	doins -r unix/resources/*
-	use doc && insinto html && dodoc -r librecad/support/doc/*
+	use doc && docinto html && dodoc -r librecad/support/doc/*
 	insinto /usr/share/appdata
 	doins unix/appdata/librecad.appdata.xml
 	doicon librecad/res/main/${PN}.png
diff --git a/media-gfx/scour/Manifest b/media-gfx/scour/Manifest
index cf3f644ccdf3..714da2a96f8d 100644
--- a/media-gfx/scour/Manifest
+++ b/media-gfx/scour/Manifest
@@ -1,5 +1,5 @@
 DIST scour-0.35.tar.gz 80981 BLAKE2B 6cf0eba35a9deadf44534d3e8370187ec7b7655e9dc31f25b5bf465fee7482eb18ee985b0702c7fa8cb5db89cb1579186fee1c43b890ba4c74f4e86cd793927a SHA512 9a09d862d66e21a63744401a44f517eef268288408556e3541218713ee8c5b5c0414ab03ac61d5d2fdbd2f01fa3276793b17f110d44cdec1c53c7b7dee16afc0
 DIST scour-0.36.tar.gz 91575 BLAKE2B be65b751151cf939601b6c0dec0613d13be6367f761fc8d7201bd58f2a3475858740be0d972446e2727852b79b1197b82d217b51dd3ae41c0bada10d53d462b7 SHA512 8593f46a0e36fe220f5ce6dd85696172435712491cd1a6983c12054965ce96eeb2a52be0877f8fa6967444817abfc353f9a00f1d8d676cbd6651cfd33a0790f7
 EBUILD scour-0.35-r1.ebuild 655 BLAKE2B 0c6c37502c38260170e04f226c7a25bf78f98e14f5ddfb76b2eeb0ce89221cdf3588cc11f236664c4f8698a867409d531f1b5a7235b0e7f56c00e614beb8731e SHA512 ff88db744f396df8d9c0e964c7a48db367b2dea7bb2093bf06674c4cf1907b36617f27f68828c9a141fe19b23294ac3401fb314277228b3cde8269d8a582f954
-EBUILD scour-0.36.ebuild 666 BLAKE2B 5693fec05ab3e5768b069973e9b09e319aabd021c8bf62d4e715eaf37ff467e4028bc69bbeb3f149e6c9730d7271385d47b5a37b08981b03fc1f08ea1d1e8627 SHA512 3b64773458af27271f42db0a3b115b696eeb43bd04962b251cd53beab1382aceb88f58141af937ad0cc79439029fe39b1b39b898e15433cbd7b0c2fb95736e1c
+EBUILD scour-0.36.ebuild 665 BLAKE2B 3b30b4c52d75da28aa1f533eb4355f2553c3aceaf1d36ec03f1653f50dcfd47f626eebd941afa01f122a7801fdeba77c1f59f320d2ecb1dec9d1966b55192e73 SHA512 4801cabbfa090fdad0f751fe8bca031e7bd028aaa85bf2c608ae91d89d2419d163eea7ff63116ce839bcf03a79e8d4d30f53bb1400c4d9628aafd7da24a90198
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-gfx/scour/scour-0.36.ebuild b/media-gfx/scour/scour-0.36.ebuild
index a70ee93ef476..2bf29d55e2ca 100644
--- a/media-gfx/scour/scour-0.36.ebuild
+++ b/media-gfx/scour/scour-0.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/scour-project/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest
index b26fa5b67768..c2404551c37a 100644
--- a/media-gfx/valentina/Manifest
+++ b/media-gfx/valentina/Manifest
@@ -1,6 +1,7 @@
 DIST valentina-0.5.0.zip 37175844 BLAKE2B 73cfb434c87e7d59efa76c303f4cc13dd9df08b9d5f61becd03943b78ce68e8735d192f2f2d5d5dfe25cda19ba998b0ea4a73bc3d0845bd4a065f7c5b4e66098 SHA512 3e69f965de1f8179850a8c6a5a0d3b5e87384158191b9c4a3647a5421d1efe567e98298bd8f47a8288eac358520469ae7979a4a61df64ccfbeb1a36fb231efcf
 DIST valentina-4798.patch 25302 BLAKE2B 153cc2ccc603703a520b5181e5192bac86410ab51eec305effe43463ce081dbbf3bb48eedb93e8ea5928f3f71351526a175c61a23a7005fda5bf4e14cc57403e SHA512 c3adbd2caa4cfb73960de850b29bee881fc408c9e4032e1fa2f29ba80b91abaa194738ff1cfb607657343990a166ad310387a66ceca546ffae0543d774bc53b4
 DIST valentina-4802.patch 6733 BLAKE2B b7e30b77aab75b45e7bfd06165586f8356cfa438e0f5f5fb708d818f04fe9be7fdd025b8098cb5ca1f45cceef0671abf7014c112ab11da8e6c9c1a640e412ab8 SHA512 5628599c1dd208ba9ea8ea5e518bf6aed5ef11aa750670335478e5af49d6e9f235901c79d6483b1897f8288259fd06b463462eddcd062c4920ff251430998ff4
-EBUILD valentina-0.5.0-r2.ebuild 2416 BLAKE2B 6ee92fb4cd2519d6ec2ced5f21377a89142c83f6e4e9f064c0e0bfc88119cf3d191e5d9f4558228fd6ab30ab3ea9c8ca793b42e2cef2cc249a651fb61ac6b810 SHA512 af345b22a261444419c41dda8815be026952861fdbac348a2cdb17ef9dd558b654b376f3d11afb1d9649b478f42f12f0c5b1b26911b07217c037fd79d8323346
+DIST valentina-5406.patch 596 BLAKE2B 34c5cf515555e455416500795c2afd96176b3ca3c2c3e278dbb6311e7cfb38bba6556126beef23d8b98ace76f0156250974d95310a6af046c0884580aa1d19d9 SHA512 f504ca766969703a20fc7c16652d4615722afda9156eb07c43845d1a6e9c7d08a2e8f07be7c71b4379326757f95e95e85858add2b1d13b0e4e5e8b1974ce18ae
+EBUILD valentina-0.5.0-r2.ebuild 2564 BLAKE2B 2d91c1cf47ec82cb0040cff641689c91d8e2daf868cd344ba03c4d8cec3ccdebb704d652f5f1dae954bebfab5f38d22304a590620e37fc02e25b0486947c668d SHA512 b41f00a7f2368a4e4ca806d76259ce062fc4310c48eb4c131968b4f6a01b8e2b2c3bec6963f7d7767e7e495be4bda27be64f3aa8d9bf706bb7475060df279856
 EBUILD valentina-9999.ebuild 2013 BLAKE2B e16d40f731acab6ef308b85440654a5c9c7f210d76211b395da68620018a1c9fa4feb6a7f8f557a766c8f5147b1b50d09739d72416330380c57288bd28a4ff99 SHA512 8ba73f6f9ddd1a193ef34a11f6bbae68c462ce89964358ef1af6d708f5fbb65fc4cf6a5c71257d408f326dddaedce4dea9c46aee63bb7d1da006de739df7f616
 MISC metadata.xml 334 BLAKE2B 7f146a505a30d4461165308b40383e2b78998411874c8af6113c3040142003868f397872ecd22b9b8f3ec6193c532fa934c8646ee04e8c49157464b58035de09 SHA512 d1264aa0d26ba75466c5572c37ca6fd384d4e6db392aca0e47d4b1d0bd3ef7e035fed51c460af1bb258c500d1cc9211ec2e85db3e3aa158d378fb1389a3ebf03
diff --git a/media-gfx/valentina/valentina-0.5.0-r2.ebuild b/media-gfx/valentina/valentina-0.5.0-r2.ebuild
index 9b5a7f5ea11e..d7a61d28cedf 100644
--- a/media-gfx/valentina/valentina-0.5.0-r2.ebuild
+++ b/media-gfx/valentina/valentina-0.5.0-r2.ebuild
@@ -9,7 +9,8 @@ DESCRIPTION="Cloth patternmaking software"
 HOMEPAGE="https://valentinaproject.bitbucket.io/"
 SRC_URI="https://bitbucket.org/dismine/${PN}/get/v${PV}.zip -> ${P}.zip
 	https://bitbucket.org/dismine/${PN}/commits/d78ca13c4891ccf3542b0704a7d66af0f9b02938/raw -> valentina-4798.patch
-	https://bitbucket.org/dismine/${PN}/commits/98e869c4146204ef31822087fa826cfa1cd7e0f4/raw -> valentina-4802.patch"
+	https://bitbucket.org/dismine/${PN}/commits/98e869c4146204ef31822087fa826cfa1cd7e0f4/raw -> valentina-4802.patch
+	https://bitbucket.org/dismine/${PN}/commits/572fe909f75e013be310905c118e1afe4368db1c/raw -> valentina-5406.patch"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -40,7 +41,8 @@ S=${WORKDIR}/dismine-${PN}-31c95eadca8b
 
 src_prepare() {
 	epatch "${DISTDIR}/${PN}-4798.patch" \
-		"${DISTDIR}/${PN}-4802.patch"
+		"${DISTDIR}/${PN}-4802.patch" \
+		"${DISTDIR}/${PN}-5406.patch"
 
 	default
 }