summaryrefslogtreecommitdiff
path: root/app-containers
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-10-14 23:35:46 +0100
committerV3n3RiX <venerix@koprulu.sector>2023-10-14 23:35:46 +0100
commit2f3183511d8fcc1dd014e08f7c2535790512213d (patch)
tree18ca7df2c112317bfef51ae8b059785773a15ed1 /app-containers
parentb23b1d43c4a10df85088f74d98a914917f114538 (diff)
gentoo auto-resync : 14:10:2023 - 23:35:45
Diffstat (limited to 'app-containers')
-rw-r--r--app-containers/Manifest.gzbin8719 -> 8718 bytes
-rw-r--r--app-containers/incus/Manifest2
-rw-r--r--app-containers/incus/incus-0.1-r2.ebuild (renamed from app-containers/incus/incus-0.1-r1.ebuild)6
3 files changed, 3 insertions, 5 deletions
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index b6454bb78aa8..d131fcffe652 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
Binary files differ
diff --git a/app-containers/incus/Manifest b/app-containers/incus/Manifest
index 316f8a4af8b4..55768456cdb3 100644
--- a/app-containers/incus/Manifest
+++ b/app-containers/incus/Manifest
@@ -5,5 +5,5 @@ AUX incus-0.1.socket 207 BLAKE2B d1fb41c9a90e0f06eb34c466a460e2d202250769ef3db38
AUX incus-containers-0.1.service 338 BLAKE2B af0849575d2d7578634228576fcf449f8ab54b6fa3a974baec4f91009dec4a6e76253f3724c532f38fc7484ccc6caffae4badf1591c1b04abb3414f4959d550c SHA512 9a9b072442a63683cb9ed71d706606da682e821f609f1f4daea0562ddcea1cc2d6157b29fd466e0aeab149f31b54ab0fff4cf41831e6b2378c47619b8dfd0b55
DIST incus-0.1.tar.gz 21498887 BLAKE2B ea200f83922a2f23c8bbc8ce94ccf7df8b7e096adfe6697d94135a4c660a950411e2176f860a63dada12890cde474beb16fcd17a4c52419f1ab86d3625c426e5 SHA512 1cd5410b07ed44f05b19ca3c734a67bde6f85d0e4673e9b46100bb8f2d60889773bcde1a274e96b55651b95414c47abeb6c3f2b8ec8d500d22ef08e31d09d9e6
DIST incus-0.1.tar.gz.asc 833 BLAKE2B 9e2ceedf246e7af20a6d8c0e597f59016a4040c10d547f724a0fa822387bb46c70d0467df583127bea874ded87115844e02191e93ddfd29fc64f3bc0262b7f10 SHA512 de14e530543d861ea3bdffe8d4b88a140f39646219c1494db81577f755d5d5ddc35f8e36f51cbfe38d8fcd4c3de95bb8d615db61530bbd507a55c6e07d3031b6
-EBUILD incus-0.1-r1.ebuild 5150 BLAKE2B 9b2036570a3a4682fa83d47675f05356c191175ea4e4a0d7d92015fd07804b9a3dc4fe42c9afec66b2548840396547198927a477d15a9173977584c602ba7fd8 SHA512 3e03c4bd7bee2c3d7ffa9c169fe3d430ace974102a2e546a2900123453d3d8a49079c073408d4644e93a41c1084fd3994fe54558829f761bdb4d252d9a78c009
+EBUILD incus-0.1-r2.ebuild 5000 BLAKE2B f01afbc669d4a6d4b2baacf3e99483228c516b45f2156ca42ec4a74053aa5c645fe986b6bfad40efb8a3c8ee18377e9947846ac74723a7842d4ddd3ffd55aba2 SHA512 d2bad62494de5e73cfce2d749a60c5f8edf57215353ef2707654977b1cd92414abaa38350e7c59f8adc462bbc4b0610a27cf8cfea779f77f0b59565586f94568
MISC metadata.xml 1471 BLAKE2B d3447fd360c4d3de95ffafefd39f9e65dd257cd39cbdb14fc2e2c513239fafe48b0fef44653fe8fdaaf54151afe59cf48f3f0909097d0c0c4a82cbd87aac4d44 SHA512 393edc7c7f202fac4f08abd2544d1fb41cfc83cea66ccf239eb4441c1f13ea85dd519de84094b1ba022b1a17658612591ee4354a77484da4d8095af917a87c25
diff --git a/app-containers/incus/incus-0.1-r1.ebuild b/app-containers/incus/incus-0.1-r2.ebuild
index 12e18f4b1a1d..b7d760e2001d 100644
--- a/app-containers/incus/incus-0.1-r1.ebuild
+++ b/app-containers/incus/incus-0.1-r2.ebuild
@@ -15,7 +15,6 @@ SLOT="0"
KEYWORDS="~amd64"
IUSE="apparmor nls"
-# incus conflicts with lxd due to fuidshift binary. Even if you replace the package, containers will remain.
DEPEND="acct-group/incus
acct-group/incus-admin
app-arch/xz-utils
@@ -29,7 +28,6 @@ DEPEND="acct-group/incus
sys-libs/libcap
virtual/udev"
RDEPEND="${DEPEND}
- !app-containers/lxd
net-firewall/ebtables
net-firewall/iptables
sys-apps/iproute2
@@ -125,7 +123,7 @@ src_compile() {
export CGO_LDFLAGS_ALLOW="-Wl,-z,now"
# lxd-to-incus: this go module is packaged separately (0.1).
- for k in fuidshift incus-benchmark incus-user incus lxc-to-incus ; do
+ for k in incus-benchmark incus-user incus lxc-to-incus ; do
go install -v -x "${S}/cmd/${k}" || die "failed compiling ${k}"
done
@@ -148,7 +146,7 @@ src_install() {
dosbin ${bindir}/incusd
- for l in fuidshift incus-agent incus-benchmark incus-migrate incus-user incus lxc-to-incus ; do
+ for l in incus-agent incus-benchmark incus-migrate incus-user incus lxc-to-incus ; do
dobin ${bindir}/${l}
done