From fcc5224904648a8e6eb528d7603154160a20022f Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 2 Feb 2022 01:39:05 +0000
Subject: gentoo resync : 02.02.2022

---
 net-misc/cfengine/Manifest                 |  2 +-
 net-misc/cfengine/cfengine-3.6.2-r1.ebuild | 32 ++++++++++++++++--------------
 2 files changed, 18 insertions(+), 16 deletions(-)

(limited to 'net-misc/cfengine')

diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index 84596b2a2a1c..dbce6288a8fd 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -5,5 +5,5 @@ AUX cfengine-3.6.2-ifconfig.patch 486 BLAKE2B c8ccad409a64f1a0232fc800fe3787ece5
 AUX cfengine-3.6.2-sysmacros.patch 555 BLAKE2B e1111a7cd5dd1b28787c0db6af1f55fed2b95ac3f1267eb5ad516584f6bf4c070a5243185808ce772c2a70171bcf3e5eb331bc0cfc5b82a04e8dccd99fdce761 SHA512 404468a5e10b535c8f10c2cff9c8928730a4323145cd29cfc080cd3af9effef1b890fb038f3dad8d84ba67d1af72b402d35cc1f382ff34fb0cdd07b8af23732c
 DIST cfengine-3.6.2.tar.gz 1966966 BLAKE2B bb5be86ff1562fe44216c05ed179273dc803ef2a20d783f4692fe1fb533cd1914982671cbcc103c5f8f7118f7742f51ccbcdbe4408a86ebc566f444bc581e3df SHA512 b1bf6010d4309980846524ca94bb39f624f4ed0df3af220df91f7210b4441456840dfeeee4d62d6d6260b417ea7cf959509ca96c1a26c6da67bda7b3c1e5dbbc
 DIST cfengine-masterfiles-3.6.2.tar.gz 119594 BLAKE2B df01bfb5e5970fb386652ab1588d0b7d037d13018904506bd481b91720782bd837f7d54ca550d7b81e2db5fd535f053ac70e4ad5337d473986408e062e3565a7 SHA512 ec942dbfbc848455bbdaa157d6665d3e830cb967bbc07303aa4ee577cf2774d01bc602c57893372538b72d70b8b62b7e2a90ca9f8e59d7420d5b2f94fcd809e9
-EBUILD cfengine-3.6.2-r1.ebuild 4208 BLAKE2B 28ea0836f48416205c0b0a03ec4155002437a1b105d518e26608bb8829a9e665ccf45b9147d9907e647cf720894f96fe5b585abdb9eaab81f7e598348b3c1901 SHA512 79ea2164cc995656dca2a99fb24b86a06b26f40ebef81209ccffe2b63896ec9f0963042712ca932adb60878d5ad86ecfd0d2b97a5e12a39278b5047f8a245175
+EBUILD cfengine-3.6.2-r1.ebuild 4223 BLAKE2B d2d7a41ddefc5649a5dee43e95416fad9ecab14debaedf8a7f1cd8ad67dbc5fde1a104b89921c330c203e8eac234420be509c42943e93ad345236adcf1f8393a SHA512 c60eefa03c939b6f01c9f8d9c9a8b0249a9882a30ddcf8a716e16def13ca3bb7eeea9bac280e9f50735ef2298445c750d21cf7b4aee607e4c67edd66f9b23f68
 MISC metadata.xml 2059 BLAKE2B e4209b077bcc24a7023de92434a76ff2ba6c7eeeb7cb0cfcc5ffaf5b013581c5d3d7d76b9e06fb8ef60836f82d874987cf25b673bf9dbd7bd43181c06fc64220 SHA512 46eeec6d3549f1295fb5de51690ae3735057784c34c4950ba0eb9cc38fed355010602e6c36a03026b6465c4bbd6183ecb0ad946c991910ee707de0c524001417
diff --git a/net-misc/cfengine/cfengine-3.6.2-r1.ebuild b/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
index 7ade88aede8b..e9cd762ac986 100644
--- a/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
+++ b/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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}"
 MY_P="${PN}-${MY_PV}"
 
-DESCRIPTION="An automated suite of programs for configuring and maintaining Unix-like computers"
+DESCRIPTION="An suite of programs for configuring and maintaining Unix-like computers"
 HOMEPAGE="http://www.cfengine.org/"
 SRC_URI="http://cfengine.package-repos.s3.amazonaws.com/tarballs/${MY_P}.tar.gz
 	masterfiles? ( http://cfengine.package-repos.s3.amazonaws.com/tarballs/masterfiles-${MY_PV}.tar.gz -> ${PN}-masterfiles-${MY_PV}.tar.gz )"
@@ -22,7 +22,7 @@ IUSE="acl examples libvirt mysql masterfiles postgres +qdbm selinux tokyocabinet
 
 DEPEND="acl? ( virtual/acl )
 	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
+	postgres? ( dev-db/postgresql:= )
 	selinux? ( sys-libs/libselinux )
 	tokyocabinet? ( dev-db/tokyocabinet )
 	qdbm? ( dev-db/qdbm )
@@ -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
 }
 
@@ -83,15 +85,15 @@ src_install() {
 	emake DESTDIR="${D}" install
 
 	# fix ifconfig path in provided promises
-	find "${D}"/usr/share -name "*.cf" | xargs sed -i "s,/sbin/ifconfig,$(which ifconfig),g"
+	find "${ED}"/usr/share -name "*.cf" | xargs sed -i "s,/sbin/ifconfig,$(which ifconfig),g"
 
 	# Evil workaround for now..
-	mv "${D}"/usr/share/doc/${PN}/ "${D}"/usr/share/doc/${PF}
+	mv "${ED}"/usr/share/doc/${PN}/ "${ED}"/usr/share/doc/${PF}
 
 	dodoc AUTHORS
 
 	if ! use examples; then
-		rm -rf "${D}"/usr/share/doc/${PF}/example*
+		rm -rf "${ED}"/usr/share/doc/${PF}/example*
 	fi
 
 	# Create cfengine working directory
@@ -103,7 +105,7 @@ src_install() {
 	# binaries here. This is the default search location for the
 	# binaries.
 	for bin in promises agent monitord serverd execd runagent key; do
-		dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin
+		dosym ../../../usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin
 	done
 
 	if use masterfiles; then
@@ -130,10 +132,10 @@ pkg_postinst() {
 
 	# Fix old cf-servd, remove it after some releases.
 	local found=0
-	for fname in $(find /etc/runlevels/ -type f -or -type l -name 'cf-servd'); do
+	for fname in $(find "${EROOT}"/etc/runlevels/ -type f -or -type l -name 'cf-servd'); do
 		found=1
-		rm $fname
-		ln -s /etc/init.d/cf-serverd $(echo $fname | sed 's:cf-servd:cf-serverd:')
+		rm "$fname"
+		ln -s /etc/init.d/cf-serverd $(echo "$fname" | sed 's:cf-servd:cf-serverd:')
 	done
 
 	if [ "${found}" -eq 1 ]; then
@@ -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
-- 
cgit v1.2.3