media-gfx/enblend: sync with main tree

Signed-off-by: Markus Meier <maekke@gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
Manifest-Sign-Key: 0x5159C1E7219C0A2C

5 files changed, 19 insertions, 190 deletions

diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest
index bd5bcb0..50011fe 100644
--- a/media-gfx/enblend/Manifest
+++ b/media-gfx/enblend/Manifest
@@ -8,27 +8,24 @@ AUX enblend-4.1.3-vigra_check.patch 463 BLAKE2B c1e4ef25952285edeab6f78f74c715fb
 AUX enblend-4.2-doc-install-dir-fix.patch 2705 BLAKE2B a5bfb43521095bc088aef980f849cfb9cb2e7e9ae2a10b2fcd4b56cd7b27888047567c3b95b40e3a8feefe7ee9209db49688800986cc895731e0949acd3bae1c SHA512 a22730295c44da4f9feb3d541b17f298adf98f0328cf01d6a85206087c782e1aebac6509968d1a5433efb5fc3d72e48301ec3d5a2516f01c1f6d923d5032ab03
 AUX enblend-4.2.0_p20161007-cmake.patch 477 BLAKE2B 9a27d95e78cc611c723824a300dbc3eaeb7c2ffe6bcacb19baeb8a24180450f2912310ae9584f450899ececca11636304d36631f8c57f6d4b7c2450043d6f147 SHA512 5b79944beabd97f71f05657ce17e31d9eab60506dfce27fefc3a8f9a10c92f33b1b4fa1411c6d1a33d23819a4020a50f130b9083fecaf3e1a072fda71e5f9ff0
 DIST enblend-4.2.0_p20161007.tar.xz 494060 BLAKE2B 8842dd70a1400a27170794246cb5c89d60b6798373e3a9d63e88738ad569e1174cb4303ccb5a2bc79846651e982e05f8cb9ac3e09b83ee33958b6ccf043ebda9 SHA512 ede037f19a7c3b358f533ecfb235f70824261eaf189d0bdcde6f9cedaa5952be2a6940884e688418b725cb3a67fc1b7d366483a76b7c62326ca857b8efe3a3f3
-DIST enblend-enfuse-4.1.3.tar.gz 862079 BLAKE2B 1ea6d909bbc32d6141090862f658cc29ee0156e898e133fa88a10d1ea1df1e3eb0b6481010a0b3c0795bce0345ff3a77d1916310bc7b39fb292478c622d4493a SHA512 0a3487783afadee896b84411330898393cda4be4cbb79d36013daa98c17ab88f97a298c21a5c398b7cb2ce83e8dc4519a80e18be472c5fec10c3114037b6db73
-EBUILD enblend-4.1.3-r1.ebuild 1828 BLAKE2B dcb8c7c2959e654fee9c49a85dbfbd2bcd38ee2638f574d16c4dd93d33c2f93b934ec22cfc4e02a6435e1ed7e8d9f82bd7a03334b383f2f8868085ac39418c62 SHA512 9d44ea73c8df971e2407f71c9464536b50e9b2cbca28aedf1628c248739c90c0c5c8ac41fa397a4ba32ba35a632fc2884207dc0336470cf17816a64382a2993c
-EBUILD enblend-4.1.3-r2.ebuild 1930 BLAKE2B 28a23f9afc96486786805567869ff0faec4302a912f4647d79fa92f49d488124949fa82f3968df9c888f5e9860aaa1fa77141747c5f373eea3085e0bff8d314a SHA512 3c0e08b10899cf8453e014df17fa1b7dbcad65db550b0556baf385eadd01b8813f6c8a1d4c98e596eb144cb01d3a7731754b24e44697a970fa5ca6adabd338c4
-EBUILD enblend-4.2.0_p20161007-r1.ebuild 1755 BLAKE2B 9669e03704332c5775786b38c23ab8810f43b0a0f6da890143fe992a1466bbaaacbef6bb4ba08fdeb88da65607d2e53899f3699eb703f23654e7997c1a0f7118 SHA512 506a593987bb79f0afb825d7892e6930a43bbaaa1a1bb0bd5ae3f14d559fa55ff7ab2fcd6136eb34b199c661c5f87fde1cc6df08d88003f61e3589b61b539b00
-MISC metadata.xml 472 BLAKE2B acab18a5d54df3704a279c6a0a98d61f35e072f6dbe264c555e15265851472417a469f5f84678c9f8cdf889ff834ed5810a2768bc2ad656f7e402ab96d518d68 SHA512 f2623eccd20aee91ae2ffe90e3999e359865757269d8ca84cd095ee5f0d55e18000d3afb602531231799a31a14edbf1bdeea72b162976fcd51727a169045d100
+EBUILD enblend-4.2.0_p20161007-r1.ebuild 1756 BLAKE2B 65b93a2b9eaafc5771cec53a48e2d62dea398f2ed844ab3277e23e72e1935567401c1132efb02f2c55c5a346d7af370e380ab53f4d97a1f705006b7042d3ae9a SHA512 be06524f5efa2da515f7e3e6fb398dd9ce7e8c631277a87396a19a6b752bafe8b2782e2ff93696f5221feb58b05d6f517dd4f1d4d326dcb12e8921bea9669a37
+MISC metadata.xml 336 BLAKE2B ca7263a1856bc0a6de0a9085fcaa0df5745cda2f678c36984fc2bf11218207214dbad308c39811213d7ce5d376228bc87a60adbfd4fee8f02b2119af0ebac207 SHA512 ac71d3806312b434087a0ce55eadd3db06091e11a195fe90da48570bdb4ad47bf50c864ae2b82e25acb08b6ce78ebc6dc8b33bdd064ee449efcb0995806f2eca
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQKTBAEBCAB9FiEEII6LnI7JmhU7S7c3e+duwlV7RDwFAlrlt/9fFIAAAAAALgAo
-aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDIw
-OEU4QjlDOEVDOTlBMTUzQjRCQjczNzdCRTc2RUMyNTU3QjQ0M0MACgkQe+duwlV7
-RDzqdhAAhTJzf9I19cT62gC8ohvk0dioDu9RH+utIMGfCeLoVYWQYriRx4UGBu9A
-oB8HPgMdGXJ+NF8qaj4KmtiAbuAfBrDI8ktjTNZcljvrLRS2KaRbQdtEct+rOqn/
-1wXPV2qcxx8wTZxVM/rErgXo0BMVcV9zRCB9ocl/nUvndu3lo8l/FqZe74vDU8ls
-lrZP4AEGoHyrCneDZDI0urQ1qMxNA4fgkPKSDEl33MeIExR906z4jBxURKzQuG2y
-lQFj2pebBhc/a6nwa9lcnfi5AN2Soam9d8Tnms1EJXIqIJG7qp1IWkbJr+X4CigE
-1bhsDAy0bEXNno8XhbaLFtnzRa3Ia4/fSeEVYoN8wyFieXSPMw3D9RT9nid4MIWk
-QC5Y4s1klYjYMHJx/fOSTUCJRPVwfTz130NL09VwKSWyT013kxL6ZwDRQtfBFuVL
-HKoIw/M1rqfAFUdMiVCXcPIQh5TerbmxWB0MKeNcHWhtgcRT796RFclxfoNjFdYP
-ZwPntDY9hzrnQ3/OJgJ9Io9bQ2NJe1dPyobOA+zYZHkCSiUTpy7QdSnxDIoo6CpH
-Yh3s34RPUWfIysRTiMFNmLr/RbppkSXTUS1eLp65Sv8MMjbifr/NAVGujn7cqEkI
-JfKXErWIgDWbB9pK4AMthDNkac1jBhFkw3RLUHu/hfSZSwr3rrI=
-=cx8y
+iQKTBAEBCAB9FiEErJcI5lTqgnns7I/6UVnB5yGcCiwFAlzHWDNfFIAAAAAALgAo
+aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEFD
+OTcwOEU2NTRFQTgyNzlFQ0VDOEZGQTUxNTlDMUU3MjE5QzBBMkMACgkQUVnB5yGc
+Ciw+rhAAwdm7XK71Lj+swBSYzeGLSmrZ8ofS86jCHdPz4jqQiM6iS+hzUKRpy3h/
+Xksv6CvdxfNC1k16Q3OJI+IqdDy/MWJ041OWs5oJHC8LeIkSw0gf7MefBcNQBpNn
+62xdGdzYp+DQIwOFn56gOkxVObEGPmPeTPvbzRwy6MDpVT2ETKp37jRfl0nTrcww
+fPgPciauFIyfKafPtrNn4sDNTQ6NFBa8UvoGiHsBt02g0kxAKbMC0ylnjKIVdOJA
+iVFebkXyVP0+xBDQc+ndK9ibG0vRK3w9DwxwqwoMHhVQNpV26hmdivv0sUWCj1sZ
+T3Dx9CDnbBJ/0IR2TImWDS0f0OA2OOeMpeswVdLkkPBe+RWl3YO6PxOWnvcnzENZ
+yHV514+SAXupFpK/QFLKXVHR/2nNq8jo7i9oBsRscVaxZwtTvlHKMJlLLuUm+LtS
+a6vLoV+jqF2KRcGOCo7CzZTohPKkViAC8CKrtxsh76H2qFLF83A9YEroOmRA8jsb
+sD7i62J8MU5mNos+u5QRWsD644HvQcDpl4QSWeDVaR/jcdVHYQlHIha/ms+WhfdZ
+hUrfx0n/KYsBd1g17ixZl/iHwhDEkPJUeWJa+4qob6Qkhcd5juBeZ6LwRe13kDsQ
+araAIFj2IAbjXUcecLRnu9n5ojdGZzXij56m9xHLsVhEuiv024w=
+=7aH1
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/enblend/enblend-4.1.3-r1.ebuild b/media-gfx/enblend/enblend-4.1.3-r1.ebuild
deleted file mode 100644
index 98dced1..0000000
--- a/media-gfx/enblend/enblend-4.1.3-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils cmake-utils
-
-MY_P="${PN}-enfuse-${PV/_rc/rc}"
-
-DESCRIPTION="Image Blending with Multiresolution Splines"
-HOMEPAGE="http://enblend.sourceforge.net/"
-SRC_URI="mirror://sourceforge/enblend/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 VIGRA"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug doc gpu image-cache openmp"
-
-REQUIRED_USE="openmp? ( !image-cache )"
-
-RDEPEND="
-	>=dev-libs/boost-1.31.0:=
-	media-libs/glew
-	>=media-libs/lcms-2.5:2
-	>=media-libs/libpng-1.2.43:0=
-	>=media-libs/openexr-1.0:=
-	media-libs/plotutils[X]
-	media-libs/tiff:=
-	>=media-libs/vigra-1.8.0[openexr]
-	sci-libs/gsl:=
-	virtual/jpeg:0=
-	debug? ( dev-libs/dmalloc )
-	gpu? ( media-libs/freeglut )"
-DEPEND="${RDEPEND}
-	media-gfx/imagemagick
-	sys-apps/help2man
-	virtual/pkgconfig
-	doc? (
-		media-gfx/transfig
-		sci-visualization/gnuplot[gd]
-		virtual/latex-base
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${PN}-4.1.3-vigra_check.patch" )
-
-src_prepare() {
-	sed -i -e "/CXX_FLAGS/s:-O3::g" CMakeLists.txt || die
-	sed -i -e "s:doc/enblend:share/doc/${PF}:" doc/CMakeLists.txt || die
-	cmake-utils_src_prepare
-
-	epatch "${FILESDIR}"/${P}-texinfo-5-upstream.patch
-	epatch "${FILESDIR}"/${P}-texinfo-5-more.patch
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_CXX_FLAGS_RELEASE=""
-		$(cmake-utils_use_enable debug DMALLOC)
-		$(cmake-utils_use doc DOC)
-		$(cmake-utils_use_enable image-cache IMAGECACHE)
-		$(cmake-utils_use_enable openmp)
-		$(cmake-utils_use_enable gpu)
-	)
-	CMAKE_BUILD_TYPE="Release"
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	# forcing -j1 as every parallel compilation process needs about 1 GB RAM.
-	cmake-utils_src_compile -j1
-}
-
-src_install() {
-	local DOCS=( AUTHORS ChangeLog NEWS README )
-	cmake-utils_src_install
-}
diff --git a/media-gfx/enblend/enblend-4.1.3-r2.ebuild b/media-gfx/enblend/enblend-4.1.3-r2.ebuild
deleted file mode 100644
index 6fadcfd..0000000
--- a/media-gfx/enblend/enblend-4.1.3-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-MY_P="${PN}-enfuse-${PV}"
-
-DESCRIPTION="Image Blending with Multiresolution Splines"
-HOMEPAGE="http://enblend.sourceforge.net/"
-SRC_URI="mirror://sourceforge/enblend/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 VIGRA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc gpu openmp"
-
-RDEPEND="
-	dev-libs/boost:=
-	media-libs/lcms:2
-	media-libs/openexr:=
-	media-libs/tiff:=
-	media-libs/vigra[openexr]
-	sci-libs/gsl:=
-	debug? ( dev-libs/dmalloc )
-	gpu? (
-		media-libs/freeglut
-		media-libs/glew:*
-		virtual/glu
-		virtual/opengl
-	)"
-DEPEND="${RDEPEND}
-	media-libs/libpng:0
-	sys-apps/help2man
-	virtual/jpeg:0
-	virtual/pkgconfig
-	doc? (
-		media-gfx/transfig
-		sci-visualization/gnuplot[gd]
-		virtual/imagemagick-tools
-		virtual/latex-base
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS NEWS README )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-vigra_check.patch
-	"${FILESDIR}"/${P}-texinfo-5-upstream.patch
-	"${FILESDIR}"/${P}-texinfo-5-more.patch
-	"${FILESDIR}"/${P}-cmake.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# CRLF in files, don't bother with patch
-	sed -i -e "/FIND_LIBRARY(LCMS2_LIBRARIES/s/lib32/lib/" \
-		CMakeModules/FindLCMS2.cmake || die
-	sed -e "/FIND_LIBRARY(OPENGL_gl_LIBRARY/s/lib32/lib/" \
-		-e "/NAMES.*MesaGLU/s/lib32/lib/" \
-		-i CMakeModules/FindOpenGL.cmake || die
-
-	sed -i -e "/CXX_FLAGS/s:-O3::g" CMakeLists.txt || die
-	sed -i -e "s:doc/enblend:share/doc/${PF}:" doc/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_CXX_FLAGS_RELEASE=""
-		-DENABLE_DMALLOC=$(usex debug)
-		-DDOC=$(usex doc)
-		-DENABLE_GPU=$(usex gpu)
-		-DENABLE_IMAGECACHE=$(usex !openmp)
-		-DENABLE_OPENMP=$(usex openmp)
-	)
-	CMAKE_BUILD_TYPE="Release"
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	# forcing -j1 as every parallel compilation process needs about 1 GB RAM.
-	cmake-utils_src_compile -j1
-}
diff --git a/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild b/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild
index b5f563b..137c0d6 100644
--- a/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild
+++ b/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ 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"
+LICENSE="GPL-2+ FDL-1.2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="debug doc openmp tcmalloc cpu_flags_x86_sse2"
diff --git a/media-gfx/enblend/metadata.xml b/media-gfx/enblend/metadata.xml
index 621b21a..9495d45 100644
--- a/media-gfx/enblend/metadata.xml
+++ b/media-gfx/enblend/metadata.xml
@@ -5,10 +5,6 @@
 		<email>graphics@gentoo.org</email>
 		<name>Gentoo Graphics Project</name>
 	</maintainer>
-	<use>
-		<flag name="gpu">GPU support for Enblend</flag>
-		<flag name="image-cache">allow for processing of large images</flag>
-	</use>
 	<upstream>
 		<remote-id type="sourceforge">enblend</remote-id>
 	</upstream>