gentoo resync : 02.11.2017

26 files changed, 194 insertions, 557 deletions

diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index b0e5f47299b2..48ab4438a5c6 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -4,23 +4,14 @@ AUX asymptote-2.32-configure-ac.patch 1124 SHA256 9c18c6f135fdc0acb04bd3ee54eaba
 AUX asymptote-2.32-ghostscript-9.15.patch 906 SHA256 d2cb6119969ed17f07b09a5a348698f51fc8f86b11e8f3d9b0e4e9bd50af08e2 SHA512 d5d40d10cead93f73755599aeb0177e65c9d34855b9889cdd603d7334c771b53132acc46c199c872d46b66f541f31326fe5747cd2cc60529b5051cf29e09d904 WHIRLPOOL 3a969631d6bb295d9ee912be7063d5d0ae8a50467159a824b278cd0cc4bc1f577b97a45a298ecf18fbeb79f25ff547316a8f408b8c0839c4001d6d8c36cc2683
 AUX asymptote-2.32-info.patch 436 SHA256 ff2cac5daac0c4efa5d2375cd440791d2843590d07f39e3808b034732e8a49ee SHA512 55283a8103625f1aee32ed3b8b235ff4af6350a2879a9c1289779a9a37ab0d76446dd3b17b731e9e1b8d1bb1c5e37c6c738eb193f00df89ef22b08b084e2ae36 WHIRLPOOL d5b2d599e033eab06e1d96d697f83a1f86e637dc2b613a1ba0ad7b7f2cc3b107cecddf8703c1f4c9fcfae76046806bbdec617dde2acbf02f4474bfd964a0b3cc
 AUX asymptote-2.32-xdg-utils.patch 744 SHA256 c86323f54b475641e62047605ada38c7749a60990fde1a81b589f74a9f9c02d0 SHA512 972be61509145f61537a0b8eab79a7f3b5f866e790bf9b18066235c906ed29621cd32dd0d894458221f3fb2c28ab67199139ba7f8e4753d2b20d5f1f07435b9b WHIRLPOOL 249514ce515990dec942a241a2cdd0269bef07f651a4b1c08c7440eaf7bb7e40d417f9b4629d7fe8ba4cf1514c718c4ed78a3ada61762121c41b49687fffcd46
-AUX asymptote-2.36-configure-ac.patch 1124 SHA256 6dad1267500d06b129e115b470a3a0d7c15f40248684137a28060b76e73092f3 SHA512 3ba2f8290d04f5e7ebb0d0aba4fb8a040b332a5992099d6cef525cc4d1566d4c9a69b7e3ab09bd6b1e5c567dbe266a3f4115f898344f5e3e9507a1ff6916b2c6 WHIRLPOOL 1c851a8745fb5bcedd2ac8340b272e582f07f4f4b30e24471ee6470ee697f7cd95e5cf6d58cdc8e711481cb6b943a9e547631694221cee8d18d62f55b471402f
-AUX asymptote-2.36-info.patch 436 SHA256 c0e41508f5456cce92c3fee5d892877f3b9f91549eda61575b684fe1d24bb2e6 SHA512 cf98ee0840d260ad5e80090405934d80847ae0f7ad2237a7c12cbcccd282b62c2e455b27d60b81bb54f0a7bab3cb148e273d6e5e19b180e19a6c494eb6835032 WHIRLPOOL 99e6824bb1f02f29a3d2aa1f88e1e9ad9436a71d1b2eaa5419e8434a8fb3fd46476fb5610a4b91f99d9d4fee8d9ab23d9c7b25f82317b49152ce614db2cf2657
-AUX asymptote-2.36-xdg-utils.patch 744 SHA256 ad6c438c59e6e797aefbe2ad10793a4ffd87b73e7d8a07c887e58115f6db8e81 SHA512 8752e8b107907f06ba03916aa61ec0ba5ca5d7b5505f7dff482f722962e17f42dbf22acbba8d2b54ead8fc6b3cc57aadb645d3c3a51170225dc84784333d7e81 WHIRLPOOL 979be4dd968a073f9c57b5fc02cda8611942888d767dd37b382ed7be04dcac1c09f02f2e9f22131ea82a74befdd7976b5983e0d70db31fdb94e394469011d6bf
-AUX asymptote-2.38-configure-ac.patch 475 SHA256 af34e95b049945a4c92ac1017f96280262ecffe36a758a8661167a808f990714 SHA512 64627a98caa1d03a274d2e9f009513f1d0cf3b5028c169ff851079a9bf836920cd196a1fd2cf6a31e0f9d0a1e8cd90bd17641fff7daaf478fbceb54c49e2b28e WHIRLPOOL 66b04fcdd7bbb79668a48ba819160eeae44db60be0cbf6532c870f01a6e32a710c69c94452d2c4d826a42cbfa8a10707ce4ffef5dc8a0cca46d6104afecc1ce4
-AUX asymptote-2.38-info.patch 436 SHA256 038acbd6ff38034ab5de8ff85211d06b87ad81d259c831f433efcade037fddb4 SHA512 9980cf8c2c2178d60cd3bae04046f985d42e12322ad480e070a6dd66f56b3704ae64687b8d9e6e912a097fcd10042983a3a7e014c5c3464476ab9b7fc87ba55e WHIRLPOOL fae6b6128239fd564fe5944c3319a736c90293dd5556b1cb8d73c30ddf53ae6976fce99088ac579a9a4aeccac0823b4e6d1d20f504d7721e8a0db2f9236e6751
-AUX asymptote-2.38-xdg-utils.patch 744 SHA256 3f95c9cc59675c397189c0348859cd4672f5781caf59126b1ac073bd964c0b08 SHA512 3b3e2398d705128c2b885ac43cac044c97795c776452687ac33dec336ec32bdc81183e15c717693aa4924620230abb651a6a92775b0f9ec08de5b81a1e925919 WHIRLPOOL 0af2754fba57d9fdf823abfa17897145c570c6a6038e4bc37a05c51c17e55c60333407a81efc962e03cdd50102e4f8ff3aa879356f7d38bf2677859825874b0e
 AUX asymptote-2.41-configure-ac.patch 475 SHA256 4f59616116fe2249884031c8e5214afc8ff39d788383a765c29b9749d072eba6 SHA512 39403fbd218ca5a6c3a565e6f1955467c8e11296c69acfe529aca5566e03bfee395c360746288fe09d768c2cabd46faaa6efcb7e57595f0dc784b4ef2e0c416a WHIRLPOOL 7219bb876fedae8283e9770e3f338f0d4d8a20fa2bd34590797eecdf70d87d307d00fa8f502572463d263baeef18e2199924e1c2bcfd7b7591b2fcfba6a3bc99
 AUX asymptote-2.41-info.patch 436 SHA256 e92ddd03ecc3ed2aea37566912cb885370daa8691e62372e86281b2cd1e484e8 SHA512 7d3ae35b2eb2b226ae3b7326d2e7d50524402d49be90303035a2872b5a109bb104f53376b9da681cc8d6922ddadec6a606540842745109edd3b55ce50725a6fb WHIRLPOOL 17dfa7c8a791f9a1d797bc81fd21e0b3c5c3ddd0333e2404100ada628a3776886caa9d31c24275dbdccc30896324918966c028960ebea9578717c89950efab5d
+AUX asymptote-2.41-perl-5.26.patch 400 SHA256 3352219fd2102bfc89523ea98bfdb349d58b90422220d1a4dffccd353f19f179 SHA512 bb333f4f42063be1c4a19d4cfd4209ac7b7d3c4318a5c3634581d63af2183cc27918b80e47148b1cbc256049b38cb85982ef7e00f7f021be3e714adabf15c87b WHIRLPOOL 6fc210b84d1a9647e8847de4bd8f18960f78bdc14d872af10306bac0138b1f997bf1c520fe2ea8d23d849ab094e5d1eea197b674662adf5fa829d04d2dcf874d
 AUX asymptote-2.41-xdg-utils.patch 744 SHA256 16e222d9d039645aca3c3bf015d509fa723d31362dc2ed3ae71138b86b39b38a SHA512 370fb078d926185ab7e10cbbc8afc4bfe0829e682fe89729a5d41bb3bda5dda96711f1fdcb99b9da69606563ce120383e5a1211372f3d8dd54ea3ddfc0838d7f WHIRLPOOL 10008a622cbe9b995f2d2e701796bea989c9b4e9fa71bf0ae417a18d1c909e73c2185a87e5a871eb5c6486fbee6940a3b1db243967ef0c52b274b9208c1c38f2
 DIST asymptote-2.32.src.tgz 1794495 SHA256 2035035e02774598312d5588da2685d20fb85a378ea2bbe48b825c5442b18fa5 SHA512 a0663f1768cb4340bb6e9224d4fbc6e2f8b41501b1f59793d84db2e0f99b9ff071d3dd8fa5c4715c1874f8ef1af713a54b27de37ff40d8ca042f0f48579a57f9 WHIRLPOOL 38a8aaa581acb07bcc7ac0c802222501acf77abaf609d5ae758d9b5668ac6b8b1343640259cc3948e62a39862404709ddb64b4bbd11bcf20dbb7ce29d4fc25d1
-DIST asymptote-2.36.src.tgz 3449528 SHA256 cd3276cba498965f8c9e6c56b157d2f22304b0453d175bd9017b4c62b3fd1750 SHA512 18b079829f90561f88ebde0391f5d842d89ea28bf7b00306b908faeeca21b421127423af3a335bab9afa22036b3d93611702a579513d8a458be2f8cdd542222f WHIRLPOOL 532b221d619c8af077e0ef4cda960e6bc1b2c2eab263cfa1eb729df5928f7ae1d9e05459efee18a5a4fa4464b0b3aacd7f5ab42076e8af4e1fc3745f75dd9b6c
-DIST asymptote-2.38.src.tgz 3460789 SHA256 e9c6dbb3fed27cbaf9ba01fd2264f0cff51781466acb29e76418bed801debcb7 SHA512 c54974a0476a33112c7913cfd8962e80a5ff10bc11f65b59a2bc0641f3c2fcfe69ba4592d84b33078d85c43fab7261670195766eca6419f6fd4923fd1ace6904 WHIRLPOOL f1d0a31fe25046c072a4963f64c92f718d980712f46637db65a5664c0a94c1eba162902c9ec4e787685f2250158ecffa9e834564ecbd69c6e3b948c5ad7d7a24
 DIST asymptote-2.41.src.tgz 3516426 SHA256 1d6e7e89fb5293fad7d836fb0477f785a113f689bd71f37a05af18ff0c5eeef0 SHA512 93f737a44b085c2290c4553c765cf49679820e6623bc5b6d0229818409868876275d6f0571abeb76033955fa95ee594e37d10c9901c54755b085e36760fd96cb WHIRLPOOL e75a6a2b4e29c3388f221b86958b6564edb14a46dad014acdc81554e1f0ac6b889c757f5a0626af6fb46783bf02393f73e92d2209080a31d665bc23550714a39
 EBUILD asymptote-2.32.ebuild 4691 SHA256 6254347d0375c6bfafe9c2d77cd9097fd89a6df6512382daeaf20aa4508cac37 SHA512 542341209f454e6c6bb7c38b2efc3075da2a50b2702999e3d5286aec60593264145176b47fca8dad5588e22bc957d069441f2389c074b95619ff2f50dd6ebcf4 WHIRLPOOL cf78bdeb62f783f8bda5db4c1f48528679837740dcc11de1d9ae7b49cce8364368ce8236dcc916b6e1a85f20cd0ce205b934f80aa7aa09c85e6a53c396705787
-EBUILD asymptote-2.36.ebuild 4557 SHA256 93f08f61479f5acb247958512d20b888ee01043ba191b5f62ae864795c8fb27f SHA512 818d94470a0f3b5efa9caea2a505029f3bd9424471e50192b048894ab073146bb455e00578a2e691c5ed3633a037e3fcf2983d1c1c2f81a72db4f7b16b3118ef WHIRLPOOL c0cdad138b661de2438db5e63006cdc5e77b2c76dc501527a0786a11011588adb3690f5acc364fc454b45426e1db3f8648f090ec3dc441f545afd38ccdd602ce
-EBUILD asymptote-2.38.ebuild 4521 SHA256 7bdb0c46047997a43335348457b11cecfbf82cfe2e5e16ffef710f618c8851be SHA512 4580c1f6986557979a24a70a8a2f6e9450abc2edb8f0113ae4728e7af66086d1ec3d1ed40a11f8fc5dec1b9b896db8a9dc9e423c26f9c4909aa5bd1bf15df63b WHIRLPOOL 7517f968fc8bb8725caad371caef3c0ed38e6bc482a0cddc177e7fb97fd13185e5fa7050578a3e05087e0366e5a9f777f2730fef51dfc171ce2b4927b5e58ffb
-EBUILD asymptote-2.41-r1.ebuild 4580 SHA256 040c1fcedcef34d452304eeba9103e0092cf2d951738206ba11de775bf609ea5 SHA512 926aca84b8cff2122a1e93a25e11d7bbc6774f1902ad8234d322be41a688961d6c9641695dbc341bb7ade014ddc46a78884772a500948620da4c5ae3714638cf WHIRLPOOL 08ea9564f28fe065922267ae970aa8c2826e6c4e63816a8b186f2c83c241254202ef1aa9169b14993b0816573bb12b7e5126009c26b389fb31c1022a5257cf2a
+EBUILD asymptote-2.41-r1.ebuild 4668 SHA256 93440ac086bb68642c6442ffb24fcb2a27c3efca4a92d36d606bb456da432296 SHA512 a30db348b7593b896ba32d94a96d079acbb07e32de936c86db27565f33bfa46854f836a98847b635630930385f380406d05abc81f123377c3f96dc97db912c90 WHIRLPOOL 004625b5b074d3aae1886ea56b42777b26c9c78ee7e9b773223df4062f1f42912a1c1b1ada568855ca9d05f7eec11c69a6b0ff23e5bc14b661c2bd4a5877d2ff
 MISC ChangeLog 5493 SHA256 42c19752496aa3f28c7c4ad7539a72e14c8d3c24ec96c4a19a584c9ec42f1a81 SHA512 bea0953d358fb283d6ff7daabdde77b39c2ee1c81f133ee75d9760725a38d0fb8e5828b6d2bbb69b24e5b7b9e5b0535c2a0f07983079979a50ac49b8bcb6dca6 WHIRLPOOL 944056444f36cb4a510f95361c4bd73be17db3f6a196b37b868b16fdb9d75c5ccd8f5f2c61d2377856135e78ff7d1f55a0d7d7d363f637d2eb7d28af6c6a093e
 MISC ChangeLog-2015 31345 SHA256 d8ac4e20f284e917db6fd098648757c19bb67c04036d706d848d799ebc7497c2 SHA512 a10cd2714c8efb07b2d7ef9538951faace408525becbd7b203fa36241c24475cc6d8714f8246a813be4cceca48c71de421aaebd336c1f349bf648d7d176b5908 WHIRLPOOL 67ed17ab8d83fac0512dda190408d7f25ec4789be94d687849e04fbde69f45614b886e4dfc9b89e8e04b2839bfb110d6f2a5cfdb9053ada736fde780b8477fe5
 MISC metadata.xml 1151 SHA256 30058a1aac7241ba11cea8839912fda208d83156f9769b57a877766bd5227328 SHA512 37a7c882ae951dee27c69937621d9385026ec2fb41d771010b48c07cf753fb5233c7edadf1dd937e9f6013c41406c0a3052a1b3d3493d7fa927bc1da9d6d8f3e WHIRLPOOL 173a1e3e82098ad3c846534101a5851d1b71b3d1ab9856a0e97168e49d3542e78c35cf70c236440589ea6a048316faa2c5550f7a8d9824b1559d6933d062d684
diff --git a/media-gfx/asymptote/asymptote-2.36.ebuild b/media-gfx/asymptote/asymptote-2.36.ebuild
deleted file mode 100644
index ce68c0d99b83..000000000000
--- a/media-gfx/asymptote/asymptote-2.36.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools elisp-common eutils latex-package multilib python-single-r1
-
-DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
-HOMEPAGE="http://asymptote.sourceforge.net/"
-SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg vim-syntax X"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	offscreen? ( opengl )"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.4-r5:0=
-	>=sys-libs/readline-4.3-r5:0=
-	imagemagick? ( media-gfx/imagemagick[png] )
-	opengl? ( >=media-libs/mesa-8 )
-	offscreen? ( media-libs/mesa[osmesa] )
-	svg? ( app-text/dvisvgm )
-	sigsegv? ( dev-libs/libsigsegv )
-	boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] )
-	fftw? ( >=sci-libs/fftw-3.0.1 )
-	gsl? ( sci-libs/gsl )
-	python? ( ${PYTHON_DEPS} )
-	X? (
-		${PYTHON_DEPS}
-		x11-misc/xdg-utils
-		dev-python/pillow[tk,${PYTHON_USEDEP}]
-		)
-	latex? (
-		virtual/latex-base
-		>=dev-texlive/texlive-latexextra-2013
-		)
-	emacs? ( virtual/emacs )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-lang/perl
-		media-gfx/imagemagick[png]
-		virtual/texi2dvi
-		virtual/latex-base
-		)"
-
-TEXMF=/usr/share/texmf-site
-
-pkg_setup() {
-	(use python || use X) && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Fixing sigsegv enabling
-	epatch "${FILESDIR}/${P}-configure-ac.patch"
-	einfo "Patching configure.ac"
-	sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \
-		-i configure.ac \
-		|| die "sed configure.ac failed"
-
-	# Changing pdf, ps, image viewers to xdg-open
-	epatch "${FILESDIR}/${P}-xdg-utils.patch"
-
-	# Bug #322473
-	epatch "${FILESDIR}/${P}-info.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	# for the CPPFLAGS see
-	# https://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349
-	econf \
-		CPPFLAGS=-DHAVE_SYS_TYPES_H \
-		CFLAGS="${CXXFLAGS}" \
-		--disable-gc-debug \
-		$(use_enable boehm-gc gc system) \
-		$(use_enable fftw) \
-		$(use_enable gsl) \
-		$(use_enable opengl gl) \
-		$(use_enable offscreen) \
-		$(use_with sigsegv)
-}
-
-src_compile() {
-	default
-
-	cd doc || die
-	emake asy.1
-	if use doc; then
-		# info
-		einfo "Making info"
-		emake ${PN}.info
-		cd FAQ || die
-		emake
-		cd .. || die
-		# pdf
-		einfo "Making pdf docs"
-		export VARTEXFONTS="${T}"/fonts
-		# see bug #260606
-		emake -j1 asymptote.pdf
-		emake CAD.pdf
-	fi
-	cd .. || die
-
-	if use emacs; then
-		einfo "Compiling emacs lisp files"
-		elisp-compile base/*.el
-	fi
-}
-
-src_install() {
-	# the program
-	dobin asy
-
-	# .asy files
-	insinto /usr/share/${PN}
-	doins base/*.asy
-
-	# documentation
-	dodoc BUGS ChangeLog README ReleaseNotes TODO
-	doman doc/asy.1
-
-	# X GUI
-	if use X; then
-		python_scriptinto /usr/share/${PN}/GUI
-		python_doscript GUI/*.py
-		dosym /usr/share/${PN}/GUI/xasy.py /usr/bin/xasy
-		doman doc/xasy.1x
-	fi
-
-	# examples
-	if use examples; then
-		insinto /usr/share/${PN}/examples
-		doins \
-			examples/*.asy \
-			examples/*.eps \
-			doc/*.asy \
-			doc/*.csv \
-			doc/*.dat \
-			doc/extra/*.asy
-		use X && doins GUI/*.asy
-
-		insinto /usr/share/${PN}/examples/animations
-		doins examples/animations/*.asy
-	fi
-
-	# LaTeX style
-	if use latex; then
-		cd doc || die
-		insinto "${TEXMF}"/tex/latex/${PN}
-		doins ${PN}.sty asycolors.sty
-		if use examples; then
-			insinto /usr/share/${PN}/examples
-			doins latexusage.tex
-		fi
-		cd .. || die
-	fi
-
-	# asymptote.py
-	use python && python_domodule base/${PN}.py
-
-	# emacs mode
-	if use emacs; then
-		elisp-install ${PN} base/*.el base/*.elc
-		elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
-	fi
-
-	# vim syntax
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins base/asy.vim
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${FILESDIR}"/asy-ftd.vim
-	fi
-
-	# extra documentation
-	if use doc; then
-		cd doc || die
-		doinfo ${PN}.info*
-		cd FAQ || die
-		dodoc asy-faq.ascii
-		doinfo asy-faq.info
-		insinto /usr/share/doc/${PF}/html/FAQ
-		doins asy-faq.html/*
-		cd .. || die
-		insinto /usr/share/doc/${PF}
-		doins ${PN}.pdf CAD.pdf
-	fi
-}
-
-pkg_postinst() {
-	use latex && latex-package_rehash
-	use emacs && elisp-site-regen
-
-	elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer'
-	elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer'
-}
-
-pkg_postrm() {
-	use latex && latex-package_rehash
-	use emacs && elisp-site-regen
-}
diff --git a/media-gfx/asymptote/asymptote-2.38.ebuild b/media-gfx/asymptote/asymptote-2.38.ebuild
deleted file mode 100644
index 7c441dfe2481..000000000000
--- a/media-gfx/asymptote/asymptote-2.38.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools elisp-common eutils latex-package multilib python-single-r1
-
-DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
-HOMEPAGE="http://asymptote.sourceforge.net/"
-SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg vim-syntax X"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	offscreen? ( opengl )"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.4-r5:0=
-	>=sys-libs/readline-4.3-r5:0=
-	imagemagick? ( media-gfx/imagemagick[png] )
-	opengl? ( >=media-libs/mesa-8 )
-	offscreen? ( media-libs/mesa[osmesa] )
-	svg? ( app-text/dvisvgm )
-	sigsegv? ( dev-libs/libsigsegv )
-	boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] )
-	fftw? ( >=sci-libs/fftw-3.0.1 )
-	gsl? ( sci-libs/gsl )
-	python? ( ${PYTHON_DEPS} )
-	X? (
-		${PYTHON_DEPS}
-		x11-misc/xdg-utils
-		dev-python/pillow[tk,${PYTHON_USEDEP}]
-		)
-	latex? (
-		virtual/latex-base
-		>=dev-texlive/texlive-latexextra-2013
-		)
-	emacs? ( virtual/emacs )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-lang/perl
-		media-gfx/imagemagick[png]
-		virtual/texi2dvi
-		virtual/latex-base
-		)"
-
-TEXMF=/usr/share/texmf-site
-
-pkg_setup() {
-	(use python || use X) && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# gc.h -> gc/gc.h
-	epatch "${FILESDIR}/${P}-configure-ac.patch"
-
-	sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \
-		-i configure.ac \
-		|| die "sed configure.ac failed"
-
-	# Changing pdf, ps, image viewers to xdg-open
-	epatch "${FILESDIR}/${P}-xdg-utils.patch"
-
-	# Bug #322473
-	epatch "${FILESDIR}/${P}-info.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	# for the CPPFLAGS see
-	# https://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349
-	econf \
-		CPPFLAGS=-DHAVE_SYS_TYPES_H \
-		CFLAGS="${CXXFLAGS}" \
-		--disable-gc-debug \
-		$(use_enable boehm-gc gc system) \
-		$(use_enable fftw) \
-		$(use_enable gsl) \
-		$(use_enable opengl gl) \
-		$(use_enable offscreen) \
-		$(use_enable sigsegv)
-}
-
-src_compile() {
-	default
-
-	cd doc || die
-	emake asy.1
-	if use doc; then
-		# info
-		einfo "Making info"
-		emake ${PN}.info
-		cd FAQ || die
-		emake
-		cd .. || die
-		# pdf
-		einfo "Making pdf docs"
-		export VARTEXFONTS="${T}"/fonts
-		# see bug #260606
-		emake -j1 asymptote.pdf
-		emake CAD.pdf
-	fi
-	cd .. || die
-
-	if use emacs; then
-		einfo "Compiling emacs lisp files"
-		elisp-compile base/*.el
-	fi
-}
-
-src_install() {
-	# the program
-	dobin asy
-
-	# .asy files
-	insinto /usr/share/${PN}
-	doins base/*.asy
-
-	# documentation
-	dodoc BUGS ChangeLog README ReleaseNotes TODO
-	doman doc/asy.1
-
-	# X GUI
-	if use X; then
-		python_scriptinto /usr/share/${PN}/GUI
-		python_doscript GUI/*.py
-		dosym /usr/share/${PN}/GUI/xasy.py /usr/bin/xasy
-		doman doc/xasy.1x
-	fi
-
-	# examples
-	if use examples; then
-		insinto /usr/share/${PN}/examples
-		doins \
-			examples/*.asy \
-			examples/*.eps \
-			doc/*.asy \
-			doc/*.csv \
-			doc/*.dat \
-			doc/extra/*.asy
-		use X && doins GUI/*.asy
-
-		insinto /usr/share/${PN}/examples/animations
-		doins examples/animations/*.asy
-	fi
-
-	# LaTeX style
-	if use latex; then
-		cd doc || die
-		insinto "${TEXMF}"/tex/latex/${PN}
-		doins ${PN}.sty asycolors.sty
-		if use examples; then
-			insinto /usr/share/${PN}/examples
-			doins latexusage.tex
-		fi
-		cd .. || die
-	fi
-
-	# asymptote.py
-	use python && python_domodule base/${PN}.py
-
-	# emacs mode
-	if use emacs; then
-		elisp-install ${PN} base/*.el base/*.elc
-		elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
-	fi
-
-	# vim syntax
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins base/asy.vim
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${FILESDIR}"/asy-ftd.vim
-	fi
-
-	# extra documentation
-	if use doc; then
-		cd doc || die
-		doinfo ${PN}.info*
-		cd FAQ || die
-		dodoc asy-faq.ascii
-		doinfo asy-faq.info
-		insinto /usr/share/doc/${PF}/html/FAQ
-		doins asy-faq.html/*
-		cd .. || die
-		insinto /usr/share/doc/${PF}
-		doins ${PN}.pdf CAD.pdf
-	fi
-}
-
-pkg_postinst() {
-	use latex && latex-package_rehash
-	use emacs && elisp-site-regen
-
-	elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer'
-	elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer'
-}
-
-pkg_postrm() {
-	use latex && latex-package_rehash
-	use emacs && elisp-site-regen
-}
diff --git a/media-gfx/asymptote/asymptote-2.41-r1.ebuild b/media-gfx/asymptote/asymptote-2.41-r1.ebuild
index 4dc9ef30750e..87c3bab47784 100644
--- a/media-gfx/asymptote/asymptote-2.41-r1.ebuild
+++ b/media-gfx/asymptote/asymptote-2.41-r1.ebuild
@@ -63,6 +63,9 @@ PATCHES=(
 
 	# Bug #322473
 	"${FILESDIR}/${P}-info.patch"
+
+	# Bug #635984 - perl-5.26 no longer has . in @INC
+	"${FILESDIR}/${P}-perl-5.26.patch"
 )
 
 pkg_setup() {
diff --git a/media-gfx/asymptote/files/asymptote-2.36-configure-ac.patch b/media-gfx/asymptote/files/asymptote-2.36-configure-ac.patch
deleted file mode 100644
index ea8bc4525d22..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.36-configure-ac.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: asymptote-2.36/configure.ac
-===================================================================
---- asymptote-2.36.orig/configure.ac
-+++ asymptote-2.36/configure.ac
-@@ -156,7 +156,7 @@ if test "x$ac_cv_use_gc" != "xno" ; then
-       fi
-       CPPFLAGS_SAVE=$CPPFLAGS
-       CPPFLAGS=$CPPFLAGS" $INCL"
--      AC_CHECK_HEADER(gc.h,
-+      AC_CHECK_HEADER([gc/gc.h],
- 	AC_CHECK_LIB([gc],[GC_malloc],[
- 	  LIBS=$LIBS"-lgc "
- 	  AC_MSG_NOTICE([enabling system $GCNAME])],[
-@@ -231,7 +231,17 @@ AC_MSG_ERROR([*** Please install libm on
- AC_CHECK_LIB([z], [deflate],,
- AC_MSG_ERROR([*** Please install libz or zlib-devel on your system ***]))
- AX_PTHREAD
--AC_CHECK_LIB([sigsegv], [stackoverflow_install_handler])
-+
-+AC_ARG_WITH(sigsegv,
-+           [  --with-sigsegv          use libsigsegv],
-+           [with_sigsegv=$withval],
-+           [with_sigsegv="no"])
-+if test "$with_sigsegv" = "yes"; then
-+AC_CHECK_HEADER([sigsegv.h],
-+   AC_CHECK_LIB([sigsegv], [stackoverflow_install_handler]),
-+   AC_MSG_NOTICE([*** Header file sigsegv.h not found ***]))
-+fi
-+
- AC_CHECK_LIB([rt], [sched_yield])
- 
- AC_ARG_ENABLE(readline,
diff --git a/media-gfx/asymptote/files/asymptote-2.36-info.patch b/media-gfx/asymptote/files/asymptote-2.36-info.patch
deleted file mode 100644
index 950732838e38..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.36-info.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: asymptote-2.36/doc/asymptote.texi
-===================================================================
---- asymptote-2.36.orig/doc/asymptote.texi
-+++ asymptote-2.36/doc/asymptote.texi
-@@ -21,7 +21,7 @@ file LICENSE in the top-level source dir
-      
- @dircategory Languages
- @direntry
--* asymptote: (asymptote/asymptote). Vector graphics language.
-+* asymptote: (asymptote). Vector graphics language.
- @end direntry
- 
- @titlepage
diff --git a/media-gfx/asymptote/files/asymptote-2.36-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.36-xdg-utils.patch
deleted file mode 100644
index 4763a52084e5..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.36-xdg-utils.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: asymptote-2.36/settings.cc
-===================================================================
---- asymptote-2.36.orig/settings.cc
-+++ asymptote-2.36/settings.cc
-@@ -90,15 +90,15 @@ bool msdos=false;
- string HOME="HOME";
- string docdir=ASYMPTOTE_DOCDIR;
- const char pathSeparator=':';
--string defaultPSViewer="gv";
-+string defaultPSViewer="xdg-open";
- #ifdef __APPLE__
- string defaultPDFViewer="open";
- #else  
--string defaultPDFViewer="acroread";
-+string defaultPDFViewer="xdg-open";
- #endif  
- string defaultGhostscript="gs";
- string defaultGhostscriptLibrary="/usr/lib/libgs.so";
--string defaultDisplay="display";
-+string defaultDisplay="xdg-open";
- string defaultAnimate="animate";
- void queryRegistry() {}
- const string dirsep="/";
diff --git a/media-gfx/asymptote/files/asymptote-2.38-configure-ac.patch b/media-gfx/asymptote/files/asymptote-2.38-configure-ac.patch
deleted file mode 100644
index 3acff863dad9..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.38-configure-ac.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: asymptote-2.38/configure.ac
-===================================================================
---- asymptote-2.38.orig/configure.ac
-+++ asymptote-2.38/configure.ac
-@@ -156,7 +156,7 @@ if test "x$ac_cv_use_gc" != "xno" ; then
-       fi
-       CPPFLAGS_SAVE=$CPPFLAGS
-       CPPFLAGS=$CPPFLAGS" $INCL"
--      AC_CHECK_HEADER(gc.h,
-+      AC_CHECK_HEADER([gc/gc.h],
- 	AC_CHECK_LIB([gc],[GC_malloc],[
- 	  LIBS=$LIBS"-lgc "
- 	  AC_MSG_NOTICE([enabling system $GCNAME])],[
diff --git a/media-gfx/asymptote/files/asymptote-2.38-info.patch b/media-gfx/asymptote/files/asymptote-2.38-info.patch
deleted file mode 100644
index 7005f152518f..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.38-info.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: asymptote-2.38/doc/asymptote.texi
-===================================================================
---- asymptote-2.38.orig/doc/asymptote.texi
-+++ asymptote-2.38/doc/asymptote.texi
-@@ -21,7 +21,7 @@ file LICENSE in the top-level source dir
-      
- @dircategory Languages
- @direntry
--* asymptote: (asymptote/asymptote). Vector graphics language.
-+* asymptote: (asymptote). Vector graphics language.
- @end direntry
- 
- @titlepage
diff --git a/media-gfx/asymptote/files/asymptote-2.38-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.38-xdg-utils.patch
deleted file mode 100644
index 044244e4008a..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.38-xdg-utils.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: asymptote-2.38/settings.cc
-===================================================================
---- asymptote-2.38.orig/settings.cc
-+++ asymptote-2.38/settings.cc
-@@ -91,15 +91,15 @@ bool msdos=false;
- string HOME="HOME";
- string docdir=ASYMPTOTE_DOCDIR;
- const char pathSeparator=':';
--string defaultPSViewer="gv";
-+string defaultPSViewer="xdg-open";
- #ifdef __APPLE__
- string defaultPDFViewer="open";
- #else  
--string defaultPDFViewer="acroread";
-+string defaultPDFViewer="xdg-open";
- #endif  
- string defaultGhostscript="gs";
- string defaultGhostscriptLibrary="/usr/lib/libgs.so";
--string defaultDisplay="display";
-+string defaultDisplay="xdg-open";
- string defaultAnimate="animate";
- void queryRegistry() {}
- const string dirsep="/";
diff --git a/media-gfx/asymptote/files/asymptote-2.41-perl-5.26.patch b/media-gfx/asymptote/files/asymptote-2.41-perl-5.26.patch
new file mode 100644
index 000000000000..54499b74e6cb
--- /dev/null
+++ b/media-gfx/asymptote/files/asymptote-2.41-perl-5.26.patch
@@ -0,0 +1,10 @@
+diff -r -U2 asymptote-2.41.orig/doc/FAQ/bfnnconv.pl asymptote-2.41/doc/FAQ/bfnnconv.pl
+--- asymptote-2.41.orig/doc/FAQ/bfnnconv.pl	2017-03-22 14:56:46.000000000 +0700
++++ asymptote-2.41/doc/FAQ/bfnnconv.pl	2017-10-31 23:44:05.511045390 +0700
+@@ -62,5 +62,5 @@
+ open(U,">$prefix.xrefdb-new");
+ 
+-for $x (@outputs) { require("m-$x.pl"); }
++for $x (@outputs) { require("./m-$x.pl"); }
+ 
+ &call('init');
diff --git a/media-gfx/displaycal/Manifest b/media-gfx/displaycal/Manifest
index d41bd726bc50..d89c41acdb2b 100644
--- a/media-gfx/displaycal/Manifest
+++ b/media-gfx/displaycal/Manifest
@@ -1,6 +1,8 @@
 DIST DisplayCAL-3.3.3.0.tar.gz 9887918 SHA256 47bcd09a44d43eb550fcd6f486d3f37c204a17b74fd9517991707856f54ca178 SHA512 2f9ac1ac2ce24629695f70078625ac4dc6e1346a675cd55658efc3631a6a37546cf6dc7b2747ae77b3681e7f7c816527497f53564e6cb51ce71a132d93955534 WHIRLPOOL 9b68dad41092d29fc7c15b34cfe3b1b034d7100eb8eeabbc1d9b1214c7670dc423fd9767830c2cf2ef007d2cc14238a0d608658206c76b0db59408d08daf863c
 DIST DisplayCAL-3.3.4.1.tar.gz 9909570 SHA256 0f4b15ef1b9bbc4ef5107651149373bb7c3dd76c524d55f9143b717e0fb0ad53 SHA512 c596333e298aea9366c808c074e467a49e32fa00b0534ae8ce6ad89d0250cf1f2a013dac0d87444edb911bcdea053a462026e335cfc2aa507a932217f1dcd272 WHIRLPOOL 0d74647f8876d6d97ccc9c969fd8a21264135f83b3db838702dd6545851670b89c48ed206ab247d885d3e80abe75378268be5a3b6c9db0981efab98a44f24fb0
+DIST DisplayCAL-3.3.5.0.tar.gz 9913672 SHA256 17045d971fc17ab75736a9d1e24afbbae3f062b4809e86c625e92884a0dc8fab SHA512 7a24cbc540771fd26b504536ee0c1b9c34f013c19b5b2a4e1ce38015014e9b34e67b48a1f08bf96581cef2968883691206ddb6cefa9ac70d76251a305a5b1c37 WHIRLPOOL 1ceb7608d660cbb1f883c8853ef1f8be5a8fd7cb110abc9e49906ff5015ec92bf323ea43f6575eb084c610be202b3c6e40293546c711ed03c4972ff1b1705850
 EBUILD displaycal-3.3.3.0.ebuild 1415 SHA256 bd2851aeb778402ef7ccad422c133df8c03f1b4b3d90c2eb39ebaec2146b8765 SHA512 c4f94565c12a623dfd1d7e7854655ddc9a1d09a7545fdf89aaa7fca713ece4a4647d0dc996269edbc22f658a850428d277d283c5dfb17d2491a30ced932b21c2 WHIRLPOOL 2fdbff04d74f813851d1863fd8870dac1dc871fc358ec325faffe7868d3945f32fd25ce135e443a9e41775f3d426a05ce4eb9c4bf95a510008ad75fa095bc786
 EBUILD displaycal-3.3.4.1.ebuild 1415 SHA256 bd2851aeb778402ef7ccad422c133df8c03f1b4b3d90c2eb39ebaec2146b8765 SHA512 c4f94565c12a623dfd1d7e7854655ddc9a1d09a7545fdf89aaa7fca713ece4a4647d0dc996269edbc22f658a850428d277d283c5dfb17d2491a30ced932b21c2 WHIRLPOOL 2fdbff04d74f813851d1863fd8870dac1dc871fc358ec325faffe7868d3945f32fd25ce135e443a9e41775f3d426a05ce4eb9c4bf95a510008ad75fa095bc786
+EBUILD displaycal-3.3.5.0.ebuild 1518 SHA256 9f1d1be636e04249a0ce7465aa2e7bbdbabbffe3dbaf59a78dd508ad91af2b18 SHA512 19671a35a80cbfb99d7f5fc2a36884990e791fc02b563efe00131b776320cac1e3c4307877152e07f972ba8aabde879ea3d7d6a4d498560f4cb96c7640459f58 WHIRLPOOL eef1b77faf532a7b2e318340604efa0fef1d5910a2ccc479af3788d34e654c22e20394ab06f14e0bf14888dc2c274e79f54ba2174aea624c1ff55c00dd552bd4
 MISC ChangeLog 1647 SHA256 a6c9f60a92412cdf15a3bd1e29033908cf93ba894422f4659a94b2922e7c15a9 SHA512 27519e3645e183b2ce4fa325742daac27b444f58092b55063c02f74e44835b877b5233db6e99fa29ca1342b0f34f2a18dddf493c860fc82e57e9bf24b38effcd WHIRLPOOL 2d544d696d759d436e5f7eee698d0cbeb86cf0fa1e5ef078718a5b56e6cf915a8aca6b954091034810d1e1d28b723193f812d6be89a49ccd2e85576ec75f9846
 MISC metadata.xml 342 SHA256 9cc5c72fe3654885e3c3716d157597605ed9026ff9cbb70c83e35ad87ce36427 SHA512 f9d5979fc8525c40af8d4e64afb8264873b0ae7cda1e9c4f3b3f30957c2a4f7fcbab76002783213a896395e8b5ef78e315441c28872589a91a0035d5f346d317 WHIRLPOOL 1bbd38a6ec1b494b739daace5e21e557e6ac0b5299585e37805728280042c22c92b9b30d6723ead6d3c1f4d5c59e9cb6821f54cf63877ac87a2961647ecd9ce0
diff --git a/media-gfx/displaycal/displaycal-3.3.5.0.ebuild b/media-gfx/displaycal/displaycal-3.3.5.0.ebuild
new file mode 100644
index 000000000000..a78347da3cc0
--- /dev/null
+++ b/media-gfx/displaycal/displaycal-3.3.5.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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
+	>=x11-libs/libX11-1.3.3
+	>=x11-apps/xrandr-1.3.2
+	>=x11-libs/libXxf86vm-1.1.0
+	>=x11-proto/xineramaproto-1.2
+	>=x11-libs/libXinerama-1.1
+"
+RDEPEND="${DEPEND}
+	>=dev-python/numpy-1.2.1
+"
+
+# 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() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-gfx/freepv/Manifest b/media-gfx/freepv/Manifest
index 0d4e3d9acddd..f46d79c4edbe 100644
--- a/media-gfx/freepv/Manifest
+++ b/media-gfx/freepv/Manifest
@@ -6,7 +6,7 @@ AUX freepv-0.3.0-stringh.patch 273 SHA256 de462bebc3460011b4f30af986f417b2836a3c
 AUX freepv-0.3.0-unsigned_short.patch 1787 SHA256 59f8ca984d1f184577b265870f5424f28f49f19582ca57ab56d3d18e981d2dec SHA512 aba4a7b0d882ebce73b5ec823e8a51cec2788efdc4d9000c9d48a3c07a77e88dbee1e24ffdb1a57b2a4ae45b9310b25cf0157c15d73f8fffdf0a2582e8b88078 WHIRLPOOL bb73a0a0c6087b2079cc44981959d0ed0628dcae53cd2adc60d4ca9bd95fbae25aa923c806ec936dd5f43cc69a65e1e188152781b9cd12356e38407cfb113f75
 DIST freepv-0.3.0.tar.gz 175545 SHA256 a66c58616cbe814b2e23c6fe109c3de906dad83a8faa32ea219c182bf15229f0 SHA512 0b207dc25c51b19fd76637743adb8e395c6098d03611612086d66d3f1aa6e4d0c5700aa0e23210082d6aa7495f19d1c3d8f0f93ad11a5236df86d709d5f71a7d WHIRLPOOL 993378bb9ef25e1a1064f9402c4608d0a54588f035f23fc67024b857705ff978a403f86e5140e9ed88b83a6d9ae7a74aa86bf9c0239eb07348904d1eeb9ef749
 EBUILD freepv-0.3.0-r4.ebuild 979 SHA256 e2141c5b9ebc1d8a8cbfd55d6ef71d1f169bf11ea114729fc52146a071afca27 SHA512 7e5243b3abfbcbfbe8a766f581950439e9609bf3ecb899f951df21851acdde5ee955388d89ff9a0ef18e748c30a3d12d41f214d37a01d7955d652837cd4e4f3a WHIRLPOOL 7a1468bf212586dc33d57e9c8aae5384b52730349f34e3b2dc6c4e9cddc29f44adbee0a2408ec8b6e326ccbc7352b4bfaeaf6bfc1f5612434f8d825d05eda840
-EBUILD freepv-0.3.0-r5.ebuild 962 SHA256 b04eed14c1b0fa7a7e39fbf76038806202576516553e4b33d23f04a12e596584 SHA512 d8334c3e781236335389924050f71d35a91bded5a3e7d14d869ab5f122974ab56a138b9be1086e4b0d577627b73aece6698f5ad9b41263fd43db24c899940a57 WHIRLPOOL 369dc7bf6da8c11cc6e1cc39ad3242480d95039f5fb0162c04e6fe0cc50187eb3dee1aa9051c7cf5fcc202058748f37e29e2ede0f88f98c2d1342af521092653
+EBUILD freepv-0.3.0-r5.ebuild 961 SHA256 6c92a80a2671c706407ab0b44675235fef83b17d67636ff090b6835314042b4a SHA512 addee76fa921a9611e234167db4328429d71c3166dbe36c030bd37825a933a9c01e6b2179ef2f0b5c1343b3ebf5f2254b2920a365d1f7f6c2e55f6be0c822d2c WHIRLPOOL 15ae81e7b5cebe42a6090fc4de3473c71fda93938d571dae467b2e609d6d2f3e4bd5eccd0cbae1624657eb1d9118fb35f1931d55ede1a194de1150196c72a1d0
 MISC ChangeLog 2357 SHA256 6c66dcbb837604ebe9e7cd8c2c6d048b459c47c61a11826db44d882c40b3e6a3 SHA512 2418782b8d38aef14f120f4b3b256b3fc10eb8c0cf7a58b3afd584a20df92c67e4863cb0c2389598bffaa43766ba7c6ca723b992d2c16d3c9ab690770b09f815 WHIRLPOOL e2cbcbcd185dacaacfd2e91c97e73cb2149d36dd912501312267f8572ad866804dd0b77d79cc5dbca4571d204b66f455f8cb4c677cc91f0f326a93c4dbf4068e
 MISC ChangeLog-2015 3391 SHA256 9452c6aa5b8c5b16013d7c5d943900ee5ae9857bd1db94e7277c0dadd5220a9a SHA512 2e656dbcd16f1c33c2bf336f7bce9bf157316c5ad6638a3d5ff524addc0d40b53dc77ea490681861db0451cf19afffba631782cea5d837f31da43a05ae4f519d WHIRLPOOL dd1ed03ee3402e1879fafadbb105bef47ccc08c1d6d5f9a2a88af77221a958e9e6c2c18d81d289d0397a32c2416fb9f7854c308d86e66f0499aa6c401164b305
 MISC metadata.xml 474 SHA256 8892cb002be9ecac033d26cb60b86ceba7d2011b79b541e4cc45229a17ca02cf SHA512 4466402d68177a660716acf3afdb8ddc2074e8ac7ad35f2ad6b31adc9fe938b39cc999dc082fa07f8787be8798a053a6248dac12091a22d32d9fb83a1022b421 WHIRLPOOL d6c4055abefdfc503c1c51319626b573fc5e4ed2924956c5d8ef976958e78bcbb0dea4a42caa8fad2e0d429075e3788e267d18cb47d118e5897738474b68c065
diff --git a/media-gfx/freepv/freepv-0.3.0-r5.ebuild b/media-gfx/freepv/freepv-0.3.0-r5.ebuild
index 567774b174ee..6188c0ed162f 100644
--- a/media-gfx/freepv/freepv-0.3.0-r5.ebuild
+++ b/media-gfx/freepv/freepv-0.3.0-r5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/freepv/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-libs/libxml2
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index 617dbffdcfba..a9f60e652ca0 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -1,7 +1,7 @@
 DIST gphoto2-2.5.11.tar.bz2 785251 SHA256 392844d6a06512b0d85e7983a5a0c85c8039feb6ab3bc420674ffdbf7536f9e9 SHA512 e1393797eaf94f4d6226fdbc390145c7a0caa5ed3422ab34185b27666887cd79bf832f7ff3a580aa5ea8740b429b235079e54f40a1bc92e37e0051cfeea5fa9a WHIRLPOOL d9a5b48ea230fcdbe7bdeba2337d6276d78bb8c8c83fe06a5a5272a8339bb2462c035bd943f021ff30029fcbf93b74811f2a55198f832cdf06bd417bf5279c61
 DIST gphoto2-2.5.14.tar.bz2 784442 SHA256 9302d02fb472d4936988382b7277ccdc4edaf7ede56c490278912ffd0627699c SHA512 47cb0d212673c9c0dbc996e0a67191a307599c844293a67184bd1529d9e3b417e154c6de64f4563f6f7e599a1bd6b127266f85f5baa97bd7d86922405bf45331 WHIRLPOOL 333bc0925b36ff5254a5e1d740536129ed08bdbfde7c57ba337aec7fe8cd2dcf8720ab6e1b13dc469b86cd10918926daa65f378e12cf0f29ebe2ff71a5cf62d4
 EBUILD gphoto2-2.5.11.ebuild 1393 SHA256 7b34c6f5dc94184f5e135fe78cd8f31e9cf673d34da511343fecf9ca010effea SHA512 c467516e247d1c0b6579ea1b5e0b6e706883a52ffc8848ee6a5d8533d69387d675362621b47a45c5b2fc1f4681aa9793d6dd2e1421da7e04f1a8895163bc397a WHIRLPOOL f64749e0a108cbda6cb2dd12d9ae8b15500a3a04c1ccbb446c48fb57221f76faf5aa480e2682a2c86791e9c6b6d87dd5b3f8c0d79d241ff4cfa7df93210f75eb
-EBUILD gphoto2-2.5.14.ebuild 1394 SHA256 6ab0f48523a5c5dcdd8b170fe6579a463425a19b8054f5e690caeaa64016b99b SHA512 784091f949aaa895bcc0a4b04f8b9ccb7c7953adce5c512ed9019b72fc321e2951f426fb413cefeddcd572fcf853e9c19173b864aaaeb870341617b85d1970ab WHIRLPOOL c91431f176da9f4635084ca67c85c37fd947d0caddc135e9cba234e674b571e486f68e5ec05d0ed53b12a0942481379b06fe9b71f3a03a63254bbf23d2eeb250
+EBUILD gphoto2-2.5.14.ebuild 1393 SHA256 7b34c6f5dc94184f5e135fe78cd8f31e9cf673d34da511343fecf9ca010effea SHA512 c467516e247d1c0b6579ea1b5e0b6e706883a52ffc8848ee6a5d8533d69387d675362621b47a45c5b2fc1f4681aa9793d6dd2e1421da7e04f1a8895163bc397a WHIRLPOOL f64749e0a108cbda6cb2dd12d9ae8b15500a3a04c1ccbb446c48fb57221f76faf5aa480e2682a2c86791e9c6b6d87dd5b3f8c0d79d241ff4cfa7df93210f75eb
 MISC ChangeLog 6553 SHA256 f8ecc7ea4f29c4d7685825c7202177b3f921a5d1aaa3d3b651939d50ddc147ee SHA512 76d83584319485d19314f6432533aeb8adc43a99c8f34151a21ddad065f17286eebfba52a0d1c515dc60dc2b85fe434a1b0c5276529a150830152f63d7975d8d WHIRLPOOL 49228705dce8fa812215b238c99811f41dc91a771b4d3c410cdafa0027179b7b2a5a580c7d05c24895fd894f70735240d4c233aef8cb540797a4b27484cd20dc
 MISC ChangeLog-2015 21574 SHA256 08159f5e47c8d762386fda5cfd18b4317a6598d1e4d7ae4489e8afea5ebe1436 SHA512 ff3248b17169cb0c25ab4da00cd589797609a2b73cb65f6930acd42efd91e3244571655209f7fd524984f5fe6bc01c9da699eb2e47e8496b7b57f36e79614692 WHIRLPOOL 5f8936414452b2308b2c108ac4f1d8ffb76bcc01020f96ae788117ba96324227e55176308de07880ec17771b7571de501050030e8ed5fa37f97be42ae494803c
 MISC metadata.xml 449 SHA256 9e3d5c2509e7e36290a192a72f04825f111c9cceaf386756aa544c5094226e1a SHA512 f938819a203e0119b1d81aa1dc812717d6ef02c3012f8ed667db452c7712bb7b142cee36d519ec33f4cf65ebcba7a660e2f67f6b66087ec6be832a4987e10c53 WHIRLPOOL d61f1a2cafc04238d88764b8a3202744de7536cd6b29232a96547920bf852220961ff0436757ab4087fbae05d5efea22703a0282d5585043df1d1d1f232a0b84
diff --git a/media-gfx/gphoto2/gphoto2-2.5.14.ebuild b/media-gfx/gphoto2/gphoto2-2.5.14.ebuild
index 543181c28e42..8cc221391d98 100644
--- a/media-gfx/gphoto2/gphoto2-2.5.14.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.5.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 hppa ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 hppa ppc ppc64 ~sparc x86"
 IUSE="aalib exif ncurses nls readline"
 
 # aalib -> needs libjpeg
diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest
index 683b339533be..7dd5d49af690 100644
--- a/media-gfx/gscan2pdf/Manifest
+++ b/media-gfx/gscan2pdf/Manifest
@@ -1,5 +1,7 @@
 DIST gscan2pdf-1.8.6.tar.xz 402532 SHA256 0674d9f1decc84b0abfa7849a66d0d50fc508cef2b901a3806addb017c4e4645 SHA512 3d33d0666e452b313a8dca91734188ab268e2fae9f0e259cd2142661a61697302bba5d602ee7395c1ffd7c87e0c52b422f9201a2b70f5211246aed359ff4092c WHIRLPOOL 59ed68feaff638f24add40f1c931ca3bfe476e26edf9c40ce0fd22c21b7a0aa43711c205362506fae0a4b5c4bbab95edfc0c35f9c56e4f70c3c7d3ea80d231a9
 DIST gscan2pdf-1.8.7.tar.xz 403676 SHA256 91ac65d3a331109bcb4995e3a379991cb50815dab7f8e3fe68e055bbc271f78a SHA512 990338c9dd9bdd5685a40792803b3077e27296c5a3363471e55d3297a815e1c344bc94e3430981764531fb02380d7d7b1c253dda5e9e65e86e632ae8371ca72d WHIRLPOOL 2a1eb67942efb7ad703560a228d3a0cfe09081e30b688c68d2a7621a5ccfce73ae7711db1d6b02b9b57462ed0d94c7ff2a16da8ebd7a25beac08098077346768
+DIST gscan2pdf-1.8.8.tar.xz 404456 SHA256 2adcbfce4bcfaacb7b73b7c8b5ea3ca3a0257fbab717a589328439a04621c6a7 SHA512 331821c0f9d7365866b7ba6bdbcd29d03b69516e44f95d186296a9a105887924c747fd1c89740bd708f04d5d67a65481b972d57fef09d8bee16dfe1b2655b9e3 WHIRLPOOL 1f6141c347147ad5e8710d2aa4dfd6f9c67f1daefb724c5045a62a24118546f1405a1e01b0d06bf72744256ec7f5c7f6dc1d0b28d0787f7fe11a2659162ae78c
 EBUILD gscan2pdf-1.8.6.ebuild 1670 SHA256 03dbd33510b056ac48912da6cb3f18c75b5c730479b692c95b9bd707d262dc65 SHA512 a67f54ab33bfc53571e4a87be08e9a561c731360fed7737baf13ec2696ad3b4a15b149e9be165742dc25b2829995f7e36bc0cdce58fdfba0e590f45a89779ceb WHIRLPOOL 16dab5a48dce34088b7230d27a447050a3eb6b1eb0cec789106efebf29e85ed8ef2641bde02a8efb48ba9eb9a6e4899e9f9a980043b26b0c4863e0890525f9e4
 EBUILD gscan2pdf-1.8.7.ebuild 1733 SHA256 4dd0e4ba6d019e7e1a320ff90aa717a94dc30fb14f4bf62e86063f88d81374cc SHA512 046288f89b95875f7acb9150a6f9099ad25d17e4dfd68cbaaeb5c147352fcee2ebe306bbf58e3dba3873eb2ace0d62eef97c445b75efd4abef469d29d49d742d WHIRLPOOL 5df92c7c6507cd8d1f493ac23f9b773a7c698bb74bb3baa09c9b9525f34dc91b21089a3a5d86ffdc373aec68a31d676a838a6750b7a32087f8cdb72a18a941b6
+EBUILD gscan2pdf-1.8.8.ebuild 1733 SHA256 4dd0e4ba6d019e7e1a320ff90aa717a94dc30fb14f4bf62e86063f88d81374cc SHA512 046288f89b95875f7acb9150a6f9099ad25d17e4dfd68cbaaeb5c147352fcee2ebe306bbf58e3dba3873eb2ace0d62eef97c445b75efd4abef469d29d49d742d WHIRLPOOL 5df92c7c6507cd8d1f493ac23f9b773a7c698bb74bb3baa09c9b9525f34dc91b21089a3a5d86ffdc373aec68a31d676a838a6750b7a32087f8cdb72a18a941b6
 MISC metadata.xml 439 SHA256 fe0ce730516bb9a9d15b43abd2b150e5a37a55dd46fa74b16779cc7dd86c2e27 SHA512 af1cc05ac693899586df81036d2fa11af187edbb3c9449862298ba05efd0dbd0c4c5b008a1a21328c1f9a27a690671bd7a9967d2e457efb31561044e45984401 WHIRLPOOL 622d34572b44041a0763005814401166ac60342e4173987249dd5da9a442a7b0ca36713e59317821097066ee4e78921bfde26af33a4097c42396721bef62ff3a
diff --git a/media-gfx/gscan2pdf/gscan2pdf-1.8.8.ebuild b/media-gfx/gscan2pdf/gscan2pdf-1.8.8.ebuild
new file mode 100644
index 000000000000..00f29f30d45d
--- /dev/null
+++ b/media-gfx/gscan2pdf/gscan2pdf-1.8.8.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils perl-module
+
+DESCRIPTION="Scan documents, perform OCR, produce PDFs and DjVus"
+HOMEPAGE="http://gscan2pdf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# OCR tests fail with tesseract[opencl], not fixed by addpredict
+# and others on Wayland and the console
+RESTRICT="test"
+
+RDEPEND="
+	dev-perl/Config-General
+	dev-perl/Date-Calc
+	dev-perl/Data-UUID
+	dev-perl/Filesys-Df
+	dev-perl/glib-perl
+	dev-perl/Goo-Canvas
+	dev-perl/Gtk2-Ex-PodViewer
+	dev-perl/Gtk2-Ex-Simple-List
+	dev-perl/Gtk2-ImageView
+	dev-perl/Gtk2
+	dev-perl/HTML-Parser
+	dev-perl/Image-Sane
+	dev-perl/Locale-gettext
+	dev-perl/List-MoreUtils
+	dev-perl/Log-Log4perl
+	dev-perl/PDF-API2
+	dev-perl/Proc-ProcessTable
+	dev-perl/Readonly
+	dev-perl/Set-IntSpan
+	dev-perl/Try-Tiny
+	virtual/perl-Archive-Tar
+	virtual/perl-Carp
+	virtual/perl-Data-Dumper
+	virtual/perl-File-Temp
+	virtual/perl-Getopt-Long
+	virtual/perl-threads
+	virtual/perl-threads-shared
+	media-gfx/gtkimageview
+	media-gfx/imagemagick[png,tiff,perl]
+	media-gfx/sane-backends
+	media-libs/tiff"
+
+mydoc="History"
+
+pkg_postinst() {
+	optfeature "DjVu file support" "app-text/djvu[tiff] media-gfx/imagemagick[djvu]"
+	optfeature "creating PostScript files from PDFs" app-text/poppler[utils]
+	optfeature "adding to an existing PDF" app-text/poppler[utils]
+	optfeature "Optical Character Recognition" app-text/tesseract[osd,tiff]
+	optfeature "scan post-processing" app-text/unpaper
+	optfeature "automatic document feeder support" media-gfx/sane-frontends
+	optfeature "sending PDFs as email attachments" x11-misc/xdg-utils
+}
diff --git a/media-gfx/icoutils/Manifest b/media-gfx/icoutils/Manifest
index 9db3dcd5a5cd..3a92eee0b06a 100644
--- a/media-gfx/icoutils/Manifest
+++ b/media-gfx/icoutils/Manifest
@@ -7,7 +7,7 @@ DIST icoutils-0.32.0.tar.bz2 593699 SHA256 17234d6e922f5dcd2dc8351a4b3535a2f348b
 EBUILD icoutils-0.31.0.ebuild 985 SHA256 9ac55e0707db7dc81de616d82884017ae6dbd052a06fa335be8d2fb0b8caa9e2 SHA512 917a7ad7167a16b4c661d0849d7dc443c409d1e0909e2c48cbcbb11d9a3aa8ed150da4ff47969f2f51268d83efc73518e17856ea8a39cf11000f8d6ca3b9923f WHIRLPOOL b05414c6de045088374ba9dffdc185b75611258022f1993e215a411c9bf19124316f5f02bd53eb703fedd51db9801fca56112ae30b7f3a2653081f4c05e4e73c
 EBUILD icoutils-0.31.1.ebuild 988 SHA256 4aa408e2a5f0e354d37d2bbfe1c09cb0576b1409a51b55089b21718e6cb022c5 SHA512 45be7bd50364f423c1cedefebf6e80afd854899f7f85084c0819ed9d3d7103c48c93243d9e80ae60992c80d6d428cc3da28120107f249b0b7152dd09120de326 WHIRLPOOL 0611443f25d876a47f8a6ad40b48461ff52e1cba51b5448def5f04366e2cca56ddfe5fabbe358c462a7010287612d6cd7edadb7fbeeef5ebe4d0b9a372f36e2f
 EBUILD icoutils-0.31.3.ebuild 1019 SHA256 1c1ac361c9ca3cebad4228447b15a3afdc6a562c094419fa0dc8248c8a111ad9 SHA512 0cd637de98d94afca95ed61ccf7bdb1ef331cc19eef08c7c13a568013a5cb3aa90b3c15c8c399b4ced503cf6d82b2a6b4bc41f55bf46caf3c69b501ae32b4bc7 WHIRLPOOL 2d780fe994f11b002c7b429dd7e5271cce9e56a5d5fc2827cc15e2ded4967884f5edf690b70d0220aad67aa3fa357cf33b9a033a69bff4de4ed858f53e753320
-EBUILD icoutils-0.32.0.ebuild 1025 SHA256 8dc0a7f3cca43fb97fc59d8c5c257743d121bd96b7482e5f1392a7b069608f04 SHA512 5f4c2cd6c800edfc8601f4de3dd0494fa6bac397ce3be888c6d3dcd00073c4253acb54c62e1c758b880823d9f0a1dc267f1285872d53f2b902e78be9c588791e WHIRLPOOL 625ef6df9099d167c675d8596d444e943815d04d068a1fe2602d74892c46545bc56bf1f91fb0be3aee5953edae4911ac6e83c501954521a70088a1b48cd047f5
+EBUILD icoutils-0.32.0.ebuild 1024 SHA256 b0bccf081044322923ec604bf081c422fe42266516cd570fa7c7d1e4b6e6deba SHA512 99469f7108512c79bfca35e91575fbc696748a59da6e67a5e165b5ce591766fd896148c9623b20543e240b98fced84fbd212b68d87e13af990a84fbffb4b83b5 WHIRLPOOL 3db8c27917fd9d35c9496d54b344ace579217dfa70d8d09926c13f878dd1e966928c29a54665aa2b8148a3d2bfd56a38e45526cb92496e1558da5cac74f68b4f
 MISC ChangeLog 2510 SHA256 16bb342dc64591f7a55a8eccb53a4437aa5de0c0d54683639d5f619f65b40b1c SHA512 3a3eb3226ac14a51798e9d5eccba44b0e008158487423fd6d0b4ac2a07ca2972d6a1700c8cb9a2f3952e7f789222ae8e7399e20fd97ebb421e06ca776ec36648 WHIRLPOOL b213562329abab32308e7ff7f3b621b30c09547095128af9da2bbe6e29d5729c3dc2ae7caafb2d0a1efb10bd86651de4b6e3e834a636e25574a77ae5f1132be5
 MISC ChangeLog-2015 4903 SHA256 b54828e070b7eac9017d1ec4e59e82ac0bb4d05c4b0357d48e72e9ac3ef958e2 SHA512 106efa193f846b6a13e0e7f7756998843cbba042c7c8b957e49c1b496360a74bcd517dc31a2088feebdf707adb6bce3591eb70433965aff89f0eeb065d322383 WHIRLPOOL 55ff0ac9c4a5ad4921d90ff0ce1c42a47c7a3ad110d05a91089e42f32101043f71651df828e95c0c08294849708bd0f1187c2cdf346fdc0bca583e2fe3a4d95c
 MISC metadata.xml 243 SHA256 cd3f53e40471c5030fe79b91a8d0dab307792eddd4b2d5e9ba9b6fb2425060b4 SHA512 3b619672a798fcaa808248ae187a6e6253bf1f693d2d9808ffb5b60d4d909130299512b623f7c9dbe6971ad15af7dbb6dd51e4b80f512abe0966dc46861fb775 WHIRLPOOL 0b98ded4f5352f03b68d62d5ed07b1f1b4fa09a6c4a39952fd28d589aad820b458a95ded468af6e3134bc10d4fe45d6acc46254ac3f9c8a891aa341d9810340f
diff --git a/media-gfx/icoutils/icoutils-0.32.0.ebuild b/media-gfx/icoutils/icoutils-0.32.0.ebuild
index e8bb27ce8147..da60b9007674 100644
--- a/media-gfx/icoutils/icoutils-0.32.0.ebuild
+++ b/media-gfx/icoutils/icoutils-0.32.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="nls"
 
 RDEPEND="
diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index 3a83e6ef59fc..63fd3cf4d9b2 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -6,7 +6,7 @@ DIST librecad-2.1.3.zip 26086377 SHA256 f05af030c71192109c1472c6fd24696fcb564b2e
 EBUILD librecad-2.0.3.ebuild 787 SHA256 a087564ddc87dfbba192a6dc0ba64c82377b2f1297e99b6b96426c529c7150c5 SHA512 5d34f9e791018f75a990d378f41c077458411d96ed40729a1b34afe527849e7fc3d245a02941dc95ce1582e3ffb935aec50efc926b57b98d3e5f48e7378b7325 WHIRLPOOL b6126b602a1b4cc6ff70716f6c9f55a2abd47bd8ded819c0d972067ee3a8ed2fe5cf866f870f3e7cccb273c03d35887585ed16a4208dc667beebec87c0e34d01
 EBUILD librecad-2.0.9-r1.ebuild 1374 SHA256 1600c97892b529ba6351b100a154900f48decb9760b2d0a69b497ac72b7e0b7c SHA512 c41f56a05b3f98f10947ec5c648796ad138fd9ae013e7b64045cc3a66ac74e075c962c02cbef5ee5e40f1597927a903fd5a177ebb3c84cd74efd7e4a8e97c2c5 WHIRLPOOL 1804543552d695fc241ecc801ace60ecbceae14949bda17d3acc8acc121fa3faffb085536921b5ef0e6eb2a10f8f3e53c2660b81dfcfdd79c46dcd9ebe92ad7e
 EBUILD librecad-2.1.1.ebuild 1418 SHA256 9429b50129a99a5e3dfa3cb260b6a6ae18506d93ae394297b3c191932efa2f33 SHA512 2080a1913324c030b6f7f3a2e21c96b894ec72ca335dc04c5594061d0a06637e9b40e7fae20920832012a5317baca4987971fe4e7cc86dea6c9cd40e4e2d9ded WHIRLPOOL 9427494ed2a759213afe6cdd7f9292b05832e86a7d724c43e71d13d42c670b65e4945edbaeb585cdcd245a2eeb39802099d07963d07f88acf2e5d5b84e1f7a79
-EBUILD librecad-2.1.3.ebuild 1419 SHA256 289e541c7af243e2a43177e7389707e789aa4a29fe575e3bbbd81b78eef611cf SHA512 6688a703ae6c0fdfeeb86bc1e3a8eb5b3a029542801d9632072409547e6932420ffb8f847b0b493379bd27449e0a3338f7fc9fb8c5ec719a4032a36b9b69c2d2 WHIRLPOOL 84988028ebe4a6e31e845efe4f430cd1027980c8cc618e65fee39ef60d2f09650616f95a032038799c75889bc90406746be12adf81d7dfb9cafcab82b59ad22e
+EBUILD librecad-2.1.3.ebuild 1418 SHA256 28d78c437d1f4c8447c010ed820a65483ee4507b180412a5aa53e98cc91e06e7 SHA512 1eb83f082dd3f88f65106633acca6dfb978c59fa0a7cb50e9353d6d92c737c33015c506de8c4896143b8177bc68dd8ca78cca0ef6fbc5e10aa85afbb8572730a WHIRLPOOL 43e54d3f75f913c3a1d8e3d3dbe2fe94ae43dc75a0d3a507efad37591bb2ed9e65bc449dda7df03112ba66f987cf2b05e1da269bec9e821589f40ff07713e4b7
 EBUILD librecad-9999.ebuild 1344 SHA256 9aad45475d3b78580db74de6c15b73b9d2e6266f687f4f19d1de769f3efa5a3b SHA512 722322ffaab726f066da0497261ba9d9f4eedab1f885e1d19b587bfbae5745cfde7399c24767f303a9c76a7d456d7564b3cc9d872b875be2a4cab8c499e6589d WHIRLPOOL 1d501cad46064352011e023664893101b5ec1b2209e154910f28d4fe539f46cfd6d2f28543185491901c7a62d1098426e8d1ab04d465001ac2b23d036b5cfbde
 MISC ChangeLog 4238 SHA256 cc0a3f5a63cb6a1d89c51b51c59c5aa9f87e66c3962de8799b51e9ed4256a045 SHA512 b00eeeb651418d48bef394da12b7d03ce690a4b48dc9af347a9548f093c784be0e9876ad2868442861ba939f3e881f3fcd4ade4ce1a1c66f73950c85975c8ead WHIRLPOOL f1d972276c6dd18bc67720ad2097d90cecd1b26fc3bb4388c3904ed33343bca20a425a2bc634a38c265a9c7ef64af31aec5e5e7a23590a9658f1cbfe6dfeb4cc
 MISC ChangeLog-2015 1255 SHA256 8defefb92b3ae4ff96ed33f893b761807d847860e604cf29f18eb181d83cb8fa SHA512 c33d1fe55743ad6bdca17ea9fc0bcead93f737f94271a05c7cd8b61ce2b099b12b9c1d8b9451f75a7139ad6735f09c8f34461f96855ef4078a3e14312617f2e6 WHIRLPOOL 2d0c89179f9d2ecafb0cd231bdc8f1a7dff078360cccb4497f7286d267aa1ac17bf3bf4ca82f344a1b44de03de9135ae5586ee1ec6340e8cd261fdd30d659132
diff --git a/media-gfx/librecad/librecad-2.1.3.ebuild b/media-gfx/librecad/librecad-2.1.3.ebuild
index b2e66a3c306d..545c5595caca 100644
--- a/media-gfx/librecad/librecad-2.1.3.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 IUSE="3d debug doc tools qt4 +qt5"
 REQUIRED_USE="|| ( qt4 qt5 )"
diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest
index af21bb4f964f..c5c7824af851 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -1,11 +1,12 @@
 AUX povray-3.7.0.0-automagic.patch 812 SHA256 dc37eb1505fcea73c2d30bef3939efa9ffb1921ee88d60e36e3aae0668336ab9 SHA512 c76ccc429b2868fbae4d40f66d81c07d8b5eba3ec419b2377d3ee541f34b7e597ecf232d1a268abd85fa47abd4f9c7b3cbf26293746b2b10361cef2ea4c34709 WHIRLPOOL 976db9c966d8f6e5e3c05c207f6d0c8f2c62cac9454bbd06f6a2dd8f3d478617b0436e9571bcfb9e8ebc32248561d472f747cc875715b2accc7b42c01fec8c12
 AUX povray-3.7.0.0-boost-1.50.patch 2739 SHA256 c8d4e6809bfcd1a33457b493fa9ba9d2a9983e1a4be750508d766d129dd0b180 SHA512 90b5f03bd290b8fd4431fae208a38d8d54c56bbe3e39db728546a0598ce953eb6f98745bd2ad527d4f8f39dc02cb066b4aee999e7fc7e1348c0da98e9f6bbc1b WHIRLPOOL ebfe59545a53562cbcccfd2da690f4fce80da28599978410f723efb76c589570fc44266a66691d065874701113f1efc37ce4748e6681d7a38ed578722a1f63e3
+AUX povray-3.7.0.0-gcc6-openexr.patch 1153 SHA256 b15f7d9a7a1148ff03b7aed2bef9f3ff2e0568b6277b054fa25bd24f4b9703b1 SHA512 0be944d63df3e1df031e25f535bddb7ef0416da8447167c1dbba1dc1b007e4c86119c01004953a7280a847640a7f630f3081fdd624028bb923620b78b5e20cec WHIRLPOOL 6614b5605d2eb65c650d85767f04aa2daa6db8761199d6e8f3f84c617163e1fac1522f320b502a8cae7f10eb54f68e052a4e4c25a4bdde0a572adac1676d0f17
 AUX povray-3.7.0.0-r1-boost-1.50.patch 3582 SHA256 c837b6173e8600061e8eec338c27f8d59b4b8afa131861ab85acc2e55c48fed7 SHA512 5ab0f29e67e98e47fe8fb991d8a510cb1ff92f27be6e0191c7d8c8f91ec3d67b3127d7227bdbfe8f263b9c6ada216ac46d0bb2e1f221230b253f07424ba689db WHIRLPOOL 4bf9c7b395d97c25b7e006fd700fc2ff6e827b15c77cbb3a46332687ac25c247f86f529d77bec6630d2cb91875f3a5da948845848b4126d46f9b05cfeb870cb0
 AUX povray-3.7.0.0-user-conf.patch 1491 SHA256 f29cb95a171005422ae56aef93d420ab6cff03e88a0fdb0ddae1549c07675501 SHA512 f25ad7e0738a6e0e759aba7405d29839f69a3013170b7072e17afebda7e5d700906280491499628859a8d61c27ee3fc54f0b9fd3f472e0771cdad4f7a3bf6664 WHIRLPOOL 4128514106a5ea157f29d7545e2daaf9ad2138b2e48e7fd7cec53835d9364f841d32a31388af7bc5eb4461b6e38b31aa416cfb9ebaaa7727116a8dd20994bc56
 AUX povray-3.7.0_rc6-darwin-defaults.patch 920 SHA256 68c8094b916fc4c78c294f33502391c579505ae91b14d091c6fb78d91b147167 SHA512 17ae635430f0d57157c9915ce5b25a88afcb34f6dd9552b27a42b32d638fdfbcb8b4e41ec89b52048db9d054812535b7b41f328ffe4554e719e4a3de21cbfdee WHIRLPOOL a8e0d22fce5fe47e12ebb0c8c3b56aa364fd8ec7d963cd02e6b64d4a8825e2d98337b194820b588551e18e3e35fdf414f47e046c05f61ab9a0acc8183f378d79
 DIST povray-3.7.0.0.tar.gz 38191521 SHA256 bf68861d648e3acafbd1d83a25016a0c68547b257e4fa79fb36eb5f08d665f27 SHA512 82e3dbcd58b7ae921fe3b953815ca4dbbfb22eda434554baee4accabd1455b18cb511061f1cf9cf93128fab0a042df374fe2f68186d78c19853a465bd4bcbe10 WHIRLPOOL 6fc85ef9dc0d31a96d98f52d4c0c42cb37264f4e90da842b0e976076fcb1abad3a38d5f5ce82ebdd111babc67d8f16e460f8b04fd40f9dadf8f115f9493e933f
 DIST povray-3.7.0.0_p20160914-fix-c++14.patch.bz2 12876 SHA256 adc1a1cfda6494dfa18bb4a8c62e5a949e4369afc01d520975687c92edee69f8 SHA512 3329da12a822762559445e208a746ff208c39f7b63e27ba84a390074bb52a105c9a2f66180e58c5157795bb16346e11b5b05efaf077ee0d8246179975a692b04 WHIRLPOOL b3adb9f515841471ca7f1130e0991bbd362571f9c20c3f694cc73c03d3311b7143267b626bf08f2ac72b724ecf91274c24d4527e7a29c5368f1df874410a339f
-EBUILD povray-3.7.0.0-r1.ebuild 4418 SHA256 a442ea6e2f27f5aedd5c605c38f376d888ed4798747bac9d78382141f649c815 SHA512 6a44afc7b482fb9e09d8c14ad1a75f9672295844507ef2f63b464ddf8da3564f2fc76c1fd7152dd51ffb043ce01a6ad9afa3cabff485b2cd2aa31b44f0c762af WHIRLPOOL dfe6f4008c8627a0311670fb84f9bca27ab7ecc5cc53bcb08c9fd339539c6173e37a7d14955601efd25fd2d402867f4ab39ac3413602e6c9d3a1428f0116884c
+EBUILD povray-3.7.0.0-r1.ebuild 4457 SHA256 19c78856fd49ad7b8971bffa96df2b776c90e150178698f5c23393d83a4f1d18 SHA512 8739f1de5bfe0308dd484d980a4550c555940aedc2ae036e3195d501a7f4406f6690f920e278983ba9646d3ce4faadfc229e49b49bbd1acc1eb6a7e84ee34603 WHIRLPOOL 16d7399082c083cc89500b8474529cf4300239d2c82cace64f7e5572d2f225f5eecb438c50c835192e905f45644e26fb802debfbb58c0ec57dc46de79556b0da
 EBUILD povray-3.7.0.0.ebuild 4391 SHA256 0430f475b037ce7323af682b486d7498eca88ed86be259a62a9eb2753e9c2604 SHA512 1f213b1860b156d6f5cd6a19c41c6582f47ff96b5653f5d23e7baad787c2ce7ee592e80d03ff515ccffef7bacae0c7dcd8adb45a9f61b71055245a00e69221f7 WHIRLPOOL 766aec6a04e1ddb9dc72a35c8f19ce95b11e4310bdc4cf62230b077dea688d6e93d01eb7770144ef7675fe3699179ac29e3d36f318b16fa87f09127c273db109
 MISC ChangeLog 4461 SHA256 c4071c3126584e31059b43db61fd7dc6a04a3c38b39a1d1c458176d11e3e7f30 SHA512 f24e824b827c13dadfeec0d55c161a6504e84c13d5c29ad8935da23ce82ad337c5c0a6434ef1ca7c62545415b4ec2e8277133731140f872d78d46f3c3ea697ca WHIRLPOOL a24326057b24c822ee2206552d093c2d391bad5d39332991b949bec540600213b31fdd222fe16a529440a5570c237d122b7bedec5b2d99171d93424fab7fe500
 MISC ChangeLog-2015 24250 SHA256 870f69fa3163b4e0e7b6e8a2d2b9878b650207206473bff2015729b268b6b89e SHA512 0cd411490a29d40b039f81ae6c09e9ebad4603bb3d54aa0ec50b03587e6a69e45dc0272f60fa01a22954c07ad221ce31ac7cd203962cde0f9be075558c27e5f9 WHIRLPOOL 302588ae268cc92cadf6374dc946cd98eb6d83c110d1402433d1ba53189505d25806ceba8aa739b9709e9cbfbdb358ed5fdc831af84d3e13b5b96bdd00f04039
diff --git a/media-gfx/povray/files/povray-3.7.0.0-gcc6-openexr.patch b/media-gfx/povray/files/povray-3.7.0.0-gcc6-openexr.patch
new file mode 100644
index 000000000000..8b06d609402e
--- /dev/null
+++ b/media-gfx/povray/files/povray-3.7.0.0-gcc6-openexr.patch
@@ -0,0 +1,39 @@
+diff -ruN povray-3.7.0.0.orig/source/base/image/openexr.cpp povray-3.7.0.0/source/base/image/openexr.cpp
+--- povray-3.7.0.0.orig/source/base/image/openexr.cpp	2013-11-06 21:28:15.000000000 +0100
++++ povray-3.7.0.0/source/base/image/openexr.cpp	2017-10-31 20:11:28.244218318 +0100
+@@ -101,7 +101,7 @@
+ 
+ 		void write(const char *c, int n)
+ 		{
+-			if(os.write(c, n) == false)
++			if(! os.write(c, n))
+ 				throw POV_EXCEPTION(kFileDataErr, "Error while writing EXR output");
+ 		}
+ 
+@@ -115,7 +115,7 @@
+ 
+ 		void seekp(Int64 pos)
+ 		{
+-			if(os.seekg((unsigned long)pos) == false)
++			if(! os.seekg((unsigned long)pos))
+ 				throw POV_EXCEPTION(kFileDataErr, "Error when writing EXR output");
+ 		}
+ 	private:
+@@ -142,7 +142,7 @@
+ 
+ 		bool read(char *c, int n)
+ 		{
+-			if(is.read(c, n) == false)
++			if(! is.read(c, n))
+ 				throw POV_EXCEPTION(kFileDataErr, "Error while reading EXR file");
+ 			return (is.tellg() < fsize);
+ 		}
+@@ -157,7 +157,7 @@
+ 
+ 		void seekg(Int64 pos)
+ 		{
+-			if(is.seekg((unsigned long)pos) == false)
++			if(! is.seekg((unsigned long)pos))
+ 				throw POV_EXCEPTION(kFileDataErr, "Error while reading EXR file");
+ 		}
+ 	private:
diff --git a/media-gfx/povray/povray-3.7.0.0-r1.ebuild b/media-gfx/povray/povray-3.7.0.0-r1.ebuild
index 35f061a14759..ac091168ba6a 100644
--- a/media-gfx/povray/povray-3.7.0.0-r1.ebuild
+++ b/media-gfx/povray/povray-3.7.0.0-r1.ebuild
@@ -44,6 +44,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-user-conf.patch
 	"${FILESDIR}"/${P}-automagic.patch
 	"${WORKDIR}"/${P}_p20160914-fix-c++14.patch
+	"${FILESDIR}"/${P}-gcc6-openexr.patch
 )
 
 src_prepare() {