media-gfx/enblend: sync with main tree

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --force
Manifest-Sign-Key: 0x363AF1F7765A9D02

9 files changed, 306 insertions, 38 deletions

diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest
index e7e2604..d788bf8 100644
--- a/media-gfx/enblend/Manifest
+++ b/media-gfx/enblend/Manifest
@@ -1,28 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX enblend-4.1.3-texinfo-5-more.patch 2392 SHA256 880737cb7e6d2e07ec42f362474862b5d5ee34c61f1c6ddc59499c6d2f9ac822 SHA512 3f3d398d8c5a39289aefb36050658cd27c477b1b23d94b1e2fdb5c9e40b54c9ee0d62f8cd1aa281618c9b48e803b082aaf6196824038c04bf090ca49cfdd21f2 WHIRLPOOL 1a66bef9d0f1f945e80c1baecf2c484a58d2f956d91f601a915ffaa3ee8abf73e279b4103d0dbdd1b4e19ef089512cb0c664372591c0c8941f22183d7b461182
-AUX enblend-4.1.3-texinfo-5-upstream.patch 18609 SHA256 2b986850e46e157835ce7b9b97d80ca670c7c3d418bf8503fb043ce21e8714ad SHA512 f42d102a534887bd56637d08d64c37436b8590310a87a8dc5fb63550bd10ae2602ec3ddb51ea6b46d16ad3477e4b8b8f20fa48821e8745a5cf9e5693ae4af40e WHIRLPOOL 10315923be3dad7d9cc39be4581c9384a94217f6a74ab6bf45066add554c58cade69d7b51e790911a829ffe61d4a5a72d5b2c8dbaf8c64980d4e826039b59b80
-AUX enblend-4.1.3-vigra_check.patch 464 SHA256 e3f4d417908c188284302882f8a35cbc0e8b69ad872699c476caff7ee723929a SHA512 e6a84c74220fcd985704d4b071ecc6f37dde8582ca9089a3dd0a782d739550e0479e52632324d25462fc59145e2309e21bdb406ad89b03902fa933b3322caab1 WHIRLPOOL db10e43c61758d32e0a401eedbb7258a160071f85823e35bd4f8207216a7c431645060493d1fce47d9b7e4e4aafb7e39c33857a4214d38a77bbf495333c69403
-DIST enblend-enfuse-4.1.3.tar.gz 862079 SHA256 1c00ae95cd05502759d7d47f99e6ba1150f8807f8f4f46c800cd46c5ad0df9ac SHA512 0a3487783afadee896b84411330898393cda4be4cbb79d36013daa98c17ab88f97a298c21a5c398b7cb2ce83e8dc4519a80e18be472c5fec10c3114037b6db73 WHIRLPOOL ab33a8ca5c38d9a5dca6aaeed7cbc806f7c34c5642f9e568a90d14789ecede896c0da888e5fe7e7d30e586778e0734495d06055fc189732e55bc0c013e699b48
-EBUILD enblend-4.1.3-r1.ebuild 1839 SHA256 3315cbde46cae9b4fe25cc4b7f429daf1b15fbce4650fed3ba64e55ea297c944 SHA512 71dfc4f44cb91b13d439513abc9853b6084690f081e34da74cefe53747864ce2187f883511cb8ec8ba89927c388cb3c179dfae4f1beb83608ef8e234a35b4aae WHIRLPOOL e60735cda45c6f634cd202aa355e8a2b85e3fceccafbb13492b04b6586f720ac41da0d3e7ece50eafcdc37e3b7f1d91a44d390fe211bc8d59fa568703a26bba7
-MISC metadata.xml 488 SHA256 4cd55ce929fca9acbe1e0fd9660b96b247d3233acf82260520056ebe6960cff0 SHA512 42fe95307799e242aaff4f1e6c9aabf9d713281d82208b891b4e68466fccc45bbdc87977d7bcb3e25fae2b082bd7b79ea4eed21428d416a66798b1d0db4d2f50 WHIRLPOOL 72bde6675569624b0c96e646943595b13e8cdaa910b6b42fa1d90c686306b6d5a58ba6bc845e498acb1fc0f02443f8ff0993e3e9e35bb64cd020a78c9356c569
+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
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJW7syqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyMDhFOEI5QzhFQzk5QTE1M0I0QkI3Mzc3
-QkU3NkVDMjU1N0I0NDNDAAoJEHvnbsJVe0Q8yZoP/0kYElhhj1ZgEycMMALalCfY
-PfoeQRAU94HaUK8fz4hF1k4Y1uEPCAOH+EaGLO0bi4dKYgZuwIuDoslrwAXwo1IF
-Eb3kmSYKBlAm4GXrTK1WJv/ANswXkySr6uHcruvtHIGmT5C8R7/gTUrgy63NJdqH
-so/9f3szNo+nt+ATsCs12g3ETRqEUIZXidd1bljQ8SGmsHyi020Q7plDe/6dNh6i
-rAauD/Iw9JAYekf9H1umKQDU9VR/OydVCKBcgVJyMMAm53VTw4TgxFTky8gqbT1B
-XjN8G/Z9siQL5pd8+60GOm85nFrA82Ynk+XMtrwdhdZqpcVOjVEmW6Rl8ucrZVbY
-YV6Q06NMzhOzCW5mywWUhqEsex85kyqyFBYA/NCkD87VGGDmRBrhtkVeakNpZXJe
-sVXxPYmZN8/GFUAFvLvORCDvR50wdyA8pfp7eZkAaurr2w0DPT5hhobvyk5KqQ3x
-VoHohIkyrsF8hWt0NJGbYgYirdVlzGsWCpute3FAKsN4SuhX0ByME2VVpkP9pNdc
-S/2vDGJK5MNN2s4PbUOBX2n/0RJW2cYy7yyJmp2IreJGRouMdbG6sSgcJPbyBtFg
-TIM3SmneqKr1T7IfRH+aHHQtcAle7cvXVZI/eCZ5Fq5+u0WxRlyEtzc2cwVG1kEX
-6WCND7wF+OHpSeX4Zx//
-=MK1G
+iQKTBAEBCAB9FiEEII6LnI7JmhU7S7c3e+duwlV7RDwFAlrlt8FfFIAAAAAALgAo
+aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDIw
+OEU4QjlDOEVDOTlBMTUzQjRCQjczNzdCRTc2RUMyNTU3QjQ0M0MACgkQe+duwlV7
+RDxYEQ/+JqWLrA3iLZ7xwCz+os8sIKWHgIzCB7QI50JlSkj4VnzDm0bl8vWCFV3u
+n5AXWuFLbA3m1fPaiXEZ2XPWeuMQHb6n2uoQYDAAKO75mFjn5BxBqJAQsi7ANAei
+XQwy+CikDjOzV6t72DIopcUEykLJ3lHY8MVCNKs3ic4Sf4J2TgzCa9o/0Hsv42F2
+fUFV7GcvcBfGYumROn9fta8FvGdnU0cjoMyBinAXGIIk1j+zLNhIO85NHlf8IGUu
+WaNHY6hMDf3j6q6jUl3z4XNBQV8WaGvusO+ugqvgFYCFQMKJ+67edGOuUMowSSO/
+jalb2tObgYeinpJWvwJcxo8Aj4MsQRU4D2xcbDe7MMHldQpKgUtO/t9j2WV2OZUX
+mb+q/8qDHlUKHj5irEKpvDOftN0GSl+5c0xSbfHTC+9X/KEp3QN8RsnbJEBny/C3
+MDdA6EBhm6ibKZ1uc09VhLv8FN65aCmSGa6ZksF4bIeNKCQUYXf4Bb2zxtwuRxN9
+9UXSv3MdMDr60ddVkht0ay3Vs3hUqgV/jY+BQx80aV2k+Hc39yr1EpC/7e0v5Om8
+AGn4YfyowYlkomiYSOQbMHtkAZS8fg3pqdfXt4ITWmkqrQDcuDIJAJQIUxZm2TAX
+imQTT6fwiTq/+MHMHfouMf2l6b7ZiI32WbDL7seiHEGuUUgR9y8=
+=8YGi
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/enblend/enblend-4.1.3-r1.ebuild b/media-gfx/enblend/enblend-4.1.3-r1.ebuild
index 710f046..98dced1 100644
--- a/media-gfx/enblend/enblend-4.1.3-r1.ebuild
+++ b/media-gfx/enblend/enblend-4.1.3-r1.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 
@@ -14,7 +13,7 @@ SRC_URI="mirror://sourceforge/enblend/${MY_P}.tar.gz"
 
 LICENSE="GPL-2 VIGRA"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE="debug doc gpu image-cache openmp"
 
 REQUIRED_USE="openmp? ( !image-cache )"
diff --git a/media-gfx/enblend/enblend-4.1.3-r2.ebuild b/media-gfx/enblend/enblend-4.1.3-r2.ebuild
new file mode 100644
index 0000000..6fadcfd
--- /dev/null
+++ b/media-gfx/enblend/enblend-4.1.3-r2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 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/enblend-4.2.0_p20161007-r1.ebuild b/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild
new file mode 100644
index 0000000..b5f563b
--- /dev/null
+++ b/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Image Blending with Multiresolution Splines"
+HOMEPAGE="http://enblend.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2 VIGRA"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug doc openmp tcmalloc cpu_flags_x86_sse2"
+
+REQUIRED_USE="tcmalloc? ( !debug )"
+
+RDEPEND="
+	media-libs/lcms:2
+	media-libs/openexr:=
+	media-libs/tiff:0
+	media-libs/vigra[openexr]
+	sci-libs/gsl:=
+	debug? ( dev-libs/dmalloc )
+	tcmalloc? ( dev-util/google-perftools )"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.62.0
+	media-libs/libpng:0
+	sys-apps/help2man
+	virtual/jpeg:0
+	virtual/pkgconfig
+	doc? (
+		dev-lang/perl
+		dev-perl/Readonly
+		dev-tex/hevea
+		gnome-base/librsvg
+		media-gfx/graphviz
+		media-gfx/transfig
+		sci-visualization/gnuplot[gd]
+		virtual/imagemagick-tools
+		virtual/latex-base
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.2-doc-install-dir-fix.patch
+	"${FILESDIR}"/${P}-cmake.patch
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i -e "s:share/doc/enblend:share/doc/${PF}:" doc/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DMALLOC=$(usex debug)
+		-DENABLE_TCMALLOC=$(usex tcmalloc)
+		-DDOC=$(usex doc)
+		-DINSTALL_HTML_DOC=$(usex doc)
+		-DINSTALL_PDF_DOC=$(usex doc)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2)
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# To allow icon resizing with renderers (no way to disable)
+	addpredict /dev/dri
+
+	# To compile fonts in the temp directory
+	export VARTEXFONTS="${T}/fonts"
+
+	# 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
new file mode 100644
index 0000000..e9fef85
--- /dev/null
+++ b/media-gfx/enblend/files/enblend-4.1.3-cmake.patch
@@ -0,0 +1,22 @@
+--- 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-vigra_check.patch b/media-gfx/enblend/files/enblend-4.1.3-vigra_check.patch
index 982293e..d067df3 100644
--- a/media-gfx/enblend/files/enblend-4.1.3-vigra_check.patch
+++ b/media-gfx/enblend/files/enblend-4.1.3-vigra_check.patch
@@ -1,5 +1,5 @@
---- ConfigureChecks.cmake.orig	2013-10-07 10:50:00.000000000 +0400
-+++ ConfigureChecks.cmake	2015-03-31 13:42:40.179527224 +0300
+--- 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)
diff --git a/media-gfx/enblend/files/enblend-4.2-doc-install-dir-fix.patch b/media-gfx/enblend/files/enblend-4.2-doc-install-dir-fix.patch
new file mode 100644
index 0000000..c952eeb
--- /dev/null
+++ b/media-gfx/enblend/files/enblend-4.2-doc-install-dir-fix.patch
@@ -0,0 +1,66 @@
+* Remove the CMAKE_BUILD_TYPE conditional code, in order to build using CMAKE_BUILD_TYPE=Gentoo
+* Install html files in html subdir of doc dir
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,9 +11,6 @@
+ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
+ 
+ project(enblend)
+-IF(NOT MSVC)
+-  SET(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel" FORCE)
+-ENDIF(NOT MSVC)
+ # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/
+ # is checked
+ # For now, reuse the hugin modules directory
+@@ -130,7 +127,6 @@
+ ENDIF()
+ 
+ IF(CMAKE_COMPILER_IS_GNUCXX)
+-  SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ffast-math -DNDEBUG -Wall")
+   IF(APPLE AND CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 5)
+     ## Add needed Compiler and Linker flags for OSX
+     SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flat_namespace -undefined suppress")
+@@ -154,20 +150,6 @@
+       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
+     ENDIF(CMAKE_CL_64)
+ 
+-    # compile everything for the static C runtime
+-    FOREACH(TYPE C CXX)
+-      # makefiles use blank configuration
+-      FOREACH(CFG "_DEBUG" "_MINSIZEREL" "_RELEASE" "_RELWITHDEBINFO")
+-        #MESSAGE("Replacing CMAKE_${TYPE}_FLAGS${CFG}: ${CMAKE_${TYPE}_FLAGS${CFG}}")
+-        SET(NEW_FLAGS "${CMAKE_${TYPE}_FLAGS${CFG}}")
+-        # fix up static libc flags
+-        STRING(REPLACE "/MD" "/MT" NEW_FLAGS "${NEW_FLAGS}")
+-        # *FORCE* to override whats already placed into the cache
+-        SET(CMAKE_${TYPE}_FLAGS${CFG} "${NEW_FLAGS}" CACHE STRING
+-          "CMAKE_${TYPE}_FLAGS${CFG} (overwritten to ensure static build)" FORCE)
+-        #MESSAGE("New       CMAKE_${TYPE}_FLAGS${CFG}: ${CMAKE_${TYPE}_FLAGS${CFG}}")
+-      ENDFOREACH(CFG)
+-    ENDFOREACH(TYPE)
+     # link only with the static C runtime !! THIS IS A MUST !!
+     SET(NEW_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
+     # ensure that the flags are not duplicated on subsequent runs
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -406,7 +406,7 @@
+         "${CMAKE_BINARY_DIR}/doc/enfuse.html"
+         ${ENBLEND_PNGFILES}
+         ${ENFUSE_PNGFILES}
+-    DESTINATION ${DocumentsDirectory}
++    DESTINATION ${DocumentsDirectory}/html
+ )
+ endif()
+ 
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -102,7 +102,7 @@
+ endif(OpenMP_CXX_FLAGS AND NOT MSVC)
+ target_link_libraries(enblend ${common_libs} ${additional_libs})
+ target_link_libraries(enfuse ${common_libs} ${additional_libs})
+-install(TARGETS enblend enfuse DESTINATION bin CONFIGURATIONS Release RelWithDebInfo MinSizeRel)
++install(TARGETS enblend enfuse DESTINATION bin)
+ 
+ if(NOT WIN32)
+     # create enblend.1 and enfuse.1
diff --git a/media-gfx/enblend/files/enblend-4.2.0_p20161007-cmake.patch b/media-gfx/enblend/files/enblend-4.2.0_p20161007-cmake.patch
new file mode 100644
index 0000000..fcbeb64
--- /dev/null
+++ b/media-gfx/enblend/files/enblend-4.2.0_p20161007-cmake.patch
@@ -0,0 +1,11 @@
+--- a/CMakeModules/FindLCMS2.cmake	2016-09-24 11:28:47.000000000 +0200
++++ b/CMakeModules/FindLCMS2.cmake	2017-02-11 16:15:33.492507341 +0100
+@@ -5,7 +5,7 @@
+       /usr/local/include
+       /usr/include
+   )
+-  FIND_LIBRARY(LCMS2_LIBRARIES lcms2 HINTS /usr/local/lib /usr/lib/x86_64-linux-gnu /usr/lib32)
++  FIND_LIBRARY(LCMS2_LIBRARIES lcms2 HINTS /usr/local/lib /usr/lib/x86_64-linux-gnu /usr/lib)
+ ELSE(NOT WIN32)
+     FIND_PATH(LCMS2_ROOT_DIR
+       NAMES include/lcms2.h
diff --git a/media-gfx/enblend/metadata.xml b/media-gfx/enblend/metadata.xml
index 5d7ddb7..621b21a 100644
--- a/media-gfx/enblend/metadata.xml
+++ b/media-gfx/enblend/metadata.xml
@@ -1,15 +1,15 @@
 <?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>
-  <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>
+	<maintainer type="project">
+		<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>
 </pkgmetadata>