reinit the tree, so we can have metadata

11 files changed, 1096 insertions, 0 deletions

diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest
new file mode 100644
index 000000000000..e6769ef90237
--- /dev/null
+++ b/media-gfx/enblend/Manifest
@@ -0,0 +1,14 @@
+AUX enblend-4.1.3-cmake.patch 1004 SHA256 55e854cbe77a1b1cea5682fd92f34e9a6220e5d8d82a50a0c04a01240cf64605 SHA512 2143d9b448d29c37cc03dd40ee99f841ccb8d79f53597ef5fc6ef9a2090eaeaa7b789f86f85c468159f19f199cf3a1c330971b51ce6590b2ca6bf4b90765fef1 WHIRLPOOL 5c4e8d369a5c9209e8871a7e682059f9624b9b0a97596954041ae331a0ecb1ba437e6146f416e9f537f7a469aeed6a7967066c1ca66dda746e5db66651b64a60
+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 463 SHA256 80ffd0c9d23cbd48e47369ea66a013ffd19f27e03639902e1e287403d67da777 SHA512 5b459c7da0608369fc591ad67fd295f3e2b11f78d5cba4e7d57116dbb0038f00b6c5f0fc190e4c40b0b625f77885ddfe51e8432654c78c03dc9040d34ae96372 WHIRLPOOL d4810b1cac9fe0b10c5424c023c184fe25bb674357f9d9d190466264da74c6e0e88f1172c55e7b0036f4fed797b12a7dab3b378d37c1e5d8b78b2ba54bae9d3a
+AUX enblend-4.2-doc-install-dir-fix.patch 2705 SHA256 92c35cb5850a752eebb2a60ef9c40e22f35372610d380557228a00ed983afe90 SHA512 a22730295c44da4f9feb3d541b17f298adf98f0328cf01d6a85206087c782e1aebac6509968d1a5433efb5fc3d72e48301ec3d5a2516f01c1f6d923d5032ab03 WHIRLPOOL 6c6d36533fef8a39c66c28b5ae9f8cdd015b869cabb6ab4898d41cdbcb0bac42a86a6b1383cfea02cd3a574c32e3ce705feef6f9988523b3c53626255bbee089
+AUX enblend-4.2.0_p20161007-cmake.patch 477 SHA256 f5dce0c5407b8b21958c5e2ef2eba4b6493f74b7bbd7de482b312ee5367d4e71 SHA512 5b79944beabd97f71f05657ce17e31d9eab60506dfce27fefc3a8f9a10c92f33b1b4fa1411c6d1a33d23819a4020a50f130b9083fecaf3e1a072fda71e5f9ff0 WHIRLPOOL f1938918a7e315f74d2e169eac185209d09fa0fc380631bf536601bde769c87733b49bd3b874fa00c27e010ad52f8a0f0da29ae90d77d451f52ddb381461afb0
+DIST enblend-4.2.0_p20161007.tar.xz 494060 SHA256 4fe05af3d697bd6b2797facc8ba5aeabdc91e233156552301f1c7686232ff4c3 SHA512 ede037f19a7c3b358f533ecfb235f70824261eaf189d0bdcde6f9cedaa5952be2a6940884e688418b725cb3a67fc1b7d366483a76b7c62326ca857b8efe3a3f3 WHIRLPOOL 791c36ee422496170a7cfc8da7d701e40a4d9d1205ebebd692d4d4c4f694d99dad4260bf8b6b1a8957c686590f20edbd5b561760311151c4bc04394542979de7
+DIST enblend-enfuse-4.1.3.tar.gz 862079 SHA256 1c00ae95cd05502759d7d47f99e6ba1150f8807f8f4f46c800cd46c5ad0df9ac SHA512 0a3487783afadee896b84411330898393cda4be4cbb79d36013daa98c17ab88f97a298c21a5c398b7cb2ce83e8dc4519a80e18be472c5fec10c3114037b6db73 WHIRLPOOL ab33a8ca5c38d9a5dca6aaeed7cbc806f7c34c5642f9e568a90d14789ecede896c0da888e5fe7e7d30e586778e0734495d06055fc189732e55bc0c013e699b48
+EBUILD enblend-4.1.3-r1.ebuild 1832 SHA256 cc64cfed5d1a7622872fa678de482f7734516e985f56d847e8dfee7b59b6e2f6 SHA512 f71bfc3040d6413584cf9d8db2d72ca036edb5aee81a5a6c42b246f0ae5829416fe57010690c069cc83b29a224c7984152534e52bd413e5b8dd5887677ef54ae WHIRLPOOL d48082a4a2bb238fdcf871ddbd56ad082e611cd7595689ce4029689c705fe017ec612522d8dc222fd12156e8ae910e0bc511075d090c584f5f1542503b1bfeeb
+EBUILD enblend-4.1.3-r2.ebuild 1935 SHA256 0ae07a24d6a9d0842c5ba3d501173fc392cc5c4231e50f7dc5b211b8e6b136a0 SHA512 bf7702b6ecd18c6a306437e2b19a7ec217c2370c735011ed7f4c0f930952950b2a995c1eedb8d55e3cf0ca63d1c113920adf01beb1f1fc0c8a4c3e933454860b WHIRLPOOL fc5387361733ea97e28d8ff262d46cea42604e4bf264c32e38aa7a05ca553dabf0576264580c2fb45aaaa1605adbbd26e146e75bfacb044613ba914b3bfa8fc6
+EBUILD enblend-4.2.0_p20161007-r1.ebuild 1759 SHA256 a1a300a550d87a8430f65acf5ffadfc9fbf43a6aa914231d34b15c4e8e040a78 SHA512 a4913e8dd999cc7b94d4ec613b2cb3e066498bb9561880a83ff38aa34dd672d4e82f9958f2b0246b357ef9117fa1eb7a832ac7caa6f0e9b64255c4428c44ba3f WHIRLPOOL 71513d830a2eeefc930be415471914c71de59c0fc66f34f61a6ae5ff7b153105ec8654c6abb7841c1215399edb4c8ae7d39df358705444c093c4a1fde74a54e9
+MISC ChangeLog 5635 SHA256 0ed066adc206662ffc6915a0c413a956a025bc6ef0b111e54f02da1ac2e5d10b SHA512 38f40da94b56df69996e24edc1ee6bb198e446b6ec67cceedf463d945f454302583eba2da8c7d81c9a7d2dddda3b068972a739746a6e9ae23dc20b073328e428 WHIRLPOOL 5992c46b10a143f18ee68c5a75b99f5e78ff68cdc4519e91672fbc73fa144bc93748530aea88799ab3020151aeb512b7a307263120871bed233c6b82d9445707
+MISC ChangeLog-2015 8816 SHA256 0564929c0f0edad6d85ce6f17760bcd1a689953affa1e1644e3e8aae0e478315 SHA512 23870be79cf0651f04ae5e612e7cc1b63bcacf90ccde68c0ceca913a0990969108a30b3b74c5cee4b64da57a546173111c0baf3273b72e48045b14d398dea815 WHIRLPOOL 7bdfe81b8f3d5e9b4bfabf096c09e506733863d1206337d761942d119854ad101189f319a6c61221c06c9cb0265700ad1f89539c691d6cd39f005160f3d442a5
+MISC metadata.xml 472 SHA256 f8f45739463944e11eec258cc923f54b557f534e5e79038e3394b7e221d8f62e SHA512 f2623eccd20aee91ae2ffe90e3999e359865757269d8ca84cd095ee5f0d55e18000d3afb602531231799a31a14edbf1bdeea72b162976fcd51727a169045d100 WHIRLPOOL fe7220fbec52afc76414de0abb988402f0f232c62256ed26a06e815c82456e780ee1242faac7fe97a39f58d18ecd61303adddf859af1066aa19652587e1375c6
diff --git a/media-gfx/enblend/enblend-4.1.3-r1.ebuild b/media-gfx/enblend/enblend-4.1.3-r1.ebuild
new file mode 100644
index 000000000000..6de5ae27cfe8
--- /dev/null
+++ b/media-gfx/enblend/enblend-4.1.3-r1.ebuild
@@ -0,0 +1,78 @@
+# 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 ppc 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
new file mode 100644
index 000000000000..c1eb5442bbc4
--- /dev/null
+++ b/media-gfx/enblend/enblend-4.1.3-r2.ebuild
@@ -0,0 +1,86 @@
+# 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 ~ppc ~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 000000000000..ae3bfd0176c1
--- /dev/null
+++ b/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2017 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 ppc 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 000000000000..e9fef85278d5
--- /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-texinfo-5-more.patch b/media-gfx/enblend/files/enblend-4.1.3-texinfo-5-more.patch
new file mode 100644
index 000000000000..dd63ae3697a5
--- /dev/null
+++ b/media-gfx/enblend/files/enblend-4.1.3-texinfo-5-more.patch
@@ -0,0 +1,82 @@
+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
new file mode 100644
index 000000000000..ef04aa73633a
--- /dev/null
+++ b/media-gfx/enblend/files/enblend-4.1.3-texinfo-5-upstream.patch
@@ -0,0 +1,633 @@
+# 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
new file mode 100644
index 000000000000..d067df3c57ae
--- /dev/null
+++ b/media-gfx/enblend/files/enblend-4.1.3-vigra_check.patch
@@ -0,0 +1,11 @@
+--- 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/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 000000000000..c952eeb7780a
--- /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 000000000000..fcbeb64232d1
--- /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
new file mode 100644
index 000000000000..621b21a35cf1
--- /dev/null
+++ b/media-gfx/enblend/metadata.xml
@@ -0,0 +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>
+</pkgmetadata>