Drop LTO, bugs 517258 and 517884.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x974CA72A

3 files changed, 22 insertions, 32 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 1823da898ab5..b6f6e726eef9 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.383 2014/07/26 08:57:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.384 2014/08/19 21:01:35 mattst88 Exp $
+
+  19 Aug 2014; Matt Turner <mattst88@gentoo.org> cairo-9999.ebuild:
+  Drop LTO, bugs 517258 and 517884.
 
   26 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> cairo-1.10.2-r3.ebuild,
   cairo-1.12.14-r4.ebuild, cairo-1.12.16-r2.ebuild, cairo-1.12.16-r3.ebuild,
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index a723ddb5c617..15091991531b 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -24,17 +24,23 @@ EBUILD cairo-1.12.14-r4.ebuild 4232 SHA256 a9500a5fa9b6d903037ee11953945799c5031
 EBUILD cairo-1.12.16-r2.ebuild 5491 SHA256 67a756c661a62d5fc1c81638dd95b80a8774d39d8c26e73fa12f5b850de1a785 SHA512 bbd0d9a8a2486607a1edc6576f40a92503ebdc86223a5c31b5f5a319d88735fce18a643f4801ff40713a3a9b1b803f67b5974ca70d542973772085ce70a6cd5b WHIRLPOOL d7228036b8924d765c2b9637688cbe97b9abe9b56c44e96c1bdbac09a183dc60a836eba30f39a1fc13a12dd0b05f3fb5d1af9387aa716e5178dc68a0e58b442e
 EBUILD cairo-1.12.16-r3.ebuild 6302 SHA256 94b0bacf6369384b3b2225599a4a00eb294555b6b4c5e95f104da062b95a931a SHA512 861841e638e28b663b955942151e8b4699fd712c7a7aee2c16887f072a24ad5ac9fd100d96b45416b6175e0474e0ff5fff36f6b3409d2a52d64c0d6b43b5eaf9 WHIRLPOOL badf031af66cc1bdf1d9a5c642b56ea4ea330d82f91d885c0b81abdc120ea4b2921e0e994849ad74b67303f93feef8593e7eb59ac4bff7240d9a1c2085135116
 EBUILD cairo-1.12.16.ebuild 4115 SHA256 510a7314d31ee86b1cdc198cc2feae538b577582961b38c1bcab35e8e8da1a17 SHA512 a7964920b7dc9b8fcd3826207fa53046e41d67d3486a73f32cd4183ebf2d9ac500398a0d73604c9d234139344653d66ad8b24eb91e1d48d814c1fa70ba179c29 WHIRLPOOL 1df6b4bae51c564a862e763b0ffb6726ce9ab983bf7fe353e7bfb8f34d32cdd56a2c889efc55d70174061a0b3d8744ef9abb282870e6bae4d119b9331841a40d
-EBUILD cairo-9999.ebuild 6079 SHA256 abd7ed212c20569899532c1bdc12f0e1f0509fd77c55497b0c4c3cd535a55982 SHA512 c01b62a00446b8dbfb0a0f6e9915bf502dadc7c76e1f4fd50b21311473e4fad597fbffe6dfa992cdd16f11b286e939bec15a77319806be125bd768b407b39cdb WHIRLPOOL ecff5e5eaf17f44ee7c370bc9c31f927e95eb756b5561662c295fbb4b723153f4a305bca2d01fe9a1bd9b50c762b0400a603085af2f4a8204fe3a4bb458a4c8c
-MISC ChangeLog 57232 SHA256 1038a2aff4c641123693a08d45b5d5f539495f7137bb8ceaeee6e6a6737a43ce SHA512 6cb6720d73aa021d036737a213b3d2c9bb45b1944e25a211c377bc5068f297c32bc535dc4b5932b69320f560b12a8937fc1a8bb7edb4698db686dae611c13d29 WHIRLPOOL beda400b7df6d5b5227862b1363fd28eb4b72207640bfb1dee1c2abdaa55dace08e4496f7ce694d439c61c4e73be60ff4dc570dc1bad5f85d7e688624b6fdb57
+EBUILD cairo-9999.ebuild 5629 SHA256 7ede1f111fced21a83b1c879242952a3d7f6d834adbf8cc8eb545f3e13171636 SHA512 52fe920e7c80af3bbd107d1513e7d5f37c783908dfb467cc7a6a7ff5d21a6d7362b799c8d911aaab7f4a9a13e57021bafdfb33dd5cc64dbc4ce22cab34c2547a WHIRLPOOL 9ba5f929ebd0f836ffc3d158bafad05492dd9fdf85bbfc170cb159d3e2778bf533c2f36b9a2ed72c1f5d285e5d060f910d1b999631577b114a93183c620d4f75
+MISC ChangeLog 57336 SHA256 239db1f2cf8564d5c3f70429fc1a36b40f0461da99febb273f1f7e7b0da7fab1 SHA512 24eb5edbbce61d5d79a03f980c9b5f68441cf967bbc005ee395fc5e3fb7ea2d9699df206e93ee6c03992e38fb14fb3686af1f8af521df87f7f87efe537caf321 WHIRLPOOL 2bdb4797327be098fb08dfdf4cad04c294aaa438c389364c22ee7fbd4f03f23dd45f7771c593312c80e1aef9eca03879391365f87002bf317b176243f6e3c611
 MISC metadata.xml 1512 SHA256 e608340ec4a70a7ed36558825b916661bc659e8e8b588a89c2b94f57fb62822e SHA512 616bfa3ee0b43f91d9104f19e756e97a2e68edc65b2eb293864d15a099068e3f5359f0edaf91fff5a2470b82d303d37e4227a7df65b3f3601362f1268501f94f WHIRLPOOL 8e279a5124dd7073add02094a5363046d47e435b4e274a765cb936d33599cf13e16758fe3f57ef316a8137dd574681a99d4b5bf8074554606d7d36afadaa3f91
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT022QAAoJEEdUh39IaPFNWxsH/05BVVAQN1FjJ1Md1MH0UEV+
-nEoRWkKluKPEf5STNl4jMR/Vhn0o/oGrBC0VwBKVEGi3mjqNeDvQeeHBzLefB8J+
-0ihFERpy424S7TAtWIA/qmih/Ne6Cyv4tnUjaCiQD8OJ/RQ9xtzhim/BtC2FdsfF
-pFrryUILbvxQ3ukEjEVsjUNwsPRNo/phZa44G9aA/4igwncdc7/37gJL/BqKehOQ
-e9Aha52EqhIcuJXEI/jzUGYlhdzRDTIJTvIfgsfzlslQKk7mY2zs1mfceje5ATPe
-xvqu9aJEYRKzxofNasbDtTZ5DsR3HCC7SIGFiEBRi+ddq6AD5cL2eVagYEpl/3E=
-=CJsH
+iQIcBAEBCAAGBQJT87vsAAoJEA/daC2XTKcqiAkP/0Ro3hQhBGLfPi2GDkJgf12f
+bwBQgC50+597TbyauJgF2EpcG/soo4r2Ks7/2524cnNBFsZ23Cih1M91fjpAMoi4
+MZvhR2Jy5+fn1+RL8SPrISfmUABQjvcTyYh+NDlWm9DXUBeWOBMb1JFFyuDuMAHp
+gfEVr9PQfjTcQxy7gotjkFHFr+6S4erqiCzUMGXfyQzLhEWaJMBWTKKLLy771S2a
+I4N6JFn9EeI2ZyhtiTZgJiG4mAzJPy8vBujQgBXKd3M8RC3F3hWpBrwiigcU5eTq
+SPoD4+T/giW1gQ21p0v1mfSC75rJBlHBSfWwCDCoq0uIIpjkv5Xo537pQ9kpP7so
+h/ToEw0AuaZIgMWvQ/ZolpfL4PqMog5ohOkworJcefW/dSvBuTRqow4fczmjPTc2
+mj0JxQd2jYMzzy8BrC0HinOic7KklZ4Zwn3ZPGdQ495obV7qqmqPs1oT5oTWzGgl
+PWswNsBDELjA1hRx5NNCeg0T8LVnP6tIDNktPJglQmN0YVc8ShGemRr06BdxUa8O
+crLQIfJmFmsrbsk+hWTHIgOZSXMmnboQY9ZAd2dcOSt5QPNEW47NMi1Y/kUdXWkA
+CXX+HPTRLMarX16ncuLspeFiu8yL7zKDEQGHmjG7B2CuKBE8jmczdJ64x3zqgxdp
+f+Z8GCvboyAG1Sv4xTQo
+=Clnm
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index c394d8bf9b79..2c6404c523f8 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.48 2014/07/26 08:57:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.49 2014/08/19 21:01:35 mattst88 Exp $
 
 EAPI=5
 
-inherit check-reqs eutils flag-o-matic autotools multilib-minimal
+inherit eutils flag-o-matic autotools multilib-minimal
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-2
@@ -19,7 +19,7 @@ DESCRIPTION="A vector graphics library with cross-device output support"
 HOMEPAGE="http://cairographics.org/"
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-IUSE="X aqua debug directfb drm gallium gles2 +glib legacy-drivers lto opengl openvg qt4 static-libs +svg valgrind xcb xlib-xcb"
+IUSE="X aqua debug directfb drm gallium gles2 +glib legacy-drivers opengl openvg qt4 static-libs +svg valgrind xcb xlib-xcb"
 # gtk-doc regeneration doesn't seem to work with out-of-source builds
 #[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate
 
@@ -85,29 +85,11 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/cairo/cairo-directfb.h
 )
 
-CHECKREQS_MEMORY="768M"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && use lto; then
-		einfo "Checking for sufficient memory to build $PN with USE=lto"
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && use lto; then
-		check-reqs_pkg_setup
-	fi
-}
-
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
 	use legacy-drivers && epatch "${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch
 	epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch
 
-	# allow the automagically injected -flto flag to be not injected
-	epatch "${FILESDIR}"/${PN}-1.12.16-lto-optional.patch
-
 	# tests and perf tools require X, bug #483574
 	if ! use X; then
 		sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die
@@ -162,7 +144,6 @@ multilib_src_configure() {
 		$(use_enable gallium) \
 		$(use_enable gles2 glesv2) \
 		$(use_enable glib gobject) \
-		$(use_enable lto) \
 		$(use_enable openvg vg) \
 		$(use_enable opengl gl) \
 		$(use_enable qt4 qt) \