[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/

[Sam James]

commit:     a279fc20a5d8d1c869c71edb5e066753909d86ae
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 23 16:58:21 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 23 16:59:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a279fc20

sys-cluster/torque: update EAPI 6 -> 8

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-cluster/torque/torque-6.0.4-r2.ebuild | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/sys-cluster/torque/torque-6.0.4-r2.ebuild 
b/sys-cluster/torque/torque-6.0.4-r2.ebuild
index 4bedb3628c5b..ad1d843840bc 100644
--- a/sys-cluster/torque/torque-6.0.4-r2.ebuild
+++ b/sys-cluster/torque/torque-6.0.4-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools flag-o-matic linux-info toolchain-funcs
 
@@ -61,9 +61,9 @@ pkg_setup() {
 
        # Find a Torque server to use.  Check environment, then
        # current setup (if any), and fall back on current hostname.
-       if [ -z "${PBS_SERVER_NAME}" ]; then
-               if [ -f "${ROOT}${PBS_SERVER_HOME}/server_name" ]; then
-                       
PBS_SERVER_NAME="$(<${ROOT}${PBS_SERVER_HOME}/server_name)"
+       if [[ -z "${PBS_SERVER_NAME}" ]]; then
+               if [ -f "${EROOT}/${PBS_SERVER_HOME}/server_name" ]; then
+                       
PBS_SERVER_NAME="$(<${EROOT}/${PBS_SERVER_HOME}/server_name)"
                else
                        PBS_SERVER_NAME=$(hostname -f)
                fi
@@ -149,6 +149,7 @@ src_install() {
                newinitd "${FILESDIR}"/pbs_server-init.d-munge pbs_server
                newinitd "${FILESDIR}"/pbs_sched-init.d pbs_sched
        fi
+
        newinitd "${FILESDIR}"/pbs_mom-init.d-munge pbs_mom
        newconfd "${FILESDIR}"/${PN}-conf.d-munge ${PN}
        newinitd "${FILESDIR}"/trqauthd-init.d trqauthd
@@ -156,13 +157,13 @@ src_install() {
 }
 
 pkg_preinst() {
-       if [[ -f "${ROOT}etc/pbs_environment" ]]; then
-               cp "${ROOT}etc/pbs_environment" "${ED}"/etc/pbs_environment || 
die
+       if [[ -f "${EROOT}/etc/pbs_environment" ]]; then
+               cp "${EROOT}/etc/pbs_environment" "${ED}"/etc/pbs_environment 
|| die
        fi
 
-       if use server && [[ -f "${ROOT}${PBS_SERVER_HOME}/server_priv/nodes" 
]]; then
+       if use server && [[ -f "${EROOT}/${PBS_SERVER_HOME}/server_priv/nodes" 
]]; then
                cp \
-                       "${EROOT}${PBS_SERVER_HOME}/server_priv/nodes" \
+                       "${EROOT}/${PBS_SERVER_HOME}/server_priv/nodes" \
                        "${ED}/${PBS_SERVER_HOME}/server_priv/nodes" || die
        fi