1 |
commit: d7c62fe7c2b60209e25aec8da5779df8b4161028 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Mar 30 21:44:53 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Mar 30 21:45:46 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7c62fe7 |
7 |
|
8 |
sys-cluster/vzctl: port to EAPI 7, drop {eutils, base}.eclass, add optfeature |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
sys-cluster/vzctl/vzctl-4.9.4.ebuild | 69 +++++++++++++++++------------------- |
13 |
1 file changed, 33 insertions(+), 36 deletions(-) |
14 |
|
15 |
diff --git a/sys-cluster/vzctl/vzctl-4.9.4.ebuild b/sys-cluster/vzctl/vzctl-4.9.4.ebuild |
16 |
index 97b9d64eb6e..7c9536d7182 100644 |
17 |
--- a/sys-cluster/vzctl/vzctl-4.9.4.ebuild |
18 |
+++ b/sys-cluster/vzctl/vzctl-4.9.4.ebuild |
19 |
@@ -1,9 +1,9 @@ |
20 |
-# Copyright 1999-2019 Gentoo Authors |
21 |
+# Copyright 1999-2021 Gentoo Authors |
22 |
# Distributed under the terms of the GNU General Public License v2 |
23 |
|
24 |
-EAPI="5" |
25 |
+EAPI=7 |
26 |
|
27 |
-inherit base bash-completion-r1 eutils toolchain-funcs udev |
28 |
+inherit bash-completion-r1 toolchain-funcs optfeature udev |
29 |
|
30 |
DESCRIPTION="OpenVZ ConTainers control utility" |
31 |
HOMEPAGE="http://openvz.org/" |
32 |
@@ -14,31 +14,35 @@ SLOT="0" |
33 |
KEYWORDS="amd64 ~ppc64 x86" |
34 |
IUSE="+ploop +vzmigrate" |
35 |
|
36 |
-RDEPEND="net-firewall/iptables |
37 |
- sys-apps/ed |
38 |
- >=sys-apps/iproute2-3.3.0 |
39 |
- >=sys-fs/vzquota-3.1 |
40 |
- ploop? ( |
41 |
- >=sys-cluster/ploop-1.13 |
42 |
- sys-block/parted |
43 |
- sys-fs/quota |
44 |
- dev-libs/libxml2 |
45 |
- ) |
46 |
- >=dev-libs/libcgroup-0.38 |
47 |
- vzmigrate? ( |
48 |
+BDEPEND="virtual/pkgconfig" |
49 |
+RDEPEND=" |
50 |
+ >=dev-libs/libcgroup-0.38 |
51 |
+ net-firewall/iptables |
52 |
+ sys-apps/attr |
53 |
+ sys-apps/ed |
54 |
+ >=sys-apps/iproute2-3.3.0 |
55 |
+ >=sys-fs/vzquota-3.1 |
56 |
+ virtual/udev |
57 |
+ ploop? ( |
58 |
+ dev-libs/libxml2 |
59 |
+ sys-block/parted |
60 |
+ >=sys-cluster/ploop-1.13 |
61 |
+ sys-fs/quota |
62 |
+ ) |
63 |
+ vzmigrate? ( |
64 |
+ app-arch/tar[xattr,acl] |
65 |
net-misc/openssh |
66 |
net-misc/rsync[xattr,acl] |
67 |
- app-arch/tar[xattr,acl] |
68 |
net-misc/bridge-utils |
69 |
virtual/awk |
70 |
- ) |
71 |
- virtual/udev |
72 |
- sys-apps/attr |
73 |
- " |
74 |
+ ) |
75 |
+" |
76 |
+DEPEND="${RDEPEND}" |
77 |
|
78 |
-DEPEND="${RDEPEND} |
79 |
- virtual/pkgconfig |
80 |
- " |
81 |
+PATCHES=( |
82 |
+ "${FILESDIR}"/${P}-glibc225.patch |
83 |
+ "${FILESDIR}"/${P}-glibc225-2.patch |
84 |
+) |
85 |
|
86 |
src_prepare() { |
87 |
# Set default OSTEMPLATE on gentoo |
88 |
@@ -46,13 +50,10 @@ src_prepare() { |
89 |
# Set proper udev directory |
90 |
sed -i -e "s:/lib/udev:$(get_udevdir):" src/lib/dev.c || die 'sed on src/lib/dev.c failed' |
91 |
|
92 |
- epatch "${FILESDIR}/${P}-glibc225.patch" |
93 |
- epatch "${FILESDIR}/${P}-glibc225-2.patch" |
94 |
- epatch_user |
95 |
+ default |
96 |
} |
97 |
|
98 |
src_configure() { |
99 |
- |
100 |
econf \ |
101 |
--localstatedir=/var \ |
102 |
--enable-udev \ |
103 |
@@ -64,11 +65,10 @@ src_configure() { |
104 |
} |
105 |
|
106 |
src_install() { |
107 |
- |
108 |
emake DESTDIR="${D}" udevdir="$(get_udevdir)"/rules.d install install-gentoo |
109 |
|
110 |
# install the bash-completion script into the right location |
111 |
- rm -rf "${ED}"/etc/bash_completion.d |
112 |
+ rm -rf "${ED}"/etc/bash_completion.d || die |
113 |
newbashcomp etc/bash_completion.d/vzctl.sh ${PN} |
114 |
|
115 |
# We need to keep some dirs |
116 |
@@ -77,12 +77,9 @@ src_install() { |
117 |
} |
118 |
|
119 |
pkg_postinst() { |
120 |
- einfo "This vzctl release required kernel above 2.6.32.92" |
121 |
- |
122 |
- einfo "If you have checkpoint suspend/restore feature in vanilla kernel" |
123 |
- einfo "please install "sys-process/criu" " |
124 |
- einfo "This is experimental and not stable ( in gentoo ) now" |
125 |
+ einfo "This vzctl release requires a kernel above 2.6.32.92" |
126 |
|
127 |
- einfo "if you have work with .xz compressed template, please install app-arch/xz-utils" |
128 |
- einfo "if you have check signature downloaded template - install gpg " |
129 |
+ optfeature "Checkpoint suspend/restore support (experimental)" sys-process/criu |
130 |
+ optfeature "Compressed .xz templates" app-arch/xz-utils |
131 |
+ optfeature "Signed templates" app-crypt/gnupg |
132 |
} |