Fix missing USE="threads" depend for x11-libs/fltk wrt #297699. Fix building with...

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

diff --git a/media-gfx/aqsis/ChangeLog b/media-gfx/aqsis/ChangeLog
index 930075c8a7ab83d707b7b3032d72c35f7b72b8da..cc9e3c2e9a1772f62d6147865f12263f2cceddce 100644 (file)
--- a/media-gfx/aqsis/ChangeLog
+++ b/media-gfx/aqsis/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/aqsis
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/aqsis/ChangeLog,v 1.22 2011/03/22 09:48:08 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/aqsis/ChangeLog,v 1.23 2011/11/05 08:40:16 ssuominen Exp $
+
+  05 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> aqsis-1.6.0.ebuild:
+  Fix missing USE="threads" depend for x11-libs/fltk wrt #297699. Fix building
+  with recent boost and gcc by using Debian patchset wrt bugs #362625 and
+  #362939. Thanks to Diego Elio Pettenò and Sebastian Luther for reporting
+  these issues.
 
   22 Mar 2011; Justin Lecher <jlec@gentoo.org> aqsis-1.6.0.ebuild:
   Restrict fltk version being able to return includedir

diff --git a/media-gfx/aqsis/Manifest b/media-gfx/aqsis/Manifest
index f88e338db3d031f37f0940b4d7ecfe0373b897b3..1d20f9c1f774673069a5eee6c741cefd9e207943 100644 (file)
--- a/media-gfx/aqsis/Manifest
+++ b/media-gfx/aqsis/Manifest
@@ -2,13 +2,18 @@
 Hash: SHA1
 
 DIST aqsis-1.6.0.tar.gz 2867634 RMD160 49d33657954922b1ae1fa9cd3a865491ef8aa5ad SHA1 cd0c1416d36f1b3c47b2eef7d8d861fcb38a8be5 SHA256 b9477c761bc887e4bbc6f3a1d2bca5e508c15cf66d77fc0d1cd430dbb9b92fa4
-EBUILD aqsis-1.6.0.ebuild 2060 RMD160 bd09a0e54b366653c6681efca0ad1a8c0aeecbe6 SHA1 e05263d25b70539f73d580b228833b8729adec8d SHA256 b4fc126f88055e84ae5eaabb323d9e87a38d115e6151b317e051e365a5bb6ed6
-MISC ChangeLog 3377 RMD160 42b895ca7f0d7d89829c4849d5be48192a47aff8 SHA1 65558e5253b264a9c7eb664927723485df450c39 SHA256 4d42a49b1fb92fe9d6d24ec312786138cb97121f5ade29d194f6c73f182cdf5c
+DIST aqsis_1.6.0-8.debian.tar.gz 15706 RMD160 83e5b1df94ed3ffe061bfc4033d874a192af73cf SHA1 c9bd1ceeafc9f4e347913d41da5083c820a62b28 SHA256 959b69b7c4078b404542c9fdd65abd81379644d588744b7b915787f6774227f8
+EBUILD aqsis-1.6.0.ebuild 2227 RMD160 7f24a2040cfd2883565b10e59daff53d25a8ea66 SHA1 9d13d8c7c0746a16e60feb909b18e3722bc15d4d SHA256 44a6f59c6d61c992cbd43832c8570f55c52b7b8dfe2c27a82a4d0932d3798985
+MISC ChangeLog 3702 RMD160 072d30426c6f8f526cfb64029da5d2e4c4d476c1 SHA1 b4b47dcf674717b54ac3835e7bf92541ad9368b8 SHA256 771975859d5082191682478478c32e02918359d3929894fec62fee411115cca6
 MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk2IcF4ACgkQgAnW8HDreRZVDQCfauuj/WtHifmOphxcE3LdyaN6
-RA8An0jzgL46C4G0/r0jS5PlTql7uxId
-=5Fy2
+iQEcBAEBAgAGBQJOtPZUAAoJEEdUh39IaPFNPn4H/0sn6tRzficFlXlQOxoIOPf6
+HNRblZElwmMapds+SR2aN33qTgPs6cwUJjfO1SuR2jtvKAfTy36wseicNopm3zEd
+qadFMJNaQPkmYERb+d5NNAWuN4fBRRfEFHIVszB2NQrR7bNMV3pGViyrWqoTBUOe
+KNzWHkaDZ/CBnoJz59a/RP52FQb8lsjDXeBVNDFPDRKTqdEhYA06w8xsuHl5cDVn
+FLHRYLaLJ+b+agBae5NOiAcS77n0gcuv3L8T/KnyPuromrq6tdBGkYKxLkKhwh5z
+BTlTKW1lfRknqWaOOz33YKHoVyLdhPznmKo3QvsRS0slwgUKkoFtxU8fUNcU/CU=
+=kf9L
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/aqsis/aqsis-1.6.0.ebuild b/media-gfx/aqsis/aqsis-1.6.0.ebuild
index 91204dd9436560fcc7942a34d3d0abedd9c70f1d..00d61686f5094f1c920bbd3ee4d5f5b4d279de09 100644 (file)
--- a/media-gfx/aqsis/aqsis-1.6.0.ebuild
+++ b/media-gfx/aqsis/aqsis-1.6.0.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/aqsis/aqsis-1.6.0.ebuild,v 1.3 2011/03/22 09:48:08 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/aqsis/aqsis-1.6.0.ebuild,v 1.4 2011/11/05 08:40:16 ssuominen Exp $
 
-EAPI="1"
+EAPI=2
+
+patch_level=8
 
 inherit versionator multilib eutils cmake-utils
 
@@ -17,7 +19,8 @@ if [[ "${P}" == *_p* ]] ; then
        SRC_URI="http://download.aqsis.org/builds/testing/source/tar/${MY_P}.tar.gz"
        S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
 else
-       SRC_URI="mirror://sourceforge/aqsis/${P}.tar.gz"
+       SRC_URI="mirror://sourceforge/aqsis/${P}.tar.gz
+               mirror://debian/pool/main/a/${PN}/${PN}_${PV}-${patch_level}.debian.tar.gz"
 fi
 
 LICENSE="GPL-2"
@@ -29,7 +32,7 @@ RDEPEND="
        >=dev-libs/boost-1.34.0
        >=media-libs/tiff-3.7.1
        >=sys-libs/zlib-1.1.4
-       fltk? ( >=x11-libs/fltk-1.1.10-r2:1 )
+       fltk? ( >=x11-libs/fltk-1.1.10-r2:1[threads] )
        openexr? ( media-libs/openexr )"
 
 DEPEND="
@@ -39,6 +42,10 @@ DEPEND="
        >=sys-devel/bison-1.35
        >=sys-devel/flex-2.5.4"
 
+src_prepare() {
+       epatch "${WORKDIR}"/debian/patches/*ftbfs*
+}
+
 src_compile() {
        if use fltk ; then
                # hack to get fltk library/include paths