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

[Lars Wendler]

commit:     d0ffa8e441f49aa43b1f1152c84b06b01369fa3e
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 19 17:02:39 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 17:02:39 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0ffa8e4

x11-libs/cairo: Apply patches as early as possible (bug #603104).

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 x11-libs/cairo/cairo-1.14.8.ebuild | 4 ++--
 x11-libs/cairo/cairo-9999.ebuild   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/x11-libs/cairo/cairo-1.14.8.ebuild 
b/x11-libs/cairo/cairo-1.14.8.ebuild
index 736ad87..5b1926b 100644
--- a/x11-libs/cairo/cairo-1.14.8.ebuild
+++ b/x11-libs/cairo/cairo-1.14.8.ebuild
@@ -76,13 +76,13 @@ PATCHES=(
 )
 
 src_prepare() {
+       default
+
        # tests and perf tools require X, bug #483574
        if ! use X; then
                sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am 
|| die
        fi
 
-       default
-
        # Slightly messed build system YAY
        if [[ ${PV} == *9999* ]]; then
                touch boilerplate/Makefile.am.features

diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index 2cec6db..e3753c2 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -76,13 +76,13 @@ PATCHES=(
 )
 
 src_prepare() {
+       default
+
        # tests and perf tools require X, bug #483574
        if ! use X; then
                sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am 
|| die
        fi
 
-       default
-
        # Slightly messed build system YAY
        if [[ ${PV} == *9999* ]]; then
                touch boilerplate/Makefile.am.features