Add patch to fix building with --as-needed, thanks to Thomas S. Howard in bug #133828.

(Portage version: 2.1_rc1-r3)

3 files changed, 62 insertions, 3 deletions

diff --git a/media-libs/openexr/ChangeLog b/media-libs/openexr/ChangeLog
index c581d93e91a1..1d6ceb4dc016 100644
--- a/media-libs/openexr/ChangeLog
+++ b/media-libs/openexr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/openexr
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openexr/ChangeLog,v 1.34 2006/05/03 20:43:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openexr/ChangeLog,v 1.35 2006/05/20 00:42:09 flameeyes Exp $
+
+  20 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/openexr-1.2.2-asneeded.patch, openexr-1.2.2-r2.ebuild:
+  Add patch to fix building with --as-needed, thanks to Thomas S. Howard in
+  bug #133828.
 
   03 May 2006; Diego Pettenò <flameeyes@gentoo.org> metadata.xml:
   Update metadata to list media-video@gentoo.org as maintainer.
diff --git a/media-libs/openexr/files/openexr-1.2.2-asneeded.patch b/media-libs/openexr/files/openexr-1.2.2-asneeded.patch
new file mode 100644
index 000000000000..5f4b2e30f1f9
--- /dev/null
+++ b/media-libs/openexr/files/openexr-1.2.2-asneeded.patch
@@ -0,0 +1,51 @@
+--- OpenEXR-1.2.2/IlmImf/Makefile.am.orig	2004-12-16 18:01:57.000000000 -0800
++++ OpenEXR-1.2.2/IlmImf/Makefile.am	2006-05-18 01:23:30.000000000 -0700
+@@ -55,7 +55,7 @@
+ 		       ImfTestFile.cpp ImfTestFile.h
+ 
+ libIlmImf_la_LDFLAGS = -version-info @LIBTOOL_VERSION@
+-
++libIlmImf_la_LIBADD = $(top_builddir)/Iex/libIex.la $(top_builddir)/Half/libHalf.la -lz
+ libIlmImfincludedir = $(includedir)/OpenEXR
+ 
+ libIlmImfinclude_HEADERS = ImfAttribute.h ImfBoxAttribute.h \
+--- OpenEXR-1.2.2/IlmImf/Makefile.in.orig	2005-03-09 17:29:28.000000000 -0800
++++ OpenEXR-1.2.2/IlmImf/Makefile.in	2006-05-18 01:23:40.000000000 -0700
+@@ -256,7 +256,7 @@
+ CONFIG_CLEAN_FILES =
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ 
+-libIlmImf_la_LIBADD =
++libIlmImf_la_LIBADD = $(top_builddir)/Iex/libIex.la $(top_builddir)/Half/libHalf.la -lz
+ am_libIlmImf_la_OBJECTS = ImfAttribute.lo ImfBoxAttribute.lo \
+ 	ImfCRgbaFile.lo ImfChannelList.lo ImfChannelListAttribute.lo \
+ 	ImfFloatAttribute.lo ImfFrameBuffer.lo ImfHeader.lo ImfIO.lo \
+--- OpenEXR-1.2.2/Imath/Makefile.am.orig	2005-03-07 20:21:53.000000000 -0800
++++ OpenEXR-1.2.2/Imath/Makefile.am	2006-05-18 01:31:30.000000000 -0700
+@@ -16,6 +16,7 @@
+ 		      ImathBox.cpp ImathRandom.cpp
+ 
+ libImath_la_LDFLAGS = -version-info @LIBTOOL_VERSION@
++libImath_la_LIBADD = $(top_builddir)/Iex/libIex.la
+ 
+ libImathincludedir = $(includedir)/OpenEXR
+ 
+--- OpenEXR-1.2.2/Imath/Makefile.in.orig	2005-03-09 17:29:29.000000000 -0800
++++ OpenEXR-1.2.2/Imath/Makefile.in	2006-05-18 01:35:04.000000000 -0700
+@@ -168,6 +168,7 @@
+ 
+ 
+ libImath_la_LDFLAGS = -version-info @LIBTOOL_VERSION@
++libImath_la_LIBADD = $(top_builddir)/Iex/libIex.la
+ 
+ libImathincludedir = $(includedir)/OpenEXR
+ 
+@@ -189,7 +190,7 @@
+ CONFIG_CLEAN_FILES =
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ 
+-libImath_la_LIBADD =
++libImath_la_LIBADD = $(top_builddir)/Iex/libIex.la
+ am_libImath_la_OBJECTS = ImathShear.lo ImathMatrixAlgo.lo ImathVec.lo \
+ 	ImathColorAlgo.lo ImathFun.lo ImathBox.lo ImathRandom.lo
+ libImath_la_OBJECTS = $(am_libImath_la_OBJECTS)
diff --git a/media-libs/openexr/openexr-1.2.2-r2.ebuild b/media-libs/openexr/openexr-1.2.2-r2.ebuild
index 64501ec8dd3b..4e3b53d2129a 100644
--- a/media-libs/openexr/openexr-1.2.2-r2.ebuild
+++ b/media-libs/openexr/openexr-1.2.2-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 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-r2.ebuild,v 1.4 2006/04/25 01:41:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openexr/openexr-1.2.2-r2.ebuild,v 1.5 2006/05/20 00:42:09 flameeyes Exp $
 
-inherit eutils libtool
+inherit eutils libtool autotools
 
 MY_P=OpenEXR-${PV}
 S=${WORKDIR}/${MY_P}
@@ -26,9 +26,12 @@ src_unpack() {
 	sed -i -e "s:NVSDK_CXXFLAGS=\"\":NVSDK_CXXFLAGS=\"-DUNIX\":" ${S}/acinclude.m4
 
 	epatch "${FILESDIR}/openexr-1.2.2-gcc4.patch"
+	epatch "${FILESDIR}/${P}-asneeded.patch"
 	# Replace the temporary directory used for tests
 	sed -i -e 's:"/var/tmp/":'"${T}"':' "${S}/IlmImfTest/tmpDir.h"
 
+	cd "${S}"
+	eautomake
 	elibtoolize
 }