mattst88 14/08/19 21:01:35 Modified: cairo-9999.ebuild ChangeLog Log: Drop LTO, bugs 517258 and 517884. (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 974CA72A)
Revision Changes Path 1.49 x11-libs/cairo/cairo-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?rev=1.49&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?rev=1.49&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?r1=1.48&r2=1.49 Index: cairo-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- cairo-9999.ebuild 26 Jul 2014 08:57:55 -0000 1.48 +++ cairo-9999.ebuild 19 Aug 2014 21:01:35 -0000 1.49 @@ -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 @@ 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 @@ /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 @@ $(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) \ 1.384 x11-libs/cairo/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.384&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.384&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?r1=1.383&r2=1.384 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v retrieving revision 1.383 retrieving revision 1.384 diff -u -r1.383 -r1.384 --- ChangeLog 26 Jul 2014 08:57:55 -0000 1.383 +++ ChangeLog 19 Aug 2014 21:01:35 -0000 1.384 @@ -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 <[email protected]> cairo-9999.ebuild: + Drop LTO, bugs 517258 and 517884. 26 Jul 2014; Samuli Suominen <[email protected]> cairo-1.10.2-r3.ebuild, cairo-1.12.14-r4.ebuild, cairo-1.12.16-r2.ebuild, cairo-1.12.16-r3.ebuild,
