Revbump to remove the fltk support as it's badly broken. See bug #100242. Also closes bug #105967.

(Portage version: 2.1_pre1)

4 files changed, 17 insertions, 18 deletions

diff --git a/media-libs/openexr/ChangeLog b/media-libs/openexr/ChangeLog
index 076e9c6bddae..3bb53d4b60c7 100644
--- a/media-libs/openexr/ChangeLog
+++ b/media-libs/openexr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/openexr
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openexr/ChangeLog,v 1.29 2005/12/13 05:44:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openexr/ChangeLog,v 1.30 2005/12/18 17:57:16 flameeyes Exp $
+
+*openexr-1.2.2-r2 (18 Dec 2005)
+
+  18 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -openexr-1.2.2-r1.ebuild, +openexr-1.2.2-r2.ebuild:
+  Revbump to remove the fltk support as it's badly broken. See bug #100242.
+  Also closes bug #105967.
 
   13 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   openexr-1.2.2-r1.ebuild:
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index c00f314255ae..340ffa1745c7 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1,10 +1,10 @@
 MD5 071e47a67435a85a9519b56ba3fc597b ChangeLog 3900
 MD5 21ea9ea0c3fabd1e25cd34b7de57dc62 files/digest-openexr-1.0.7 66
 MD5 ae16061f11f8add38c447314c0f8724c files/digest-openexr-1.2.2 66
-MD5 ae16061f11f8add38c447314c0f8724c files/digest-openexr-1.2.2-r1 66
+MD5 ae16061f11f8add38c447314c0f8724c files/digest-openexr-1.2.2-r2 66
 MD5 dd45e17d712e65d12cb5a8cb704fc11c files/openexr-1.0.7-gentoo.patch 993
 MD5 bc17a0faf5bb747f36271992bc598a15 files/openexr-1.2.2-gcc4.patch 311
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 MD5 6f69b195aab90aaa3d98f058bc0f584d openexr-1.0.7.ebuild 1006
-MD5 3e5808324c47eb9826d2c127b105f855 openexr-1.2.2-r1.ebuild 1652
+MD5 87a6c3567c9ab2d64deea5e99fcdf221 openexr-1.2.2-r2.ebuild 1266
 MD5 c9c0d28408bc3c035ac3d1de86ea72ac openexr-1.2.2.ebuild 1005
diff --git a/media-libs/openexr/files/digest-openexr-1.2.2-r1 b/media-libs/openexr/files/digest-openexr-1.2.2-r2
index f1dc406e2c15..f1dc406e2c15 100644
--- a/media-libs/openexr/files/digest-openexr-1.2.2-r1
+++ b/media-libs/openexr/files/digest-openexr-1.2.2-r2
diff --git a/media-libs/openexr/openexr-1.2.2-r1.ebuild b/media-libs/openexr/openexr-1.2.2-r2.ebuild
index e7f48810dfa9..c92c4c9e8b66 100644
--- a/media-libs/openexr/openexr-1.2.2-r1.ebuild
+++ b/media-libs/openexr/openexr-1.2.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openexr/openexr-1.2.2-r1.ebuild,v 1.5 2005/12/13 05:44:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openexr/openexr-1.2.2-r2.ebuild,v 1.1 2005/12/18 17:57:16 flameeyes Exp $
 
 inherit eutils
 
@@ -14,22 +14,12 @@ HOMEPAGE="http://www.openexr.com"
 SLOT="0"
 LICENSE="as-is"
 KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~hppa"
-IUSE="doc examples fltk"
+IUSE="doc examples"
 
-RDEPEND="virtual/opengl
-	fltk? ( x11-libs/fltk )"
+RDEPEND="virtual/opengl"
 DEPEND="dev-util/pkgconfig
 	${RDEPEND}"
 
-pkg_setup() {
-	if use fltk  && ( ! built_with_use x11-libs/fltk opengl ) ; then
-		echo
-		eerror "You need either to rebuild x11-libs/fltk with opengl use flag enabled, or to build"
-		eerror "OpenEXR without fltk support (exrdisplay, an OpenEXR image viewer won't be built)."
-		die
-	fi
-}
-
 src_unpack() {
 	unpack ${A}
 	sed -i -e "s:OpenEXR-@OPENEXR_VERSION@:\$\(P\):" ${S}/IlmImfExamples/Makefile.in
@@ -39,8 +29,10 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf="--disable-fltktest $(use_with fltk fltk-config) $(use_enable examples imfexamples)"
-	econf ${myconf} || die "configure failed"
+	econf \
+		$(use_enable examples imfexamples) \
+		--without-fltk-config
+	
 	emake || die "make failed"
 }