Version bump, wrt bug #453816: EAPI 5, unbundle tinyxml, add compatibility patch with OpenEXR 2.0. Drop old version

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

6 files changed, 155 insertions, 94 deletions

diff --git a/media-gfx/aqsis/ChangeLog b/media-gfx/aqsis/ChangeLog
index e4b86c1d7a0b..59e77f5a8467 100644
--- a/media-gfx/aqsis/ChangeLog
+++ b/media-gfx/aqsis/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/aqsis
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/aqsis/ChangeLog,v 1.24 2011/11/05 08:45:07 ssuominen Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/aqsis/ChangeLog,v 1.25 2014/02/16 08:08:12 pinkbyte Exp $
+
+*aqsis-1.8.2 (16 Feb 2014)
+
+  16 Feb 2014; Sergey Popov <pinkbyte@gentoo.org> -aqsis-1.6.0.ebuild,
+  +aqsis-1.8.2.ebuild, +files/aqsis-1.8.2-openexr-compat.patch,
+  +files/aqsis-1.8.2-unbundle-tinyxml.patch:
+  Version bump, wrt bug #453816: EAPI 5, unbundle tinyxml, add compatibility
+  patch with OpenEXR 2.0. Drop old version
 
   05 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> aqsis-1.6.0.ebuild:
   Fix building with recent boost and gcc by using Debian patchset wrt bugs
diff --git a/media-gfx/aqsis/Manifest b/media-gfx/aqsis/Manifest
index c9d6299f2737..e5fd388e0f39 100644
--- a/media-gfx/aqsis/Manifest
+++ b/media-gfx/aqsis/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST aqsis-1.6.0.tar.gz 2867634 RMD160 49d33657954922b1ae1fa9cd3a865491ef8aa5ad SHA1 cd0c1416d36f1b3c47b2eef7d8d861fcb38a8be5 SHA256 b9477c761bc887e4bbc6f3a1d2bca5e508c15cf66d77fc0d1cd430dbb9b92fa4
-DIST aqsis_1.6.0-8.debian.tar.gz 15706 RMD160 83e5b1df94ed3ffe061bfc4033d874a192af73cf SHA1 c9bd1ceeafc9f4e347913d41da5083c820a62b28 SHA256 959b69b7c4078b404542c9fdd65abd81379644d588744b7b915787f6774227f8
-EBUILD aqsis-1.6.0.ebuild 2218 RMD160 37bc9aa29da414955f61971b59a3610bec8dcfb6 SHA1 cf64abbb2565ab1e6fbdf5cfec3aa7ae44e3fd42 SHA256 0d12ba015e6b417cb4a0e4bd01b9aa087ef5d8da5990ff4bf1fe6bda2c5cc95e
-MISC ChangeLog 3636 RMD160 c70ac60bd97a301d6a217a4df9c066577d9d081e SHA1 5c22c379f86f85898404315c126f60dd4f5b0629 SHA256 f23a7829dfb6085515a14eec297ff66484b54adbb20c0309ee6f3f3d218796a2
-MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1
+AUX aqsis-1.8.2-openexr-compat.patch 384 SHA256 c0dc89b88ad1faed2ecf55dd978210583f5202cf1808f8d39e461a9e11997183 SHA512 43e903cf2e81b1581c1e391b18aabe1aa5538187c2cb54fc5b105bcbad0e44ac51e5b8c50f6f5e8d4b18b96931ec79870e3e68a5970d270b47a93d22cdb8e332 WHIRLPOOL 8c292a0a8ef293ddc7afe910da045b5a63165dabe160083e7997d875c7cb55bf3e9ee447d9611484964ed2d5f0d5e365494b7d2545f3f2d7b8d9425b7bf6d80d
+AUX aqsis-1.8.2-unbundle-tinyxml.patch 1835 SHA256 7952a88118edd3b2356ec149a56c32cca1c044ea880d41bc8963b8c6da6a0a3f SHA512 836b5f19544c04c245d4772f64ba689a6590e90bf510c1aad11560589fb9b6f11821716bfb15f2e366a1439a401de08b13f39398d18f95eeb1b42afaa458bccc WHIRLPOOL 875993ca1b46ecf7fde6cc9a808e136af4e7b1e62a96915ece0754b8ac92d162665f72ceb577279d7b869497c5bf1cd8cfa24d593c391f6f44b29e7917da46f2
+DIST aqsis-1.8.2.tar.gz 5669285 SHA256 25f644eb69dfe6f89c76f95615e897c6d74053fe72cc2069713855f80e791098 SHA512 b571f9cfa46c0f1e659b054835698fe90f4d9bf43bea54caea257ac0b9d1d65fca68a0ea874772d18c98194630e13528acefb0e852ef398f353b1d1bb545cecc WHIRLPOOL 57514e5943f48946db78f1fe88fd884d844318c7dd92a7d260beb0c6302f5c2fa71d0e97b0a58f0f9f16388eec5b0097106e6142906aa503a7b9f5f833377079
+EBUILD aqsis-1.8.2.ebuild 1329 SHA256 5d8af2e3b65f2fac8d5d6626f165863a4989bc25a1d4b24cbbfa5a88986230fa SHA512 3e38a58c1c1c87ed470652ba8109e4e0da16d29e4cbc3de7609c0b73916c1c52a767c239950af365bb8e4cf3fd9abec7f5b5cb8335e372a9c4f6d0d26a60eb21 WHIRLPOOL 727ba5380fa87a023fd30705129c9e7f83e8a40d78a9d0c3b8b89970a8aadf0f1c73eda8ab7168496a5a5fbef546f5c637c2b027f0cade695209b06688429061
+MISC ChangeLog 3964 SHA256 8eed6e036042c96c6410c31fae03fff0078ce7debaa07f47e246c9de8d797789 SHA512 70c180359000ceb3f7dc7802cd01383e2d7976589553a3056b1ac5fc1ec705e91a6f35865be50c39e6989e4643dd3e2f59064dce05546fac443e35c849951c65 WHIRLPOOL 1eda74f8c0a8cf9c801ab5942c30422ed7041a479073b7e07782bb64ea689727985c64b4a383707f234bec53a3c8e88995eeb29d074c0dac6cc1e2a2d7bfa838
+MISC metadata.xml 161 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1 SHA512 425caf0160f1410ce7bf1d4639020be7f6335152c339edbce80676bff4166f1cab3ae9e13161c47b98dc00741dab3bfa45e9572a3314844476e480f5c2b58d7d WHIRLPOOL ad7cdd3352dbc12cb4181fb5d63b5aee5ce3a151b975c12a96c4a5c91f751736d27282ad22633c7e768230266bce5d17947735d33ef5c5c2341c3f9435b9ebb0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOtPd4AAoJEEdUh39IaPFN1r8H/j5NS5fY0CGP+AmzNDXGAwgx
-Mw5PIuFC2R9csS8KwIW4+68cm+UkYOEWfmwznNVgZCS9QsF4yfiTCbiMwlGPG4v3
-OiVFm+pdnFWt4NZoM0ouclobTzqLxIKjA0JT6yH7p/3mFIZLwYltu8o+mDufSiwC
-KOvfnwtMWYzInqdHEnpxAQxl3iRklfZ+aHnNGzpOcEC7MKeRJVt3c3D4W+lM619z
-yyEbQPxcAyBL72c920LlVgcZONbN4iOxjtTqVHxdE2RzfvOBBbSoZb79gZ4n41AH
-9yxf/bLeVQomT+nNR9JnB6fjp21vdXBiUDDPJP6crcuwnPVFhj4hLlBQ6NERA34=
-=epD2
+iQEcBAEBCAAGBQJTAHH0AAoJECo/aRed92673KsH/1W+7jsi/9yWldIbxMupOf0U
+mPP0HIy1VpDbw450KMmX4BLvB4t8lni7vlesHCJCCg83b3sRZmLxYyui/Pm4UeNR
+h7AJ1YUGZf6OtJq8j8062Axh5x+S/1n3J3W94QuFXV/TScJ+oT5A9Vyw3YCOEpe5
+yU5LftfPGkMY5qUQB2IHiRZb3Y/TFQTPXOvyZvCDcJt1+TMHs1pGqm2AJmXnuYsZ
+Ra8s3HdloaadcfvjWgC69JeqepdavwDPpuiljJY1hcT8U/fsMjNzqevYjfC6Fes7
+tJCqg7CbgnU2/pKQ1lazSbWisNsU5Us1NVlh+XtvlGmz3IHyFyrnI6+awUs2zRw=
+=yL2m
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/aqsis/aqsis-1.6.0.ebuild b/media-gfx/aqsis/aqsis-1.6.0.ebuild
deleted file mode 100644
index ff8ca9ba7bbf..000000000000
--- a/media-gfx/aqsis/aqsis-1.6.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/aqsis/aqsis-1.6.0.ebuild,v 1.5 2011/11/05 08:45:07 ssuominen Exp $
-
-EAPI=2
-
-patch_level=8
-
-inherit versionator multilib eutils cmake-utils
-
-DESCRIPTION="Open source RenderMan-compliant 3D rendering solution"
-HOMEPAGE="http://www.aqsis.org"
-if [[ "${P}" == *_p* ]] ; then
-	# snapshot
-	_PV=($(get_version_components ${PV}))
-	DATE="${_PV[3]/p/}"
-	DATE="${DATE:0:4}-${DATE:4:2}-${DATE:6:2}"
-	MY_P="${PN}-$(get_version_component_range 1-3)-${DATE}"
-	SRC_URI="http://download.aqsis.org/builds/testing/source/tar/${MY_P}.tar.gz"
-	S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
-else
-	SRC_URI="mirror://sourceforge/aqsis/${P}.tar.gz
-		mirror://debian/pool/main/a/${PN}/${PN}_${PV}-${patch_level}.debian.tar.gz"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+fltk openexr"
-
-RDEPEND="
-	>=dev-libs/boost-1.34.0
-	>=media-libs/tiff-3.7.1
-	>=sys-libs/zlib-1.1.4
-	fltk? ( >=x11-libs/fltk-1.1.10-r2:1 )
-	openexr? ( media-libs/openexr )"
-
-DEPEND="
-	${RDEPEND}
-	dev-libs/libxslt
-	>=dev-util/cmake-2.6.3
-	>=sys-devel/bison-1.35
-	>=sys-devel/flex-2.5.4"
-
-src_prepare() {
-	epatch "${WORKDIR}"/debian/patches/*ftbfs*
-}
-
-src_compile() {
-	if use fltk ; then
-		# hack to get fltk library/include paths
-		# (upstream doesn't autodetect the gentoo install path for fltk)
-		fltk_version="$(get_version_component_range 1 \
-			$(best_version x11-libs/fltk | sed -e 's/^x11-libs\/fltk//'))"
-		mycmakeargs="${mycmakeargs}
-			-DAQSIS_USE_FLTK:BOOL=ON
-			-DAQSIS_FLTK_INCLUDE_DIR:PATH=$(fltk-config --includedir)
-			-DAQSIS_FLTK_LIBRARIES_DIR:PATH=/usr/$(get_libdir)/fltk-${fltk_version}"
-	else
-		mycmakeargs="${mycmakeargs} -DAQSIS_USE_FLTK:BOOL=OFF"
-	fi
-
-	mycmakeargs="${mycmakeargs}
-		-DAQSIS_BOOST_LIB_SUFFIX:STRING=-mt
-		-DAQSIS_USE_OPENEXR:BOOL=$(use openexr && echo ON || echo OFF)
-		-DAQSIS_USE_RPATH:BOOL=OFF
-		-DLIBDIR:STRING=$(get_libdir)
-		-DSYSCONFDIR:STRING=/etc
-		-DCMAKE_INSTALL_PREFIX:PATH=/usr"
-
-	cmake-utils_src_compile
-}
-
-src_install() {
-	DOCS="AUTHORS INSTALL README"
-	newdoc "release-notes/1.6/summary-1.6.0.txt" ReleaseNotes
-	cmake-utils_src_install
-}
diff --git a/media-gfx/aqsis/aqsis-1.8.2.ebuild b/media-gfx/aqsis/aqsis-1.8.2.ebuild
new file mode 100644
index 000000000000..d5779449b2f3
--- /dev/null
+++ b/media-gfx/aqsis/aqsis-1.8.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/aqsis/aqsis-1.8.2.ebuild,v 1.1 2014/02/16 08:08:12 pinkbyte Exp $
+
+EAPI=5
+
+inherit cmake-utils multilib
+
+DESCRIPTION="Open source RenderMan-compliant 3D rendering solution"
+HOMEPAGE="http://www.aqsis.org"
+SRC_URI="mirror://sourceforge/aqsis/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="png qt4"
+
+# OpenEXR currently can not be optional dependency, despite build system options
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/tinyxml
+	media-libs/tiff:0
+	sys-libs/zlib
+	media-libs/openexr:=
+	png? ( media-libs/libpng:0= )
+	qt4? ( dev-qt/qtgui:4 )
+"
+
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	sys-devel/bison
+	sys-devel/flex
+"
+
+DOCS=( AUTHORS INSTALL README )
+PATCHES=(
+	"${FILESDIR}/${P}-openexr-compat.patch"
+	"${FILESDIR}/${P}-unbundle-tinyxml.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use png AQSIS_USE_PNG)
+		$(cmake-utils_use qt4 AQSIS_USE_QT)
+		-DAQSIS_ENABLE_DOCS=OFF
+		-DAQSIS_USE_EXTERNAL_TINYXML=ON
+		-DAQSIS_USE_OPENEXR=ON
+		-DAQSIS_USE_RPATH=OFF
+		-DLIBDIR="$(get_libdir)"
+		-DSYSCONFDIR="/etc"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	newdoc "release-notes/1.8/summary-1.8.0.txt" ReleaseNotes
+	cmake-utils_src_install
+}
diff --git a/media-gfx/aqsis/files/aqsis-1.8.2-openexr-compat.patch b/media-gfx/aqsis/files/aqsis-1.8.2-openexr-compat.patch
new file mode 100644
index 000000000000..155c93ebb295
--- /dev/null
+++ b/media-gfx/aqsis/files/aqsis-1.8.2-openexr-compat.patch
@@ -0,0 +1,15 @@
+--- libs/tex/io/exrinputfile.h.orig	2012-08-24 16:26:50.000000000 +0400
++++ libs/tex/io/exrinputfile.h	2014-02-14 16:26:47.293497092 +0400
+@@ -48,10 +48,9 @@
+ 
+ #include <aqsis/tex/io/itexinputfile.h>
+ 
++#include <OpenEXR/ImfInputFile.h>
++
+ //------------------------------------------------------------------------------
+-namespace Imf {
+-	class InputFile;
+-}
+ 
+ namespace Aqsis {
+ 
diff --git a/media-gfx/aqsis/files/aqsis-1.8.2-unbundle-tinyxml.patch b/media-gfx/aqsis/files/aqsis-1.8.2-unbundle-tinyxml.patch
new file mode 100644
index 000000000000..158c96aeabce
--- /dev/null
+++ b/media-gfx/aqsis/files/aqsis-1.8.2-unbundle-tinyxml.patch
@@ -0,0 +1,57 @@
+--- CMakeLists.txt.orig	2014-02-14 16:55:38.894647998 +0400
++++ CMakeLists.txt	2014-02-14 16:56:14.017651059 +0400
+@@ -134,15 +134,15 @@
+ 	endif()
+ endif()
+ 
+-## find tinyxml.  If not found we use the version distributed with the aqsis
+-## source.
+-#if(AQSIS_USE_EXTERNAL_TINYXML)
+-#	find_package(TinyXML)
+-#	if(NOT TINYXML_FOUND)
+-#		message("** Cannot find external tinyxml library - using version included with the aqsis source.")
+-#		set(AQSIS_USE_EXTERNAL_TINYXML OFF)
+-#	endif()
+-#endif()
++# find tinyxml.  If not found we use the version distributed with the aqsis
++# source.
++if(AQSIS_USE_EXTERNAL_TINYXML)
++	find_package(TinyXML)
++	if(NOT AQSIS_TINYXML_FOUND)
++		message("** Cannot find external tinyxml library - using version included with the aqsis source.")
++		set(AQSIS_USE_EXTERNAL_TINYXML OFF)
++	endif()
++endif()
+ 
+ 
+ #-------------------------------------------------------------------------------
+@@ -274,7 +274,9 @@
+ )
+ 
+ # Thirdparty libs
+-declare_subproject(thirdparty/tinyxml)
++if(NOT AQSIS_USE_EXTERNAL_TINYXML)
++	declare_subproject(thirdparty/tinyxml)
++endif()
+ declare_subproject(thirdparty/partio)
+ declare_subproject(libs/pointrender)
+ if(AQSIS_USE_PDIFF)
+--- tools/piqsl/CMakeLists.txt.orig	2014-02-16 11:18:43.308699170 +0400
++++ tools/piqsl/CMakeLists.txt	2014-02-16 11:18:52.620699981 +0400
+@@ -5,8 +5,6 @@
+     message(FATAL_ERROR "Piqsl requires boost thread and Qt4 to build")
+ endif()
+ 
+-include_subproject(tinyxml)
+-
+ set(piqsl_hdrs
+     displayserverimage.h
+     image.h
+--- tools/displays/piqsl/CMakeLists.txt.orig	2014-02-16 11:21:25.820713332 +0400
++++ tools/displays/piqsl/CMakeLists.txt	2014-02-16 11:21:34.676714104 +0400
+@@ -1,5 +1,4 @@
+ include_subproject(dspyutil)
+-include_subproject(tinyxml)
+ 
+ aqsis_add_display(piqsl piqsldisplay.cpp ${dspyutil_srcs}
+ 	${tinyxml_srcs} ${tinyxml_hdrs}