From: Lars Wendler <polynomial-c@gentoo.org>
Date: Mon, 19 Dec 2016 17:02:39 +0000 (+0100)
Subject: x11-libs/cairo: Apply patches as early as possible (bug #603104).
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d0ffa8e441f49aa43b1f1152c84b06b01369fa3e;p=gentoo.git

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 736ad877c288..5b1926b14ee9 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 2cec6db7ea24..e3753c2c7262 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