From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1108361-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 2F0CF138334
	for <garchives@archives.gentoo.org>; Sat, 31 Aug 2019 00:20:59 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 5F4D7E0849;
	Sat, 31 Aug 2019 00:20:58 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 2E39BE0849
	for <gentoo-commits@lists.gentoo.org>; Sat, 31 Aug 2019 00:20:58 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 8F41334A714
	for <gentoo-commits@lists.gentoo.org>; Sat, 31 Aug 2019 00:20:56 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 14FA176D
	for <gentoo-commits@lists.gentoo.org>; Sat, 31 Aug 2019 00:20:55 +0000 (UTC)
From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" <floppym@gentoo.org>
Message-ID: <1567210722.0c1ea876a19c8474bedd2a63e68508f74cebdafb.floppym@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/udev-init-scripts/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
X-VCS-Directories: sys-fs/udev-init-scripts/
X-VCS-Committer: floppym
X-VCS-Committer-Name: Mike Gilbert
X-VCS-Revision: 0c1ea876a19c8474bedd2a63e68508f74cebdafb
X-VCS-Branch: master
Date: Sat, 31 Aug 2019 00:20:55 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 7ac5bdf7-a8c5-48d5-8315-225117fccd67
X-Archives-Hash: 08d08bae490de725bfd0fa5f16a77743

commit:     0c1ea876a19c8474bedd2a63e68508f74cebdafb
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 31 00:18:42 2019 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Aug 31 00:18:42 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c1ea876

sys-fs/udev-init-scripts: fix install on prefix

Closes: https://bugs.gentoo.org/682422
Package-Manager: Portage-2.3.73_p4, Repoman-2.3.17_p24
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild   | 13 +++++++++----
 sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild | 13 +++++++++----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild
index 2090016f2a5..1646e4a87e8 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild
@@ -25,13 +25,18 @@ RESTRICT="test"
 RDEPEND=">=virtual/udev-217
 	!<sys-apps/openrc-0.14"
 
+src_install() {
+	local -x SYSCONFDIR="${EPREFIX}/etc"
+	default
+}
+
 pkg_postinst() {
 	# Add udev and udev-trigger to the sysinit runlevel automatically.
 	for f in udev udev-trigger; do
-		if [[ -x ${ROOT%/}/etc/init.d/${f} &&
-			-d ${ROOT%/}/etc/runlevels/sysinit &&
-			! -L "${ROOT%/}/etc/runlevels/sysinit/${f}" ]]; then
-			ln -snf /etc/init.d/${f} "${ROOT%/}"/etc/runlevels/sysinit/${f}
+		if [[ -x "${EROOT}/etc/init.d/${f}" &&
+			-d "${EROOT}/etc/runlevels/sysinit" &&
+			! -L "${EROOT}/etc/runlevels/sysinit/${f}" ]]; then
+			ln -snf "${EPREFIX}/etc/init.d/${f}" "${EROOT}/etc/runlevels/sysinit/${f}"
 			ewarn "Adding ${f} to the sysinit runlevel"
 		fi
 	done

diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
index b514fc5923d..4ce4b403509 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
@@ -25,13 +25,18 @@ RESTRICT="test"
 RDEPEND=">=virtual/udev-217
 	!<sys-apps/openrc-0.14"
 
+src_install() {
+	local -x SYSCONFDIR="${EPREFIX}/etc"
+	default
+}
+
 pkg_postinst() {
 	# Add udev and udev-trigger to the sysinit runlevel automatically.
 	for f in udev udev-trigger; do
-		if [[ -x ${ROOT%/}/etc/init.d/${f} &&
-			-d ${ROOT%/}/etc/runlevels/sysinit &&
-			! -L "${ROOT%/}/etc/runlevels/sysinit/${f}" ]]; then
-			ln -snf /etc/init.d/${f} "${ROOT%/}"/etc/runlevels/sysinit/${f}
+		if [[ -x "${EROOT}/etc/init.d/${f}" &&
+			-d "${EROOT}/etc/runlevels/sysinit" &&
+			! -L "${EROOT}/etc/runlevels/sysinit/${f}" ]]; then
+			ln -snf "${EPREFIX}/etc/init.d/${f}" "${EROOT}/etc/runlevels/sysinit/${f}"
 			ewarn "Adding ${f} to the sysinit runlevel"
 		fi
 	done