From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 02ADC139086 for ; Mon, 19 Dec 2016 11:03:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6DB4F21C13C; Mon, 19 Dec 2016 11:03:42 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 49B1F21C0B9 for ; Mon, 19 Dec 2016 11:03:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5FEAC341026 for ; Mon, 19 Dec 2016 11:03:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0342924E3 for ; Mon, 19 Dec 2016 11:03:40 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1482145415.812e00aa9cf758beac2d3198915d0af820199415.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-libs/cairo/cairo-9999.ebuild X-VCS-Directories: x11-libs/cairo/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 812e00aa9cf758beac2d3198915d0af820199415 X-VCS-Branch: master Date: Mon, 19 Dec 2016 11:03:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 664c9600-abf2-4428-9d09-b334b406caf4 X-Archives-Hash: 92119166166fa7ea079cb0f103e97b84 commit: 812e00aa9cf758beac2d3198915d0af820199415 Author: Lars Wendler gentoo org> AuthorDate: Mon Dec 19 11:00:37 2016 +0000 Commit: Lars Wendler gentoo 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