Link libIlmThread against $(PTHREAD_LIBS) from m4/threads.m4 wrt #462494 by Julian Ospald and Daniel Scharrer

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

4 files changed, 31 insertions, 11 deletions

diff --git a/media-libs/ilmbase/ChangeLog b/media-libs/ilmbase/ChangeLog
index 32e7ddb932fa..5b679a23f61e 100644
--- a/media-libs/ilmbase/ChangeLog
+++ b/media-libs/ilmbase/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/ilmbase
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ilmbase/ChangeLog,v 1.30 2013/03/21 03:43:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ilmbase/ChangeLog,v 1.31 2013/03/21 15:49:17 ssuominen Exp $
+
+  21 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> ilmbase-2.0.0.ebuild,
+  +files/ilmbase-2.0.0-underlinking.patch:
+  Link libIlmThread against $(PTHREAD_LIBS) from m4/threads.m4 wrt #462494 by
+  Julian Ospald and Daniel Scharrer
 
   21 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> ilmbase-2.0.0.ebuild:
   Don't use ucontext.h from libc with this release of IlmBase wrt #461594 by
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index 4c2f0785d26e..162f966c5cbe 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -3,20 +3,21 @@ Hash: SHA256
 
 AUX ilmbase-1.0.0-asneeded.patch 430 SHA256 2fa63c4d151e784d4e2c1a2509ccae530b391df6d6805f6ec188c5e6c0a6565e SHA512 ee217602f51f146324c277f3876d9fe6f23524e9e7d81c00707b7a29a0edcaa200adf2e8835485f04c4b7914b7fcfc8307dbb984072d895588e4e10ef0cff525 WHIRLPOOL d1002a7bf3078d503d75dca6c055dc0020a79e4fbb511c34aa5c64731dd8a2dfc5cd7b7a364aacf64be9b73dc14c5a43fea422481b3664c1a5ebc1b1dddac6ad
 AUX ilmbase-1.0.2-gcc43.patch 290 SHA256 fe48f677649b1ff79e780217fd09be98012ef41108843a7b08b635dbc33dc0a5 SHA512 7436f6ea0bc6a25a6496566b2d3169f11103fd5376dfa7883bc0a420e32d2f2dbcd94ad02cb7eecede36ac1d0f27564d9b442c4ee9d82c19a9c7c1cba51204cf WHIRLPOOL 484bf599c465acb320ad3da9f79be3edbe95e25ee32532df20e36effb675d2161126bd55986427d50afa61a995df0b48ec2dfa0bd5fa44650a94998e76315c6e
+AUX ilmbase-2.0.0-underlinking.patch 350 SHA256 1ba6304e7c6c03a093b1290d071490998d61b9b8f978c2297bdc1aedc34dea88 SHA512 dc80a918a5b8ccec6756b18d13ab074d155efbcb818375f4de4df592e6fb360c4e5866e9bd21c985bc0c84c375d10f2ffa63b0564a93aa4c4d28b48c1c907e4f WHIRLPOOL 11e56df12253b46e949ed641349f8653d7a83c96a381c7e43596ee6d4beb59a5bca3deb918d8b741e7fa937a3432810d9c20c908433f59299d6a5ba42b101c19
 DIST ilmbase-1.0.2.tar.gz 496540 SHA256 2e5cda799ffdfca9b1a16bb120d49c74a39af1457ef22f968918c6200ba62e44 SHA512 5a1a0011ef43132f33832d2e322320abb81a0f495e921de52af8f6e9ee50e0bed63897a0054de228f4081cc2f6591cb99a686f908620e87bf86c9d2d689923cd WHIRLPOOL c111275a20b7506216d8888d1f88483dbec2577e4fb47986f8c1b19dc0b320518d5f251f7499dc10df4e145594a7717156d22f6d64e11a01e92c8eb20045bcd0
 DIST openexr-2.0.0.tar.gz 23886229 SHA256 9e2cef76caf159263262b15b002b8b5717fd7e9e126009ad0ac7331bf45090af SHA512 42fe4b5f009384b6c51400061d522fd710e5ca97811e50b33206187f2c483035a3b32e036935eb3ac5ea149bdabcd7958e14d1442dd2312e010eb6a977d775cb WHIRLPOOL 6bb193c4bb213ea10689e72e604a129d800b36a4ebad250991faec30ee52c284ccf7bbfa4d362ccc788189b5622d757f56fef7f9698c333fef7e52d1db1d7ae0
 EBUILD ilmbase-1.0.2.ebuild 923 SHA256 03a338780bdd65085f4060f68eaee1b585b0727632f36e40e059e3caa2faca8b SHA512 b46cfada672fc09294942144080aa3f71578152e60e7f5252469ed20ac26017f7b926b7a3a96538fdfae8161bf8a6736b770197be3769477ab21f5f202535127 WHIRLPOOL ca38cd6a08ea696a67d86a2efec17e2720437a33faa9de5195a2e6bbfd8c99e4b0c42f306542cde0acdb35183d2dfd29306e0c9e728e2a4cf8e7f7a0976ba3cf
-EBUILD ilmbase-2.0.0.ebuild 915 SHA256 ea654abbb42ceedea3921ebbebb3b9fe4c14d11c58a208f781438b27f8427451 SHA512 59440b58e38c01e8cf54b53afed83024e585100f39df1cc673d9c6d3c1174635560a71063c8c8e4562010b4266b854090ccd06db1b791a063980a7a0b108f0fa WHIRLPOOL fc0b5fd2984ca6b0425ce6d505bf4328ca13ff2eed0d20b51d1dc8d47acae51f0f5d9d8005bbf5012f4eebad8a1700dd3783382c253975de7e63d91e129bc2fa
-MISC ChangeLog 3858 SHA256 065c98e114f67a6d82207ee80e5ba936f826089b09701242557074743b95f91c SHA512 4985f1850a66c1c6263daee7ff3302986dd82fbe57a8bb7e696fdf6cdc0503ac2a14d22e63dcddd77c3faa492e4c7ac8070a788dd0a855332f3de6f8e1eb85f4 WHIRLPOOL bba09bc6498d43c0f39c028f791d1e478de38222db177ecc19c13f97605e6ab6cf54a0555b1881a90fab845ff29172f68ced393462b76a8deb6c46c1d69268df
+EBUILD ilmbase-2.0.0.ebuild 961 SHA256 e3fafe9fbbf487c66d1afb918ef507e57e9acac1a343b1c78522c5577b1c3d19 SHA512 d1cec041b803d65765c6a924571b8c40334b445669853cf3eb6438d71ef5452ae0c4fad061fa3e7507ddb3225ccb741755950cff851bf92035a67b57152621f5 WHIRLPOOL 59203f19f5a155192b1eecf0c42c9342e3f1306eb85c6ce0f01caa3a6e031cc71ba74a11aa1421472c1ef6f3c5e3e6664d1d7586d9c6702820fd1e457ebe87cc
+MISC ChangeLog 4092 SHA256 ff366c69d4a70ec9a010aa3593c9482c8f26946506d1406199aa6ab78957d646 SHA512 07390e5a0965465fb1515e84163d63744e84d03a9cd60d94d90279a84b5d4866aa41f152505608eb41272bcc11d7df4be967934f65b615784d92b27e28b2d99e WHIRLPOOL 54696c9f60f6ce58ffedfe5fa7f4a4b273c6000ecb5e7132649db9cced79a9ee3079580af9b41ff24d5a78ab44f6efa69de2b1b7dda45e2d58af7548c575e9f1
 MISC metadata.xml 223 SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 SHA512 cacba929b8688a7270637f34d348216fdeb89e725cdee4b40e5577ca3f626c5f72e73c1c125605a284506aff47265f41e3fedaa76ed4074c540fc1f200e6d494 WHIRLPOOL dcd04d57abcfe2704036097ed68500917f74b7024b46580e9054e1c933d55678992c350fe07ff0efd590b9345fbcdd81665b8ce546f786dd31f5a0f4eb654da3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRSoHRAAoJEEdUh39IaPFNtXsIAJItmtJRAncv64WXGQwVHH+r
-LKTS1+IVyu9zO+YRnp+OL35sCrwXsplwm5ULvra+LOH7zJdbrQS4HSEcmKxad4Yc
-LXpRLYgUAR9prQevKQlkZ48HoRiS9vS0LNcGsbGSs/3WAAwxdcug8O2E5lbqOto7
-zxnCYbk/JI+Qp66NOkeJgNUK1EhB/SoYF+8LTrN3KdAzcM5Sg4dP/4KyJv7FArve
-q52UilPqp/gyY9SbdOmT5CTDm7q42xr/dU3UkuqK1LqU8em4Q1iyxjuryhe3/KlZ
-Ln6SCdVy+OpWWgPszLsC0Vo7druTbHD0iMzVQb4ekYBMSQCxtLymKulxltr+J8I=
-=YUeT
+iQEcBAEBCAAGBQJRSyvTAAoJEEdUh39IaPFNPP8H/3Yh+YXYuwngX192Qqyd7eCs
+CHyuVoiKzCG/CNUPl6OEOCIVGV0bMyWLyOgaoE5K4+S+uHL8kbvhADDpXK8xdsBl
+RiMlYx+akrOnWEA8DvxyKfdbefjwUXcoyPXZQvf+apudlj7UgkDJhIscwf2L4p+L
+pPHN2R+n3W4u9Bp+Phm3MTT9D/LIeYQQ8WoEncKvbF2fr+1199uL+dWhBH26BuQA
+aojBAkcgCfRUsc+WdJDylCy4QCYOY+tY2rtVFxRFkMstlD67pUta+9CACzIoDm4h
+Vyo1c+ldFx4Cx6XkKsZ/becP/MSz1Ff5LY+I2ij4EJAccNzi/+0RexKCbW4jJek=
+=Bphk
 -----END PGP SIGNATURE-----
diff --git a/media-libs/ilmbase/files/ilmbase-2.0.0-underlinking.patch b/media-libs/ilmbase/files/ilmbase-2.0.0-underlinking.patch
new file mode 100644
index 000000000000..83cae475cd10
--- /dev/null
+++ b/media-libs/ilmbase/files/ilmbase-2.0.0-underlinking.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/462494
+
+--- IlmBase/IlmThread/Makefile.am
++++ IlmBase/IlmThread/Makefile.am
+@@ -14,7 +14,7 @@
+ if LIB_SUFFIX_EXISTS
+ libIlmThread_la_LDFLAGS += -release @LIB_SUFFIX@
+ endif
+-libIlmThread_la_LIBADD = ../Iex/libIex.la
++libIlmThread_la_LIBADD = ../Iex/libIex.la $(PTHREAD_LIBS)
+ 
+ libIlmThreadincludedir = $(includedir)/OpenEXR
+ 
diff --git a/media-libs/ilmbase/ilmbase-2.0.0.ebuild b/media-libs/ilmbase/ilmbase-2.0.0.ebuild
index 800f451b9885..5cbb1e858125 100644
--- a/media-libs/ilmbase/ilmbase-2.0.0.ebuild
+++ b/media-libs/ilmbase/ilmbase-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ilmbase/ilmbase-2.0.0.ebuild,v 1.3 2013/03/21 03:43:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ilmbase/ilmbase-2.0.0.ebuild,v 1.4 2013/03/21 15:49:17 ssuominen Exp $
 
 EAPI=5
 inherit autotools eutils #libtool
@@ -18,6 +18,7 @@ S=${WORKDIR}/openexr-${PV}/IlmBase
 
 src_prepare() {
 	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
+	epatch "${FILESDIR}"/${P}-underlinking.patch
 	eautoreconf
 #	elibtoolize
 }