gentoo resync : 22.12.2021

12 files changed, 0 insertions, 751 deletions

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
deleted file mode 100644
index 56ea67096ca2..000000000000
--- a/app-emulation/lxd/Manifest
+++ /dev/null
@@ -1,15 +0,0 @@
-AUX lxd-4.0.0.confd 582 BLAKE2B 88ce8ec99eb50174bffea7d3b8bddc67b50fe6677d54df115c9069311b5fb59a72170a15988f50714740074f7ec4f2cd32fb47b6d8c52cf69b8c6fa332162a06 SHA512 96d922ae81677eebace3f8d2dff7f67d58701c40c09e2435677f9289cca89fe260c0d9526059d3772c3405a5b8ec52466bf7d7a920dcdd7551f1b3f01f2fc9c4
-AUX lxd-4.0.0.initd 1221 BLAKE2B cdff6d900e09f85d9a4dc86b30f0d32b848689e209b79b48217e2f844a48fb358850cbc27db1aed7c1b957bbc19af2d76856fd65319a0a207cedfefbadf659cc SHA512 8b176036c1e5f2ffac4c94e781694fb637fa53666f10da1d5d2b3f1fc341f02003e5306dbd332edd9eeb6f7b08dffd9190c7f65361a40220f6f88d56e4c78a57
-AUX lxd-4.0.0.socket 197 BLAKE2B 8c0d2dee71c14ee5f34b2bd0804adfa06ab3ae2a73bcf8d122184434c42b7f91f66fe610bddda93c458e0f171b505fe79a4f268d8243aabdf226f47e95027e71 SHA512 d70dc867b2e92b69928c83fc5feca4e387808adbc267b9fe4ecf0c8befdf3ca13366b229c6eefcb5667e51405fb0aa4e6bb8f59a0b5b5fb3895c46b4aaab0661
-AUX lxd-4.0.7-no-werror.patch 5387 BLAKE2B a13ef0b87a91aa5e44a3bc527c8d339249653139bbc35d78a1b0f0c1f3412b083f7016e634640dff1e3ab18099e5b56551c7fb2eb6b898f984cb2f9f90acafc2 SHA512 6abb81bc43cc82a2716cce8e68741d32db33d860a09fc21e5df781c298abf7e88fc5ccab1513e1d635c839a801e092c16d7e92eb0fe616a3b680db47153dcf0c
-AUX lxd-4.0.7-r1.service 497 BLAKE2B 90141dce8dbef52521c5f9c2924111904f8b0528e8555afb8a2eb8d9dc8b4c6b32b543a6ee3caf42dc0a90f20d35d40810a3f0828a88377e91424f7b00e589a8 SHA512 91fa16a9e9de2eda34c06ec66c144a43fe1cb23c99137cbd830ff9621c7362989404ca9906e4f53b3c10ba84c3cc950713cb69ed7a81bd66f07935312f8f75f8
-AUX lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch 2184 BLAKE2B ee6b371694a594606b25ac6950032f3613be4da470c9b991bf30f0f1911b563844f20180009c7049f1e5ad461e83025f82764ae00777bc811e05b26a2b6690b8 SHA512 7d126f4c59007862dce8dd4273b1b335a6f29e1631012adb7f1486778179dc03a2e94aa3fed38b7ad075fd65bf2efb580800b9450dac21c088778d0cef32fcff
-AUX lxd-containers-4.0.0.service 322 BLAKE2B a38cffd4b5809946abdac858564dcab2c2967c295d671df0d315d790df1849e25f0bc052e20cd0d9e4c23403289050b4538f5a52437ab8ae9ca3b40c6a9a1571 SHA512 a55f2c1a367c5c3c5eb6880e01893977de18c6e9463949236ee3247715fbf53641bbe1b69404362dd6cb6ba2a30ac6539fd362b21059e529dc4dac4ec5ca6718
-AUX lxd-syscall_wrappers-don-t-conflict-with-glibc-provided.patch 2055 BLAKE2B 4f17aeb03e6022b6e88c4279865215fbecb699b9cc112a8e1fe16d9cda113e41d39faf448d17f9810bb65efb37d37b74b3c20ffb65329e012820f46705235f6f SHA512 1f0846ab9aa3ebfd96e79a91bc17be871f0ac3af44ddd3f9ba2a17570b2d800407a76634476e61d6d1f8bfbb880f5df37ad3b435a139e62f4c1c786c002d29d4
-DIST lxd-4.0.7.tar.gz 15454709 BLAKE2B 6278fa058efa15a689a982dcf0bce58bf320ac500bc8bd6cd4227f5f126a03dd85a65363d4d36b3437a0a2fd8e08e8a7332b96f9aba8e8eb2aa508d1129fec13 SHA512 dd99db21a4de95d95e6bd53dcbd68f4d9f0ffbd9e60d994340cd0b1e820068e671507a9718d1c56488c79ad49019f86637a4a8b9c945cdd3f70d59c9e2026fb1
-DIST lxd-4.0.7.tar.gz.asc 833 BLAKE2B a28e43d1fd0d5851a62121069703637e7ba25cbeb142507e4e162b254eddce2b5a13a100eedb202fbf3d8aa40f6e20b4fd587ef38f6c73a07d2bd9d8d9d00c8f SHA512 561d7cbf94a37e7ed03828ac98a2022dc1a4e11b80cdee3ad925bf4226b78b9e1d1b9c51ed070e60fba881b69e06dc70be2713026285b10de5cca59549ac5f82
-DIST lxd-4.0.8.tar.gz 8898153 BLAKE2B c02bea1019079f59fff5fbb2c3d3ebf13e01751fd1c18b9aa44a9306a8f631cb0c0a55f77eb17945e44c040dfdad5c790bb2c2e3ab165356e3900c3d6cccec0e SHA512 9bf5ee91438bc14e916410254979838a110d21d8329c0eaa0a5eecfd378039a3ac10291197d2f680dc12484866f21ef724618e88e6c02038e6d2484d33571dd6
-DIST lxd-4.0.8.tar.gz.asc 833 BLAKE2B 2073b113f34b2ab052e6e4f406016ac04631ec63269b79dd1e85ca5191aa73ed1f47f0e87f5155b6e5c6659138a182c4c403a66e20925cdb347f49e542e8139b SHA512 9b5f00f9d4a601e718ca91f623dd31e864963b7b8a9e9be6af8da2288b775c4fc8c60b0d6fcefa2a347d733d1e002a3714ac3dbfadf9a1188f9747e9682fe8b9
-EBUILD lxd-4.0.7-r2.ebuild 4485 BLAKE2B 8adf5a720156d2a01b15052bcc45f2184fc343192421a8a159cd1c208711015ae2b4ddf051294bf148bb3b20b4cba1b74e92db2e465cac1c4bad4bace44a9a74 SHA512 c8a68f075c2879117ad817146ef783fc3527a961817d03a73361f2a12270d05d06e3bc01a8f111e54905a012f4ea6c6f67731b1dbdc3ef0e93e3c2c262420c08
-EBUILD lxd-4.0.8-r1.ebuild 4543 BLAKE2B 816fbb3f91aa6194d6dba0e763dd87d3a23c0274ad565dff94e04073d400a1d56cc9ebf84777b3b35596a8e1e479e3999325721daa38758e8edbb077d62039c4 SHA512 060c13ae076b1a559a1432aca31d55982d85df2022a3cf02c0797f2699332c65a8e53fde8c29de733f88f14a30db263b30850535c23cd883be930bc2b09ed830
-MISC metadata.xml 777 BLAKE2B e25ff2ac780143763e40917f2570bbe8244c2a2a9eac1a9761199e7ea19df9863ade968ca8218f62da9fe41f3b9e7110ef86abff764c2a3d85f02ae102951a16 SHA512 e39a06e8b838990a9b0019f52e1d0c7dd83527c6a15bc8a14f0aa9fec2ee86c914de52f1ba48e7a586c3866d9da46dc32c2d6e1ea3e2c42ca985fdfe0783b40c
diff --git a/app-emulation/lxd/files/lxd-4.0.0.confd b/app-emulation/lxd/files/lxd-4.0.0.confd
deleted file mode 100644
index 68cf344995be..000000000000
--- a/app-emulation/lxd/files/lxd-4.0.0.confd
+++ /dev/null
@@ -1,23 +0,0 @@
-# Group which owns the shared socket
-LXD_OPTIONS+=" --group lxd"
-
-# Enable cpu profiling into the specified file
-#LXD_OPTIONS+=" --cpuprofile /tmp/lxc_cpu_profile"
-
-# Enable memory profiling into the specified file
-#LXD_OPTIONS+=" --memprofile /tmp/lxc_mem_profile"
-
-# Enable debug mode
-#LXD_OPTIONS+=" --debug"
-
-# For debugging, print a complete stack trace every n seconds
-#LXD_OPTIONS+=" --print-goroutines-every 5"
-
-# Enable verbose mode
-#LXD_OPTIONS+=" -v"
-
-# Logfile to log to
-#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
-
-# Enable syslog logging
-#LXD_OPTIONS+=" --syslog"
diff --git a/app-emulation/lxd/files/lxd-4.0.0.initd b/app-emulation/lxd/files/lxd-4.0.0.initd
deleted file mode 100644
index e6ae971e879f..000000000000
--- a/app-emulation/lxd/files/lxd-4.0.0.initd
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-DAEMON=/usr/sbin/lxd
-PIDFILE=/run/lxd.pid
-
-depend() {
-	need net
-	need lxcfs
-}
-
-start() {
-	ebegin "Starting lxd service"
-
-	modprobe -f loop > /dev/null 2>&1
-
-	# fix permissions on /var/lib/lxd and make sure it exists
-	install -d /var/lib/lxd --group lxd --owner root --mode 0775
-	start-stop-daemon --start \
-		--pidfile ${PIDFILE} \
-		--exec ${DAEMON} \
-		--background \
-		--make-pidfile \
-		-- \
-		${LXD_OPTIONS}
-	eend ${?}
-}
-
-stop() {
-	if [ "${RC_CMD}" = restart ]; then
-		ebegin "Stopping lxd service (but not containers)"
-		# start-stop-daemon sends SIGTERM with a timeout of 5s by default.
-		# SIGTERM indicates to LXD that it will be stopped temporarily.
-		# Instances will keep running.
-		start-stop-daemon --stop --quiet -p "${PIDFILE}"
-		eend ${?}
-	else
-		ebegin "Stopping lxd service and containers, waiting 40s"
-		# SIGPWR indicates to LXD that the host is going down.
-		# LXD will do a clean shutdown of all instances.
-		# After 30s all remaining instances will be killed.
-		# We wait up to 40s for LXD.
-		start-stop-daemon --stop --quiet -R SIGPWR/40 -p "${PIDFILE}"
-		eend ${?}
-	fi
-}
diff --git a/app-emulation/lxd/files/lxd-4.0.0.socket b/app-emulation/lxd/files/lxd-4.0.0.socket
deleted file mode 100644
index 3207c9453d11..000000000000
--- a/app-emulation/lxd/files/lxd-4.0.0.socket
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=LXD - unix socket
-Documentation=man:lxd(1)
-
-[Socket]
-ListenStream=/var/lib/lxd/unix.socket
-SocketGroup=lxd
-SocketMode=0660
-Service=lxd.service
-
-[Install]
-WantedBy=sockets.target
diff --git a/app-emulation/lxd/files/lxd-4.0.7-no-werror.patch b/app-emulation/lxd/files/lxd-4.0.7-no-werror.patch
deleted file mode 100644
index 50a916356019..000000000000
--- a/app-emulation/lxd/files/lxd-4.0.7-no-werror.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-diff -Naur lxd-4.0.7/lxd/cgo.go lxd-4.0.7-no-werror/lxd/cgo.go
---- lxd-4.0.7/lxd/cgo.go	2021-07-16 23:33:23.000000000 +0300
-+++ lxd-4.0.7-no-werror/lxd/cgo.go	2021-11-16 15:16:23.575299112 +0200
-@@ -3,7 +3,7 @@
- 
- package main
- 
--// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self
-+// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self
- // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels -fasynchronous-unwind-tables
- // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused
- // #cgo CFLAGS: -Werror=implicit-function-declaration
-diff -Naur lxd-4.0.7/lxd/seccomp/cgo.go lxd-4.0.7-no-werror/lxd/seccomp/cgo.go
---- lxd-4.0.7/lxd/seccomp/cgo.go	2021-07-16 23:33:23.000000000 +0300
-+++ lxd-4.0.7-no-werror/lxd/seccomp/cgo.go	2021-11-16 15:16:34.928629720 +0200
-@@ -3,7 +3,7 @@
- 
- package seccomp
- 
--// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self
-+// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self
- // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels -fasynchronous-unwind-tables
- // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused
- // #cgo CFLAGS: -Werror=implicit-function-declaration
-diff -Naur lxd-4.0.7/lxd/storage/cgo.go lxd-4.0.7-no-werror/lxd/storage/cgo.go
---- lxd-4.0.7/lxd/storage/cgo.go	2021-07-16 23:33:23.000000000 +0300
-+++ lxd-4.0.7-no-werror/lxd/storage/cgo.go	2021-11-16 15:16:44.585294068 +0200
-@@ -3,7 +3,7 @@
- 
- package storage
- 
--// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self
-+// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self
- // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels -fasynchronous-unwind-tables
- // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused
- // #cgo CFLAGS: -Werror=implicit-function-declaration
-diff -Naur lxd-4.0.7/lxd/storage/quota/cgo.go lxd-4.0.7-no-werror/lxd/storage/quota/cgo.go
---- lxd-4.0.7/lxd/storage/quota/cgo.go	2021-07-16 23:33:23.000000000 +0300
-+++ lxd-4.0.7-no-werror/lxd/storage/quota/cgo.go	2021-11-16 15:16:54.231958418 +0200
-@@ -3,7 +3,7 @@
- 
- package quota
- 
--// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self
-+// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self
- // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels -fasynchronous-unwind-tables
- // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused
- // #cgo CFLAGS: -Werror=implicit-function-declaration
-diff -Naur lxd-4.0.7/lxd-p2c/cgo.go lxd-4.0.7-no-werror/lxd-p2c/cgo.go
---- lxd-4.0.7/lxd-p2c/cgo.go	2021-07-16 23:33:23.000000000 +0300
-+++ lxd-4.0.7-no-werror/lxd-p2c/cgo.go	2021-11-16 15:17:06.185288881 +0200
-@@ -2,7 +2,7 @@
- 
- package main
- 
--// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self
-+// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self
- // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels -fasynchronous-unwind-tables
- // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused
- // #cgo CFLAGS: -Werror=implicit-function-declaration
-diff -Naur lxd-4.0.7/shared/cgo.go lxd-4.0.7-no-werror/shared/cgo.go
---- lxd-4.0.7/shared/cgo.go	2021-07-16 23:33:23.000000000 +0300
-+++ lxd-4.0.7-no-werror/shared/cgo.go	2021-11-16 15:17:15.238620041 +0200
-@@ -3,7 +3,7 @@
- 
- package shared
- 
--// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self
-+// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self
- // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels -fasynchronous-unwind-tables
- // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused
- // #cgo CFLAGS: -Werror=implicit-function-declaration
-diff -Naur lxd-4.0.7/shared/idmap/cgo.go lxd-4.0.7-no-werror/shared/idmap/cgo.go
---- lxd-4.0.7/shared/idmap/cgo.go	2021-07-16 23:33:23.000000000 +0300
-+++ lxd-4.0.7-no-werror/shared/idmap/cgo.go	2021-11-16 15:17:25.768617513 +0200
-@@ -3,7 +3,7 @@
- 
- package idmap
- 
--// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self
-+// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self
- // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels -fasynchronous-unwind-tables
- // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused
- // #cgo CFLAGS: -Werror=implicit-function-declaration
-diff -Naur lxd-4.0.7/shared/netutils/cgo.go lxd-4.0.7-no-werror/shared/netutils/cgo.go
---- lxd-4.0.7/shared/netutils/cgo.go	2021-07-16 23:33:23.000000000 +0300
-+++ lxd-4.0.7-no-werror/shared/netutils/cgo.go	2021-11-16 15:17:34.598615393 +0200
-@@ -3,7 +3,7 @@
- 
- package netutils
- 
--// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self
-+// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self
- // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels -fasynchronous-unwind-tables
- // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused
- // #cgo CFLAGS: -Werror=implicit-function-declaration
-diff -Naur lxd-4.0.7/shared/termios/cgo.go lxd-4.0.7-no-werror/shared/termios/cgo.go
---- lxd-4.0.7/shared/termios/cgo.go	2021-07-16 23:33:23.000000000 +0300
-+++ lxd-4.0.7-no-werror/shared/termios/cgo.go	2021-11-16 15:17:43.568613239 +0200
-@@ -3,7 +3,7 @@
- 
- package termios
- 
--// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self
-+// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self
- // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels -fasynchronous-unwind-tables
- // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused
- // #cgo CFLAGS: -Werror=implicit-function-declaration
diff --git a/app-emulation/lxd/files/lxd-4.0.7-r1.service b/app-emulation/lxd/files/lxd-4.0.7-r1.service
deleted file mode 100644
index f1e644b95df8..000000000000
--- a/app-emulation/lxd/files/lxd-4.0.7-r1.service
+++ /dev/null
@@ -1,20 +0,0 @@
-[Unit]
-Description=LXD - main daemon
-After=network-online.target lxcfs.service lxd.socket
-Requires=network-online.target lxcfs.service lxd.socket
-Documentation=man:lxd(1)
-
-[Service]
-EnvironmentFile=-/etc/environment
-ExecStart=/usr/sbin/lxd --group lxd --syslog
-ExecStartPost=/usr/sbin/lxd waitready --timeout=600
-KillMode=process
-TimeoutStartSec=600s
-TimeoutStopSec=30s
-Restart=on-failure
-LimitNOFILE=1048576
-LimitNPROC=infinity
-TasksMax=infinity
-
-[Install]
-Also=lxd-containers.service lxd.socket
diff --git a/app-emulation/lxd/files/lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch b/app-emulation/lxd/files/lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch
deleted file mode 100644
index f32debff5e3b..000000000000
--- a/app-emulation/lxd/files/lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 5efac9cfed92a890dc1a073fe60b1c814c305267 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@ubuntu.com>
-Date: Thu, 4 Nov 2021 14:05:27 -0400
-Subject: [PATCH] lxd/storage/btrfs: Support 5.14.2
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Closes #9418
-
-Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
----
- lxd/storage/drivers/driver_btrfs.go       | 18 ++++++++++++++++++
- lxd/storage/drivers/driver_btrfs_utils.go |  8 +++++++-
- 2 files changed, 25 insertions(+), 1 deletion(-)
-
-diff --git a/lxd/storage/drivers/driver_btrfs.go b/lxd/storage/drivers/driver_btrfs.go
-index e6a64bf8136..a47be766f8f 100644
---- a/lxd/storage/drivers/driver_btrfs.go
-+++ b/lxd/storage/drivers/driver_btrfs.go
-@@ -17,10 +17,12 @@ import (
- 	"github.com/lxc/lxd/shared/api"
- 	"github.com/lxc/lxd/shared/units"
- 	"github.com/lxc/lxd/shared/validate"
-+	"github.com/lxc/lxd/shared/version"
- )
- 
- var btrfsVersion string
- var btrfsLoaded bool
-+var btrfsPropertyForce bool
- 
- type btrfs struct {
- 	common
-@@ -64,6 +66,22 @@ func (d *btrfs) load() error {
- 		}
- 	}
- 
-+	// Check if we need --force to set properties.
-+	ver5142, err := version.Parse("5.14.2")
-+	if err != nil {
-+		return err
-+	}
-+
-+	ourVer, err := version.Parse(btrfsVersion)
-+	if err != nil {
-+		return err
-+	}
-+
-+	// If running 5.14.2 or older, we need --force.
-+	if ourVer.Compare(ver5142) > 0 {
-+		btrfsPropertyForce = true
-+	}
-+
- 	btrfsLoaded = true
- 	return nil
- }
-diff --git a/lxd/storage/drivers/driver_btrfs_utils.go b/lxd/storage/drivers/driver_btrfs_utils.go
-index e1a359e8490..0618e29e6f2 100644
---- a/lxd/storage/drivers/driver_btrfs_utils.go
-+++ b/lxd/storage/drivers/driver_btrfs_utils.go
-@@ -308,7 +308,13 @@ func (d *btrfs) setSubvolumeReadonlyProperty(path string, readonly bool) error {
- 		return nil
- 	}
- 
--	_, err := shared.RunCommand("btrfs", "property", "set", "-ts", path, "ro", fmt.Sprintf("%t", readonly))
-+	args := []string{"property", "set"}
-+	if btrfsPropertyForce {
-+		args = append(args, "-f")
-+	}
-+	args = append(args, "-ts", path, "ro", fmt.Sprintf("%t", readonly))
-+
-+	_, err := shared.RunCommand("btrfs", args...)
- 	return err
- }
- 
diff --git a/app-emulation/lxd/files/lxd-containers-4.0.0.service b/app-emulation/lxd/files/lxd-containers-4.0.0.service
deleted file mode 100644
index 894760c3506b..000000000000
--- a/app-emulation/lxd/files/lxd-containers-4.0.0.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=LXD - container startup/shutdown
-Documentation=man:lxd(1)
-After=lxd.socket lxd.service
-Requires=lxd.socket
-
-[Service]
-Type=oneshot
-ExecStart=/usr/sbin/lxd activateifneeded
-ExecStop=/usr/sbin/lxd shutdown
-TimeoutStartSec=600s
-TimeoutStopSec=600s
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-emulation/lxd/files/lxd-syscall_wrappers-don-t-conflict-with-glibc-provided.patch b/app-emulation/lxd/files/lxd-syscall_wrappers-don-t-conflict-with-glibc-provided.patch
deleted file mode 100644
index 0b471688cc0d..000000000000
--- a/app-emulation/lxd/files/lxd-syscall_wrappers-don-t-conflict-with-glibc-provided.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 9a128f32fc277dd0c07bc85c71dc25d123f8a831 Mon Sep 17 00:00:00 2001
-From: Christian Brauner <christian.brauner@ubuntu.com>
-Date: Wed, 4 Aug 2021 21:34:11 +0200
-Subject: [PATCH] syscall_wrappers: don't conflict with glibc provided
- close_range()
-
-Newer glibc version's provide a wrapper for close_range().
-
-Fixes: #9084
-Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
----
- lxd/include/syscall_wrappers.h | 2 +-
- lxd/main_checkfeature.go       | 2 +-
- lxd/main_forkexec.go           | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/lxd/include/syscall_wrappers.h b/lxd/include/syscall_wrappers.h
-index 4405a622b801..25e56a5cefac 100644
---- a/lxd/include/syscall_wrappers.h
-+++ b/lxd/include/syscall_wrappers.h
-@@ -16,7 +16,7 @@
- #define CLOSE_RANGE_UNSHARE (1U << 1)
- #endif
- 
--static inline int close_range(unsigned int fd, unsigned int max_fd, unsigned int flags)
-+static inline int lxd_close_range(unsigned int fd, unsigned int max_fd, unsigned int flags)
- {
- 	return syscall(__NR_close_range, fd, max_fd, flags);
- }
-diff --git a/lxd/main_checkfeature.go b/lxd/main_checkfeature.go
-index 9511b684fa5d..0cc89207158d 100644
---- a/lxd/main_checkfeature.go
-+++ b/lxd/main_checkfeature.go
-@@ -496,7 +496,7 @@ static void is_close_range_aware(void)
- 	if (fd < 0)
- 		return;
- 
--	if (close_range(fd, fd, CLOSE_RANGE_UNSHARE))
-+	if (lxd_close_range(fd, fd, CLOSE_RANGE_UNSHARE))
- 		return;
- 
- 	close_range_aware = true;
-diff --git a/lxd/main_forkexec.go b/lxd/main_forkexec.go
-index 574f25eeb988..cfa4cd6bcda8 100644
---- a/lxd/main_forkexec.go
-+++ b/lxd/main_forkexec.go
-@@ -290,7 +290,7 @@ __attribute__ ((noinline)) static int __forkexec(void)
- 	if (!argvp || !*argvp)
- 		return log_error(EXIT_FAILURE, "No command specified");
- 
--	ret = close_range(EXEC_PIPE_FD + 1, UINT_MAX, CLOSE_RANGE_UNSHARE);
-+	ret = lxd_close_range(EXEC_PIPE_FD + 1, UINT_MAX, CLOSE_RANGE_UNSHARE);
- 	if (ret) {
- 		// Fallback to close_inherited() when the syscall is not
- 		// available or when CLOSE_RANGE_UNSHARE isn't supported.
--- 
-2.32.0
-
diff --git a/app-emulation/lxd/lxd-4.0.7-r2.ebuild b/app-emulation/lxd/lxd-4.0.7-r2.ebuild
deleted file mode 100644
index f1f4af48c04d..000000000000
--- a/app-emulation/lxd/lxd-4.0.7-r2.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 linux-info optfeature systemd verify-sig
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd"
-SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
-	verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="apparmor ipv6 nls verify-sig"
-
-DEPEND="acct-group/lxd
-	app-arch/xz-utils
-	>=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)]
-	dev-libs/dqlite
-	dev-libs/lzo
-	dev-libs/raft[lz4]
-	>=dev-util/xdelta-3.0[lzma(+)]
-	net-dns/dnsmasq[dhcp,ipv6?]"
-RDEPEND="${DEPEND}
-	net-firewall/ebtables
-	net-firewall/iptables[ipv6?]
-	sys-apps/iproute2[ipv6?]
-	sys-fs/fuse:*
-	sys-fs/lxcfs
-	sys-fs/squashfs-tools[lzma]
-	virtual/acl"
-BDEPEND="dev-lang/go
-	nls? ( sys-devel/gettext )
-	verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="
-	~CGROUPS
-	~IPC_NS
-	~NET_NS
-	~PID_NS
-
-	~SECCOMP
-	~USER_NS
-	~UTS_NS
-"
-
-ERROR_IPC_NS="CONFIG_IPC_NS is required."
-ERROR_NET_NS="CONFIG_NET_NS is required."
-ERROR_PID_NS="CONFIG_PID_NS is required."
-ERROR_SECCOMP="CONFIG_SECCOMP is required."
-ERROR_UTS_NS="CONFIG_UTS_NS is required."
-
-# Go magic.
-QA_PREBUILT="/usr/bin/fuidshift
-	/usr/bin/lxc
-	/usr/bin/lxc-to-lxd
-	/usr/bin/lxd-agent
-	/usr/bin/lxd-benchmark
-	/usr/bin/lxd-p2c
-	/usr/sbin/lxd"
-
-EGO_PN="github.com/lxc/lxd"
-GOPATH="${S}/_dist" # this seems to reset every now and then, though
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-PATCHES=(
-	"${FILESDIR}/${PN}-syscall_wrappers-don-t-conflict-with-glibc-provided.patch"
-	"${FILESDIR}"/lxd-4.0.7-no-werror.patch
-)
-
-src_prepare() {
-	default
-
-	export GOPATH="${S}/_dist"
-
-	sed -i \
-		-e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd:g" \
-		-e "s:make:make ${MAKEOPTS}:g" \
-		Makefile || die
-
-	# Fix hardcoded ovmf file path, see bug 763180
-	sed -i \
-		-e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
-		-e "s:OVMF_VARS.ms.fd:OVMF_VARS.secboot.fd:g" \
-		doc/environment.md \
-		lxd/apparmor/instance_qemu.go \
-		lxd/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths."
-
-	# Fix hardcoded virtfs-proxy-helper file path, see bug 798924
-	sed -i \
-		-e "s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \
-		lxd/device/disk.go || die "Failed to fix virtfs-proxy-helper path."
-
-	cp "${FILESDIR}"/lxd-4.0.7-r1.service "${T}"/lxd.service || die
-	if use apparmor; then
-		sed -i \
-			'/^EnvironmentFile=.*/a ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \
-			"${T}"/lxd.service || die
-	fi
-}
-
-src_configure() { :; }
-
-src_compile() {
-	export GOPATH="${S}/_dist"
-	export GO111MODULE=auto
-	export CGO_LDFLAGS_ALLOW="-Wl,-z,now"
-
-	cd "${S}" || die
-
-	for k in fuidshift lxd-benchmark lxc lxc-to-lxd; do
-		go install -v -x "${EGO_PN}/${k}" || die "failed compiling ${k}"
-	done
-
-	go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon"
-
-	# Needs to be built statically
-	CGO_ENABLED=0 go install -v -tags netgo "${EGO_PN}"/lxd-p2c
-	CGO_ENABLED=0 go install -v -tags agent,netgo "${EGO_PN}"/lxd-agent
-
-	use nls && emake build-mo
-}
-
-src_test() {
-	export GOPATH="${S}/_dist"
-	export GO111MODULE=off
-	go test -v ${EGO_PN}/lxd || die
-}
-
-src_install() {
-	local bindir="_dist/bin"
-	export GOPATH="${S}/_dist"
-
-	dosbin ${bindir}/lxd
-
-	for l in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
-		dobin ${bindir}/${l}
-	done
-
-	cd "${S}" || die
-
-	newbashcomp scripts/bash/lxd-client lxc
-
-	newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd
-	newinitd "${FILESDIR}"/lxd-4.0.0.initd lxd
-
-	systemd_dounit "${T}"/lxd.service
-
-	systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service lxd-containers.service
-	systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket
-
-	# Temporary fix for #817287
-	keepdir /var/log/lxd
-	fowners root:lxd /var/log/lxd
-
-	dodoc AUTHORS doc/*
-	use nls && domo po/*.mo
-}
-
-pkg_postinst() {
-	elog
-	elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
-	elog "including a Quick Start."
-	elog
-	elog "Please run 'lxc-checkconfig' to see all optional kernel features."
-	elog
-	optfeature "btrfs storage backend" sys-fs/btrfs-progs
-	optfeature "lvm2 storage backend" sys-fs/lvm2
-	optfeature "zfs storage backend" sys-fs/zfs
-	elog
-	elog "Be sure to add your local user to the lxd group."
-}
diff --git a/app-emulation/lxd/lxd-4.0.8-r1.ebuild b/app-emulation/lxd/lxd-4.0.8-r1.ebuild
deleted file mode 100644
index e76b0eeabfea..000000000000
--- a/app-emulation/lxd/lxd-4.0.8-r1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 linux-info optfeature systemd verify-sig
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd"
-SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
-	verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="apparmor ipv6 nls verify-sig"
-
-DEPEND="acct-group/lxd
-	app-arch/xz-utils
-	>=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)]
-	dev-db/sqlite:3
-	dev-libs/dqlite
-	dev-libs/lzo
-	dev-libs/raft[lz4]
-	>=dev-util/xdelta-3.0[lzma(+)]
-	net-dns/dnsmasq[dhcp,ipv6?]
-	sys-libs/libcap
-	virtual/udev"
-RDEPEND="${DEPEND}
-	net-firewall/ebtables
-	net-firewall/iptables[ipv6?]
-	sys-apps/iproute2[ipv6?]
-	sys-fs/fuse:*
-	sys-fs/lxcfs
-	sys-fs/squashfs-tools[lzma]
-	virtual/acl"
-BDEPEND="dev-lang/go
-	nls? ( sys-devel/gettext )
-	verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="
-	~CGROUPS
-	~IPC_NS
-	~NET_NS
-	~PID_NS
-
-	~SECCOMP
-	~USER_NS
-	~UTS_NS
-"
-
-ERROR_IPC_NS="CONFIG_IPC_NS is required."
-ERROR_NET_NS="CONFIG_NET_NS is required."
-ERROR_PID_NS="CONFIG_PID_NS is required."
-ERROR_SECCOMP="CONFIG_SECCOMP is required."
-ERROR_UTS_NS="CONFIG_UTS_NS is required."
-
-# Go magic.
-QA_PREBUILT="/usr/bin/fuidshift
-	/usr/bin/lxc
-	/usr/bin/lxc-to-lxd
-	/usr/bin/lxd-agent
-	/usr/bin/lxd-benchmark
-	/usr/bin/lxd-p2c
-	/usr/sbin/lxd"
-
-EGO_PN="github.com/lxc/lxd"
-GOPATH="${S}/_dist" # this seems to reset every now and then, though
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-# The testsuite must be run as root.
-# make: *** [Makefile:156: check] Error 1
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch
-	"${FILESDIR}"/lxd-4.0.7-no-werror.patch )
-
-src_prepare() {
-	default
-
-	export GOPATH="${S}/_dist"
-
-	sed -i \
-		-e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd:g" \
-		-e "s:make:make ${MAKEOPTS}:g" \
-		Makefile || die
-
-	# Fix hardcoded ovmf file path, see bug 763180
-	sed -i \
-		-e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
-		-e "s:OVMF_VARS.ms.fd:OVMF_VARS.secboot.fd:g" \
-		doc/environment.md \
-		lxd/apparmor/instance_qemu.go \
-		lxd/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths."
-
-	# Fix hardcoded virtfs-proxy-helper file path, see bug 798924
-	sed -i \
-		-e "s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \
-		lxd/device/disk.go || die "Failed to fix virtfs-proxy-helper path."
-
-	cp "${FILESDIR}"/lxd-4.0.7-r1.service "${T}"/lxd.service || die
-	if use apparmor; then
-		sed -i \
-			'/^EnvironmentFile=.*/a ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \
-			"${T}"/lxd.service || die
-	fi
-}
-
-src_configure() { :; }
-
-src_compile() {
-	export GOPATH="${S}/_dist"
-	export GO111MODULE=auto
-	export CGO_LDFLAGS_ALLOW="-Wl,-z,now"
-
-	cd "${S}" || die
-
-	for k in fuidshift lxd-benchmark lxc lxc-to-lxd; do
-		go install -v -x "${EGO_PN}/${k}" || die "failed compiling ${k}"
-	done
-
-	go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon"
-
-	# Needs to be built statically
-	CGO_ENABLED=0 go install -v -tags netgo "${EGO_PN}"/lxd-p2c
-	CGO_ENABLED=0 go install -v -tags agent,netgo "${EGO_PN}"/lxd-agent
-
-	use nls && emake build-mo
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	local bindir="_dist/bin"
-	export GOPATH="${S}/_dist"
-
-	dosbin ${bindir}/lxd
-
-	for l in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
-		dobin ${bindir}/${l}
-	done
-
-	cd "${S}" || die
-
-	newbashcomp scripts/bash/lxd-client lxc
-
-	newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd
-	newinitd "${FILESDIR}"/lxd-4.0.0.initd lxd
-
-	systemd_dounit "${T}"/lxd.service
-
-	systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service lxd-containers.service
-	systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket
-
-	# Temporary fix for #817287
-	keepdir /var/log/lxd
-	fowners root:lxd /var/log/lxd
-
-	dodoc AUTHORS doc/*
-	use nls && domo po/*.mo
-}
-
-pkg_postinst() {
-	elog
-	elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
-	elog "including a Quick Start."
-	elog
-	elog "Please run 'lxc-checkconfig' to see all optional kernel features."
-	elog
-	optfeature "btrfs storage backend" sys-fs/btrfs-progs
-	optfeature "lvm2 storage backend" sys-fs/lvm2
-	optfeature "zfs storage backend" sys-fs/zfs
-	elog
-	elog "Be sure to add your local user to the lxd group."
-}
diff --git a/app-emulation/lxd/metadata.xml b/app-emulation/lxd/metadata.xml
deleted file mode 100644
index dfd11315a93a..000000000000
--- a/app-emulation/lxd/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>juippis@gentoo.org</email>
-    <name>Joonas Niilola</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>virtualization@gentoo.org</email>
-    <name>Gentoo Virtualization Project</name>
-  </maintainer>
-  <use>
-    <flag name="apparmor">Enable AppArmor support</flag>
-  </use>
-  <longdescription>
-    By combining the speed and density of containers with
-    the security of traditional virtual machines, LXD is
-    the next-generation of container hypervisor for Linux
-    from Canonical.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">lxc/lxd</remote-id>
-  </upstream>
-</pkgmetadata>