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

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

5 files changed, 140 insertions, 80 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/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}