[gentoo-commits] repo/gentoo:master commit in: net-misc/cfengine/

[Mike Gilbert]

commit:     4ab520202ec5681eee7856fbb308001e25ff67c4
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 16 23:43:51 2022 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Jan 16 23:56:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ab52020

net-misc/cfengine: update EAPI 5 -> 7

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 net-misc/cfengine/cfengine-3.6.2-r1.ebuild | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/net-misc/cfengine/cfengine-3.6.2-r1.ebuild 
b/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
index 3ac2c4c22e6a..c05b9132fce6 100644
--- a/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
+++ b/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
-inherit autotools epatch
+inherit autotools
 
 MY_PV="${PV//_beta/b}"
 MY_PV="${MY_PV/_p/p}"
@@ -39,9 +39,11 @@ REQUIRED_USE="^^ ( qdbm tokyocabinet )"
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+       local PATCHES=(
+               "${FILESDIR}/${P}-ifconfig.patch"
+               "${FILESDIR}/${P}-sysmacros.patch"
+       )
        default
-       epatch "${FILESDIR}/${P}-ifconfig.patch"
-       epatch "${FILESDIR}/${P}-sysmacros.patch"
        eautoreconf
 }
 
@@ -143,7 +145,7 @@ pkg_postinst() {
 }
 
 pkg_config() {
-       if [ "${ROOT}" == "/" ]; then
+       if [[ -z ${ROOT} ]]; then
                if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then
                        einfo "Generating keys for localhost."
                        /usr/sbin/cf-key