Version bump wrt #435400 by Hendrik v. Raven

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 110 insertions, 2 deletions

diff --git a/media-libs/openimageio/ChangeLog b/media-libs/openimageio/ChangeLog
index 240b7f8e987b..f4961a374f77 100644
--- a/media-libs/openimageio/ChangeLog
+++ b/media-libs/openimageio/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/openimageio
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openimageio/ChangeLog,v 1.8 2012/09/29 15:30:34 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openimageio/ChangeLog,v 1.9 2012/11/24 16:08:29 ssuominen Exp $
+
+*openimageio-1.1.1 (24 Nov 2012)
+
+  24 Nov 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +openimageio-1.1.1.ebuild, metadata.xml:
+  Version bump wrt #435400 by Hendrik v. Raven
 
   29 Sep 2012; Anthony G. Basile <blueness@gentoo.org> openimageio-1.0.8.ebuild:
   keyword ~ppc64, bug #436566
diff --git a/media-libs/openimageio/metadata.xml b/media-libs/openimageio/metadata.xml
index 6fd0761f8740..4cf2cf4b078f 100644
--- a/media-libs/openimageio/metadata.xml
+++ b/media-libs/openimageio/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<herd>graphics</herd>
 	<use>
-		<flag name='tbb'>Use <pkg>dev-cpp/tbb</pkg> for threading.</flag>
+		<flag name='opencv'>Use <pkg>media-libs/opencv</pkg></flag>
+		<flag name='tbb'>Use <pkg>dev-cpp/tbb</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/media-libs/openimageio/openimageio-1.1.1.ebuild b/media-libs/openimageio/openimageio-1.1.1.ebuild
new file mode 100644
index 000000000000..17788263d3a5
--- /dev/null
+++ b/media-libs/openimageio/openimageio-1.1.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openimageio/openimageio-1.1.1.ebuild,v 1.1 2012/11/24 16:08:29 ssuominen Exp $
+
+EAPI=5
+
+PYTHON_DEPEND="python? 2:2.7"
+
+inherit cmake-utils multilib python
+
+DESCRIPTION="A library for reading and writing images"
+HOMEPAGE="http://sites.google.com/site/openimageio/ http://github.com/OpenImageIO"
+SRC_URI="http://github.com/OpenImageIO/oiio/tarball/Release-${PV} -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="jpeg2k opencv opengl python qt4 tbb +truetype" # opencolorio
+
+RESTRICT="test" #431412
+
+# opencolorio? ( media-gfx/opencolorio )
+RDEPEND="dev-libs/boost[python?]
+	dev-libs/pugixml
+	media-libs/glew
+	media-libs/ilmbase
+	media-libs/libpng:0
+	media-libs/libwebp
+	media-libs/openexr
+	media-libs/tiff:0
+	sci-libs/hdf5
+	sys-libs/zlib
+	virtual/jpeg
+	jpeg2k? ( media-libs/openjpeg )
+	opencv? ( media-libs/opencv )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+		)
+	qt4? (
+		x11-libs/qt-core:4
+		x11-libs/qt-gui:4
+		x11-libs/qt-opengl:4
+		)
+	tbb? ( dev-cpp/tbb )
+	truetype? ( >=media-libs/freetype-2 )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${P}/src
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	mv OpenImageIO-* "${WORKDIR}"/${P}
+}
+
+src_prepare() {
+	# remove bundled code to make it build
+	# https://github.com/OpenImageIO/oiio/issues/403
+	rm */pugixml* || die
+
+	# fix man page building
+	# https://github.com/OpenImageIO/oiio/issues/404
+	use qt4 || sed -i -e '/list.*APPEND.*cli_tools.*iv/d' doc/CMakeLists.txt
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR=/usr/$(get_libdir)
+		-DBUILDSTATIC=OFF
+		-DLINKSTATIC=OFF
+		$(use python && echo -DPYLIB_INSTALL_DIR=$(python_get_sitedir))
+		-DUSE_EXTERNAL_PUGIXML=ON
+		-DUSE_FIELD3D=OFF # missing in Portage
+		$(cmake-utils_use_use truetype freetype)
+		-DUSE_OCIO=OFF # $(cmake-utils_use_use opencolorio OCIO), OpenColorIO is outdated in Portage 2012/10
+		$(cmake-utils_use_use opencv)
+		$(cmake-utils_use_use opengl)
+		$(cmake-utils_use_use jpeg2k OPENJPEG)
+		$(cmake-utils_use_use python)
+		$(cmake-utils_use_use qt4 QT)
+		$(cmake-utils_use_use tbb)
+		)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	rm -rf "${ED}"/usr/share/doc
+	dodoc ../{CHANGES,CREDITS,README*} # doc/CLA-{CORPORATE,INDIVIDUAL}
+	docinto pdf
+	dodoc doc/*.pdf
+}