Merge updates from master

9 files changed, 79 insertions, 71 deletions

diff --git a/app-accessibility/accerciser/Manifest b/app-accessibility/accerciser/Manifest
index 53f17c429cf0..9388c6185a69 100644
--- a/app-accessibility/accerciser/Manifest
+++ b/app-accessibility/accerciser/Manifest
@@ -1,2 +1 @@
-DIST accerciser-3.22.0.tar.xz 3060756 BLAKE2B a648c764c5f101f323458c692cb4171704b7b710558f4103b57d87ca58c2d0d9c03cad72de1d3be9483d317ad94c95e43bb2437515093d6ffd93089a58e5fab1 SHA512 980db5dcd0bdc78314ab87cce95cfcfa018bf302acc66ea2dd1bddfb61de5bfe2e64344cff63740c38be33124ff49c75699aa6867d5e85b25d422b5af1b025c1
 DIST accerciser-3.36.2.tar.xz 1995756 BLAKE2B 14d569f159cda685bb5217cb650d64c473c296e6c0e74bf2d6290908ea4aef06fd736aa8bdb7782a7bbd5231895a53e85fa362382fd15cf0554721fe46c8cbe9 SHA512 fb2ecb35826f1a868a8badcefcb4941258273bfc639996b8d4cecbd5d9700cb48e102891105842fcf3b0cb5f7a53df28de3283a80130d83695528db06ff0f268
diff --git a/app-accessibility/accerciser/accerciser-3.22.0.ebuild b/app-accessibility/accerciser/accerciser-3.22.0.ebuild
deleted file mode 100644
index 9acb9c3494a6..000000000000
--- a/app-accessibility/accerciser/accerciser-3.22.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="xml"
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Interactive Python accessibility explorer"
-HOMEPAGE="https://wiki.gnome.org/Apps/Accerciser"
-
-LICENSE="BSD CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.5.2:2
-	>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
-	>=x11-libs/gtk+-3.1.13:3[introspection]
-
-	dev-libs/atk[introspection]
-	>=dev-libs/glib-2.28:2
-	dev-libs/gobject-introspection:=
-	>=dev-python/ipython-0.11[${PYTHON_USEDEP}]
-	>=dev-python/pyatspi-2.1.5[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	x11-libs/gdk-pixbuf[introspection]
-	x11-libs/libwnck:3[introspection]
-	x11-libs/pango[introspection]
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Leave shebang alone
-	sed 's:@PYTHON@:/usr/bin/python:' -i src/accerciser.in || die
-
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir gnome2_src_configure
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_install() {
-	installing() {
-		gnome2_src_install
-		python_doscript src/accerciser
-	}
-	python_foreach_impl run_in_build_dir installing
-}
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index 3336c487865d..9dbe02e8aba3 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -2,3 +2,5 @@ DIST vault-1.4.2-webui.tar.xz 1208924 BLAKE2B 5177afc91e7bc774b7d78e5e344d7c8310
 DIST vault-1.4.2.tar.gz 33158384 BLAKE2B 263f20419c210b83448907b1e95464fb139f52f4f7347eb01803b5aa487797c191f1e61a9fb77321f776ea70feb83a741f10c79400fdd471b790fe37a6404a9c SHA512 d4f2a426a4c0531cca0d3812c2e29ebc5ebbd6da2897d3ee57fe57d4dfde0395f30713cfe21600b4dd51fdc90bf2a10527957b04c8215bd185bd502267f93503
 DIST vault-1.4.3-webui.tar.xz 1212168 BLAKE2B d068d3218462b2e2eda9eec623a0438a3c7f6a894713ccfa3260a4b1ed53bf0791760f2ad9ac6071ae5227e7c44e5c9b675d7a1cc8ecb7052b322d8415f79955 SHA512 5542a170d853a52bbe05b4bfab7014305c6fa68e7fc2ea24df5f508905c7db8cf8a0f65b8f91c209563779a22044959d615f05d26a12df2b8ef1f749b8af450e
 DIST vault-1.4.3.tar.gz 33169383 BLAKE2B 78adde5dfe68fbb51b43abc7f12fe96df7df6b7f5a7fc0af35439184a3f1ce03a71e445fe735e692953a68e039093f9eb65265ee9aae786e4ef9b8f0ca81c030 SHA512 638bdeaaee122263d8f8c44b6db48b0f10869dd6f2cd6d35bcefb96e8b25dde4596a4a41f287d065f0cece01c5e75f9a4ae220864dddc381365fe57faeb2efe2
+DIST vault-1.5.0-webui.tar.xz 1237556 BLAKE2B 2647d9733a6a20b61f5884b15dd46d048705c3fe5dcfb9f4c8c2fa71303d17c9b69d2f08a42ec171e863affd45632c0407d4db4cb6bb229ba780860dfbf05449 SHA512 b5164f7525c94752f3f6a17ba6c738eb42e05f33682b790b49c322882964dfdb68abf28d0f30836759383ff6777cc5d5061699fc2a5d2a7a3706b5423ccca378
+DIST vault-1.5.0.tar.gz 34940170 BLAKE2B cbc4b25bbb6881415c63be41970429e4413e3f70fc9aa3dfb3c54136719c7166896475d77a11d33d3e388344d863a19d63836f2ed3e20cc42db98ee2b57ba9a4 SHA512 245d5ea837f561d6c3832a0cb28d851dabe908fac2be7e53d3fd466689778d67b2cd5d9ea8c297f8daceb003c571a9768254a7e27d1fbeb1a376ac75e3c6edfb
diff --git a/app-admin/vault/vault-1.5.0.ebuild b/app-admin/vault/vault-1.5.0.ebuild
new file mode 100644
index 000000000000..d7f0e36a12fb
--- /dev/null
+++ b/app-admin/vault/vault-1.5.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps go-module systemd
+
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/"
+VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
+SRC_URI="https://github.com/hashicorp/vault/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	webui? (
+		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
+	)"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+webui"
+
+BDEPEND="dev-go/gox"
+COMMON_DEPEND="acct-group/vault
+	acct-user/vault"
+	DEPEND="${COMMON_DEPEND}"
+	RDEPEND="${COMMON_DEPEND}"
+
+FILECAPS=(
+	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
+)
+
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	# Avoid the need to have a git checkout
+	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
+		-e 's:^\(GIT_DIRTY=\).*:\1:' \
+		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
+		-i scripts/build.sh || die
+	sed -e "/hooks/d" \
+		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
+		-i Makefile || die
+	if [[ -f "${WORKDIR}/http/bindata_assetfs.go" ]]; then
+		mv "${WORKDIR}/http/bindata_assetfs.go" "${S}/http" ||
+			die "mv failed"
+	fi
+}
+
+src_compile() {
+	mkdir "${T}"/bin || die
+	BUILD_TAGS="$(usex webui ui '')" \
+	GOFLAGS="-mod=vendor" \
+	GOPATH="${T}" \
+	XC_ARCH=$(go env GOARCH) \
+	XC_OS=$(go env GOOS) \
+	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
+	emake
+}
+
+src_install() {
+	dobin bin/${PN}
+	dodoc CHANGELOG.md CONTRIBUTING.md README.md
+	insinto /etc/${PN}.d
+	doins "${FILESDIR}/"*.json.example
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+	go-module_pkg_postinst
+}
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.22.3-r2.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.22.3-r3.ebuild
index 1eca4cc57b54..212c93bb5080 100644
--- a/mate-base/mate-session-manager/mate-session-manager-1.22.3-r2.ebuild
+++ b/mate-base/mate-session-manager/mate-session-manager-1.22.3-r3.ebuild
@@ -41,7 +41,6 @@ COMMON_DEPEND="
 	systemd? ( sys-apps/systemd )
 	!systemd? (
 		elogind? ( sys-auth/elogind )
-		!elogind? ( >=sys-auth/consolekit-0.9.2 )
 	)
 	xtrans? ( x11-libs/xtrans )"
 
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.24.0-r2.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.24.0-r3.ebuild
index a244689335a6..426846b20ada 100644
--- a/mate-base/mate-session-manager/mate-session-manager-1.24.0-r2.ebuild
+++ b/mate-base/mate-session-manager/mate-session-manager-1.24.0-r3.ebuild
@@ -40,7 +40,6 @@ COMMON_DEPEND="
 	systemd? ( sys-apps/systemd )
 	!systemd? (
 		elogind? ( sys-auth/elogind )
-		!elogind? ( >=sys-auth/consolekit-0.9.2 )
 	)
 	xtrans? ( x11-libs/xtrans )"
 
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.22.2.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.22.1-r1.ebuild
index f37314be82dd..628d7105fa80 100644
--- a/mate-extra/mate-power-manager/mate-power-manager-1.22.2.ebuild
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.22.1-r1.ebuild
@@ -43,7 +43,6 @@ RDEPEND="${COMMON_DEPEND}
 	systemd? ( sys-apps/systemd )
 	!systemd? (
 		elogind? ( sys-auth/elogind )
-		!elogind? ( >=sys-auth/consolekit-0.9.2 )
 	)"
 
 DEPEND="${COMMON_DEPEND}
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.22.1.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.22.2-r1.ebuild
index f37314be82dd..628d7105fa80 100644
--- a/mate-extra/mate-power-manager/mate-power-manager-1.22.1.ebuild
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.22.2-r1.ebuild
@@ -43,7 +43,6 @@ RDEPEND="${COMMON_DEPEND}
 	systemd? ( sys-apps/systemd )
 	!systemd? (
 		elogind? ( sys-auth/elogind )
-		!elogind? ( >=sys-auth/consolekit-0.9.2 )
 	)"
 
 DEPEND="${COMMON_DEPEND}
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.24.1.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.24.1-r1.ebuild
index b188be8b1a4d..6db2b2e078c0 100644
--- a/mate-extra/mate-power-manager/mate-power-manager-1.24.1.ebuild
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.24.1-r1.ebuild
@@ -44,7 +44,6 @@ RDEPEND="${COMMON_DEPEND}
 	systemd? ( sys-apps/systemd )
 	!systemd? (
 		elogind? ( sys-auth/elogind )
-		!elogind? ( >=sys-auth/consolekit-0.9.2 )
 	)"
 
 DEPEND="${COMMON_DEPEND}