From 6ca51d9ebebcf52984a80a6db95ab8623d95d1f3 Mon Sep 17 00:00:00 2001
From: "Anthony G. Basile" <blueness@gentoo.org>
Date: Sat, 28 Apr 2018 19:28:19 -0400
Subject: [PATCH] tools-systemd: fix bug #653128

---
 tools-systemd/portage.amd64/package.use/iputils | 1 +
 tools-systemd/portage.amd64/package.use/pam     | 1 +
 tools-systemd/portage.i686/package.use/iputils  | 1 +
 tools-systemd/portage.i686/package.use/pam      | 1 +
 tools-systemd/run.sh                            | 1 +
 tools-systemd/stage-all.conf.template           | 1 +
 6 files changed, 6 insertions(+)
 create mode 100644 tools-systemd/portage.amd64/package.use/iputils
 create mode 100644 tools-systemd/portage.amd64/package.use/pam
 create mode 100644 tools-systemd/portage.i686/package.use/iputils
 create mode 100644 tools-systemd/portage.i686/package.use/pam

diff --git a/tools-systemd/portage.amd64/package.use/iputils b/tools-systemd/portage.amd64/package.use/iputils
new file mode 100644
index 00000000..9cde931b
--- /dev/null
+++ b/tools-systemd/portage.amd64/package.use/iputils
@@ -0,0 +1 @@
+net-misc/iputils -caps -filecaps
diff --git a/tools-systemd/portage.amd64/package.use/pam b/tools-systemd/portage.amd64/package.use/pam
new file mode 100644
index 00000000..6cec48a7
--- /dev/null
+++ b/tools-systemd/portage.amd64/package.use/pam
@@ -0,0 +1 @@
+sys-libs/pam -filecaps
diff --git a/tools-systemd/portage.i686/package.use/iputils b/tools-systemd/portage.i686/package.use/iputils
new file mode 100644
index 00000000..9cde931b
--- /dev/null
+++ b/tools-systemd/portage.i686/package.use/iputils
@@ -0,0 +1 @@
+net-misc/iputils -caps -filecaps
diff --git a/tools-systemd/portage.i686/package.use/pam b/tools-systemd/portage.i686/package.use/pam
new file mode 100644
index 00000000..6cec48a7
--- /dev/null
+++ b/tools-systemd/portage.i686/package.use/pam
@@ -0,0 +1 @@
+sys-libs/pam -filecaps
diff --git a/tools-systemd/run.sh b/tools-systemd/run.sh
index 0f16c4d1..bdaf5a4d 100755
--- a/tools-systemd/run.sh
+++ b/tools-systemd/run.sh
@@ -28,6 +28,7 @@ prepare_confs() {
         -e "s:SARCH:${arch}:g" \
         -e "s:PARCH:${parch}:g" \
         -e "s:@REPO_DIR@:${repo_dir}:g" \
+        -e "s:MYCATALYST:$(pwd):g" \
         >  stage${s}-${arch}-systemd.conf
   done
 }
diff --git a/tools-systemd/stage-all.conf.template b/tools-systemd/stage-all.conf.template
index eeff0e98..2be2284f 100644
--- a/tools-systemd/stage-all.conf.template
+++ b/tools-systemd/stage-all.conf.template
@@ -5,3 +5,4 @@ rel_type: systemd/SARCH
 profile: default/linux/PARCH/17.0/systemd
 snapshot: current
 source_subpath: systemd/SARCH/PSTAGE-SARCH-systemd
+portage_confdir: MYCATALYST/portage.SARCH