[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/

[Lars Wendler]

commit:     812e00aa9cf758beac2d3198915d0af820199415
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 19 11:00:37 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 11:03:35 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=812e00aa

x11-libs/cairo: Bumped live ebuild to EAPI-6.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 x11-libs/cairo/cairo-9999.ebuild | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index 12d34b3..2cec6db 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit eutils flag-o-matic autotools multilib-minimal
 
@@ -70,16 +70,18 @@ MULTILIB_WRAPPED_HEADERS=(
        /usr/include/cairo/cairo-directfb.h
 )
 
-src_prepare() {
-       epatch "${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
-       epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch
+PATCHES=(
+       "${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
+       "${FILESDIR}"/${PN}-respect-fontconfig.patch
+)
 
+src_prepare() {
        # tests and perf tools require X, bug #483574
        if ! use X; then
                sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am 
|| die
        fi
 
-       epatch_user
+       default
 
        # Slightly messed build system YAY
        if [[ ${PV} == *9999* ]]; then