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

Package-Manager: Portage-2.3.3, Repoman-2.3.1

diff --git a/x11-libs/cairo/cairo-1.14.8.ebuild b/x11-libs/cairo/cairo-1.14.8.ebuild
index 736ad877c2882744d33356f7b3fb0534119cce56..5b1926b14ee98a16db92f940ca267e6290f1562c 100644 (file)
--- 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 2cec6db7ea24c20ceef20c8914608c3ef9cc9b0a..e3753c2c7262ae0f2655858130afd8b860c17186 100644 (file)
--- 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