19 files changed, 126 insertions, 101 deletions
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index b8bca616b4..fcb60cb019 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,3 +1,3 @@
-DIST lxd-0.20.tar.bz2 2687718 SHA256 a071b92015f676746137e1ffeab1886d90297d0d5832bbf5ee6aff081acc4840 SHA512 2064daa7d1aeb4764a15d559e3d4178918942d82dbba31e964d713aab48d2ee30ce6a63632701c41b13de4aea541acd76d55b52f12de10a99ffeaa3cb945ad44 WHIRLPOOL 1ffa9d6bf1cb7132b82e731002eae7b7ff3544fb03958827916c2e00e02a0bdd10bbadd2401f7799187c2c0338987f24b46d8e138131f7df888162e56b3f4fe5
-DIST lxd-0.21.tar.bz2 2683517 SHA256 06e9ed72d1d45af532664e47d9772a886dc1d757e83d673498b05798249c66c8 SHA512 588225ed77cd8a86b34579ee3f3b2b3ba8166ce9d85872e6076fa5075bc5a3846c82255dee6e701a6d51bdd9bf8280bbd5fab08ca4438de5320de8f0388685eb WHIRLPOOL c85f103e38f44c4cd859faf330764c3d076cede6d09f976b4686d7f91b6ca233e09721df418493fed19cb8bf3118b2a0a6723f3084da532bba4a5344de8a4b9c
-DIST lxd-0.22.tar.bz2 2685133 SHA256 66dc30b82fba7f606658280d0dbac67a32152644a403ab00285fc3907b50082e SHA512 ab5384143edd03dfa1ef956c64e9fce2d845ce07c5388f719c202fd1ff9059282e104400f39f23ff1c4fefc8a23dd1d4c6c9094b497c40c659b087989bf07d44 WHIRLPOOL 27559c50f6aa55edb533046bb49b04784c63003569e7920261504a7b4c69891a80ff8432421352c13f274bb21876f2cf5266e9de2b1302d69e0254be87c17137
+DIST lxd-0.25.tar.bz2 1983043 SHA256 1cfdf1a5e8638060e2368e9e5cf8763406857309f08c4668fa0756e85ba7b89e SHA512 001e52826a3bbe00121115ddace14b3f552321f16e97700763ff6dd23b5babd3c1393cbc9b9b263b6a18c31e49c30d612e3d7153d4987644689989be0be50d00 WHIRLPOOL 496f3f19c50c1ee79ba8b5625cf34b6f57683f4066a09b3edc2cbd017cc5ebc2cc7ac9e569c94bcba0d699c6efb722b79ae43541e0dfddc2fb8d877131519b06
+DIST lxd-0.26.tar.bz2 1985288 SHA256 71079140946e3e66563cc3025c3e4f756fd45cc413af1d5396c56a608427d0aa SHA512 25aa73274b03163698646fe2f49c2401ae93a9b90be46f0ba0414521bc920e68c61db7e6617d75a19675e22a705afd5d3220e24a518e30819daf3dc75670b900 WHIRLPOOL d59471f02744efbe3d3dbb1ae32dcf17141f8414a1614535451e75c5422928d3c5d54dceebcf0d829f7395ae3cb49bf424ff7999d1e32b9384a3f81b3d3ab01e
+DIST lxd-0.27.tar.bz2 2247266 SHA256 290d05a792f2f146b302d500eadd3168822ed99aecb4ea96762570580f29910a SHA512 37d5fef677a943dc7e84c73836aa1d4e5f0353c165aa33cefcd87dcd1fdae574760e74fb290404182badfee96e04ef929a81d6633d2c0f91c458ccd19996b9c3 WHIRLPOOL d1d0c0fad0e604f41482c133f4425461546599aded2e948d5c58f7698eba963746ac8c3c3085ffbd244b0169cedb26ad8ec5d85babea6aa9a7688ee6ce342589
diff --git a/app-emulation/lxd/files/lxd-0.20-nc-binary-name.patch b/app-emulation/lxd/files/lxd-0.20-nc-binary-name.patch
deleted file mode 100644
index b88b7f7e50..0000000000
--- a/app-emulation/lxd/files/lxd-0.20-nc-binary-name.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lxd/rsync.go.orig	2015-09-17 21:00:29.290772099 -0500
-+++ lxd/rsync.go	2015-09-17 21:00:54.737770359 -0500
-@@ -73,7 +73,7 @@
- 	 * command (i.e. the command to run on --server). However, we're
- 	 * hardcoding that at the other end, so we can just ignore it.
- 	 */
--	rsyncCmd := fmt.Sprintf("sh -c \"nc -U %s\"", f.Name())
-+	rsyncCmd := fmt.Sprintf("sh -c \"nc.openbsd -U %s\"", f.Name())
- 	cmd := exec.Command("rsync", "-arvP", "--devices", "--partial", path, "localhost:/tmp/foo", "-e", rsyncCmd)
- 	if err := cmd.Start(); err != nil {
- 		return nil, nil, err
diff --git a/app-emulation/lxd/files/lxd-0.21-nc-binary-name.patch b/app-emulation/lxd/files/lxd-0.21-nc-binary-name.patch
deleted file mode 100644
index b88b7f7e50..0000000000
--- a/app-emulation/lxd/files/lxd-0.21-nc-binary-name.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lxd/rsync.go.orig	2015-09-17 21:00:29.290772099 -0500
-+++ lxd/rsync.go	2015-09-17 21:00:54.737770359 -0500
-@@ -73,7 +73,7 @@
- 	 * command (i.e. the command to run on --server). However, we're
- 	 * hardcoding that at the other end, so we can just ignore it.
- 	 */
--	rsyncCmd := fmt.Sprintf("sh -c \"nc -U %s\"", f.Name())
-+	rsyncCmd := fmt.Sprintf("sh -c \"nc.openbsd -U %s\"", f.Name())
- 	cmd := exec.Command("rsync", "-arvP", "--devices", "--partial", path, "localhost:/tmp/foo", "-e", rsyncCmd)
- 	if err := cmd.Start(); err != nil {
- 		return nil, nil, err
diff --git a/app-emulation/lxd/files/lxd-0.20-dont-go-get.patch b/app-emulation/lxd/files/lxd-0.25-dont-go-get.patch
index 1b229ea99c..9964af6aec 100644
--- a/app-emulation/lxd/files/lxd-0.20-dont-go-get.patch
+++ b/app-emulation/lxd/files/lxd-0.25-dont-go-get.patch
@@ -1,9 +1,10 @@
---- Makefile.orig	2015-09-17 20:37:16.481867339 -0500
-+++ Makefile	2015-09-17 20:53:27.715800926 -0500
-@@ -12,15 +12,11 @@
+--- Makefile.orig	2015-12-28 19:23:28.425122306 -0600
++++ Makefile	2015-12-28 19:25:09.482123654 -0600
+@@ -12,17 +12,11 @@
  
  .PHONY: default
  default:
+-	# Must run twice due to go get race
 -	-go get -t -v -d ./...
 -	-go get -t -v -d ./...
  	go install -v ./...
@@ -11,6 +12,7 @@
  
  .PHONY: client
  client:
+-	# Must run twice due to go get race
 -	-go get -t -v -d ./...
 -	-go get -t -v -d ./...
  	go install -v ./lxc
diff --git a/app-emulation/lxd/files/lxd-0.22-nc-binary-name.patch b/app-emulation/lxd/files/lxd-0.25-nc-binary-name.patch
index 7373b66969..7373b66969 100644
--- a/app-emulation/lxd/files/lxd-0.22-nc-binary-name.patch
+++ b/app-emulation/lxd/files/lxd-0.25-nc-binary-name.patch
diff --git a/app-emulation/lxd/files/lxd-0.20.confd b/app-emulation/lxd/files/lxd-0.25.confd
index 3d553276a5..3d553276a5 100644
--- a/app-emulation/lxd/files/lxd-0.20.confd
+++ b/app-emulation/lxd/files/lxd-0.25.confd
diff --git a/app-emulation/lxd/files/lxd-0.22.initd b/app-emulation/lxd/files/lxd-0.25.initd
index 65915f0ae5..ec23258c19 100644
--- a/app-emulation/lxd/files/lxd-0.22.initd
+++ b/app-emulation/lxd/files/lxd-0.25.initd
@@ -6,11 +6,14 @@
 DAEMON=/usr/sbin/lxd
 PIDFILE=/run/lxd.pid
 
-extra_commands="shutdown"
+extra_commands="stopall"
 
 depend() {
-    need cgmanager
     need net
+    use lxcfs
+
+    # remove with 2.0 release
+    need cgmanager
 }
 
 start() {
@@ -28,14 +31,18 @@ start() {
 }
 
 stop() {
-    ebegin "Stopping lxd server"
-    start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
-    eend $?
+    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
 }
 
-shutdown() {
-    ebegin "Stopping lxd server and containers"
-    if ${DAEMON} shutdown; then
+stopall() {
+    ebegin "Stopping lxd service and containers"
+    if "${DAEMON}" shutdown; then
 	/etc/init.d/lxd zap
 	rm -f ${PIDFILE}
     fi
diff --git a/app-emulation/lxd/files/lxd-0.21-dont-go-get.patch b/app-emulation/lxd/files/lxd-0.26-dont-go-get.patch
index 1b229ea99c..9964af6aec 100644
--- a/app-emulation/lxd/files/lxd-0.21-dont-go-get.patch
+++ b/app-emulation/lxd/files/lxd-0.26-dont-go-get.patch
@@ -1,9 +1,10 @@
---- Makefile.orig	2015-09-17 20:37:16.481867339 -0500
-+++ Makefile	2015-09-17 20:53:27.715800926 -0500
-@@ -12,15 +12,11 @@
+--- Makefile.orig	2015-12-28 19:23:28.425122306 -0600
++++ Makefile	2015-12-28 19:25:09.482123654 -0600
+@@ -12,17 +12,11 @@
  
  .PHONY: default
  default:
+-	# Must run twice due to go get race
 -	-go get -t -v -d ./...
 -	-go get -t -v -d ./...
  	go install -v ./...
@@ -11,6 +12,7 @@
  
  .PHONY: client
  client:
+-	# Must run twice due to go get race
 -	-go get -t -v -d ./...
 -	-go get -t -v -d ./...
  	go install -v ./lxc
diff --git a/app-emulation/lxd/files/lxd-0.26-nc-binary-name.patch b/app-emulation/lxd/files/lxd-0.26-nc-binary-name.patch
new file mode 100644
index 0000000000..7373b66969
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.26-nc-binary-name.patch
@@ -0,0 +1,11 @@
+--- lxd/rsync.go.orig	2015-11-11 20:54:37.402700202 -0600
++++ lxd/rsync.go	2015-11-11 20:55:06.704698199 -0600
+@@ -91,7 +91,7 @@
+ 	 * command (i.e. the command to run on --server). However, we're
+ 	 * hardcoding that at the other end, so we can just ignore it.
+ 	 */
+-	rsyncCmd := fmt.Sprintf("sh -c \"nc -U %s\"", f.Name())
++	rsyncCmd := fmt.Sprintf("sh -c \"nc.openbsd -U %s\"", f.Name())
+ 	cmd := exec.Command(
+ 		"rsync",
+ 		"-arvP",
diff --git a/app-emulation/lxd/files/lxd-0.21.confd b/app-emulation/lxd/files/lxd-0.26.confd
index 3d553276a5..3d553276a5 100644
--- a/app-emulation/lxd/files/lxd-0.21.confd
+++ b/app-emulation/lxd/files/lxd-0.26.confd
diff --git a/app-emulation/lxd/files/lxd-0.21.initd b/app-emulation/lxd/files/lxd-0.26.initd
index 2b75e51c8a..ec23258c19 100644
--- a/app-emulation/lxd/files/lxd-0.21.initd
+++ b/app-emulation/lxd/files/lxd-0.26.initd
@@ -6,9 +6,14 @@
 DAEMON=/usr/sbin/lxd
 PIDFILE=/run/lxd.pid
 
+extra_commands="stopall"
+
 depend() {
-    need cgmanager
     need net
+    use lxcfs
+
+    # remove with 2.0 release
+    need cgmanager
 }
 
 start() {
@@ -26,7 +31,20 @@ start() {
 }
 
 stop() {
-    ebegin "Stopping lxd server"
-    start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+    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 $?
 }
diff --git a/app-emulation/lxd/files/lxd-0.22-dont-go-get.patch b/app-emulation/lxd/files/lxd-0.27-dont-go-get.patch
index 1b229ea99c..9964af6aec 100644
--- a/app-emulation/lxd/files/lxd-0.22-dont-go-get.patch
+++ b/app-emulation/lxd/files/lxd-0.27-dont-go-get.patch
@@ -1,9 +1,10 @@
---- Makefile.orig	2015-09-17 20:37:16.481867339 -0500
-+++ Makefile	2015-09-17 20:53:27.715800926 -0500
-@@ -12,15 +12,11 @@
+--- Makefile.orig	2015-12-28 19:23:28.425122306 -0600
++++ Makefile	2015-12-28 19:25:09.482123654 -0600
+@@ -12,17 +12,11 @@
  
  .PHONY: default
  default:
+-	# Must run twice due to go get race
 -	-go get -t -v -d ./...
 -	-go get -t -v -d ./...
  	go install -v ./...
@@ -11,6 +12,7 @@
  
  .PHONY: client
  client:
+-	# Must run twice due to go get race
 -	-go get -t -v -d ./...
 -	-go get -t -v -d ./...
  	go install -v ./lxc
diff --git a/app-emulation/lxd/files/lxd-0.27-nc-binary-name.patch b/app-emulation/lxd/files/lxd-0.27-nc-binary-name.patch
new file mode 100644
index 0000000000..7373b66969
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.27-nc-binary-name.patch
@@ -0,0 +1,11 @@
+--- lxd/rsync.go.orig	2015-11-11 20:54:37.402700202 -0600
++++ lxd/rsync.go	2015-11-11 20:55:06.704698199 -0600
+@@ -91,7 +91,7 @@
+ 	 * command (i.e. the command to run on --server). However, we're
+ 	 * hardcoding that at the other end, so we can just ignore it.
+ 	 */
+-	rsyncCmd := fmt.Sprintf("sh -c \"nc -U %s\"", f.Name())
++	rsyncCmd := fmt.Sprintf("sh -c \"nc.openbsd -U %s\"", f.Name())
+ 	cmd := exec.Command(
+ 		"rsync",
+ 		"-arvP",
diff --git a/app-emulation/lxd/files/lxd-0.22.confd b/app-emulation/lxd/files/lxd-0.27.confd
index 3d553276a5..3d553276a5 100644
--- a/app-emulation/lxd/files/lxd-0.22.confd
+++ b/app-emulation/lxd/files/lxd-0.27.confd
diff --git a/app-emulation/lxd/files/lxd-0.20.initd b/app-emulation/lxd/files/lxd-0.27.initd
index 2b75e51c8a..ec23258c19 100644
--- a/app-emulation/lxd/files/lxd-0.20.initd
+++ b/app-emulation/lxd/files/lxd-0.27.initd
@@ -6,9 +6,14 @@
 DAEMON=/usr/sbin/lxd
 PIDFILE=/run/lxd.pid
 
+extra_commands="stopall"
+
 depend() {
-    need cgmanager
     need net
+    use lxcfs
+
+    # remove with 2.0 release
+    need cgmanager
 }
 
 start() {
@@ -26,7 +31,20 @@ start() {
 }
 
 stop() {
-    ebegin "Stopping lxd server"
-    start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+    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 $?
 }
diff --git a/app-emulation/lxd/lxd-0.22.ebuild b/app-emulation/lxd/lxd-0.25.ebuild
index a56c9bda52..549dff584e 100644
--- a/app-emulation/lxd/lxd-0.22.ebuild
+++ b/app-emulation/lxd/lxd-0.25.ebuild
@@ -19,9 +19,12 @@ IUSE="+daemon nls test"
 # IUSE and PLOCALES must be defined before l10n inherited
 inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
 
+# The compiler is forced in golang-base:
+# DEPEND=">=dev-lang/go-1.4.2:="
+# ... so the dep is omitted here (and I disagree with := in this case)
+
 DEPEND="
 	dev-go/go-crypto
-	>=dev-lang/go-1.4.2:=
 	dev-libs/protobuf
 	dev-vcs/git
 	nls? ( sys-devel/gettext )
@@ -57,7 +60,7 @@ RDEPEND="
 #   this package directly.
 
 src_prepare() {
-	cd "${S}/src/${EGO_PN}"
+	cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
 
 	epatch "${FILESDIR}/${P}-dont-go-get.patch"
 
@@ -72,7 +75,7 @@ src_prepare() {
 src_compile() {
 	golang-build_src_compile
 
-	cd "${S}/src/${EGO_PN}"
+	cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
 
 	if use daemon; then
 		# Build binaries
@@ -98,11 +101,7 @@ src_install() {
 
 	cd "${S}"
 	dobin bin/lxc
-	if use daemon; then
-		dobin bin/fuidshift
-
-		dosbin bin/lxd
-	fi
+	use daemon && dosbin bin/lxd
 
 	cd "src/${EGO_PN}"
 
@@ -149,6 +148,7 @@ pkg_postinst() {
 	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
diff --git a/app-emulation/lxd/lxd-0.21.ebuild b/app-emulation/lxd/lxd-0.26.ebuild
index dd67b7be7a..ce1664213f 100644
--- a/app-emulation/lxd/lxd-0.21.ebuild
+++ b/app-emulation/lxd/lxd-0.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,9 +19,12 @@ IUSE="+daemon nls test"
 # IUSE and PLOCALES must be defined before l10n inherited
 inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
 
+# The compiler is forced in golang-base:
+# DEPEND=">=dev-lang/go-1.4.2:="
+# ... so the dep is omitted here (and I disagree with := in this case)
+
 DEPEND="
 	dev-go/go-crypto
-	>=dev-lang/go-1.4.2:=
 	dev-libs/protobuf
 	dev-vcs/git
 	nls? ( sys-devel/gettext )
@@ -55,12 +58,9 @@ RDEPEND="
 # - since 0.15 gccgo is a supported compiler ('make gccgo').  It would
 #   be preferable for that support to go into the golang-build eclass not
 #   this package directly.
-# - integrate "lxd shutdown" into initscript as custom action (default "stop"
-#   action should _not_ stop containers amirite?)
-#   "Perform a clean shutdown of LXD and all running containers"
 
 src_prepare() {
-	cd "${S}/src/${EGO_PN}"
+	cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
 
 	epatch "${FILESDIR}/${P}-dont-go-get.patch"
 
@@ -75,7 +75,7 @@ src_prepare() {
 src_compile() {
 	golang-build_src_compile
 
-	cd "${S}/src/${EGO_PN}"
+	cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
 
 	if use daemon; then
 		# Build binaries
@@ -101,11 +101,7 @@ src_install() {
 
 	cd "${S}"
 	dobin bin/lxc
-	if use daemon; then
-		dobin bin/fuidshift
-
-		dosbin bin/lxd
-	fi
+	use daemon && dosbin bin/lxd
 
 	cd "src/${EGO_PN}"
 
@@ -152,18 +148,10 @@ pkg_postinst() {
 	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."
-
-	if test -n "${REPLACING_VERSIONS}"; then
-		einfo
-		einfo "If you are upgrading from version 0.14 or older, note that the --tcp"
-		einfo "is no longer available in /etc/conf.d/lxd.  Instead, configure the"
-		einfo "listen address/port by setting the core.https_address server option."
-	fi
-
-	einfo
 }
diff --git a/app-emulation/lxd/lxd-0.20.ebuild b/app-emulation/lxd/lxd-0.27.ebuild
index ab08cd16c4..ba679e3248 100644
--- a/app-emulation/lxd/lxd-0.20.ebuild
+++ b/app-emulation/lxd/lxd-0.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -8,7 +8,7 @@ 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"
-SRC_URI="http://961db08fe45d5f5dd062-b8a7a040508aea6d369676e49b80719d.r29.cf2.rackcdn.com/${P}.tar.bz2"
+SRC_URI="https://dev.gentoo.org/~stasibear/distfiles/${P}.tar.bz2"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -19,9 +19,12 @@ IUSE="+daemon nls test"
 # IUSE and PLOCALES must be defined before l10n inherited
 inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
 
+# The compiler is forced in golang-base:
+# DEPEND=">=dev-lang/go-1.4.2:="
+# ... so the dep is omitted here (and I disagree with := in this case)
+
 DEPEND="
 	dev-go/go-crypto
-	>=dev-lang/go-1.4.2:=
 	dev-libs/protobuf
 	dev-vcs/git
 	nls? ( sys-devel/gettext )
@@ -55,12 +58,9 @@ RDEPEND="
 # - since 0.15 gccgo is a supported compiler ('make gccgo').  It would
 #   be preferable for that support to go into the golang-build eclass not
 #   this package directly.
-# - integrate "lxd shutdown" into initscript as custom action (default "stop"
-#   action should _not_ stop containers amirite?)
-#   "Perform a clean shutdown of LXD and all running containers"
 
 src_prepare() {
-	cd "${S}/src/${EGO_PN}"
+	cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
 
 	epatch "${FILESDIR}/${P}-dont-go-get.patch"
 
@@ -75,7 +75,7 @@ src_prepare() {
 src_compile() {
 	golang-build_src_compile
 
-	cd "${S}/src/${EGO_PN}"
+	cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
 
 	if use daemon; then
 		# Build binaries
@@ -101,11 +101,7 @@ src_install() {
 
 	cd "${S}"
 	dobin bin/lxc
-	if use daemon; then
-		dobin bin/fuidshift
-
-		dosbin bin/lxd
-	fi
+	use daemon && dosbin bin/lxd
 
 	cd "src/${EGO_PN}"
 
@@ -124,7 +120,7 @@ src_install() {
 		systemd_dounit "${FILESDIR}"/lxd.service
 	fi
 
-	newbashcomp config/bash/lxc.in lxc
+	newbashcomp config/bash/lxd-client lxc
 
 	dodoc AUTHORS CONTRIBUTING.md README.md
 
@@ -152,18 +148,10 @@ pkg_postinst() {
 	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."
-
-	if test -n "${REPLACING_VERSIONS}"; then
-		einfo
-		einfo "If you are upgrading from version 0.14 or older, note that the --tcp"
-		einfo "is no longer available in /etc/conf.d/lxd.  Instead, configure the"
-		einfo "listen address/port by setting the core.https_address server option."
-	fi
-
-	einfo
 }
diff --git a/app-emulation/lxd/metadata.xml b/app-emulation/lxd/metadata.xml
index 0ff516e1ca..6550e45afb 100644
--- a/app-emulation/lxd/metadata.xml
+++ b/app-emulation/lxd/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer status="active">
+	<maintainer status="active" type="person">
 		<email>stasibear@gentoo.org</email>
 		<name>Erik Mackdanz</name>
 	</maintainer>