[gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/

[Joonas Niilola]

commit:     779e0763dbddc306e1a729099981b108fac1c744
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri May 29 13:09:46 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri May 29 13:15:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=779e0763

app-emulation/lxd: clean old 3.16

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

 app-emulation/lxd/Manifest           |   1 -
 app-emulation/lxd/lxd-3.16-r1.ebuild | 266 -----------------------------------
 2 files changed, 267 deletions(-)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 5c5d670606b..f5bd47450bf 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,3 +1,2 @@
 DIST lxd-3.14.tar.gz 26141949 BLAKE2B 69004501012c9a873eef77a60df7e5dba25c692224d27b02cd2d2b27533012e71bd7562cb64a17920234746e8be2819bb773365c01422c0b776dd2b7c36b69fe SHA512 3d2d4e61298fc9fde49defad776a398fcccf7639485e810173c9c7f7d939c354a9ad8112a4a631b0850f6eb54435012d289236ff61839416caf95434eb23c8ff
-DIST lxd-3.16.tar.gz 24863601 BLAKE2B 0087c00d86ea3f623ea31bc008176e4232bb432f5c431c288f5c5ff3e1658abe4e310509088ddc6b23d8db68f8e93997522b8a5c0b19fd243abee13e11d3deb9 SHA512 11c6c5c49ceb23c31979829937e1baad340b8920481ef5b89b2b6d0b6b05967ec1f446f8b0330c11008f6fecea077eed0858af7fe802c50b52148757584fdfb9
 DIST lxd-4.0.1.tar.gz 25027762 BLAKE2B 1154a427558ad5eda62b63501a2f62a5c3a1b740fac061432b06a1034b75cb906f38d6c43e8215cab8ae0bed328d75a7612c1bb7af3272cdbe3f93235d5bb920 SHA512 1f47f8239cc1d3425fc4cd075487678e219e94deddec10f52a1cd18fbdc0515f54b67552e7b41d0052803c317a861b34cfc83a25776eae7b9673b5c5fd50d70f

diff --git a/app-emulation/lxd/lxd-3.16-r1.ebuild b/app-emulation/lxd/lxd-3.16-r1.ebuild
deleted file mode 100644
index 6f15ebbce92..00000000000
--- a/app-emulation/lxd/lxd-3.16-r1.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
-
-LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="+daemon +ipv6 +dnsmasq nls test tools"
-RESTRICT="!test? ( test )"
-
-inherit autotools bash-completion-r1 linux-info systemd user
-
-SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz"
-
-DEPEND="
-	dev-lang/tcl
-	>=dev-lang/go-1.9.4
-	dev-libs/libuv
-	dev-libs/protobuf
-	nls? ( sys-devel/gettext )
-	test? (
-		app-misc/jq
-		net-misc/curl
-		sys-devel/gettext
-	)
-"
-
-RDEPEND="
-	daemon? (
-		app-arch/xz-utils
-		>=app-emulation/lxc-2.0.7[seccomp]
-		dev-libs/libuv
-		dev-libs/lzo
-		dev-util/xdelta:3
-		dnsmasq? (
-			net-dns/dnsmasq[dhcp,ipv6?]
-		)
-		net-firewall/ebtables
-		net-firewall/iptables[ipv6?]
-		net-libs/libnfnetlink
-		net-libs/libnsl:0=
-		net-misc/rsync[xattr]
-		sys-apps/iproute2[ipv6?]
-		sys-fs/fuse:0=
-		sys-fs/lxcfs
-		sys-fs/squashfs-tools
-		virtual/acl
-	)
-"
-
-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
-"
-
-ERROR_BRIDGE="BRIDGE: needed for network commands"
-ERROR_DUMMY="DUMMY: needed for network commands"
-ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands"
-ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network commands"
-ERROR_IPV6="IPV6: needed for network commands"
-ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands"
-ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network commands"
-ERROR_MACVLAN="MACVLAN: needed for network commands"
-ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for network commands"
-ERROR_NET_IPGRE="NET_IPGRE: needed for network commands"
-ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands"
-ERROR_NET_IPIP="NET_IPIP: needed for network commands"
-ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network commands"
-ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network commands"
-ERROR_VXLAN="VXLAN: needed for network commands"
-
-EGO_PN="github.com/lxc/lxd"
-
-src_prepare() {
-	eapply_user
-	eapply "${FILESDIR}/de-translation-newline-1.patch"
-
-	cd "${S}/_dist/deps/raft" || die "Can't cd to raft dir"
-	# Workaround for " * ACCESS DENIED:  open_wr:      /dev/zfs"
-	sed -i 's#zfs version | cut -f 2#< /sys/module/zfs/version cut -f 1#' configure.ac || die "Can't sed configure.ac for raft"
-	eautoreconf
-
-	cd "${S}/_dist/deps/dqlite" || die "Can't cd to dqlite dir"
-	eautoreconf
-
-}
-
-src_configure() {
-	export GOPATH="${S}/_dist"
-	cd "${GOPATH}/deps/sqlite" || die "Can't cd to sqlite dir"
-	econf --enable-replication --disable-amalgamation --disable-tcl --libdir="${EPREFIX}/usr/lib/lxd"
-
-	cd "${GOPATH}/deps/raft" || die "Can't cd to raft dir"
-	PKG_CONFIG_PATH="${GOPATH}/raft/" econf --libdir=${EPREFIX}/usr/lib/lxd
-
-	cd "${GOPATH}/deps/dqlite" || die "Can't cd to dqlite dir"
-	export RAFT_CFLAGS="-I${GOPATH}/deps/raft/include/"
-	export RAFT_LIBS="${GOPATH}/deps/raft/.libs"
-	export CO_CFLAGS="-I${GOPATH}/deps/libco/"
-	export CO_LIBS="${GOPATH}/deps/libco/"
-	PKG_CONFIG_PATH="${GOPATH}/sqlite/" econf --libdir=${EPREFIX}/usr/lib/lxd
-}
-
-src_compile() {
-	export GOPATH="${S}/_dist"
-
-	cd "${GOPATH}/deps/sqlite" || die "Can't cd to sqlite dir"
-	emake
-
-	cd "${GOPATH}/deps/raft" || die "Can't cd to raft dir"
-	emake
-
-	cd "${GOPATH}/deps/libco" || die "Can't cd to libco dir"
-	emake
-
-	cd "${GOPATH}/deps/dqlite" || die "Can't cd to dqlite dir"
-	emake CFLAGS="-I${GOPATH}/deps/sqlite -I${GOPATH}/deps/raft/include" LDFLAGS="-L${GOPATH}/deps/sqlite -L${GOPATH}/deps/raft"
-
-	# We don't use the Makefile here because it builds targets with the
-	# assumption that `pwd` is in a deep gopath namespace, which we're not.
-	# It's simpler to manually call "go install" than patching the Makefile.
-	cd "${S}"
-	go install -v -x ${EGO_PN}/lxc || die "Failed to build the client"
-
-	if use daemon; then
-
-		# LXD depends on a patched, bundled sqlite with replication
-		# capabilities.
-		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}"
-
-		go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon"
-	fi
-
-	if use tools; then
-		go install -v -x ${EGO_PN}/fuidshift || die "Failed to build fuidshift"
-		go install -v -x ${EGO_PN}/lxc-to-lxd || die "Failed to build lxc-to-lxd"
-		go install -v -x ${EGO_PN}/lxd-benchmark || die "Failed to build lxd-benchmark"
-		go install -v -x ${EGO_PN}/lxd-p2c || die "Failed to build lxd-p2c"
-	fi
-
-	use nls && emake build-mo
-}
-
-src_test() {
-	if use daemon; then
-		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
-		go get -v -x github.com/remyoudompheng/go-misc/deadcode
-		go get -v -x github.com/golang/lint/golint
-		go test -v ${EGO_PN}/lxd
-	else
-		einfo "No tests to run for client-only builds"
-	fi
-}
-
-src_install() {
-	local bindir="_dist/bin"
-	dobin ${bindir}/lxc
-	if use daemon; then
-
-		export GOPATH="${S}/_dist"
-		cd "${GOPATH}/deps/sqlite" || die "Can't cd to sqlite dir"
-		emake DESTDIR="${D}" install
-
-		cd "${GOPATH}/deps/raft" || die "Can't cd to raft dir"
-		emake DESTDIR="${D}" install
-
-		cd "${GOPATH}/deps/libco" || die "Can't cd to libco dir"
-		dolib.so libco.so
-
-		cd "${GOPATH}/deps/dqlite" || die "Can't cd to dqlite dir"
-		emake DESTDIR="${D}" install
-
-		# Must only install libs
-		rm "${D}/usr/bin/sqlite3" || die "Can't remove custom sqlite3 binary"
-		rm -r "${D}/usr/include" || die "Can't remove include directory"
-
-		cd "${S}" || die "Can't cd to \${S}"
-		dosbin ${bindir}/lxd
-	fi
-
-	if use tools; then
-		dobin ${bindir}/fuidshift
-		dobin ${bindir}/lxc-to-lxd
-		dobin ${bindir}/lxd-benchmark
-		dobin ${bindir}/lxd-p2c
-	fi
-
-	if use nls; then
-		domo po/*.mo
-	fi
-
-	if use daemon; then
-		newinitd "${FILESDIR}"/${PN}.initd lxd
-		newconfd "${FILESDIR}"/${PN}.confd lxd
-
-		systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
-	fi
-
-	newbashcomp scripts/bash/lxd-client lxc
-
-	dodoc AUTHORS doc/*
-}
-
-pkg_postinst() {
-	elog
-	elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
-	elog "including a Quick Start."
-
-	# The messaging below only applies to daemon installs
-	use daemon || return 0
-
-	# The control socket will be owned by (and writeable by) this group.
-	enewgroup lxd
-
-	# Ubuntu also defines an lxd user but it appears unused (the daemon
-	# must run as root)
-
-	elog
-	elog "Though not strictly required, some features are enabled at run-time"
-	elog "when the relevant helper programs are detected:"
-	elog "- sys-apps/apparmor"
-	elog "- sys-fs/btrfs-progs"
-	elog "- sys-fs/lvm2"
-	elog "- sys-fs/zfs"
-	elog "- sys-process/criu"
-	elog
-	elog "Since these features can't be disabled at build-time they are"
-	elog "not USE-conditional."
-	elog
-	elog "Be sure to add your local user to the lxd group."
-	elog
-	elog "Networks with bridge.mode=fan are unsupported due to requiring"
-	elog "a patched kernel and iproute2."
-}
-
-# TODO:
-# - man page, I don't see cobra generating it
-# - maybe implement LXD_CLUSTER_UPDATE per
-#     https://discuss.linuxcontainers.org/t/lxd-3-5-has-been-released/2656
-#     EM I'm not convinced it's a good design.