From a44f5a469b6426bfb240fd28cc6e97fd3e986fca Mon Sep 17 00:00:00 2001
From: mischief <mischief@offblast.org>
Date: Wed, 11 Mar 2015 15:49:43 -0700
Subject: [PATCH] sys-apps/keyutils: move conf files to /usr and setup
 tmpfiles.d symlinks

---
 .../sys-apps/keyutils/files/tmpfiles.d/keyutils.conf   |  3 +++
 ...yutils-1.5.9-r1.ebuild => keyutils-1.5.9-r2.ebuild} | 10 ++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/files/tmpfiles.d/keyutils.conf
 rename sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/{keyutils-1.5.9-r1.ebuild => keyutils-1.5.9-r2.ebuild} (89%)

diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/files/tmpfiles.d/keyutils.conf b/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/files/tmpfiles.d/keyutils.conf
new file mode 100644
index 0000000000..5750b4b167
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/files/tmpfiles.d/keyutils.conf
@@ -0,0 +1,3 @@
+L	/etc/request-key.conf	-	-	-	-	../usr/share/keyutils/request-key.conf
+d	/etc/request-key.d	-	-	-	-	-
+
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/keyutils-1.5.9-r2.ebuild
similarity index 89%
rename from sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/keyutils-1.5.9-r2.ebuild
index 5f6fe000d0..911d66efe7 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/keyutils-1.5.9-r2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit multilib eutils toolchain-funcs linux-info multilib-minimal
+inherit multilib eutils toolchain-funcs linux-info multilib-minimal systemd
 
 DESCRIPTION="Linux Key Management Utilities"
 HOMEPAGE="http://people.redhat.com/dhowells/keyutils/"
@@ -72,8 +72,14 @@ multilib_src_test() {
 }
 
 multilib_src_install() {
-	default
+	# setup tmpfiles symlinks for moved confs
+	systemd_dotmpfilesd "${FILESDIR}"/tmpfiles.d/keyutils.conf
+
+	emake install ETCDIR=/usr/share/keyutils DESTDIR="${D}"
 	multilib_is_native_abi && gen_usr_ldscript -a keyutils
+
+	dosym ../usr/share/keyutils/request-key.conf /etc/request-key.conf
+	dodir /etc/request-key.d
 }
 
 multilib_src_install_all() {