app-emulation/lxd: version bump to 2.16.

Package-Manager: Portage-2.3.6, Repoman-2.3.1
Closes: gentoo#5457

app-emulation/lxd/files/lxd-2.16-dont-go-get.patch

@@ -0,0 +1,16 @@
+--- /src/github.com/lxc/lxd/Makefile.orig	2016-07-11 23:34:40.299664675 +0000
++++ /src/github.com/lxc/lxd/Makefile	2016-07-11 23:37:00.816018727 +0000
+@@ -13,13 +13,11 @@
+
+ .PHONY: default
+ default:
+-	go get -t -v -d ./...
+ 	go install -v $(TAGS) $(DEBUG) ./...
+ 	@echo "LXD built successfully"
+
+ .PHONY: client
+ client:
+-	go get -t -v -d ./...
+ 	go install -v $(TAGS) $(DEBUG) ./lxc
+ 	@echo "LXD client built successfully"
+

app-emulation/lxd/files/lxd-2.16-fix-fr-po.patch

@@ -0,0 +1,11 @@
+--- /src/github.com/lxc/lxd/po/fr.po
++++ /src/github.com/lxc/lxd/po/fr.po
+@@ -1110,7 +1110,7 @@ msgstr ""
+ "Toutes les fonctionnalités de LXD peuvent être utilisées à l'aide des "
+ "commandes ci-dessous.\n"
+ "Pour de l'aide avec l'une des commandes, simplement les utiliser avec --"
+-"help.\n"
++"help."
+
+ #: lxc/action.go:45
+ msgid "Time to wait for the container before killing it"

app-emulation/lxd/files/lxd-2.16.confd

@@ -0,0 +1,27 @@
+# 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"
+
+
+
+# Enables debug mode
+#LXD_OPTIONS+=" --debug"
+
+# For debugging, print a complete stack trace every n seconds
+#LXD_OPTIONS+=" --print-goroutines-every 5"
+
+# Enables verbose mode
+#LXD_OPTIONS+=" -v"
+
+# Logfile to log to
+#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
+
+# Enables syslog logging
+#LXD_OPTIONS+=" --syslog"

app-emulation/lxd/files/lxd-2.16.initd

@@ -0,0 +1,46 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DAEMON=/usr/sbin/lxd
+PIDFILE=/run/lxd.pid
+
+extra_commands="stopall"
+
+depend() {
+    need net
+    use lxcfs
+}
+
+start() {
+    ebegin "Starting lxd server"
+
+    start-stop-daemon --start \
+		      --pidfile ${PIDFILE} \
+		      --exec ${DAEMON} \
+		      --background \
+		      --make-pidfile \
+		      -- \
+		      ${LXD_OPTIONS}
+
+    eend $?
+}
+
+stop() {
+    if [ "$RC_GOINGDOWN" = "YES" ] || [ "$RC_REBOOT" = "YES" ]; then
+	stopall
+    else
+	ebegin "Stopping lxd service (but not containers)"
+	start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+	eend $?
+    fi
+}
+
+stopall() {
+    ebegin "Stopping lxd service and containers"
+    if "${DAEMON}" shutdown; then
+	/etc/init.d/lxd zap
+	rm -f ${PIDFILE}
+    fi
+    eend $?
+}

app-emulation/lxd/files/lxd-2.16.service

@@ -0,0 +1,10 @@
+[Unit]
+Description=Container hypervisor based on LXC
+
+[Service]
+ExecStart=/usr/sbin/lxd --group lxd
+KillMode=process
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target

app-emulation/lxd/lxd-2.16.ebuild

@@ -0,0 +1,224 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
+EGO_PN_PARENT="github.com/lxc"
+EGO_PN="${EGO_PN_PARENT}/lxd"
+
+# Maintained with https://github.com/hsoft/gentoo-ego-vendor-update
+EGO_VENDOR=(
+	"github.com/dustinkirkland/golang-petname 1f4996aa8aa05ee066aaf9e3179d340b48c6da74"
+	"github.com/golang/protobuf ab9f9a6dab164b7d1246e0e688b0ab7b94d8553e"
+	"github.com/gorilla/mux ac112f7d75a0714af1bd86ab17749b31f7809640"
+	"github.com/gorilla/websocket a69d9f6de432e2c6b296a947d8a5ee88f68522cf"
+	"github.com/gosexy/gettext 74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b"
+	"github.com/jessevdk/go-flags 6cf8f02b4ae8ba723ddc64dcfd403e530c06d927"
+	"github.com/mattn/go-colorable ad5389df28cdac544c99bd7b9161a0b5b6ca9d1b"
+	"github.com/mattn/go-runewidth 97311d9f7767e3d6f422ea06661bc2c7a19e8a5d"
+	"github.com/mattn/go-sqlite3 6654e412c3c7eabb310d920cf73a2102dbf8c632"
+	"github.com/olekukonko/tablewriter be5337e7b39e64e5f91445ce7e721888dbab7387"
+	"github.com/pborman/uuid e790cca94e6cc75c7064b1332e63811d4aae1a53"
+	"github.com/stretchr/testify 890a5c3458b43e6104ff5da8dfa139d013d77544"
+	"github.com/syndtr/gocapability db04d3cc01c8b54962a58ec7e491717d06cfcc16"
+	"github.com/go-stack/stack 817915b46b97fd7bb80e8ab6b69f01a53ac3eebf"
+	"github.com/mattn/go-isatty fc9e8d8ef48496124e79ae0df75490096eccf6fe"
+	"github.com/juju/errors c7d06af17c68cd34c835053720b21f6549d9b0ee"
+	"golang.org/x/crypto b176d7def5d71bdd214203491f89843ed217f420 github.com/golang/crypto"
+	"golang.org/x/net 1c05540f6879653db88113bc4a2b70aec4bd491f github.com/golang/net"
+	"golang.org/x/sync f52d1811a62927559de87708c8913c1650ce4f26 github.com/golang/sync"
+	"golang.org/x/text e56139fd9c5bc7244c76116c68e500765bb6db6b github.com/golang/text"
+	"golang.org/x/tools 84a35ef54dff3c5596983e180ec10919fc432242 github.com/golang/tools"
+	"golang.org/x/sys 9f7170bcd8e9f4d3691c06401119c46a769a1e03 github.com/golang/sys"
+	"gopkg.in/check.v1 20d25e2804050c1cd24a7eea1e7a6447dd0e74ec github.com/go-check/check"
+	"gopkg.in/flosch/pongo2.v3 5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9 github.com/flosch/pongo2"
+	"gopkg.in/inconshreveable/log15.v2 b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f github.com/inconshreveable/log15"
+	"gopkg.in/lxc/go-lxc.v2 1a2cf29ce27f74298fe70acbf817ca2f46cf7457 github.com/lxc/go-lxc"
+	"gopkg.in/tomb.v2 d5d1b5820637886def9eef33e03a27a9f166942c github.com/go-tomb/tomb"
+	"gopkg.in/yaml.v2 eb3733d160e74a9c7e442f435eb3bea458e1d19f github.com/go-yaml/yaml"
+)
+
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PLOCALES="de el fr it ja nl ru sr sv tr"
+IUSE="+daemon nls test"
+
+# IUSE and PLOCALES must be defined before l10n inherited
+inherit bash-completion-r1 golang-build l10n linux-info systemd user golang-vcs-snapshot
+
+SRC_URI="${ARCHIVE_URI}
+	${EGO_VENDOR_URI}"
+
+DEPEND="
+	>=dev-lang/go-1.7.1
+	dev-libs/protobuf
+	nls? ( sys-devel/gettext )
+	test? (
+		app-misc/jq
+		dev-db/sqlite
+		net-misc/curl
+		sys-devel/gettext
+	)
+"
+
+RDEPEND="
+	daemon? (
+		app-arch/xz-utils
+		>=app-emulation/lxc-2.0.7[seccomp]
+		net-dns/dnsmasq[dhcp,ipv6]
+		net-misc/rsync[xattr]
+		sys-apps/iproute2[ipv6]
+		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"
+
+PATCHES=(
+	"${FILESDIR}/${P}-dont-go-get.patch"
+	# See https://github.com/lxc/lxd/pull/3390
+	# (I thought I could remove this for v2.16, but apparently not...)
+	"${FILESDIR}/${P}-fix-fr-po.patch"
+)
+
+# KNOWN ISSUES:
+# - Translations may not work.  I've been unsuccessful in forcing
+#   localized output.  Anyway, upstream (Canonical) doesn't install the
+#   message files.
+
+src_prepare() {
+	default_src_prepare
+
+	# Warn on unhandled locale changes
+	l10n_find_plocales_changes "${S}/src/${EGO_PN}/po" "" .po
+
+	# Examples in go-lxc make our build fail.
+	rm -rf "${S}/src/${EGO_PN}/vendor/gopkg.in/lxc/go-lxc.v2/examples" || die
+}
+
+src_compile() {
+	export GOPATH="${S}"
+
+	cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
+
+	tmpgoroot="${T}/goroot"
+	if use daemon; then
+		# Build binaries
+		emake
+	else
+		# build client tool
+		emake client
+	fi
+
+	use nls && emake build-mo
+}
+
+src_test() {
+	if use daemon; then
+		# Go native tests should succeed
+		golang-build_src_test
+	fi
+}
+
+src_install() {
+	# Installs all src,pkg to /usr/lib/go-gentoo
+	golang-build_src_install
+
+	cd "${S}" || die "can't cd into ${S}"
+	dobin bin/lxc
+	if use daemon; then
+		dosbin bin/lxd
+		dobin bin/fuidshift
+	fi
+
+	cd "src/${EGO_PN}" || die "can't cd into ${S}/src/${EGO_PN}"
+
+	if use nls; then
+		local lingua
+		for lingua in ${PLOCALES}; do
+			if use linguas_${lingua}; then
+				domo po/${lingua}.mo
+			fi
+		done
+	fi
+
+	if use daemon; then
+		newinitd "${FILESDIR}"/${P}.initd lxd
+		newconfd "${FILESDIR}"/${P}.confd lxd
+
+		systemd_newunit "${FILESDIR}"/${P}.service ${PN}.service
+	fi
+
+	newbashcomp config/bash/lxd-client lxc
+
+	dodoc AUTHORS CONTRIBUTING.md README.md doc/*
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+	einfo "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)
+
+	einfo
+	einfo "Though not strictly required, some features are enabled at run-time"
+	einfo "when the relevant helper programs are detected:"
+	einfo "- sys-apps/apparmor"
+	einfo "- sys-fs/btrfs-progs"
+	einfo "- sys-fs/lvm2"
+	einfo "- sys-fs/lxcfs"
+	einfo "- sys-fs/zfs"
+	einfo "- sys-process/criu"
+	einfo
+	einfo "Since these features can't be disabled at build-time they are"
+	einfo "not USE-conditional."
+	einfo
+	einfo "Networks with bridge.mode=fan are unsupported due to requiring"
+	einfo "a patched kernel and iproute2."
+}