gentoo resync : 09.06.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-06-09 09:27:03 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-06-09 09:27:03 +0100
commit: cb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa (patch)
tree: 047fc92023c520d07f13ec5ac96e094d1b312a7a /media-gfx
parent: 7b9f15840068dfaeea5684f8a1af1fe460dfa14c (diff)
45 files changed, 915 insertions, 1653 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index a92b0ac5b498..43d61bc86d75 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 5a5275c9ed46..d33adf05074a 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,13 +1,11 @@
 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.1.tar.xz 3396372 BLAKE2B 916a39b117c3af8bd81a1c6177929bdc0f756c79fef4e4994236569d46e2b770c85303e07c6937f670d0b657ba826cc7b0f1b8b713cdf66b11cd625865db525f SHA512 50de282d26b345deeca19ebacfd9eebcc8b1ef3eec4d73d7853e918eef0d23b5ddba96695e7084b808891f0778b5765dc6bf718b9f25c5e1ce5ed393c1421c94
-DIST darktable-2.4.2.tar.xz 3415724 BLAKE2B 2c7149ff14283f38208f223cab78c57d30cf0f50841484411bec64d8154b6c4f2213990d169da057d734b9ac792a549aa9c3a6137a0ebfcec6b4c7d6f3991817 SHA512 4ad698bbfbeb94ab8d25a5414e65a5e5d6d8edae0e77d1ac327dfed0e0519e1a8a6761f9efe653aa8c421cc37269efaef4da96c5bc3797f923b4a0df4ebdfa8b
 DIST darktable-2.4.3.tar.xz 3422460 BLAKE2B 2fa1d7787301b6bc83b09e8d93bda251d2f9b7cf7d47979087b6da5126272d17c15f925be26652580aad6601f8613eac593c08e91638f2d445de1981f8694798 SHA512 adc0740f866890c53a1389b43042d76a4c668dd22654d91fd5a7eb728aa6979cb7dd3703d6e7d3689b6d3840e892432b3c3ce6953a76d4355dfc1f90a8f29506
+DIST darktable-2.4.4.tar.xz 3432268 BLAKE2B 75d22187c4a32eaf240803e68b8ffe9a29b4dfeaab3eb0061dd817e65c7118a5fe3f1832ce2d7b5adf1d8501c17adff7f1e87545774ca17bd2e33b749e993886 SHA512 143739b18217cb2b47f7c5cb29bbb17e0d78b380ccd9358e96e179639d8e3526c76f3822edace605856ec3272b099a09f052867479d20879bf36ef45dafe5df6
 DIST darktable-usermanual-2.2.0.pdf 14998142 BLAKE2B 68332239b4d2e34a0cd9f9e9bc26a18149ef1a8c033e3d5a7a7c150e952546669d74d0eeb97ad6793955d65a3259df51932829aca3d46f5c3ce7e01b59ee709b SHA512 5408193b442a7f60783aace507d8dd39c638f5f58d8b5fb5ab68eca03ce9853477b0cbe14184375d58cd6a648de18e9ecae586376698571222be755159cc0b20
 DIST darktable-usermanual-2.4.0.pdf 15072726 BLAKE2B a10fb02bb732040e45e4b2c6b6a6e022c6095a29aac894727c8a803bf76ac50924bcd938f3c7085222f32542074cbe051afe8752059a0796db22adabecce3faf SHA512 0259ccd264ec0569a770d92a517932bf5b24ce279c699a636f36656519c400456f0bdbd5de1eacf96e0cb05c0b7e59a6c6fa02803b809bc0fabb902ffe454dd1
 EBUILD darktable-2.2.5.ebuild 3856 BLAKE2B 01adcaf0ca198b5cea7c49b5dc3844c76a7f0a0a1c83e1a9729161721aa73b390971156bb3784ec4d9c7577821da90390b5bdd1c3c3820976963d45fab510187 SHA512 daf6de876de7db156d979292562411581f06e58f8bddf5b3cb96f75c4b8d38f7dd8ac951c275192ce5d6f5f139566492aa7c08238e35da131a056113c08d9a94
-EBUILD darktable-2.4.1.ebuild 3999 BLAKE2B da571509858accbfcc514c4283c58fe4fe820f5dc0baabfd07a056c7934671c2526c86ded6219f903d094f24888cb0115bf451292facdaf56b657faf48678c8b SHA512 c655edc4067ff2744244bf7f07d5239da45594d906c0032e2bf881d5ab1be7f83807897f8b60d0d7dd4e2fbbbd39e96d2ac47dfdcce79ccf8c16790d0b2ca455
-EBUILD darktable-2.4.2.ebuild 3999 BLAKE2B f4b1905eae4d77f485150f40bc2eaee25e5515e1872975a209e1d190442589b237065715c7e4da35f335376085f99173641c7f4b1a811422a33b28e52b1ada3e SHA512 572edf9c1f5f3a9f794bef774129b0ed751a87d60ecfa668d7a7f2199b2f76a6ccb6de640b22cd64139501130d58df8fcb5303937b51444566528330e05f7307
 EBUILD darktable-2.4.3.ebuild 3999 BLAKE2B f4b1905eae4d77f485150f40bc2eaee25e5515e1872975a209e1d190442589b237065715c7e4da35f335376085f99173641c7f4b1a811422a33b28e52b1ada3e SHA512 572edf9c1f5f3a9f794bef774129b0ed751a87d60ecfa668d7a7f2199b2f76a6ccb6de640b22cd64139501130d58df8fcb5303937b51444566528330e05f7307
+EBUILD darktable-2.4.4.ebuild 3999 BLAKE2B f4b1905eae4d77f485150f40bc2eaee25e5515e1872975a209e1d190442589b237065715c7e4da35f335376085f99173641c7f4b1a811422a33b28e52b1ada3e SHA512 572edf9c1f5f3a9f794bef774129b0ed751a87d60ecfa668d7a7f2199b2f76a6ccb6de640b22cd64139501130d58df8fcb5303937b51444566528330e05f7307
 EBUILD darktable-9999.ebuild 3434 BLAKE2B 9720e4706e25b09ef6b0a652cdd2ee47fdc394fee8a7a8f3a673c8393a081e1a87b136cd6da813ca59aa4c6c6da6930ffcaead9123cf768765eb276cfc8134ab SHA512 99476f1f3742d2404bc491e3fe654e4928b714429070fc338461db8f49c2cc51c089f9426aad1470c65dd606054a90a6d69e8c52deb83e39bc0a298393bf6111
 MISC metadata.xml 925 BLAKE2B 5f8855e5d645a30a6a4fdd5049e04f2269df88b042f69321677733d00b56d5e77b9084d996ab7c08340d24f14fdaea3080962465807266d435a954f0f4ca5dbf SHA512 f247ae77eba5dcebc3381cf6fabc68565dc6880c1b3aa5d90311864d78ba9868eb6848a960ead426c006e1e4c5f7d76baee256c948b68ad44785adf45215d09b
diff --git a/media-gfx/darktable/darktable-2.4.1.ebuild b/media-gfx/darktable/darktable-2.4.1.ebuild
deleted file mode 100644
index 34320cc4d26b..000000000000
--- a/media-gfx/darktable/darktable-2.4.1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils flag-o-matic gnome2-utils pax-utils toolchain-funcs xdg-utils
-
-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 geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
-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 )
-	geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	gphoto2? ( media-libs/libgphoto2:= )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	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 gnome-keyring)
-		-DUSE_LUA=OFF
-		-DUSE_MAP=$(usex geolocation)
-		-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-2.4.2.ebuild b/media-gfx/darktable/darktable-2.4.4.ebuild
index 76721f6a80a4..76721f6a80a4 100644
--- a/media-gfx/darktable/darktable-2.4.2.ebuild
+++ b/media-gfx/darktable/darktable-2.4.4.ebuild
diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest
index aaf652bf2328..7790b0c84b66 100644
--- a/media-gfx/enblend/Manifest
+++ b/media-gfx/enblend/Manifest
@@ -1,12 +1,5 @@
-AUX enblend-4.1.3-cmake.patch 1004 BLAKE2B 7912d827e702d85e6c356b0a246e3f9d465371d0f875523384772397a7a2cfa4320b4b743c76263e4069a9abd70e2429bd654d47e537a795df9a3b5dc6a000b3 SHA512 2143d9b448d29c37cc03dd40ee99f841ccb8d79f53597ef5fc6ef9a2090eaeaa7b789f86f85c468159f19f199cf3a1c330971b51ce6590b2ca6bf4b90765fef1
-AUX enblend-4.1.3-texinfo-5-more.patch 2392 BLAKE2B 57f6f57cb19487afb6a093d5bc671628fd24533ad2dd7319d63d1c2a452ad170da18b023545d5601957469f06ff972a94ac3049a7efe55a469939bf1190ed952 SHA512 3f3d398d8c5a39289aefb36050658cd27c477b1b23d94b1e2fdb5c9e40b54c9ee0d62f8cd1aa281618c9b48e803b082aaf6196824038c04bf090ca49cfdd21f2
-AUX enblend-4.1.3-texinfo-5-upstream.patch 18609 BLAKE2B 86aa3c27e2e79a8064949a4599a64ed767b998204532f54d362842e6dc6112772abca5b497073997f18290dd568bdccffd7fddf065f7ecaaf9c04da7869ee5aa SHA512 f42d102a534887bd56637d08d64c37436b8590310a87a8dc5fb63550bd10ae2602ec3ddb51ea6b46d16ad3477e4b8b8f20fa48821e8745a5cf9e5693ae4af40e
-AUX enblend-4.1.3-vigra_check.patch 463 BLAKE2B c1e4ef25952285edeab6f78f74c715fbd1726490ab31b788e6a0dd708df7faec275bc1bd6b9dcd4082f635ed742f1b2485a74262eea1b8b44f51cd1d39a1a61d SHA512 5b459c7da0608369fc591ad67fd295f3e2b11f78d5cba4e7d57116dbb0038f00b6c5f0fc190e4c40b0b625f77885ddfe51e8432654c78c03dc9040d34ae96372
 AUX enblend-4.2-doc-install-dir-fix.patch 2705 BLAKE2B a5bfb43521095bc088aef980f849cfb9cb2e7e9ae2a10b2fcd4b56cd7b27888047567c3b95b40e3a8feefe7ee9209db49688800986cc895731e0949acd3bae1c SHA512 a22730295c44da4f9feb3d541b17f298adf98f0328cf01d6a85206087c782e1aebac6509968d1a5433efb5fc3d72e48301ec3d5a2516f01c1f6d923d5032ab03
 AUX enblend-4.2.0_p20161007-cmake.patch 477 BLAKE2B 9a27d95e78cc611c723824a300dbc3eaeb7c2ffe6bcacb19baeb8a24180450f2912310ae9584f450899ececca11636304d36631f8c57f6d4b7c2450043d6f147 SHA512 5b79944beabd97f71f05657ce17e31d9eab60506dfce27fefc3a8f9a10c92f33b1b4fa1411c6d1a33d23819a4020a50f130b9083fecaf3e1a072fda71e5f9ff0
 DIST enblend-4.2.0_p20161007.tar.xz 494060 BLAKE2B 8842dd70a1400a27170794246cb5c89d60b6798373e3a9d63e88738ad569e1174cb4303ccb5a2bc79846651e982e05f8cb9ac3e09b83ee33958b6ccf043ebda9 SHA512 ede037f19a7c3b358f533ecfb235f70824261eaf189d0bdcde6f9cedaa5952be2a6940884e688418b725cb3a67fc1b7d366483a76b7c62326ca857b8efe3a3f3
-DIST enblend-enfuse-4.1.3.tar.gz 862079 BLAKE2B 1ea6d909bbc32d6141090862f658cc29ee0156e898e133fa88a10d1ea1df1e3eb0b6481010a0b3c0795bce0345ff3a77d1916310bc7b39fb292478c622d4493a SHA512 0a3487783afadee896b84411330898393cda4be4cbb79d36013daa98c17ab88f97a298c21a5c398b7cb2ce83e8dc4519a80e18be472c5fec10c3114037b6db73
-EBUILD enblend-4.1.3-r1.ebuild 1828 BLAKE2B 8b11df2857f52ddb4e1efb0d86ca577c23af0ba5b8ec0bf8f5a682bf953fc6fb822b7fe207437af2b60b905710d544d1e382801b8a62d68ec38c215add67adc9 SHA512 df0d81b83868daabf072b557b70ec0ad555682133b44165694167a98c713d84123b2736f6f7e914a2b6a366ff7b5810acb0d090422c0dbd95c4a874403007f71
-EBUILD enblend-4.1.3-r2.ebuild 1930 BLAKE2B 078a4dcde4bfb1eba7d639f22620083d72449e953e56fe56907658308221fde6b196fc172b18ea5f1622f40570fa4cd9df46b3c810bd221fdada0d1642869666 SHA512 002f38789573df33f650cd0127b8499859ee3855e4674cefecc9aa9f10be7b0b413942d40d23dd14e1dc29d8037bb452df0149ee825f320038e65dd260ec1453
 EBUILD enblend-4.2.0_p20161007-r1.ebuild 1755 BLAKE2B 651b934a2e1a63a5761b2fbd2ffc3fe2a9e45464359d7877041b65abea4cb001927a91d05159421d0e3dea042d1e6ae8f0802b40f371a00de2a17fe92219a234 SHA512 7b082d0d7716ed034b484173fef1a68beb892ca0f01048a23d00cdcd8ee99631f05bd1fd7531ebf5b1769eb927961c1ee0689a3e4bf8aeb69a289b0e12eaf2d3
-MISC metadata.xml 472 BLAKE2B acab18a5d54df3704a279c6a0a98d61f35e072f6dbe264c555e15265851472417a469f5f84678c9f8cdf889ff834ed5810a2768bc2ad656f7e402ab96d518d68 SHA512 f2623eccd20aee91ae2ffe90e3999e359865757269d8ca84cd095ee5f0d55e18000d3afb602531231799a31a14edbf1bdeea72b162976fcd51727a169045d100
+MISC metadata.xml 336 BLAKE2B ca7263a1856bc0a6de0a9085fcaa0df5745cda2f678c36984fc2bf11218207214dbad308c39811213d7ce5d376228bc87a60adbfd4fee8f02b2119af0ebac207 SHA512 ac71d3806312b434087a0ce55eadd3db06091e11a195fe90da48570bdb4ad47bf50c864ae2b82e25acb08b6ce78ebc6dc8b33bdd064ee449efcb0995806f2eca
diff --git a/media-gfx/enblend/enblend-4.1.3-r1.ebuild b/media-gfx/enblend/enblend-4.1.3-r1.ebuild
deleted file mode 100644
index 6f9f1fa58337..000000000000
--- a/media-gfx/enblend/enblend-4.1.3-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils cmake-utils
-
-MY_P="${PN}-enfuse-${PV/_rc/rc}"
-
-DESCRIPTION="Image Blending with Multiresolution Splines"
-HOMEPAGE="http://enblend.sourceforge.net/"
-SRC_URI="mirror://sourceforge/enblend/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 VIGRA"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug doc gpu image-cache openmp"
-
-REQUIRED_USE="openmp? ( !image-cache )"
-
-RDEPEND="
-	>=dev-libs/boost-1.31.0:=
-	media-libs/glew
-	>=media-libs/lcms-2.5:2
-	>=media-libs/libpng-1.2.43:0=
-	>=media-libs/openexr-1.0:=
-	media-libs/plotutils[X]
-	media-libs/tiff:=
-	>=media-libs/vigra-1.8.0[openexr]
-	sci-libs/gsl:=
-	virtual/jpeg:0=
-	debug? ( dev-libs/dmalloc )
-	gpu? ( media-libs/freeglut )"
-DEPEND="${RDEPEND}
-	media-gfx/imagemagick
-	sys-apps/help2man
-	virtual/pkgconfig
-	doc? (
-		media-gfx/transfig
-		sci-visualization/gnuplot[gd]
-		virtual/latex-base
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${PN}-4.1.3-vigra_check.patch" )
-
-src_prepare() {
-	sed -i -e "/CXX_FLAGS/s:-O3::g" CMakeLists.txt || die
-	sed -i -e "s:doc/enblend:share/doc/${PF}:" doc/CMakeLists.txt || die
-	cmake-utils_src_prepare
-
-	epatch "${FILESDIR}"/${P}-texinfo-5-upstream.patch
-	epatch "${FILESDIR}"/${P}-texinfo-5-more.patch
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_CXX_FLAGS_RELEASE=""
-		$(cmake-utils_use_enable debug DMALLOC)
-		$(cmake-utils_use doc DOC)
-		$(cmake-utils_use_enable image-cache IMAGECACHE)
-		$(cmake-utils_use_enable openmp)
-		$(cmake-utils_use_enable gpu)
-	)
-	CMAKE_BUILD_TYPE="Release"
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	# forcing -j1 as every parallel compilation process needs about 1 GB RAM.
-	cmake-utils_src_compile -j1
-}
-
-src_install() {
-	local DOCS=( AUTHORS ChangeLog NEWS README )
-	cmake-utils_src_install
-}
diff --git a/media-gfx/enblend/enblend-4.1.3-r2.ebuild b/media-gfx/enblend/enblend-4.1.3-r2.ebuild
deleted file mode 100644
index 296bc122df57..000000000000
--- a/media-gfx/enblend/enblend-4.1.3-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-MY_P="${PN}-enfuse-${PV}"
-
-DESCRIPTION="Image Blending with Multiresolution Splines"
-HOMEPAGE="http://enblend.sourceforge.net/"
-SRC_URI="mirror://sourceforge/enblend/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 VIGRA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc gpu openmp"
-
-RDEPEND="
-	dev-libs/boost:=
-	media-libs/lcms:2
-	media-libs/openexr:=
-	media-libs/tiff:=
-	media-libs/vigra[openexr]
-	sci-libs/gsl:=
-	debug? ( dev-libs/dmalloc )
-	gpu? (
-		media-libs/freeglut
-		media-libs/glew:*
-		virtual/glu
-		virtual/opengl
-	)"
-DEPEND="${RDEPEND}
-	media-libs/libpng:0
-	sys-apps/help2man
-	virtual/jpeg:0
-	virtual/pkgconfig
-	doc? (
-		media-gfx/transfig
-		sci-visualization/gnuplot[gd]
-		virtual/imagemagick-tools
-		virtual/latex-base
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS NEWS README )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-vigra_check.patch
-	"${FILESDIR}"/${P}-texinfo-5-upstream.patch
-	"${FILESDIR}"/${P}-texinfo-5-more.patch
-	"${FILESDIR}"/${P}-cmake.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# CRLF in files, don't bother with patch
-	sed -i -e "/FIND_LIBRARY(LCMS2_LIBRARIES/s/lib32/lib/" \
-		CMakeModules/FindLCMS2.cmake || die
-	sed -e "/FIND_LIBRARY(OPENGL_gl_LIBRARY/s/lib32/lib/" \
-		-e "/NAMES.*MesaGLU/s/lib32/lib/" \
-		-i CMakeModules/FindOpenGL.cmake || die
-
-	sed -i -e "/CXX_FLAGS/s:-O3::g" CMakeLists.txt || die
-	sed -i -e "s:doc/enblend:share/doc/${PF}:" doc/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_CXX_FLAGS_RELEASE=""
-		-DENABLE_DMALLOC=$(usex debug)
-		-DDOC=$(usex doc)
-		-DENABLE_GPU=$(usex gpu)
-		-DENABLE_IMAGECACHE=$(usex !openmp)
-		-DENABLE_OPENMP=$(usex openmp)
-	)
-	CMAKE_BUILD_TYPE="Release"
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	# forcing -j1 as every parallel compilation process needs about 1 GB RAM.
-	cmake-utils_src_compile -j1
-}
diff --git a/media-gfx/enblend/files/enblend-4.1.3-cmake.patch b/media-gfx/enblend/files/enblend-4.1.3-cmake.patch
deleted file mode 100644
index e9fef85278d5..000000000000
--- a/media-gfx/enblend/files/enblend-4.1.3-cmake.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/CMakeLists.txt	2017-02-12 13:43:46.862787952 +0100
-+++ b/CMakeLists.txt	2017-02-12 13:50:03.461229021 +0100
-@@ -185,7 +185,6 @@
- FIND_PACKAGE(TIFF REQUIRED)
- FIND_PACKAGE(Perl REQUIRED)
- # this one is needed in doc. (Especially the program "convert")
--FIND_PACKAGE(ImageMagick REQUIRED)
- FIND_PACKAGE(GSL REQUIRED)
- include_directories(${GSL_INCLUDE_DIR})
- LIST(APPEND common_libs ${LCMS2_LIBRARIES} ${TIFF_LIBRARIES} ${GSL_LIBRARIES})
-@@ -394,8 +393,9 @@
- add_subdirectory(src)
- 
- # you really should have perl installed, when creating doc's
--if (PERL_FOUND AND IMAGEMAGICK_FOUND AND DOC)
--  # this should be set from comman line
-+if (PERL_FOUND AND DOC)
-+  FIND_PACKAGE(ImageMagick REQUIRED)
-+  # this should be set from command line
-   # Possible values like described in README: @smallbook @afivepaper @afourpaper @afourwide @afourlatex
-   # @letter is default
-   set(EXTRATEXI2DVIFLAGS "@afourpaper" CACHE STRING "Papersize: @letter @smallbook @afivepaper @afourpaper @afourwide @afourlatex")
diff --git a/media-gfx/enblend/files/enblend-4.1.3-texinfo-5-more.patch b/media-gfx/enblend/files/enblend-4.1.3-texinfo-5-more.patch
deleted file mode 100644
index dd63ae3697a5..000000000000
--- a/media-gfx/enblend/files/enblend-4.1.3-texinfo-5-more.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 7ec0e758430f9e31fb9fc0f85d72339a307263d6 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Fri, 14 Aug 2015 03:09:57 +0200
-Subject: [PATCH] Texinfo: Fix parameter handling with macro "mainpurpose"
-
----
- doc/auxmac.texi |  6 +++---
- doc/enfuse.texi | 10 +++++-----
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/doc/auxmac.texi b/doc/auxmac.texi
-index 59520c3..ad35d6a 100644
---- a/doc/auxmac.texi
-+++ b/doc/auxmac.texi
-@@ -88,12 +88,12 @@ not displayed, because of lacking <acronym>SVG</acronym> and
- 
- @c Text Fragments
- 
--@macro mainpurpose
-+@macro mainpurpose{purpose}
- @ifinfo
--@strong{Main Purpose}:
-+@strong{Main Purpose}: \purpose\
- @end ifinfo
- @ifnotinfo
--@strong{Main Purpose: }
-+@strong{Main Purpose: }\purpose\
- @end ifnotinfo
- @end macro
- 
-diff --git a/doc/enfuse.texi b/doc/enfuse.texi
-index 92fe597..9e601ea 100644
---- a/doc/enfuse.texi
-+++ b/doc/enfuse.texi
-@@ -5164,7 +5164,7 @@ Fire in rapid succession.
- @cindex series, simple
- @cindex noise reduction
- 
--@mainpurpose Reduce noise
-+@mainpurpose{Reduce noise}
- 
- @noindent
- With the default settings, Enfuse computes a weighted average of the
-@@ -5193,7 +5193,7 @@ be worth an extra run.
- @cindex series, exposure
- @cindex dynamic range increase
- 
--@mainpurpose Increase manageable dynamic range
-+@mainpurpose{Increase manageable dynamic range}
- 
- @noindent
- An exposure series is a set of images taken with identical parameters
-@@ -5322,7 +5322,7 @@ the multiply occuring exposures and reducing noise.
- @cindex series, flash exposure
- @cindex dynamic range increase
- 
--@mainpurpose ???
-+@mainpurpose{???}
- 
- ...
- 
-@@ -5333,7 +5333,7 @@ the multiply occuring exposures and reducing noise.
- @cindex series, polarization
- @cindex saturation enhancement
- 
--@mainpurpose Reflection suppression, saturation enhancement
-+@mainpurpose{Reflection suppression, saturation enhancement}
- 
- In the current implementation of Enfuse, it is not possible in general
- to fuse a polarization series.  Naively abusing
-@@ -5345,7 +5345,7 @@ to fuse a polarization series.  Naively abusing
- @cindex focus stacks
- @cindex depth-of-focus increase
- 
--@mainpurpose Synthetic Depth-of-Field Increase
-+@mainpurpose{Synthetic Depth-of-Field Increase}
- 
- A @dfn{focus stack} is a series of images where the distance of the
- focal plane from the sensor varies.  Sloppily speaking, the images
--- 
-2.5.0
-
diff --git a/media-gfx/enblend/files/enblend-4.1.3-texinfo-5-upstream.patch b/media-gfx/enblend/files/enblend-4.1.3-texinfo-5-upstream.patch
deleted file mode 100644
index ef04aa73633a..000000000000
--- a/media-gfx/enblend/files/enblend-4.1.3-texinfo-5-upstream.patch
+++ /dev/null
@@ -1,633 +0,0 @@
-# HG changeset patch
-# User Chris <cspiel@users.sourceforge.net>
-# Date 1438958604 -7200
-# Node ID 8387f0170f7b352baea887f77960e8066185a6cd
-# Parent  c1bcd2df4e3724f3bb0414d3a5e2e9302be78921
-Get the Texinfo documentation to translate again with makeinfo-5.2.
-
-This patch takes thus care of issue #1181678
-    https://bugs.launchpad.net/enblend/+bug/1181678
-
-We do not strive for a nicely formatted documentation anymore in the
-Stable Branch, because the Development Branch already has a flawless
-new documentation *not* based on Texinfo.
-
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/Makefile.am
---- a/doc/Makefile.am	Fri Aug 07 16:43:18 2015 +0200
-+++ b/doc/Makefile.am	Fri Aug 07 16:43:24 2015 +0200
-@@ -46,7 +46,7 @@
-                    -I $(top_builddir) -I $(srcdir) \
-                    --css-include=@srcdir@/default.css \
-                    $(MAKEINFOHTMLFLAGS)
--export TEXINPUTS=$(top_builddir):$(srcdir)
-+export TEXINPUTS = .:$(top_builddir):$(srcdir):
- 
- TEXI2DVI = texi2dvi $(TEXI2DVIFLAGS) $(EXTRATEXI2DVIFLAGS)
- 
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/auxmac.tex
---- a/doc/auxmac.tex	Fri Aug 07 16:43:18 2015 +0200
-+++ b/doc/auxmac.tex	Fri Aug 07 16:43:24 2015 +0200
-@@ -1,13 +1,6 @@
--\input thumbpdf.sty
--
--
- % Auxilliary Macros.
- %
- % Include this file before texinfo.tex!
- 
- \def\mathit#1{\hbox{\it #1}}
- \def\mathrm#1{\ifmmode{\rm #1}\else #1\fi}
--
--% These definitions are required for older versions of texinfo.tex.
--\def\geq{\ifmmode \ge\else $\ge$\fi}
--\def\leq{\ifmmode \le\else $\le$\fi}
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/auxmac.texi
---- a/doc/auxmac.texi	Fri Aug 07 16:43:18 2015 +0200
-+++ b/doc/auxmac.texi	Fri Aug 07 16:43:24 2015 +0200
-@@ -2,16 +2,6 @@
- @c Macro Definitions
- @c
- 
--@c redefined commands
--
--@c Get the spacing of dimensions right.
--@ifnottex
--@macro dmn{unit}
--@tie{}\unit\
--@end macro
--@end ifnottex
--
--
- @c extended commands
- 
- @c Add a title to a DocBook element.
-@@ -80,73 +70,6 @@
- 
- @c Operators
- 
--@c Generate a nice representation of base^exponent.
--@macro power{base, exponent}
--@ifinfo
--\base\^\exponent\
--@end ifinfo
--@html
--\base\<sup>\exponent\</sup>
--@end html
--@tex
--$\base\^{\exponent\}$%
--@end tex
--@docbook
--\base\<superscript>\exponent\</superscript>
--@end docbook
--@end macro
--
--
--@macro classictimes
--@ifinfo
--x@c gobble following newline  -- The Tricks of a Texinfo Wizard.
--@end ifinfo
--@html
--&times;
--@end html
--@tex
--\\ifmmode\\times\\else$\\times$\\fi% gobble following newline  -- The Tricks of a TeX Wizard.
--@end tex
--@docbook
--&times;
--@end docbook
--@end macro
--
--
--@c Required for older versions of makeinfo.  The definition of @geq
--@c for TeX lives in auxmac.tex.
--@ifnottex
--@macro geq
--@ifinfo
-->=@c
--@end ifinfo
--@html
--&ge;
--@end html
--@docbook
--&ge;
--@end docbook
--@end macro
--@end ifnottex
--
--
--@c Required for older versions of makeinfo.  The definition of @leq
--@c for TeX lives in auxmac.tex.
--@ifnottex
--@macro leq
--@ifinfo
--<=@c
--@end ifinfo
--@html
--&le;
--@end html
--@docbook
--&le;
--@end docbook
--@end macro
--@end ifnottex
--
--
- @macro plusminus
- @ifinfo
- +/-@c
-@@ -163,62 +86,6 @@
- @end macro
- 
- 
--@c Special Characters
--
--@macro inlineomega
--@ifinfo
--@math{omega}@c
--@end ifinfo
--@html
--<mathinline xmlns="http://www.w3.org/1998/Math/MathML" display="inline">
--    <mi>&omega;</mi>
--</mathinline>
--@end html
--@tex
--$\\omega$%
--@end tex
--@docbook
--&omega;
--@end docbook
--@end macro
--
--
--@macro inlinesigma
--@ifinfo
--@math{sigma}@c
--@end ifinfo
--@html
--<mathinline xmlns="http://www.w3.org/1998/Math/MathML" display="inline">
--    <mi>&sigma;</mi>
--</mathinline>
--@end html
--@tex
--$\\sigma$%
--@end tex
--@docbook
--&sigma;
--@end docbook
--@end macro
--
--
--@macro inlinexi
--@ifinfo
--@math{xi}@c
--@end ifinfo
--@html
--<mathinline xmlns="http://www.w3.org/1998/Math/MathML" display="inline">
--    <mi>&xi;</mi>
--</mathinline>
--@end html
--@tex
--$\\xi$%
--@end tex
--@docbook
--&xi;
--@end docbook
--@end macro
--
--
- @c Text Fragments
- 
- @macro mainpurpose
-@@ -236,26 +103,3 @@
- @noindent
- @strong{Summary of influential options}
- @end macro
--
--
--@macro semilog{significant, exponent}
--@ifinfo
--\significant\*10^\exponent\@c
--@end ifinfo
--@html
--<math xmlns="http://www.w3.org/1998/Math/MathML" display="inline">
--    <mn>\significant\</mn>
--    <mo>&times;</mo>
--    <msup>
--        <mn>10</mn>
--        <mn>\exponent\</mn>
--    </msup>
--</math>
--@end html
--@tex
--\\ifmmode\significant\ \\times 10^{\exponent\}\\else$\significant\ \\times 10^{\exponent\}$\\fi%
--@end tex
--@docbook
--\significant\&times;10<superscript>\exponent\</superscript>
--@end docbook
--@end macro
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/bug-reports.texi
---- a/doc/bug-reports.texi	Fri Aug 07 16:43:18 2015 +0200
-+++ b/doc/bug-reports.texi	Fri Aug 07 16:43:24 2015 +0200
-@@ -77,7 +77,7 @@
- @item
- A complete set of input images that will reproduce the bug.  Strive
- for a minimal set of @emph{small}@footnote{Images of a size less than
--1500@classictimes{}1000 pixels qualify as small.} images.
-+1500x1000 pixels qualify as small.} images.
- 
- @item
- The type of machine you are using, and the operating system name and
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/enblend.info
-Binary file doc/enblend.info has changed
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/enblend.texi
---- a/doc/enblend.texi	Fri Aug 07 16:43:18 2015 +0200
-+++ b/doc/enblend.texi	Fri Aug 07 16:43:24 2015 +0200
-@@ -508,9 +508,9 @@
- twice as large as the previous one.  So, the zeroth layer, the
- original image, obviously defines the image at single-pixel scale, the
- first level works at two-pixel scale, and generally, the @math{n}-th
--level contains image data at @power{2, n}-pixel scale.  This is the
-+level contains image data at 2^n-pixel scale.  This is the
- reason why an image of
--@math{width}@classictimes{}@/@math{height}@dmn{pixels} cannot be
-+@math{width}x@/@math{height}@dmn{pixels} cannot be
- deconstructed into a pyramid of more than
- @ifinfo
- @display
-@@ -1194,11 +1194,11 @@
- 
- @itemize
- @item
--Minimum normalized value: @semilog{1.2, -38}
-+Minimum normalized value: 1.2e-38
- @item
--Epsilon: @semilog{1.2, -7}
-+Epsilon: 1.2e-7
- @item
--Maximum finite value: @semilog{3.4, 38}
-+Maximum finite value: 3.4e38
- @end itemize
- 
- @c IEEE double: 64 bits, n = 53, k = 64 - n - 1 = 10
-@@ -1210,11 +1210,11 @@
- 
- @itemize
- @item
--Minimum normalized value: @semilog{2.2, -308}
-+Minimum normalized value: 2.2e-308
- @item
--Epsilon: @semilog{2.2, -16}
-+Epsilon: 2.2e-16
- @item
--Maximum finite value: @semilog{1.8, 308}
-+Maximum finite value: 1.8e308
- @end itemize
- @end table
- 
-@@ -1236,11 +1236,11 @@
- 
- @itemize
- @item
--Minimum normalized value: @semilog{9.3, -10}
-+Minimum normalized value: 9.3e-10
- @item
--Epsilon: @semilog{2.0, -3}
-+Epsilon: 2.0e-3
- @item
--Maximum finite value: @semilog{4.3, 9}
-+Maximum finite value: 4.3e9
- @end itemize
- 
- @item -f @var{WIDTH}x@var{HEIGHT}
-@@ -1250,7 +1250,7 @@
- @cindex canvas size
- @cindex size, canvas
- Ensure that the minimum ``canvas'' size of the output image is at
--least @var{WIDTH}@classictimes{}@/@var{HEIGHT}.  Optionally specify
-+least @var{WIDTH}x@/@var{HEIGHT}.  Optionally specify
- the @var{XOFFSET} and @var{YOFFSET}, too.
- 
- @pindex nona @r{(Hugin)}
-@@ -1572,7 +1572,7 @@
- @value{src::default-coarseness-factor}, this means,
- option@tie{}@option{--coarse-mask} shrinks the overlapping
- @emph{areas} by a factor of
--@math{@value{src::default-coarseness-factor}@classictimes{}@/@value{src::default-coarseness-factor}}.
-+@math{@value{src::default-coarseness-factor}x@/@value{src::default-coarseness-factor}}.
- With @var{FACTOR}@tie{}=@tie{}8 the total memory allocated during a
- run of Enblend shrinks approximately by 80% and the maximum amount of
- memory in use at a time is decreased to 60% (Enblend compiled with
-@@ -2494,7 +2494,7 @@
- When using this option in conjunction with
- option@tie{}@code{--coarse-mask}=@/@var{FACTOR}, keep in mind that the
- smoothing occurs @emph{after} the overlap regions have been shrunken.
--Thus, blurring affects a @var{FACTOR}@classictimes{}@/@var{FACTOR}
-+Thus, blurring affects a @var{FACTOR}x@/@var{FACTOR}
- times larger area in the original images.
- 
- Valid range: @var{RADIUS} @geq{} @value{src::minimum-smooth-difference}.
-@@ -2606,7 +2606,7 @@
- @rimage{seam-line-visualization}
- 
- @caption{Seam-line visualization of a simple overlap.  The
--853@classictimes{}238@dmn{pixel} image is shown at a magification of
-+853x238@dmn{pixel} image is shown at a magification of
- 100%.}
- 
- @shortcaption{Seam-line visualization}
-@@ -2618,7 +2618,7 @@
- @rimage{seam-line-visualization, 15cm}
- 
- @caption{Seam-line visualization of a simple overlap.  The
--853@classictimes{}238@dmn{pixel} image has been rescaled to a width of
-+853x238@dmn{pixel} image has been rescaled to a width of
- approximately 15@dmn{cm}.}
- 
- @shortcaption{Seam-line visualization}
-@@ -2629,7 +2629,7 @@
- @float Figure,Figure:seam-line-visualization
- @rimage{seam-line-visualization, 15cm}
- 
--@caption{Seam-line visualization of a simple overlap.  The 853@classictimes{}238@dmn{pixel} image has been rescaled to a width of approximately 15@dmn{cm}.}
-+@caption{Seam-line visualization of a simple overlap.  The 853x238@dmn{pixel} image has been rescaled to a width of approximately 15@dmn{cm}.}
- 
- @shortcaption{Seam-line visualization}
- @end float
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/enfuse.info
-Binary file doc/enfuse.info has changed
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/enfuse.texi
---- a/doc/enfuse.texi	Fri Aug 07 16:43:18 2015 +0200
-+++ b/doc/enfuse.texi	Fri Aug 07 16:43:24 2015 +0200
-@@ -621,9 +621,9 @@
- twice as large as the previous one.  So, the zeroth layer, the
- original image, obviously defines the image at single-pixel scale, the
- first level works at two-pixel scale, and generally, the @math{n}-th
--level contains image data at @power{2, n}-pixel scale.  This is the
-+level contains image data at 2^n-pixel scale.  This is the
- reason why an image of
--@math{width}@classictimes{}@/@math{height}@dmn{pixels} cannot be
-+@math{width}x@/@math{height}@dmn{pixels} cannot be
- deconstructed into a pyramid of more than
- @ifinfo
- @display
-@@ -1255,11 +1255,11 @@
- 
- @itemize
- @item
--Minimum normalized value: @semilog{1.2, -38}
-+Minimum normalized value: 1.2e-38
- @item
--Epsilon: @semilog{1.2, -7}
-+Epsilon: 1.2e-7
- @item
--Maximum finite value: @semilog{3.4, 38}
-+Maximum finite value: 3.4e38
- @end itemize
- 
- @c IEEE double: 64 bits, n = 53, k = 64 - n - 1 = 10
-@@ -1271,11 +1271,11 @@
- 
- @itemize
- @item
--Minimum normalized value: @semilog{2.2, -308}
-+Minimum normalized value: 2.2e-308
- @item
--Epsilon: @semilog{2.2, -16}
-+Epsilon: 2.2e-16
- @item
--Maximum finite value: @semilog{1.8, 308}
-+Maximum finite value: 1.8e308
- @end itemize
- @end table
- 
-@@ -1297,11 +1297,11 @@
- 
- @itemize
- @item
--Minimum normalized value: @semilog{9.3, -10}
-+Minimum normalized value: 9.3e-10
- @item
--Epsilon: @semilog{2.0, -3}
-+Epsilon: 2.0e-3
- @item
--Maximum finite value: @semilog{4.3, 9}
-+Maximum finite value: 4.3e9
- @end itemize
- 
- @item -f @var{WIDTH}x@var{HEIGHT}
-@@ -1311,7 +1311,7 @@
- @cindex canvas size
- @cindex size, canvas
- Ensure that the minimum ``canvas'' size of the output image is at
--least @var{WIDTH}@classictimes{}@/@var{HEIGHT}.  Optionally specify
-+least @var{WIDTH}x@/@var{HEIGHT}.  Optionally specify
- the @var{XOFFSET} and @var{YOFFSET}, too.
- 
- @pindex nona @r{(Hugin)}
-@@ -1501,8 +1501,8 @@
- @var{LCE-SCALE} is the radius of the Gaussian used in the enhancement
- step, @var{LCE-FACTOR} is the weight factor (``strength'').
- 
--@var{enhanced} = (1 + @var{LCE-FACTOR}) @classictimes{} @var{original}
--@minus{} @var{LCE-FACTOR} @classictimes{} Gaussian@/Smooth(@var{original},
-+@var{enhanced} = (1 + @var{LCE-FACTOR}) x @var{original}
-+@minus{} @var{LCE-FACTOR} x Gaussian@/Smooth(@var{original},
- @var{LCE-SCALE}).
- 
- @var{LCE-SCALE} defaults to @value{src::default-lce-scale} pixels and
-@@ -1531,7 +1531,7 @@
- @opindex --contrast-window-size
- 
- Set the window @var{SIZE} for local contrast analysis.  The window
--will be a square of @var{SIZE}@classictimes{}@/@var{SIZE} pixels.  If
-+will be a square of @var{SIZE}x@/@var{SIZE} pixels.  If
- given an even @var{SIZE}, Enfuse will automatically use the next odd
- number.
- 
-@@ -1585,7 +1585,7 @@
- @opindex --entropy-window-size
- 
- Window @var{SIZE} for local entropy analysis.  The window will be a
--square of @var{SIZE}@classictimes{}@/@var{SIZE} pixels.
-+square of @var{SIZE}x@/@var{SIZE} pixels.
- 
- In the entropy calculation @var{SIZE} values of 3 to 7 yield an
- acceptable compromise of the locality of the information and the
-@@ -2433,20 +2433,6 @@
- from 1 to the common height, and @math{i} from 1 to the number of
- input images@tie{}@math{n}.
- 
--@macro equationW{}
--@ifnotdocbook
--@ifnottex
--(W)
--@end ifnottex
--@end ifnotdocbook
--@tex
--(W)%
--@end tex
--@docbook
--<xref linkend="equ:pixel-weighting-function"/>
--@end docbook
--@end macro
--
- Enfuse allows for weighting the contribution of each @math{P(i, x, y)}
- to the final @math{Q(x, y)}:
- @ifinfo
-@@ -2454,7 +2440,7 @@
- @math{w(P(1, x, y)) * P(1, x, y) +
- ... +
- w(P(n, x, y)) * P(n, x, y)
----> Q(x, y),}@w{                                                  }@equationW{}
-+--> Q(x, y),}
- @end display
- @end ifinfo
- @html
-@@ -2520,9 +2506,6 @@
-                 <mi>y</mi>
-             </mfenced>
-         </mrow>
--        <mtext>,</mtext>
--        <mspace width="4em"/>
--        <mtext>@equationW{}</mtext>
-     </mrow>
- </math>
- @end html
-@@ -2530,7 +2513,7 @@
- $$
-     w(P(1, x, y)) P(1, x, y) + \ldots + w(P(n, x, y)) P(n, x, y)
-     \rightarrow
--    Q(x, y),\hskip4em\hbox{@equationW{}}
-+    Q(x, y)
- $$
- @end tex
- @docbook
-@@ -2948,7 +2931,7 @@
- be extreme, favoring only a few pixels or even only one pixel in the
- input stack.  Extremes are not typical, however.
- 
--Equal weights are another extreme that turns @equationW{} into an
-+Equal weights are another extreme that turns the equation into an
- arithmetic average.  This is why we sometimes speak of the ``averaging
- property'' of this weighting algorithm, like smoothing out noise.
- 
-@@ -2969,7 +2952,7 @@
- wins, this is, gets weight@tie{}one, and all other pixels get the
- weight of zero
- (@uref{http://@/en.wikipedia.org/@/wiki/@/The_@/Winner_@/Takes_@/It_@/All,,``The
--Winner Takes It All.''}).  With @option{--hard-mask} Equation@tie{}@equationW{}
-+Winner Takes It All.''}).  With @option{--hard-mask} the equation
- becomes
- @ifinfo
- @display
-@@ -3114,8 +3097,8 @@
- 
- @noindent
- Note that this ``averaging'' scheme lacks the nice noise-reduction
--property of the weighted average@tie{}@equationW{}, because only a
--single input pixel contributes to the output.
-+property of the weighted average, because only a single input pixel
-+contributes to the output.
- 
- 
- @node Single Criterion Fusing
-@@ -3562,7 +3545,7 @@
- 
- @noindent
- It associates a probability@tie{}@math{p} with each of the @math{n}
--different possible outcomes@tie{}@inlineomega{} of the random
-+different possible outcomes@tie{}@math{omega} of the random
- variable@tie{}@math{X}.
- @cindex expectation value
- Based on @math{w}, we define the @dfn{expectation value} or ``First
-@@ -4189,7 +4172,7 @@
- @end docbook
- 
- @noindent
--The parameter@tie{}@inlinesigma{}, the argument of
-+The parameter@tie{}@math{sigma}, the argument of
- option@tie{}@option{--contrast-edge-scale}, is the length scale on which edges
- are detected by @math{g(x, y)}.  We apply the Laplacian operator in
- Cartesian coordinates
-@@ -4401,7 +4384,7 @@
- </informalequation>
- @end docbook
- 
--where we have used the dimensionless distance@tie{}@inlinexi{} from
-+where we have used the dimensionless distance@tie{}@math{xi} from
- the origin
- @ifinfo
- @display
-@@ -4556,7 +4539,7 @@
- @float Figure,Figure:laplacian-of-gaussian
- @vimage{laplacian-of-gaussian}
- 
--@caption{Laplacian-of-Gaussian function for @inlinesigma{} = 0.5.}
-+@caption{Laplacian-of-Gaussian function for @math{sigma} = 0.5.}
- 
- @shortcaption{Laplacian-of-Gaussian}
- @end float
-@@ -4656,10 +4639,10 @@
- @var{CURVATURE} nor the mode of operation (@acronym{SDev}-only,
- @acronym{LoG}-only, or a blend of both) scales to different image
- sizes.  In practice, this means that if you start with a set of
--reduced size images, say 2808@classictimes{}1872 pixels, carefully
-+reduced size images, say 2808x1872 pixels, carefully
- optimize @var{EDGESCALE}, @var{CURVATURE} and so on, and find
- @acronym{LoG}-only the best mode, and then switch to the original
--resolution of 5616@classictimes{}3744 pixels, multiplying (or
-+resolution of 5616x3744 pixels, multiplying (or
- dividing) the parameters by four and sticking to @acronym{LoG}-only
- might @emph{not} result in the best fused image.  For best quality,
- perform the parameter optimization and the search for the most
-@@ -5080,9 +5063,9 @@
- Images should align well to be suitable for fusion.  However, there is
- no hard mathematical rule what ``well'' means.  The alignment
- requirements for 16@dmn{MPixel} images to yield a sharp
--4"@classictimes{}6" print at 300@dmn{dpi} (``dpi'' means dots per
-+4"x6" print at 300@dmn{dpi} (``dpi'' means dots per
- inch) or even for web presentation are relatively low, whereas the
--alignment of 8@dmn{MPixel} images for a 12"@classictimes{}18" print
-+alignment of 8@dmn{MPixel} images for a 12"x18" print
- ought to be tight.
- 
- @pindex hugin
-@@ -5548,7 +5531,7 @@
- 
- Let us use an example to illustrate the problem of relating the
- sharpness with the local contrast variations.  Say we use a
--5@classictimes{}5 contrast window.  Moreover, let @code{sharp_edge}
-+5x5 contrast window.  Moreover, let @code{sharp_edge}
- and @code{smooth_edge} be two specific configurations:
- 
- @example
-@@ -5727,7 +5710,7 @@
- Apply the default grayscale projector: @code{average} and throw away
- all edges with a curvature of less than 0.5% and replace the
- @acronym{LoG} data between 0% and 0.5% with @acronym{SDev} data.  Use
--a window of 7@classictimes{}7@dmn{pixel} window to compute the
-+a window of 7x7@dmn{pixel} window to compute the
- @acronym{SDev}.
- @end table
- 
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/versenblend.texi
---- a/doc/versenblend.texi	Fri Aug 07 16:43:18 2015 +0200
-+++ b/doc/versenblend.texi	Fri Aug 07 16:43:24 2015 +0200
-@@ -1,4 +1,4 @@
--@set UPDATED 10 March 2014
--@set UPDATED-MONTH March 2014
-+@set UPDATED 15 June 2015
-+@set UPDATED-MONTH June 2015
- @set EDITION 4.1.3
- @set VERSION 4.1.3
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/versenfuse.texi
---- a/doc/versenfuse.texi	Fri Aug 07 16:43:18 2015 +0200
-+++ b/doc/versenfuse.texi	Fri Aug 07 16:43:24 2015 +0200
-@@ -1,4 +1,4 @@
--@set UPDATED 10 March 2014
--@set UPDATED-MONTH March 2014
-+@set UPDATED 15 June 2015
-+@set UPDATED-MONTH June 2015
- @set EDITION 4.1.3
- @set VERSION 4.1.3
-
diff --git a/media-gfx/enblend/files/enblend-4.1.3-vigra_check.patch b/media-gfx/enblend/files/enblend-4.1.3-vigra_check.patch
deleted file mode 100644
index d067df3c57ae..000000000000
--- a/media-gfx/enblend/files/enblend-4.1.3-vigra_check.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/ConfigureChecks.cmake	2013-10-07 10:50:00.000000000 +0400
-+++ b/ConfigureChecks.cmake	2015-03-31 13:42:40.179527224 +0300
-@@ -53,7 +53,7 @@
- if(VIGRA_FOUND AND NOT VIGRA_VERSION_CHECK)
-   unset(VIGRA_SETIMAGEINDEX CACHE)
-   set(CMAKE_REQUIRED_INCLUDES ${VIGRA_INCLUDE_DIR})
--  set(CMAKE_REQUIRED_LIBRARIES ${VIGRA_LIBRARIES})
-+  set(CMAKE_REQUIRED_LIBRARIES ${VIGRA_LIBRARIES} -lpthread)
-   check_cxx_source_compiles(
-   "
-   #include <vigra/imageinfo.hxx>
diff --git a/media-gfx/enblend/metadata.xml b/media-gfx/enblend/metadata.xml
index 621b21a35cf1..9495d45d212c 100644
--- a/media-gfx/enblend/metadata.xml
+++ b/media-gfx/enblend/metadata.xml
@@ -5,10 +5,6 @@
 		<email>graphics@gentoo.org</email>
 		<name>Gentoo Graphics Project</name>
 	</maintainer>
-	<use>
-		<flag name="gpu">GPU support for Enblend</flag>
-		<flag name="image-cache">allow for processing of large images</flag>
-	</use>
 	<upstream>
 		<remote-id type="sourceforge">enblend</remote-id>
 	</upstream>
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index ea2849992c20..3c4a9aea012e 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -3,8 +3,10 @@ DIST feh-2.18.3.tar.bz2 2127924 BLAKE2B c667a7bea38e66afd4ed7c688c32327700419648
 DIST feh-2.24.tar.bz2 2130683 BLAKE2B b1f720d9ef74b4418daf92b945e57ca7d34839f72f5be47312dd936274e411a0ec4d4df2042cbb98a0656fd52a9cce804d627e8db497467ef4461eb994e5ccd3 SHA512 5d745586201dfc9b72a2e3987aed5d9c36f18c3123d3083c1c130f6b301da98dccbc79bc6aa55c70a895e831a7325c4cbf75fa2ca82a3a05eda3e98e1de8cb7d
 DIST feh-2.25.1.tar.bz2 2131624 BLAKE2B 3e7d9145bb416d433f3ec92b5c921a734de137e3637999b6c3c6ac7e8d8b2e05a8a34dcdb12715431d4dd22f37a6e70b93bd18831c5e05ae9ce91b8e2e2f17d4 SHA512 a821d46901d4cf59bb09b911f28c6ab26fbd0ee9784b50fbacfb6cf23483da5d29ebbb4cc53b23289181bb3ba0dc9893a3f39a90b3420d0bd98d740d5583fc3e
 DIST feh-2.25.tar.bz2 2131457 BLAKE2B 50a3ab469dc637195e4421871ee01f690dd890abf97d408e2781684e497623d455ce3a92f5f809b3ab1562396d605618061786cfbaf78541064cc6c2c0892d1a SHA512 42bac46f71d3833affd076d985464c32dbba5ad34c0ab02692e6d9dba68304b2209c87221340f695408c1959a4482cdaf18fda6552a14cc42e08655bbb28ae4a
+DIST feh-2.26.3.tar.bz2 2132140 BLAKE2B 4d1e87ecdc0aac06c06fe0f0901aaaf26cd288bbf7283e9106b3034c806230680feb18742dabd6648efe9dfe81e703fe6b17580f1a1ea95a6d21d50a47aac438 SHA512 b7212e99d4210b71c1d84e6712b7cac18a65367ebf9a17d889412dddb66aefd2c3f0bf0b624b09f3b46aa007cd27ac1bd2e4a7c4757e8bc90d49d2a435baaf06
 EBUILD feh-2.18.3.ebuild 1194 BLAKE2B a9ba56ee28f45ba475db7373f3caf7534fb9cb1e020b85b6f4fa19fecd00cd23c493d862b662639e73cd2e9b38bc8703e42a36107e26cee636b0ad871b1d6990 SHA512 f23c472d2686a21fb3c81111415682d059a121eb5e0a14a6a71298395407e3aea0f5a16b9d91ca8c46c2e7a1ce455656832863ba63de2a142e056dac132e7346
 EBUILD feh-2.24.ebuild 1198 BLAKE2B 4e4dc1080aaf4b7df37314c30f175ddbdb52b3335b575a9bec86b63855e33cb34e574fa8085aed2484b0aaa990414edfef533380e96b4dbf05b3460dcb76615a SHA512 98e07ca40951af821217239f3124b6c189dc82ba551cf841d759f9ae4aec72a50c3f447b88c522b61ac24255d8c76dbe930fc2b9009ba54bee02b1fd5e65e43a
 EBUILD feh-2.25.1.ebuild 1198 BLAKE2B 4e4dc1080aaf4b7df37314c30f175ddbdb52b3335b575a9bec86b63855e33cb34e574fa8085aed2484b0aaa990414edfef533380e96b4dbf05b3460dcb76615a SHA512 98e07ca40951af821217239f3124b6c189dc82ba551cf841d759f9ae4aec72a50c3f447b88c522b61ac24255d8c76dbe930fc2b9009ba54bee02b1fd5e65e43a
 EBUILD feh-2.25.ebuild 1198 BLAKE2B 4e4dc1080aaf4b7df37314c30f175ddbdb52b3335b575a9bec86b63855e33cb34e574fa8085aed2484b0aaa990414edfef533380e96b4dbf05b3460dcb76615a SHA512 98e07ca40951af821217239f3124b6c189dc82ba551cf841d759f9ae4aec72a50c3f447b88c522b61ac24255d8c76dbe930fc2b9009ba54bee02b1fd5e65e43a
+EBUILD feh-2.26.3.ebuild 1470 BLAKE2B 495d4329c2ba76a0715a7cb543b488e25770d0ddc93065c4a8dd94b39830cdc753e3fcecc3661e681aca176595a67bf52377bca3afe361b4c055dcca4ef2eddd SHA512 62e7f3e5c35080196eeeeb348ddf72e692b92914718c8ced8222248694ba99d04d49585fc5c8dcce430ff109c2ebd4ff958b7db492677debb67ec8eb76761b69
 MISC metadata.xml 465 BLAKE2B 8f1b9aeb152fc8941e9cf72cf562b46d4b7b93677713b99cc7ba01cffba527cfc818e5b0dfb8d5d3878dd31f2488277036f876c01d2d85a5422b285275819eb3 SHA512 7156b24a140c6b586af743cc670b588eaba3c255fd356f689c26c737195ebcb9d36bcf7cc6291c668d8ae6a4da3d4914a0830d80d86e3831e966bc38708607c8
diff --git a/media-gfx/feh/feh-2.26.3.ebuild b/media-gfx/feh/feh-2.26.3.ebuild
new file mode 100644
index 000000000000..0fc4bf732db8
--- /dev/null
+++ b/media-gfx/feh/feh-2.26.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs gnome2-utils xdg-utils
+
+DESCRIPTION="A fast, lightweight imageviewer using imlib2"
+HOMEPAGE="https://feh.finalrewind.org/"
+SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
+
+LICENSE="feh"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug curl exif test xinerama"
+
+COMMON_DEPEND="media-libs/imlib2[X]
+	>=media-libs/libpng-1.2:0=
+	x11-libs/libX11
+	curl? ( net-misc/curl )
+	exif? ( media-libs/libexif )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${COMMON_DEPEND}
+	virtual/jpeg:0"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+	x11-libs/libXt
+	test? (
+		>=dev-lang/perl-5.10
+		dev-perl/Test-Command
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.6.2-debug-cflags.patch )
+
+pkg_setup() {
+	use_feh() { usex $1 1 0; }
+
+	fehopts=(
+		DESTDIR="${D}"
+		PREFIX="${EPREFIX}"/usr
+		doc_dir='${main_dir}'/share/doc/${PF}
+		example_dir='${main_dir}'/share/doc/${PF}/examples
+		curl=$(use_feh curl)
+		debug=$(use_feh debug)
+		xinerama=$(use_feh xinerama)
+		exif=$(use_feh exif)
+	)
+}
+
+src_compile() {
+	tc-export CC
+	emake "${fehopts[@]}"
+}
+
+src_install() {
+	emake "${fehopts[@]}" install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/freepv/Manifest b/media-gfx/freepv/Manifest
index 1334b780b78b..c0624b8cda49 100644
--- a/media-gfx/freepv/Manifest
+++ b/media-gfx/freepv/Manifest
@@ -5,6 +5,5 @@ AUX freepv-0.3.0-noplugin.patch 1099 BLAKE2B 41c3c76e19d058764a700665f7c139f3b1d
 AUX freepv-0.3.0-stringh.patch 273 BLAKE2B 16781116005749beead28a96190ae04f19808934c20d52f62c7c858a6eb42793b5de2bc394373499636b7367e48819e1e48fe4cf40dcb9de80c3001d395d34ae SHA512 b368117f3a675df53e76ada4b13aa6d99f2744f006b2a8d6e37c96c5a1c62f48383042a519e82d03bd569192615de94f1b87dfa851178924d6b002522372b67f
 AUX freepv-0.3.0-unsigned_short.patch 1787 BLAKE2B 975d3b534deb4198b505553cd05f34369db07a98706a2b6154891cc1d163e538ca9430d91db340fcf88ea2e9b6325c3047af4c24d0e248fb384da7a749ea2eff SHA512 aba4a7b0d882ebce73b5ec823e8a51cec2788efdc4d9000c9d48a3c07a77e88dbee1e24ffdb1a57b2a4ae45b9310b25cf0157c15d73f8fffdf0a2582e8b88078
 DIST freepv-0.3.0.tar.gz 175545 BLAKE2B 7169679ffb5eeaefb4f558056fc7abe9b8093722e21c0313bf22ad9839c8274d58f8123758a5842bfe06edd3fd9b84b927a25b932607efe7d0f67b772d99c8e3 SHA512 0b207dc25c51b19fd76637743adb8e395c6098d03611612086d66d3f1aa6e4d0c5700aa0e23210082d6aa7495f19d1c3d8f0f93ad11a5236df86d709d5f71a7d
-EBUILD freepv-0.3.0-r4.ebuild 979 BLAKE2B 640fe9ed24fed4dfb0cc58a729bf4047f7f3afa5436d0b551f540cf0fe20969cacc213dcd17ddb81e160704ca30568fd920f3491963107824abcb9a3de5ae94d SHA512 7e5243b3abfbcbfbe8a766f581950439e9609bf3ecb899f951df21851acdde5ee955388d89ff9a0ef18e748c30a3d12d41f214d37a01d7955d652837cd4e4f3a
 EBUILD freepv-0.3.0-r5.ebuild 1065 BLAKE2B 1390f41b75114a3ae735e3d55fa666444f6272bc9184a7b3b6893d590a3b04e59e77eb96e5cc1a6fe388b9d704b89551335c1a6ee216c16cda3ae33e6d4bd9a7 SHA512 32077cae06f717bb1e07331d07e1f945e2968eee23907891e6c20341c074a48415b1cd20209455d30f4c17cf9b9e49e46fb83393e92de65cee758a449e54da01
 MISC metadata.xml 474 BLAKE2B d3d6659b4526c50e8b141bed97fedbf2dc99626760444f637c4a8601b634cdd2e2c3fa18ab5a269adc32efccaaaaf8f39c7dbaa71b5ff83ad2204417e1e0dc2b SHA512 4466402d68177a660716acf3afdb8ddc2074e8ac7ad35f2ad6b31adc9fe938b39cc999dc082fa07f8787be8798a053a6248dac12091a22d32d9fb83a1022b421
diff --git a/media-gfx/freepv/freepv-0.3.0-r4.ebuild b/media-gfx/freepv/freepv-0.3.0-r4.ebuild
deleted file mode 100644
index 464bdb32ea38..000000000000
--- a/media-gfx/freepv/freepv-0.3.0-r4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils eutils
-
-DESCRIPTION="Panorama viewer (Quicktime, PangeaVR, GLPanoView formats)"
-HOMEPAGE="http://freepv.sourceforge.net/"
-SRC_URI="mirror://sourceforge/freepv/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-libs/libxml2
-	media-libs/libpng:0=
-	media-libs/freeglut
-	sys-libs/zlib
-	virtual/jpeg
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXxf86vm"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc44.patch
-	"${FILESDIR}"/${P}-gcc46.patch
-	"${FILESDIR}"/${P}-noplugin.patch
-	"${FILESDIR}"/${P}-libpng14.patch
-	"${FILESDIR}"/${P}-stringh.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i \
-		-e 's:jpeg_mem_src:freepv_jpeg_mem_src:g' \
-		src/libfreepv/JpegReader.cpp || die 'jpeg sed failed'
-
-	sed -i -e 's:^INSTALL(.*)::' \
-		src/libfreepv/CMakeLists.txt || die 'static lib install sed failed'
-}
diff --git a/media-gfx/ipe/Manifest b/media-gfx/ipe/Manifest
deleted file mode 100644
index c4816a72db66..000000000000
--- a/media-gfx/ipe/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX ipe-7.1.3-gold.patch 1175 BLAKE2B 4ef9651bed7c62093bc6a7ac15c50ca758f327b05ea69e6330830fd32df6496f3a7c1b90aedcc0c622df33f3dcfffb916df1b73a511b81df424e6535d91348f3 SHA512 8ae03dd3b1720223db8a009948f09b0581eeeb7df02f61558d26c27a36108ee780d071ae46bea81c5173b3329b1ec856f3ded10faf0609cc59c140910f1af562
-DIST ipe-7.1.2-src.tar.gz 1416404 BLAKE2B e3eb5e92d7713703eaac5c6591a2553e9ba428d7a4d99cb9b5b88212f7bb8f72b7f315db4949a8665ed26c8d11e9fe16a2416291b0613ba28365b3a5e436dbb6 SHA512 9d49c5f116a6271fce5a5a6c77cad64e348b17b9b02d1be8bece341231ebc15f642d6af49e73958e4d26814eafc52be38855e4d24e8cf44488da6a752151a189
-DIST ipe-7.1.3-src.tar.gz 1497624 BLAKE2B 2e2c635d4797c5b3b1c7101f6c5112437caf6c3bf013ce5edd3439827d47aceb6d6b7aa33c21d758b9a8b8c0a265d4ee96617d0ae9fc8db97034991942bd9ed2 SHA512 eea85ed6f4bc23e746222e01f4cdfd101c9c18aeb19fcba9abff565a65614a2a5e6630ddf9f7b024cac225582a34238a22f6fc5cf7dcc3733b8281ce844ef23d
-EBUILD ipe-7.1.2.ebuild 1712 BLAKE2B 9f1d1a8ed22bd8f29363474ce8c696b2391ee8424d797339d905aa512aa1bb0099f142a011d48cb777df01dadce1438ea0c66cae4cb946dcdf76966946ed0655 SHA512 ab00eda3ddbcadf56f98014a95fa86456ffda64241dff4341e5127297f67e82fe9d2b024c658557619767940e00a1087e494da00e07a36b91337b6701af01e4c
-EBUILD ipe-7.1.3.ebuild 1753 BLAKE2B 24f296ff90650c417a9335c05b31f78b3464dfb7859986bf62e6c8392f955064f4e3ca8c3ab5705b9f72f3bb1e67ce2915d284aa430fd5f8c63bc1be8a7bf7b5 SHA512 a7cf07a4e420e181e7692eb2226c74119b94af44181ee14f622f6077e3e296b7f1b7303efa44a51a8180e7055cbbf9d3b6259e82748986464dfc38681c3e34af
-MISC metadata.xml 600 BLAKE2B 990436716dce9ba595b39445d063bbbf2754940adc3741e079fd861db5848b975af8551de9da4c8e1e89da3d7357626c1d2784e5541225cbe3c2339c1e5ae33c SHA512 7a0feac244ba6e344f4a88f41bf9c4ffb25c9a37c62326ad71bcd5b64ad61edab86f14b59121182d21f2e171899fd5a1ec63869b06ebb88773eed1e150f7d417
diff --git a/media-gfx/ipe/files/ipe-7.1.3-gold.patch b/media-gfx/ipe/files/ipe-7.1.3-gold.patch
deleted file mode 100644
index a28fafa15c43..000000000000
--- a/media-gfx/ipe/files/ipe-7.1.3-gold.patch
+++ /dev/null
@@ -1,30 +0,0 @@
- src/ipe/Makefile       | 2 +-
- src/ipescript/Makefile | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/ipe/Makefile b/src/ipe/Makefile
-index 21ac500..5a7a1ad 100644
---- a/src/ipe/Makefile
-+++ b/src/ipe/Makefile
-@@ -10,7 +10,7 @@ TARGET = $(call exe_target,ipe)
- CPPFLAGS += -I../include -I../ipecanvas -I../ipecairo -I../ipelua \
- 	$(LUA_CFLAGS) $(UI_CFLAGS) $(CAIRO_CFLAGS) $(ZLIB_CFLAGS)
- LIBS += -L$(buildlib) -lipecanvas -lipecairo -lipelua -lipe -lipeui \
--	$(LUA_LIBS) $(UI_LIBS) $(CAIRO_LIBS) $(ZLIB_LIBS)
-+	$(LUA_LIBS) $(UI_LIBS) $(CAIRO_LIBS) $(ZLIB_LIBS) -ldl
- 
- CPPFLAGS += -DIPELETDIR=\"$(IPELETDIR)\"
- CPPFLAGS += -DIPELUADIR=\"$(IPELUADIR)\"
-diff --git a/src/ipescript/Makefile b/src/ipescript/Makefile
-index ff35fd9..2315f1f 100644
---- a/src/ipescript/Makefile
-+++ b/src/ipescript/Makefile
-@@ -8,7 +8,7 @@ include ../common.mak
- TARGET = $(call exe_target,ipescript)
- 
- CPPFLAGS += -I../include -I../ipelua $(LUA_CFLAGS) 
--LIBS += -L$(buildlib) -lipelua -lipe $(LUA_LIBS)
-+LIBS += -L$(buildlib) -lipelua -lipe $(LUA_LIBS) -ldl
- 
- CPPFLAGS += -DIPELETDIR=\"$(IPELETDIR)\"
- CPPFLAGS += -DIPESTYLEDIR=\"$(IPESTYLEDIR)\"
diff --git a/media-gfx/ipe/ipe-7.1.2.ebuild b/media-gfx/ipe/ipe-7.1.2.ebuild
deleted file mode 100644
index 95a1767ba501..000000000000
--- a/media-gfx/ipe/ipe-7.1.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils toolchain-funcs qt4-r2
-
-DESCRIPTION="Drawing editor for creating figures in PDF or PS formats"
-HOMEPAGE="http://ipe7.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ipe7/${PN}/7.1.0/${P}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-text/texlive-core
-	dev-lang/lua
-	media-libs/freetype:2
-	x11-libs/cairo
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${P}/src"
-
-search_urw_fonts() {
-	# colon-separated list of paths
-	local texmfdist="$(kpsewhich -var-value=TEXMFDIST)"
-	# according to TeX directory structure
-	local urwdir=fonts/type1/urw
-	# add colon as field separator
-	local IFS="${IFS}:" dir
-	for dir in ${texmfdist}; do
-		if [[ -d ${dir}/${urwdir} ]]; then
-			URWFONTDIR="${dir}/${urwdir}"
-			return 0
-		fi
-	done
-	return 1
-}
-
-pkg_setup() {
-	if search_urw_fonts; then
-		einfo "URW fonts found in ${URWFONTDIR}"
-	else
-		ewarn "Could not find directory containing URW fonts"
-		ewarn "Ipe will not function properly without them."
-	fi
-}
-
-src_prepare() {
-	sed -i \
-		-e 's/fpic/fPIC/' \
-		-e 's/moc-qt4/moc/' \
-		-e "s:\$(IPEPREFIX)/lib:\$(IPEPREFIX)/$(get_libdir):g" \
-		config.mak || die
-	sed -i -e 's/install -s/install/' common.mak || die
-
-}
-
-src_compile() {
-	emake \
-		CXX=$(tc-getCXX) \
-		IPEPREFIX="${EPREFIX}/usr" \
-		IPEDOCDIR="${EPREFIX}/usr/share/doc/${PF}/html"
-}
-
-src_install() {
-	emake install \
-		IPEPREFIX="${EPREFIX}/usr" \
-		IPEDOCDIR="${EPREFIX}/usr/share/doc/${PF}/html" \
-		INSTALL_ROOT="${ED}"
-	dodoc ../{news,readme}.txt
-	doicon ipe/icons/ipe.png
-	make_desktop_entry ipe Ipe ipe
-}
diff --git a/media-gfx/ipe/ipe-7.1.3.ebuild b/media-gfx/ipe/ipe-7.1.3.ebuild
deleted file mode 100644
index c25f67000442..000000000000
--- a/media-gfx/ipe/ipe-7.1.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils qt4-r2 toolchain-funcs
-
-DESCRIPTION="Drawing editor for creating figures in PDF or PS formats"
-HOMEPAGE="http://ipe7.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ipe7/${PN}/7.1.0/${P}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	app-text/texlive-core
-	dev-lang/lua
-	media-libs/freetype:2
-	x11-libs/cairo
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${P}/src"
-
-search_urw_fonts() {
-	# colon-separated list of paths
-	local texmfdist="$(kpsewhich -var-value=TEXMFDIST)"
-	# according to TeX directory structure
-	local urwdir=fonts/type1/urw
-	# add colon as field separator
-	local IFS="${IFS}:" dir
-	for dir in ${texmfdist}; do
-		if [[ -d ${dir}/${urwdir} ]]; then
-			URWFONTDIR="${dir}/${urwdir}"
-			return 0
-		fi
-	done
-	return 1
-}
-
-pkg_setup() {
-	if search_urw_fonts; then
-		einfo "URW fonts found in ${URWFONTDIR}"
-	else
-		ewarn "Could not find directory containing URW fonts"
-		ewarn "Ipe will not function properly without them."
-	fi
-}
-
-src_prepare() {
-	sed -i \
-		-e 's/fpic/fPIC/' \
-		-e 's/moc-qt4/moc/' \
-		-e "s:\$(IPEPREFIX)/lib:\$(IPEPREFIX)/$(get_libdir):g" \
-		config.mak || die
-	sed -i -e 's/install -s/install/' common.mak || die
-
-	epatch "${FILESDIR}"/${P}-gold.patch
-}
-
-src_compile() {
-	emake \
-		CXX=$(tc-getCXX) \
-		IPEPREFIX="${EPREFIX}/usr" \
-		IPEDOCDIR="${EPREFIX}/usr/share/doc/${PF}/html"
-}
-
-src_install() {
-	emake install \
-		IPEPREFIX="${EPREFIX}/usr" \
-		IPEDOCDIR="${EPREFIX}/usr/share/doc/${PF}/html" \
-		INSTALL_ROOT="${ED}"
-	dodoc ../{news,readme}.txt
-	doicon ipe/icons/ipe.png
-	make_desktop_entry ipe Ipe ipe
-}
diff --git a/media-gfx/ipe/metadata.xml b/media-gfx/ipe/metadata.xml
deleted file mode 100644
index 6446d13a5fe6..000000000000
--- a/media-gfx/ipe/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  Ipe is a drawing editor for creating figures in PDF or
-  (encapsulated) Postscript format. Ipe supports making small figures
-  for inclusion into LaTeX documents as well as making multi-page PDF
-  presentations.
-</longdescription>
-  <upstream>
-    <remote-id type="sourceforge">ipe7</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index 372ce08e3065..8701c6928731 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -1,5 +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-2.1.3-r3.ebuild 1240 BLAKE2B 58aabdf88496e831a36dccf809ff69c334bacb15245dfbd3b94fe44ff3968a4eb8330f2fb64828ed507378053a10b2642bb5896336f9ed557bc406db001f9bef SHA512 eea97966207d444a19c95f83e94420af6e9287d82528a70bdd5fe45bedf83c301e3784d5504d0dbfdcabd5307d76de3b45fce9c8ead0a4dbcac86cbe7095338d
-EBUILD librecad-9999.ebuild 1183 BLAKE2B 9b1ac89fa4d9bf2b29408b3588779fcfc99951bc884f1f68f7964bf78a8d10a907a84c78d8b12b5925f0a89a49ed4e5ec8307a8d2b0f4a272ad86ae790274421 SHA512 b6297b5e9686f35e0fd3efaf52a0e551cec321936cd0009370f17fdabcab61fdf501f505a427748d9af88130653997d7100b6c58d94db16562183205926f4676
+EBUILD librecad-2.1.3-r2.ebuild 1239 BLAKE2B 39a94d6a4804a225549c5e4b7f74ebf79578bcff2a1189347694fd39673c2c73a5513a35fbe6cf5214b5a26d5b729d404dc6a46c98ac6aeb33ffe8b05cb6eef4 SHA512 05095a8861c0c884afe82a5637ad0218ff0ac6a2d68a7610c8a4e49dbed73e2845d7b33e93549cdd039f12fe2364b7fac8e0f0dd497c246f49230d67030812bb
+EBUILD librecad-2.1.3-r3.ebuild 1241 BLAKE2B 2856c0a78d2dd5b3d43d7e1726be5258871e5eddb3dcdf79f34f9b3c31142f6b91c5fc8ec4cfdab7e1cad7f8fa012e2eaaa9cc19fa7bef4ee959b0c7212f174f SHA512 523de0503d2259089327399ff1fd3a1ffe73a8c3c024084bd07181714dca734fc16e8be49213c4fb3dafda0e12772b9ee12f36df0bb013a6857c9d83b9509f96
+EBUILD librecad-9999.ebuild 1184 BLAKE2B ccb254d96ec419c864da6ae95a37a6efce6e2dfc3e86d12f71fb4d5b5f6312a60792c7518edd01390c3110063d8b36c852d59210ecdc7d00b1c78b6b1d1a2c6a SHA512 8ab5110a9f847b221451da6de60b6b6ccc9f6fc694e77cdd4e3c8df67492a3cda7c11c21daffbd35ec4ba4f9755428c681d75a31e225dc18aa8d51372c006e28
 MISC metadata.xml 459 BLAKE2B 8b648b5abdd62d9df306c90d182164694c753231b16ad37319863ee37feac91b2e0fcc89212b5259a899287a638a68cb2e48fcc55af8a076d23b201e6b38ebb3 SHA512 108977904dfb070a16279d3306f40982a73b1cdddfa90e8ab22f83c4a75cd620a829fea9a56a0290d2d160b1d30fd0fb67e320f526726dd57a613e781c700b6c
diff --git a/media-gfx/librecad/librecad-2.1.3-r2.ebuild b/media-gfx/librecad/librecad-2.1.3-r2.ebuild
index f7735d744d31..aedbfb3814e6 100644
--- a/media-gfx/librecad/librecad-2.1.3-r2.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit eutils qmake-utils
 
 DESCRIPTION="Generic 2D CAD program"
-HOMEPAGE="http://www.librecad.org/"
+HOMEPAGE="https://www.librecad.org/"
 SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip"
 
 LICENSE="GPL-2"
diff --git a/media-gfx/librecad/librecad-2.1.3-r3.ebuild b/media-gfx/librecad/librecad-2.1.3-r3.ebuild
index 20902c58015f..52d397d7a4b8 100644
--- a/media-gfx/librecad/librecad-2.1.3-r3.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r3.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit eutils qmake-utils
 
 DESCRIPTION="Generic 2D CAD program"
-HOMEPAGE="http://www.librecad.org/"
+HOMEPAGE="https://www.librecad.org/"
 SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip"
 
 LICENSE="GPL-2"
diff --git a/media-gfx/librecad/librecad-9999.ebuild b/media-gfx/librecad/librecad-9999.ebuild
index efb61a9472a1..2ab7e7f06f7f 100644
--- a/media-gfx/librecad/librecad-9999.ebuild
+++ b/media-gfx/librecad/librecad-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit eutils git-r3 qmake-utils
 
 DESCRIPTION="Generic 2D CAD program"
-HOMEPAGE="http://www.librecad.org/"
+HOMEPAGE="https://www.librecad.org/"
 SRC_URI=""
 EGIT_REPO_URI="https://github.com/LibreCAD/LibreCAD.git"
 
diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest
index 944c1e135d7f..4576a7a09ce5 100644
--- a/media-gfx/luminance-hdr/Manifest
+++ b/media-gfx/luminance-hdr/Manifest
@@ -11,5 +11,5 @@ AUX luminance-hdr-2.5.1-openmp-automagic.patch 1574 BLAKE2B e8c289b8a66e258dd0ea
 DIST luminance-hdr-2.4.0.tar.bz2 10507522 BLAKE2B b8dc777211b63e4e03466612e1c4b7c685f921db292712c749fc14d9638a69fd735990fd5412c7376a7452911cb15212448afc03aa8407f0d6f9c65fac5d5769 SHA512 aa14a13d12ba382f5f8dcb79a57aa68864678db62f036ac2d8b8959da76f20b938481932a6fff3861eb6dbc5a1d4f06bc1f3e3ca9a6ce4f7a27a9db736aa8702
 DIST luminance-hdr-2.5.1.tar.bz2 10238826 BLAKE2B 02cc275e2433281e9305e07efb6f77a611ca8e8167ca478a0c4a4c16feab260203aeef501b24b52b54ff9ad92923fd52b2c6925d81e60b492f0ac2465e65b604 SHA512 5d2165ca69080b67426cbc7e30c3ad5545f1a9dacf09e76684c619633cd40b03ed2d0e32181a5dce9463addf20dce1afb58cbf4c0710688e143112687448be2c
 EBUILD luminance-hdr-2.4.0.ebuild 2010 BLAKE2B 725e43d724a797d695dcb8d6d0675442a30dad0b7fa4392daca1e3aafdffc479f30d3d5dc2777df7a8a7dfbbea30ec4a39d937d3f5b77cfeb08e6e7b6008f44c SHA512 017a18d18e0e724e7271f311371e19adadc40cc52a5699cd15f4b6383d4b761d2285833d408fe7db08fd8c2a9b8b0f9a3335f57112cadd40f9d73c6d9434521f
-EBUILD luminance-hdr-2.5.1.ebuild 1942 BLAKE2B fdc60d5f4bf3ee0336e269a7457de2e16547e24bb2865603df2a5fdfff9360f03067e4d607fa99158d7e194ed3c7728998f6738e59ba7a616a5824220e6434c4 SHA512 2412f71b89971d678a41f0301c500986f5c1e24422ca52e4b222f972be4f54f8f8fb6f13b959f81481040f35ea8d2d60d006799ee70bc8f28daf014c510c3a7f
+EBUILD luminance-hdr-2.5.1-r1.ebuild 1952 BLAKE2B c50b64bfdd0159e60108d0e02689ff3102c2332f9b501f6e31afbd2a45f7030518faca6b34a5a6dfd6ea61b204b1d7e1d8ee4bf019d142063561d2cc85ede12f SHA512 e085e42e58228f8da396f879071035d1ee5f299f82ff8e7f6ec170ce1252fc29d40ef28380f377b26b442955b2583ec7a122366ecd97212fc3b3d590f37d5a8a
 MISC metadata.xml 1276 BLAKE2B 5b913b3c342f4d5a6fc67c30008d8eb9469c61cea7f6a10b8c29d1e60324da71e662a4f4d16a0d4a20c7431f5bab3dc9e157efbeae5dacbdadf4b2f5989e9058 SHA512 f1c9daadf3632c1f22297fe5987484a72cb7f0fa3f0758883c7d3c4fe798a6cad7838b855267b1ccc4ca74574692d915e725940c77e9891652a7cc80604a2597
diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.5.1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild
index 8bf884629bcc..1321f071b96d 100644
--- a/media-gfx/luminance-hdr/luminance-hdr-2.5.1.ebuild
+++ b/media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/qtpfsgui/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LANGS=" cs de es fi fr hi hu id it pl ro ru sk tr zh"
 IUSE="cpu_flags_x86_sse2 fits openmp test ${LANGS// / l10n_}"
 
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
 	dev-qt/qtsql:5
-	dev-qt/qtwebengine:5
+	dev-qt/qtwebengine:5[widgets]
 	>=media-gfx/exiv2-0.14:0=
 	media-libs/lcms:2
 	media-libs/libpng:0=
@@ -33,8 +33,8 @@ RDEPEND="
 	media-libs/ilmbase:=
 	>=media-libs/openexr-1.2.2-r2:=
 	>=media-libs/tiff-3.8.2-r2:0
-	sci-libs/fftw:3.0[threads]
-	fits? ( sci-libs/cfitsio )
+	sci-libs/fftw:3.0=[threads]
+	fits? ( sci-libs/cfitsio:= )
 	sci-libs/gsl
 	virtual/jpeg:0
 "
diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index cbdf96d121f0..17fe1a2078e6 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,10 +1,4 @@
-AUX nomacs-3.6.1-batch-resize.patch 757 BLAKE2B 0eba44f34bcde704fcb5ae907ee25fbab3752481409df81d48feb7b923328dd03ceeb0958f5221da493eb9e847f9c8ca7c13a313f532a929e7c6627ddf12f2ff SHA512 781921c31fdd7714e654c7112b4b866c76a2140f5b7e2e9ec2859a06281e01d00912813bae8b6b44b2cc263c27da03ee4610cde692a184125d82747c8c8cf9df
 AUX nomacs-3.8.1-qt-5.11.patch 4507 BLAKE2B 5473253ebd9405ee31dc8fa230dc3548f15f3b01cbeadf388339f836091c4a0880346a1d06344e1935c79fa1f25d30f76e1bba87363b777235a181c28aba713b SHA512 14495e3f1a93c5559fef6bfa3a141ec8b9b84e11cce09d3f362f1a8f9de1ab2b31b6c3f1407fa3f79f828b79d65f940118a311c69ae0aefee9c19cd87880bb3c
-DIST nomacs-3.6.1.tar.gz 28604636 BLAKE2B 74045163d5dabf9858de4e11a2300a298c15d691b3991a56dc802e6b16ee484637de05674aa13ba1d31848bce2df4724c3e083c5d35f82dba926b16aeaf81327 SHA512 cfbda2be5ed015a5ea39cc3c3c9273e3164bb67f0c5fd4fac0e3c607075cf67cfea2311b21420585363a841d65a53c03e100af57c209786243c2c3dcaba11f8e
-DIST nomacs-3.8.0.tar.gz 32240476 BLAKE2B b0bf2832cda09c01b98c5ef540a0d3d61046ca652c2c0b8b382ba69b7623327f6bcaf030cce2b87719a4bda1141b2118cb184700bfbff83fc86b496622178a16 SHA512 90ffd1ea7f6d8e2f07b2b093ebc7cfec682f11b874d95e249f3d35a2ceb8b75e7a0c55f19c978231c3c8342abe5cb251359771fd90aa39b50ee0a6d1514e88e1
 DIST nomacs-3.8.1.tar.gz 32184536 BLAKE2B 3ba4e0b0220797991c5999164e27fb3c57218d87d17858f5cf6098d8b91ddd0b3330836642999ce953f3ce9b538dcb35ecb48400f94f11805cd8eedeed05b110 SHA512 ff27570bc15096d0e331ad2c871b2f504a414927b8e64166668dedbbbc41f8cd031d9fb142c89c22cff76bf79156f93decf1038e30eecfc3de3e328a325f0134
-EBUILD nomacs-3.6.1-r1.ebuild 1598 BLAKE2B 95aa8b0faf792aa1a6fdd92f1b3ef1f3ab740eb3900e454f2ba45a7f4700b0ddd20ecf9f40cbe086932058b2a9a670d71c3c11c0b7f7e57d1efc57b1abd1cdfa SHA512 57fce8366da69eff7739e5cd05c461ab1a577e59caf194d2b472ab1db83c29ad2ed12da6372d651d15339ae0307d58e260686e78f67ede84fcfd71f86b6054a8
-EBUILD nomacs-3.6.1.ebuild 1516 BLAKE2B 6f90ecc2401786a6ff3c06649006fd7994fe8dc53c1507937923eea49592b629102c5d49bf3047901a0d1464eb452e9294af482c0b75b3757870126914763513 SHA512 7852f9e0d3c4091b5326f4081bd3fa90d729910a036832a901f83880f55a196c26b12ff89e7f2c0cd2514af67e86c89ee939342aa459c333e0d580e17e9615bc
-EBUILD nomacs-3.8.0.ebuild 1661 BLAKE2B 286200d262f759b648747fb014ca76c24718153b9cbca0630b645637976a1b8871126809ab47971a1b03ac010ee3b3b163936c31d6a35e736c4eeead0dd8d528 SHA512 1edc2400b6f53cfbcc900cb8e3c94d82b3a1a4fc216383de413a73b9c76eada1bf5a8ffbb03a3aa35ccdd229171451352a334e34f1b90906bfc5c038c4f1fd31
-EBUILD nomacs-3.8.1.ebuild 1735 BLAKE2B 2bb1754a19a26e8547de56d1e97bbb49a36ac244df4e26fc86f50a224d1b1af2f64a49f62229c00f19a01c44669c410d05fac5ceacef8e776002b3892e28d1a5 SHA512 55c837c5117ce8ab7f97c95ed0b053c1139f257d6d9edfb38403828470bb6facd80a6a62ad84a166d4631d81a582f575970fa865f92f0a18f515320e78afab6e
+EBUILD nomacs-3.8.1.ebuild 1733 BLAKE2B 52eaaba8455349581f26a583159df4ad8494e68fca503fa1659455dea921a9829145e2ac4302e36325fc33fc77424b6b263191995f7d8be7ab8a9051f9eb7860 SHA512 894b46f2662f472253b281b007018caace584076517bd010908a506533b7b299325a4fd5c43443096b66bcd9a80a976b43a05c2938caca5748cf684b17986ec4
 MISC metadata.xml 588 BLAKE2B 544009f8f7b184b666e5b7bbb88ce395028032bd060a7abe16f2ed096accb11b0819c19b3898ca1fc96c61aacc9cf0bb5960716f711ba77c5f545f040dd31567 SHA512 f681a8f2f1ec2c2902d34829245790edd014eca1829479f2a47b9179f370d3c3d3c562c32dae1918a7616c8f75c7d94b525beec410ad39704b25fd502cefb5fb
diff --git a/media-gfx/nomacs/files/nomacs-3.6.1-batch-resize.patch b/media-gfx/nomacs/files/nomacs-3.6.1-batch-resize.patch
deleted file mode 100644
index b2dd078d0e94..000000000000
--- a/media-gfx/nomacs/files/nomacs-3.6.1-batch-resize.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 11cbd66ca66ea9d97d72546a92fe2b487e62481b Mon Sep 17 00:00:00 2001
-From: diemmarkus <diemmarkus@gmail.com>
-Date: Wed, 17 May 2017 10:08:05 +0200
-Subject: [PATCH] fixes #118 batch resizing - used to only work if rotate was
- active
-
----
- ImageLounge/src/DkCore/DkProcess.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/ImageLounge/src/DkCore/DkProcess.cpp b/ImageLounge/src/DkCore/DkProcess.cpp
-index a47b4194..d0dfd97f 100644
---- a/src/DkCore/DkProcess.cpp
-+++ b/src/DkCore/DkProcess.cpp
-@@ -255,8 +255,6 @@ bool DkBatchTransform::compute(QSharedPointer<DkImageContainer> container, QStri
- 		rotationMatrix.rotate((double)mAngle);
- 		tmpImg = tmpImg.transformed(rotationMatrix);
- 	}
--	else
--		tmpImg = img;
- 
- 	// logs
- 	if (!tmpImg.isNull()) {
diff --git a/media-gfx/nomacs/nomacs-3.6.1-r1.ebuild b/media-gfx/nomacs/nomacs-3.6.1-r1.ebuild
deleted file mode 100644
index 4f755d2ab8f7..000000000000
--- a/media-gfx/nomacs/nomacs-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils xdg-utils
-
-DESCRIPTION="Qt-based image viewer"
-HOMEPAGE="https://nomacs.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+jpeg opencv raw tiff zip"
-
-REQUIRED_USE="
-	raw? ( opencv )
-	tiff? ( opencv )
-"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[jpeg?]
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	>=media-gfx/exiv2-0.25:=
-	opencv? ( media-libs/opencv:=[-qt4(-)] )
-	raw? ( >=media-libs/libraw-0.14:= )
-	tiff? (
-		dev-qt/qtimageformats:5
-		media-libs/tiff:0
-	)
-	zip? ( >=dev-libs/quazip-0.7.2[qt5(+)] )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P}/ImageLounge"
-
-PATCHES=( "${FILESDIR}/${P}-batch-resize.patch" )
-
-src_prepare() {
-	default
-
-	# fix build with quazip-0.7.2 - bug 598354
-	sed -i -e "s/find_package(QuaZIP/find_package(QuaZip5/" cmake/Unix.cmake || die
-	sed -e "s/include <quazip/&5/" \
-		-i src/DkCore/DkImageLoader.cpp \
-		-i src/DkCore/DkImageContainer.cpp \
-		-i src/DkCore/DkBasicLoader.cpp \
-		-i src/DkGui/DkDialog.cpp || die
-
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_RAW=$(usex raw)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_QUAZIP=$(usex zip)
-		-DUSE_SYSTEM_QUAZIP=ON
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/nomacs/nomacs-3.6.1.ebuild b/media-gfx/nomacs/nomacs-3.6.1.ebuild
deleted file mode 100644
index 7d4943b91dc7..000000000000
--- a/media-gfx/nomacs/nomacs-3.6.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils xdg-utils
-
-DESCRIPTION="Qt-based image viewer"
-HOMEPAGE="https://nomacs.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE="+jpeg opencv raw tiff zip"
-
-REQUIRED_USE="
-	raw? ( opencv )
-	tiff? ( opencv )
-"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[jpeg?]
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	>=media-gfx/exiv2-0.25:=
-	opencv? ( media-libs/opencv:=[-qt4(-)] )
-	raw? ( >=media-libs/libraw-0.14:= )
-	tiff? ( media-libs/tiff:0 )
-	zip? ( >=dev-libs/quazip-0.7.2[qt5(+)] )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P}/ImageLounge"
-
-src_prepare() {
-	default
-
-	# fix build with quazip-0.7.2 - bug 598354
-	sed -i -e "s/find_package(QuaZIP/find_package(QuaZip5/" cmake/Unix.cmake || die
-	sed -e "s/include <quazip/&5/" \
-		-i src/DkCore/DkImageLoader.cpp \
-		-i src/DkCore/DkImageContainer.cpp \
-		-i src/DkCore/DkBasicLoader.cpp \
-		-i src/DkGui/DkDialog.cpp || die
-
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_RAW=$(usex raw)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_QUAZIP=$(usex zip)
-		-DUSE_SYSTEM_QUAZIP=ON
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/nomacs/nomacs-3.8.0.ebuild b/media-gfx/nomacs/nomacs-3.8.0.ebuild
deleted file mode 100644
index 91389e8030f2..000000000000
--- a/media-gfx/nomacs/nomacs-3.8.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils xdg-utils
-
-DESCRIPTION="Qt-based image viewer"
-HOMEPAGE="https://nomacs.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+jpeg opencv raw tiff zip"
-
-REQUIRED_USE="
-	raw? ( opencv )
-	tiff? ( opencv )
-"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[jpeg?]
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	>=media-gfx/exiv2-0.25:=
-	opencv? ( media-libs/opencv:=[-qt4(-)] )
-	raw? ( >=media-libs/libraw-0.14:= )
-	tiff? (
-		dev-qt/qtimageformats:5
-		media-libs/tiff:0
-	)
-	zip? ( >=dev-libs/quazip-0.7.2[qt5(+)] )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P}/ImageLounge"
-
-DOCS=( src/changelog.txt )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# fix build with quazip-0.7.2 - bug 598354
-	sed -i -e "s/find_package(QuaZIP/find_package(QuaZip5/" cmake/Unix.cmake || die
-	sed -e "s/include <quazip/&5/" \
-		-i src/DkCore/DkImageLoader.cpp \
-		-i src/DkCore/DkImageContainer.cpp \
-		-i src/DkCore/DkBasicLoader.cpp \
-		-i src/DkGui/DkDialog.cpp || die
-
-	sed -i -e "/setup_target_for_coverage/s/^/#/" CMakeLists.txt || die
-
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_RAW=$(usex raw)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_QUAZIP=$(usex zip)
-		-DUSE_SYSTEM_QUAZIP=ON
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/nomacs/nomacs-3.8.1.ebuild b/media-gfx/nomacs/nomacs-3.8.1.ebuild
index 782838abb005..4720454ff095 100644
--- a/media-gfx/nomacs/nomacs-3.8.1.ebuild
+++ b/media-gfx/nomacs/nomacs-3.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE="+jpeg +opencv raw tiff zip"
 
 REQUIRED_USE="
diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest
index 5fecc0366f9f..9f44eea6f64c 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -6,6 +6,6 @@ AUX povray-3.7.0.0-user-conf.patch 1491 BLAKE2B ee99672c70a5d7e12048acbfc50a3ef4
 AUX povray-3.7.0_rc6-darwin-defaults.patch 920 BLAKE2B 9cffcda18626cfdbea9a6b00ae99ee300d6b29a79e22229e35d116070b4a1ac1fbb4869242a043155a4fa189f701e6bc318cd3ba8fbc743d497db26c763926c8 SHA512 17ae635430f0d57157c9915ce5b25a88afcb34f6dd9552b27a42b32d638fdfbcb8b4e41ec89b52048db9d054812535b7b41f328ffe4554e719e4a3de21cbfdee
 DIST povray-3.7.0.0.tar.gz 38191521 BLAKE2B 5d936bdcdf9910ede2247cfa5e3881211da00762ac4bc08225dc6b53addc9e09546de9493e642b5d41228d81a50a4bcfbb5e606eb8bd9a224bb1afc5fc82db6e SHA512 82e3dbcd58b7ae921fe3b953815ca4dbbfb22eda434554baee4accabd1455b18cb511061f1cf9cf93128fab0a042df374fe2f68186d78c19853a465bd4bcbe10
 DIST povray-3.7.0.0_p20160914-fix-c++14.patch.bz2 12876 BLAKE2B b1c458764f04a57420a4562e9faacae4ae955c3d9ce4343ffd49176bb575f63830fcd58d0777dea22b975df118aa14e2bdd91509758d33d659daa3fbbaba5880 SHA512 3329da12a822762559445e208a746ff208c39f7b63e27ba84a390074bb52a105c9a2f66180e58c5157795bb16346e11b5b05efaf077ee0d8246179975a692b04
-EBUILD povray-3.7.0.0-r1.ebuild 4458 BLAKE2B c79b313eb47ecfe82a712e8ac44b3ad556ded679bc2fd96de5741b605d64f5d8a06717d0133389b258cc669e17645a6278d2e96284f86d13c09cc27f6b2d7e59 SHA512 227579890ea76e496c3c09c6783cdf96320659da73c365d3b96fba82b0241320a39be0a3a3cf6f29ab34fa4b93784a8aa1d205755ef6a009f3dbb383cfc06df8
+EBUILD povray-3.7.0.0-r1.ebuild 4513 BLAKE2B bca3975cbff9e41c8c5f560f554f0f64bff7d0d5a14eb27185e960ba56ee04cc4ff9fa779aa4aac40bb4a4548edaa267b34669c856abfa015a234526bdd13bee SHA512 deb99cdee185fe98d00c744ace38dc434188050bf38b2f62b2320cf3a0fcfea670b64c4ce8f28020354f9412276721906fb9704828aeaa6de3b48362eae8ed50
 EBUILD povray-3.7.0.0.ebuild 4392 BLAKE2B 7889135b1482356090f1073d4680e17905335c7586f20d47d8dc29c375e802c3440786ede36715e3f873c70d2ff61f30fff0ab2125024aaa12dfe36b99b871d1 SHA512 c74582d9f9534c9b1c3976e2c7bb5d61a4e24afcdf4ffe08ea2626125e96a5549805d0ab5fca60410da4842e446932dcacea2d628391282f8c6dc06980c56a5c
 MISC metadata.xml 504 BLAKE2B f0b8ba895e8949a452dc4ddac0f3e78513b3c91107131d288e9e4ea7d1dd406622ac8a3ddeacd0b3df039ce95ab6f3dd339b80bf91f48ea99ab6d5c74a6cb4d8 SHA512 e2146892acd26bd3fc03fe1733f67073a1db1106f568ac886548b7c3e4fef508d1f3a619d74b8573696f007ae764d26e1f8556c3dbb03b9434b71258f0bcbb00
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 097bd61ed04b..2b48c77734e6 100644
--- a/media-gfx/povray/povray-3.7.0.0-r1.ebuild
+++ b/media-gfx/povray/povray-3.7.0.0-r1.ebuild
@@ -112,6 +112,7 @@ src_configure() {
 		$(use_with X x "${EPREFIX}/usr/$(get_libdir)") \
 		$(use_enable static-libs static) \
 		$(usex tiff "" "NON_REDISTRIBUTABLE_BUILD=yes") \
+		--with-boost-libdir="${EPREFIX}/usr/$(get_libdir)" \
 		--without-libmkl \
 		--disable-pipe \
 		--disable-strip \
diff --git a/media-gfx/qrencode/Manifest b/media-gfx/qrencode/Manifest
index 2bc077e6c5ae..c3d1a7ca8d9a 100644
--- a/media-gfx/qrencode/Manifest
+++ b/media-gfx/qrencode/Manifest
@@ -1,6 +1,8 @@
 AUX qrencode-3.2.0-pngregenfix.patch 1339 BLAKE2B e4ae15f573ac9d00ae5286c41aa57fb2029f49f581d9e15dc6bd36a8f9364be83eae551d7db4995da5975e2dc5c0b984e5bec38b4839aaa2b6c710876021e3db SHA512 3155814da1abcbf0ad3c144e3470b5b2ae9e93d9d1b1df2437dfdf16b31aaa9efb3642ceedb6facdc640685ddc41cfddf2e7266994d6ad5f1fa0f24e1473a89a
 DIST qrencode-3.4.4.tar.bz2 369136 BLAKE2B 19e9a2089c6c22284da61dda57d1150573b72833c3e9d96d1aa8742a69cb7495b3c39b8162b0dd268e94412bbc618d1358dcfd969f12c0b3e9701414955aed46 SHA512 4835d462542e37e5460635e0dd84e291ff0976a6aec61c63f9950c1e60b446bc913220726e14f6379322bfd32ccd9bcd5fceed9ca10cb95343c952d8472b983d
 DIST qrencode-4.0.0.tar.bz2 429244 BLAKE2B 45fe8afe602e7ff20b750b5a0de8a3b52b61340ebf0bbcad2ae00e4a0ff2976077b5add4e2c1358d4ca852f79f4cdb27d9dab8c726bf72ff53964661335b5a0a SHA512 d4140d77fce3a1c39735cc3e98e3a19018daaa08c870644f71727d27ffb17711e76b4ed4e51718d90d812e78df75fe575617580ea9b1bf210438f8fd1734204e
+DIST qrencode-4.0.2.tar.bz2 430309 BLAKE2B 1f68d2a921ba60df3a6c7381d7886b27a2876f90771d78c12d5d0fed2d6a4edb4d7da5985e2b244406a0cf3434b351fbec8b12c5944c365078ef2b227edb0acd SHA512 2429c7938e32eacbaf327c029c7745ba33259f879661a8b6470cc617c780daf5bd1d5689599151df62e84badd2568eccab6c12f157331e512ab24a3899e0f002
 EBUILD qrencode-3.4.4-r1.ebuild 577 BLAKE2B 19577c82a04b248a08201344b226a236bf73b58540f0fb5c8e4d55493dfeade02cc1f0d22d096dda91a82b52f1c532f8068b755dc47be06e138e4b4a30516f7a SHA512 af41d0ff230fe92fdc21d7ee0ab93820187f1973f633dc7cc5b32140504c48729c30a9d35488cf59e90010a5852fd72111275118053789c6e5e4ccefeab35288
 EBUILD qrencode-4.0.0.ebuild 877 BLAKE2B 29aea20c217c2d95eea2083f8a5f7be1d1060bfd1de0bfadea9ec34594f5f2503de322274c9cca2fa9f45dd9841c6e04b09750f346ff93b901146ae74116ac0c SHA512 25fc4c0abc58d351c1d53c105d89c39d61a8eb9f63e9a2084183d047fc1846339842f0f17d6264dd524be298b5b8f8dcf92692327aa08f4b6b053a5ac8f45dbe
+EBUILD qrencode-4.0.2.ebuild 785 BLAKE2B b223dac0308d17648761f32b45339aa12074113f81f9c35f37f806198f2922239efe9634135a68fab44b7ffd4f7d2e29a6f14940e5911e765c51f2aa91a3a2d9 SHA512 a4d2e49119d9365f75f2d7c740496d6e302ad66dfefb1894925f6323c105ca3f3d0a5788afbafbeee85015ce4380626c8948f175ddf54d567086493c3eabb14c
 MISC metadata.xml 370 BLAKE2B af379243b15cc55c2e2c14bd20ec8b9bb41d4fbb6a87938aae5cbc39e17c78ac45b322d946eadec59fc48c13354fd9dfdffea8c2572301d8d4cb86f162d49bdc SHA512 f5987a8aab3b861bbe4961c69d0c72b07826c43320fd383075036ad63a070204c6ed41297b2490b4a14224f5c4269c37c40e5abc9bce4d1c5857e68e98d6428c
diff --git a/media-gfx/qrencode/qrencode-4.0.2.ebuild b/media-gfx/qrencode/qrencode-4.0.2.ebuild
new file mode 100644
index 000000000000..a12c5fe02c0a
--- /dev/null
+++ b/media-gfx/qrencode/qrencode-4.0.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="C library for encoding data in a QR Code symbol"
+HOMEPAGE="https://fukuchi.org/works/qrencode/"
+SRC_URI="https://fukuchi.org/works/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0/4"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="test"
+
+RDEPEND="media-libs/libpng:0="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		$(use_with test tests)
+		# TODO: figure out how to make SDL check fail as the SDL test
+		# program is not useful
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	cd tests || die
+	./test_basic.sh || die
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest
index 882b2e4f9b66..a40652e99642 100644
--- a/media-gfx/slic3r/Manifest
+++ b/media-gfx/slic3r/Manifest
@@ -1,10 +1,13 @@
 AUX slic3r-1.1.7-adjust_var_path.patch 274 BLAKE2B 7f360a202f1bcbeb42619ed7293a5997ebc47ab754fc2fed0c88bbf514bf32b6c72f7c64e9c86efef90d8aec93a72662da599af910c14f6186e0f3cc5b1e9482 SHA512 c13cf1a6f37aa13a9b85093e75de0d2368b4ca4623b28be17e7cfef5740b2b4f4cee69492c099bf936e4ee553e37389b8ffa9ea0df804a80a1cb6295cd198653
 AUX slic3r-1.2.9-adjust_var_path.patch 293 BLAKE2B e16ca1eb4c7037adc704250e090cee3be3bddf0b4e7f4cb24a1d3d6769239904bc7fcf1cc34dd521424a3555f02732253578c05f2b343570c202eec58bc5a519 SHA512 5a1ddca0380964c2bce9ba83dd9654671636433d0719cb54851e2ff521bd08c886f317073a1db5c145f8b3689248781cc1dc734c2071e6f6319be21845ed8a9d
 AUX slic3r-1.2.9-c++11.patch 1102 BLAKE2B 3cb6c1ab196a73da820190e2f00f65654a1e3ac22926a6de94f64bb23d8d31df73f4a4cbff1e757602b018d4e3a430ddd1f43f0f33d13a5814dff601d9ea4538 SHA512 e5fa8ba0ce1ccbf5da34559c1e4d6d2db3c71acff69129125aef68e785285649a2e9b6c66779caffd2fe400859e878178afbd3f1884a28d9bdbee3b66d86311c
+AUX slic3r-1.3.0-no-locallib.patch 15462 BLAKE2B 0fd73fbf341573392ebdab3c4d010e1a11cbf424ded6b5b6fab18c05ffde049a8816c2884a06acdbacf0f41ed30b4d136a849eb6bf92e5fb72591e6e0081592d SHA512 cdf791f721ab3a2356631ee9c74c796c48626c8313dd31dab59e880ab181734e892fa341bbb1a648d35303f4fb4a8e3c4615d360c317438876f67de1ef9f9187
 AUX slic3r-9999-no-locallib.patch 15462 BLAKE2B 0fd73fbf341573392ebdab3c4d010e1a11cbf424ded6b5b6fab18c05ffde049a8816c2884a06acdbacf0f41ed30b4d136a849eb6bf92e5fb72591e6e0081592d SHA512 cdf791f721ab3a2356631ee9c74c796c48626c8313dd31dab59e880ab181734e892fa341bbb1a648d35303f4fb4a8e3c4615d360c317438876f67de1ef9f9187
 DIST slic3r-1.1.7.tar.gz 2079200 BLAKE2B b3aa45741bb92a75dd09be783cb9a8cd551c7736f04022905d11587d8b2a533db85c1f88a9d0185b2b6414ba56d44e0feb104bcfcaf52a0a35a1db912c6976db SHA512 0c3a12890f57f422084b20152ede3467a8624db4ba8be774258df0af963c1f6f41fda7d96967f6355bd95727539e6aad51c30cf45284a7ee3fff294839acc650
 DIST slic3r-1.2.9.tar.gz 2165322 BLAKE2B 49643284520e6c85ff0e32fada165c8d4c75c15e484555aac1004bc9527bacd552c6aa4916cbb56e304553a47ef6c2db703f6e9d705a585cfbac909c2e84bb79 SHA512 c0284f40de43c54e775baccdb2a67813a6ca4b69db78a788f2023b3f34127e780e6d0160144b9df1e17a2992b3255ef9a372b61a594f503b21efad7334387a51
+DIST slic3r-1.3.0.tar.gz 2104094 BLAKE2B 74c58690cf196f89ecff5eec853215c87c648df5a504725fea9f14b0343bca105190de1d63e2e8e76d47fcaf8dbe7b6d26f61b304ce7336412effa1c9a3fba41 SHA512 ff0f7747e166826ff1c53220974ee9d3a217d0e19964dbe4a5fa3e81f262a6810a47632686b7f1b3128384ae05c6f98d8aab980524079bdf9811445fe23a0f0d
 EBUILD slic3r-1.1.7.ebuild 2909 BLAKE2B e27ded00dbfe3869bd08b5a7d969f78d23c96c34611e50997a57f9331a0b142de3e984e5a15eea219414b39c97fcd99633014bce2df072117ea334db2d41a868 SHA512 03a2ffd9a3290b582da0feb1eaff5445ec1baa991faa5dde9899f68d557bd234c2f20cca24a5660093e0695ef5ca47ed76059688da48d2561b92b45d17ece834
 EBUILD slic3r-1.2.9-r2.ebuild 2472 BLAKE2B 60a07b07348bec52717fa7476286030dd0ff9bda794c634e054386d67a46d3a640429eb8d301b356cf8e01d08f0b73777ae33944a2a65a7882618bca5ef16a95 SHA512 9937794276d490f75476fa39208f7726d0ad83534acb84ab5818cd1849c580cf3ce2c9f01b9eeaaee9ed9d4f49cc24bb9c4b95c4b45bbd70fd304678e0246795
+EBUILD slic3r-1.3.0.ebuild 2602 BLAKE2B e4f9a4e793ee552d839a563427ba4ffc4458736b114dfb13f0d99ea0c34d70d1bcc247f4679a436672b1259a4e1d4caa83e652ff6f6c942229c12af734058982 SHA512 7884576a45326e4ac368f3780595ac95ab90005d1d3abe9101fb7a45a16dfb56908b787e5deca39ac0f7e47f7e8390793dd514226fd4171c5abcbcd25d5b0bf8
 EBUILD slic3r-9999.ebuild 2621 BLAKE2B ac3c5a2f2790214a68522edae4b4e93958bd866bc236c0435ca535733a209ee05b96cee6ba1a470420ca1a9a3f66454c09b38eeb0e44d683a38977b797853626 SHA512 bfff6a690433fdd85398d841c738578e44569eb58df43b602502c062419a77b3786288944414b3114538cbc278ccb029fa074ce44e4f2fc919209052888dacdc
 MISC metadata.xml 861 BLAKE2B 91af33b7f79333028a2c77b24a4e910b93693a8aeec0e260405df9930489e4cadd3a4cf12f66e1b3b90a84113deb1c30108a7cdc000ef2097559871552385cfb SHA512 203b7d367c4eb6ff4b88fc304dac879277a2b515ed349d495d4231bbd3b097172f20a98fe4bb396b92114a78e7db3e56c2bfb3256e7ff94dfaded9e36696c6a8
diff --git a/media-gfx/slic3r/files/slic3r-1.3.0-no-locallib.patch b/media-gfx/slic3r/files/slic3r-1.3.0-no-locallib.patch
new file mode 100644
index 000000000000..8cb7fd6d16dc
--- /dev/null
+++ b/media-gfx/slic3r/files/slic3r-1.3.0-no-locallib.patch
@@ -0,0 +1,609 @@
+commit 6f7e42a4707788d079d865800d9fdb65ed7d5f1f
+Author: Ian Stakenvicius <axs@gentoo.org>
+Date:   Wed Sep 27 12:22:14 2017 -0400
+
+    Revert "Use --local-lib when calling cpanm"
+    
+    This reverts commit e5412b5d69dc4d5415c92a7daaa47fb4860ca4ea and others
+    that add local::lib dependency
+
+diff --git a/Build.PL b/Build.PL
+index 2dd18435..18befbf8 100644
+--- a/Build.PL
++++ b/Build.PL
+@@ -109,16 +109,7 @@ EOF
+         if !$cpanm;
+     my @cpanm_args = ();
+     push @cpanm_args, "--sudo" if $sudo;
+-    
+-    # install local::lib without --local-lib otherwise it's not usable afterwards
+-    if (!eval "use local::lib qw(local-lib); 1") {
+-        my $res = system $cpanm, @cpanm_args, 'local::lib';
+-        warn "Warning: local::lib is required. You might need to run the `cpanm --sudo local::lib` command in order to install it.\n"
+-            if $res != 0;
+-    }
+-    
+-    push @cpanm_args, ('--local-lib', 'local-lib');
+-    
++
+     # make sure our cpanm is updated (old ones don't support the ~ syntax)
+     system $cpanm, @cpanm_args, 'App::cpanminus';
+     
+diff --git a/slic3r.pl b/slic3r.pl
+index 11dc2fad..76885c90 100755
+--- a/slic3r.pl
++++ b/slic3r.pl
+@@ -6,7 +6,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/lib";
+-    use local::lib '--no-create', "$FindBin::Bin/local-lib";
+ }
+ 
+ use File::Basename qw(basename);
+diff --git a/t/adaptive_slicing.t b/t/adaptive_slicing.t
+index 64c3769f..5ab631fe 100644
+--- a/t/adaptive_slicing.t
++++ b/t/adaptive_slicing.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first sum);
+diff --git a/t/adaptive_width.t b/t/adaptive_width.t
+index 7a0baa75..c200f844 100644
+--- a/t/adaptive_width.t
++++ b/t/adaptive_width.t
+@@ -7,7 +7,6 @@ plan tests => 32;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first);
+diff --git a/t/angles.t b/t/angles.t
+index 2ae00b4e..1e1a6c9c 100644
+--- a/t/angles.t
++++ b/t/angles.t
+@@ -7,9 +7,6 @@ plan tests => 34;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use lib "$FindBin::Bin/../lib";
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/t/arcs.t b/t/arcs.t
+index ec85dfbc..65b83de4 100644
+--- a/t/arcs.t
++++ b/t/arcs.t
+@@ -7,7 +7,6 @@ plan tests => 24;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/t/avoid_crossing_perimeters.t b/t/avoid_crossing_perimeters.t
+index 7cd04e50..dd6c3e7b 100644
+--- a/t/avoid_crossing_perimeters.t
++++ b/t/avoid_crossing_perimeters.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first sum);
+diff --git a/t/bridges.t b/t/bridges.t
+index 677115b8..3dc6b84a 100644
+--- a/t/bridges.t
++++ b/t/bridges.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first sum);
+diff --git a/t/clean_polylines.t b/t/clean_polylines.t
+index 50c6f5bb..4526bd60 100644
+--- a/t/clean_polylines.t
++++ b/t/clean_polylines.t
+@@ -7,7 +7,6 @@ plan tests => 6;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/t/clipper.t b/t/clipper.t
+index 3c983814..a898a53f 100644
+--- a/t/clipper.t
++++ b/t/clipper.t
+@@ -7,7 +7,6 @@ plan tests => 6;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(sum);
+diff --git a/t/collinear.t b/t/collinear.t
+index b28a3602..9dee7770 100644
+--- a/t/collinear.t
++++ b/t/collinear.t
+@@ -7,7 +7,6 @@ plan tests => 11;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/t/combineinfill.t b/t/combineinfill.t
+index 66e461d4..6661cdd6 100644
+--- a/t/combineinfill.t
++++ b/t/combineinfill.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first);
+diff --git a/t/config.t b/t/config.t
+index 829ef5f3..7f85dae8 100644
+--- a/t/config.t
++++ b/t/config.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/t/cooling.t b/t/cooling.t
+index 80819bdc..5b2d4b4c 100644
+--- a/t/cooling.t
++++ b/t/cooling.t
+@@ -7,7 +7,6 @@ plan tests => 13;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(none all);
+diff --git a/t/custom_gcode.t b/t/custom_gcode.t
+index 9b58344e..3ff7c35d 100644
+--- a/t/custom_gcode.t
++++ b/t/custom_gcode.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first);
+diff --git a/t/fill.t b/t/fill.t
+index 765cfd47..d422d27a 100644
+--- a/t/fill.t
++++ b/t/fill.t
+@@ -7,7 +7,6 @@ plan tests => 95;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first sum max);
+diff --git a/t/flow.t b/t/flow.t
+index 37e9deaf..071d290c 100644
+--- a/t/flow.t
++++ b/t/flow.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first sum);
+diff --git a/t/gaps.t b/t/gaps.t
+index 01ec1b4e..16baa036 100644
+--- a/t/gaps.t
++++ b/t/gaps.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first);
+diff --git a/t/gcode.t b/t/gcode.t
+index ec9b7bb2..525356df 100644
+--- a/t/gcode.t
++++ b/t/gcode.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first);
+diff --git a/t/geometry.t b/t/geometry.t
+index 9c6eef55..4e6e7097 100644
+--- a/t/geometry.t
++++ b/t/geometry.t
+@@ -7,7 +7,6 @@ plan tests => 44;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/t/layers.t b/t/layers.t
+index a8599807..57fd2576 100644
+--- a/t/layers.t
++++ b/t/layers.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first);
+diff --git a/t/loops.t b/t/loops.t
+index d2bf7717..725154c9 100644
+--- a/t/loops.t
++++ b/t/loops.t
+@@ -7,7 +7,6 @@ plan tests => 4;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/t/multi.t b/t/multi.t
+index fb8cad81..4d6f8193 100644
+--- a/t/multi.t
++++ b/t/multi.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first);
+diff --git a/t/perimeters.t b/t/perimeters.t
+index 513c76ef..3ddde0b8 100644
+--- a/t/perimeters.t
++++ b/t/perimeters.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r::ExtrusionLoop ':roles';
+diff --git a/t/polyclip.t b/t/polyclip.t
+index 0808c7be..1292d321 100644
+--- a/t/polyclip.t
++++ b/t/polyclip.t
+@@ -7,7 +7,6 @@ plan tests => 18;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/t/pressure.t b/t/pressure.t
+index dde23695..6bbb81d8 100644
+--- a/t/pressure.t
++++ b/t/pressure.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw();
+diff --git a/t/print.t b/t/print.t
+index b78739e4..28cf1ee4 100644
+--- a/t/print.t
++++ b/t/print.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first);
+diff --git a/t/retraction.t b/t/retraction.t
+index 237af3ab..37dcb64b 100644
+--- a/t/retraction.t
++++ b/t/retraction.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(any);
+diff --git a/t/shells.t b/t/shells.t
+index 2347ff36..d64eb28c 100644
+--- a/t/shells.t
++++ b/t/shells.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first sum);
+diff --git a/t/skirt_brim.t b/t/skirt_brim.t
+index d6181ba2..cfa0698e 100644
+--- a/t/skirt_brim.t
++++ b/t/skirt_brim.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first);
+diff --git a/t/slice.t b/t/slice.t
+index 51b52163..301ae164 100644
+--- a/t/slice.t
++++ b/t/slice.t
+@@ -8,7 +8,6 @@ plan tests => 16;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ # temporarily disable compilation errors due to constant not being exported anymore
+diff --git a/t/speed.t b/t/speed.t
+index 5d9fb54c..3deab75b 100644
+--- a/t/speed.t
++++ b/t/speed.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(none);
+diff --git a/t/support.t b/t/support.t
+index 8d4655b3..b4f9ce04 100644
+--- a/t/support.t
++++ b/t/support.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first);
+diff --git a/t/svg.t b/t/svg.t
+index 6092efe2..9299eeef 100644
+--- a/t/svg.t
++++ b/t/svg.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/t/thin.t b/t/thin.t
+index 2d256d28..51461480 100644
+--- a/t/thin.t
++++ b/t/thin.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/t/threads.t b/t/threads.t
+index 7fcd86f0..106a68af 100644
+--- a/t/threads.t
++++ b/t/threads.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first);
+diff --git a/t/vibrationlimit.t b/t/vibrationlimit.t
+index 1a5488a6..7bfa27ac 100644
+--- a/t/vibrationlimit.t
++++ b/t/vibrationlimit.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/utils/amf-to-stl.pl b/utils/amf-to-stl.pl
+index 56df2e23..7edc1460 100755
+--- a/utils/amf-to-stl.pl
++++ b/utils/amf-to-stl.pl
+@@ -7,7 +7,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use File::Basename qw(basename);
+diff --git a/utils/config-bundle-to-config.pl b/utils/config-bundle-to-config.pl
+index e1d7f614..beecd666 100755
+--- a/utils/config-bundle-to-config.pl
++++ b/utils/config-bundle-to-config.pl
+@@ -9,7 +9,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Getopt::Long qw(:config no_auto_abbrev);
+diff --git a/utils/dump-stl.pl b/utils/dump-stl.pl
+index 6da275ab..4df94268 100644
+--- a/utils/dump-stl.pl
++++ b/utils/dump-stl.pl
+@@ -8,7 +8,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/utils/estimate-gcode-time.pl b/utils/estimate-gcode-time.pl
+index 43c558b6..eab4f6da 100755
+--- a/utils/estimate-gcode-time.pl
++++ b/utils/estimate-gcode-time.pl
+@@ -6,7 +6,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/utils/gcode_sectioncut.pl b/utils/gcode_sectioncut.pl
+index b94a2fc4..4d9619e4 100644
+--- a/utils/gcode_sectioncut.pl
++++ b/utils/gcode_sectioncut.pl
+@@ -7,7 +7,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Getopt::Long qw(:config no_auto_abbrev);
+diff --git a/utils/pdf-slices.pl b/utils/pdf-slices.pl
+index 30c41ae4..fa7612bb 100755
+--- a/utils/pdf-slices.pl
++++ b/utils/pdf-slices.pl
+@@ -7,7 +7,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Getopt::Long qw(:config no_auto_abbrev);
+diff --git a/utils/send-gcode.pl b/utils/send-gcode.pl
+index d87e6826..6f529b90 100644
+--- a/utils/send-gcode.pl
++++ b/utils/send-gcode.pl
+@@ -6,7 +6,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/utils/split_stl.pl b/utils/split_stl.pl
+index eb659b9c..16cf5a9d 100755
+--- a/utils/split_stl.pl
++++ b/utils/split_stl.pl
+@@ -7,7 +7,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use File::Basename qw(basename);
+diff --git a/utils/stl-to-amf.pl b/utils/stl-to-amf.pl
+index cb041893..81648b8e 100755
+--- a/utils/stl-to-amf.pl
++++ b/utils/stl-to-amf.pl
+@@ -7,7 +7,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use File::Basename qw(basename);
+diff --git a/utils/view-mesh.pl b/utils/view-mesh.pl
+index 91cd20a2..b122faed 100644
+--- a/utils/view-mesh.pl
++++ b/utils/view-mesh.pl
+@@ -7,7 +7,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Getopt::Long qw(:config no_auto_abbrev);
+diff --git a/utils/view-toolpaths.pl b/utils/view-toolpaths.pl
+index d4c47f07..4bbbaab4 100755
+--- a/utils/view-toolpaths.pl
++++ b/utils/view-toolpaths.pl
+@@ -7,7 +7,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Getopt::Long qw(:config no_auto_abbrev);
+diff --git a/utils/wireframe.pl b/utils/wireframe.pl
+index f49b66e5..053581de 100644
+--- a/utils/wireframe.pl
++++ b/utils/wireframe.pl
+@@ -8,7 +8,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Getopt::Long qw(:config no_auto_abbrev);
diff --git a/media-gfx/slic3r/slic3r-1.3.0.ebuild b/media-gfx/slic3r/slic3r-1.3.0.ebuild
new file mode 100644
index 000000000000..52dbf45085be
--- /dev/null
+++ b/media-gfx/slic3r/slic3r-1.3.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils perl-module
+
+DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
+HOMEPAGE="http://slic3r.org"
+SRC_URI="https://github.com/alexrj/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3 CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gui test"
+
+# check Build.PL for dependencies
+RDEPEND="!=dev-lang/perl-5.16*
+	>=dev-libs/boost-1.55[threads]
+	dev-perl/Class-XSAccessor
+	dev-perl/Devel-CheckLib
+	dev-perl/Devel-Size
+	>=dev-perl/Encode-Locale-1.50.0
+	dev-perl/IO-stringy
+	>=dev-perl/Math-PlanePath-53.0.0
+	>=dev-perl/Moo-1.3.1
+	dev-perl/XML-SAX-ExpatXS
+	virtual/perl-Carp
+	virtual/perl-Encode
+	virtual/perl-File-Spec
+	virtual/perl-Getopt-Long
+	virtual/perl-parent
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Test-Simple
+	virtual/perl-Thread-Semaphore
+	>=virtual/perl-threads-1.960.0
+	virtual/perl-Time-HiRes
+	virtual/perl-Unicode-Normalize
+	virtual/perl-XSLoader
+	gui? ( dev-perl/Class-Accessor
+		dev-perl/Growl-GNTP
+		dev-perl/libwww-perl
+		dev-perl/Module-Pluggable
+		dev-perl/Net-Bonjour
+		dev-perl/Net-DBus
+		dev-perl/OpenGL
+		>=dev-perl/Wx-0.991.800
+		dev-perl/Wx-GLCanvas
+		>=media-libs/freeglut-3
+		virtual/perl-Math-Complex
+		>=virtual/perl-Socket-2.16.0
+		x11-libs/libXmu
+	)"
+DEPEND="${RDEPEND}
+	dev-perl/Devel-CheckLib
+	>=dev-perl/ExtUtils-CppGuess-0.70.0
+	>=dev-perl/ExtUtils-Typemaps-Default-1.50.0
+	>=dev-perl/ExtUtils-XSpp-0.170.0
+	>=dev-perl/Module-Build-0.380.0
+	>=dev-perl/Module-Build-WithXSpp-0.140.0
+	>=virtual/perl-ExtUtils-MakeMaker-6.800.0
+	>=virtual/perl-ExtUtils-ParseXS-3.220.0
+	test? (	virtual/perl-Test-Harness
+		virtual/perl-Test-Simple )"
+
+S="${WORKDIR}/Slic3r-${PV}/xs"
+
+src_prepare() {
+	pushd "${WORKDIR}/Slic3r-${PV}" || die
+	sed -i lib/Slic3r.pm -e "s@FindBin::Bin@FindBin::RealBin@g" || die
+	eapply "${FILESDIR}"/${P}-no-locallib.patch
+	eapply_user
+	popd || die
+}
+
+src_configure() {
+	SLIC3R_NO_AUTO=1 perl-module_src_configure
+}
+
+src_test() {
+	perl-module_src_test
+	pushd .. || die
+	prove -Ixs/blib/arch -Ixs/blib/lib/ t/ || die "Tests failed"
+	popd || die
+}
+
+src_install() {
+	perl-module_src_install
+
+	pushd .. || die
+	insinto "${VENDOR_LIB}"
+	doins -r lib/Slic3r.pm lib/Slic3r
+
+	insinto "${VENDOR_LIB}"/Slic3r
+	doins -r var
+
+	exeinto "${VENDOR_LIB}"/Slic3r
+	doexe slic3r.pl
+
+	dosym "${VENDOR_LIB}"/Slic3r/slic3r.pl /usr/bin/slic3r.pl
+
+	make_desktop_entry slic3r.pl \
+		Slic3r \
+		"${VENDOR_LIB}/Slic3r/var/Slic3r_128px.png" \
+		"Graphics;3DGraphics;Engineering;Development"
+	popd || die
+}
diff --git a/media-gfx/structure-synth/Manifest b/media-gfx/structure-synth/Manifest
deleted file mode 100644
index 7f183702d699..000000000000
--- a/media-gfx/structure-synth/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST StructureSynth-Source-v1.5.0.zip 1922583 BLAKE2B a2b35d824d73f28cf8ccb6d57feed1d3442b30e1797425a3184cbf6af72507def24136165ee7bc43afe6fc5039eeaacd84ea9646853ee7a755d9283ca37fe18c SHA512 50fbd2838ccc9978e9646d3b0a45bcad92cf64008db205fa171b2ea90ca6327981de6bce9d0eec61a670be8c883f03731c265c730a1218c5ffc9882d53ff7289
-EBUILD structure-synth-1.5.0.ebuild 884 BLAKE2B a361b5d56a30c3d6f1647b7d0deafcc37599f68cf9ccae69fe3536e3b40c26953fcd8e9259ae60361f57a65b009b64cef581aa6e497e557e8db404024d1f03a5 SHA512 7a37113e860a89dfd0bdf4beaaa68b017d6c9290ae1a8e68243d3a948bb189aee8606d03005ca71ebdf181e358954b734930335f8cb4fecb41fd1ee402eab828
-MISC metadata.xml 353 BLAKE2B 76a6cdd97b007713e73c76c4024293dfd59175d3420dc6b032f73db6ac73fd2f3ee9e512891c0b768dae968cf770da7b9f41584c9a2c5840795b39c209ad1f49 SHA512 8986f6fad8fbb9e07ace8336ff6bff63220f61dc97dbe63c91df44aa4fa368f0099e35798d81bdb0f8fc5eade7c2077a7d8c5227f1c1da6cf8d9b518b459a060
diff --git a/media-gfx/structure-synth/metadata.xml b/media-gfx/structure-synth/metadata.xml
deleted file mode 100644
index 66e0f549e615..000000000000
--- a/media-gfx/structure-synth/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">structuresynth</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/media-gfx/structure-synth/structure-synth-1.5.0.ebuild b/media-gfx/structure-synth/structure-synth-1.5.0.ebuild
deleted file mode 100644
index 0974d6a6c10d..000000000000
--- a/media-gfx/structure-synth/structure-synth-1.5.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils qt4-r2
-
-MY_P="StructureSynth-Source-v${PV}"
-DESCRIPTION="A program to generate 3D structures by specifying a design grammar"
-HOMEPAGE="http://structuresynth.sourceforge.net/"
-SRC_URI="mirror://sourceforge/structuresynth/${MY_P}.zip"
-
-LICENSE="|| ( LGPL-2.1 GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="virtual/opengl
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	dev-qt/qtscript:4"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/Structure Synth Source Code"
-
-src_prepare() {
-	qmake -project -o ${PN}.pro -after "CONFIG+=opengl" \
-		-after "QT+=xml opengl script" || die "qmake failed"
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc roadmap.txt changelog.txt bugs.txt
-	domenu ${PN}.desktop
-	newicon images/structuresynth.png ${PN}.png
-}
diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index 16fa5553f774..8a5c024a595f 100644
--- a/media-gfx/wings/Manifest
+++ b/media-gfx/wings/Manifest
@@ -2,6 +2,8 @@ AUX wings.sh 182 BLAKE2B e9facdbcd7520af19045bab0ef89e835c1e2f1d7b4e8c8d45d64f18
 AUX wings.sh-r1 181 BLAKE2B d892abf053f7f0039e50057869a4a0a26438f7312dca62561fc22280b2341621e17f13c97e7031072b242db42c533f4012b21ac46645cf32e121e5aad1884774 SHA512 739b8e68a1b47a3f4adbff8a1f34b713d7b0ac2d8103d85d3fdd6020bf08e81c231d210239c140d23e1dd135ff7122bfd43327a27585a333eafab473ea1480df
 DIST wings-2.1.5.tar.bz2 2653117 BLAKE2B 10b14e8dd29daf74fd6af9229341296fa457df405542274533df85198d932188c53094afffbc4b09342c29086df02a7e19d4983f1fc912623ea79ae85e9d4067 SHA512 37f363f39d0618550d7814733a4e52c18b52c7d8ee357c76dcf97ae1b530f5b941bddecfba18d63538792dda3ca3013055759595157832e11e017bfe18b34df0
 DIST wings-2.1.6.tar.bz2 2688154 BLAKE2B 9183ac21f3ae58e5c4d248f3ab9e8af89c3838b312aa51f6d625c21cde05b9326156737e449876aa2a0ea8047a9ce75ad433fe1430ff5add2c5b516144ba7244 SHA512 db17ae58f57233a65f9cec43cca41e9d259eb6499229e6ffc1f1acb8e86e18deda7a1ab1075f0948885cc4ca3c075871150efb007bf3e8e8e5a2e77b5b924af7
+DIST wings-2.1.7.tar.bz2 2720764 BLAKE2B b0ba4a1acaee6ea0bcd21cab1eca1a37a0fd3549c2d5551969e71084eb2596a9c7574f0ddc3a86230fccbaf58c3ac87d7061ccfa17047d10e1b8bff096198235 SHA512 6cd2816e22b2326af43f539831d36b32015828c5261c0503ea36cd171dfd8a54eba65165395fbb3f173224d6bb2d3a3015f8f58225c6237c2d5bf56604e72d10
 EBUILD wings-2.1.5.ebuild 1190 BLAKE2B 0099d6f003a286d3a13c63a6aea374b373869d683798c2d6e7513d9d103964a8fbe67b1dab880090c671f7738de8c7443adb85b7b6e77931ee83175369e56bae SHA512 387ae28ae4a7c06335fcf2bb4f891c1497029ae02d4f18b05819932ff17208fcd8dd6f41b2022b8dd1cc24fdc2004c64132705f555ab5a27bd95812d9ca12964
 EBUILD wings-2.1.6.ebuild 1192 BLAKE2B 399b138a6c495b20ee8d4a3591d82e12487f3b7f150d88fcd7a21f95ecf1875677dbc912d7c2275a6eeebc4a5fdfb9b95ceb0dc992aad10403c406938e686df2 SHA512 90a78aa8008951f1c3f6ccfa00486acde5a457c2b378741a68299757e754b1a61f064e9b0b1ee710bffd88bc3d936108508c2d7ea46711c35f3940dd2cdb8eae
+EBUILD wings-2.1.7.ebuild 1192 BLAKE2B 399b138a6c495b20ee8d4a3591d82e12487f3b7f150d88fcd7a21f95ecf1875677dbc912d7c2275a6eeebc4a5fdfb9b95ceb0dc992aad10403c406938e686df2 SHA512 90a78aa8008951f1c3f6ccfa00486acde5a457c2b378741a68299757e754b1a61f064e9b0b1ee710bffd88bc3d936108508c2d7ea46711c35f3940dd2cdb8eae
 MISC metadata.xml 730 BLAKE2B c74a1bbba0f4b98683e0d3d1d5045ffdfc7ea81b6180cd7ee967bb3846f446e5bda5528bec501e7941c076d6bc755cc0fb1b005506203d7ef57ccb15378724bd SHA512 7672ac58e0f7ba153b0a5939cf8e426e8c3f8c97366436340e1bbb65e85a785add4c6394e81e1aade634f58d8751a85ba75cbb1bb57fa822773a632736d96086
diff --git a/media-gfx/wings/wings-2.1.7.ebuild b/media-gfx/wings/wings-2.1.7.ebuild
new file mode 100644
index 000000000000..bc645abc4232
--- /dev/null
+++ b/media-gfx/wings/wings-2.1.7.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib
+
+DESCRIPTION="Wings 3D is an advanced subdivision modeler"
+HOMEPAGE="http://www.wings3d.com/"
+SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-lang/erlang-18.1[smp,wxwidgets]
+	dev-libs/cl
+	media-libs/glu
+	media-libs/libsdl[opengl]
+	virtual/opengl
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/include_lib/s|"wings/|"../|' \
+		$(find . -name '*'.erl) \
+		|| die
+
+	sed -i \
+		-e 's|-O3||g' \
+		-e 's|-Werror||g' \
+		-e 's|CFLAGS = |CFLAGS += |g' \
+		$(find . -name Makefile) \
+		|| die
+}
+
+src_configure() {
+	export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
+}
+
+src_compile() {
+	# Work around parallel make issues
+	emake vsn.mk
+	for subdir in intl_tools src e3d icons plugins_src; do
+		emake -C ${subdir}
+	done
+}
+
+src_install() {
+	WINGS_PATH=${ERL_PATH}/${P}
+	dodir ${WINGS_PATH}
+
+	find -name 'Makefile*' -exec rm -f '{}' \;
+
+	insinto ${WINGS_PATH}
+	doins -r e3d ebin icons plugins psd shaders src textures tools
+
+	newbin "${FILESDIR}"/wings.sh-r1 wings
+	dodoc AUTHORS README
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-06-09 09:27:03 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-06-09 09:27:03 +0100
commit	cb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa (patch)
tree	047fc92023c520d07f13ec5ac96e094d1b312a7a /media-gfx
parent	7b9f15840068dfaeea5684f8a1af1fe460dfa14c (diff)