media-gfx/enblend: sync with gentoo

Package-Manager: portage-2.2.20.1
RepoMan-Options: --force
Manifest-Sign-Key: 0x363AF1F7765A9D02

11 files changed, 1595 insertions, 12 deletions

diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest
index ef17203..00f04ec 100644
--- a/media-gfx/enblend/Manifest
+++ b/media-gfx/enblend/Manifest
@@ -1,19 +1,37 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX enblend-4.1.1-texinfo-5-upstream.patch 19028 SHA256 feb1f7ad9d7f1a381fba6dbd12961af9986e26d69a6f39810e4b30a5ceb27dea SHA512 4bcfdfaf799b047876658b5a84a6f2e1013f5a8014c4913eaeb7e10f2d548c37d7c4b5f6944078366f942a2617fbc08c68a89c0909ffc2c2ec8148fcf4151af0 WHIRLPOOL e3bd5dbe37e1a4873ebf341a81f32df368b26864c04f5526b801a3d3f27b03718aea585c9ade648e990e38a5b1013bf6c56df5cfc5cbb88efd84ce08b27cc782
+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.1.tar.gz 850214 SHA256 9d0947633ebaa0dc1211331b31009408de6fe2108751ad4190760e3a9f181bc9 SHA512 dd4c8f205986beef1268210a8ccad10107125fc15a45b2e7266f250d36a294356f557d577b80e923e04b5f14ed5f6070201793c067cc3a2e7d6020cf5669a61f WHIRLPOOL c9938499116f26f3bfe6eae874414722a15380cbda959c82315bb124cb7b58456550174b0d43355d924cb6e107ef3ee4d1b83f8adc82d7144d974b66207ff965
 DIST enblend-enfuse-4.1.2.tar.gz 869265 SHA256 6dc2682d366776ff771fd6c9ae709bcfef0b7b00cac9e620b56d13bf81faaf6e SHA512 8d4fa80bb455276e79e7ee4e757c8774bb0380fa2ef56835e18a02fda12b710eaad0a90f2849dc2297eb7cd477dc7134a90a61708373928463595d726ded0259 WHIRLPOOL e0834b7e9461ae3d29e52cd21cd8c41384356026f3e62b7c60cbb60ba02edc23c844862afac001cb20b5da828a11ec7f9bd4d604ab77177ca318e400ccf70650
 DIST enblend-enfuse-4.1.3.tar.gz 862079 SHA256 1c00ae95cd05502759d7d47f99e6ba1150f8807f8f4f46c800cd46c5ad0df9ac SHA512 0a3487783afadee896b84411330898393cda4be4cbb79d36013daa98c17ab88f97a298c21a5c398b7cb2ce83e8dc4519a80e18be472c5fec10c3114037b6db73 WHIRLPOOL ab33a8ca5c38d9a5dca6aaeed7cbc806f7c34c5642f9e568a90d14789ecede896c0da888e5fe7e7d30e586778e0734495d06055fc189732e55bc0c013e699b48
-EBUILD enblend-4.1.1-r1.ebuild 1744 SHA256 af1604ca1fee4b09b69f1ab14964633b7db21315da1b7b4fa7c5ab6e14d8d69d SHA512 0c4e71d6aadf8313e4143d40bc6e6ad7052be4ff6644806b61565c9d9cd7989517273effada7a268162354515dd685b47c7446b6b0994399d98f579e4a5da9d7 WHIRLPOOL 21001db32db2e23d7d8d59727e1b9c04b8f314ce7a107e143fd670760e8bbc2d919a4bb93308cb5c0070a6bd7195603b6272390df4d94607a5e0459f20098387
-EBUILD enblend-4.1.1.ebuild 1937 SHA256 a7c519f40c3c4b9149bf7fed592280cc29bad5da2cf8a594e9d8885ced21937a SHA512 d5be6d54b83c917e352c1a8e354cf730fa61679d14b46208f274fbae7a127bb5115902ac4e2997864544e904678f39c541c6dadb5c8bc0560913f262e3f104a8 WHIRLPOOL 5475db49caae94c7a92df20a10b4d0332f5049e2ba0e4386e0e4fecea93fdc46ebfc817b41c296449fc2724bd301496bebb58062041bec0aa39978fe3a8be6dc
-EBUILD enblend-4.1.2.ebuild 1760 SHA256 0764a2b9e48c5ccd86a221c5f65209aeb22e3de7ae8d784145a3af667a8619a1 SHA512 227aa25739b1a0a9e155993ea35eabada92a0b33af6529def8dbf551dfc3eb184575da76a989d56f1915284276fa72a6fdc3e0434ae1fad205c02ba4576edd9e WHIRLPOOL a72554ec6b1ccb4d536e547cc6eaa2d9807b7da7f8622343816924197ad661e09431c4370805269f3a96858e69fec23a4065fbeb4271f317c382a1f9713cf27b
-EBUILD enblend-4.1.3.ebuild 1866 SHA256 f92e398bf1bc50794aca0855ea192d99e523a712efc1081b811d08c365d0e1ea SHA512 b8b85554263171688e26a4f7e98e94e7d2c30b6402aa0d50627e6edbd8b4b02c0ecbfed9b6fca7ecde930b92470e69b32df810f9e204516fa57e21e907f1a01d WHIRLPOOL 8633d79473f3ce88402cdad16ac948eec50c85131b30413b33f9ad53f11ace66099492a285a12f89c139029114cb077e645d24504345ff7623d206d19cad08a9
+EBUILD enblend-4.1.1-r1.ebuild 1635 SHA256 010b1b1dbd019bbe480ef41205f857561a2284c43213232dc66da6da43cc66b2 SHA512 03a906c96a3a142c82f06f6a21e6ca03ac52048a9fc020873c9177ffe59f748f1916505c253545c5f24dc4151791e23477c3aa3a7a191bfde0c9fb18c3e83b05 WHIRLPOOL 579b9061d5a9c512889343eaae17af2a3aedbbd32459b43b858424ee0ab6b12e77321e11a0b02a43fd8a2ec3742f02a895098a9e4f5805a14d8d305ec00ce171
+EBUILD enblend-4.1.1-r2.ebuild 1695 SHA256 195fd1a585cd80d2d1307476b8da0a639e6c86afd1175d8816e98903b3239f07 SHA512 355119db32fafdb50f1023ac394d58099ee7adb400637ed5d887998f97180f6fac69dc0ccff99e9351e4f32e410af515fe32725b80f4b86e7faa0018cd4a9610 WHIRLPOOL e0e2e3c6b12789966c5f973b7330298e707cfc4ef48d1450d3b91b388d25fcf9dd61b8fb1583839e1c829a5872077bbfc0fd124d1b4ca20b28601c522d7bdb8a
+EBUILD enblend-4.1.1-r3.ebuild 1804 SHA256 838060b0ababc20356feaa174970852074f90466ff204ed7e9d1ec67db89ff8b SHA512 7e0ebae90f4aec2cbb6421c103d461d051936808c6c18a64673245c77da7efad1d5edc92524be2f94ee55fe19ddae748f6da3ad4c474df1d3a2342466f645fb5 WHIRLPOOL 09e0f96a7bfc727c31ccf1903a8068b1b1a7cc1cdb7d88e86bc8322489c44737f2986da38f5f8280be10b3cef05c026d48f636ef82c0f9e0a237cbb04b7116cb
+EBUILD enblend-4.1.1.ebuild 1830 SHA256 f7eb8edd1622f1fac09b0ccf453117cfbf8a11051c3f313a2e759d766fa2d384 SHA512 117b9625585c21abdb6e69c14b067dfabdf101ea070431c166fb171822ba6c942be8df396f4db1348ce531dc4fd6439515126b21c226bd045416070f65e08711 WHIRLPOOL dcbc48d1c38c08a60af0e1b45f9529159cb5e1714a3b66818beecb07da366628727b376321af0633f00ba9887fadae198c3bd122d5bb6cc0f1abccd6ebf6311d
+EBUILD enblend-4.1.2.ebuild 1654 SHA256 e7e97e285092a4ca5e999aeca61726b013eeaf559e05726089671476eb9aa948 SHA512 b663bf08e73ab4361c5c0a65ea678c17a485e86449c9d9319e065146643f615e58ea939b58469f665c9d42e654256e05f00e202948bb899b0eb689b65a51fa1c WHIRLPOOL 53bd88f4caa594d916578263586885792dd789b0f3552e9668164d8e67596679f8536cf5324e1fa1b520032f8fc466b398ae8122f2b46094f5daa111018a8ccc
+EBUILD enblend-4.1.3-r1.ebuild 1839 SHA256 1fbc86991f77de3f2ed69db612b5dac37ae9a57b110d945a6ffd06a5bba04ac0 SHA512 5264f067b92952118b2563c15610b396bb6fc379faa54ada291fe711969b6e1cf2e3068248e0785fcfcbdd796358afd583e9e55b8646c283f56af6df2f246ef3 WHIRLPOOL a0b2f556f14e7bbf881388e00896929b144bfdd1eb67b792448b4fe53858e3cad6f9b529ed4c6f33621c01b5c74a35ce6c1b46b05ee05a35ff1271192896015c
+EBUILD enblend-4.1.3.ebuild 1760 SHA256 cad2b357740b2137f0a832ce10af4fcf9b21f91ece71ed02521aac21eba10916 SHA512 c3661893bfb091ebda8b79bb9e89f5f57f2e56dbad000c220c0eda268d458d95bcf8046fb8245b2741f2a2f5995b5734b34c4847606c8a4eeef3a7b024da2e7e WHIRLPOOL d820fc3ded8272c3ec47c96131a87b4c3139a177ac7bad87cb410b85d827077d551e66ab1d7789e54c1018d551dd3044044da141ae26b3eff25944e264218078
 MISC metadata.xml 386 SHA256 bdd95aecd66cd375334d95757dbf21f8ba162e92f9403c268f13e17192efbf7e SHA512 6b72e7a926b277102d98e03562d236332db10ac3512a5feb794606b6d7fcd345af6681faf3e2484d3a9b0365ea07d4bcb5e4fcf7056f5768607d6e69f4ead8af WHIRLPOOL c24f3e44c32a0af3602f6d17330c33a70ef5366b5a08254246008ec3742420ef30c36798afdf86cc0016785152675c4e1b16832b1364a39e163068a338b5076a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlW/284ACgkQkKaRLQcq0GLYWACdENRL+hUnf+Csdgdz0MRV1QSI
-1QQAn3tnvjnVPzHP1ELWXqN11Dqa3ZgD
-=rggZ
+iQJ8BAEBCABmBQJV04wUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyMDhFOEI5QzhFQzk5QTE1M0I0QkI3Mzc3
+QkU3NkVDMjU1N0I0NDNDAAoJEHvnbsJVe0Q83NAP/jraRBJRHKodu9TUHHtnVL3+
+SWCLZ9RFo6hrbU9IY1GZCBzfTJnnF9V8Ph4aiuheaho1NvBNPy4Au8UGmOrddP1B
+PlaKyiIHx3elH22ibYZDj4nnZjjkDkx2pLkzMTeAUD/1Cd7rKDJiWcz1w6/ydW2H
+StDtguVMGKl5Fdt4BZjgMFEwEDQ8UU0eYPHXsOnKRZ4whpj6Wn7LmZa1iUVAIi+O
+T47epiZjP5L94wLFqyF0/A5LEMvrHuFU9UXZwAiU/uxX5WOr7RNDoQFnf48IAF7m
+d7276zpEHyV+1+qSwx1eh5WKYP85UPyHx6kUVdue7+NtYXjFzAv83e2E/PYxPXCW
+OVKIaj/Ri+nw504cnbSeLA2BKj0iGTYzwCD0fekON9NancppCRjKaOLKmNIFmMmP
+TNXDxJv8Chcw44Fl9AZ7dcEHFRs2L7/NKjvYrF10zNFgzlf3hPz/po7W37+X2Iiu
+mITnL6aT5O72VFUSn78AuciT5lrN9vXXnm79Mjwlw0sEH2g5q6980sLqFCSejYmn
+Nf5nnATu3w0yTHE+tZvaRmjBJKErzppefmVyPtr0WfjwOYpFbQ3k+Vr2/ZVVfCp1
+aZzded33PiEuynibRsxZFn73J6BAZZwVO0zMzeB5JmRI1M+IGaIKBx85GE20RRJu
+sWbxcmjzsNmrdCEQOyDT
+=VWDt
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/enblend/enblend-4.1.1-r1.ebuild b/media-gfx/enblend/enblend-4.1.1-r1.ebuild
index 6d52eed..20e2832 100644
--- a/media-gfx/enblend/enblend-4.1.1-r1.ebuild
+++ b/media-gfx/enblend/enblend-4.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-4.1.1-r1.ebuild,v 1.3 2013/09/09 22:26:33 maekke Exp $
+# $Id$
 
 EAPI=5
 
diff --git a/media-gfx/enblend/enblend-4.1.1-r2.ebuild b/media-gfx/enblend/enblend-4.1.1-r2.ebuild
new file mode 100644
index 0000000..aea8156
--- /dev/null
+++ b/media-gfx/enblend/enblend-4.1.1-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="
+	media-libs/glew
+	=media-libs/lcms-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
+	sci-libs/gsl
+	virtual/jpeg:0=
+	debug? ( dev-libs/dmalloc )
+	gpu? ( media-libs/freeglut )"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.31.0:=
+	virtual/pkgconfig
+	doc? (
+		media-gfx/imagemagick
+		media-gfx/transfig
+		sci-visualization/gnuplot[gd]
+		virtual/latex-base
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.1.3-vigra_check.patch
+
+	sed -i -e "/CXX_FLAGS/s:-O3::g" CMakeLists.txt || die
+	sed -i -e "s:doc/enblend:doc/${P}:" doc/CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+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.1-r3.ebuild b/media-gfx/enblend/enblend-4.1.1-r3.ebuild
new file mode 100644
index 0000000..2e46825
--- /dev/null
+++ b/media-gfx/enblend/enblend-4.1.1-r3.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="
+	media-libs/glew
+	=media-libs/lcms-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
+	sci-libs/gsl
+	virtual/jpeg:0=
+	debug? ( dev-libs/dmalloc )
+	gpu? ( media-libs/freeglut )"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.31.0:=
+	virtual/pkgconfig
+	doc? (
+		media-gfx/imagemagick
+		media-gfx/transfig
+		sci-visualization/gnuplot[gd]
+		virtual/latex-base
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.1.3-vigra_check.patch
+
+	sed -i -e "/CXX_FLAGS/s:-O3::g" CMakeLists.txt || die
+	sed -i -e "s:doc/enblend:doc/${P}:" doc/CMakeLists.txt || die
+	cmake-utils_src_prepare
+
+	epatch "${FILESDIR}"/${P}-texinfo-5-upstream.patch
+	epatch "${FILESDIR}"/${PN}-4.1.3-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.1.ebuild b/media-gfx/enblend/enblend-4.1.1.ebuild
index 1394af1..20e6ba7 100644
--- a/media-gfx/enblend/enblend-4.1.1.ebuild
+++ b/media-gfx/enblend/enblend-4.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-4.1.1.ebuild,v 1.2 2013/04/11 20:12:38 vincent Exp $
+# $Id$
 
 EAPI=2
 
diff --git a/media-gfx/enblend/enblend-4.1.2.ebuild b/media-gfx/enblend/enblend-4.1.2.ebuild
index d02b628..5078db9 100644
--- a/media-gfx/enblend/enblend-4.1.2.ebuild
+++ b/media-gfx/enblend/enblend-4.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-4.1.2.ebuild,v 1.2 2014/06/15 12:34:05 maekke Exp $
+# $Id$
 
 EAPI=5
 
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 0000000..1984998
--- /dev/null
+++ b/media-gfx/enblend/enblend-4.1.3-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.ebuild b/media-gfx/enblend/enblend-4.1.3.ebuild
index a6bedc1..132ec8d 100644
--- a/media-gfx/enblend/enblend-4.1.3.ebuild
+++ b/media-gfx/enblend/enblend-4.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-4.1.3.ebuild,v 1.7 2015/07/25 11:21:33 maekke Exp $
+# $Id$
 
 EAPI=5
 
diff --git a/media-gfx/enblend/files/enblend-4.1.1-texinfo-5-upstream.patch b/media-gfx/enblend/files/enblend-4.1.1-texinfo-5-upstream.patch
new file mode 100644
index 0000000..8399f23
--- /dev/null
+++ b/media-gfx/enblend/files/enblend-4.1.1-texinfo-5-upstream.patch
@@ -0,0 +1,617 @@
+From 0a60c121addb1b850f52281d898bdf1e04d920ad Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 16 Aug 2015 20:01:15 +0200
+Subject: [PATCH] Port enblend-4.1.3-texinfo-5-upstream.patch to 4.1.1
+
+---
+ doc/Makefile.am      |   2 +-
+ doc/auxmac.tex       |   7 ---
+ doc/auxmac.texi      | 156 ---------------------------------------------------
+ doc/bug-reports.texi |   2 +-
+ doc/enblend.texi     |  34 +++++------
+ doc/enfuse.texi      |  81 +++++++++++---------------
+ 6 files changed, 51 insertions(+), 231 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 22c7fbc..40bb394 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -46,7 +46,7 @@ AM_MAKEINFOHTMLFLAGS = @AM_MAKEINFOHTMLFLAGS@ \
+                    -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 --git a/doc/auxmac.tex b/doc/auxmac.tex
+index 812d58d..524830f 100644
+--- a/doc/auxmac.tex
++++ b/doc/auxmac.tex
+@@ -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 --git a/doc/auxmac.texi b/doc/auxmac.texi
+index 98c679f..59520c3 100644
+--- a/doc/auxmac.texi
++++ b/doc/auxmac.texi
+@@ -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 @@ not displayed, because of lacking <acronym>SVG</acronym> and
+ 
+ @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 @@ x@c gobble following newline  -- The Tricks of a Texinfo Wizard.
+ @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 @@ $\\xi$%
+ @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 --git a/doc/bug-reports.texi b/doc/bug-reports.texi
+index 56f8196..82c7476 100644
+--- a/doc/bug-reports.texi
++++ b/doc/bug-reports.texi
+@@ -78,7 +78,7 @@ this by running it with the options @option{--version} and
+ @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 --git a/doc/enblend.texi b/doc/enblend.texi
+index 17b7c3d..a9a00e8 100644
+--- a/doc/enblend.texi
++++ b/doc/enblend.texi
+@@ -508,9 +508,9 @@ As a guideline, remember that each new level works on a linear scale
+ 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 @@ For floating-point format, use
+ 
+ @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 @@ Maximum finite value: @semilog{3.4, 38}
+ 
+ @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 @@ floating-point numbers.
+ 
+ @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 @@ Maximum finite value: @semilog{4.3, 9}
+ @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 @@ If omitted @var{FACTOR} defaults to
+ @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 @@ option@tie{}@option{--visualize} to directly judge the effect.
+ 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 @@ of the image and the final seam-line
+ @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 @@ of the image and the final seam-line
+ @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 @@ approximately 15@dmn{cm}.}
+ @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 --git a/doc/enfuse.texi b/doc/enfuse.texi
+index 0dd8c23..59c1dfe 100644
+--- a/doc/enfuse.texi
++++ b/doc/enfuse.texi
+@@ -621,9 +621,9 @@ As a guideline, remember that each new level works on a linear scale
+ 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 @@ For floating-point format, use
+ 
+ @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 @@ Maximum finite value: @semilog{3.4, 38}
+ 
+ @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 @@ floating-point numbers.
+ 
+ @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 @@ Maximum finite value: @semilog{4.3, 9}
+ @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 @@ A positive @var{LCE-SCALE} turns on local contrast enhancement
+ @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 @@ left unchanged.  This effectively suppresses weak edges.
+ @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 @@ output image.
+ @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 @@ where @math{x} runs from 1 to the common width of the images, @math{y}
+ 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 @@ to the final @math{Q(x, y)}:
+ @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 @@ w(P(n, x, y)) * P(n, x, y)
+                 <mi>y</mi>
+             </mfenced>
+         </mrow>
+-        <mtext>,</mtext>
+-        <mspace width="4em"/>
+-        <mtext>@equationW{}</mtext>
+     </mrow>
+ </math>
+ @end html
+@@ -2530,7 +2513,7 @@ w(P(n, x, y)) * P(n, x, y)
+ $$
+     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 @@ contributes as much as its weight demands.  Of course the weights can
+ 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 @@ Trouper'') weighting mode, where the pixel with the highest weight
+ 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 @@ where
+ 
+ @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 @@ $R = \sqrt{x^2 + y^2}$.
+ @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 @@ Experience has shown that neither the parameters @var{EDGESCALE} and
+ @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 @@ centers around the image effects.
+ 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 @@ next section.
+ 
+ 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 @@ Use @acronym{LoG} to detect edges on a scale of 0.3@dmn{pixels}.
+ 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
+ 
+-- 
+2.5.0
+
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 0000000..dd63ae3
--- /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 0000000..ef04aa7
--- /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
+