gentoo auto-resync : 18:10:2022 - 07:56:02

8 files changed, 184 insertions, 172 deletions

diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index a20da60e0327..690ca62613bc 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/flannel/Manifest b/app-containers/flannel/Manifest
index 3036f90003dd..ed7b8501e230 100644
--- a/app-containers/flannel/Manifest
+++ b/app-containers/flannel/Manifest
@@ -4,14 +4,8 @@ AUX flanneld.confd 40 BLAKE2B 7e3aae756e872ead179c34119e39bb054c7e23255b647c9c4f
 AUX flanneld.initd 518 BLAKE2B 36859121c77fcd7b53f679eff455ad1ba1f9c6c58fc6a015e195c7639434f941106c44349671c1fe15f4f0c63c3d753f69e9b8cfe2a8d706cd33dbf62a928154 SHA512 3f6f33fe90adca1dd17b503ce0cd3a7f3cc0ca7fc10d0ca5b631f4c87ed513c0133dfd7679618cf95540b252b3176f9bbefd6454867ef792258c46cafc039d86
 AUX flanneld.logrotated 77 BLAKE2B 778f7289a6268cf6b150b1c58895514808c304b56baca56b1df3297df4ff0a4c9ec6e70a3ddbf16c55c0bd5be146bcfa20f7b4ac8ceb08fa9af223164c19a905 SHA512 d84258a164adcec0f1cef7fcafcf0cadb3bf3959b393b905c4897274adeff476279ce96ec42e9aa9d574c6bd7d37649d92c7c52563975f85d303cade990a3942
 AUX flanneld.service 476 BLAKE2B ea838e26be0834943bafb985a37e71b45219bffbd68784b8442c065d9bafc8c9cb2b097c8a00629c19faf4b7bb1fb4ae33071e51d4bf6ffdd62cf5898de1f3cf SHA512 4a7d09f25f117b1cda9b02914a394c0d6d6ddd6c02503f61c0646ede1934cb4cad831992058c5738401b1ac7be6e4c7cd83b1c4a70c04084bb4bb01338c08220
-DIST flannel-0.14.0.tar.gz 8324790 BLAKE2B 47fd65d531f9fa10e602ccf1858549ede97d8f8c9afa32ffeb010d733060703262cafd02b5daddc65142dfa96b1c6b429eaff30b7fdaca27e2a5397c0d756e7c SHA512 a5d9f45d55f18c744e635b4d697200cf9d5a8c4387cd6d9c57220e652e3688337f2ee50fef193135dd0073b14edb8800fac8d5ca9f9d0d3e9ef70d09a52f259c
-DIST flannel-0.16.0.tar.gz 8697548 BLAKE2B a307990554a6cf215bef6ac75a544d00d8c6cd702f02e98efaf80b89d0ecf4592c1c338d1f80cf22ee086355ee7edb77492e6af587cbf037f38b6e3dbc4ac252 SHA512 7b80fe1e282c312b8b242d2201ecd164d87b551f4bc02d8375ca856c0dcfad2d31bd1b4041663016130b0bd7ebaf0062afe59c0946e97f10478142ca8ffd94f0
-DIST flannel-0.16.1.tar.gz 8697974 BLAKE2B bff4d5a6fe179129fa9ae494291301b25bc3ff9d6f4049b990f50b01920dfd20d149eb85339e2930b66dd060aca57f269a3b21fa508a3c95f5d152bbfb91631f SHA512 699ba7e7b80dd60a03bb5c6ee384a582201d8167ef21e60816ca9942a9d70ba0fd7633a3d2a44802f9f0a0851a79709afe78bd46f15ca81641ff64d46859f928
-DIST flannel-0.16.3.tar.gz 9531741 BLAKE2B 6a22b3d031dda538a0b64877eda4afbf5e9cbe6d39342325f54bcc5faf1b867c8eef6a9f2800ec9b872ed5c48d17aa23842f273a0fad862bffb99b9905045363 SHA512 965708d99401c4a6a32883181afbc1afccd2211589411272b6b93f225ec84373b95fa2be840d00c39364b8e4c1a8a3763a498523503ecb631156c5c70304a9b9
 DIST flannel-0.17.0.tar.gz 9534647 BLAKE2B 03d6d036d5877641a2fc7b6654995822522d378943e4d7b2531be8197de6e7d6e0509143cd8d4dfd3d2ef11c9355011bfc44c834f966e14fd3aa774350bcab11 SHA512 f0625339e387a6ae81780d21025c282c2e0caf8b32ac778634a877a4e04ebf10d41fc10b50ae477c28815cedaf34af867b651ed5a8c5267177ea925abc6a1253
-EBUILD flannel-0.14.0.ebuild 1418 BLAKE2B 94b7e426dc6e3d769b3564f60e969a28d21628a1f963721a9d78e3f3568bd6ef2a5b481406b6aa93aa072c47209ab1f7eb1c375429d66d8cd11910bacde07c6f SHA512 1dea57abed0dc5dc46b720d046788fc16e3d471d01bc0fe2115b156c3a7888b6d834f0da85eed00b644ed3318817e858126aabacdf40e94e53d06d3736bef43a
-EBUILD flannel-0.16.0.ebuild 1418 BLAKE2B 94b7e426dc6e3d769b3564f60e969a28d21628a1f963721a9d78e3f3568bd6ef2a5b481406b6aa93aa072c47209ab1f7eb1c375429d66d8cd11910bacde07c6f SHA512 1dea57abed0dc5dc46b720d046788fc16e3d471d01bc0fe2115b156c3a7888b6d834f0da85eed00b644ed3318817e858126aabacdf40e94e53d06d3736bef43a
-EBUILD flannel-0.16.1.ebuild 1418 BLAKE2B cf64ef8ca8ccea8838b27dccf750a8497b23876ba68275bb97911770898e17b2c35c917134147ba06493e010ce5b18fd8950678fd992db4feb9fd49066aeb8d8 SHA512 6095d70c1bbe214c6122584f9b307bc93aee73018c20aae8ed0e11e7f6e87dbd9f38edf64dcaf6931d48db35906fa17df03bf983963ae349b3b951bfd3e3d85b
-EBUILD flannel-0.16.3.ebuild 1418 BLAKE2B cf64ef8ca8ccea8838b27dccf750a8497b23876ba68275bb97911770898e17b2c35c917134147ba06493e010ce5b18fd8950678fd992db4feb9fd49066aeb8d8 SHA512 6095d70c1bbe214c6122584f9b307bc93aee73018c20aae8ed0e11e7f6e87dbd9f38edf64dcaf6931d48db35906fa17df03bf983963ae349b3b951bfd3e3d85b
+DIST flannel-0.20.0.tar.gz 10737855 BLAKE2B d2e5821c4457a8c0781618a62245132f862d7877ce10467f8d9c72be2440f7b60f0866a3420a69d13bc53826407b0b653e6c2385f8e56d684ee1e09acf0528f0 SHA512 624a293607d3d4d5e53b41b5fd26a416f8499a763f8cfbe39c79796644a56d5eb3605664592d15eddde519f2dba55da241889be159644bbe40e78ae72ed5a43b
 EBUILD flannel-0.17.0.ebuild 1436 BLAKE2B c0dc753253b6267ffc746294c1cec61bd4647f30ad1b562598dec39de55073bf2cd0a47b1b9a0bb518ec4211f285f00f63a319c009b6c4d83498242d99908083 SHA512 6fbaedd060184774118f8a483ea737fa1ba6eb16996d8b2f7677c9f09ba5aeafc1773182980a98f4185c70442d6a7080ab4903944958197125c26b7e4f13fc8c
+EBUILD flannel-0.20.0.ebuild 1436 BLAKE2B c0dc753253b6267ffc746294c1cec61bd4647f30ad1b562598dec39de55073bf2cd0a47b1b9a0bb518ec4211f285f00f63a319c009b6c4d83498242d99908083 SHA512 6fbaedd060184774118f8a483ea737fa1ba6eb16996d8b2f7677c9f09ba5aeafc1773182980a98f4185c70442d6a7080ab4903944958197125c26b7e4f13fc8c
 MISC metadata.xml 310 BLAKE2B de0cea7ebb19915abdb06399ba91ff1f3c45b2ca5a24c4c99e59c839bad7a854f702cd5909549bc9ad746ad579b80280fe53be39736117aa5f4fdec184a122e3 SHA512 e2c16506f5baf5911f15a5cadc4d8493b0c8d66dfefef8f789a471dfc4c92411e3a8c5ac3e40490edd3d4c8150a0beb815d497882db83164724093e2fc8aa34d
diff --git a/app-containers/flannel/flannel-0.14.0.ebuild b/app-containers/flannel/flannel-0.14.0.ebuild
deleted file mode 100644
index ec33f31625ba..000000000000
--- a/app-containers/flannel/flannel-0.14.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd tmpfiles
-
-KEYWORDS="~amd64 ~arm64"
-DESCRIPTION="An etcd backed network fabric for containers"
-HOMEPAGE="https://github.com/coreos/flannel"
-SRC_URI="https://github.com/coreos/flannel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD ISC LGPL-3 MIT"
-SLOT="0"
-IUSE="hardened"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	default
-	sed -e "s:^var Version =.*:var Version = \"${PV}\":" \
-		-i "${S}/version/version.go" || die
-}
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"\
-	go build -o dist/flanneld -ldflags "
-		-X github.com/flannel-io/flannel/version.Version=v${PV}
-		-extldflags \"-static\"" . || die
-}
-
-src_test() {
-	GOPATH="${WORKDIR}/${P}" \
-		go test -v -work -x "${EGO_PN}" || die
-}
-
-src_install() {
-	dobin dist/${PN}d
-	exeinto /usr/libexec/flannel
-	doexe dist/mk-docker-opts.sh
-	insinto /etc/systemd/system/docker.service.d
-	newins "${FILESDIR}/flannel-docker.conf" flannel.conf
-	newinitd "${FILESDIR}"/flanneld.initd flanneld
-	newconfd "${FILESDIR}"/flanneld.confd flanneld
-	keepdir /var/log/${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/flanneld.logrotated flanneld
-	newtmpfiles "${FILESDIR}/flannel.tmpfilesd" flannel.conf
-	systemd_dounit "${FILESDIR}/flanneld.service"
-	dodoc README.md
-}
-
-pkg_postinst() {
-	tmpfiles_process flannel.conf
-}
diff --git a/app-containers/flannel/flannel-0.16.0.ebuild b/app-containers/flannel/flannel-0.16.0.ebuild
deleted file mode 100644
index ec33f31625ba..000000000000
--- a/app-containers/flannel/flannel-0.16.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd tmpfiles
-
-KEYWORDS="~amd64 ~arm64"
-DESCRIPTION="An etcd backed network fabric for containers"
-HOMEPAGE="https://github.com/coreos/flannel"
-SRC_URI="https://github.com/coreos/flannel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD ISC LGPL-3 MIT"
-SLOT="0"
-IUSE="hardened"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	default
-	sed -e "s:^var Version =.*:var Version = \"${PV}\":" \
-		-i "${S}/version/version.go" || die
-}
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"\
-	go build -o dist/flanneld -ldflags "
-		-X github.com/flannel-io/flannel/version.Version=v${PV}
-		-extldflags \"-static\"" . || die
-}
-
-src_test() {
-	GOPATH="${WORKDIR}/${P}" \
-		go test -v -work -x "${EGO_PN}" || die
-}
-
-src_install() {
-	dobin dist/${PN}d
-	exeinto /usr/libexec/flannel
-	doexe dist/mk-docker-opts.sh
-	insinto /etc/systemd/system/docker.service.d
-	newins "${FILESDIR}/flannel-docker.conf" flannel.conf
-	newinitd "${FILESDIR}"/flanneld.initd flanneld
-	newconfd "${FILESDIR}"/flanneld.confd flanneld
-	keepdir /var/log/${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/flanneld.logrotated flanneld
-	newtmpfiles "${FILESDIR}/flannel.tmpfilesd" flannel.conf
-	systemd_dounit "${FILESDIR}/flanneld.service"
-	dodoc README.md
-}
-
-pkg_postinst() {
-	tmpfiles_process flannel.conf
-}
diff --git a/app-containers/flannel/flannel-0.16.3.ebuild b/app-containers/flannel/flannel-0.16.3.ebuild
deleted file mode 100644
index ad8fbf25ad4e..000000000000
--- a/app-containers/flannel/flannel-0.16.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd tmpfiles
-
-KEYWORDS="~amd64 ~arm64"
-DESCRIPTION="An etcd backed network fabric for containers"
-HOMEPAGE="https://github.com/coreos/flannel"
-SRC_URI="https://github.com/coreos/flannel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD ISC LGPL-3 MIT"
-SLOT="0"
-IUSE="hardened"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	default
-	sed -e "s:^var Version =.*:var Version = \"${PV}\":" \
-		-i "${S}/version/version.go" || die
-}
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"\
-	go build -o dist/flanneld -ldflags "
-		-X github.com/flannel-io/flannel/version.Version=v${PV}
-		-extldflags \"-static\"" . || die
-}
-
-src_test() {
-	GOPATH="${WORKDIR}/${P}" \
-		go test -v -work -x "${EGO_PN}" || die
-}
-
-src_install() {
-	dobin dist/${PN}d
-	exeinto /usr/libexec/flannel
-	doexe dist/mk-docker-opts.sh
-	insinto /etc/systemd/system/docker.service.d
-	newins "${FILESDIR}/flannel-docker.conf" flannel.conf
-	newinitd "${FILESDIR}"/flanneld.initd flanneld
-	newconfd "${FILESDIR}"/flanneld.confd flanneld
-	keepdir /var/log/${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/flanneld.logrotated flanneld
-	newtmpfiles "${FILESDIR}/flannel.tmpfilesd" flannel.conf
-	systemd_dounit "${FILESDIR}/flanneld.service"
-	dodoc README.md
-}
-
-pkg_postinst() {
-	tmpfiles_process flannel.conf
-}
diff --git a/app-containers/flannel/flannel-0.16.1.ebuild b/app-containers/flannel/flannel-0.20.0.ebuild
index ad8fbf25ad4e..18d922d3f1d3 100644
--- a/app-containers/flannel/flannel-0.16.1.ebuild
+++ b/app-containers/flannel/flannel-0.20.0.ebuild
@@ -6,8 +6,8 @@ inherit go-module systemd tmpfiles
 
 KEYWORDS="~amd64 ~arm64"
 DESCRIPTION="An etcd backed network fabric for containers"
-HOMEPAGE="https://github.com/coreos/flannel"
-SRC_URI="https://github.com/coreos/flannel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/flannel-io/flannel"
+SRC_URI="https://github.com/flannel-io/flannel/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD ISC LGPL-3 MIT"
 SLOT="0"
diff --git a/app-containers/snapd/Manifest b/app-containers/snapd/Manifest
index 7d3e85418f29..be021527eb1f 100644
--- a/app-containers/snapd/Manifest
+++ b/app-containers/snapd/Manifest
@@ -1,4 +1,6 @@
 AUX README.gentoo 1941 BLAKE2B dd25269f2aaaea693701d74511d632bc45f2c99954ae683cb81d4df41c4c1f8007bb6c337234e46bfc5973aa7e8356cd12ac510e9109eca09890cbc42bd184bb SHA512 5b522e6c29bdad84a71245fa1f0289e9cfed0501d936b433829f66ef9d655f3cc13d6bca29beeae2c00e1b68f9fa30058608b9c4cde86ba66eab67bd011c9d00
 DIST snapd-2.57.2.tar.xz 6827264 BLAKE2B f9b1ae934a9c5b777d2e36854e259ddde301067a91b04ecef064accfccecc74693a2a58700e60867f46f028728a271b87cb3d4cdb316ae35df11363990959c3a SHA512 671e7598074894daf76646f7eea09c4163c57e68d0d46ebb77b20f71b898109fd73c78d363cb1253386ce058c1796eb25fab7f2f0345360426d3b9cc11d38804
+DIST snapd-2.57.4.tar.xz 6884432 BLAKE2B 47dcb8857070ab9f5cd02f6b64d6ef263ab1cf958c0eee6654064f7beec10c5b9995dcad9c66ba8237c6e4991e6c82b2fa758e204cdc3fb1134a5d8bb45e855b SHA512 00763d64a17c94ae7a8f4b09f61489f5dc32d923e2a22f223e0fa817693cf69e5d36cb7f9ea7b04d4ea325abdbaf3c1aeb87884318bf16de803bce1fef9666de
 EBUILD snapd-2.57.2-r1.ebuild 5169 BLAKE2B f96430c3131d507c6b7566f7b085851a6db569a93dae668d0a34d13319c06f563566858367bf028ed600f1d0ba8f29e5970c56ca72241b7b72eccf5318939633 SHA512 b7551510c5b5adf6f12c2df137ef54c8c62f96984141f49e2706a7c88c65490b03f43674b8314c82cb83bbad5de560285d1c10b1b11bf79359034cf758096caf
+EBUILD snapd-2.57.4.ebuild 5169 BLAKE2B f96430c3131d507c6b7566f7b085851a6db569a93dae668d0a34d13319c06f563566858367bf028ed600f1d0ba8f29e5970c56ca72241b7b72eccf5318939633 SHA512 b7551510c5b5adf6f12c2df137ef54c8c62f96984141f49e2706a7c88c65490b03f43674b8314c82cb83bbad5de560285d1c10b1b11bf79359034cf758096caf
 MISC metadata.xml 457 BLAKE2B 204b67bf36a85bd18f4111b4d8590195908bf15ae0bafedb76b6124b7d19c6570627925e5dfc46dd4dd47732c6d8f1066451831a0cc475518aab8a29403ececc SHA512 07671272b60f1a6793e3f36b096e99153263830314359eb86000aec65266c61ebe9c448af4ec166d6163e3ca2325f36cc74fe5aace95e7ffa7b0293516b18120
diff --git a/app-containers/snapd/snapd-2.57.4.ebuild b/app-containers/snapd/snapd-2.57.4.ebuild
new file mode 100644
index 000000000000..35255adff108
--- /dev/null
+++ b/app-containers/snapd/snapd-2.57.4.ebuild
@@ -0,0 +1,178 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 flag-o-matic go-module linux-info readme.gentoo-r1 systemd xdg-utils
+
+DESCRIPTION="Service and tools for management of snap packages"
+HOMEPAGE="http://snapcraft.io/"
+
+SRC_URI="https://github.com/snapcore/${PN}/releases/download/${PV}/${PN}_${PV}.vendor.tar.xz -> ${P}.tar.xz"
+MY_PV=${PV}
+KEYWORDS="~amd64"
+
+LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
+SLOT="0"
+IUSE="apparmor +forced-devmode gtk kde systemd"
+REQUIRED_USE="!forced-devmode? ( apparmor ) systemd"
+
+CONFIG_CHECK="~CGROUPS
+		~CGROUP_DEVICE
+		~CGROUP_FREEZER
+		~NAMESPACES
+		~SQUASHFS
+		~SQUASHFS_ZLIB
+		~SQUASHFS_LZO
+		~SQUASHFS_XZ
+		~BLK_DEV_LOOP
+		~SECCOMP
+		~SECCOMP_FILTER"
+
+RDEPEND="
+	sys-libs/libseccomp:=
+	apparmor? (
+		sec-policy/apparmor-profiles
+		sys-apps/apparmor:=
+	)
+	dev-libs/glib
+	virtual/libudev
+	systemd? ( sys-apps/systemd )
+	sys-libs/libcap:=
+	sys-fs/squashfs-tools[lzma]"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	>=dev-lang/go-1.9
+	dev-python/docutils
+	sys-devel/gettext
+	sys-fs/xfsprogs"
+
+PDEPEND="sys-auth/polkit[gtk?,kde?]"
+
+README_GENTOO_SUFFIX=""
+
+pkg_setup() {
+	if use apparmor; then
+		CONFIG_CHECK+=" ~SECURITY_APPARMOR"
+	fi
+	linux-info_pkg_setup
+
+	# Seems to have issues building with -O3, switch to -O2
+	replace-flags -O3 -O2
+}
+
+src_prepare() {
+	default
+	# Update apparmor profile to allow libtinfow.so*
+	sed -i 's/libtinfo/libtinfo{,w}/' \
+		"cmd/snap-confine/snap-confine.apparmor.in" || die
+
+	if ! use forced-devmode; then
+		sed -e 's#return !apparmorFull#if !apparmorFull {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
+			-i "sandbox/forcedevmode.go" || die
+		grep -q 'panic("USE=forced-devmode is disabled")' "sandbox/forcedevmode.go" || die "failed to disable forced-devmode"
+	fi
+
+	sed -i 's:command -v git >/dev/null:false:' -i "mkversion.sh" || die
+
+	./mkversion.sh "${PV}"
+	pushd "cmd" >/dev/null || die
+	eautoreconf
+}
+
+src_configure() {
+	SNAPD_MAKEARGS=(
+		"BINDIR=${EPREFIX}/usr/bin"
+		"DBUSSERVICESDIR=${EPREFIX}/usr/share/dbus-1/services"
+		"LIBEXECDIR=${EPREFIX}/usr/lib"
+		"SNAP_MOUNT_DIR=${EPREFIX}/var/lib/snapd/snap"
+		"SYSTEMDSYSTEMUNITDIR=$(systemd_get_systemunitdir)"
+	)
+	export CGO_ENABLED="1"
+	export CGO_CFLAGS="${CFLAGS}"
+	export CGO_CPPFLAGS="${CPPFLAGS}"
+	export CGO_CXXFLAGS="${CXXFLAGS}"
+
+	pushd "${S}/cmd" >/dev/null || die
+	econf --libdir="${EPREFIX}/usr/lib" \
+		--libexecdir="${EPREFIX}/usr/lib/snapd" \
+		$(use_enable apparmor) \
+		--enable-nvidia-biarch \
+		--with-snap-mount-dir="${EPREFIX}/var/lib/snapd/snap"
+}
+
+src_compile() {
+	export -n GOCACHE XDG_CACHE_HOME
+	export GOBIN="${S}/bin"
+
+	local file
+	for file in "${S}/po/"*.po; do
+		msgfmt "${file}" -o "${file%.po}.mo" || die
+	done
+
+	emake -C "${S}/data" "${SNAPD_MAKEARGS[@]}"
+
+	local -a flags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}'" -trimpath)
+	local -a staticflags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS} -static'" -trimpath)
+
+	local cmd
+	for cmd in snap snapd snapd-apparmor snap-bootstrap snap-failure snap-preseed snap-recovery-chooser snap-repair snap-seccomp; do
+		go build ${GOFLAGS} -mod=vendor -o "${GOBIN}/${cmd}" "${flags[@]}" \
+		    -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
+		[[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
+	done
+	for cmd in snapctl snap-exec snap-update-ns; do
+		go build ${GOFLAGS} -mod=vendor -o "${GOBIN}/${cmd}" "${staticflags[@]}" \
+		    -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
+		[[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
+	done
+}
+
+src_install() {
+	emake -C "${S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
+	emake -C "${S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
+
+	if use apparmor; then
+		mv "${ED}/etc/apparmor.d/usr.lib.snapd.snap-confine"{,.real} || die
+		keepdir /var/lib/snapd/apparmor/profiles
+	fi
+	keepdir /var/lib/snapd/{apparmor/snap-confine,cache,cookie,snap,void}
+	fperms 700 /var/lib/snapd/{cache,cookie}
+
+	dobin "${GOBIN}/"{snap,snapctl}
+	ln "${ED}/usr/bin/snapctl" "${ED}/usr/lib/snapd/snapctl" || die
+
+	exeinto /usr/lib/snapd
+	doexe "${GOBIN}/"{snapd,snapd-apparmor,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns} \
+		"${S}/"{cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt} \
+		"${S}/data/completion/bash/"{complete.sh,etelpmoc.sh,}
+
+	dobashcomp "${S}/data/completion/bash/snap"
+
+	insinto /usr/share/zsh/site-functions
+	doins "${S}/data/completion/zsh/_snap"
+
+	insinto "/usr/share/polkit-1/actions"
+	doins "${S}/data/polkit/io.snapcraft.snapd.policy"
+
+	dodoc "${S}/packaging/ubuntu-16.04/changelog"
+	domo "${S}/po/"*.mo
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	xdg_desktop_database_update
+
+	if use apparmor && [[ -z ${ROOT} && -e /sys/kernel/security/apparmor/profiles &&
+		$(wc -l < /sys/kernel/security/apparmor/profiles) -gt 0 ]]; then
+		apparmor_parser -r "${EPREFIX}/etc/apparmor.d/usr.lib.snapd.snap-confine.real"
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}