Version bump.

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x4868F14D

5 files changed, 112 insertions, 13 deletions

diff --git a/media-gfx/openexr_viewers/ChangeLog b/media-gfx/openexr_viewers/ChangeLog
index 00a7a46c1e31..84dd7fd1ac1d 100644
--- a/media-gfx/openexr_viewers/ChangeLog
+++ b/media-gfx/openexr_viewers/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/openexr_viewers
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/openexr_viewers/ChangeLog,v 1.28 2012/05/05 07:00:23 jdhore Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/openexr_viewers/ChangeLog,v 1.29 2013/03/12 21:45:31 ssuominen Exp $
+
+*openexr_viewers-2.0.0 (12 Mar 2013)
+
+  12 Mar 2013; Samuli Suominen <ssuominen@gentoo.org>
+  +openexr_viewers-2.0.0.ebuild,
+  +files/openexr_viewers-2.0.0-nvidia-automagic.patch:
+  Version bump.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> openexr_viewers-1.0.2.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/media-gfx/openexr_viewers/Manifest b/media-gfx/openexr_viewers/Manifest
index 044c3a7a9f6c..4cd53f8b264c 100644
--- a/media-gfx/openexr_viewers/Manifest
+++ b/media-gfx/openexr_viewers/Manifest
@@ -1,7 +1,24 @@
-AUX openexr_viewers-1.0.1-gcc43.patch 2122 RMD160 2d45255837fc22a24462bf468fbe95ffd59f04bd SHA1 94c81b3931410c30cab0b5c5f6795ac74507634b SHA256 2327ca9369c9022a5f8f315d1d2a95037dcbfd610eee3dda22e11877205bd3bb
-AUX openexr_viewers-1.0.1-gcc44.patch 1064 RMD160 b5445a8f456488c17e44a4b595a13d46e0b0d7ff SHA1 140ffba8bdda154a586fe7096fdb663ccec6c83b SHA256 7214f033bc84b7433f010b5297fabc383f9305a95fd02d50ff1f94c5bfe13386
-AUX openexr_viewers-1.0.2-nvidia-automagic.patch 472 RMD160 f037321d4c9eef8890c77e46fa9b4773ac488d9e SHA1 ab10769d59b67737c13141906802e566bce13ffa SHA256 95c00b84847ead53ff390e30739328c5475bdef5159fa2f621fb574ad901fa25
-DIST openexr_viewers-1.0.2.tar.gz 482009 RMD160 4e738e2623e382b5106cf4e4e462fc4fa18d280f SHA1 a95c63ce076a4a3ea900731e5e5f98d54c9dd546 SHA256 eb6b1987d587b441f113d417dc8a5baec25f3d81bc06b0369217567c1cde13ef
-EBUILD openexr_viewers-1.0.2.ebuild 1478 RMD160 9f4f0aaa61a806993ea627ff4b3500e2d571fca5 SHA1 8287dbdc2e668d4ff9dc4c71c73440454d30d4f5 SHA256 4cda8383b0d18cd0e6e4d54aa674407c3ec5b2a71e16f398cc60c6e3b0feb698
-MISC ChangeLog 4028 RMD160 baa54a9a623ed3645d3aa1002236545ab29c6cef SHA1 03d55e8d4d2818b6fb7529062887d632d26b7821 SHA256 1eab4033df5db73fc9c974aa354b5bd11acb469aecdfd762008e78e809cbe993
-MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX openexr_viewers-1.0.1-gcc43.patch 2122 SHA256 2327ca9369c9022a5f8f315d1d2a95037dcbfd610eee3dda22e11877205bd3bb SHA512 1e4c2f7a496b7a48063b6ec163c72620eabc78fa850cd87de8c4d1555bdcf91913941c16fdadcfe076c67d0903c229e677ee3b7c0fe194116864c5cab1bbe4a1 WHIRLPOOL c3d26ea57601b89c686ac12a7958da2ff0e6371a9b1b21016f6382e59187120e436261c2cc0a454d95be3c99d0ba69cb12695736401cda65d87b1f2ee37b78ed
+AUX openexr_viewers-1.0.1-gcc44.patch 1064 SHA256 7214f033bc84b7433f010b5297fabc383f9305a95fd02d50ff1f94c5bfe13386 SHA512 3b6c2f02581025a9a9e8963274aca27badc905a1986376860728b24b795008dedbb7a3887b5a4fed04c81b0ea1acff1918fab3ad09881de9f2be899c90443177 WHIRLPOOL 547fc0238d5f738c6b0c1ba57feeffc362fb78b168fb6f2108056254c2a6b889eba0ac4b54f4ca27f4fa3f57c529112ea712132e60cc6f444f8bfb53a4a4dd38
+AUX openexr_viewers-1.0.2-nvidia-automagic.patch 472 SHA256 95c00b84847ead53ff390e30739328c5475bdef5159fa2f621fb574ad901fa25 SHA512 777b8635b4454ea9c8c9bcd1b707012218ba16c523a105e987e897a17b126a2e11d986bc566cfe1a87a1af2df3336ec53e5ff8cc54cdc01ea7752947dac140f4 WHIRLPOOL 61dada4e3ae0b4d16e517a41d97e8b618bc4b85c9540ac705356dab2ed533dba2709e0e105d45c001c5f0b788e7d20398f493b42212e7af90cf9d126fbe1ddbc
+AUX openexr_viewers-2.0.0-nvidia-automagic.patch 434 SHA256 5ded4984733e894deb4b3778e51df1f0008946a2404270209b4d2964d1f3ce32 SHA512 6c05ec9708822559e8f84f601f8ede89d4e9820cbbe4b49b93ac6d0ba228fa602b699f13540d2169ce16b144ec85db63d06262001bfa391e80f2febfa66ceec7 WHIRLPOOL 5132f99849c5077903a16e237b1c82d23c2255dd5cea1d1d97f1081120a3a0a9f45048a5d6742766f9f3b1949d8b7286ee172a7d6f741360420f880a366ef409
+DIST openexr-2.0.0.tar.gz 23886229 SHA256 9e2cef76caf159263262b15b002b8b5717fd7e9e126009ad0ac7331bf45090af SHA512 42fe4b5f009384b6c51400061d522fd710e5ca97811e50b33206187f2c483035a3b32e036935eb3ac5ea149bdabcd7958e14d1442dd2312e010eb6a977d775cb WHIRLPOOL 6bb193c4bb213ea10689e72e604a129d800b36a4ebad250991faec30ee52c284ccf7bbfa4d362ccc788189b5622d757f56fef7f9698c333fef7e52d1db1d7ae0
+DIST openexr_viewers-1.0.2.tar.gz 482009 SHA256 eb6b1987d587b441f113d417dc8a5baec25f3d81bc06b0369217567c1cde13ef SHA512 06e01be3310a05c5709cdb4641f230522a5d91d50b08b6736a5541d20a03decfd80a9f5b65af383659a3d19407f932317c04eba73d199c03fa0ff9e24cc7ad07 WHIRLPOOL dd6d805f71db710bb70db9d993cc07bcd0b02c225527402f194300b82a3f1036d3584bed5db517c937d3f638e14466ff3c9c3653430d1d7c6fb1a01e331012f8
+EBUILD openexr_viewers-1.0.2.ebuild 1478 SHA256 4cda8383b0d18cd0e6e4d54aa674407c3ec5b2a71e16f398cc60c6e3b0feb698 SHA512 3ad0245f7b5d124b8d597f673ac8f2cf2df63019d1d90663f7071dcbd5869e7bdbaae55debc50d7d1ebfa39f6a421492eb928047c85215d53ae9cf2a1d5005ec WHIRLPOOL b3e35be853edb751d9243b01b4fb6b503425e4f6dc8949a449fc0ff1975d7cad52302443c24f58372b80c72c00584794759c809e1a4df98c8a9a40f0c3d921fd
+EBUILD openexr_viewers-2.0.0.ebuild 1390 SHA256 d4704f015743b06df609aebd4362b0a64c488a6fa00f108da2af6e93c267ba85 SHA512 611373b7c3583bc81b83ce5230146299820a2836f0ce65f4543bec9c09b23bb12334328966857f9147d67c5f785da799ec8c749285753bfd7ecda004f8747086 WHIRLPOOL 6e3d0d93dd6453fef77694fddda6d82c87b993bcfb4a2061f577c4016effe567493f19502302fde132705f461a2bf557ce30917d0593c02965a347535671bf1f
+MISC ChangeLog 4228 SHA256 97b806f259ae3a7f14fa02c716ede83535789e249649d545b74142c8c70e8696 SHA512 6340b15467d56ee204e59a63603d749899c69ca3b573975fd0972050166a80d7d418343f000d09e6d97648e89bb5de10c65e88ec29398289df101b25fff2dd0d WHIRLPOOL 14f12c6aa683a9e8d203d79e4fb743e8cbb8efc648f7cc24e409689129efcc88e0562d25e509e01bc0ab9f0365b862c6d549ce68c12369635b4bd6b99c6cd392
+MISC metadata.xml 304 SHA256 a45d1aa99eb6ac13fd8aca19035278af34e36fd469b3482f10e770845d965927 SHA512 0887d366e684531f01a9fd69c421baba9572a5b63190a990a0318e95f71e40e254e950d0df330bc2f34d1f4999a648c803c4b25bab9c612a46e3e86daf62fdf1 WHIRLPOOL bd986a9c7ee714cd436a9909000abc5c5f2b66071735c13cc45869a9338f4da52117f085c827fb2e57d96c9273421d9e71d92d0b8368ecce5d49bc0ab6b32709
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRP6H8AAoJEEdUh39IaPFNj/cH/j/eymfVwBcW70Fh0biXYLgm
+jlI4ek8hH4J2HW2P9a42pozXcg7+Bp3ex4Sw5kFbw9p0rLMnHIsPY7/q/szb9kEu
+ObLF+SEIH9pGW5Cvj0rAyi0ekQIQJUS/x9KEFltx3w3V+js9O6sClD4FD5zVtP98
+WyafKkgsREmEU6WW0oNow4ByyxeSCPFF6jATp7i8myuSDVguWNDv/3GjMy/kBLM7
+CIo6y9WGtAzZdsdOzMHs9iio0MBtGSmQcQyIdehPWXpKXydqpsXfF8CrZ87kAt4n
+qBYV9UNDaH/oyOhHFZo4hz95HD9RzA7EUVqMpo9MxUQzoMXNVD+GGR8Jfw2ICjI=
+=dsHc
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/openexr_viewers/files/openexr_viewers-2.0.0-nvidia-automagic.patch b/media-gfx/openexr_viewers/files/openexr_viewers-2.0.0-nvidia-automagic.patch
new file mode 100644
index 000000000000..1ea9f869a671
--- /dev/null
+++ b/media-gfx/openexr_viewers/files/openexr_viewers-2.0.0-nvidia-automagic.patch
@@ -0,0 +1,14 @@
+--- configure.ac
++++ configure.ac
+@@ -192,7 +192,10 @@
+ dnl
+ dnl check for Cg
+ dnl
+-if test "${have_fltk}" = yes; then
++AC_ARG_ENABLE(cg, AC_HELP_STRING([--enable-cg],
++  [enable nvidia cg support [[default=check]]]), [want_cg="${enableval}"], [want_cg=yes])
++
++if test "${have_fltk}" = yes -a "${want_cg}" != "no"; then
+   AM_PATH_CG(have_cg=yes, have_cg=no)
+   if test "${have_cg}" = yes; then
+     AC_DEFINE(HAVE_FRAGMENT_SHADERS)
diff --git a/media-gfx/openexr_viewers/metadata.xml b/media-gfx/openexr_viewers/metadata.xml
index edccfe5754d2..68f5c4738332 100644
--- a/media-gfx/openexr_viewers/metadata.xml
+++ b/media-gfx/openexr_viewers/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
-<maintainer>
-<email>media-video@gentoo.org</email>
-</maintainer>
+	<herd>video</herd>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name='cg'>Add support for nvidia's cg shaders</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-gfx/openexr_viewers/openexr_viewers-2.0.0.ebuild b/media-gfx/openexr_viewers/openexr_viewers-2.0.0.ebuild
new file mode 100644
index 000000000000..3418f05d9451
--- /dev/null
+++ b/media-gfx/openexr_viewers/openexr_viewers-2.0.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/openexr_viewers/openexr_viewers-2.0.0.ebuild,v 1.1 2013/03/12 21:45:31 ssuominen Exp $
+
+EAPI=5
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="OpenEXR Viewers"
+HOMEPAGE="http://openexr.com/"
+SRC_URI="http://dev.gentoo.org/~ssuominen/openexr-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="cg opengl"
+
+RDEPEND=">=media-libs/ilmbase-${PV}:=
+	>=media-libs/openexr-${PV}:=
+	media-libs/ctl:=
+	media-libs/openexr_ctl:=
+	opengl? (
+		virtual/opengl
+		x11-libs/fltk:1[opengl]
+		cg? ( media-gfx/nvidia-cg-toolkit )
+		)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/openexr-${PV}/OpenEXR_Viewers
+
+src_prepare() {
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
+	epatch "${FILESDIR}"/${P}-nvidia-automagic.patch
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use cg; then
+		myconf="--with-cg-prefix=/opt/nvidia-cg-toolkit"
+		append-flags $(no-as-needed) # binary-only libCg is not properly linked
+	fi
+
+	econf \
+		$(use_enable cg) \
+		$(use_with opengl fltk-config /usr/bin/fltk-config) \
+		${myconf}
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir="/usr/share/doc/${PF}/pdf" \
+		install || die
+
+	dodoc AUTHORS ChangeLog NEWS README
+}