1 |
commit: 8a409b249524f5c3fa4d7b879ddac956deeab1b1 |
2 |
Author: Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Jan 2 14:40:59 2023 +0000 |
4 |
Commit: Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com> |
5 |
CommitDate: Mon Jan 2 14:40:59 2023 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/user/ssnb.git/commit/?id=8a409b24 |
7 |
|
8 |
Correct issues from bug 885013 |
9 |
|
10 |
Signed-off-by: Samuel Bernardo <samuelbernardo.mail <AT> gmail.com> |
11 |
|
12 |
app-emulation/libvirt/Manifest | 18 - |
13 |
app-emulation/libvirt/files/README.gentoo-r2 | 58 ---- |
14 |
...irt-1.2.16-fix_paths_in_libvirt-guests_sh.patch | 19 - |
15 |
.../files/libvirt-1.3.0-do_not_use_sysconf.patch | 114 ------ |
16 |
.../libvirt/files/libvirt-1.3.4-glibc-2.23.patch | 86 ----- |
17 |
.../files/libvirt-3.1.0-musl-fix-includes.patch | 10 - |
18 |
.../libvirt-3.10.0-fix_paths_for_apparmor.patch | 118 ------- |
19 |
app-emulation/libvirt/files/libvirt-guests.confd | 68 ---- |
20 |
app-emulation/libvirt/files/libvirt-guests.init-r2 | 235 ------------- |
21 |
app-emulation/libvirt/files/libvirtd.confd-r5 | 18 - |
22 |
app-emulation/libvirt/files/libvirtd.init-r16 | 34 -- |
23 |
app-emulation/libvirt/files/libvirtd.service.conf | 10 - |
24 |
app-emulation/libvirt/files/libvirtd.tmpfiles.conf | 1 - |
25 |
app-emulation/libvirt/files/virtlockd.init-r1 | 23 -- |
26 |
app-emulation/libvirt/files/virtlogd.init-r1 | 23 -- |
27 |
app-emulation/libvirt/libvirt-3.10.0-r1.ebuild | 382 --------------------- |
28 |
app-emulation/libvirt/libvirt-9999.ebuild | 379 -------------------- |
29 |
app-emulation/libvirt/metadata.xml | 102 ------ |
30 |
app-emulation/supermin/Manifest | 3 - |
31 |
app-emulation/supermin/metadata.xml | 21 -- |
32 |
app-emulation/supermin/supermin-5.1.18.ebuild | 63 ---- |
33 |
app-emulation/supermin/supermin-9999.ebuild | 1 - |
34 |
media-video/handbrake/Manifest | 7 - |
35 |
.../handbrake/files/handbrake-0.10.3-nolibav.patch | 76 ---- |
36 |
...handbrake-9999-fix-missing-x265-link-flag.patch | 13 - |
37 |
.../files/handbrake-9999-remove-dvdnav-dup.patch | 20 -- |
38 |
.../handbrake-9999-remove-faac-dependency.patch | 84 ----- |
39 |
media-video/handbrake/handbrake-1.0.7.ebuild | 156 --------- |
40 |
media-video/handbrake/metadata.xml | 18 - |
41 |
sys-fs/btrfsmaintenance/ChangeLog | 4 - |
42 |
sys-fs/btrfsmaintenance/Manifest | 4 - |
43 |
.../btrfsmaintenance/btrfsmaintenance-0.3.1.ebuild | 75 ---- |
44 |
.../btrfsmaintenance/btrfsmaintenance-9999.ebuild | 75 ---- |
45 |
sys-fs/btrfsmaintenance/metadata.xml | 7 - |
46 |
sys-fs/zrep/Manifest | 4 +- |
47 |
.../zrep/{zrep-1.8.0.ebuild => zrep-2.0.2.ebuild} | 6 +- |
48 |
sys-fs/zrep/zrep-9999.ebuild | 6 +- |
49 |
37 files changed, 8 insertions(+), 2333 deletions(-) |
50 |
|
51 |
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest |
52 |
deleted file mode 100644 |
53 |
index d339c39..0000000 |
54 |
--- a/app-emulation/libvirt/Manifest |
55 |
+++ /dev/null |
56 |
@@ -1,18 +0,0 @@ |
57 |
-AUX README.gentoo-r2 2094 SHA256 e4360cd1a0ab23180fcc4dc97958f043aedb0b7564f2b7172dbe5e8240c3c247 SHA512 595ede7bb574c7f244a15e430b70f828bc4574b409d4cc37261bf38bfb30cdb31edb6091ff63f6517b281cc11a34eee960ea0330a6ea285dd48fe2288dd67196 WHIRLPOOL 820501bc603a28041eab27221024957a428a59c3edc8eebe4209d984b7f81f1c67da1186f7d402c237dc0a8b4c633266edb2d46255e1305fa4708da8a7be2f96 |
58 |
-AUX libvirt-1.2.16-fix_paths_in_libvirt-guests_sh.patch 641 SHA256 a8417304d8dfd4d042956d33bfb373d61c7c2c0e8ead8c384300bf32f8acee8e SHA512 df9960b80c7dda852e38d992ab31181d79091bd6e1ba88c0b0c1af8a2f2d1445ee95c957df38ab27b452cd2de01d36b88164e665a867ad69c15ca15c18b1d588 WHIRLPOOL 892bc9d14257929718e29671bea2eb44ed25a8ed5f7f4d8ee72c9d82a4e6a96b5da67f43279de29c06d6abe41ab2792b48515c2dea46aa4a452d76e85ebda973 |
59 |
-AUX libvirt-1.3.0-do_not_use_sysconf.patch 4072 SHA256 896d482d3aa9281977e6900e6103848e34a7e4c0479395016fd1d2ff254eb476 SHA512 44428e16cf1998db0bcae1b54d3ba32363a71db3f45f493bd675f6ad7d6bf131667749f33226ab5f40be52e833ec0899bb9202a8f0e150d007c3f7c71a9cf314 WHIRLPOOL 4978b13925c4836d1601217aec9473a62797821275a1c2bab4a7acb80fa3a34a54ed01b3daf91cd78c20622f3be6f6f9214399fc7da63172a5f9e138727b4fcf |
60 |
-AUX libvirt-1.3.4-glibc-2.23.patch 2049 SHA256 8fa125da2a8e6dabf17fc47863597b2b3929d4d4b1e01ace1433a75ac4bc0ba2 SHA512 022b610c2e343c9cb595babcc8b2e5e0e0db1a19d6bfc9babdc817bc1e093ff12ee1c26304c188151fecc32481ffd225d7a3d36324613dd5b4ea7139280629c4 WHIRLPOOL 3cc039820865eafd1ea23eec81c3b4f842fe359e49a85d09925dddd5f8b0228adf62fa908cb345b9df0526ed9eb388f965d70ef99d73edcfaf20c5539fcb4559 |
61 |
-AUX libvirt-3.1.0-musl-fix-includes.patch 221 SHA256 40b1814d2a1d05a987242af46592a74feb612ccb3f064e93984bdad29d9c1fc7 SHA512 876c7dacedcce1d69938779b978b3a23b2f51128f121b4aa53f5f301d7740f90d77f335523210ed492b68b5f7a0b864b25a694ee562fb5e8ab1b6411d3da48e7 WHIRLPOOL d9d7f57cee28f1f6149f6de6f853f08679cbb9b3e82b019ff6046da525c1768ea3f7ef34cf3afa6033e87f80e8f5c74e5f2d129122d8df6edb371e743a3a3af5 |
62 |
-AUX libvirt-3.10.0-fix_paths_for_apparmor.patch 3504 SHA256 b09888e448ec3253ca63a7daae8b19ae1ad85eaa99cb28b1989bae3c7c999a08 SHA512 4fc444f73f69c03c46e21ba51a8ecb9d089fa944ddf22985ca1d595a40535bf2e93f8d76ae64e5abc3b51f5f9007f84dea5e29533629297623abd116b700f6e3 WHIRLPOOL 50664d86f0c6f3d282fc3b7d4c0706fa8e8afb02413b22d3265fb951802b1829f599099502db2487583968f348258c80ca249c9c8f68bcd7965240f5eb4c32d3 |
63 |
-AUX libvirt-guests.confd 2430 SHA256 d5f85bb8c1d2010347f23badc422e98046b97a0066254739b5829fce07837d63 SHA512 78f419a89de7aabaad860903c24f1c070786fc1296d987e61dd537705b0e7f71a46c315888028f3826c3417e42861ca8471788be4ec5695e98427c5f18ae63fc WHIRLPOOL 4f06b9319f52b872f14f86da9aeeafecf176c46755955c7773badd0df239fdd76efaff50921565154fa24896d0e4b07df788e785ed6ff5f2308c0ba0e79a9418 |
64 |
-AUX libvirt-guests.init-r2 5412 SHA256 f78ced5ebe644522c6ce102b3f6bcf932686243a50629559f988548c570cad3a SHA512 0f46ec5776c61d1776248779fa894b1a6d7b98d0eb8e8374b320c785c25d92468f087e350233b9152eb2cd0680f6b334c3a61684dabc7c5b559d3b55fdcb712d WHIRLPOOL 77ce5c6e615c94b437f13f8bfb2689cea7b8231a4aa227e83944fd66793a3daf0ada8c041c358f38c2f676dfc7fb071880df682dcc759f63e8e20f033e141d39 |
65 |
-AUX libvirtd.confd-r5 740 SHA256 4f7fba7e64533868119c0f3355aa22932e163b208397323dc2cd96daadcc4079 SHA512 98f935589dbc5f2a99329f77fdf84c563fa0dc99404b7476603679478d68ce8dbea2c88645251d3c28f59e7bcae124ae632972146e8a8c3e0e9fcbfb27296f91 WHIRLPOOL cc40f10c1ab440efff318f4cac95c0923dfb3309e727d3de4a5dd5cd95181da76a6f1de4ad6740b99d0b65b6bbf5a5128ce24288f77a91268e74d2e8d8e95e49 |
66 |
-AUX libvirtd.init-r16 1093 SHA256 1f875e12cc6ecb1b434bfea774893b84f6602072da0218b654d2ecf79cf2d36d SHA512 5ea4c2f9e48faf2aa8fe7077d075841d610da17e28bcc85c79c55565f286e345339f042090b453e25accf5c405e322e76b6cf846fdfb3e90db3e2d0c2fff4c48 WHIRLPOOL 1de3b7c8fab0ec92d1138f6de9f7ba38087de7094908fc9205d91bfa0bc667d11dff2e113cf393f5508b23badf3a2e524c6f81d5a3b817a7b9d198f0b504332a |
67 |
-AUX libvirtd.service.conf 401 SHA256 1cfb6f7dec5746364d9a4cccddb4b63f8ccd0ebf8bfaa000b13a09962ca24fac SHA512 27adbd104ea87e51d423b057392a0c6726692ad8ee9723f73dc4bfe8eb54069725d64883434424ba810d36992d404d1ba4afe6bcefb866d3d3d92dfd161c2b32 WHIRLPOOL d6b960b7d18bdbaf0ff6dc5ecf29e7d10e22fa7d16933a149d6287c007d864a0e0dd67048c25a038dd5f73c9ea911d2cd49bf21c072b0c7eab1e92be35d8b545 |
68 |
-AUX libvirtd.tmpfiles.conf 36 SHA256 0102a9bbbb6fc9764c2d49933a89d1661b3999aec53c6a66302cb0f21ce9c9fc SHA512 2b1c3c64dd6fa03d8c2ae24e7ce4aa7d754913214542a68a4e99f10fbc251fd23ee26e297a957d7b4b70eec8ef028c41fc915da3a85fbbd16143bb92d1de3aed WHIRLPOOL c51b2059f4eef0ceaf69e11018a6e51299be5aa21a56741366db4fe43a7998388fa6e5bf15d79c52ab66dd69d64c679003a0904c54033c8bdfc04c16bb5b8e4f |
69 |
-AUX virtlockd.init-r1 570 SHA256 23ddea66fb2d85c17c382daa07abfabe7fa57d62406d2ca5df0c755f5dcc3834 SHA512 65a05d406200da9a534df5caa1b9cb2af97f0b03f64e6b4157322975fa754f59ae74fff9ec8301a6c0510e4b75e2b72a78cddf004a76109e18c375e83527cee5 WHIRLPOOL 7959e426986747165ef074ca52b8049aa4120b0206b7532330346552fe5811a46fa71b58e02fcd37e55b872e099ccc8688fcc3f30b2e2316e01a4220806d49b4 |
70 |
-AUX virtlogd.init-r1 569 SHA256 1647c11779fd874bdc115234bae0f0f65278084541473d2825aa9864ad49f939 SHA512 0a3e083e742f9e0d8206ab9a48c63bbd395bdc24e5551e2cbeddffa3fb576a817b73dbafe646c392a35c354d6b65426a9b6f3ce3dcafc30077715e90684968c1 WHIRLPOOL e0fa334c60dac4aa1ff721c3c4e957a688e0a58297cb06249de50dd838c55eee3c1c00fcb4b1c06b74c1fb61c52354889a09bd2793c8623faa120489cac95c3a |
71 |
-DIST libvirt-3.10.0.tar.xz 14952220 SHA256 dff109cae2cc915b3ed5ba7e460502b85eb9a5058cda4f356d7bb7b1e3196b0e SHA512 c2dfe0629bd90e8d7ae85f2a31dc027475c9614d497063fec6905aa2da4db68ce96e8f20d3290b0c0542b6ea31c85700b2727008bac65997ff0901b45f1b7260 WHIRLPOOL b2eeee1a75fbd8d3878fb646ebc432abdb53568741cf0efbdd9a7b78035e5d8a50720890861c7e8b11e1ec92a9e00b3142f52d7799118255dffedba90245a0c6 |
72 |
-EBUILD libvirt-3.10.0-r1.ebuild 9635 SHA256 785314548039f033b8c1d76c25059e8e5c449e623415618eacd021b616b30b99 SHA512 ac6dd002208619d19d058249df5c4d0f1197c4d4f925b19bd0fcdf4fcde9111f46d51ca71999b55b1249cd3f6307a73f1af119aadfa0243823519eb114dc19f5 WHIRLPOOL e8c1e60a0f205b1f2ec21a99fb8c2df60809b92a80ea741126ba57f37c7c2b1303b44be26d97c5e6c0fb084c8073a496eb8474fa06f0a0b9ddfff3ba30f78261 |
73 |
-EBUILD libvirt-9999.ebuild 9506 SHA256 d5af8cfea0f8f40cb4c1e474a64709440cd5fc31672af9be7bc607fcec880f04 SHA512 669472ae963372efc043f20dcf3a38d06fcdf45eb80ca13c7b76e6fed35590255206731ebd4a42b95017399bba309d49e734c14c07c9b5dc22cc7ae7819dbac2 WHIRLPOOL 1158f1338973b99a1dc518aae73e50015fff4cc2a7d8afee086784525571b2668b76dd5f6eaf5391d8a80d6817f4d8c5caf363d93e758b89202ee73e4c047f43 |
74 |
-MISC metadata.xml 3779 SHA256 4e9be58ed2f7a2426e897aa3530aaeadff88477cabf988545e90d947cccfb859 SHA512 071cc7193ce6b2d6e1a1557f0977697bf7edc07b947fe51cc126975b2bbe7e64079db154112b99bbe88c0c237f2252f4608a7d31c9140b7afd27b00f5dce5a02 WHIRLPOOL 72523ef832a3edb2bcc69154680ea085c5c6f77a12b33be42d558490c499cbbb6edf8161b8b399d3f72b700a165e78669034ad2fd04e237ffae845f7a29396ba |
75 |
|
76 |
diff --git a/app-emulation/libvirt/files/README.gentoo-r2 b/app-emulation/libvirt/files/README.gentoo-r2 |
77 |
deleted file mode 100644 |
78 |
index 1c086c1..0000000 |
79 |
--- a/app-emulation/libvirt/files/README.gentoo-r2 |
80 |
+++ /dev/null |
81 |
@@ -1,58 +0,0 @@ |
82 |
-Important: The openrc libvirtd init script is now broken up into two |
83 |
-separate services: libvirtd, that solely handles the daemon, and |
84 |
-libvirt-guests, that takes care of clients during shutdown/restart of the |
85 |
-host. In order to reenable client handling, edit /etc/conf.d/libvirt-guests |
86 |
-and enable the service and start it: |
87 |
- |
88 |
- $ rc-update add libvirt-guests |
89 |
- $ service libvirt-guests start |
90 |
- |
91 |
- |
92 |
-For the basic networking support (bridged and routed networks) you don't |
93 |
-need any extra software. For more complex network modes including but not |
94 |
-limited to NATed network, you can enable the 'virt-network' USE flag. It |
95 |
-will pull in required runtime dependencies |
96 |
- |
97 |
- |
98 |
-If you are using dnsmasq on your system, you will have to configure |
99 |
-/etc/dnsmasq.conf to enable the following settings: |
100 |
- |
101 |
- bind-interfaces |
102 |
- interface or except-interface |
103 |
- |
104 |
-Otherwise you might have issues with your existing DNS server. |
105 |
- |
106 |
- |
107 |
-For openrc users: |
108 |
- |
109 |
- Please use /etc/conf.d/libvirtd to control the '--listen' parameter for |
110 |
- libvirtd. |
111 |
- |
112 |
- Use /etc/init.d/libvirt-guests to manage clients on restart/shutdown of |
113 |
- the host. The default configuration will suspend and resume running kvm |
114 |
- guests with 'managedsave'. This behavior can be changed under |
115 |
- /etc/conf.d/libvirt-guests |
116 |
- |
117 |
- |
118 |
-For systemd users: |
119 |
- |
120 |
- Please use /etc/systemd/system/libvirtd.service.d/00gentoo.conf |
121 |
- to control the '--listen' parameter for libvirtd. |
122 |
- |
123 |
- The configuration for the 'libvirt-guests.service' is found under |
124 |
- /etc/libvirt/libvirt-guests.conf" |
125 |
- |
126 |
- |
127 |
-If you have built libvirt with policykit support, a new group "libvirt" has |
128 |
-been created. Simply add a user to the libvirt group in order to grant |
129 |
-administrative access to libvirtd. Alternatively, drop a custom policykit |
130 |
-rule into /etc/polkit-1/rules.d. |
131 |
- |
132 |
-If you have built libvirt without policykit support (USE=-policykit), you |
133 |
-must change the unix sock group and/or perms in /etc/libvirt/libvirtd.conf |
134 |
-in order to allow normal users to connect to libvirtd. |
135 |
- |
136 |
- |
137 |
-If libvirtd is built with USE=caps, libvirt will now start qemu/kvm VMs |
138 |
-with non-root privileges. Ensure any resources your VMs use are accessible |
139 |
-by qemu:qemu. |
140 |
|
141 |
diff --git a/app-emulation/libvirt/files/libvirt-1.2.16-fix_paths_in_libvirt-guests_sh.patch b/app-emulation/libvirt/files/libvirt-1.2.16-fix_paths_in_libvirt-guests_sh.patch |
142 |
deleted file mode 100644 |
143 |
index ddedb1f..0000000 |
144 |
--- a/app-emulation/libvirt/files/libvirt-1.2.16-fix_paths_in_libvirt-guests_sh.patch |
145 |
+++ /dev/null |
146 |
@@ -1,19 +0,0 @@ |
147 |
-diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in |
148 |
-index 7f74b85..ea58119 100644 |
149 |
---- a/tools/libvirt-guests.sh.in |
150 |
-+++ b/tools/libvirt-guests.sh.in |
151 |
-@@ -41,11 +41,11 @@ CONNECT_RETRIES=10 |
152 |
- RETRIES_SLEEP=1 |
153 |
- SYNC_TIME=0 |
154 |
- |
155 |
--test -f "$sysconfdir"/sysconfig/libvirt-guests && |
156 |
-- . "$sysconfdir"/sysconfig/libvirt-guests |
157 |
-+test -f "$sysconfdir"/libvirt/libvirt-guests.conf && |
158 |
-+ . "$sysconfdir"/libvirt/libvirt-guests.conf |
159 |
- |
160 |
- LISTFILE="$localstatedir"/lib/libvirt/libvirt-guests |
161 |
--VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/subsys/libvirt-guests |
162 |
-+VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/libvirt-guests |
163 |
- |
164 |
- RETVAL=0 |
165 |
- |
166 |
|
167 |
diff --git a/app-emulation/libvirt/files/libvirt-1.3.0-do_not_use_sysconf.patch b/app-emulation/libvirt/files/libvirt-1.3.0-do_not_use_sysconf.patch |
168 |
deleted file mode 100644 |
169 |
index 47010c4..0000000 |
170 |
--- a/app-emulation/libvirt/files/libvirt-1.3.0-do_not_use_sysconf.patch |
171 |
+++ /dev/null |
172 |
@@ -1,114 +0,0 @@ |
173 |
-diff --git a/daemon/Makefile.am b/daemon/Makefile.am |
174 |
-index be1b5a9..5ce0e1e 100644 |
175 |
---- a/daemon/Makefile.am |
176 |
-+++ b/daemon/Makefile.am |
177 |
-@@ -385,9 +385,7 @@ uninstall-logrotate: |
178 |
- rmdir $(DESTDIR)$(sysconfdir)/logrotate.d || : |
179 |
- |
180 |
- install-sysconfig: |
181 |
-- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig |
182 |
-- $(INSTALL_DATA) $(srcdir)/libvirtd.sysconf \ |
183 |
-- $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd |
184 |
-+ |
185 |
- uninstall-sysconfig: |
186 |
- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd |
187 |
- rmdir $(DESTDIR)$(sysconfdir)/sysconfig || : |
188 |
-diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in |
189 |
-index 608221c..63708f4 100644 |
190 |
---- a/daemon/libvirtd.service.in |
191 |
-+++ b/daemon/libvirtd.service.in |
192 |
-@@ -12,8 +12,7 @@ Documentation=http://libvirt.org |
193 |
- |
194 |
- [Service] |
195 |
- Type=notify |
196 |
--EnvironmentFile=-/etc/sysconfig/libvirtd |
197 |
--ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS |
198 |
-+ExecStart=@sbindir@/libvirtd |
199 |
- ExecReload=/bin/kill -HUP $MAINPID |
200 |
- KillMode=process |
201 |
- Restart=on-failure |
202 |
-diff --git a/src/Makefile.am b/src/Makefile.am |
203 |
-index 7219f7c..c474a23 100644 |
204 |
---- a/src/Makefile.am |
205 |
-+++ b/src/Makefile.am |
206 |
-@@ -2473,11 +2473,6 @@ EXTRA_DIST += \ |
207 |
- logging/virtlogd.sysconf |
208 |
- |
209 |
- install-sysconfig: |
210 |
-- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig |
211 |
-- $(INSTALL_DATA) $(srcdir)/locking/virtlockd.sysconf \ |
212 |
-- $(DESTDIR)$(sysconfdir)/sysconfig/virtlockd |
213 |
-- $(INSTALL_DATA) $(srcdir)/logging/virtlogd.sysconf \ |
214 |
-- $(DESTDIR)$(sysconfdir)/sysconfig/virtlogd |
215 |
- |
216 |
- uninstall-sysconfig: |
217 |
- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/virtlogd |
218 |
-diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in |
219 |
-index 57089b0..ace0c83 100644 |
220 |
---- a/src/locking/virtlockd.service.in |
221 |
-+++ b/src/locking/virtlockd.service.in |
222 |
-@@ -5,8 +5,7 @@ Documentation=man:virtlockd(8) |
223 |
- Documentation=http://libvirt.org |
224 |
- |
225 |
- [Service] |
226 |
--EnvironmentFile=-/etc/sysconfig/virtlockd |
227 |
--ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS |
228 |
-+ExecStart=@sbindir@/virtlockd |
229 |
- ExecReload=/bin/kill -USR1 $MAINPID |
230 |
- # Loosing the locks is a really bad thing that will |
231 |
- # cause the machine to be fenced (rebooted), so make |
232 |
-diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in |
233 |
-index a264d3a..b467884 100644 |
234 |
---- a/src/logging/virtlogd.service.in |
235 |
-+++ b/src/logging/virtlogd.service.in |
236 |
-@@ -5,8 +5,7 @@ Documentation=man:virtlogd(8) |
237 |
- Documentation=http://libvirt.org |
238 |
- |
239 |
- [Service] |
240 |
--EnvironmentFile=-/etc/sysconfig/virtlogd |
241 |
--ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS |
242 |
-+ExecStart=@sbindir@/virtlogd |
243 |
- ExecReload=/bin/kill -USR1 $MAINPID |
244 |
- # Loosing the logs is a really bad thing that will |
245 |
- # cause the machine to be fenced (rebooted), so make |
246 |
-diff --git a/tools/Makefile.am b/tools/Makefile.am |
247 |
-index 9180564..e72d5f4 100644 |
248 |
---- a/tools/Makefile.am |
249 |
-+++ b/tools/Makefile.am |
250 |
-@@ -293,7 +293,7 @@ uninstall-local: uninstall-init uninstall-systemd |
251 |
- install-sysconfig: |
252 |
- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig |
253 |
- $(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \ |
254 |
-- $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests |
255 |
-+ $(DESTDIR)$(sysconfdir)/libvirt/libvirt-guests.conf |
256 |
- |
257 |
- uninstall-sysconfig: |
258 |
- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests |
259 |
-diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in |
260 |
-index c31f663..71cb79d 100644 |
261 |
---- a/tools/libvirt-guests.service.in |
262 |
-+++ b/tools/libvirt-guests.service.in |
263 |
-@@ -5,7 +5,7 @@ Documentation=man:libvirtd(8) |
264 |
- Documentation=http://libvirt.org |
265 |
- |
266 |
- [Service] |
267 |
--EnvironmentFile=-/etc/sysconfig/libvirt-guests |
268 |
-+EnvironmentFile=-/etc/libvirt/libvirt-guests.conf |
269 |
- # Hack just call traditional service until we factor |
270 |
- # out the code |
271 |
- ExecStart=@libexecdir@/libvirt-guests.sh start |
272 |
-diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf |
273 |
-index 2770056..accd4f5 100644 |
274 |
---- a/tools/libvirt-guests.sysconf |
275 |
-+++ b/tools/libvirt-guests.sysconf |
276 |
-@@ -1,3 +1,10 @@ |
277 |
-+# |
278 |
-+# Warning: This configuration file is only sourced by the systemd |
279 |
-+# libvirt-guests.service unit. The coresponding openrc facility is in |
280 |
-+# /etc/init.d/libvirtd and /etc/conf.d/libvirtd |
281 |
-+# |
282 |
-+ |
283 |
-+ |
284 |
- # URIs to check for running guests |
285 |
- # example: URIS='default xen:/// vbox+tcp://host/system lxc:///' |
286 |
- #URIS=default |
287 |
|
288 |
diff --git a/app-emulation/libvirt/files/libvirt-1.3.4-glibc-2.23.patch b/app-emulation/libvirt/files/libvirt-1.3.4-glibc-2.23.patch |
289 |
deleted file mode 100644 |
290 |
index adeff5c..0000000 |
291 |
--- a/app-emulation/libvirt/files/libvirt-1.3.4-glibc-2.23.patch |
292 |
+++ /dev/null |
293 |
@@ -1,86 +0,0 @@ |
294 |
-get major/minor macros by using AC_HEADER_MAJOR |
295 |
- |
296 |
-https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Particular-Headers.html#AC_HEADER_MAJOR |
297 |
- |
298 |
-https://bugs.gentoo.org/579960 |
299 |
-diff --git a/configure.ac b/configure.ac |
300 |
-index 93d347c..1e7ee51 100644 |
301 |
---- a/configure.ac |
302 |
-+++ b/configure.ac |
303 |
-@@ -282,2 +282,5 @@ AC_CHECK_SIZEOF([long]) |
304 |
- |
305 |
-+dnl detect system-specific headers for major()/minor() |
306 |
-+AC_HEADER_MAJOR |
307 |
-+ |
308 |
- dnl Availability of various common functions (non-fatal if missing), |
309 |
-diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c |
310 |
-index bd2eeb6..74b2487 100644 |
311 |
---- a/src/conf/domain_audit.c |
312 |
-+++ b/src/conf/domain_audit.c |
313 |
-@@ -28,2 +28,9 @@ |
314 |
- |
315 |
-+#ifdef MAJOR_IN_MKDEV |
316 |
-+# include <sys/mkdev.h> |
317 |
-+#endif |
318 |
-+#ifdef MAJOR_IN_SYSMACROS |
319 |
-+# include <sys/sysmacros.h> |
320 |
-+#endif |
321 |
-+ |
322 |
- #include "domain_audit.h" |
323 |
-diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c |
324 |
-index 76bef82..49c0648 100644 |
325 |
---- a/src/lxc/lxc_controller.c |
326 |
-+++ b/src/lxc/lxc_controller.c |
327 |
-@@ -48,2 +48,9 @@ |
328 |
- |
329 |
-+#ifdef MAJOR_IN_MKDEV |
330 |
-+# include <sys/mkdev.h> |
331 |
-+#endif |
332 |
-+#ifdef MAJOR_IN_SYSMACROS |
333 |
-+# include <sys/sysmacros.h> |
334 |
-+#endif |
335 |
-+ |
336 |
- #include "virerror.h" |
337 |
-diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c |
338 |
-index 3c6c839..983cd21 100644 |
339 |
---- a/src/lxc/lxc_driver.c |
340 |
-+++ b/src/lxc/lxc_driver.c |
341 |
-@@ -38,2 +38,9 @@ |
342 |
- |
343 |
-+#ifdef MAJOR_IN_MKDEV |
344 |
-+# include <sys/mkdev.h> |
345 |
-+#endif |
346 |
-+#ifdef MAJOR_IN_SYSMACROS |
347 |
-+# include <sys/sysmacros.h> |
348 |
-+#endif |
349 |
-+ |
350 |
- #include "virerror.h" |
351 |
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c |
352 |
-index 38398fd..4b45458 100644 |
353 |
---- a/src/util/vircgroup.c |
354 |
-+++ b/src/util/vircgroup.c |
355 |
-@@ -31,2 +31,10 @@ |
356 |
- #endif |
357 |
-+ |
358 |
-+#ifdef MAJOR_IN_MKDEV |
359 |
-+# include <sys/mkdev.h> |
360 |
-+#endif |
361 |
-+#ifdef MAJOR_IN_SYSMACROS |
362 |
-+# include <sys/sysmacros.h> |
363 |
-+#endif |
364 |
-+ |
365 |
- #include <fcntl.h> |
366 |
-diff --git a/src/util/virutil.c b/src/util/virutil.c |
367 |
-index bb9604a..9840a9e 100644 |
368 |
---- a/src/util/virutil.c |
369 |
-+++ b/src/util/virutil.c |
370 |
-@@ -68,2 +68,9 @@ |
371 |
- |
372 |
-+#ifdef MAJOR_IN_MKDEV |
373 |
-+# include <sys/mkdev.h> |
374 |
-+#endif |
375 |
-+#ifdef MAJOR_IN_SYSMACROS |
376 |
-+# include <sys/sysmacros.h> |
377 |
-+#endif |
378 |
-+ |
379 |
- #include "c-ctype.h" |
380 |
|
381 |
diff --git a/app-emulation/libvirt/files/libvirt-3.1.0-musl-fix-includes.patch b/app-emulation/libvirt/files/libvirt-3.1.0-musl-fix-includes.patch |
382 |
deleted file mode 100644 |
383 |
index 70fb168..0000000 |
384 |
--- a/app-emulation/libvirt/files/libvirt-3.1.0-musl-fix-includes.patch |
385 |
+++ /dev/null |
386 |
@@ -1,10 +0,0 @@ |
387 |
---- a/src/storage/storage_backend_fs.c |
388 |
-+++ b/src/storage/storage_backend_fs.c |
389 |
-@@ -30,6 +30,7 @@ |
390 |
- #include <dirent.h> |
391 |
- #include <errno.h> |
392 |
- #include <fcntl.h> |
393 |
-+#include <paths.h> |
394 |
- #include <unistd.h> |
395 |
- #include <string.h> |
396 |
- |
397 |
|
398 |
diff --git a/app-emulation/libvirt/files/libvirt-3.10.0-fix_paths_for_apparmor.patch b/app-emulation/libvirt/files/libvirt-3.10.0-fix_paths_for_apparmor.patch |
399 |
deleted file mode 100644 |
400 |
index 0e386c1..0000000 |
401 |
--- a/app-emulation/libvirt/files/libvirt-3.10.0-fix_paths_for_apparmor.patch |
402 |
+++ /dev/null |
403 |
@@ -1,118 +0,0 @@ |
404 |
-diff --git a/examples/Makefile.am b/examples/Makefile.am |
405 |
-index ef2f79d..d8cdb9b 100644 |
406 |
---- a/examples/Makefile.am |
407 |
-+++ b/examples/Makefile.am |
408 |
-@@ -23,7 +23,7 @@ EXTRA_DIST = \ |
409 |
- apparmor/TEMPLATE.lxc \ |
410 |
- apparmor/libvirt-qemu \ |
411 |
- apparmor/libvirt-lxc \ |
412 |
-- apparmor/usr.lib.libvirt.virt-aa-helper \ |
413 |
-+ apparmor/usr.libexec.virt-aa-helper \ |
414 |
- apparmor/usr.sbin.libvirtd \ |
415 |
- lxcconvert/virt-lxc-convert \ |
416 |
- polkit/libvirt-acl.rules \ |
417 |
-@@ -70,7 +70,7 @@ admin_logging_SOURCES = admin/logging.c |
418 |
- if WITH_APPARMOR_PROFILES |
419 |
- apparmordir = $(sysconfdir)/apparmor.d/ |
420 |
- apparmor_DATA = \ |
421 |
-- apparmor/usr.lib.libvirt.virt-aa-helper \ |
422 |
-+ apparmor/usr.libexec.virt-aa-helper \ |
423 |
- apparmor/usr.sbin.libvirtd \ |
424 |
- $(NULL) |
425 |
- |
426 |
-diff --git a/examples/apparmor/libvirt-qemu b/examples/apparmor/libvirt-qemu |
427 |
-index d4fad85..0b22009 100644 |
428 |
---- a/examples/apparmor/libvirt-qemu |
429 |
-+++ b/examples/apparmor/libvirt-qemu |
430 |
-@@ -86,6 +86,8 @@ |
431 |
- /usr/share/AAVMF/** r, |
432 |
- /usr/share/qemu-efi/** r, |
433 |
- /usr/share/slof/** r, |
434 |
-+ /usr/share/seavgabios/** r, |
435 |
-+ /usr/share/edk2-ovmf/** r, |
436 |
- |
437 |
- # access PKI infrastructure |
438 |
- /etc/pki/libvirt-vnc/** r, |
439 |
-diff --git a/examples/apparmor/usr.lib.libvirt.virt-aa-helper b/examples/apparmor/usr.lib.libvirt.virt-aa-helper |
440 |
-deleted file mode 100644 |
441 |
-index bd6181d..0000000 |
442 |
---- a/examples/apparmor/usr.lib.libvirt.virt-aa-helper |
443 |
-+++ /dev/null |
444 |
-@@ -1,60 +0,0 @@ |
445 |
--# Last Modified: Mon Apr 5 15:10:27 2010 |
446 |
--#include <tunables/global> |
447 |
-- |
448 |
--profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper { |
449 |
-- #include <abstractions/base> |
450 |
-- |
451 |
-- # needed for searching directories |
452 |
-- capability dac_override, |
453 |
-- capability dac_read_search, |
454 |
-- |
455 |
-- # needed for when disk is on a network filesystem |
456 |
-- network inet, |
457 |
-- network inet6, |
458 |
-- |
459 |
-- deny @{PROC}/[0-9]*/mounts r, |
460 |
-- @{PROC}/[0-9]*/net/psched r, |
461 |
-- owner @{PROC}/[0-9]*/status r, |
462 |
-- @{PROC}/filesystems r, |
463 |
-- |
464 |
-- /etc/libnl-3/classid r, |
465 |
-- |
466 |
-- # for hostdev |
467 |
-- /sys/devices/ r, |
468 |
-- /sys/devices/** r, |
469 |
-- deny /dev/sd* r, |
470 |
-- deny /dev/vd* r, |
471 |
-- deny /dev/dm-* r, |
472 |
-- deny /dev/drbd[0-9]* r, |
473 |
-- deny /dev/dasd* r, |
474 |
-- deny /dev/nvme* r, |
475 |
-- deny /dev/zd[0-9]* r, |
476 |
-- deny /dev/mapper/ r, |
477 |
-- deny /dev/mapper/* r, |
478 |
-- |
479 |
-- /usr/{lib,lib64}/libvirt/virt-aa-helper mr, |
480 |
-- /{usr/,}sbin/apparmor_parser Ux, |
481 |
-- |
482 |
-- /etc/apparmor.d/libvirt/* r, |
483 |
-- /etc/apparmor.d/libvirt/libvirt-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]* rw, |
484 |
-- |
485 |
-- # for backingstore -- allow access to non-hidden files in @{HOME} as well |
486 |
-- # as storage pools |
487 |
-- audit deny @{HOME}/.* mrwkl, |
488 |
-- audit deny @{HOME}/.*/ rw, |
489 |
-- audit deny @{HOME}/.*/** mrwkl, |
490 |
-- audit deny @{HOME}/bin/ rw, |
491 |
-- audit deny @{HOME}/bin/** mrwkl, |
492 |
-- @{HOME}/ r, |
493 |
-- @{HOME}/** r, |
494 |
-- /var/lib/libvirt/images/ r, |
495 |
-- /var/lib/libvirt/images/** r, |
496 |
-- /{media,mnt,opt,srv}/** r, |
497 |
-- |
498 |
-- /**.img r, |
499 |
-- /**.qcow{,2} r, |
500 |
-- /**.qed r, |
501 |
-- /**.vmdk r, |
502 |
-- /**.[iI][sS][oO] r, |
503 |
-- /**/disk{,.*} r, |
504 |
--} |
505 |
-diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd |
506 |
-index 8d61d15..656a559 100644 |
507 |
---- a/examples/apparmor/usr.sbin.libvirtd |
508 |
-+++ b/examples/apparmor/usr.sbin.libvirtd |
509 |
-@@ -84,8 +84,10 @@ |
510 |
- audit deny /sys/kernel/security/apparmor/.* rwxl, |
511 |
- /sys/kernel/security/apparmor/profiles r, |
512 |
- /usr/{lib,lib64}/libvirt/* PUxr, |
513 |
-- /usr/{lib,lib64}/libvirt/libvirt_parthelper ix, |
514 |
-- /usr/{lib,lib64}/libvirt/libvirt_iohelper ix, |
515 |
-+ /usr/libexec/virt-aa-helper PUxr, |
516 |
-+ /usr/libexec/libvirt_lxc PUxr, |
517 |
-+ /usr/libexec/libvirt_parthelper ix, |
518 |
-+ /usr/libexec/libvirt_iohelper ix, |
519 |
- /etc/libvirt/hooks/** rmix, |
520 |
- /etc/xen/scripts/** rmix, |
521 |
- |
522 |
|
523 |
diff --git a/app-emulation/libvirt/files/libvirt-guests.confd b/app-emulation/libvirt/files/libvirt-guests.confd |
524 |
deleted file mode 100644 |
525 |
index ed2ce58..0000000 |
526 |
--- a/app-emulation/libvirt/files/libvirt-guests.confd |
527 |
+++ /dev/null |
528 |
@@ -1,68 +0,0 @@ |
529 |
-# /etc/conf.d/libvirtd |
530 |
- |
531 |
-# LIBVIRT_URIS |
532 |
-# space separated list of libvirt URIs to communicate with to start/stop guests |
533 |
-# Valid values are anything that can be passed to 'virsh connect' |
534 |
- |
535 |
-#LIBVIRT_URIS="qemu:///system" |
536 |
- |
537 |
- |
538 |
-# LIBVIRT_SHUTDOWN |
539 |
-# Valid options: |
540 |
-# * managedsave - Performs a state save external to the VM (for hypervisors |
541 |
-# supporting this operation). qemu-kvm will stop the CPU |
542 |
-# and save off all state to a separate file. When the |
543 |
-# machine is started again, it will resume like nothing |
544 |
-# ever happened. This is guarenteed to always successfully |
545 |
-# stop your machine and restart it. |
546 |
-# |
547 |
-# * shutdown - Sends an ACPI shutdown (think of this as a request to |
548 |
-# your guest to shutdown). There is no way to distinguish |
549 |
-# between guests that are ignoring the shutdown request or |
550 |
-# are stuck or are taking a long time to shutdown. We will |
551 |
-# wait LIBVIRT_MAXWAIT seconds before yanking the power |
552 |
-# out. |
553 |
-# |
554 |
-# * destroy - Immediately stop all running guests. Use with caution as |
555 |
-# this can leave the guest in a corrupted state and might |
556 |
-# lead to data loss. |
557 |
-# |
558 |
- |
559 |
-#LIBVIRT_SHUTDOWN="managedsave" |
560 |
- |
561 |
- |
562 |
-# LIBVIRT_MAXWAIT |
563 |
-# Timeout in seconds until stopping a guest and "pulling the plug" on the |
564 |
-# guest |
565 |
-# Valid values are any integer over 0 |
566 |
- |
567 |
-#LIBVIRT_MAXWAIT="500" |
568 |
- |
569 |
- |
570 |
-# LIBVIRT_START |
571 |
-# If this value is set to 'no', then guests and networks that were shutdown |
572 |
-# by this script when it was stopped will not be started when it is started |
573 |
-# back up. |
574 |
-# Valid values are yes or no |
575 |
- |
576 |
-#LIBVIRT_START="yes" |
577 |
- |
578 |
- |
579 |
-# LIBVIRT_IGNORE_AUTOSTART |
580 |
-# If the VM is marked for autostart in its XML configuration then we won't |
581 |
-# save its start when the init script is stopped. The result is that when |
582 |
-# the init script starts back up, no attempt will be made to start the VM or |
583 |
-# confirm it is started. |
584 |
-# Valid values are yes or no |
585 |
- |
586 |
-#LIBVIRT_IGNORE_AUTOSTART="no" |
587 |
- |
588 |
- |
589 |
-# LIBVIRT_NET_SHUTDOWN |
590 |
-# If libvirtd created networks for you (e.g. NATed networks) then this init |
591 |
-# script will shut them down for you if this is set to 'yes'. Otherwise, |
592 |
-# the networks will be left running. For this option to be useful you must |
593 |
-# have enabled the 'virt-network' USE flag and have had libvirt create a |
594 |
-# NATed network for you. Valid values: 'yes' or 'no' |
595 |
- |
596 |
-#LIBVIRT_NET_SHUTDOWN="yes" |
597 |
|
598 |
diff --git a/app-emulation/libvirt/files/libvirt-guests.init-r2 b/app-emulation/libvirt/files/libvirt-guests.init-r2 |
599 |
deleted file mode 100644 |
600 |
index 9db6d95..0000000 |
601 |
--- a/app-emulation/libvirt/files/libvirt-guests.init-r2 |
602 |
+++ /dev/null |
603 |
@@ -1,235 +0,0 @@ |
604 |
-#!/sbin/openrc-run |
605 |
- |
606 |
-description="Virtual Machine Management (libvirt) Guests" |
607 |
- |
608 |
-depend() { |
609 |
- use libvirtd |
610 |
-} |
611 |
- |
612 |
-# set the default to QEMU |
613 |
-[ -z "${LIBVIRT_URIS}" ] && LIBVIRT_URIS="qemu:///system" |
614 |
- |
615 |
-# default to suspending the VM via managedsave |
616 |
-case "${LIBVIRT_SHUTDOWN}" in |
617 |
- managedsave|shutdown|destroy) ;; |
618 |
- *) LIBVIRT_SHUTDOWN="managedsave" ;; |
619 |
-esac |
620 |
- |
621 |
-# default to 500 seconds |
622 |
-[ -z ${LIBVIRT_MAXWAIT} ] && LIBVIRT_MAXWAIT=500 |
623 |
- |
624 |
-gueststatefile="/var/lib/libvirt/libvirt-guests.state" |
625 |
-netstatefile="/var/lib/libvirt/libvirt-net.state" |
626 |
- |
627 |
-do_virsh() { |
628 |
- local hvuri=$1 |
629 |
- shift |
630 |
- |
631 |
- # if unset, default to qemu |
632 |
- [ -z ${hvuri} ] && hvuri="qemu:///system" |
633 |
- # if only qemu was supplied then correct the value |
634 |
- [ "xqemu" = x${hvuri} ] && hvuri="qemu:///system" |
635 |
- |
636 |
- # Silence errors because virsh always throws an error about |
637 |
- # not finding the hypervisor version when connecting to libvirtd |
638 |
- # lastly strip the blank line at the end |
639 |
- LC_ALL=C virsh -c ${hvuri} "$@" 2>/dev/null | head -n -1 |
640 |
-} |
641 |
- |
642 |
-libvirtd_dom_list() { |
643 |
- # Only work with domains by their UUIDs |
644 |
- local hvuri=$1 |
645 |
- shift |
646 |
- |
647 |
- do_virsh "${hvuri}" list --uuid $@ |
648 |
-} |
649 |
- |
650 |
-libvirtd_dom_count() { |
651 |
- local hvuri=$1 |
652 |
- shift |
653 |
- |
654 |
- libvirtd_dom_list "${hvuri}" $@ | wc -l |
655 |
-} |
656 |
- |
657 |
-libvirtd_net_list() { |
658 |
- # Only work with networks by their UUIDs |
659 |
- local hvuri=$1 |
660 |
- shift |
661 |
- |
662 |
- do_virsh "${hvuri}" net-list --uuid $@ |
663 |
-} |
664 |
- |
665 |
-libvirtd_net_count() { |
666 |
- local hvuri=$1 |
667 |
- shift |
668 |
- |
669 |
- libvirtd_net_list "${hvuri}" $@ | wc -l |
670 |
-} |
671 |
- |
672 |
-libvirtd_dom_stop() { |
673 |
- # stops all persistent or transient domains for a given URI |
674 |
- # $1 - uri |
675 |
- # $2 - persisent/transient |
676 |
- |
677 |
- local uri=$1 |
678 |
- local persist=$2 |
679 |
- local shutdown_type=${LIBVIRT_SHUTDOWN} |
680 |
- local counter=${LIBVIRT_MAXWAIT} |
681 |
- local dom_name= |
682 |
- local dom_as= |
683 |
- local dom_ids= |
684 |
- local uuid= |
685 |
- local dom_count= |
686 |
- |
687 |
- [ "${persist}" = "--transient" ] && shutdown_type="shutdown" |
688 |
- [ -n "${counter}" ] || counter=500 |
689 |
- |
690 |
- einfo " Shutting down domain(s) ..." |
691 |
- |
692 |
- # grab all persistent or transient domains running |
693 |
- dom_ids=$(libvirtd_dom_list ${uri} ${persist}) |
694 |
- |
695 |
- for uuid in ${dom_ids}; do |
696 |
- # Get the name |
697 |
- dom_name=$(do_virsh ${uri} domname ${uuid}) |
698 |
- einfo " ${dom_name}" |
699 |
- # Get autostart state |
700 |
- dom_as=$(do_virsh ${uri} dominfo ${uuid} | \ |
701 |
- awk '$1 == "Autostart:" { print $2 }') |
702 |
- |
703 |
- if [ "${persist}" = "--persistent" ]; then |
704 |
- # Save our running state only if LIBVIRT_IGNORE_AUTOSTART != yes |
705 |
- if [ "x${LIBVIRT_IGNORE_AUTOSTART}" = "xyes" ] && \ |
706 |
- [ ${dom_as} = "enabled" ]; then |
707 |
- : |
708 |
- else |
709 |
- echo "${uri} ${uuid}" >> ${gueststatefile} |
710 |
- fi |
711 |
- |
712 |
- fi |
713 |
- |
714 |
- # Now let's stop it |
715 |
- do_virsh "${uri}" ${shutdown_type} ${uuid} > /dev/null |
716 |
- |
717 |
- done |
718 |
- |
719 |
- dom_count="$(libvirtd_dom_count ${uri} ${persist})" |
720 |
- while [ ${dom_count} -gt 0 ] && [ ${counter} -gt 0 ] ; do |
721 |
- dom_count="$(libvirtd_dom_count ${uri} ${persist})" |
722 |
- sleep 1 |
723 |
- if [ "${shutdown_type}" = "shutdown" ]; then |
724 |
- counter=$((${counter} - 1)) |
725 |
- fi |
726 |
- echo -n "." |
727 |
- done |
728 |
- |
729 |
- if [ "${shutdown_type}" = "shutdown" ]; then |
730 |
- # grab all domains still running |
731 |
- dom_ids=$(libvirtd_dom_list ${uri} ${persist}) |
732 |
- for uuid in ${dom_ids}; do |
733 |
- dom_name=$(do_virsh ${uri} domname ${uuid}) |
734 |
- eerror " ${dom_name} forcibly stopped" |
735 |
- do_virsh "${uri}" destroy ${uuid} > /dev/null |
736 |
- done |
737 |
- fi |
738 |
-} |
739 |
- |
740 |
-libvirtd_net_stop() { |
741 |
- # stops all persistent or transient domains for a given URI |
742 |
- # $1 - uri |
743 |
- # $2 - persisent/transient |
744 |
- |
745 |
- local uri=$1 |
746 |
- local persist=$2 |
747 |
- local uuid= |
748 |
- local net_name= |
749 |
- |
750 |
- if [ "${LIBVIRT_NET_SHUTDOWN}" != "no" ]; then |
751 |
- |
752 |
- einfo " Shutting down network(s):" |
753 |
- for uuid in $(libvirtd_net_list ${uri} ${persist}); do |
754 |
- net_name=$(do_virsh ${uri} net-name ${uuid}) |
755 |
- einfo " ${net_name}" |
756 |
- |
757 |
- if [ "${persist}" = "--persistent" ]; then |
758 |
- # Save our running state |
759 |
- echo "${uri} ${uuid}" >> ${netstatefile} |
760 |
- |
761 |
- fi |
762 |
- |
763 |
- # Actually stop the network |
764 |
- do_virsh qemu net-destroy ${uuid} > /dev/null |
765 |
- done |
766 |
- |
767 |
- fi |
768 |
-} |
769 |
- |
770 |
-start() { |
771 |
- local uri= |
772 |
- local uuid= |
773 |
- local name= |
774 |
- |
775 |
- for uri in ${LIBVIRT_URIS}; do |
776 |
- do_virsh "${uri}" connect |
777 |
- if [ $? -ne 0 ]; then |
778 |
- eerror "Failed to connect to '${uri}'. Domains may not start." |
779 |
- fi |
780 |
- done |
781 |
- |
782 |
- [ ! -e "${netstatefile}" ] && touch "${netstatefile}" |
783 |
- [ ! -e "${gueststatefile}" ] && touch "${gueststatefile}" |
784 |
- |
785 |
- # if the user didn't want to start any guests up then respect their wish |
786 |
- [ "x${LIBVIRT_START}" = "xno" ] && return 0 |
787 |
- |
788 |
- # start networks |
789 |
- ebegin "Starting libvirt networks" |
790 |
- while read -r uri uuid |
791 |
- do |
792 |
- # ignore trash |
793 |
- [ -z "${uri}" ] || [ -z "${uuid}" ] && continue |
794 |
- |
795 |
- name=$(do_virsh "${uri}" net-name ${uuid}) |
796 |
- einfo " ${name}" |
797 |
- do_virsh "${uri}" net-start ${uuid} > /dev/null |
798 |
- done <"${netstatefile}" |
799 |
- eend 0 |
800 |
- |
801 |
- # start domains |
802 |
- ebegin "Starting libvirt domains" |
803 |
- while read -r uri uuid |
804 |
- do |
805 |
- # ignore trash |
806 |
- [ -z "${uri}" ] || [ -z "${uuid}" ] && continue |
807 |
- |
808 |
- name=$(do_virsh "${uri}" domname ${uuid}) |
809 |
- einfo " ${name}" |
810 |
- do_virsh "${uri}" start ${uuid} > /dev/null |
811 |
- done <"${gueststatefile}" |
812 |
- eend 0 |
813 |
-} |
814 |
- |
815 |
-stop() { |
816 |
- local counter= |
817 |
- local dom_name= |
818 |
- local net_name= |
819 |
- local dom_ids= |
820 |
- local uuid= |
821 |
- local dom_count= |
822 |
- |
823 |
- rm -f "${gueststatefile}" |
824 |
- [ $? -ne 0 ] && eerror "Unable to save domain state" |
825 |
- rm -f "${netstatefile}" |
826 |
- [ $? -ne 0 ] && eerror "Unable to save net state" |
827 |
- |
828 |
- for uri in ${LIBVIRT_URIS}; do |
829 |
- einfo "Stopping libvirt domains and networks for ${uri}" |
830 |
- |
831 |
- libvirtd_dom_stop "${uri}" "--persistent" |
832 |
- libvirtd_dom_stop "${uri}" "--transient" |
833 |
- libvirtd_net_stop "${uri}" "--persistent" |
834 |
- libvirtd_net_stop "${uri}" "--transient" |
835 |
- |
836 |
- einfo "Done stopping domains and networks for ${uri}" |
837 |
- done |
838 |
-} |
839 |
|
840 |
diff --git a/app-emulation/libvirt/files/libvirtd.confd-r5 b/app-emulation/libvirt/files/libvirtd.confd-r5 |
841 |
deleted file mode 100644 |
842 |
index c326531..0000000 |
843 |
--- a/app-emulation/libvirt/files/libvirtd.confd-r5 |
844 |
+++ /dev/null |
845 |
@@ -1,18 +0,0 @@ |
846 |
-# /etc/conf.d/libvirtd |
847 |
- |
848 |
-# Startup dependency |
849 |
-# libvirtd typically requires all networks to be up and settled which |
850 |
-# is what rc_need="net" provides. However if you only use specific networks |
851 |
-# for libvirtd, you may override this. Or if you only use libvirtd locally. |
852 |
-rc_need="net" |
853 |
- |
854 |
-# The termination timeout (start-stop-daemon parameter "retry") ensures |
855 |
-# that the service will be terminated within a given time (25 + 5 seconds |
856 |
-# per default) when you are stopping the service. |
857 |
-#LIBVIRTD_TERMTIMEOUT="TERM/25/KILL/5" |
858 |
- |
859 |
-# LIBVIRTD_OPTS |
860 |
-# You may want to add '--listen' to have libvirtd listen for tcp/ip connections |
861 |
-# if you want to use libvirt for remote control |
862 |
-# Please consult 'libvirtd --help' for more options |
863 |
-#LIBVIRTD_OPTS="--listen" |
864 |
|
865 |
diff --git a/app-emulation/libvirt/files/libvirtd.init-r16 b/app-emulation/libvirt/files/libvirtd.init-r16 |
866 |
deleted file mode 100644 |
867 |
index be660e3..0000000 |
868 |
--- a/app-emulation/libvirt/files/libvirtd.init-r16 |
869 |
+++ /dev/null |
870 |
@@ -1,34 +0,0 @@ |
871 |
-#!/sbin/openrc-run |
872 |
-# Copyright 1999-2015 Gentoo Foundation |
873 |
-# Distributed under the terms of the GNU General Public License v2 |
874 |
- |
875 |
-description="Virtual Machine Management daemon (libvirt)" |
876 |
- |
877 |
-LIBVIRTD_OPTS=${LIBVIRTD_OPTS:-"${LIBVIRTD_OPTS}"} |
878 |
-LIBVIRTD_TIMEOUT=${LIBVIRTD_TERMTIMEOUT:-"TERM/25/KILL/5"} |
879 |
- |
880 |
-command="/usr/sbin/libvirtd" |
881 |
-command_args="-d ${LIBVIRTD_OPTS}" |
882 |
-start_stop_daemon_args="--env KRB5_KTNAME=/etc/libvirt/krb5.tab" |
883 |
-pidfile="/var/run/libvirtd.pid" |
884 |
-retry="${LIBVIRTD_TERMTIMEOUT}" |
885 |
- |
886 |
-depend() { |
887 |
- need virtlogd |
888 |
- use dbus virtlockd |
889 |
- after ntp-client ntpd nfs nfsmount portmap rpc.statd iptables ip6tables ebtables corosync sanlock cgconfig xenconsoled |
890 |
- USE_FLAG_FIREWALLD |
891 |
- USE_FLAG_AVAHI |
892 |
- USE_FLAG_ISCSI |
893 |
- USE_FLAG_RBD |
894 |
-} |
895 |
- |
896 |
-start_pre() { |
897 |
- # Test configuration directories in /etc/libvirt/ to be either not |
898 |
- # present or a directory, i.e. not a regular file, bug #532892 |
899 |
- |
900 |
- checkpath --directory /etc/libvirt/lxc || return 1 |
901 |
- checkpath --directory /etc/libvirt/nwfilter || return 1 |
902 |
- checkpath --directory /etc/libvirt/qemu || return 1 |
903 |
- checkpath --directory /etc/libvirt/storage || return 1 |
904 |
-} |
905 |
|
906 |
diff --git a/app-emulation/libvirt/files/libvirtd.service.conf b/app-emulation/libvirt/files/libvirtd.service.conf |
907 |
deleted file mode 100644 |
908 |
index f087922..0000000 |
909 |
--- a/app-emulation/libvirt/files/libvirtd.service.conf |
910 |
+++ /dev/null |
911 |
@@ -1,10 +0,0 @@ |
912 |
-# Uncomment the following three lines to start libvirtd with the '--listen' |
913 |
-# directive such that it listens for TCP/IP connections (honoring the |
914 |
-# listen_tls and listen_tcp settings in /etc/libvirt/libvirtd.conf). If |
915 |
-# libvirtd is started without the '--listen' parameter, network connection |
916 |
-# (for the daemon) is globally disabled: |
917 |
- |
918 |
-# [Service] |
919 |
-# ExecStart= |
920 |
-# ExecStart=/usr/sbin/libvirtd --listen |
921 |
- |
922 |
|
923 |
diff --git a/app-emulation/libvirt/files/libvirtd.tmpfiles.conf b/app-emulation/libvirt/files/libvirtd.tmpfiles.conf |
924 |
deleted file mode 100644 |
925 |
index c22c23d..0000000 |
926 |
--- a/app-emulation/libvirt/files/libvirtd.tmpfiles.conf |
927 |
+++ /dev/null |
928 |
@@ -1 +0,0 @@ |
929 |
-d /run/libvirt/lxc 0755 root root - |
930 |
|
931 |
diff --git a/app-emulation/libvirt/files/virtlockd.init-r1 b/app-emulation/libvirt/files/virtlockd.init-r1 |
932 |
deleted file mode 100644 |
933 |
index e7c3db2..0000000 |
934 |
--- a/app-emulation/libvirt/files/virtlockd.init-r1 |
935 |
+++ /dev/null |
936 |
@@ -1,23 +0,0 @@ |
937 |
-#!/sbin/openrc-run |
938 |
-# Copyright 1999-2015 Gentoo Foundation |
939 |
-# Distributed under the terms of the GNU General Public License v2 |
940 |
- |
941 |
-description="libvirt virtual machine lock manager" |
942 |
-command="/usr/sbin/virtlockd" |
943 |
-command_args="-d" |
944 |
-pidfile="/var/run/virtlockd.pid" |
945 |
- |
946 |
-extra_started_commands="reload" |
947 |
-description_reload="re-exec the daemon, while maintaining locks and clients" |
948 |
- |
949 |
- |
950 |
-depend() { |
951 |
- after ntp-client ntpd nfs nfsmount corosync |
952 |
-} |
953 |
- |
954 |
-reload() { |
955 |
- ebegin "re-exec() virtlockd" |
956 |
- |
957 |
- start-stop-daemon --signal SIGUSR1 \ |
958 |
- --exec "${command}" --pidfile "${pidfile}" |
959 |
-} |
960 |
|
961 |
diff --git a/app-emulation/libvirt/files/virtlogd.init-r1 b/app-emulation/libvirt/files/virtlogd.init-r1 |
962 |
deleted file mode 100644 |
963 |
index 438070e..0000000 |
964 |
--- a/app-emulation/libvirt/files/virtlogd.init-r1 |
965 |
+++ /dev/null |
966 |
@@ -1,23 +0,0 @@ |
967 |
-#!/sbin/openrc-run |
968 |
-# Copyright 1999-2015 Gentoo Foundation |
969 |
-# Distributed under the terms of the GNU General Public License v2 |
970 |
- |
971 |
-description="libvirt virtual machine logging manager" |
972 |
-command="/usr/sbin/virtlogd" |
973 |
-command_args="-d" |
974 |
-pidfile="/var/run/virtlogd.pid" |
975 |
- |
976 |
-extra_started_commands="reload" |
977 |
-description_reload="re-exec the daemon, while maintaining open connections" |
978 |
- |
979 |
- |
980 |
-depend() { |
981 |
- after ntp-client ntpd nfs nfsmount corosync |
982 |
-} |
983 |
- |
984 |
-reload() { |
985 |
- ebegin "re-exec() virtlogd" |
986 |
- |
987 |
- start-stop-daemon --signal SIGUSR1 \ |
988 |
- --exec "${command}" --pidfile "${pidfile}" |
989 |
-} |
990 |
|
991 |
diff --git a/app-emulation/libvirt/libvirt-3.10.0-r1.ebuild b/app-emulation/libvirt/libvirt-3.10.0-r1.ebuild |
992 |
deleted file mode 100644 |
993 |
index aa6bd57..0000000 |
994 |
--- a/app-emulation/libvirt/libvirt-3.10.0-r1.ebuild |
995 |
+++ /dev/null |
996 |
@@ -1,382 +0,0 @@ |
997 |
-# Copyright 1999-2017 Gentoo Foundation |
998 |
-# Distributed under the terms of the GNU General Public License v2 |
999 |
- |
1000 |
-EAPI=6 |
1001 |
- |
1002 |
-inherit autotools eutils user linux-info systemd readme.gentoo-r1 versionator |
1003 |
- |
1004 |
-if [[ ${PV} = *9999* ]]; then |
1005 |
- inherit git-r3 |
1006 |
- EGIT_REPO_URI="git://libvirt.org/libvirt.git" |
1007 |
- SRC_URI="" |
1008 |
- KEYWORDS="" |
1009 |
- SLOT="0" |
1010 |
-else |
1011 |
- # Versions with 4 numbers are stable updates: |
1012 |
- if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then |
1013 |
- SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.xz" |
1014 |
- else |
1015 |
- SRC_URI="http://libvirt.org/sources/${P}.tar.xz" |
1016 |
- fi |
1017 |
- KEYWORDS="~amd64 ~arm64 ~x86" |
1018 |
- SLOT="0/${PV}" |
1019 |
-fi |
1020 |
- |
1021 |
-DESCRIPTION="C toolkit to manipulate virtual machines" |
1022 |
-HOMEPAGE="http://www.libvirt.org/" |
1023 |
-LICENSE="LGPL-2.1" |
1024 |
-IUSE=" |
1025 |
- apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm |
1026 |
- libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit |
1027 |
- +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network |
1028 |
- wireshark-plugins xen zeroconf zfs |
1029 |
-" |
1030 |
- |
1031 |
-REQUIRED_USE=" |
1032 |
- firewalld? ( virt-network ) |
1033 |
- libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) |
1034 |
- lxc? ( caps libvirtd ) |
1035 |
- openvz? ( libvirtd ) |
1036 |
- policykit? ( dbus ) |
1037 |
- qemu? ( libvirtd ) |
1038 |
- uml? ( libvirtd ) |
1039 |
- vepa? ( macvtap ) |
1040 |
- virt-network? ( libvirtd ) |
1041 |
- virtualbox? ( libvirtd ) |
1042 |
- xen? ( libvirtd )" |
1043 |
- |
1044 |
-# gettext.sh command is used by the libvirt command wrappers, and it's |
1045 |
-# non-optional, so put it into RDEPEND. |
1046 |
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the |
1047 |
-# package will use 3 by default. Since we don't have slot pinning in an API, |
1048 |
-# we must go with the most recent |
1049 |
-RDEPEND=" |
1050 |
- app-misc/scrub |
1051 |
- dev-libs/libgcrypt:0 |
1052 |
- dev-libs/libnl:3 |
1053 |
- >=dev-libs/libxml2-2.7.6 |
1054 |
- || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 ) |
1055 |
- >=net-libs/gnutls-1.0.25:0= |
1056 |
- net-libs/libssh2 |
1057 |
- net-libs/libtirpc |
1058 |
- net-libs/rpcsvc-proto |
1059 |
- >=net-misc/curl-7.18.0 |
1060 |
- sys-apps/dmidecode |
1061 |
- >=sys-apps/util-linux-2.17 |
1062 |
- sys-devel/gettext |
1063 |
- sys-libs/ncurses:0= |
1064 |
- sys-libs/readline:= |
1065 |
- apparmor? ( sys-libs/libapparmor ) |
1066 |
- audit? ( sys-process/audit ) |
1067 |
- caps? ( sys-libs/libcap-ng ) |
1068 |
- dbus? ( sys-apps/dbus ) |
1069 |
- firewalld? ( net-firewall/firewalld ) |
1070 |
- fuse? ( >=sys-fs/fuse-2.8.6:= ) |
1071 |
- glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) |
1072 |
- iscsi? ( sys-block/open-iscsi ) |
1073 |
- libssh? ( net-libs/libssh ) |
1074 |
- lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) |
1075 |
- nfs? ( net-fs/nfs-utils ) |
1076 |
- numa? ( |
1077 |
- >sys-process/numactl-2.0.2 |
1078 |
- sys-process/numad |
1079 |
- ) |
1080 |
- parted? ( |
1081 |
- >=sys-block/parted-1.8[device-mapper] |
1082 |
- sys-fs/lvm2[-device-mapper-only(-)] |
1083 |
- ) |
1084 |
- pcap? ( >=net-libs/libpcap-1.0.0 ) |
1085 |
- policykit? ( >=sys-auth/polkit-0.9 ) |
1086 |
- qemu? ( |
1087 |
- >=app-emulation/qemu-0.13.0 |
1088 |
- dev-libs/yajl |
1089 |
- ) |
1090 |
- rbd? ( sys-cluster/ceph ) |
1091 |
- sasl? ( dev-libs/cyrus-sasl ) |
1092 |
- selinux? ( >=sys-libs/libselinux-2.0.85 ) |
1093 |
- virt-network? ( |
1094 |
- net-dns/dnsmasq[script] |
1095 |
- net-firewall/ebtables |
1096 |
- >=net-firewall/iptables-1.4.10[ipv6] |
1097 |
- net-misc/radvd |
1098 |
- sys-apps/iproute2[-minimal] |
1099 |
- ) |
1100 |
- virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) |
1101 |
- wireshark-plugins? ( net-analyzer/wireshark:= ) |
1102 |
- xen? ( |
1103 |
- app-emulation/xen |
1104 |
- app-emulation/xen-tools:= |
1105 |
- ) |
1106 |
- udev? ( |
1107 |
- virtual/udev |
1108 |
- >=x11-libs/libpciaccess-0.10.9 |
1109 |
- ) |
1110 |
- zeroconf? ( >=net-dns/avahi-0.6[dbus] ) |
1111 |
- zfs? ( sys-fs/zfs )" |
1112 |
- |
1113 |
-DEPEND="${RDEPEND} |
1114 |
- app-text/xhtml1 |
1115 |
- dev-lang/perl |
1116 |
- dev-libs/libxslt |
1117 |
- dev-perl/XML-XPath |
1118 |
- virtual/pkgconfig" |
1119 |
- |
1120 |
-PATCHES=( |
1121 |
- "${FILESDIR}"/${PN}-1.3.0-do_not_use_sysconf.patch |
1122 |
- "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch |
1123 |
- "${FILESDIR}"/${PN}-3.10.0-fix_paths_for_apparmor.patch |
1124 |
- "${FILESDIR}"/${PN}-1.3.4-glibc-2.23.patch |
1125 |
- "${FILESDIR}"/${PN}-3.1.0-musl-fix-includes.patch # bug #609488 |
1126 |
-) |
1127 |
- |
1128 |
-pkg_setup() { |
1129 |
- if use qemu; then |
1130 |
- enewgroup qemu 77 |
1131 |
- enewuser qemu 77 -1 -1 "qemu,kvm" |
1132 |
- fi |
1133 |
- |
1134 |
- use policykit && enewgroup libvirt |
1135 |
- |
1136 |
- # Check kernel configuration: |
1137 |
- CONFIG_CHECK="" |
1138 |
- use fuse && CONFIG_CHECK+=" |
1139 |
- ~FUSE_FS" |
1140 |
- |
1141 |
- use lvm && CONFIG_CHECK+=" |
1142 |
- ~BLK_DEV_DM |
1143 |
- ~DM_MULTIPATH |
1144 |
- ~DM_SNAPSHOT" |
1145 |
- |
1146 |
- use lxc && CONFIG_CHECK+=" |
1147 |
- ~BLK_CGROUP |
1148 |
- ~CGROUP_CPUACCT |
1149 |
- ~CGROUP_DEVICE |
1150 |
- ~CGROUP_FREEZER |
1151 |
- ~CGROUP_NET_PRIO |
1152 |
- ~CGROUP_PERF |
1153 |
- ~CGROUPS |
1154 |
- ~CGROUP_SCHED |
1155 |
- ~CPUSETS |
1156 |
- ~IPC_NS |
1157 |
- ~MACVLAN |
1158 |
- ~NAMESPACES |
1159 |
- ~NET_CLS_CGROUP |
1160 |
- ~NET_NS |
1161 |
- ~PID_NS |
1162 |
- ~POSIX_MQUEUE |
1163 |
- ~SECURITYFS |
1164 |
- ~USER_NS |
1165 |
- ~UTS_NS |
1166 |
- ~VETH |
1167 |
- ~!GRKERNSEC_CHROOT_MOUNT |
1168 |
- ~!GRKERNSEC_CHROOT_DOUBLE |
1169 |
- ~!GRKERNSEC_CHROOT_PIVOT |
1170 |
- ~!GRKERNSEC_CHROOT_CHMOD |
1171 |
- ~!GRKERNSEC_CHROOT_CAPS" |
1172 |
- |
1173 |
- kernel_is lt 4 7 && use lxc && CONFIG_CHECK+=" |
1174 |
- ~DEVPTS_MULTIPLE_INSTANCES" |
1175 |
- |
1176 |
- use macvtap && CONFIG_CHECK+=" |
1177 |
- ~MACVTAP" |
1178 |
- |
1179 |
- use virt-network && CONFIG_CHECK+=" |
1180 |
- ~BRIDGE_EBT_MARK_T |
1181 |
- ~BRIDGE_NF_EBTABLES |
1182 |
- ~NETFILTER_ADVANCED |
1183 |
- ~NETFILTER_XT_CONNMARK |
1184 |
- ~NETFILTER_XT_MARK |
1185 |
- ~NETFILTER_XT_TARGET_CHECKSUM" |
1186 |
- # Bandwidth Limiting Support |
1187 |
- use virt-network && CONFIG_CHECK+=" |
1188 |
- ~BRIDGE_EBT_T_NAT |
1189 |
- ~NET_ACT_POLICE |
1190 |
- ~NET_CLS_FW |
1191 |
- ~NET_CLS_U32 |
1192 |
- ~NET_SCH_HTB |
1193 |
- ~NET_SCH_INGRESS |
1194 |
- ~NET_SCH_SFQ" |
1195 |
- |
1196 |
- # Handle specific kernel versions for different features |
1197 |
- kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR" |
1198 |
- if kernel_is ge 3 6; then |
1199 |
- CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP " |
1200 |
- kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM " |
1201 |
- fi |
1202 |
- |
1203 |
- ERROR_USER_NS="Optional depending on LXC configuration." |
1204 |
- |
1205 |
- if [[ -n ${CONFIG_CHECK} ]]; then |
1206 |
- linux-info_pkg_setup |
1207 |
- fi |
1208 |
-} |
1209 |
- |
1210 |
-src_prepare() { |
1211 |
- touch "${S}/.mailmap" |
1212 |
- |
1213 |
- default |
1214 |
- |
1215 |
- if [[ ${PV} = *9999* ]]; then |
1216 |
- # git checkouts require bootstrapping to create the configure script. |
1217 |
- # Additionally the submodules must be cloned to the right locations |
1218 |
- # bug #377279 |
1219 |
- ./bootstrap || die "bootstrap failed" |
1220 |
- ( |
1221 |
- git submodule status | sed 's/^[ +-]//;s/ .*//' |
1222 |
- git hash-object bootstrap.conf |
1223 |
- ) >.git-module-status |
1224 |
- fi |
1225 |
- |
1226 |
- # Tweak the init script: |
1227 |
- cp "${FILESDIR}/libvirtd.init-r16" "${S}/libvirtd.init" || die |
1228 |
- sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \ |
1229 |
- -e "s/USE_FLAG_AVAHI/$(usex zeroconf 'use avahi-daemon' '')/" \ |
1230 |
- -e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \ |
1231 |
- -e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \ |
1232 |
- -i "${S}/libvirtd.init" || die "sed failed" |
1233 |
- |
1234 |
- eautoreconf |
1235 |
-} |
1236 |
- |
1237 |
-src_configure() { |
1238 |
- local myeconfargs=( |
1239 |
- $(use_with apparmor) |
1240 |
- $(use_with apparmor apparmor-profiles) |
1241 |
- $(use_with audit) |
1242 |
- $(use_with caps capng) |
1243 |
- $(use_with dbus) |
1244 |
- $(use_with firewalld) |
1245 |
- $(use_with fuse) |
1246 |
- $(use_with glusterfs) |
1247 |
- $(use_with glusterfs storage-gluster) |
1248 |
- $(use_with iscsi storage-iscsi) |
1249 |
- $(use_with libvirtd) |
1250 |
- $(use_with libssh) |
1251 |
- $(use_with lvm storage-lvm) |
1252 |
- $(use_with lvm storage-mpath) |
1253 |
- $(use_with lxc) |
1254 |
- $(use_with macvtap) |
1255 |
- $(use_enable nls) |
1256 |
- $(use_with numa numactl) |
1257 |
- $(use_with numa numad) |
1258 |
- $(use_with openvz) |
1259 |
- $(use_with parted storage-disk) |
1260 |
- $(use_with pcap libpcap) |
1261 |
- $(use_with phyp) |
1262 |
- $(use_with policykit polkit) |
1263 |
- $(use_with qemu) |
1264 |
- $(use_with qemu yajl) |
1265 |
- $(use_with rbd storage-rbd) |
1266 |
- $(use_with sasl) |
1267 |
- $(use_with selinux) |
1268 |
- $(use_with udev) |
1269 |
- $(use_with uml) |
1270 |
- $(use_with vepa virtualport) |
1271 |
- $(use_with virt-network network) |
1272 |
- $(use_with wireshark-plugins wireshark-dissector) |
1273 |
- $(use_with xen) |
1274 |
- $(use_with xen xen-inotify) |
1275 |
- $(use_with xen libxl) |
1276 |
- $(use_with zeroconf avahi) |
1277 |
- $(use_with zfs storage-zfs) |
1278 |
- |
1279 |
- --without-hal |
1280 |
- --without-netcf |
1281 |
- --without-sanlock |
1282 |
- --without-xenapi |
1283 |
- |
1284 |
- --with-esx |
1285 |
- --with-init-script=systemd |
1286 |
- --with-qemu-group=$(usex caps qemu root) |
1287 |
- --with-qemu-user=$(usex caps qemu root) |
1288 |
- --with-remote |
1289 |
- --with-storage-fs |
1290 |
- --with-vmware |
1291 |
- |
1292 |
- --disable-static |
1293 |
- --disable-werror |
1294 |
- |
1295 |
- --with-html-subdir=${PF}/html |
1296 |
- --localstatedir=/var |
1297 |
- ) |
1298 |
- |
1299 |
- if use virtualbox && has_version app-emulation/virtualbox-ose; then |
1300 |
- myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ ) |
1301 |
- else |
1302 |
- myeconfargs+=( $(use_with virtualbox vbox) ) |
1303 |
- fi |
1304 |
- |
1305 |
- econf "${myeconfargs[@]}" |
1306 |
- |
1307 |
- if [[ ${PV} = *9999* ]]; then |
1308 |
- # Restore gnulib's config.sub and config.guess |
1309 |
- # bug #377279 |
1310 |
- (cd .gnulib && git reset --hard > /dev/null) |
1311 |
- fi |
1312 |
-} |
1313 |
- |
1314 |
-src_test() { |
1315 |
- cd "${BUILD_DIR}" |
1316 |
- |
1317 |
- # remove problematic tests, bug #591416, bug #591418 |
1318 |
- sed -i -e 's#commandtest$(EXEEXT) # #' \ |
1319 |
- -e 's#virfirewalltest$(EXEEXT) # #' \ |
1320 |
- -e 's#nwfilterebiptablestest$(EXEEXT) # #' \ |
1321 |
- -e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \ |
1322 |
- tests/Makefile |
1323 |
- |
1324 |
- export VIR_TEST_DEBUG=1 |
1325 |
- HOME="${T}" emake check || die "tests failed" |
1326 |
-} |
1327 |
- |
1328 |
-src_install() { |
1329 |
- emake DESTDIR="${D}" \ |
1330 |
- SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install |
1331 |
- |
1332 |
- find "${D}" -name '*.la' -delete || die |
1333 |
- |
1334 |
- # Remove bogus, empty directories. They are either not used, or |
1335 |
- # libvirtd is able to create them on demand |
1336 |
- rm -rf "${D}"/etc/sysconfig |
1337 |
- rm -rf "${D}"/var/cache |
1338 |
- rm -rf "${D}"/var/run |
1339 |
- rm -rf "${D}"/var/log |
1340 |
- |
1341 |
- use libvirtd || return 0 |
1342 |
- # From here, only libvirtd-related instructions, be warned! |
1343 |
- |
1344 |
- systemd_install_serviced \ |
1345 |
- "${FILESDIR}"/libvirtd.service.conf libvirtd.service |
1346 |
- |
1347 |
- systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf |
1348 |
- |
1349 |
- newinitd "${S}/libvirtd.init" libvirtd || die |
1350 |
- newinitd "${FILESDIR}/libvirt-guests.init-r2" libvirt-guests || die |
1351 |
- newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die |
1352 |
- newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die |
1353 |
- |
1354 |
- newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die |
1355 |
- newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die |
1356 |
- |
1357 |
- DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2") |
1358 |
- DISABLE_AUTOFORMATTING=true |
1359 |
- readme.gentoo_create_doc |
1360 |
-} |
1361 |
- |
1362 |
-pkg_preinst() { |
1363 |
- # we only ever want to generate this once |
1364 |
- if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then |
1365 |
- rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml |
1366 |
- fi |
1367 |
-} |
1368 |
- |
1369 |
-pkg_postinst() { |
1370 |
- if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then |
1371 |
- touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml |
1372 |
- fi |
1373 |
- |
1374 |
- use libvirtd || return 0 |
1375 |
- # From here, only libvirtd-related instructions, be warned! |
1376 |
- |
1377 |
- readme.gentoo_print_elog |
1378 |
-} |
1379 |
|
1380 |
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild |
1381 |
deleted file mode 100644 |
1382 |
index 3716e89..0000000 |
1383 |
--- a/app-emulation/libvirt/libvirt-9999.ebuild |
1384 |
+++ /dev/null |
1385 |
@@ -1,379 +0,0 @@ |
1386 |
-# Copyright 1999-2017 Gentoo Foundation |
1387 |
-# Distributed under the terms of the GNU General Public License v2 |
1388 |
- |
1389 |
-EAPI=6 |
1390 |
- |
1391 |
-inherit autotools eutils user linux-info systemd readme.gentoo-r1 |
1392 |
- |
1393 |
-if [[ ${PV} = *9999* ]]; then |
1394 |
- inherit git-r3 |
1395 |
- EGIT_REPO_URI="git://libvirt.org/libvirt.git" |
1396 |
- SRC_URI="" |
1397 |
- KEYWORDS="" |
1398 |
- SLOT="0" |
1399 |
-else |
1400 |
- # Versions with 4 numbers are stable updates: |
1401 |
- if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then |
1402 |
- SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.xz" |
1403 |
- else |
1404 |
- SRC_URI="http://libvirt.org/sources/${P}.tar.xz" |
1405 |
- fi |
1406 |
- KEYWORDS="~amd64 ~arm64 ~x86" |
1407 |
- SLOT="0/${PV}" |
1408 |
-fi |
1409 |
- |
1410 |
-DESCRIPTION="C toolkit to manipulate virtual machines" |
1411 |
-HOMEPAGE="http://www.libvirt.org/" |
1412 |
-LICENSE="LGPL-2.1" |
1413 |
-IUSE=" |
1414 |
- apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm |
1415 |
- libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit |
1416 |
- +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network |
1417 |
- wireshark-plugins xen zeroconf zfs |
1418 |
-" |
1419 |
- |
1420 |
-REQUIRED_USE=" |
1421 |
- firewalld? ( virt-network ) |
1422 |
- libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) |
1423 |
- lxc? ( caps libvirtd ) |
1424 |
- openvz? ( libvirtd ) |
1425 |
- policykit? ( dbus ) |
1426 |
- qemu? ( libvirtd ) |
1427 |
- uml? ( libvirtd ) |
1428 |
- vepa? ( macvtap ) |
1429 |
- virt-network? ( libvirtd ) |
1430 |
- virtualbox? ( libvirtd ) |
1431 |
- xen? ( libvirtd )" |
1432 |
- |
1433 |
-# gettext.sh command is used by the libvirt command wrappers, and it's |
1434 |
-# non-optional, so put it into RDEPEND. |
1435 |
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the |
1436 |
-# package will use 3 by default. Since we don't have slot pinning in an API, |
1437 |
-# we must go with the most recent |
1438 |
-RDEPEND=" |
1439 |
- app-misc/scrub |
1440 |
- dev-libs/libgcrypt:0 |
1441 |
- dev-libs/libnl:3 |
1442 |
- >=dev-libs/libxml2-2.7.6 |
1443 |
- || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 ) |
1444 |
- >=net-libs/gnutls-1.0.25:0= |
1445 |
- net-libs/libssh2 |
1446 |
- >=net-misc/curl-7.18.0 |
1447 |
- sys-apps/dmidecode |
1448 |
- >=sys-apps/util-linux-2.17 |
1449 |
- sys-devel/gettext |
1450 |
- sys-libs/ncurses:0= |
1451 |
- sys-libs/readline:= |
1452 |
- apparmor? ( sys-libs/libapparmor ) |
1453 |
- audit? ( sys-process/audit ) |
1454 |
- caps? ( sys-libs/libcap-ng ) |
1455 |
- dbus? ( sys-apps/dbus ) |
1456 |
- firewalld? ( net-firewall/firewalld ) |
1457 |
- fuse? ( >=sys-fs/fuse-2.8.6:= ) |
1458 |
- glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) |
1459 |
- iscsi? ( sys-block/open-iscsi ) |
1460 |
- libssh? ( net-libs/libssh ) |
1461 |
- lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) |
1462 |
- nfs? ( net-fs/nfs-utils ) |
1463 |
- numa? ( |
1464 |
- >sys-process/numactl-2.0.2 |
1465 |
- sys-process/numad |
1466 |
- ) |
1467 |
- parted? ( |
1468 |
- >=sys-block/parted-1.8[device-mapper] |
1469 |
- sys-fs/lvm2[-device-mapper-only(-)] |
1470 |
- ) |
1471 |
- pcap? ( >=net-libs/libpcap-1.0.0 ) |
1472 |
- policykit? ( >=sys-auth/polkit-0.9 ) |
1473 |
- qemu? ( |
1474 |
- >=app-emulation/qemu-0.13.0 |
1475 |
- dev-libs/yajl |
1476 |
- ) |
1477 |
- rbd? ( sys-cluster/ceph ) |
1478 |
- sasl? ( dev-libs/cyrus-sasl ) |
1479 |
- selinux? ( >=sys-libs/libselinux-2.0.85 ) |
1480 |
- virt-network? ( |
1481 |
- net-dns/dnsmasq[script] |
1482 |
- net-firewall/ebtables |
1483 |
- >=net-firewall/iptables-1.4.10[ipv6] |
1484 |
- net-misc/radvd |
1485 |
- sys-apps/iproute2[-minimal] |
1486 |
- ) |
1487 |
- virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) |
1488 |
- wireshark-plugins? ( net-analyzer/wireshark:= ) |
1489 |
- xen? ( |
1490 |
- app-emulation/xen |
1491 |
- app-emulation/xen-tools:= |
1492 |
- ) |
1493 |
- udev? ( |
1494 |
- virtual/udev |
1495 |
- >=x11-libs/libpciaccess-0.10.9 |
1496 |
- ) |
1497 |
- zeroconf? ( >=net-dns/avahi-0.6[dbus] ) |
1498 |
- zfs? ( sys-fs/zfs )" |
1499 |
- |
1500 |
-DEPEND="${RDEPEND} |
1501 |
- app-text/xhtml1 |
1502 |
- dev-lang/perl |
1503 |
- dev-libs/libxslt |
1504 |
- dev-perl/XML-XPath |
1505 |
- virtual/pkgconfig" |
1506 |
- |
1507 |
-PATCHES=( |
1508 |
- "${FILESDIR}"/${PN}-1.3.0-do_not_use_sysconf.patch |
1509 |
- "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch |
1510 |
- "${FILESDIR}"/${PN}-3.0.0-fix_paths_for_apparmor.patch |
1511 |
- "${FILESDIR}"/${PN}-1.3.4-glibc-2.23.patch |
1512 |
-) |
1513 |
- |
1514 |
-pkg_setup() { |
1515 |
- if use qemu; then |
1516 |
- enewgroup qemu 77 |
1517 |
- enewuser qemu 77 -1 -1 "qemu,kvm" |
1518 |
- fi |
1519 |
- |
1520 |
- use policykit && enewgroup libvirt |
1521 |
- |
1522 |
- # Check kernel configuration: |
1523 |
- CONFIG_CHECK="" |
1524 |
- use fuse && CONFIG_CHECK+=" |
1525 |
- ~FUSE_FS" |
1526 |
- |
1527 |
- use lvm && CONFIG_CHECK+=" |
1528 |
- ~BLK_DEV_DM |
1529 |
- ~DM_MULTIPATH |
1530 |
- ~DM_SNAPSHOT" |
1531 |
- |
1532 |
- use lxc && CONFIG_CHECK+=" |
1533 |
- ~BLK_CGROUP |
1534 |
- ~CGROUP_CPUACCT |
1535 |
- ~CGROUP_DEVICE |
1536 |
- ~CGROUP_FREEZER |
1537 |
- ~CGROUP_NET_PRIO |
1538 |
- ~CGROUP_PERF |
1539 |
- ~CGROUPS |
1540 |
- ~CGROUP_SCHED |
1541 |
- ~CPUSETS |
1542 |
- ~IPC_NS |
1543 |
- ~MACVLAN |
1544 |
- ~NAMESPACES |
1545 |
- ~NET_CLS_CGROUP |
1546 |
- ~NET_NS |
1547 |
- ~PID_NS |
1548 |
- ~POSIX_MQUEUE |
1549 |
- ~SECURITYFS |
1550 |
- ~USER_NS |
1551 |
- ~UTS_NS |
1552 |
- ~VETH |
1553 |
- ~!GRKERNSEC_CHROOT_MOUNT |
1554 |
- ~!GRKERNSEC_CHROOT_DOUBLE |
1555 |
- ~!GRKERNSEC_CHROOT_PIVOT |
1556 |
- ~!GRKERNSEC_CHROOT_CHMOD |
1557 |
- ~!GRKERNSEC_CHROOT_CAPS" |
1558 |
- |
1559 |
- kernel_is lt 4 7 && use lxc && CONFIG_CHECK+=" |
1560 |
- ~DEVPTS_MULTIPLE_INSTANCES" |
1561 |
- |
1562 |
- use macvtap && CONFIG_CHECK+=" |
1563 |
- ~MACVTAP" |
1564 |
- |
1565 |
- use virt-network && CONFIG_CHECK+=" |
1566 |
- ~BRIDGE_EBT_MARK_T |
1567 |
- ~BRIDGE_NF_EBTABLES |
1568 |
- ~NETFILTER_ADVANCED |
1569 |
- ~NETFILTER_XT_CONNMARK |
1570 |
- ~NETFILTER_XT_MARK |
1571 |
- ~NETFILTER_XT_TARGET_CHECKSUM" |
1572 |
- # Bandwidth Limiting Support |
1573 |
- use virt-network && CONFIG_CHECK+=" |
1574 |
- ~BRIDGE_EBT_T_NAT |
1575 |
- ~NET_ACT_POLICE |
1576 |
- ~NET_CLS_FW |
1577 |
- ~NET_CLS_U32 |
1578 |
- ~NET_SCH_HTB |
1579 |
- ~NET_SCH_INGRESS |
1580 |
- ~NET_SCH_SFQ" |
1581 |
- |
1582 |
- # Handle specific kernel versions for different features |
1583 |
- kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR" |
1584 |
- if kernel_is ge 3 6; then |
1585 |
- CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP " |
1586 |
- kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM " |
1587 |
- fi |
1588 |
- |
1589 |
- ERROR_USER_NS="Optional depending on LXC configuration." |
1590 |
- |
1591 |
- if [[ -n ${CONFIG_CHECK} ]]; then |
1592 |
- linux-info_pkg_setup |
1593 |
- fi |
1594 |
-} |
1595 |
- |
1596 |
-src_prepare() { |
1597 |
- touch "${S}/.mailmap" |
1598 |
- |
1599 |
- default |
1600 |
- |
1601 |
- if [[ ${PV} = *9999* ]]; then |
1602 |
- # git checkouts require bootstrapping to create the configure script. |
1603 |
- # Additionally the submodules must be cloned to the right locations |
1604 |
- # bug #377279 |
1605 |
- ./bootstrap || die "bootstrap failed" |
1606 |
- ( |
1607 |
- git submodule status | sed 's/^[ +-]//;s/ .*//' |
1608 |
- git hash-object bootstrap.conf |
1609 |
- ) >.git-module-status |
1610 |
- fi |
1611 |
- |
1612 |
- # Tweak the init script: |
1613 |
- cp "${FILESDIR}/libvirtd.init-r16" "${S}/libvirtd.init" || die |
1614 |
- sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \ |
1615 |
- -e "s/USE_FLAG_AVAHI/$(usex zeroconf 'use avahi-daemon' '')/" \ |
1616 |
- -e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \ |
1617 |
- -e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \ |
1618 |
- -i "${S}/libvirtd.init" || die "sed failed" |
1619 |
- |
1620 |
- eautoreconf |
1621 |
-} |
1622 |
- |
1623 |
-src_configure() { |
1624 |
- local myeconfargs=( |
1625 |
- $(use_with apparmor) |
1626 |
- $(use_with apparmor apparmor-profiles) |
1627 |
- $(use_with audit) |
1628 |
- $(use_with caps capng) |
1629 |
- $(use_with dbus) |
1630 |
- $(use_with firewalld) |
1631 |
- $(use_with fuse) |
1632 |
- $(use_with glusterfs) |
1633 |
- $(use_with glusterfs storage-gluster) |
1634 |
- $(use_with iscsi storage-iscsi) |
1635 |
- $(use_with libvirtd) |
1636 |
- $(use_with libssh) |
1637 |
- $(use_with lvm storage-lvm) |
1638 |
- $(use_with lvm storage-mpath) |
1639 |
- $(use_with lxc) |
1640 |
- $(use_with macvtap) |
1641 |
- $(use_enable nls) |
1642 |
- $(use_with numa numactl) |
1643 |
- $(use_with numa numad) |
1644 |
- $(use_with openvz) |
1645 |
- $(use_with parted storage-disk) |
1646 |
- $(use_with pcap libpcap) |
1647 |
- $(use_with phyp) |
1648 |
- $(use_with policykit polkit) |
1649 |
- $(use_with qemu) |
1650 |
- $(use_with qemu yajl) |
1651 |
- $(use_with rbd storage-rbd) |
1652 |
- $(use_with sasl) |
1653 |
- $(use_with selinux) |
1654 |
- $(use_with udev) |
1655 |
- $(use_with uml) |
1656 |
- $(use_with vepa virtualport) |
1657 |
- $(use_with virt-network network) |
1658 |
- $(use_with wireshark-plugins wireshark-dissector) |
1659 |
- $(use_with xen) |
1660 |
- $(use_with xen xen-inotify) |
1661 |
- $(use_with xen libxl) |
1662 |
- $(use_with zeroconf avahi) |
1663 |
- $(use_with zfs storage-zfs) |
1664 |
- |
1665 |
- --without-hal |
1666 |
- --without-netcf |
1667 |
- --without-sanlock |
1668 |
- --without-xenapi |
1669 |
- |
1670 |
- --with-esx |
1671 |
- --with-init-script=systemd |
1672 |
- --with-qemu-group=$(usex caps qemu root) |
1673 |
- --with-qemu-user=$(usex caps qemu root) |
1674 |
- --with-remote |
1675 |
- --with-storage-fs |
1676 |
- --with-vmware |
1677 |
- |
1678 |
- --disable-static |
1679 |
- --disable-werror |
1680 |
- |
1681 |
- --with-html-subdir=${PF}/html |
1682 |
- --localstatedir=/var |
1683 |
- ) |
1684 |
- |
1685 |
- if use virtualbox && has_version app-emulation/virtualbox-ose; then |
1686 |
- myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ ) |
1687 |
- else |
1688 |
- myeconfargs+=( $(use_with virtualbox vbox) ) |
1689 |
- fi |
1690 |
- |
1691 |
- econf "${myeconfargs[@]}" |
1692 |
- |
1693 |
- if [[ ${PV} = *9999* ]]; then |
1694 |
- # Restore gnulib's config.sub and config.guess |
1695 |
- # bug #377279 |
1696 |
- (cd .gnulib && git reset --hard > /dev/null) |
1697 |
- fi |
1698 |
-} |
1699 |
- |
1700 |
-src_test() { |
1701 |
- cd "${BUILD_DIR}" |
1702 |
- |
1703 |
- # remove problematic tests, bug #591416, bug #591418 |
1704 |
- sed -i -e 's#commandtest$(EXEEXT) # #' \ |
1705 |
- -e 's#virfirewalltest$(EXEEXT) # #' \ |
1706 |
- -e 's#nwfilterebiptablestest$(EXEEXT) # #' \ |
1707 |
- -e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \ |
1708 |
- tests/Makefile |
1709 |
- |
1710 |
- export VIR_TEST_DEBUG=1 |
1711 |
- HOME="${T}" emake check || die "tests failed" |
1712 |
-} |
1713 |
- |
1714 |
-src_install() { |
1715 |
- emake DESTDIR="${D}" \ |
1716 |
- SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install |
1717 |
- |
1718 |
- find "${D}" -name '*.la' -delete || die |
1719 |
- |
1720 |
- # Remove bogus, empty directories. They are either not used, or |
1721 |
- # libvirtd is able to create them on demand |
1722 |
- rm -rf "${D}"/etc/sysconfig |
1723 |
- rm -rf "${D}"/var/cache |
1724 |
- rm -rf "${D}"/var/run |
1725 |
- rm -rf "${D}"/var/log |
1726 |
- |
1727 |
- use libvirtd || return 0 |
1728 |
- # From here, only libvirtd-related instructions, be warned! |
1729 |
- |
1730 |
- systemd_install_serviced \ |
1731 |
- "${FILESDIR}"/libvirtd.service.conf libvirtd.service |
1732 |
- |
1733 |
- systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf |
1734 |
- |
1735 |
- newinitd "${S}/libvirtd.init" libvirtd || die |
1736 |
- newinitd "${FILESDIR}/libvirt-guests.init-r2" libvirt-guests || die |
1737 |
- newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die |
1738 |
- newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die |
1739 |
- |
1740 |
- newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die |
1741 |
- newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die |
1742 |
- |
1743 |
- DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2") |
1744 |
- DISABLE_AUTOFORMATTING=true |
1745 |
- readme.gentoo_create_doc |
1746 |
-} |
1747 |
- |
1748 |
-pkg_preinst() { |
1749 |
- # we only ever want to generate this once |
1750 |
- if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then |
1751 |
- rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml |
1752 |
- fi |
1753 |
-} |
1754 |
- |
1755 |
-pkg_postinst() { |
1756 |
- if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then |
1757 |
- touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml |
1758 |
- fi |
1759 |
- |
1760 |
- use libvirtd || return 0 |
1761 |
- # From here, only libvirtd-related instructions, be warned! |
1762 |
- |
1763 |
- readme.gentoo_print_elog |
1764 |
-} |
1765 |
|
1766 |
diff --git a/app-emulation/libvirt/metadata.xml b/app-emulation/libvirt/metadata.xml |
1767 |
deleted file mode 100644 |
1768 |
index 5750757..0000000 |
1769 |
--- a/app-emulation/libvirt/metadata.xml |
1770 |
+++ /dev/null |
1771 |
@@ -1,102 +0,0 @@ |
1772 |
-<?xml version="1.0" encoding="UTF-8"?> |
1773 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
1774 |
-<pkgmetadata> |
1775 |
-<maintainer type="person"> |
1776 |
- <email>samuelbernardo.mail@×××××.com</email> |
1777 |
- <name>Samuel Bernardo</name> |
1778 |
-</maintainer> |
1779 |
-<maintainer type="project"> |
1780 |
- <email>virtualization@g.o</email> |
1781 |
- <name>Gentoo Virtualization Project</name> |
1782 |
-</maintainer> |
1783 |
-<use> |
1784 |
- <!-- Pool backend flags --> |
1785 |
- <flag name="iscsi"> |
1786 |
- Allow using an iSCSI remote storage server as pool for disk image storage |
1787 |
- </flag> |
1788 |
- <flag name="lvm"> |
1789 |
- Allow using the Logical Volume Manager (<pkg>sys-fs/lvm2</pkg>) as pool for disk image |
1790 |
- storage |
1791 |
- </flag> |
1792 |
- <flag name="nfs"> |
1793 |
- Allow using Network File System mounts as pool for disk image storage |
1794 |
- </flag> |
1795 |
- <flag name="parted"> |
1796 |
- Allow using real disk partitions as pool for disk image storage, using |
1797 |
- <pkg>sys-block/parted</pkg> to create, resize and delete them. |
1798 |
- </flag> |
1799 |
- <flag name="rbd"> |
1800 |
- Enable rados block device support via <pkg>sys-cluster/ceph</pkg> |
1801 |
- </flag> |
1802 |
- <!-- Virtualisation backends --> |
1803 |
- <flag name="lxc"> |
1804 |
- Support management of Linux Containers virtualisation (<pkg>app-emulation/lxc</pkg>) |
1805 |
- </flag> |
1806 |
- <flag name="openvz"> |
1807 |
- Support management of OpenVZ virtualisation (openvz-sources) |
1808 |
- </flag> |
1809 |
- <flag name="uml"> |
1810 |
- Support management of User Mode Linux virtualisation |
1811 |
- </flag> |
1812 |
- <flag name="qemu"> |
1813 |
- Support management of QEMU virtualisation (<pkg>app-emulation/qemu</pkg>) |
1814 |
- </flag> |
1815 |
- <flag name="xen"> |
1816 |
- Support management of Xen virtualisation (<pkg>app-emulation/xen</pkg>) |
1817 |
- </flag> |
1818 |
- <flag name="virtualbox"> |
1819 |
- Support management of VirtualBox virtualisation (one of <pkg>app-emulation/virtualbox</pkg> or |
1820 |
- <pkg>app-emulation/virtualbox-bin</pkg>) |
1821 |
- </flag> |
1822 |
- <flag name="phyp"> |
1823 |
- Support IBM HMC / IVM hypervisor via PHYP protocol |
1824 |
- </flag> |
1825 |
- <!-- Miscellaneous flags --> |
1826 |
- <flag name="apparmor">Enable AppArmor support</flag> |
1827 |
- <flag name="fuse">Allow LXC to use <pkg>sys-fs/fuse</pkg> for mount |
1828 |
- points</flag> |
1829 |
- <flag name="numa"> |
1830 |
- Use NUMA for memory segmenting via <pkg>sys-process/numactl</pkg> and |
1831 |
- <pkg>sys-process/numad</pkg> |
1832 |
- </flag> |
1833 |
- <flag name="libvirtd"> |
1834 |
- Builds the libvirtd daemon as well as the client utilities instead of just the client |
1835 |
- utilities |
1836 |
- </flag> |
1837 |
- <flag name="libssh"> |
1838 |
- Use <pkg>net-libs/libssh</pkg> to communicate with remote libvirtd hosts, |
1839 |
- for example: qemu+libssh://server/system |
1840 |
- </flag> |
1841 |
- <flag name="pcap"> |
1842 |
- Support auto learning IP addreses for routing |
1843 |
- </flag> |
1844 |
- <flag name="macvtap"> |
1845 |
- Support for MAC-based TAP (macvlan/macvtap). For networking instead |
1846 |
- of the normal TUN/TAP. It has its advantages and disadvantages. |
1847 |
- macvtap support requires very new kernels and is |
1848 |
- currently evolving. Support for this is experimental at best. |
1849 |
- </flag> |
1850 |
- <flag name="vepa">Virtual Ethernet Port Aggregator (VEPA) / 802.1Qbg |
1851 |
- support. Relies on macvtap support.</flag> |
1852 |
- <flag name="virt-network"> |
1853 |
- Enable virtual networking (NAT) support for guests. Includes all |
1854 |
- the dependencies for NATed network mode. Effectively any network |
1855 |
- setup that relies on libvirt to setup and configure network |
1856 |
- interfaces on your host. This can include bridged and routed |
1857 |
- networks ONLY if you are allowing libvirt to create and manage |
1858 |
- the underlying devices for you. In some cases this requires |
1859 |
- enabling the 'netcf' USE flag (currently unavailable). |
1860 |
- </flag> |
1861 |
- <flag name="firewalld">DBus interface to iptables/ebtables allowing |
1862 |
- for better runtime management of your firewall.</flag> |
1863 |
- <flag name="wireshark-plugins"> |
1864 |
- Build the <pkg>net-analyzer/wireshark</pkg> plugin for the Libvirt RPC protocol |
1865 |
- </flag> |
1866 |
- <flag name="glusterfs"> |
1867 |
- Enable GlusterFS support via <pkg>sys-cluster/glusterfs</pkg> |
1868 |
- </flag> |
1869 |
- <flag name="zfs"> |
1870 |
- Enable ZFS backend storage <pkg>sys-fs/zfs</pkg> |
1871 |
- </flag> |
1872 |
-</use> |
1873 |
-</pkgmetadata> |
1874 |
|
1875 |
diff --git a/app-emulation/supermin/Manifest b/app-emulation/supermin/Manifest |
1876 |
deleted file mode 100644 |
1877 |
index 0deebdf..0000000 |
1878 |
--- a/app-emulation/supermin/Manifest |
1879 |
+++ /dev/null |
1880 |
@@ -1,3 +0,0 @@ |
1881 |
-EBUILD supermin-5.1.18.ebuild 1259 SHA256 df439c46910b2e067cfc893e8dda5c3137da9a11a24e351da7f18bbab4feaf47 SHA512 b500a71d213ae9fd7e2ae0d541284c99b09c9ea2ec4c13d1110042863180049aa3529f3d7cbf34ed9f2805f1ea37e600eddfec4c192bd18323a03cd621e3583e WHIRLPOOL 0b0d35d05fd078ba00040c6a4df72b8001614963e5b02c9b94365fb4bf892d18dd46a136c81786534b8a73ff24f27f83e897c4f8439b3fdd22477dcbdddc777f |
1882 |
-EBUILD supermin-9999.ebuild 1259 SHA256 df439c46910b2e067cfc893e8dda5c3137da9a11a24e351da7f18bbab4feaf47 SHA512 b500a71d213ae9fd7e2ae0d541284c99b09c9ea2ec4c13d1110042863180049aa3529f3d7cbf34ed9f2805f1ea37e600eddfec4c192bd18323a03cd621e3583e WHIRLPOOL 0b0d35d05fd078ba00040c6a4df72b8001614963e5b02c9b94365fb4bf892d18dd46a136c81786534b8a73ff24f27f83e897c4f8439b3fdd22477dcbdddc777f |
1883 |
-MISC metadata.xml 671 SHA256 729595d9a11903236c4aedfc9397663fdab2fb5a623f4178be73f24f24999c42 SHA512 9686312623976518279db082f686ccdf1155a76d18d873d23255c0f8ccbf4df4ffd4b36f250d73ccaea067802e985077638ff678494c73aa02a81a0020f2ee21 WHIRLPOOL 3a0933ca91a47614a47ed593818ebe8732bf6ffd62c437e6ca7ae4072aa411da9250c32593c0276fe1e0e7a41bb3d611e71900747e21ccc280b383a9be7ad864 |
1884 |
|
1885 |
diff --git a/app-emulation/supermin/metadata.xml b/app-emulation/supermin/metadata.xml |
1886 |
deleted file mode 100644 |
1887 |
index 81fd502..0000000 |
1888 |
--- a/app-emulation/supermin/metadata.xml |
1889 |
+++ /dev/null |
1890 |
@@ -1,21 +0,0 @@ |
1891 |
-<?xml version="1.0" encoding="UTF-8"?> |
1892 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
1893 |
-<pkgmetadata> |
1894 |
- <herd>supermin</herd> |
1895 |
- <longdescription> |
1896 |
- Supermin is a tool for building supermin appliances. |
1897 |
- These are tiny appliances [similar to virtual machines], |
1898 |
- usually around 100KB in size, which get fully instantiated |
1899 |
- on-the-fly in a fraction of a second when you need to boot |
1900 |
- one of them. |
1901 |
- |
1902 |
- Official documentation at |
1903 |
- http://people.redhat.com/~rjones/supermin/ |
1904 |
- </longdescription> |
1905 |
- <use> |
1906 |
- <flag name='test'>Enable tests with network connection. |
1907 |
- If you don't have a network connection let it |
1908 |
- disabled. |
1909 |
- </flag> |
1910 |
- </use> |
1911 |
-</pkgmetadata> |
1912 |
|
1913 |
diff --git a/app-emulation/supermin/supermin-5.1.18.ebuild b/app-emulation/supermin/supermin-5.1.18.ebuild |
1914 |
deleted file mode 100644 |
1915 |
index a886f0b..0000000 |
1916 |
--- a/app-emulation/supermin/supermin-5.1.18.ebuild |
1917 |
+++ /dev/null |
1918 |
@@ -1,63 +0,0 @@ |
1919 |
-# Copyright 1999-2017 Gentoo Foundation |
1920 |
-# Distributed under the terms of the GNU General Public License v2 |
1921 |
- |
1922 |
-EAPI=6 |
1923 |
- |
1924 |
-inherit eutils git-r3 autotools user |
1925 |
- |
1926 |
-AM_OPTS="-i" #define eautoreconf options |
1927 |
-#AT_NOELIBTOOLIZE="yes" #disable elibtoolize because eautoreconf is crashing at this phase |
1928 |
- |
1929 |
-if [[ $PV = *9999* ]]; then |
1930 |
- EGIT_REPO_URI=" |
1931 |
- https://github.com/libguestfs/supermin.git |
1932 |
- git@××××××.com:libguestfs/supermin.git" |
1933 |
- EGIT_SUBMODULES=( '*' ) |
1934 |
- SRC_URI="" |
1935 |
- KEYWORDS="" |
1936 |
-else |
1937 |
- EGIT_REPO_URI=" |
1938 |
- https://github.com/libguestfs/supermin.git |
1939 |
- git@××××××.com:libguestfs/supermin.git" |
1940 |
- EGIT_SUBMODULES=( '*' ) |
1941 |
- EGIT_COMMIT="v$PV" |
1942 |
- SRC_URI="" |
1943 |
- KEYWORDS="~amd64 ~x86" |
1944 |
-fi |
1945 |
- |
1946 |
-DESCRIPTION="Tool for creating supermin appliances" |
1947 |
-HOMEPAGE="http://libguestfs.org" |
1948 |
- |
1949 |
-LICENSE="GPL" |
1950 |
-SLOT="0" |
1951 |
-IUSE="test" |
1952 |
- |
1953 |
-DEPEND=" |
1954 |
- dev-lang/ocaml |
1955 |
- dev-ml/findlib[-tk] |
1956 |
- dev-lang/perl |
1957 |
- app-shells/bash |
1958 |
- sys-devel/gcc |
1959 |
- sys-apps/gawk |
1960 |
- >=sys-devel/prelink-20151030 |
1961 |
- app-arch/cpio |
1962 |
- " |
1963 |
-RDEPEND=" |
1964 |
- sys-fs/e2fsprogs |
1965 |
- !<=dev-util/febootstrap-3.21 |
1966 |
- " |
1967 |
- |
1968 |
-src_prepare() { |
1969 |
- "${S}/.gnulib/gnulib-tool" --update >/dev/null 2>&1 || die "gnulib-tool --update failed!" |
1970 |
- eautoreconf |
1971 |
- eapply_user |
1972 |
-} |
1973 |
- |
1974 |
-src_configure() { |
1975 |
- econf $(use_enable !test disable-network-tests) |
1976 |
-} |
1977 |
- |
1978 |
-src_install() { |
1979 |
- emake DESTDIR="${D}" install |
1980 |
-} |
1981 |
- |
1982 |
|
1983 |
diff --git a/app-emulation/supermin/supermin-9999.ebuild b/app-emulation/supermin/supermin-9999.ebuild |
1984 |
deleted file mode 120000 |
1985 |
index 2852cc8..0000000 |
1986 |
--- a/app-emulation/supermin/supermin-9999.ebuild |
1987 |
+++ /dev/null |
1988 |
@@ -1 +0,0 @@ |
1989 |
-supermin-5.1.18.ebuild |
1990 |
\ No newline at end of file |
1991 |
|
1992 |
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest |
1993 |
deleted file mode 100644 |
1994 |
index 0d923f1..0000000 |
1995 |
--- a/media-video/handbrake/Manifest |
1996 |
+++ /dev/null |
1997 |
@@ -1,7 +0,0 @@ |
1998 |
-AUX handbrake-0.10.3-nolibav.patch 2821 BLAKE2B 78294506e6b3efe71d7d14537c2e605d10067fd9e637f06ff3b01a9d8e6bea34dfb2c871bb2558e35310bebdb4922ae99f63d9f7911f7236a28ea1a4dc3d6832 SHA512 88a0b5df6cc198a8383a2d1dcf6d4c71f24445ea71e29dac570a2b3987cdaa0a563b56c7cccd291b58099dbdb15130bdcc0cd4527bdaeb442aefe4fa06455ec7 |
1999 |
-AUX handbrake-9999-fix-missing-x265-link-flag.patch 281 BLAKE2B 623f902bb31586513a51db95a63841e6234d4841d6332d2be9a6a0d7fd07f3e9cc694eb8945bebf718e10538fa390bbaa9dcbea81ba5324cbf20bd64bc582fdb SHA512 30d457258dd287cae3df66e7899b66480be2212a3969fe3a4e4f99ed383740e8f597fa7cf869922f29f501f100313b7efd78ebe09e2949ed4c235e2df22d22e5 |
2000 |
-AUX handbrake-9999-remove-dvdnav-dup.patch 809 BLAKE2B 16cde838dcf59753e5438df0d2c2b81f45667058bd0687a7368c528f61bd2a2fedc4462894daad58c3acb5c51bdd53df3b30e28adba93a0fb2838416e4226217 SHA512 e2005155adf29e8253f4313d209b2ccc642fb1d7f63256d3bdf675ddd0e6b0e15bc6bffd98e19aa7dab3907e161e29c5268dc5656590ce9254b12a91ac3ff6b0 |
2001 |
-AUX handbrake-9999-remove-faac-dependency.patch 3697 BLAKE2B b0f7d0a1c4d464d3287ab233b756f5036d6ffa7e9e59a2f98a8ffb2ae59e46d25e56edb3e5bf9c04a16330f3dc50f4c2426f252b35834b7c9c9e6b4904244368 SHA512 9d070e50a9b7d4b8ac25b7d56bd341aca6dc979ba506c84f4b95109909f70020723915cd120bed24e84a8fc242ee3c3a5775f43a78b7995e53cd499444c9f6dc |
2002 |
-DIST handbrake-1.0.7.tar.bz2 12650549 BLAKE2B 54fa6f4ee053de3ce1840695e66b0fef5ac09aed79f61755f146dbf990c624608e9acf2f81e69871ece85daf5a3f09780a75f43567c5b08afc55863495958ec7 SHA512 bacc5ff105893a0fdea95174839663e00027c87a13f00fb67d39c347b55e35869c0b998ec52181389b98cc2cc358d221e41d729e76952e4cb21fe8d12ee5a44a |
2003 |
-EBUILD handbrake-1.0.7.ebuild 3524 BLAKE2B 26efd30bd6f2e359fb5059aa2713645b7b7a3a1ae929b5492fb4589d2b76f454653994d88d8bbb875212080cc75933bf1cb8a90b1443022de0e7e2a7c0476786 SHA512 b519a8842dbd5a1420e1b3bd4256b2edbf5b1163c0a2eac90a6386798d86af63cdf18aa519f4244b51042a38a14a10cfae6fbf3211dbd9e1c981f730011dfb99 |
2004 |
-MISC metadata.xml 842 BLAKE2B c494d233f5eb83c6ad5f1eb02e332a8335cf908019942bd0526b45fd9186f300676474a7d814dcf221c8379e6d196f3eb9f14aba04ec10065c12b334176dba1c SHA512 d503d78aefd9a994d3197093f97dd3f958fb8347e6eff7598d9d5ef11a5eb17e0088bac4bb676dfa617dd0377ee185e2d0e80fe91feecd53e5257cbf9adc5f0e |
2005 |
|
2006 |
diff --git a/media-video/handbrake/files/handbrake-0.10.3-nolibav.patch b/media-video/handbrake/files/handbrake-0.10.3-nolibav.patch |
2007 |
deleted file mode 100644 |
2008 |
index 8539186..0000000 |
2009 |
--- a/media-video/handbrake/files/handbrake-0.10.3-nolibav.patch |
2010 |
+++ /dev/null |
2011 |
@@ -1,76 +0,0 @@ |
2012 |
-From 75549414927212d4d1666730133805b33447de79 Mon Sep 17 00:00:00 2001 |
2013 |
-From: John Stebbins <jstebbins.hb@×××××.com> |
2014 |
-Date: Tue, 3 Nov 2015 10:16:01 -0800 |
2015 |
-Subject: [PATCH] muxavformat: add support for mp4 fallback audio signalling |
2016 |
- |
2017 |
---- |
2018 |
-diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c |
2019 |
-index 0d70597..373c2ab 100644 |
2020 |
---- a/libhb/muxavformat.c |
2021 |
-+++ b/libhb/muxavformat.c |
2022 |
-@@ -121,7 +121,7 @@ static int avformatInit( hb_mux_object_t * m ) |
2023 |
- hb_mux_data_t * track; |
2024 |
- int meta_mux; |
2025 |
- int max_tracks; |
2026 |
-- int ii, ret; |
2027 |
-+ int ii, jj, ret; |
2028 |
- |
2029 |
- int clock_min, clock_max, clock; |
2030 |
- hb_video_framerate_get_limits(&clock_min, &clock_max, &clock); |
2031 |
-@@ -589,6 +589,56 @@ static int avformatInit( hb_mux_object_t * m ) |
2032 |
- } |
2033 |
- } |
2034 |
- |
2035 |
-+ // Check for audio track associations |
2036 |
-+ for (ii = 0; ii < hb_list_count(job->list_audio); ii++) |
2037 |
-+ { |
2038 |
-+ audio = hb_list_item(job->list_audio, ii); |
2039 |
-+ switch (audio->config.out.codec & HB_ACODEC_MASK) |
2040 |
-+ { |
2041 |
-+ case HB_ACODEC_FFAAC: |
2042 |
-+ case HB_ACODEC_CA_AAC: |
2043 |
-+ case HB_ACODEC_CA_HAAC: |
2044 |
-+ case HB_ACODEC_FDK_AAC: |
2045 |
-+ case HB_ACODEC_FDK_HAAC: |
2046 |
-+ break; |
2047 |
-+ |
2048 |
-+ default: |
2049 |
-+ { |
2050 |
-+ // Mark associated fallback audio tracks for any non-aac track |
2051 |
-+ for(jj = 0; jj < hb_list_count( job->list_audio ); jj++ ) |
2052 |
-+ { |
2053 |
-+ hb_audio_t * fallback; |
2054 |
-+ int codec; |
2055 |
-+ |
2056 |
-+ if (ii == jj) continue; |
2057 |
-+ |
2058 |
-+ fallback = hb_list_item( job->list_audio, jj ); |
2059 |
-+ codec = fallback->config.out.codec & HB_ACODEC_MASK; |
2060 |
-+ if (fallback->config.in.track == audio->config.in.track && |
2061 |
-+ (codec == HB_ACODEC_FFAAC || |
2062 |
-+ codec == HB_ACODEC_CA_AAC || |
2063 |
-+ codec == HB_ACODEC_CA_HAAC || |
2064 |
-+ codec == HB_ACODEC_FDK_AAC || |
2065 |
-+ codec == HB_ACODEC_FDK_HAAC)) |
2066 |
-+ { |
2067 |
-+ hb_mux_data_t * fallback_track; |
2068 |
-+ int * sd; |
2069 |
-+ |
2070 |
-+ track = audio->priv.mux_data; |
2071 |
-+ fallback_track = fallback->priv.mux_data; |
2072 |
-+ sd = (int*)av_stream_new_side_data(track->st, |
2073 |
-+ AV_PKT_DATA_FALLBACK_TRACK, |
2074 |
-+ sizeof(int)); |
2075 |
-+ if (sd != NULL) |
2076 |
-+ { |
2077 |
-+ *sd = fallback_track->st->index; |
2078 |
-+ } |
2079 |
-+ } |
2080 |
-+ } |
2081 |
-+ } break; |
2082 |
-+ } |
2083 |
-+ } |
2084 |
-+ |
2085 |
- char * subidx_fmt = |
2086 |
- "size: %dx%d\n" |
2087 |
- "org: %d, %d\n" |
2088 |
|
2089 |
diff --git a/media-video/handbrake/files/handbrake-9999-fix-missing-x265-link-flag.patch b/media-video/handbrake/files/handbrake-9999-fix-missing-x265-link-flag.patch |
2090 |
deleted file mode 100644 |
2091 |
index a963fe0..0000000 |
2092 |
--- a/media-video/handbrake/files/handbrake-9999-fix-missing-x265-link-flag.patch |
2093 |
+++ /dev/null |
2094 |
@@ -1,13 +0,0 @@ |
2095 |
-Written by: Peter Foley <pefoley2@×××××××.com> |
2096 |
-Gentoo Bug: #552792 |
2097 |
- |
2098 |
---- a/test/module.defs |
2099 |
-+++ b/test/module.defs |
2100 |
-@@ -25,6 +25,7 @@ |
2101 |
- |
2102 |
- ifeq (1,$(FEATURE.x265)) |
2103 |
- TEST.GCC.D += USE_X265 |
2104 |
-+ TEST.GCC.l += x265 |
2105 |
- endif |
2106 |
- |
2107 |
- TEST.GCC.l += $(foreach m,$(MODULES.NAMES),$($m.OSL.libs)) |
2108 |
|
2109 |
diff --git a/media-video/handbrake/files/handbrake-9999-remove-dvdnav-dup.patch b/media-video/handbrake/files/handbrake-9999-remove-dvdnav-dup.patch |
2110 |
deleted file mode 100644 |
2111 |
index 7dc1f69..0000000 |
2112 |
--- a/media-video/handbrake/files/handbrake-9999-remove-dvdnav-dup.patch |
2113 |
+++ /dev/null |
2114 |
@@ -1,20 +0,0 @@ |
2115 |
---- a/libhb/dvdnav.c |
2116 |
-+++ b/libhb/dvdnav.c |
2117 |
-@@ -1225,16 +1225,7 @@ |
2118 |
- { |
2119 |
- for (kk = 0; kk < buttons; kk++) |
2120 |
- { |
2121 |
-- dvdnav_t *dvdnav_copy; |
2122 |
-- |
2123 |
-- result = dvdnav_dup( &dvdnav_copy, d->dvdnav ); |
2124 |
-- if (result != DVDNAV_STATUS_OK) |
2125 |
-- { |
2126 |
-- hb_log("dvdnav dup failed: %s", dvdnav_err_to_string(d->dvdnav)); |
2127 |
-- goto done; |
2128 |
-- } |
2129 |
-- title = try_button( dvdnav_copy, kk, list_title ); |
2130 |
-- dvdnav_free_dup( dvdnav_copy ); |
2131 |
-+ title = try_button( d->dvdnav, kk, list_title ); |
2132 |
- |
2133 |
- if ( title >= 0 ) |
2134 |
- { |
2135 |
|
2136 |
diff --git a/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch b/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch |
2137 |
deleted file mode 100644 |
2138 |
index 7e8ab99..0000000 |
2139 |
--- a/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch |
2140 |
+++ /dev/null |
2141 |
@@ -1,84 +0,0 @@ |
2142 |
---- a/libhb/common.c |
2143 |
-+++ b/libhb/common.c |
2144 |
-@@ -243,7 +243,6 @@ |
2145 |
- { |
2146 |
- // legacy encoders, back to HB 0.9.4 whenever possible (disabled) |
2147 |
- { { "", "dts", NULL, HB_ACODEC_DCA_PASS, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_DTS_PASS, }, |
2148 |
-- { { "AAC (faac)", "faac", NULL, 0, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AAC, }, |
2149 |
- { { "AAC (ffmpeg)", "ffaac", NULL, HB_ACODEC_FFAAC, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AAC, }, |
2150 |
- { { "AC3 (ffmpeg)", "ffac3", NULL, HB_ACODEC_AC3, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AC3, }, |
2151 |
- { { "MP3 (lame)", "lame", NULL, HB_ACODEC_LAME, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_MP3, }, |
2152 |
---- a/scripts/manicure.rb |
2153 |
-+++ b/scripts/manicure.rb |
2154 |
-@@ -349,7 +349,7 @@ |
2155 |
- audioEncoders << "copy:dtshd" |
2156 |
- when /AAC Pass/ |
2157 |
- audioEncoders << "copy:aac" |
2158 |
-- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)" |
2159 |
-+ when "AAC (ffmpeg)", "AAC (avcodec)" |
2160 |
- audioEncoders << "av_aac" |
2161 |
- when "AAC (FDK)" |
2162 |
- audioEncoders << "fdk_aac" |
2163 |
-@@ -466,7 +466,7 @@ |
2164 |
- case hash["AudioEncoderFallback"] |
2165 |
- when /AC3/ |
2166 |
- audioEncoderFallback << "ac3" |
2167 |
-- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)" |
2168 |
-+ when "AAC (ffmpeg)", "AAC (avcodec)" |
2169 |
- audioEncoderFallback << "av_aac" |
2170 |
- when "AAC (FDK)" |
2171 |
- audioEncoderFallback << "fdk_aac" |
2172 |
-@@ -753,7 +753,7 @@ |
2173 |
- audioEncoders << "copy:dtshd" |
2174 |
- when /AAC Pass/ |
2175 |
- audioEncoders << "copy:aac" |
2176 |
-- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)" |
2177 |
-+ when "AAC (ffmpeg)", "AAC (avcodec)" |
2178 |
- audioEncoders << "av_aac" |
2179 |
- when "AAC (FDK)" |
2180 |
- audioEncoders << "fdk_aac" |
2181 |
-@@ -870,7 +870,7 @@ |
2182 |
- case hash["AudioEncoderFallback"] |
2183 |
- when /AC3/ |
2184 |
- audioEncoderFallback << "ac3" |
2185 |
-- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)" |
2186 |
-+ when "AAC (ffmpeg)", "AAC (avcodec)" |
2187 |
- audioEncoderFallback << "av_aac" |
2188 |
- when "AAC (FDK)" |
2189 |
- audioEncoderFallback << "fdk_aac" |
2190 |
-@@ -1163,7 +1163,7 @@ |
2191 |
- audioEncoders << "copy:dtshd" |
2192 |
- when /AAC Pass/ |
2193 |
- audioEncoders << "copy:aac" |
2194 |
-- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)" |
2195 |
-+ when "AAC (ffmpeg)", "AAC (avcodec)" |
2196 |
- audioEncoders << "av_aac" |
2197 |
- when "AAC (FDK)" |
2198 |
- audioEncoders << "fdk_aac" |
2199 |
-@@ -1298,7 +1298,7 @@ |
2200 |
- case hash["AudioEncoderFallback"] |
2201 |
- when /AC3/ |
2202 |
- audioEncoderFallback << "ac3" |
2203 |
-- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)" |
2204 |
-+ when "AAC (ffmpeg)", "AAC (avcodec)" |
2205 |
- audioEncoderFallback << "av_aac" |
2206 |
- when "AAC (FDK)" |
2207 |
- audioEncoderFallback << "fdk_aac" |
2208 |
-@@ -1615,7 +1615,7 @@ |
2209 |
- audioEncoders << "copy:dtshd" |
2210 |
- when /AAC Pass/ |
2211 |
- audioEncoders << "copy:aac" |
2212 |
-- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)" |
2213 |
-+ when "AAC (ffmpeg)", "AAC (avcodec)" |
2214 |
- audioEncoders << "av_aac" |
2215 |
- when "AAC (FDK)" |
2216 |
- audioEncoders << "fdk_aac" |
2217 |
-@@ -1732,7 +1732,7 @@ |
2218 |
- case hash["AudioEncoderFallback"] |
2219 |
- when /AC3/ |
2220 |
- audioEncoderFallback << "ac3" |
2221 |
-- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)" |
2222 |
-+ when "AAC (ffmpeg)", "AAC (avcodec)" |
2223 |
- audioEncoderFallback << "av_aac" |
2224 |
- when "AAC (FDK)" |
2225 |
- audioEncoderFallback << "fdk_aac" |
2226 |
|
2227 |
diff --git a/media-video/handbrake/handbrake-1.0.7.ebuild b/media-video/handbrake/handbrake-1.0.7.ebuild |
2228 |
deleted file mode 100644 |
2229 |
index 0ce6364..0000000 |
2230 |
--- a/media-video/handbrake/handbrake-1.0.7.ebuild |
2231 |
+++ /dev/null |
2232 |
@@ -1,156 +0,0 @@ |
2233 |
-# Copyright 1999-2017 Gentoo Foundation |
2234 |
-# Distributed under the terms of the GNU General Public License v2 |
2235 |
- |
2236 |
-EAPI=6 |
2237 |
- |
2238 |
-PYTHON_COMPAT=( python2_7 ) |
2239 |
- |
2240 |
-inherit autotools eutils gnome2-utils python-any-r1 |
2241 |
- |
2242 |
-if [[ ${PV} = *9999* ]]; then |
2243 |
- EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git" |
2244 |
- inherit git-r3 |
2245 |
- KEYWORDS="" |
2246 |
-else |
2247 |
- MY_P="HandBrake-${PV}" |
2248 |
- SRC_URI="http://handbrake.fr/rotation.php?file=${MY_P}.tar.bz2 -> ${P}.tar.bz2" |
2249 |
- S="${WORKDIR}/${MY_P}" |
2250 |
- KEYWORDS="~amd64 ~x86" |
2251 |
-fi |
2252 |
- |
2253 |
-DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder" |
2254 |
-HOMEPAGE="http://handbrake.fr/" |
2255 |
-LICENSE="GPL-2" |
2256 |
- |
2257 |
-SLOT="0" |
2258 |
-IUSE="+fdk gstreamer gtk libav libav-aac x265" |
2259 |
- |
2260 |
-REQUIRED_USE="^^ ( fdk libav-aac )" |
2261 |
- |
2262 |
-RDEPEND=" |
2263 |
- dev-libs/jansson |
2264 |
- media-libs/a52dec |
2265 |
- media-libs/libass:= |
2266 |
- >=media-libs/libbluray-1.0 |
2267 |
- media-libs/libdvdnav |
2268 |
- media-libs/libdvdread |
2269 |
- media-libs/libsamplerate |
2270 |
- media-libs/libtheora |
2271 |
- media-libs/libvorbis |
2272 |
- media-libs/libvpx |
2273 |
- media-libs/opus |
2274 |
- media-libs/x264:= |
2275 |
- media-sound/lame |
2276 |
- sys-libs/zlib |
2277 |
- libav? ( >=media-video/libav-10.1:0=[fdk?] ) |
2278 |
- !libav? ( >=media-video/ffmpeg-2.3:0=[fdk?] ) |
2279 |
- gstreamer? ( |
2280 |
- media-libs/gstreamer:1.0 |
2281 |
- media-libs/gst-plugins-base:1.0 |
2282 |
- media-libs/gst-plugins-good:1.0 |
2283 |
- media-libs/gst-plugins-bad:1.0 |
2284 |
- media-libs/gst-plugins-ugly:1.0 |
2285 |
- media-plugins/gst-plugins-a52dec:1.0 |
2286 |
- media-plugins/gst-plugins-libav:1.0 |
2287 |
- media-plugins/gst-plugins-x264:1.0 |
2288 |
- ) |
2289 |
- gtk? ( |
2290 |
- >=x11-libs/gtk+-3.10 |
2291 |
- dev-libs/dbus-glib |
2292 |
- dev-libs/glib:2 |
2293 |
- x11-libs/cairo |
2294 |
- x11-libs/gdk-pixbuf:2 |
2295 |
- x11-libs/libnotify |
2296 |
- x11-libs/pango |
2297 |
- virtual/libgudev:= |
2298 |
- ) |
2299 |
- fdk? ( media-libs/fdk-aac ) |
2300 |
- x265? ( >=media-libs/x265-1.7:0= ) |
2301 |
- " |
2302 |
- |
2303 |
-DEPEND="${RDEPEND} |
2304 |
- ${PYTHON_DEPS} |
2305 |
- dev-lang/yasm |
2306 |
- dev-util/intltool |
2307 |
- sys-devel/automake" |
2308 |
- |
2309 |
-PATCHES=( |
2310 |
- # Remove libdvdnav duplication and call it on the original instead. |
2311 |
- # It may work this way; if not, we should try to mimic the duplication. |
2312 |
- "${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch" |
2313 |
- |
2314 |
- # Remove faac dependency; TODO: figure out if we need to do this at all. |
2315 |
- "${FILESDIR}/${PN}-9999-remove-faac-dependency.patch" |
2316 |
- |
2317 |
- # Fix missing x265 link flag |
2318 |
- "${FILESDIR}/${PN}-9999-fix-missing-x265-link-flag.patch" |
2319 |
-) |
2320 |
- |
2321 |
-pkg_setup() { |
2322 |
- python-any-r1_pkg_setup |
2323 |
-} |
2324 |
- |
2325 |
-src_prepare() { |
2326 |
- # Get rid of leftover bundled library build definitions, |
2327 |
- sed -i 's:.*\(/contrib\|contrib/\).*::g' \ |
2328 |
- "${S}"/make/include/main.defs \ |
2329 |
- || die "Contrib removal failed." |
2330 |
- |
2331 |
- default |
2332 |
- |
2333 |
- # Get rid of libav specific code when using ffmpeg |
2334 |
- use libav || eapply -R "${FILESDIR}/${PN}-0.10.3-nolibav.patch" |
2335 |
- |
2336 |
- cd "${S}/gtk" |
2337 |
- # Don't run autogen.sh. |
2338 |
- sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed" |
2339 |
- eautoreconf |
2340 |
-} |
2341 |
- |
2342 |
-src_configure() { |
2343 |
- ./configure \ |
2344 |
- --force \ |
2345 |
- --verbose \ |
2346 |
- --prefix="${EPREFIX}/usr" \ |
2347 |
- --disable-gtk-update-checks \ |
2348 |
- $(use_enable libav-aac) \ |
2349 |
- $(use_enable fdk fdk-aac) \ |
2350 |
- $(use_enable gtk) \ |
2351 |
- $(usex !gstreamer --disable-gst) \ |
2352 |
- $(use_enable x265) || die "Configure failed." |
2353 |
-} |
2354 |
- |
2355 |
-src_compile() { |
2356 |
- emake -C build |
2357 |
- |
2358 |
- # TODO: Documentation building is currently broken, try to fix it. |
2359 |
- # |
2360 |
- # if use doc ; then |
2361 |
- # emake -C build doc |
2362 |
- # fi |
2363 |
-} |
2364 |
- |
2365 |
-src_install() { |
2366 |
- emake -C build DESTDIR="${D}" install |
2367 |
- |
2368 |
- dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown |
2369 |
-} |
2370 |
- |
2371 |
-pkg_postinst() { |
2372 |
- einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`." |
2373 |
- |
2374 |
- if use gtk ; then |
2375 |
- einfo "" |
2376 |
- einfo "For the GTK+ version of HandBrake, you can run \`ghb\`." |
2377 |
- fi |
2378 |
- |
2379 |
- gnome2_icon_cache_update |
2380 |
-} |
2381 |
- |
2382 |
-pkg_preinst() { |
2383 |
- gnome2_icon_savelist |
2384 |
-} |
2385 |
- |
2386 |
-pkg_postrm() { |
2387 |
- gnome2_icon_cache_update |
2388 |
-} |
2389 |
|
2390 |
diff --git a/media-video/handbrake/metadata.xml b/media-video/handbrake/metadata.xml |
2391 |
deleted file mode 100644 |
2392 |
index 1c5819c..0000000 |
2393 |
--- a/media-video/handbrake/metadata.xml |
2394 |
+++ /dev/null |
2395 |
@@ -1,18 +0,0 @@ |
2396 |
-<?xml version="1.0" encoding="UTF-8"?> |
2397 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
2398 |
-<pkgmetadata> |
2399 |
- <maintainer type="person"> |
2400 |
- <email>thev00d00@g.o</email> |
2401 |
- <name>Ian Whyman</name> |
2402 |
- </maintainer> |
2403 |
- <longdescription> |
2404 |
- Open-source, GPL-licensed, multiplatform, multithreaded video transcoder. |
2405 |
- </longdescription> |
2406 |
- <use> |
2407 |
- <flag name="gstreamer">Support for the streaming media framework from <pkg>media-libs/gstreamer</pkg>.</flag> |
2408 |
- <flag name="gtk">Install the GTK UI, ghb.</flag> |
2409 |
- <flag name="fdk">Support for encoding AAC using <pkg>media-libs/fdk-aac</pkg>.</flag> |
2410 |
- <flag name="libav-aac">Support for encoding AAC using <pkg>media-video/libav</pkg>'s internal encoder.</flag> |
2411 |
- <flag name="x265">Support for encoding h265 using <pkg>media-libs/x265</pkg>.</flag> |
2412 |
- </use> |
2413 |
-</pkgmetadata> |
2414 |
|
2415 |
diff --git a/sys-fs/btrfsmaintenance/ChangeLog b/sys-fs/btrfsmaintenance/ChangeLog |
2416 |
deleted file mode 100644 |
2417 |
index 58d54e7..0000000 |
2418 |
--- a/sys-fs/btrfsmaintenance/ChangeLog |
2419 |
+++ /dev/null |
2420 |
@@ -1,4 +0,0 @@ |
2421 |
-# ChangeLog for net-misc/axel |
2422 |
-# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2 |
2423 |
-# (auto-generated from git log) |
2424 |
- |
2425 |
|
2426 |
diff --git a/sys-fs/btrfsmaintenance/Manifest b/sys-fs/btrfsmaintenance/Manifest |
2427 |
deleted file mode 100644 |
2428 |
index 8cbc6d2..0000000 |
2429 |
--- a/sys-fs/btrfsmaintenance/Manifest |
2430 |
+++ /dev/null |
2431 |
@@ -1,4 +0,0 @@ |
2432 |
-EBUILD btrfsmaintenance-0.3.1.ebuild 1677 SHA256 d8d420dea519c290f5da36fe9087bb5945333729afa908828acaea3f32430a96 SHA512 393fbaae5f81e231a2ab6d4c45a98850a2b84d4ddae703a8c986fab7d5b63d426c09f9c461dfabe5039329284d8baedad3f2305282934f5a1f7fa4af08397c89 WHIRLPOOL 4a770eed20e1ca9bfe01a2d4bb28364b05b8fa1133ef82bca6515a7b0af5ea182d4bdb588968f26df0535a86afd99b7243d2f474a87182878f413724879dac44 |
2433 |
-EBUILD btrfsmaintenance-9999.ebuild 1677 SHA256 d8d420dea519c290f5da36fe9087bb5945333729afa908828acaea3f32430a96 SHA512 393fbaae5f81e231a2ab6d4c45a98850a2b84d4ddae703a8c986fab7d5b63d426c09f9c461dfabe5039329284d8baedad3f2305282934f5a1f7fa4af08397c89 WHIRLPOOL 4a770eed20e1ca9bfe01a2d4bb28364b05b8fa1133ef82bca6515a7b0af5ea182d4bdb588968f26df0535a86afd99b7243d2f474a87182878f413724879dac44 |
2434 |
-MISC ChangeLog 133 SHA256 b43e8276967303e6b4861bc8bd72e25af3b18508e968a04da060d9baac51f197 SHA512 ec2d17be6bdff644ed4b2d4560fa4df52ae95662ac1bf3870d395bef10c426e939607856bd26d58d3cec34ee90547d8eb09bd11e394e9a2028f43400bc24d2f2 WHIRLPOOL cad0c613c8ed3dec798100c471c9bfcc2df31901ad1c23d20f04bca7215efe18fc5fe3d73f4ef53dada0be3d0e70c0985e591b41073b1bc9cd6fe7a0dcca66a5 |
2435 |
-MISC metadata.xml 229 SHA256 07a0b6bbb40a353798239f40efd4e2260b64bcfd78c19802da7e8676b0a91599 SHA512 b836c807530b0453ea5ab90e2805759b1d3c4cc0b3a25848b8f0b682c0e99c6422b2a687db1c45e4ebd180f37cf8dc011231e62124d7568bfd7ae10ce46f8a30 WHIRLPOOL 288c65b78dd23fb26e6832f84209395ba6f146c56d3d12352d08d438ff3b34907bebe9753db878fb62e2fac89b4e19b6c8be7f099347a182f00296dfe98afa23 |
2436 |
|
2437 |
diff --git a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.3.1.ebuild b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.3.1.ebuild |
2438 |
deleted file mode 100644 |
2439 |
index 1f91d3c..0000000 |
2440 |
--- a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.3.1.ebuild |
2441 |
+++ /dev/null |
2442 |
@@ -1,75 +0,0 @@ |
2443 |
-# Copyright 1999-2015 Gentoo Foundation |
2444 |
-# Distributed under the terms of the GNU General Public License v2 |
2445 |
-# $Id$ |
2446 |
- |
2447 |
-EAPI=6 |
2448 |
-#PYTHON_COMPAT=( python2_7 ) |
2449 |
- |
2450 |
-if [[ $PV = *9999* ]]; then |
2451 |
- scm_eclass=git-r3 |
2452 |
- EGIT_REPO_URI=" |
2453 |
- https://github.com/kdave/btrfsmaintenance.git |
2454 |
- git@××××××.com:kdave/btrfsmaintenance.git" |
2455 |
- SRC_URI="" |
2456 |
- KEYWORDS="" |
2457 |
-else |
2458 |
- scm_eclass=git-r3 |
2459 |
- EGIT_REPO_URI=" |
2460 |
- https://github.com/kdave/btrfsmaintenance.git |
2461 |
- git@××××××.com:kdave/btrfsmaintenance.git" |
2462 |
- EGIT_COMMIT="v$PV" |
2463 |
- SRC_URI="" |
2464 |
- KEYWORDS="~amd64 ~x86" |
2465 |
-fi |
2466 |
- |
2467 |
-inherit autotools eutils systemd user ${scm_eclass} |
2468 |
- |
2469 |
-DESCRIPTION="Scripts for btrfs periodic maintenance task" |
2470 |
-HOMEPAGE="https://github.com/kdave/btrfsmaintenance" |
2471 |
- |
2472 |
-LICENSE="GPL2" |
2473 |
-SLOT="0" |
2474 |
-#IUSE="" |
2475 |
- |
2476 |
-#CDEPEND=" |
2477 |
-# " |
2478 |
-#DEPEND="${CDEPEND} |
2479 |
-# " |
2480 |
-RDEPEND="app-shells/bash |
2481 |
- sys-fs/btrfs-progs" |
2482 |
- |
2483 |
-src_install() { |
2484 |
- #dodir "/usr/share/${PN}" |
2485 |
- # copy files to expected directory |
2486 |
- #cp -R "${S}/${P}/" "${D}/usr/share/${PN}" || die "Install failed!" |
2487 |
- |
2488 |
- exeinto "/usr/share/${PN}" |
2489 |
- doexe btrfs-balance.sh |
2490 |
- doexe btrfs-defrag.sh |
2491 |
- doexe btrfs-scrub.sh |
2492 |
- doexe btrfs-trim.sh |
2493 |
- doexe ${PN}-refresh-cron.sh |
2494 |
- doexe prepare-release.sh |
2495 |
- doexe dist-install.sh |
2496 |
- |
2497 |
- insinto "/usr/share/${PN}" |
2498 |
- doins btrfs-defrag-plugin.py |
2499 |
- doins ${PN}.changes |
2500 |
- doins ${PN}-functions |
2501 |
- doins sysconfig.${PN} |
2502 |
- doins README.md |
2503 |
- doins COPYING |
2504 |
- |
2505 |
- insinto "/etc/default" |
2506 |
- newins sysconfig.${PN} ${PN} |
2507 |
- |
2508 |
- systemd_dounit ${PN}-refresh.service |
2509 |
- |
2510 |
- dosym "/usr/share/${PN}/${PN}-refresh-cron.sh" "/etc/cron.hourly/" |
2511 |
-} |
2512 |
- |
2513 |
-pkg_postinst() { |
2514 |
- elog "You will need to review your /etc/default/${PN} file before starting the service." |
2515 |
- elog "The source file is at /usr/share/${PN}/sysconfig.${PN}. Setup as necessary." |
2516 |
-} |
2517 |
- |
2518 |
|
2519 |
diff --git a/sys-fs/btrfsmaintenance/btrfsmaintenance-9999.ebuild b/sys-fs/btrfsmaintenance/btrfsmaintenance-9999.ebuild |
2520 |
deleted file mode 100644 |
2521 |
index 1f91d3c..0000000 |
2522 |
--- a/sys-fs/btrfsmaintenance/btrfsmaintenance-9999.ebuild |
2523 |
+++ /dev/null |
2524 |
@@ -1,75 +0,0 @@ |
2525 |
-# Copyright 1999-2015 Gentoo Foundation |
2526 |
-# Distributed under the terms of the GNU General Public License v2 |
2527 |
-# $Id$ |
2528 |
- |
2529 |
-EAPI=6 |
2530 |
-#PYTHON_COMPAT=( python2_7 ) |
2531 |
- |
2532 |
-if [[ $PV = *9999* ]]; then |
2533 |
- scm_eclass=git-r3 |
2534 |
- EGIT_REPO_URI=" |
2535 |
- https://github.com/kdave/btrfsmaintenance.git |
2536 |
- git@××××××.com:kdave/btrfsmaintenance.git" |
2537 |
- SRC_URI="" |
2538 |
- KEYWORDS="" |
2539 |
-else |
2540 |
- scm_eclass=git-r3 |
2541 |
- EGIT_REPO_URI=" |
2542 |
- https://github.com/kdave/btrfsmaintenance.git |
2543 |
- git@××××××.com:kdave/btrfsmaintenance.git" |
2544 |
- EGIT_COMMIT="v$PV" |
2545 |
- SRC_URI="" |
2546 |
- KEYWORDS="~amd64 ~x86" |
2547 |
-fi |
2548 |
- |
2549 |
-inherit autotools eutils systemd user ${scm_eclass} |
2550 |
- |
2551 |
-DESCRIPTION="Scripts for btrfs periodic maintenance task" |
2552 |
-HOMEPAGE="https://github.com/kdave/btrfsmaintenance" |
2553 |
- |
2554 |
-LICENSE="GPL2" |
2555 |
-SLOT="0" |
2556 |
-#IUSE="" |
2557 |
- |
2558 |
-#CDEPEND=" |
2559 |
-# " |
2560 |
-#DEPEND="${CDEPEND} |
2561 |
-# " |
2562 |
-RDEPEND="app-shells/bash |
2563 |
- sys-fs/btrfs-progs" |
2564 |
- |
2565 |
-src_install() { |
2566 |
- #dodir "/usr/share/${PN}" |
2567 |
- # copy files to expected directory |
2568 |
- #cp -R "${S}/${P}/" "${D}/usr/share/${PN}" || die "Install failed!" |
2569 |
- |
2570 |
- exeinto "/usr/share/${PN}" |
2571 |
- doexe btrfs-balance.sh |
2572 |
- doexe btrfs-defrag.sh |
2573 |
- doexe btrfs-scrub.sh |
2574 |
- doexe btrfs-trim.sh |
2575 |
- doexe ${PN}-refresh-cron.sh |
2576 |
- doexe prepare-release.sh |
2577 |
- doexe dist-install.sh |
2578 |
- |
2579 |
- insinto "/usr/share/${PN}" |
2580 |
- doins btrfs-defrag-plugin.py |
2581 |
- doins ${PN}.changes |
2582 |
- doins ${PN}-functions |
2583 |
- doins sysconfig.${PN} |
2584 |
- doins README.md |
2585 |
- doins COPYING |
2586 |
- |
2587 |
- insinto "/etc/default" |
2588 |
- newins sysconfig.${PN} ${PN} |
2589 |
- |
2590 |
- systemd_dounit ${PN}-refresh.service |
2591 |
- |
2592 |
- dosym "/usr/share/${PN}/${PN}-refresh-cron.sh" "/etc/cron.hourly/" |
2593 |
-} |
2594 |
- |
2595 |
-pkg_postinst() { |
2596 |
- elog "You will need to review your /etc/default/${PN} file before starting the service." |
2597 |
- elog "The source file is at /usr/share/${PN}/sysconfig.${PN}. Setup as necessary." |
2598 |
-} |
2599 |
- |
2600 |
|
2601 |
diff --git a/sys-fs/btrfsmaintenance/metadata.xml b/sys-fs/btrfsmaintenance/metadata.xml |
2602 |
deleted file mode 100644 |
2603 |
index 96932c3..0000000 |
2604 |
--- a/sys-fs/btrfsmaintenance/metadata.xml |
2605 |
+++ /dev/null |
2606 |
@@ -1,7 +0,0 @@ |
2607 |
-<?xml version="1.0" encoding="UTF-8"?> |
2608 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
2609 |
-<pkgmetadata> |
2610 |
- <maintainer type="person"> |
2611 |
- <email>samuelbernardo.mail@×××××.com</email> |
2612 |
- </maintainer> |
2613 |
-</pkgmetadata> |
2614 |
|
2615 |
diff --git a/sys-fs/zrep/Manifest b/sys-fs/zrep/Manifest |
2616 |
index 88192ef..3495a0f 100644 |
2617 |
--- a/sys-fs/zrep/Manifest |
2618 |
+++ b/sys-fs/zrep/Manifest |
2619 |
@@ -1,4 +1,4 @@ |
2620 |
-EBUILD zrep-1.8.0.ebuild 957 BLAKE2B 8d5357fd1839ea4e39e24d804651f4736d002494780e9c5db2dfd81d8f345f384aab1f374a51b124c4409a6fc2d3557da86e61a15ce0e38d74e1237b7f589c6d SHA512 9c6a0b88281e33b3a5cfc3edb624890b234a668563c914bc26b9a28def539faa6e30d9d1ecb6f80eba4106b70e39564cfaeebc525c83519ad73304ad663ebcea |
2621 |
-EBUILD zrep-9999.ebuild 926 BLAKE2B 8659480c5dfbcf9f59e6c81cb1eb0b94cf8cd28d68fc05f685788221a9b32b2cfc7d520c295ffebb0211d8bc74b2b85e8d9263992b39c6a7e185c31ad84a3160 SHA512 ed5e6267adf27b94650f99b127bae7b326de52040f543713c40d87db94ab3c5487f005807786e1e3112a47bf68763d2f3be74bee697e592d5d5692d062626d72 |
2622 |
+EBUILD zrep-2.0.2.ebuild 945 BLAKE2B bde5206b09fc4883d493e44bdaf58194602c903388f9a4a5df4c891fcec481c8b8a19640fc40865ebcfe6b05443ad940efa1f9779464d392c7de626c14b9c2fd SHA512 61fe6f8b20a2d70c7280e07adfe7ad02e28989db6f49b5655345acfa2cf66237aca53df077055ceda85ee2fff63d784f20e95e03840dfee11a597d1b6fde5e76 |
2623 |
+EBUILD zrep-9999.ebuild 914 BLAKE2B 7dd983303f9ee072c4462022b678c92dd6bd5cd7626bc464ff1bd6ac63b341b4ef1d07ec6b3f40ab362f45c2ca8e0c59c45384312763c93c2ed8767296201703 SHA512 bfdfb8086b437095e44266c86e0039d9fb496eb4e803a9ee6075ecc35e2325368a72a604279bd0804ee287b055afcef71ae488d46179ce6121b307459f1502f6 |
2624 |
MISC ChangeLog 133 BLAKE2B e3d7db1c4126e57bb9653a3df59b1ecfb118c0e6eac26d345c719163d2444616f7ea2510312936baadf88eaa2a72a001e389697bec74b47f31dc7b234c08f516 SHA512 ec2d17be6bdff644ed4b2d4560fa4df52ae95662ac1bf3870d395bef10c426e939607856bd26d58d3cec34ee90547d8eb09bd11e394e9a2028f43400bc24d2f2 |
2625 |
MISC metadata.xml 229 BLAKE2B 9f28cf7b6b1e283d6e0f0ab7f7a611ba23584a2adcfdc52987dec50cc570e19044413260a61d13409b2e0e626b8b59460193c82e8e0fefcd5c5c8a4f75b79f4e SHA512 b836c807530b0453ea5ab90e2805759b1d3c4cc0b3a25848b8f0b682c0e99c6422b2a687db1c45e4ebd180f37cf8dc011231e62124d7568bfd7ae10ce46f8a30 |
2626 |
|
2627 |
diff --git a/sys-fs/zrep/zrep-1.8.0.ebuild b/sys-fs/zrep/zrep-2.0.2.ebuild |
2628 |
similarity index 90% |
2629 |
rename from sys-fs/zrep/zrep-1.8.0.ebuild |
2630 |
rename to sys-fs/zrep/zrep-2.0.2.ebuild |
2631 |
index 3423419..dd95738 100644 |
2632 |
--- a/sys-fs/zrep/zrep-1.8.0.ebuild |
2633 |
+++ b/sys-fs/zrep/zrep-2.0.2.ebuild |
2634 |
@@ -1,8 +1,8 @@ |
2635 |
-# Copyright 1999-2022 Gentoo Authors |
2636 |
+# Copyright 1999-2023 Gentoo Authors |
2637 |
# Distributed under the terms of the GNU General Public License v2 |
2638 |
# $Id$ |
2639 |
|
2640 |
-EAPI=7 |
2641 |
+EAPI=8 |
2642 |
#PYTHON_COMPAT=( python2_7 ) |
2643 |
|
2644 |
if [[ $PV = *9999* ]]; then |
2645 |
@@ -25,7 +25,7 @@ else |
2646 |
KEYWORDS="~amd64 ~x86" |
2647 |
fi |
2648 |
|
2649 |
-inherit autotools eutils user ${scm_eclass} |
2650 |
+inherit autotools ${scm_eclass} |
2651 |
|
2652 |
DESCRIPTION="ZFS based replication and failover solution" |
2653 |
HOMEPAGE="http://www.bolthole.com/solaris/zrep/" |
2654 |
|
2655 |
diff --git a/sys-fs/zrep/zrep-9999.ebuild b/sys-fs/zrep/zrep-9999.ebuild |
2656 |
index 30bb7e4..34bf46d 100644 |
2657 |
--- a/sys-fs/zrep/zrep-9999.ebuild |
2658 |
+++ b/sys-fs/zrep/zrep-9999.ebuild |
2659 |
@@ -1,8 +1,8 @@ |
2660 |
-# Copyright 1999-2022 Gentoo Authors |
2661 |
+# Copyright 1999-2023 Gentoo Authors |
2662 |
# Distributed under the terms of the GNU General Public License v2 |
2663 |
# $Id$ |
2664 |
|
2665 |
-EAPI=7 |
2666 |
+EAPI=8 |
2667 |
#PYTHON_COMPAT=( python2_7 ) |
2668 |
|
2669 |
if [[ $PV = *9999* ]]; then |
2670 |
@@ -24,7 +24,7 @@ else |
2671 |
KEYWORDS="~amd64 ~x86" |
2672 |
fi |
2673 |
|
2674 |
-inherit autotools eutils user ${scm_eclass} |
2675 |
+inherit autotools ${scm_eclass} |
2676 |
|
2677 |
DESCRIPTION="ZFS based replication and failover solution" |
2678 |
HOMEPAGE="http://www.bolthole.com/solaris/zrep/" |