commit:     d63e8ebe8e24e37ba29415d4e7d11e49ac9b6d64
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 23 07:35:25 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Oct 23 07:36:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d63e8ebe

app-emulation/lxd: bump to 4.0.4

 - dropped bundled libco,
 - dropped dependencies that were required to build bundled libs,
 - dropped multiple kernel requirements that were not documented upstream,
   please run 'lxc-checkconfig' to enable some optional kernel features,
 - fixed 'builds with -Werror' bug #744106,
 - test phase works now,
 - use system dqlite instead of bundled one,
 - use system raft instead of bundled one,
 - use system sqlite instead of bundled one.

Bug: https://bugs.gentoo.org/744106
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-emulation/lxd/Manifest         |   2 +
 app-emulation/lxd/lxd-4.0.4.ebuild | 144 +++++++++++++++++++++++++++++++++++++
 2 files changed, 146 insertions(+)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 84866a252c0..b7b2ca464c0 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,2 +1,4 @@
 DIST lxd-4.0.3.tar.gz 25468067 BLAKE2B 
5c3d8a2841d3222d070be39fb6cb63c99450a7edea86915a808230012f1a3b7a66c2c4a3c56be378f586c8ca033c4f547ed6eeb14bb09a091b3ae28c62fda7ae
 SHA512 
aaf7fe7473e04765263ff99f02041748f0e57abdd0311d734fbf1cbc461516bf6adad1bc42c9cfa58b4e87c28efb5186d9436fb0a1d309b23eb37fe95299ad6f
 DIST lxd-4.0.3.tar.gz.asc 833 BLAKE2B 
b889b7c3a85f325a4c47319b45c4828c4fc0cac2bae77341734827e737243802852c20a766ab72ce1a12e643502d108fec41b715d8eb820ec273c651b7745fb2
 SHA512 
993ad833832a551e0804f9e565542b5779352cad2bb32989a440a0be11b1ae6539e46fa3332d35e8be365026dacc21d847db544b62b3e11493100d3c9cb313e1
+DIST lxd-4.0.4.tar.gz 14166577 BLAKE2B 
5a04efa1bf70d416b328f5f85379a7c697667978a2b7571c05f8d834ccea51c65ce3df447787ccad5c0a9cc524bc396eb5c90b26b92d6252fc07a5be0157e0ea
 SHA512 
800768b923de920e04d676d9c87beedd2ddd164661799c429616f6fa00b36f23ae1d9cff56f2ed16172585b9b3c058ee955eb3e5f8d98c84109c4405c5aae23f
+DIST lxd-4.0.4.tar.gz.asc 833 BLAKE2B 
bac0b63fc7fe61290bd399ef09eaf0bae12ac962b1188c49fa94c9132b002c278dcdb271d35a1784848591a315a8e88eab823c1c653ef814d454a0af607e461b
 SHA512 
7fc9b9b27305d7637efeaf4024a8a26e2f891599fe50fa22e2f9defa6d451a015d74d068f63a9547fce312ed5fb5da82b99be9dc13601f807695cf1b675baf15

diff --git a/app-emulation/lxd/lxd-4.0.4.ebuild 
b/app-emulation/lxd/lxd-4.0.4.ebuild
new file mode 100644
index 00000000000..e287cc4458a
--- /dev/null
+++ b/app-emulation/lxd/lxd-4.0.4.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools 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 
)"
+
+# Needs to include licenses for all bundled programs and libraries.
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="apparmor ipv6 nls verify-sig"
+
+DEPEND="app-arch/xz-utils
+       >=app-emulation/lxc-3.0.0[apparmor?,seccomp]
+       dev-libs/dqlite
+       dev-libs/lzo
+       dev-libs/raft
+       net-dns/dnsmasq[dhcp,ipv6?]"
+RDEPEND="${DEPEND}
+       acct-group/lxd
+       net-firewall/ebtables
+       net-firewall/iptables[ipv6?]
+       sys-apps/iproute2[ipv6?]
+       sys-fs/fuse:0=
+       sys-fs/lxcfs
+       sys-fs/squashfs-tools
+       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
+
+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
+}
+
+src_configure() { :; }
+
+src_compile() {
+       export GOPATH="${S}/_dist"
+
+       cd "${S}" || die
+
+       for k in fuidshift lxd-agent lxd-benchmark lxd-p2c 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"
+
+       use nls && emake build-mo
+}
+
+src_test() {
+       export GOPATH="${S}/_dist"
+       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
+
+       if use apparmor; then
+               systemd_newunit "${FILESDIR}"/lxd-4.0.0_apparmor.service 
lxd.service
+       else
+               systemd_newunit "${FILESDIR}"/lxd-4.0.0.service lxd.service
+       fi
+
+       systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service 
lxd-containers.service
+       systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket
+
+       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
+       elog "Optional features:"
+       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."
+}

Reply via email to