From 6fd9bf4fd71291280c665637d7fb9e55f0537fba Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg59@coreos.com>
Date: Wed, 27 Apr 2016 16:12:32 -0700
Subject: [PATCH] sys-auth/polkit: Fix cross-compilation

Polkit makes incorrect assumptions about paths in the build root. Pull
data from the correct location.
---
 .../polkit-0.113-gir-cross-compile.patch      | 21 +++++++++++++++++++
 ...it-0.113.ebuild => polkit-0.113-r1.ebuild} |  1 +
 2 files changed, 22 insertions(+)
 create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-auth/polkit/files/polkit-0.113-gir-cross-compile.patch
 rename sdk_container/src/third_party/coreos-overlay/sys-auth/polkit/{polkit-0.113.ebuild => polkit-0.113-r1.ebuild} (98%)

diff --git a/sdk_container/src/third_party/coreos-overlay/sys-auth/polkit/files/polkit-0.113-gir-cross-compile.patch b/sdk_container/src/third_party/coreos-overlay/sys-auth/polkit/files/polkit-0.113-gir-cross-compile.patch
new file mode 100644
index 0000000000..64bff277a7
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-auth/polkit/files/polkit-0.113-gir-cross-compile.patch
@@ -0,0 +1,21 @@
+--- polkit-0.113.orig/configure	2015-06-19 13:31:13.000000000 -0700
++++ polkit-0.113/configure	2016-04-27 16:00:31.800252583 -0700
+@@ -14949,14 +14949,14 @@
+     INTROSPECTION_GIRDIR=
+     INTROSPECTION_TYPELIBDIR=
+     if test "x$found_introspection" = "xyes"; then
+-       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
+-       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+-       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
++       INTROSPECTION_SCANNER=${SYSROOT}/`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
++       INTROSPECTION_COMPILER=${SYROOT}/`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
++       INTROSPECTION_GENERATE=${SYSROOT}/`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+        INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+        INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+        INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+        INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+-       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
++       INTROSPECTION_MAKEFILE=${SYSROOT}/`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
+     fi
+ 
+ 
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-auth/polkit/polkit-0.113.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-auth/polkit/polkit-0.113-r1.ebuild
similarity index 98%
rename from sdk_container/src/third_party/coreos-overlay/sys-auth/polkit/polkit-0.113.ebuild
rename to sdk_container/src/third_party/coreos-overlay/sys-auth/polkit/polkit-0.113-r1.ebuild
index 5f757a66da..98f090b160 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-auth/polkit/polkit-0.113.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-auth/polkit/polkit-0.113-r1.ebuild
@@ -64,6 +64,7 @@ pkg_setup() {
 
 src_prepare() {
 	sed -i -e 's|unix-group:wheel|unix-user:0|' src/polkitbackend/*-default.rules || die #401513
+	epatch ${FILESDIR}/polkit-0.113-gir-cross-compile.patch
 }
 
 src_configure() {