add CMake based ebuild, using EAPI=5, should fix bug #476836 and bug #460274

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x072AD062

3 files changed, 85 insertions, 10 deletions

diff --git a/media-gfx/enblend/ChangeLog b/media-gfx/enblend/ChangeLog
index 0b0d665f7889..0b0d207fbfdf 100644
--- a/media-gfx/enblend/ChangeLog
+++ b/media-gfx/enblend/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/enblend
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/ChangeLog,v 1.53 2013/05/08 08:50:30 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/ChangeLog,v 1.54 2013/09/06 20:48:55 maekke Exp $
+
+*enblend-4.1.1-r1 (06 Sep 2013)
+
+  06 Sep 2013; Markus Meier <maekke@gentoo.org> +enblend-4.1.1-r1.ebuild:
+  add CMake based ebuild, using EAPI=5, should fix bug #476836 and bug #460274
 
   08 May 2013; Tim Harder <radhermit@gentoo.org> -enblend-4.0.ebuild,
   -files/enblend-4.0-libpng14.patch, -files/enblend-4.0-libpng15.patch,
diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest
index 061258b3c7ff..c05422bf8c7b 100644
--- a/media-gfx/enblend/Manifest
+++ b/media-gfx/enblend/Manifest
@@ -2,17 +2,14 @@
 Hash: SHA256
 
 DIST enblend-enfuse-4.1.1.tar.gz 850214 SHA256 9d0947633ebaa0dc1211331b31009408de6fe2108751ad4190760e3a9f181bc9 SHA512 dd4c8f205986beef1268210a8ccad10107125fc15a45b2e7266f250d36a294356f557d577b80e923e04b5f14ed5f6070201793c067cc3a2e7d6020cf5669a61f WHIRLPOOL c9938499116f26f3bfe6eae874414722a15380cbda959c82315bb124cb7b58456550174b0d43355d924cb6e107ef3ee4d1b83f8adc82d7144d974b66207ff965
+EBUILD enblend-4.1.1-r1.ebuild 1747 SHA256 34be7a767e908bd87d4065b4c40d2e52e64aa0318904e15385f5ce8e5594e11f SHA512 6dced904c0cae18fdb0a819cc6758040b6eef770438813690375fd7dba60523c0b66142debd6ca093754e121fb6e62ea8aabae3036ef23ad0509e9d06373fc5b WHIRLPOOL 4ea1d49578dc7ced52656cc9ead329e6af81148d381478783beab29e8529499aa1a64c8d55ade4b92565bf1fb5c6780e28afe01e114cd1e41cd659fbf6879d1f
 EBUILD enblend-4.1.1.ebuild 1937 SHA256 a7c519f40c3c4b9149bf7fed592280cc29bad5da2cf8a594e9d8885ced21937a SHA512 d5be6d54b83c917e352c1a8e354cf730fa61679d14b46208f274fbae7a127bb5115902ac4e2997864544e904678f39c541c6dadb5c8bc0560913f262e3f104a8 WHIRLPOOL 5475db49caae94c7a92df20a10b4d0332f5049e2ba0e4386e0e4fecea93fdc46ebfc817b41c296449fc2724bd301496bebb58062041bec0aa39978fe3a8be6dc
-MISC ChangeLog 7095 SHA256 978091f06cf9de8667d9ece2a8358dee33dda13f6c2b5e3aa2e08f6e09e69fb2 SHA512 9f6787bdecb0b055c2ea256c746d5ab5eb43874748d0bd9d7a383b06fa096e984ff0e5688461baea4e69c2194c07e09d3ea62ec6a5b44392c36e4ee6d0af2fa2 WHIRLPOOL 77b6fb1858b87e8a7667e1bd828418e0d74dd0c267bcc0048368b97632595451c716eaffadbd55d93763b9b620634de6902961adf27250dbd8133bc9bbb9b7df
+MISC ChangeLog 7279 SHA256 ee81162c050371fef228d2b28ac88118ae6fa8f338d2b514fa5f913c076622f6 SHA512 e203164314acc14d617035becb0c19884a4a30cf01eeab926dae5b2ebd36692f63528672d3331555673384bbf95d4e7e6f50932088a52b6ce85f258e3a8405c2 WHIRLPOOL dd926cde56f927d6831885ea92f887043e25c462ba5b0b8aae1c248fa8668dce70b68212be1077f7e929c56753ae19118b35666cf7aee172aba64c359f6ffcc4
 MISC metadata.xml 298 SHA256 5d3fcb04b17733010c038cd4b18d4fff78a7ca252ebf3610ecdf353f7dce76f3 SHA512 a92eebec232855ca89459a7c112c54c65f9ffb6e40e712da5eb9369b8389e1278768441a4c83a901ce90640adb321d068ed96bc95d63b6048bf4b7c90b5c999a WHIRLPOOL 015f7e2a6cdc965f1b385358bbdf3d2c784f044a0134018bce3aec87fd64677b2e6b04a3d6279d51dddd2a07b09d7b6fe43fe60fd74b7546104bbeff1231406a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRihHXAAoJEEqz6FtPBkyjgfwIAI6uPAtKA9MM4kftHIo5ajre
-Z78gFWycsz1TvFMIC1bcSWn6vXok7Cb/6WFqaLUtDkO6h4fWumbAxul1D4F4llBs
-MSB+kQatWXllMFav28R05/UVEOK3gSDAvu5cgTDHVyht1OzkLw4oKvfbNqlfWmlM
-DbRiWSfZIpFTU2stfdlYlA83a11pFCB8M7NIX3U22WIlVKBjbYUHVaP6fjOR93w/
-2pQYY01j854dwz7IFXw80dteFTdk+a8dLBMtbvbk5SeimCLbScLNZgXX+MqpeSGx
-7snVxg7FxH81S6fZed2CERP4Rx1i8fLsVrr1hzbZ177Dz87e6gljXssXhyN9lCs=
-=O452
+iEYEAREIAAYFAlIqQS4ACgkQkKaRLQcq0GKpuACfRu04vmUxALrx2LD/1uxIFDD/
+j6YAoJ2rYsZ6k/PV4sIzdGFAHw2aCXa5
+=meVu
 -----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
new file mode 100644
index 000000000000..72eae60f62d5
--- /dev/null
+++ b/media-gfx/enblend/enblend-4.1.1-r1.ebuild
@@ -0,0 +1,73 @@
+# 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.1 2013/09/06 20:48:55 maekke Exp $
+
+EAPI=5
+
+inherit 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() {
+	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 OPENCL)
+	)
+	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
+}