Version bump wrt #435400 by Hendrik v. Raven

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 121 insertions, 7 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/Manifest b/media-libs/openimageio/Manifest
index 3d3fb2cb8c46..1ae702bfffdd 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -2,13 +2,19 @@
 Hash: SHA256
 
 DIST openimageio-1.0.8.tar.gz 4207636 SHA256 09caaf2c75787eb405809103b0d8806eef0bb1a593d7f7d47d0afe186cf7bc5a SHA512 1f39d10595036ff5edc0ad1ef81eb8f03df0f2010b3d25e71488fa71f85bd2cefc521055dff3a738c19a3ace5edefa2012b64ec0293943ee89132a4f5e5d5def WHIRLPOOL 7495776e6b6edf7b0f46255c74d1930db70ff088e5b0802b02071dcb14b319ff07daf20a99867d8aa8f49f6f72a3f7f14c18fed204c7f682de57962a90b72322
+DIST openimageio-1.1.1.tar.gz 8217144 SHA256 a1cf6251edb597d31ccec3a74f516c3c9ce6e116dfb5edb3e4bd87d528d4700d SHA512 cf3e1371c6f0333f40506b08dc3fa6c0acecfb149e2e99159e893825e0d838db8ac1150e316e3568024568ed19bbcb473b4f38a61779a03fe9706ee476ec5943 WHIRLPOOL 78420497e1b65140f439e67c295102de5def4ed92eac1bf7b3b417d79d4634a0b149d08eafb8127aa1c5f1eb770334a14b244bee1f7af61ef31dc2abb2309aae
 EBUILD openimageio-1.0.8.ebuild 2145 SHA256 c9258189b1293133836521bd155b11ca102c01cd86174c26bd6be861038f382f SHA512 b978cfa56a47d612fe6b4834bab88059b44c6f82bcc9954334558f6161d3f10db145987f61affaed330ff6b985359df2a366f9e666360249545c23ceaddd4878 WHIRLPOOL 9a6892359931983fbb582986836c74da0024b6d5c3221749f6a9b941451c96084ace6439fee8c4748cb8fe54d75bdb51f883b0b81a4334b235106d3bf35533b7
-MISC ChangeLog 1897 SHA256 527ce26db6cb3846ee284bb9247b617434c525856e61deb41bc84d6c601dcc25 SHA512 673a6645889ee93bd1b0421ba5b7dea9830f9c831b739d4495e2bc8c7b7caa6bdc3b525c866ce483485ac8359405edf65f88d251029a0eeea54c816aeeecbb97 WHIRLPOOL 949c5f83a545a8a49a00f1cc562045bb6e1d32d350929bf4d755eab7900af2c27506ff5c4a9137561f2fd14c41bd09daa3271552f73af1a722f287dde4d90d04
-MISC metadata.xml 245 SHA256 a21a2e5530e3543c033e1ed43c7dadb400ada83401bb76a26f4a91722a38f23a SHA512 f804b5d223bde7ae123fe80feb02644aa432809784b3dd3a76c92fb85b169fb4152623e2e7b7c3dcca3e4116a2d7cea8fcdcdfcf4664fdd401e8dc37666d211b WHIRLPOOL 601cc0d6b571469ef105ca88c018b90d84475c9e9aa6181e8368163730dc43d77c2c55fbdf726a844ddda414375ff4ade22cc8eec75d208df46f670793c73bd4
+EBUILD openimageio-1.1.1.ebuild 2464 SHA256 4e10a89485f22519b4298b08356c0e1d42dbbfa0f72c8624a7c30f9ed29c1216 SHA512 e466c2274a110e279dd0ddf4401d07199a2caca7934d4bb5f45f326981a84b2edb5490b7a12f34d7832a08111028d03259920afcd62398a480ebf9c82a658245 WHIRLPOOL 869b56041428147a9678207c31d34ab3936adffd57f102f6ab879cac8fb31b6efbe7925ea80c9ddd9c845553e2f8962ceb55f064bb67ab4174037e3977f252ed
+MISC ChangeLog 2077 SHA256 c8d2529f0330c4e017990732996165448d8b5e3080eb5b83f458eb8a9c337dcf SHA512 e3ebef01a2e018d0fc6496bd2065441171ec5f546e2cdbc344770afe53c576c17ae93496f5c6c08d1cf999632d550dc10ef413cce17da70dcfd5f4bf95aa3a48 WHIRLPOOL 43ee76f7a12fb16b9674cd2deb9eb46c1a4b13a3f9b66cbaf1a01e6540fa93b580687b84da53d2d8535c2e8c5a3bad73b05053540c3c26a70cdfddf897b85f56
+MISC metadata.xml 292 SHA256 9805ad92c8df67f03a827c6d591b8278dd62d8f58071b3268a41dbdac307672e SHA512 bcb52837c5f6dea22a1e1451f17b4c9f821f9c8ca99217b60798497418e8853adef2ab18d66763aea51c6c74a91dbfbd79199d88bffafb63875063c3d227462e WHIRLPOOL a7d20f005000c4d707e9245e54a486b4ba1e7fcd06ceedbbb2e386b979c12025a6e260653c534ddfdc0439a49655ec7d8d00be61a24fc2fa7daf8e4ef1060407
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBnE/AACgkQl5yvQNBFVTXzLwCeMTs9sNuI78XApmkeMPill6VB
-OtMAnRLyPCwbqDEc+KSFR+OmK0i+mjk7
-=K7oU
+iQEcBAEBCAAGBQJQsPDhAAoJEEdUh39IaPFNjj0H/3ah2/tP/Pujtjc4Fq7qRV19
+tg8nJy31BrbcvBzcbjAPW5Uk/HHGcO9deP7c7/6DOitp7su9lcGBAlVU25adQeVl
+X51BiNHk+SfmGb49Imh2rssrNbWQdIPmw/ntZJ/rmaAb+H2UkcAhL5XLqj866zhy
+r/jryRWXsu0eUWy8tZ778aR7UO3r5JdrRvg4p2h00b8reIdvP5a1ZjTXLsWkU5PR
+WX0Z3G82tZ4uKh0cMY2gocIZPQC2fGRHj9jDZC4RlOV2H1G/A7Y20I4MFLhNwMQc
+1rCCRoOSHoObLkUWR1vdSJTezInUMulHlxltJotheKzZwpDF8OFe6IWoJU1jlTA=
+=OgFj
 -----END PGP SIGNATURE-----
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
+}