From ac4875f9cf40eb14e9c8f0d8f6815a1db1607db0 Mon Sep 17 00:00:00 2001 From: Michael Haubenwallner Date: Thu, 23 Mar 2017 12:59:30 +0100 Subject: [PATCH] sys-apps/prefix-chain-utils: prefer /lib/gentoo/functions.sh Package-Manager: portage-2.3.3 --- sys-apps/prefix-chain-utils/files/startprefix.in | 9 ++++++++- ...ls-0.2-r5.ebuild => prefix-chain-utils-0.2-r6.ebuild} | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) rename sys-apps/prefix-chain-utils/{prefix-chain-utils-0.2-r5.ebuild => prefix-chain-utils-0.2-r6.ebuild} (97%) diff --git a/sys-apps/prefix-chain-utils/files/startprefix.in b/sys-apps/prefix-chain-utils/files/startprefix.in index 1b84ed3c28e1..3882ffe14a9c 100644 --- a/sys-apps/prefix-chain-utils/files/startprefix.in +++ b/sys-apps/prefix-chain-utils/files/startprefix.in @@ -1,6 +1,13 @@ #!/usr/bin/env bash -. "@GENTOO_PORTAGE_EPREFIX@"/sbin/functions.sh +if [[ -r "@GENTOO_PORTAGE_EPREFIX@"/lib/gentoo/functions.sh ]]; then + . "@GENTOO_PORTAGE_EPREFIX@"/lib/gentoo/functions.sh +elif [[ -r "@GENTOO_PORTAGE_EPREFIX@"/etc/init.d/functions.sh ]]; then + . "@GENTOO_PORTAGE_EPREFIX@"/etc/init.d/functions.sh +elif [[ -r "@GENTOO_PORTAGE_EPREFIX@"/sbin/functions.sh ]]; then + . "@GENTOO_PORTAGE_EPREFIX@"/sbin/functions.sh +fi + einfo "entering chained prefix @GENTOO_PORTAGE_EPREFIX@ ..." # inform profiles very early of us beeing interactive (or at least, diff --git a/sys-apps/prefix-chain-utils/prefix-chain-utils-0.2-r5.ebuild b/sys-apps/prefix-chain-utils/prefix-chain-utils-0.2-r6.ebuild similarity index 97% rename from sys-apps/prefix-chain-utils/prefix-chain-utils-0.2-r5.ebuild rename to sys-apps/prefix-chain-utils/prefix-chain-utils-0.2-r6.ebuild index 1a31f8ddc67f..fe753b07b811 100644 --- a/sys-apps/prefix-chain-utils/prefix-chain-utils-0.2-r5.ebuild +++ b/sys-apps/prefix-chain-utils/prefix-chain-utils-0.2-r6.ebuild @@ -4,7 +4,7 @@ inherit prefix DESCRIPTION="Chained EPREFIX utilities and wrappers" -HOMEPAGE="https://dev.gentoo.org/~mduft" +HOMEPAGE="https://dev.gentoo.org/~haubi" SRC_URI="" LICENSE="GPL-3" -- 2.26.2