summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-03-09 09:19:24 +0000
committerMichał Górny <mgorny@gentoo.org>2014-03-09 09:19:24 +0000
commit00579076e0fd0ce6d3fe387e65de687ee78ba531 (patch)
tree8d8d7377157f35f47c669df1102f50e9b4f8e970 /x11-libs
parentVersion bump for the 3.10 / 3.13 series, remove old. (diff)
downloadgentoo-2-00579076e0fd0ce6d3fe387e65de687ee78ba531.tar.gz
gentoo-2-00579076e0fd0ce6d3fe387e65de687ee78ba531.tar.bz2
gentoo-2-00579076e0fd0ce6d3fe387e65de687ee78ba531.zip
Wrap headers that can change due to USE=directfb inter-ABI mismatch.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/cairo/ChangeLog5
-rw-r--r--x11-libs/cairo/cairo-1.12.16-r1.ebuild7
2 files changed, 10 insertions, 2 deletions
diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 4fb7caf6f2ff..f3640b367cc0 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.360 2014/02/28 21:24:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.361 2014/03/09 09:19:24 mgorny Exp $
+
+ 09 Mar 2014; Michał Górny <mgorny@gentoo.org> cairo-1.12.16-r1.ebuild:
+ Wrap headers that can change due to USE=directfb inter-ABI mismatch.
28 Feb 2014; Michał Górny <mgorny@gentoo.org> cairo-1.12.16-r1.ebuild:
Add missing emul-linux blocker.
diff --git a/x11-libs/cairo/cairo-1.12.16-r1.ebuild b/x11-libs/cairo/cairo-1.12.16-r1.ebuild
index fb348f4e3493..f0a8736d5c74 100644
--- a/x11-libs/cairo/cairo-1.12.16-r1.ebuild
+++ b/x11-libs/cairo/cairo-1.12.16-r1.ebuild
@@ -1,6 +1,6 @@
# 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-1.12.16-r1.ebuild,v 1.2 2014/02/28 21:24:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r1.ebuild,v 1.3 2014/03/09 09:19:24 mgorny Exp $
EAPI=5
@@ -78,6 +78,11 @@ REQUIRED_USE="
xlib-xcb? ( xcb )
"
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/cairo/cairo-features.h
+ /usr/include/cairo/cairo-directfb.h
+)
+
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
use legacy-drivers && epatch "${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch