app-emulation/lxd: remove old 4.0.1

Signed-off-by: Joonas Niilola <juippis@gentoo.org>

4 files changed, 0 insertions, 293 deletions

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 621644c18aef..e491542f828a 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,2 +1 @@
-DIST lxd-4.0.1.tar.gz 25027762 BLAKE2B 1154a427558ad5eda62b63501a2f62a5c3a1b740fac061432b06a1034b75cb906f38d6c43e8215cab8ae0bed328d75a7612c1bb7af3272cdbe3f93235d5bb920 SHA512 1f47f8239cc1d3425fc4cd075487678e219e94deddec10f52a1cd18fbdc0515f54b67552e7b41d0052803c317a861b34cfc83a25776eae7b9673b5c5fd50d70f
 DIST lxd-4.0.2.tar.gz 25350601 BLAKE2B 2abecb61759a1a717960671516157dc7b7a36865ecdbcec1f211e5b653b2b4afc41932a4a289430de0dd4ac1e2c777de471ab26e31dbf2b8d1855f67d03886ad SHA512 6c1c668055e9677850f24e142e6741cb6b5aa8d4d9cce29af566e8090c28e04b4baf973f486aef28b7f6b34be5b9ab9bb45e77956879ff7feff6bec8e4db3077
diff --git a/app-emulation/lxd/files/lxd-4.0.1-clang.patch b/app-emulation/lxd/files/lxd-4.0.1-clang.patch
deleted file mode 100644
index 765f2f38be5d..000000000000
--- a/app-emulation/lxd/files/lxd-4.0.1-clang.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From c7ce94825871ea5d0946e92762e981354628b8ad Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@ubuntu.com>
-Date: Mon, 22 Jun 2020 22:17:02 -0400
-Subject: [PATCH] lxd: Fix building with clang
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Closes #7573
-
-Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
----
- lxd/main_forksyscall.go |  8 --------
- lxd/seccomp/seccomp.go  | 16 ++++++++--------
- 2 files changed, 8 insertions(+), 16 deletions(-)
-
-diff --git a/lxd/main_forksyscall.go b/lxd/main_forksyscall.go
-index a304405c2e..14895b6ce0 100644
---- a/lxd/main_forksyscall.go
-+++ b/lxd/main_forksyscall.go
-@@ -34,12 +34,6 @@ extern void attach_userns_fd(int ns_fd);
- extern int pidfd_nsfd(int pidfd, pid_t pid);
- extern bool setnsat(int ns_fd, const char *ns);
- 
--static inline bool same_fsinfo(struct stat *s1, struct stat *s2,
--			       struct statfs *sfs1, struct statfs *sfs2)
--{
--	return ((sfs1->f_type == sfs2->f_type) && (s1->st_dev == s2->st_dev));
--}
--
- static bool chdirchroot_in_mntns(int cwd_fd, int root_fd)
- {
- 	ssize_t len;
-@@ -209,8 +203,6 @@ const char *ns_names[] = { "user", "pid", "uts", "ipc", "net", "cgroup", NULL };
- 
- static bool change_creds(int ns_fd, cap_t caps, uid_t nsuid, gid_t nsgid, uid_t nsfsuid, gid_t nsfsgid)
- {
--	__do_close int fd = -EBADF;
--
- 	if (prctl(PR_SET_KEEPCAPS, 1))
- 		return false;
- 
-diff --git a/lxd/seccomp/seccomp.go b/lxd/seccomp/seccomp.go
-index 8945fd9197..025efb3141 100644
---- a/lxd/seccomp/seccomp.go
-+++ b/lxd/seccomp/seccomp.go
-@@ -91,21 +91,21 @@ static int device_allowed(dev_t dev, mode_t mode)
- {
- 	switch (mode & S_IFMT) {
- 	case S_IFCHR:
--		if ((dev == makedev(0, 0))) // whiteout
-+		if (dev == makedev(0, 0)) // whiteout
- 			return 0;
--		else if ((dev == makedev(5, 1))) // /dev/console
-+		else if (dev == makedev(5, 1)) // /dev/console
- 			return 0;
--		else if ((dev == makedev(1, 7))) // /dev/full
-+		else if (dev == makedev(1, 7)) // /dev/full
- 			return 0;
--		else if ((dev == makedev(1, 3))) // /dev/null
-+		else if (dev == makedev(1, 3)) // /dev/null
- 			return 0;
--		else if ((dev == makedev(1, 8))) // /dev/random
-+		else if (dev == makedev(1, 8)) // /dev/random
- 			return 0;
--		else if ((dev == makedev(5, 0))) // /dev/tty
-+		else if (dev == makedev(5, 0)) // /dev/tty
- 			return 0;
--		else if ((dev == makedev(1, 9))) // /dev/urandom
-+		else if (dev == makedev(1, 9)) // /dev/urandom
- 			return 0;
--		else if ((dev == makedev(1, 5))) // /dev/zero
-+		else if (dev == makedev(1, 5)) // /dev/zero
- 			return 0;
- 	}
- 
diff --git a/app-emulation/lxd/files/lxd.service b/app-emulation/lxd/files/lxd.service
deleted file mode 100644
index d00635fbcdd9..000000000000
--- a/app-emulation/lxd/files/lxd.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Container hypervisor based on LXC
-
-[Service]
-ExecStart=/usr/sbin/lxd --group lxd
-KillMode=process
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-emulation/lxd/lxd-4.0.1.ebuild b/app-emulation/lxd/lxd-4.0.1.ebuild
deleted file mode 100644
index 578a64630a10..000000000000
--- a/app-emulation/lxd/lxd-4.0.1.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 eutils linux-info systemd
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd"
-SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz"
-
-# Needs to include licenses for all bundled programs.
-LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+ipv6 nls"
-
-DEPEND="app-arch/xz-utils
-	>=app-emulation/lxc-3.0.0[seccomp]
-	dev-lang/tcl
-	dev-libs/libuv
-	dev-libs/lzo
-	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 )"
-
-CONFIG_CHECK="
-	~BRIDGE
-	~DUMMY
-	~IP6_NF_NAT
-	~IP6_NF_TARGET_MASQUERADE
-	~IPV6
-	~IP_NF_NAT
-	~IP_NF_TARGET_MASQUERADE
-	~MACVLAN
-	~NETFILTER_XT_MATCH_COMMENT
-	~NET_IPGRE
-	~NET_IPGRE_DEMUX
-	~NET_IPIP
-	~NF_NAT_MASQUERADE_IPV4
-	~NF_NAT_MASQUERADE_IPV6
-	~VXLAN
-"
-
-# To no one's surprise uses internet connection.
-RESTRICT="test"
-
-# Go magic.
-QA_PREBUILT="/usr/lib/lxd/libdqlite.so.0.0.1
-	/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
-
-PATCHES=( "${FILESDIR}"/lxd-4.0.1-clang.patch )
-
-common_op() {
-	local i
-	for i in dqlite raft; do
-		cd "${GOPATH}"/deps/${i} || die "failed to switch dir to ${i}"
-		"${@}"
-		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
-	done
-}
-
-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
-
-	sed -i 's#lib$#lib/lxd#' "${GOPATH}"/deps/libco/Makefile || die
-	sed -i 's#zfs version 2>/dev/null | cut -f 2 -d - | head -1#< /sys/module/zfs/version cut -f 1#' "${GOPATH}"/deps/raft/configure.ac || die
-
-	common_op eautoreconf
-}
-
-src_configure() {
-	export GOPATH="${S}/_dist"
-
-	export CO_CFLAGS="-I${GOPATH}/deps/libco/"
-	export CO_LIBS="${GOPATH}/deps/libco/"
-
-	export RAFT_CFLAGS="-I${GOPATH}/deps/raft/include/"
-	export RAFT_LIBS="${GOPATH}/deps/raft/.libs"
-
-	export SQLITE_CFLAGS="-I${GOPATH}/deps/sqlite"
-	export SQLITE_LIBS="${GOPATH}/deps/sqlite/.libs"
-
-	export PKG_CONFIG_PATH="${GOPATH}/sqlite/:${GOPATH}/libco/:${GOPATH}/raft/"
-
-	cd "${GOPATH}/deps/sqlite" || die
-	econf --enable-replication --disable-amalgamation --disable-tcl --libdir="${EPREFIX}/usr/lib/lxd"
-
-	common_op econf --libdir="${EPREFIX}"/usr/lib/lxd
-}
-
-src_compile() {
-	export GOPATH="${S}/_dist"
-
-	export CGO_CFLAGS="${CGO_CFLAGS} -I${GOPATH}/deps/sqlite/ -I${GOPATH}/deps/dqlite/include/ -I${GOPATH}/deps/raft/include/ -I${GOPATH}/deps/libco/"
-	export CGO_LDFLAGS="${CGO_LDFLAGS} -L${GOPATH}/deps/sqlite/.libs/ -L${GOPATH}/deps/dqlite/.libs/ -L${GOPATH}/deps/raft/.libs -L${GOPATH}/deps/libco/ -Wl,-rpath,${EPREFIX}/usr/lib/lxd"
-	export LD_LIBRARY_PATH="${GOPATH}/deps/sqlite/.libs/:${GOPATH}/deps/dqlite/.libs/:${GOPATH}/deps/raft/.libs:${GOPATH}/deps/libco/:${LD_LIBRARY_PATH}"
-
-	local j
-	for j in sqlite raft libco; do
-		cd "${GOPATH}"/deps/${j} || die
-		emake
-	done
-
-	ln -s libco.so.0.1.0 libco.so || die
-
-	cd "${GOPATH}/deps/dqlite" || die
-	emake CFLAGS="-I${GOPATH}/deps/sqlite -I${GOPATH}/deps/raft/include" LDFLAGS="-L${GOPATH}/deps/sqlite -L${GOPATH}/deps/raft"
-
-	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"
-
-	# This is mostly a copy/paste from the Makefile's "check" rule, but
-	# patching the Makefile to work in a non "fully-qualified" go namespace
-	# was more complicated than this modest copy/paste.
-	# Also: sorry, for now a network connection is needed to run tests.
-	# Will properly bundle test dependencies later.
-	go get -v -x github.com/rogpeppe/godeps || die
-	go get -v -x github.com/remyoudompheng/go-misc/deadcode || die
-	go get -v -x github.com/golang/lint/golint || die
-	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
-
-	for m in dqlite libco raft sqlite; do
-		cd "${GOPATH}"/deps/${m} || die "failed switching into ${GOPATH}/${m}"
-		emake DESTDIR="${D}" install
-	done
-
-	cd "${S}" || die
-
-	# We only need libraries, and we don't want anything to link against these.
-	rm "${ED}"/usr/bin/sqlite3 || die
-	rm -r "${ED}"/usr/include || die
-	rm -r "${ED}"/usr/lib/lxd/*.a || die
-	rm -r "${ED}"/usr/lib/lxd/pkgconfig || die
-
-	newbashcomp scripts/bash/lxd-client lxc
-
-	newconfd "${FILESDIR}"/${PN}-4.0.0.confd lxd
-	newinitd "${FILESDIR}"/${PN}-4.0.0.initd lxd
-
-	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
-
-	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 "Optional features:"
-	optfeature "apparmor support" app-emulation/lxc[apparmor]
-	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."
-}