gentoo resync : 28.04.2021

2 files changed, 34 insertions, 37 deletions

diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index 18b514abc2b7..03af79450380 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -1,5 +1,5 @@
 AUX vzctl-4.9.4-glibc225-2.patch 1196 BLAKE2B 4560cb8fc78163b0c397cbf89545aca9c7005f67d31eb41b6dcc2d6c0ab064298655d30eeb958e007320828d5ef7bd7bcb89e44e1b7f5b36c7d327f866f66d6f SHA512 70ec27c9067bdd7fa1e3e2aa32b32649aca8a2d357ffa583c29132d7339f52bbc19195fc9be304f977ee82d96978f3a51bc9cca23d124ce4946c48b6129bd714
 AUX vzctl-4.9.4-glibc225.patch 406 BLAKE2B abee2fcb861f755bd75840eb29ee4921c8580f18d5243cb9ac19bf4fe25e44474cb490d0f673e80a3bff8f17b8c93dd96c3b8b0e2e38dbda5721262b2f610d16 SHA512 db7778a15785e6d9d22d1102cb341647834b6b9eeb4fc26b6cbaa86af7317931d3571a2b7f03a3b419338e11427482dd831374144a67dda2f2f4fe11ff020f45
 DIST vzctl-4.9.4.tar.bz2 550370 BLAKE2B 173d6cfe93b15aef6cb1903a5d711e29190964479c146625a3f9d2ff872161c51b7632213a5f0d47d5a14ec34d7d80499c1bc17f11cfbb80318c26630c05fd71 SHA512 651aa7882ba77442666a09441769f821a7374f417199380667b27c9980203597575dfe12ad5c261da22941b6a2bc6e032d3f9c2d88dcb03af6412634cc5b4706
-EBUILD vzctl-4.9.4.ebuild 2178 BLAKE2B 69bc846d3bdde8c6b3d36c81044b7bba03be18e782cb9750fa21a4f396639aca3bb8a164c165b6cf28bd191eb893295c5142d5930741ff7869c4edcf2320ec16 SHA512 01486c1ae843b7550f743262d5f308c3299dcb4446f0806fa28bbab03a53647fda7c48d24e42f605b1321c34c426b7745ae46a342b13d26f0ae1b4de1c81528d
+EBUILD vzctl-4.9.4.ebuild 2008 BLAKE2B 3323b0687ac64f350951bf64e04832d9ac58c235e820e7a9096a278a718e3d269fae9128b878e9e87c6fa86a6ffb0f7d91797c98818b940c0293b4904a6de260 SHA512 92dfe7ad31eafb659faaf6eb5b73f4ed91c9ef8e450494790168a009cd9b23e6c02c9e11e181374a7ea6665486f51f16f967581a6e5967b3043759d420c03354
 MISC metadata.xml 476 BLAKE2B 6036f242ec8f7fe818244fd4d01d5d89b548c66fa2834127c66dadb4fe3a9d06643fab4ccd297c780e7f470eae8bc73a5d04a03ed15fd732c79c38a841373809 SHA512 0530fde605015304c81e13ae82da0fcd230a97766dcd775632515d7368d701b3ecae16988ad6447d0e77a1ae9d08f31bd28a3e0e3f5ce0f03b915ff2ad453389
diff --git a/sys-cluster/vzctl/vzctl-4.9.4.ebuild b/sys-cluster/vzctl/vzctl-4.9.4.ebuild
index 97b9d64eb6e1..7c9536d71828 100644
--- a/sys-cluster/vzctl/vzctl-4.9.4.ebuild
+++ b/sys-cluster/vzctl/vzctl-4.9.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit base bash-completion-r1 eutils toolchain-funcs udev
+inherit bash-completion-r1 toolchain-funcs optfeature udev
 
 DESCRIPTION="OpenVZ ConTainers control utility"
 HOMEPAGE="http://openvz.org/"
@@ -14,31 +14,35 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc64 x86"
 IUSE="+ploop +vzmigrate"
 
-RDEPEND="net-firewall/iptables
-		sys-apps/ed
-		>=sys-apps/iproute2-3.3.0
-		>=sys-fs/vzquota-3.1
-		ploop? (
-			>=sys-cluster/ploop-1.13
-			sys-block/parted
-			sys-fs/quota
-			dev-libs/libxml2
-			)
-		>=dev-libs/libcgroup-0.38
-		vzmigrate? (
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	>=dev-libs/libcgroup-0.38
+	net-firewall/iptables
+	sys-apps/attr
+	sys-apps/ed
+	>=sys-apps/iproute2-3.3.0
+	>=sys-fs/vzquota-3.1
+	virtual/udev
+	ploop? (
+		dev-libs/libxml2
+		sys-block/parted
+		>=sys-cluster/ploop-1.13
+		sys-fs/quota
+	)
+	vzmigrate? (
+		app-arch/tar[xattr,acl]
 		net-misc/openssh
 		net-misc/rsync[xattr,acl]
-		app-arch/tar[xattr,acl]
 		net-misc/bridge-utils
 		virtual/awk
-			)
-		virtual/udev
-		sys-apps/attr
-		"
+	)
+"
+DEPEND="${RDEPEND}"
 
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	"
+PATCHES=(
+	"${FILESDIR}"/${P}-glibc225.patch
+	"${FILESDIR}"/${P}-glibc225-2.patch
+)
 
 src_prepare() {
 	# Set default OSTEMPLATE on gentoo
@@ -46,13 +50,10 @@ src_prepare() {
 	# Set proper udev directory
 	sed -i -e "s:/lib/udev:$(get_udevdir):" src/lib/dev.c || die 'sed on src/lib/dev.c failed'
 
-	epatch "${FILESDIR}/${P}-glibc225.patch"
-	epatch "${FILESDIR}/${P}-glibc225-2.patch"
-	epatch_user
+	default
 }
 
 src_configure() {
-
 	econf \
 		--localstatedir=/var \
 		--enable-udev \
@@ -64,11 +65,10 @@ src_configure() {
 }
 
 src_install() {
-
 	emake DESTDIR="${D}" udevdir="$(get_udevdir)"/rules.d install install-gentoo
 
 	# install the bash-completion script into the right location
-	rm -rf "${ED}"/etc/bash_completion.d
+	rm -rf "${ED}"/etc/bash_completion.d || die
 	newbashcomp etc/bash_completion.d/vzctl.sh ${PN}
 
 	# We need to keep some dirs
@@ -77,12 +77,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo "This vzctl release required kernel above 2.6.32.92"
-
-	einfo "If you have checkpoint suspend/restore feature in vanilla kernel"
-	einfo "please install "sys-process/criu" "
-	einfo "This is experimental and not stable ( in gentoo ) now"
+	einfo "This vzctl release requires a kernel above 2.6.32.92"
 
-	einfo "if you have work with  .xz compressed template, please install app-arch/xz-utils"
-	einfo "if you have check signature downloaded template - install gpg "
+	optfeature "Checkpoint suspend/restore support (experimental)" sys-process/criu
+	optfeature "Compressed .xz templates" app-arch/xz-utils
+	optfeature "Signed templates" app-crypt/gnupg
 }