epunt_cxx to avoid C++ /lib/cpp requirement wrt #424689 by Sylvain BERTRAND

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

3 files changed, 24 insertions, 23 deletions

diff --git a/media-libs/libjpeg-turbo/ChangeLog b/media-libs/libjpeg-turbo/ChangeLog
index bbfff0700aa7..1af5a341388b 100644
--- a/media-libs/libjpeg-turbo/ChangeLog
+++ b/media-libs/libjpeg-turbo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libjpeg-turbo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.47 2012/06/14 15:44:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.48 2012/07/04 18:24:10 ssuominen Exp $
+
+  04 Jul 2012; Samuli Suominen <ssuominen@gentoo.org>
+  libjpeg-turbo-1.2.0-r2.ebuild:
+  epunt_cxx to avoid C++ /lib/cpp requirement wrt #424689 by Sylvain BERTRAND
 
   14 Jun 2012; Mike Frysinger <vapier@gentoo.org> libjpeg-turbo-1.2.0-r2.ebuild:
   Disable simd code for x32 ABIs so the package at least works (passes tests)
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 59f2ad624500..14a571334408 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -1,28 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX libjpeg-turbo-1.2.0-guard_against_bad_num_components_value.patch 889 RMD160 a59bdfd56f86c5b35627fede136ab1f1bddeb6e7 SHA1 3bce6b6c1b5df4167a5694cc7ad44896fee073d1 SHA256 66bef73d49350d1bb173f27226aeb215d5c4b3729a5a23088a7dbbac5a2f960c
-AUX libjpeg-turbo-1.2.0-x32.patch 1240 RMD160 36661dae335cf1809b99ad0a1b94722fba580cb9 SHA1 9253567cb26365eb6cc84605796e9bf6b0e02a9d SHA256 b12ab8fbef2cd8ceafd2e26e8fca375894275b7a60216fabf23f4f1342e73347
-DIST libjpeg-turbo-1.2.0.tar.gz 1752925 RMD160 d60a7de07c3164aeb1800ba21a86782e195f00f8 SHA1 4ab00afc9a8d54cd2e7a67aacb9c49e01a8bccac SHA256 629db2a9b1295a1b0e5fa8dddda36c5da61a90536bef8295e0b209cbcd50f98e
-DIST libjpeg8_8d-1.debian.tar.gz 13676 RMD160 9a60fe29a866b76935f8e26c7bf90324e1dc0ce6 SHA1 00b45ec61555c86da250f3a73823c7d46cfd81aa SHA256 70ec6689b0ad85739802cf3ebbdcc12ea01e21edd8f931c614b25b44cf199057
-EBUILD libjpeg-turbo-1.2.0-r1.ebuild 2685 RMD160 e12b395b5b09531070c6e3bd1e898e5a78459975 SHA1 a08b692270dbc3c415af35ad70318f2a0e1a97d6 SHA256 01facfbf8e95e2d2c31e278c139183f445814ced72fae27445085e9f4c37b03f
-EBUILD libjpeg-turbo-1.2.0-r2.ebuild 2930 RMD160 e2d29c153a6011e25b0cbe301007a09b9d6f776b SHA1 7d82d2bf1fc85e6812bb5225abce66c67ee785b2 SHA256 350623f3bb6d3ff5d044675f7b7290c8fb462662144312c53d3011534af95d04
-MISC ChangeLog 7287 RMD160 41e8f34058da83a5679bc1ac0e66978760c83188 SHA1 ce3686ceffb6dd1547454c060598375e71244f97 SHA256 57865cb8c28cf8f42acb9970eb7f57a127a07e80964ecf766e9ad8cd76309801
-MISC metadata.xml 367 RMD160 904c022029879a401ebec35c5a94e8092cf2f5ad SHA1 86a0413cf0356331eda8202c54241c7f712a4d1f SHA256 6b8c81649360de8af20a434749d90a9ee689026f959c814e22dac83513c5b0d4
+AUX libjpeg-turbo-1.2.0-guard_against_bad_num_components_value.patch 889 SHA256 66bef73d49350d1bb173f27226aeb215d5c4b3729a5a23088a7dbbac5a2f960c SHA512 a886c57b0e6773a2b86e0cc9ef5a5800ca3024683d606e9a8e1f7ad27303795a61bfc4045ee08362e1da674fb1d062b272aa4db470f3f97ddb2319ab893c11f9 WHIRLPOOL c6cbd484ff8c1ecef92b4b1348262137500916a1a7be377ddbc1815ad4740709d7f9763b23b753be4f1484402d0d169a739a8c2f7a17cb1fe9dd4eb9cbb19704
+AUX libjpeg-turbo-1.2.0-x32.patch 1240 SHA256 b12ab8fbef2cd8ceafd2e26e8fca375894275b7a60216fabf23f4f1342e73347 SHA512 0aa26467b7c0f583d945619f9b1ad9f200d6ae6cb5c904873a047d955de43c0bfefbf0d9f83cf26b3758f780b530cc35825b57a98856138642dcd29d73e24e91 WHIRLPOOL 67c84aec436f41f318149b264e5a198ad8b4d4bd19483f404dce60a59b237715a38fd5e6108d0c745ab90b6ca3688d2d75d7d23aecff06a649db34bff4d1be2d
+DIST libjpeg-turbo-1.2.0.tar.gz 1752925 SHA256 629db2a9b1295a1b0e5fa8dddda36c5da61a90536bef8295e0b209cbcd50f98e SHA512 cdfebd83f95988ebf79451363acb46f57555eafe8d782ef1ab7ace2d2336698f804f9ce33de850cc5bc453e91cb24878a7a40143f2ffd39d6def3d28f6ff65bb WHIRLPOOL 3f3614f42ab3b8c45ab947bda09635015bcc4b562a4d16a272d86fccb50d5c47a8ad0170f1c03b793f275e6a9eac64ff30a9b5e473d00158ccc33654f1511cce
+DIST libjpeg8_8d-1.debian.tar.gz 13676 SHA256 70ec6689b0ad85739802cf3ebbdcc12ea01e21edd8f931c614b25b44cf199057 SHA512 7def4f13524f0af3b9adf35a370027a18f43b9a635f56a17d5bb7883370db8b18b8a12737d0f0cb4b0287ccf8fb474eb5f754de6b398ffe7d522c54e5bf68040 WHIRLPOOL 94526c31d401eb14c9bf0f7115e13a27886ad58863e25d6653eba2b2f5ef260ec272368d2b9d9934bd75b1e5b5f1afc97230e540248efc24d6e85e5680399d27
+EBUILD libjpeg-turbo-1.2.0-r1.ebuild 2685 SHA256 01facfbf8e95e2d2c31e278c139183f445814ced72fae27445085e9f4c37b03f SHA512 973c6eea3c56037a7a6610727edb66804890540077a901f91659078e4f4443d2c2c6134b6f15ec9dbca545231406f47f7bb5501e147edfd1a8b54548aead5632 WHIRLPOOL 14c664605170c520335bdce18cf12d9d7dfe11ec69eae93e291ba43f269033f275855f46bd53c7ee9882bdffd1a955864e08d842d85adfd43cbb14863026b448
+EBUILD libjpeg-turbo-1.2.0-r2.ebuild 2954 SHA256 a11cf05ecbfe425e57d51e010a8551d960f9970bc3629ce178694ac699e60857 SHA512 5fb28a3e65416add444ad38a90b63d912cbcd8d029fc482f5fa448af8034b41f1ef49b7ea7a9fbb4a48fbd2c2405d2ac531d635e418b5d5a483d4c947f4747be WHIRLPOOL 4837809e204dde426ce2e0b78cbc3a1577e9d129eeb8aa586c6bcd2adfbe47e8a0011da6e685f8d2a80d57ac1454c0683e006b3c8b5e8275253c175cbfd765ba
+MISC ChangeLog 7456 SHA256 0a4a610ad401bb5bc0edd1890c3782855673e72968bf6afb0fbc5da779583425 SHA512 e5671ebfe752b5f46be7694943550f54711d83f19e8df4be6d18f2ca7f8474158dabb493585a008aa08331a1d2f4563127becadf1261608033dac497d7723cc5 WHIRLPOOL d6503e58b3379f6893537ba18b0758aab398e888248b67f13304834f86c6e1ac790787ab0b14aa5333016cca8c56a0e4dd62d3f57d106d0b694c674f06b82f9f
+MISC metadata.xml 367 SHA256 6b8c81649360de8af20a434749d90a9ee689026f959c814e22dac83513c5b0d4 SHA512 0dc1a5f70e560471119207724bc0015d1ae6b80c7da5d2305479b681ae9dca487dc0a58b5db45cc033d3c12ec997902b1c42c664efbfdff8cf3e1570259d0835 WHIRLPOOL 5686f917bfedc7f73923a18e99e8fa64eadda2cbe476d8b6c527be83f283acad01e0fedb5d4c9deb1dbf4f21538b69b3446db3304af782fb76e4b009c6bd3822
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP2gbmAAoJELEHsLL7fEFWlgYQALAHl0fzugY4IKYYrNSQ3der
-OiBr4o++Y4Tdaex7YaqGtnnSUCZyIKGnHactAwdWeTR5RbMhi5Q2JwAJbyLfze68
-l3NlpbH96Sg1ba8HcA/vGnrLPYCmw1jNG2y3epAktxmrQCF42UHUoKIGJi4sop3p
-VYDJEo1Emsn1rCQbG8F1taSJ+3N5kWAf72SlAHOE22gxCswZ4oNOeYvonl0OKM8B
-T2EvR804n6Tt7HQnGwpNn+1b9fMSEB/e1PxD8DEmN+1nHgzNydH9uiqKBM1c6lrI
-uNbmENyhAzhZ7233ZuIfqm8OC3HeYUNx8bMEdMyjsUO2VeVr/quCMfA42HPmuW8L
-vdA9UpEbiiQAd1m5daTILG68/TrpmUilGlUTuGX5w7vLhi5bME1ukGy3Ru5TTLN3
-1FOEk10nBQtjD2PlmSzeQyUkx6H+BvOmhGTvNOa+j13P9AOPNoF6JGLc9uyoTVIe
-hwxVZkvmtxwhmXZaHBMtgmn4WApfl+h/2kJ9OapKlfh3uvREOvQhbOtH1HIJT+JJ
-UTkYIOrKKoLnv1s66x11tJsPBfEelDYz07kH87SGLigigONOLClFpHFBo8nF9+mg
-b1Q+cvK5KLhxLPAQXSWb11QKL6nlCQBaOWUgx9BCBcqWzrY5MhNzCVVRqi7z4cP2
-TXjoMDhnLNlR0NT41Bj5
-=7NLC
+iQEcBAEBAgAGBQJP9IkBAAoJEEdUh39IaPFNP/gH/i8Chy8+Gb9jwdpk25u4o3pP
+orJA8uZm7HUR0jTCQTUd9tFZvfZ4gutNDEQTariCoZWFDsCMI4DJWpk1k1pqpbdN
+axvmzIY4URfyF1pn/Cy0NZCgJZ/Hr4W1QfA/pv3kHK7cgNJWdD9LGLye2re9zLRX
+7+LBS3f8ssFdNiwR9PB5X5zzlwe/k/sER6i0ztNdyRvqGm0HZJUxPRDJIjh55Mk4
+Q4UbRNkUicnnbv9tyTYCCi3Q31q1AkZXH2day+sJ/+s9uTuFjBiT5ypFnUD2vWx9
+o30RP80mVkmLm3GWwfuCUoV0I6LJFzKhxlDLw2YgR1T44PwlLqi9pucamw5vDY8=
+=jHRR
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild
index 2057588c1f07..2783b617b05b 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild,v 1.5 2012/06/14 15:44:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild,v 1.6 2012/07/04 18:24:10 ssuominen Exp $
 
 EAPI=4
 
@@ -48,6 +48,9 @@ src_prepare() {
 	else
 		eautoreconf
 	fi
+
+	epunt_cxx #424689
+
 	java-pkg-opt-2_src_prepare
 }