gentoo resync : 04.05.2021

62 files changed, 1256 insertions, 931 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 4f87b552132a..a9053abfa9f6 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/abrt/Manifest b/app-admin/abrt/Manifest
index 68357ed72493..05db82fbd9c6 100644
--- a/app-admin/abrt/Manifest
+++ b/app-admin/abrt/Manifest
@@ -1,5 +1,7 @@
 AUX abrt-2.0.12-r1-conf 687 BLAKE2B 771c5370e3f7f181c22f8a56d8a13a02759aed2fdd5f7182d4bf9e7bebf1f80f6178acbce4ffddff7ab292c773685148621d53528b96c3099d96dcd0f26b1280 SHA512 8dc19a07ca57a7a95184366e747f20e36b97eea6423aafb88390f9754f90bfa76b6d0c33806c714fcadfebeebda05e989b282bf07cd0ce50cf01efa8721357f2
 AUX abrt-2.0.12-r1-init 1921 BLAKE2B dc8bbe3d4902ac65165f1e71eb6400810980f6b90014619aa87614f0a8e1c6e9bb79afa964e5c0324ca090fefa9b90f2705c7388b488709f31619d824850e3e8 SHA512 a6f7c4029f974af083f33020756bc0eaa877c23f658d6b92388627e3a923aae499dd44e1b0e22af792a6c431a683ebe4604d6dec62bf09f70a2a5209cd45be81
 DIST abrt-2.14.2.tar.gz 6113632 BLAKE2B 904ec2ca4c3aa70b62573ca2730742689f4446c1e5f04bfb6dc4267a4a9a6d44ef8c2b6e82c1e0aba04876b400c3a965a879da65bbff7ec729846f1b5c28cdf9 SHA512 82ba10cb151b4585024e3dfc626f46a7d967797e0375158cd76355c4f6a66c59578cc7b41bc5d5aaa3e694b3653b8658650df458676225660cfe95ec318c6886
+DIST abrt-2.14.5.tar.gz 6056105 BLAKE2B 22e797a431237bd3d4ef6f2467842c5f08e2ef3ca51e7857e3c55e45ed93a9499843fe40b081c70affb5def8f2cfe78d61e865c51c969fb2c9936225bdfe4996 SHA512 a8672735c6d3263ddff006e6e186d9b71e6d9375a8c909c2a85bbbf736a6687b6fe4aa74640a07664f14fd886895a86babf41218a8c2365d6fccd347630ccc9e
 EBUILD abrt-2.14.2.ebuild 3153 BLAKE2B 90814321779be2e6e624d3eaac8e0a910e11e8379c04c0d408a70b5561c4f2ce560b126887e24d72884eb9553f0c8ba00c860b775286ae5279853770cf9e6d53 SHA512 0fe5f288ebc6a9937f9cbc9634801b4c92d0e84fb3bd4b679974f8f0759d2d2bb9710bdc70462dbaf73904d9f57c332746fe93fb7dfba5ed3a9863ecbd9e8d32
+EBUILD abrt-2.14.5.ebuild 3153 BLAKE2B 90814321779be2e6e624d3eaac8e0a910e11e8379c04c0d408a70b5561c4f2ce560b126887e24d72884eb9553f0c8ba00c860b775286ae5279853770cf9e6d53 SHA512 0fe5f288ebc6a9937f9cbc9634801b4c92d0e84fb3bd4b679974f8f0759d2d2bb9710bdc70462dbaf73904d9f57c332746fe93fb7dfba5ed3a9863ecbd9e8d32
 MISC metadata.xml 327 BLAKE2B 856e3ab03170c985b08a7c11282af63794b0447b04d221803badcb19a9145adaa91d7637a6fe864618c469d2dfa7796bb39a3ef5ab2116eb7861f2793961dd0b SHA512 4ab7758c443c8c34f579d9b89e9b2c8aeeaf2b83f8bef397d1d56e24779708e761324eea26c0ef69283c9a018b7e7f82492a534683509040facefa382d9a3acb
diff --git a/app-admin/abrt/abrt-2.14.5.ebuild b/app-admin/abrt/abrt-2.14.5.ebuild
new file mode 100644
index 000000000000..16a5250da01e
--- /dev/null
+++ b/app-admin/abrt/abrt-2.14.5.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit autotools python-single-r1 xdg-utils
+
+DESCRIPTION="Automatic bug detection and reporting tool"
+HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="selinux test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/libreport-2.13.0[gtk,python]
+	dev-libs/libxml2:2
+	>=gnome-base/gsettings-desktop-schemas-3.15.1
+	net-libs/libsoup:2.4
+	sys-apps/dbus
+	sys-apps/systemd:0=
+	sys-auth/polkit
+	sys-libs/libcap
+	sys-fs/inotify-tools
+	x11-libs/gtk+:3
+"
+RDEPEND="${DEPEND}
+	acct-user/abrt
+	acct-group/abrt
+	app-arch/cpio
+	app-arch/rpm[python,${PYTHON_SINGLE_USEDEP}]
+	dev-libs/elfutils
+	dev-libs/json-c:0=
+	sys-apps/util-linux
+	>=sys-devel/gdb-7
+	$(python_gen_cond_dep '
+			dev-libs/satyr[${PYTHON_MULTI_USEDEP}]
+			dev-python/argcomplete[${PYTHON_MULTI_USEDEP}]
+			dev-python/argh[${PYTHON_MULTI_USEDEP}]
+			dev-python/humanize[${PYTHON_MULTI_USEDEP}]
+	')
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_MULTI_USEDEP}]')
+	)
+	app-text/asciidoc
+	app-text/xmlto
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	python_fix_shebang .
+	default
+
+	# Install under proper directory
+	sed -i -e 's:dbusabrtdocdir = ${datadir}/doc/abrt-dbus-${VERSION}/html:dbusabrtdocdir = ${datadir}/doc/${PF}/html:' doc/problems-service/Makefile.am || die
+
+	# Ensure this works for systems with and without /usr merge
+	sed -i -e "s:/usr/bin/bash:$(which bash):" init-scripts/abrtd.service || die
+
+	# Fix hardcoded "pytest-3"
+	sed -i -e "s:pytest-3:pytest:" \
+		configure.ac src/python-problem/tests/Makefile.am src/cli/test || die
+
+	# pyhook test is sensitive to the format of python's error messages, and
+	# fails with certain python versions
+	sed -e '/pyhook.at/ d' \
+		-i tests/Makefile.* tests/testsuite.at || die "sed remove pyhook tests failed"
+	./gen-version || die # Needed to be run before autoreconf
+	eautoreconf
+}
+
+src_configure() {
+	myeconfargs=(
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-bodhi
+		# package breaks due to not finding libreport-web with bodhi plugin enabled
+		--without-rpm
+		$(usex selinux "" "--without-selinux")
+		--with-python3
+		--without-pythondoc
+		# package breaks due to no sphinx-build-3
+		$(use_with test pythontests)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+
+	keepdir /var/run/abrt
+	# /var/spool/abrt is created by dev-libs/libreport
+
+	diropts -m 700 -o abrt -g abrt
+	keepdir /var/spool/abrt-upload
+
+	diropts -m 775 -o abrt -g abrt
+	keepdir /var/cache/abrt-di
+
+	find "${D}" -name '*.la' -delete || die
+
+	newinitd "${FILESDIR}/${PN}-2.0.12-r1-init" abrt
+	newconfd "${FILESDIR}/${PN}-2.0.12-r1-conf" abrt
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 266a9ab6d877..7165fca6d557 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1,8 +1,6 @@
 AUX apache-tools-2.4.7-Makefile.patch 1695 BLAKE2B 8fac145613ac9f587e49bc6932c5712b7d7cad0d91422e11701edd24152e1d33907cbf31e3bef709555253759cea72199d4537df5d20d3ce9ca5dc898ba26779 SHA512 f597ce5503e590ed5b2621c04dcf0a571a73b70f144df7fe4e5fb7329a4f1558a5eb16913fe3d7c58ac1030f46cd2b1882e08d0f62106fbf8d40a8677c6b9448
-DIST httpd-2.4.41.tar.bz2 7072373 BLAKE2B 88a2390736209d5ef04bffcb867bc8d6019302885e6f3cc63d18123336d4d0657252105a3bfebf4e91b8daa02119d4a61f4c0a9702244858a3193ec6cf681c0f SHA512 350cc7dcd2c439e0590338fa6da3f44df44f9bb885c381e91f91b14c2f48597f6f0bbac0ea118a8a67eaa70ae7edbb769beace368643ed73f6daee44c307b335
-DIST httpd-2.4.43.tar.bz2 7155865 BLAKE2B cd85c7e25500f8f1b4bd6ac5f715718a61bf548dfaf36408a970d27bacbfce256e4dda255ba5b62f89e117c335d0568d6207c93e5fb0d2b1ee84dba4ce0d4bd7 SHA512 16cfeecc8f6fab6eca478065a384bdf1872f7ac42206b0bc2bcac6c0d9c576f392c07107201f39e0601dec1bbafcb33d66153544de4d87d79b9a52094d334b64
 DIST httpd-2.4.46.tar.bz2 7187805 BLAKE2B 2cd8a40be0b7b60ae5b06a286aa6dd801b8615fd0483a4653ceea6f9832c9ebb111f67ba4f69827b01acd1e5552e70ac0441df49573c9da0ca26d4c2f589f0bc SHA512 5936784bb662e9d8a4f7fe38b70c043b468114d931cd10ea831bfe74461ea5856b64f88f42c567ab791fc8907640a99884ba4b6a600f86d661781812735b6f13
-EBUILD apache-tools-2.4.41.ebuild 2524 BLAKE2B 3b2d9368d0cb3088062990484ee7867c6ff3eb2fe82d05b61d34135d8e0b1d1582b8d145e676735f8946539c77158a4d9b6a490d4218e5a751f07fdc05374185 SHA512 2fd21ee79b0822f4ab410e571b27a0ee4b42f66929958cbeeffd10865917592682d9cf1b6b32600a870275b96b4b733a208cfd5a8e8f64980799c53bc0b5d0c9
-EBUILD apache-tools-2.4.43.ebuild 2524 BLAKE2B 3b2d9368d0cb3088062990484ee7867c6ff3eb2fe82d05b61d34135d8e0b1d1582b8d145e676735f8946539c77158a4d9b6a490d4218e5a751f07fdc05374185 SHA512 2fd21ee79b0822f4ab410e571b27a0ee4b42f66929958cbeeffd10865917592682d9cf1b6b32600a870275b96b4b733a208cfd5a8e8f64980799c53bc0b5d0c9
-EBUILD apache-tools-2.4.46.ebuild 2524 BLAKE2B 3b2d9368d0cb3088062990484ee7867c6ff3eb2fe82d05b61d34135d8e0b1d1582b8d145e676735f8946539c77158a4d9b6a490d4218e5a751f07fdc05374185 SHA512 2fd21ee79b0822f4ab410e571b27a0ee4b42f66929958cbeeffd10865917592682d9cf1b6b32600a870275b96b4b733a208cfd5a8e8f64980799c53bc0b5d0c9
+DIST httpd-2.4.47.tar.bz2 7187445 BLAKE2B ba5b6ebac73aaa6f2f0d7a34d5bf9d13bd4ac862ee9d04b105c315c3aad16401b842b6901424dba6a44a0b5d255c0356e0bf72b5d1898b4b091b12192c204c96 SHA512 ac05e878604037572b484c32c767e022bf027e5efa2a2ed28472939d9f536448f1536ede4d809f1e913a29a0247bdd27981bd00d3d8614f978573c14bce7c7af
+EBUILD apache-tools-2.4.46.ebuild 2460 BLAKE2B b472d42e496a6af6baca2790f6b1ed330353d169f721f41af04a27f9660f6d9f5fcff220cf63f8369675f202a29d7509c1872a0a9a340ce10a338a67769a46dc SHA512 667f5a2b8d53f03587b982275cc4b0e8ed8c5d814fb93fae6f589b2438a7bce7895259f54f70a89a9a7b7b3af3846c2c51292c5c4af3a7e53feb6457a5743b1f
+EBUILD apache-tools-2.4.47.ebuild 2469 BLAKE2B 7c4e2b191bfa166d7c89eec4febf97619b7f6cdc49c429d701c9b5401fea022a792a60ba77b27d959dbd5e3ef53d2e754eed0f10d067915b59b349a8b3736edf SHA512 ca8a17e6cfa9a420d79d967a172bc8f520aceee1f95c98bec69e4bc402df4c1c1a97f4187d09fda71b74043b5fe6e3408e1e25245a98ff92948963a0ba088a92
 MISC metadata.xml 468 BLAKE2B 850e5a23a188280992a745276f7466b0287d4e1ca9dee8c61046612273bf7484c24e60d95ccc6637c65c88d851719bed812e2c1f3e951fdca1c7058c68aaa0db SHA512 d9b6eabeaba642f760ceca4b4b39b5db7bae5369c6766ce230c5cf0949e3152affa6ec5116ffa4ead983d987387c767600b8f36ebe1b8cf1323ed5c2cb14fab2
diff --git a/app-admin/apache-tools/apache-tools-2.4.43.ebuild b/app-admin/apache-tools/apache-tools-2.4.43.ebuild
deleted file mode 100644
index 42dcd53ef1e3..000000000000
--- a/app-admin/apache-tools/apache-tools-2.4.43.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
-HOMEPAGE="https://httpd.apache.org/"
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
-IUSE="libressl ssl"
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/apr-1.5.0:1=
-	dev-libs/apr-util:1=
-	dev-libs/expat
-	dev-libs/libpcre
-	kernel_linux? ( sys-apps/util-linux )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-
-S="${WORKDIR}/httpd-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
-)
-
-src_prepare() {
-	default
-
-	# This package really should upgrade to using pcre's .pc file.
-	cat <<-\EOF >"${T}"/pcre-config
-	#!/bin/bash
-	flags=()
-	for flag; do
-		if [[ ${flag} == "--version" ]]; then
-			flags+=( --modversion )
-		else
-			flags+=( "${flag}" )
-		fi
-	done
-	exec ${PKG_CONFIG} libpcre "${flags[@]}"
-	EOF
-	chmod a+x "${T}"/pcre-config || die
-}
-
-src_configure() {
-	# Brain dead check.
-	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-	tc-export PKG_CONFIG
-
-	local myeconfargs=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
-		--sbindir="${EPREFIX}"/usr/sbin
-		--with-perl="${EPREFIX}"/usr/bin/perl
-		--with-expat="${EPREFIX}"/usr
-		--with-z="${EPREFIX}"/usr
-		--with-apr="${SYSROOT}${EPREFIX}"/usr
-		--with-apr-util="${SYSROOT}${EPREFIX}"/usr
-		--with-pcre="${T}"/pcre-config
-		$(use_enable ssl)
-		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
-	)
-	# econf overwrites the stuff from config.layout.
-	ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
-	econf "${myeconfargs[@]}"
-	sed -i \
-		-e '/^LTFLAGS/s:--silent::' \
-		build/rules.mk build/config_vars.mk || die
-}
-
-src_compile() {
-	emake -C support
-}
-
-src_install() {
-	emake -C support DESTDIR="${D}" install
-	dodoc CHANGES
-	doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
-		docs/man/{htcacheclean,rotatelogs}.8
-
-	# Providing compatiblity symlinks for #177697 (which we'll stop to install
-	# at some point).
-	pushd "${ED}"/usr/sbin >/dev/null || die
-	local i
-	for i in *; do
-		dosym ${i} /usr/sbin/${i}2
-	done
-	popd >/dev/null || die
-
-	# Provide a symlink for ab-ssl
-	if use ssl ; then
-		dosym ab /usr/bin/ab-ssl
-		dosym ab /usr/bin/ab2-ssl
-	fi
-}
diff --git a/app-admin/apache-tools/apache-tools-2.4.46.ebuild b/app-admin/apache-tools/apache-tools-2.4.46.ebuild
index 42dcd53ef1e3..6e6a05fad334 100644
--- a/app-admin/apache-tools/apache-tools-2.4.46.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.46.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
-IUSE="libressl ssl"
+IUSE="ssl"
 RESTRICT="test"
 
 RDEPEND=">=dev-libs/apr-1.5.0:1=
@@ -19,10 +19,7 @@ RDEPEND=">=dev-libs/apr-1.5.0:1=
 	dev-libs/expat
 	dev-libs/libpcre
 	kernel_linux? ( sys-apps/util-linux )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
+	ssl? ( dev-libs/openssl:0= )"
 
 DEPEND="${RDEPEND}
 	sys-devel/libtool"
diff --git a/app-admin/apache-tools/apache-tools-2.4.41.ebuild b/app-admin/apache-tools/apache-tools-2.4.47.ebuild
index 42dcd53ef1e3..7383d8780bb2 100644
--- a/app-admin/apache-tools/apache-tools-2.4.41.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.47.ebuild
@@ -10,8 +10,8 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
-IUSE="libressl ssl"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
+IUSE="ssl"
 RESTRICT="test"
 
 RDEPEND=">=dev-libs/apr-1.5.0:1=
@@ -19,10 +19,7 @@ RDEPEND=">=dev-libs/apr-1.5.0:1=
 	dev-libs/expat
 	dev-libs/libpcre
 	kernel_linux? ( sys-apps/util-linux )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
+	ssl? ( dev-libs/openssl:0= )"
 
 DEPEND="${RDEPEND}
 	sys-devel/libtool"
@@ -71,7 +68,7 @@ src_configure() {
 		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
 	)
 	# econf overwrites the stuff from config.layout.
-	ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
+	ac_cv_path_PKGCONFIG="${PKG_CONFIG}" \
 	econf "${myeconfargs[@]}"
 	sed -i \
 		-e '/^LTFLAGS/s:--silent::' \
diff --git a/app-admin/augeas/Manifest b/app-admin/augeas/Manifest
index 03e07a650b18..6ae137a256e7 100644
--- a/app-admin/augeas/Manifest
+++ b/app-admin/augeas/Manifest
@@ -2,5 +2,5 @@ DIST augeas-1.11.0.tar.gz 2393675 BLAKE2B e7c50715fee892b47843f9be4ec9e88937c0ce
 DIST augeas-1.12.0.tar.gz 2429279 BLAKE2B cd90203fec1a81b114d95bb50e168b852923136f34c83974d3427cbedd4eb0d335d3952057507b38ded5c7011be2b56725565ea106cb32a0ca43b7c81250b29e SHA512 4f61d4abbf338e915dfae212560d39792674bc757f05f500afa80c6170abc214ffb99cab2cf5bbd1c2338d11a6909e5fc3ff7112a2246fca69f7b39ac283da40
 EBUILD augeas-1.11.0-r1.ebuild 958 BLAKE2B c3c1dcbaaa4fca227a3fe55802a6fe659d95ffbee471ec8cd1228adeb48b9238b34bb07bcafc8fa63e7a1f68cdb2d93779ef6d2fe0dee2483e7df913734997e1 SHA512 af5097d238d027caaea968a3bf51cabbf7ac43e5b0006c539ca19175da272d65442fe53167746d1922162a9030a5b2267fa202bedeab61168dd2d364afb20823
 EBUILD augeas-1.11.0.ebuild 1027 BLAKE2B f3f6126b6f408a3f3bc6a62e7e5f079196163a76e4992bd2e8962db5bc50012f5b6a2450e5e58c73f277f0331d164f6f783fb5fcf04c489fb196af61929b35ff SHA512 a13755d1e2539152a14a581b4ad466c77e12f039ddae67f698ddfa0a946a02a8b69206ff99c34bb8fd095046afbc309dda0719fa27878abde2447f82a0e3fad6
-EBUILD augeas-1.12.0.ebuild 958 BLAKE2B 557b719ad87580fbb38dcd6e240525a888d708795d766820f11142258cb2a509f78f9a733119c840ac6305af02f42e5fcadeb9fed3433000c5dc759689d1aa20 SHA512 5c8abcc5fa54022f338386610499c441370f162b487093afc119dc86000268bf796b8e840284f7bdb8d84f77f5d5c361190dc402d0f30c2c4fa7d357b2b9ced6
+EBUILD augeas-1.12.0.ebuild 957 BLAKE2B 8997535b7b70e25300dc2bb017be15fd724e6731590151ac9617bb7ec8e03901b3dedaa07dc5b54c3475a5fd86646bd38bfd2ca7a6d07dbc5b66aae8cfe7fd8e SHA512 f6402c7b79ff126af421b82598817edf2894542ac73b3ab32601a4d8e18c8e3b7f273cb55be83470123a7ebbea14a53cba93a3d6652075c22740791ab6ed23c4
 MISC metadata.xml 693 BLAKE2B c47bd36818c81a0fcb3d8f2e18e7a48797038c8a4a93302d592140faaed41d093523b6ad407b58dc7ae8c5f81c999c04e8514511b685e2a9b7d556dea177bde8 SHA512 1fcdcea259ed6cb652d08e763ccc67bee7bd5da9a7d3600dd492beaec7300868a47a7afdd71950ca8631886042428fce36cc17602a0776a9fa489f0fa2d27436
diff --git a/app-admin/augeas/augeas-1.12.0.ebuild b/app-admin/augeas/augeas-1.12.0.ebuild
index 0c09cb0cd6a0..a0ec45a79367 100644
--- a/app-admin/augeas/augeas-1.12.0.ebuild
+++ b/app-admin/augeas/augeas-1.12.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.augeas.net/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-admin/clustershell/Manifest b/app-admin/clustershell/Manifest
index 28bfb77e9ff9..2d0cde27bedb 100644
--- a/app-admin/clustershell/Manifest
+++ b/app-admin/clustershell/Manifest
@@ -1,3 +1,3 @@
 DIST clustershell-1.8.3.tar.gz 363975 BLAKE2B 3a7bb9103398e96f57f53d0d5d5edc6895ce02b6983e8fed34d65cad83a6d4e86f40b9576f41631e499a99adc8be5f4f422005b8ddc7ac8325fe11abd2c99477 SHA512 5108773e2958d1dae0aa6966d764e9af9d41024f65271005b202468f2bd1a3b63acc977729324fe1305d400dc8b06b0c4672e8d8ded207fa77cef69fb0005108
-EBUILD clustershell-1.8.3.ebuild 1047 BLAKE2B 130379ca1f38ec400ef160fd0ee32aad0b2417815edac16ebb74bac4470b0d440a41ee98af7cc06a81f9d693ae6eae0650c9e7e978ce5c660f5c2b5a3e0c0d62 SHA512 7cd420fbf3791649926fe019c40bcf5544bc393839465bc145ddef1a74cabb62d31ed7c0d9402039c5a5ac674c3ea8914e8fc76302c7cadeadff2df18db3d357
+EBUILD clustershell-1.8.3.ebuild 986 BLAKE2B 10499dd6164ee7a93582f50da614b5e1ba846256e9b557f3649d2d8c13fd0a99557ab70b0e632271e81431ace9f5befef5f4489344ff4485847d8917bbb5e9a1 SHA512 78d74d0c91c04456240c373a34f7e1ea9baa6dfe85d0770d8c4f3bcfdd7f63816ae7ef684a70e3fecb8c8b8c465fa4aa92114c1984aa2b348a7e039d8335ad45
 MISC metadata.xml 346 BLAKE2B a7ba198c3d053ce6b8f07d828767b6cc92e87ebf1a0d27c18f4f660d3d683c5c0a53f8a6b3a73b7693c834c05a01735c6481aba7207594bbf9d7ba0b05764f71 SHA512 aa2a78948db02a02e036fdab4e66dc24d98ed1953996b6278da535354b5b505cc28d6c97c218ecbdf54e14ad6cf919d9158b54d7554fb30fda528162c261a1ae
diff --git a/app-admin/clustershell/clustershell-1.8.3.ebuild b/app-admin/clustershell/clustershell-1.8.3.ebuild
index a369abd0fa26..113e9a21ba5e 100644
--- a/app-admin/clustershell/clustershell-1.8.3.ebuild
+++ b/app-admin/clustershell/clustershell-1.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # TODO: test phase
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/cea-hpc/clustershell/archive/v${PV}.tar.gz -> ${P}.t
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc libressl test"
+IUSE="doc test"
 
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="
@@ -27,9 +27,7 @@ DEPEND="
 RDEPEND="
 	${CDEPEND}
 	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-
+	dev-libs/openssl:0="
 RESTRICT="test" # currently fail
 
 python_install() {
diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
index c5bdb18a2e83..051fccb336dd 100644
--- a/app-admin/conserver/Manifest
+++ b/app-admin/conserver/Manifest
@@ -1,10 +1,7 @@
-AUX 8.2.3-libressl.patch 981 BLAKE2B 98e222e3136c0f4cb252333c5f950e71d201eec76d1d2c200c64079ff5dc811bb69814683baf36c290ae50fd02e51c0b9064a8d250f71c209be3a89a4d0f1d6b SHA512 55b209e80cd000bc0cd23c12f0cfe93784f2470c1836305f569d87d676f586eb516e1793b0940f23b2de0d7fe72814f7db3c87f0e5e9d05f254a4bbe707a2e89
 AUX conserver-8.2.6-autoconf-2.70.patch 1029 BLAKE2B c95e0837ae67e4f7f8e2244c0078fdb4a4eabd6a35cac90d40d4e0e0b9e1280ebafbcfb3204e9d453c527d150f8dcbdf9a44b14355ed7a9fd997731026f7cada SHA512 28565be004637e6469bd83c696bf4b505be14f9dd9f00c08d6122eea80277499558117e98cd1b8999ecb85fdbd6570a98eb67b167b3a8bb3b26bd7fe8c7b42b4
 AUX conserver.confd-r1 133 BLAKE2B 6f3029a06b34458f70ef8370c35c09ea69a4d005aad173070e89fd1ce613b34147ad547c621b6aa98165bfb13ef67f0886667ab52973cfe4f45ea13c1f07a7bf SHA512 34fbe44a28a1a56ce51f9f2cebfc0d1bd20e4c4ea153f7605fb96434001b6bc9c52ba7e770617ed36710bfb7f69cebe7d79b31efbccac6c6a8847cf12a1ed774
 AUX conserver.initd-r1 428 BLAKE2B 574fa8611e928b17e70b1da522060c230b3f51ef0daf8babeeb9635f9652d01f06de1fa4309a213b6b2bca77099a17910aa5d6790bccc4e4e8f7f8fc0ba42458 SHA512 f0dcea7fddec5165fb00c452aa0b56c3eaa0919e96e5bf1ff4e80000b01fe80134bc4ee8a584114fcad56c6d5caa467d229b8b54bc8b4145dd2fa76871336c7d
 AUX conserver.pam-pambase 194 BLAKE2B ad284008c94f4c19b911a93279b12893a1c686806b22f7f19500e7216c19768ab161f9ba5cf2405d9d46f412a08c0cb04de0bc05ead15fb75da931575c2c3be2 SHA512 5368394be5b9d97e0ae751d84fbb4848aa27fd57b1a2eea8c7919e56246e390985deca80f0019c2104034103f73ac382a5ab2129113a0ff0b63b0b8bd83648c9
-DIST conserver-8.2.3.tar.gz 329825 BLAKE2B 94ceb427a18b38855ee3146e432be50248a518221d9779c833b3bf1190dedf800ff498ffdd88eafc7cea343b2f87f476738977021c85f19c869bf0a012f1da11 SHA512 35b387629973620aa25211d9532f940e17d7891aa7216776c315cb9fde09106b7388e7cef29f5a2ead8660fc35e2be2b14f38a51cd2b3198251b7e7e70a2254d
 DIST conserver-8.2.6.tar.gz 437315 BLAKE2B 9f62bb8ac91b57759c6b08d5a6ff31727a547c1991d322d75350a879a247925bbb1bbcab25b8a3d99a2ce6a997ba9f2e6c35338588e913055b29f3574e00e434 SHA512 3b7769675fd0edfd3727e5e84785f33c037b9e7a17c8c69c0ce48a447ea3b7de916e217c0f3b808b8350818b7bc702c917ea7a122ed96ae6b73f81ff0b5ae283
-EBUILD conserver-8.2.3-r1.ebuild 2355 BLAKE2B 69a01594a73817f9970ae9292709d98fe28c1a704f67edf43cb595be1b251c85da60e40bb7895cffe47275747c73e4ede9e615f5d88dd32ed0ec120df1922ccb SHA512 1ca942d8044bfa96a4cf559c35f3bea6ed823ecb6f75ab540726cd306730778af3d1ed6be4edd5b7c34c4205a9078a5514fbe94a4a6e23557fc854e935589854
-EBUILD conserver-8.2.6-r1.ebuild 2382 BLAKE2B 0ffad99ee3fc06041600e544ca79d6e475830c2c50768668e507a6e20ca9b9155b4988291607f69a8b5c1b490c1a08fec92561e9cb659de3bb6e6a4d621e075c SHA512 1be3d84c121974754fcb2717cb198fe8849ddfe8406c6a21b8fe625d38e499eaa5b2f186f93770c974a615e3a1de93d678cf8bb0b7a79581a1121bd1cbd13d0d
+EBUILD conserver-8.2.6-r1.ebuild 2314 BLAKE2B ab1d3085be3bc6709356f0ec73fe156309ed17aaa0deb6b6188e2cc62ac44eb68e98bed735dfd4902fe1b5e168f2331a9095193af9851c5d7507406cfff170ca SHA512 c2d6216eb4aab36de3590c69f7ddc4e1c20c09bc1808b55e709e82d5d207767862250d09c8296f06781f76b261e36221806a8dc63226b2c454e7c9f5d28810f2
 MISC metadata.xml 1408 BLAKE2B 01acca9d16d6bf1f182d0c582f7c69f1c89a697a3b2fe44a589368faa4aa5117c6e7382214464497bc305cc38bab8f860a86460ebfe57d6b4af74bc4f0781b12 SHA512 604c18ac8e93c5d37a465e61f541a29ea6a5143518a153e5a39da820af53d8859e2ef4fe212ddeaad5e2cebed83735e55f61afda12c5cc0bcbf828d1a8238b3d
diff --git a/app-admin/conserver/conserver-8.2.3-r1.ebuild b/app-admin/conserver/conserver-8.2.3-r1.ebuild
deleted file mode 100644
index 7a587ea09385..000000000000
--- a/app-admin/conserver/conserver-8.2.3-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools pam ssl-cert
-
-DESCRIPTION="Serial Console Manager"
-HOMEPAGE="https://www.conserver.com"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD BSD-with-attribution"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
-IUSE="debug ipv6 freeipmi kerberos libressl pam ssl test tcpd"
-RESTRICT="!test? ( test )"
-
-DEPEND="debug? ( dev-libs/dmalloc:= )
-	freeipmi? ( sys-libs/freeipmi:= )
-	kerberos? (
-		virtual/krb5
-		net-libs/libgssglue
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	pam? ( sys-libs/pam )
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-RDEPEND="${DEPEND}
-	pam? ( sys-auth/pambase )"
-
-DOCS=( CHANGES FAQ PROTOCOL README conserver/Sun-serial contrib/maketestcerts)
-
-PATCHES=( "${FILESDIR}/${PV}-libressl.patch" )
-
-src_prepare() {
-	default
-	sed -e '/^INSTALL_PROGRAM/s:-s::' \
-		-i {console,conserver,autologin,contrib/chat}/Makefile.in || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_with debug dmalloc)
-		$(use_with ipv6)
-		$(use_with freeipmi)
-		$(use_with kerberos gssapi)
-		$(use_with ssl openssl)
-		$(use_with pam)
-		$(use_with tcpd libwrap)
-		--with-cffile=conserver/conserver.cf
-		--with-logfile=/var/log/conserver.log
-		--with-master=localhost
-		--with-pidfile=/run/conserver.pid
-		--with-port=7782
-		--with-pwdfile=conserver/conserver.passwd
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" exampledir="/usr/share/doc/${PF}/examples" install
-
-	keepdir /var/consoles
-	fowners daemon:daemon /var/consoles
-	fperms 700 /var/consoles
-
-	newinitd "${FILESDIR}"/conserver.initd-r1 conserver
-	newconfd "${FILESDIR}"/conserver.confd-r1 conserver
-
-	dodir /etc/conserver
-	fperms 700 /etc/conserver
-	insinto /etc/conserver
-	newins "${S}"/conserver.cf/conserver.cf conserver.cf.sample
-	newins "${S}"/conserver.cf/conserver.passwd conserver.passwd.sample
-
-	einstalldocs
-	docinto examples
-	dodoc -r conserver.cf/samples/.
-
-	if use pam; then
-		newpamd "${FILESDIR}"/conserver.pam-pambase conserver
-	fi
-}
-
-src_test() {
-	# hangs without -j1
-	emake -j1 test
-}
-
-pkg_postinst() {
-	if use ssl; then
-		if [[ ! -f "${EROOT}"/etc/ssl/conserver/conserver.key ]]; then
-			install_cert /etc/ssl/conserver/conserver
-		fi
-	fi
-}
diff --git a/app-admin/conserver/conserver-8.2.6-r1.ebuild b/app-admin/conserver/conserver-8.2.6-r1.ebuild
index 7d0d422f9ba6..34a51420681c 100644
--- a/app-admin/conserver/conserver-8.2.6-r1.ebuild
+++ b/app-admin/conserver/conserver-8.2.6-r1.ebuild
@@ -11,8 +11,8 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD BSD-with-attribution"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug ipv6 freeipmi kerberos libressl pam ssl test tcpd"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
+IUSE="debug ipv6 freeipmi kerberos pam ssl test tcpd"
 RESTRICT="!test? ( test )"
 
 DEPEND="debug? ( dev-libs/dmalloc:= )
@@ -21,10 +21,7 @@ DEPEND="debug? ( dev-libs/dmalloc:= )
 		virtual/krb5
 		net-libs/libgssglue
 	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
+	ssl? ( dev-libs/openssl:0= )
 	pam? ( sys-libs/pam )
 	tcpd? ( sys-apps/tcp-wrappers )
 "
diff --git a/app-admin/conserver/files/8.2.3-libressl.patch b/app-admin/conserver/files/8.2.3-libressl.patch
deleted file mode 100644
index 8b04acb7b88c..000000000000
--- a/app-admin/conserver/files/8.2.3-libressl.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f4d2a4a30f930c58bf87511f7ed1a982eca66ce3 Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Thu, 6 Jun 2019 21:30:16 -0700
-Subject: [PATCH] libressl
-
-backport of https://github.com/conserver/conserver/pull/26
----
- conserver/cutil.h | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/conserver/cutil.h b/conserver/cutil.h
-index 63aef65..07aa6d4 100644
---- a/conserver/cutil.h
-+++ b/conserver/cutil.h
-@@ -12,10 +12,12 @@
- # include <openssl/err.h>
- # if OPENSSL_VERSION_NUMBER < 0x10100000L
- #  define TLS_method SSLv23_method
-+# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+# if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
- #  define CIPHER_SEC0
- # else
- #  define CIPHER_SEC0 ":@SECLEVEL=0"
--# endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */
- #endif
- #if HAVE_GSSAPI
- # include <gssapi/gssapi.h>
--- 
-2.21.0
-
diff --git a/app-admin/entr/Manifest b/app-admin/entr/Manifest
index 84b130a70f96..d4ac6bce234f 100644
--- a/app-admin/entr/Manifest
+++ b/app-admin/entr/Manifest
@@ -1,5 +1,5 @@
 DIST entr-4.6.tar.gz 24909 BLAKE2B e6c1eb5da1a3b94d593297f9975c36ea98d88c5b6ac17c34934c8d4678fb1c247699b8ff3d481a3972a67fd0abba75687b11489258be98990713e2041a12c2d0 SHA512 41e8c2311c7833a778193b13d1e0b1bb18ece54f5e20b8b5b0b4a2308ba1cc1a8b8378700dbac83ee68822b5f847a3fa9c47822d22a22d45da792d2408f48378
 DIST entr-4.8.tar.gz 25408 BLAKE2B 82367e2d7c933d881ed35147656f9b3c521103a636eecc603ed7d3e17eb59929e872ecb865f8d733f867383a3e1021fd3564f8e5fd27d094dfac9789d6651251 SHA512 fc99a257fe9a30a9b08f0b6283f9ee3b65c38362744842dd976a4ac7749df7f6ff630235443af17f664f9cbf2a197dbb8c1114fe491e675921745294b4fa4d8f
 EBUILD entr-4.6.ebuild 586 BLAKE2B 342fd92b72d67e5f97bc39cdeb24f2454370dbe7c56bde889b3271b2a1829c7d917a046282543dbef589b86a0f33601faef9adc688fbdfe8d7d2c52d4ad6cfb0 SHA512 25958a209870781211efe04357b4cffcfa728e543820d3342c2471d3d2c58876b5e18a47d48d8b7cde96a19898d55f5a493b70d1df2d0db35baf3fdfe97e5cf4
-EBUILD entr-4.8.ebuild 590 BLAKE2B 10bd6604fc9be627bd3e5b779a35b2d4048f014f84274c9107672fdf9d9db1770639eef33773eac72bfd73b3eac34d8d92092803c318767aa8c9f9bc4077149a SHA512 8006118f9c58f97f26108a1e9d322f60c5dcc65656780d5e99d6b97efcf37e2fe30b71ea3864f6bb754ca463ecd10b9d22745f8ceb3a634a8b48a8dde26e68bc
+EBUILD entr-4.8.ebuild 586 BLAKE2B 342fd92b72d67e5f97bc39cdeb24f2454370dbe7c56bde889b3271b2a1829c7d917a046282543dbef589b86a0f33601faef9adc688fbdfe8d7d2c52d4ad6cfb0 SHA512 25958a209870781211efe04357b4cffcfa728e543820d3342c2471d3d2c58876b5e18a47d48d8b7cde96a19898d55f5a493b70d1df2d0db35baf3fdfe97e5cf4
 MISC metadata.xml 377 BLAKE2B 377ae6a1620e09bf5a309a212ed7b4db5516e51b9e955373502252ab4fa5bdd9520d5c145905634d76e3884a3a993a6fb2cbe37e730e177081ea5f0c65b3c1ec SHA512 7db7620ce42324e2a551b2fa5898aab491c868b5d28b938e163ea1bf24aed66913fff8d611e95c634e65aa5372bed9314a55b278d62157929d6873cea7994bd6
diff --git a/app-admin/entr/entr-4.8.ebuild b/app-admin/entr/entr-4.8.ebuild
index e8a126ca365b..d0aef7b7af8e 100644
--- a/app-admin/entr/entr-4.8.ebuild
+++ b/app-admin/entr/entr-4.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://entrproject.org/code/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index 69b7637d400e..b52e1bb1d176 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -5,6 +5,6 @@ AUX gkrellmd.conf 250 BLAKE2B 2b0cfcd1940cd695c67db32c13bbb7f372936b1f88938a2e43
 AUX gkrellmd.initd 338 BLAKE2B 6ff2ab29e354578efc477af50af6a7e517bb7ec9267575d75fb5d5a12c9894a60996ffa37672760657eeee0680b9b7573d3d03d7d5efbe20122d330e5a55ebd8 SHA512 403431a0bfe8264ccdaf3c7e361e363a18a5e2deda8b2287919030c746c7caf80571b1a2dda407c113a9f878253078e67202017a026d83dec43bc5ca0389cc06
 AUX gkrellmd.service 173 BLAKE2B c89a772fd0273b54766f5cea36aab9156d7a1d59f5759bdd673651afebdc21e1bf6108cadbc6328287e6fc62d0edac215eeb7e6dd9d8d6a916c7ff913222c511 SHA512 8703ea4e51d243050034b65b7bc50b3d1862a6369af72b0d9e47285558763066e27dbdfadd54a4316da0402aac0d92c17cf1c42eed2b7926226191ce5d85089d
 DIST gkrellm-2.3.11.tar.bz2 783123 BLAKE2B b68c60477e4994e9508a8e5ea39fd09ab5cf0f019fc6b4567b9482b3b1fd315dd2548daed262095b42dda43ac068295d5c3c375c5cb80c91fda76ef8b9834df2 SHA512 e4147aa90e09925b9672728f287880bde26632d77d83d3f0b9458a201593a57158d9eb8cbb31e569e0d71d91a08c9bceba29814f59e542315775663ef9fd27a9
-EBUILD gkrellm-2.3.11-r1.ebuild 3334 BLAKE2B bbd6fe1265a6b72e1e9a9830d829e28875b8604f851f8879564aeb79bf9a807cf716ce06926b7613b043aa42644230927ef1926fe5a89c33313426d5b9791a06 SHA512 d0bdd181eed540ce917e3830cc148dc18723d32b1a825dff53ce61ef083e6d2b9a8aec61f53195588f0194f73969c665d6e56f5f4ee546d863f0eefed8bb39e8
-EBUILD gkrellm-9999.ebuild 3352 BLAKE2B dab875e96a3baacbb110e23b544c412787b5ad1f20cca62196ce6b6d5b89588275836e80fcebd1e3d141f8cd3993695687ed52aaae7af6e9c71c2310146eb13c SHA512 c939397ccb34fce1892a13abac3cc6c990c16dc9e8c3a370f7767d28b0d3c4231cb3813873a5afba938bb0a6c37bee1f0b2ff30c6e84a259cd841bd11d43649b
+EBUILD gkrellm-2.3.11-r1.ebuild 3272 BLAKE2B 76c6fd50b283d7975cf8803fece4d62bda16f75cc3991072e07014c5f447a5fcb4a26ac06ce7641610147d0f182eb8fa0c288619655f30563a76cca78ef73f31 SHA512 64e31dd6ab972459dbba8debca7ef7b9169e6d89bace50b229cdc36f5d4d20e67899fa43d767149609e655e206fb295088bd7573fbffecd3d5a559e817cf85a2
+EBUILD gkrellm-9999.ebuild 3290 BLAKE2B e4e552b0faa7076fbe4240f86c025f6f4aed93dc322086f38a5ef4edcadf9055ec3fd63dd72ed44b7ed615ae5a22dd3d33b845cf11fa523717663a779effff23 SHA512 ca94eadf30b3a70b89bac2c9496239eeeb45ab091a42c86b7a971f02360dd8bb0ea16c4427963813f8ac1d8d20175a511fb513bca890583fc933d3f4554dfac1
 MISC metadata.xml 917 BLAKE2B 88567611e5ddaed8c1f81e639c7e82a120f9201f56b9e512bca08d948c78a967e57490e754f7e3b2c9a4a9a2c216b1288c8059593589378b5404b51db50a9644 SHA512 8b880d60459e4cba922f2fe586f0dfdcc4b0f8054e5f5cf8650ab10bacb30380b67f81795c671e28bf0c51bd6f3379c3b653bc78c0ec954bc7456dccdad274f0
diff --git a/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild b/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
index 330be6e934f7..99c4bb7aaf3b 100644
--- a/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ else
 fi
 LICENSE="GPL-3"
 SLOT="2"
-IUSE="gnutls hddtemp libressl lm-sensors nls ntlm ssl kernel_FreeBSD X"
+IUSE="gnutls hddtemp lm-sensors nls ntlm ssl kernel_FreeBSD X"
 
 RDEPEND="
 	acct-group/gkrellmd
@@ -28,8 +28,7 @@ RDEPEND="
 	ssl? (
 		gnutls? ( net-libs/gnutls )
 		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
+			dev-libs/openssl:0=
 		)
 	)
 	lm-sensors? ( sys-apps/lm-sensors:= )
diff --git a/app-admin/gkrellm/gkrellm-9999.ebuild b/app-admin/gkrellm/gkrellm-9999.ebuild
index e757131b4748..01398103d527 100644
--- a/app-admin/gkrellm/gkrellm-9999.ebuild
+++ b/app-admin/gkrellm/gkrellm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ else
 fi
 LICENSE="GPL-3"
 SLOT="2"
-IUSE="gnutls hddtemp libressl lm-sensors nls ntlm ssl kernel_FreeBSD X"
+IUSE="gnutls hddtemp lm-sensors nls ntlm ssl kernel_FreeBSD X"
 
 RDEPEND="
 	acct-group/gkrellmd
@@ -28,8 +28,7 @@ RDEPEND="
 	ssl? (
 		gnutls? ( net-libs/gnutls )
 		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
+			dev-libs/openssl:0=
 		)
 	)
 	lm-sensors? ( sys-apps/lm-sensors:= )
diff --git a/app-admin/gopass-hibp/Manifest b/app-admin/gopass-hibp/Manifest
index a0222acd10b3..43e9890123e0 100644
--- a/app-admin/gopass-hibp/Manifest
+++ b/app-admin/gopass-hibp/Manifest
@@ -201,5 +201,5 @@ DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.zip 105245 BLA
 DIST gotest.tools%2F@v%2Fv2.2.0+incompatible.mod 20 BLAKE2B 25d11078b1caa5a705f3ae32f28d155683dfe0109d96531b1fc20e632acdc2f8429395975e6509f5dc78bc042b5e70e90fa2daa9790c39eb3422cbc189fb21af SHA512 5a73bc54777766425ba833348d2986408baedcaff86acf1648384bbcb31e302b0b0de38e1a92d53083551e35c62f375262497c0d5a37c9fb39824ae68fe8113e
 DIST gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod 194 BLAKE2B c322e2469b51e719e88bf9d9461c9a888afbdc1e214d9260b08324623e5828ce14b9dafdd42febc839e354f242e5ec53e78c9f61bd70338abc6de06090dd8197 SHA512 795de820e4a8622de316ee1b391a9c92476b3a67eee387278cd79f818c275df687ccacc60afbba20491dd813e442fa5a10d84b8b138f712c5a8705e884cb1d42
 DIST rsc.io%2Fqr%2F@v%2Fv0.2.0.mod 17 BLAKE2B c37ef4c1d8928ffad995abcb6f2ac59d2a0c6a329e6b198b18f8d802794793cef874b6b9eebc05d2cad4b17f300b4f752f5e1d78d7cc798e3596387551dac8f9 SHA512 89fa51351e90323df1f25ff8c33410ead21746cc4fe0a7c54dfb0423ff1285406b000920eadbba59ae105c545388b79cc66899aac78650452addd19d5f1f9815
-EBUILD gopass-hibp-1.12.0.ebuild 10987 BLAKE2B 45cfc3b33629e91bcb9d21a69f7e24a17a382633e88353bfa6a55a4af7eecf24c70575265b6a1f20d73237ca895c0a5ee4dbf753fdccee93a48b75ae477a32e2 SHA512 b4eef930301254f2d7e2f7ab0af22cea2ce80b831cba78fa14bd1dabb03d807bb1682bfd03f679bff38511bfc1a31c42af075fcac528901fb32b1f303825958c
+EBUILD gopass-hibp-1.12.0.ebuild 10988 BLAKE2B 611ae32df9dcd28160e07a69f1ee3fddf93901d1ea99f210d48362fe3d90338baeb1c97fe6344289293839a8162fe928241dd5c9daa6975a69081ee9b3e157f6 SHA512 4aed82f266cbb3770cd9ef26074aca55e79a637a7bd3881a76278202420a30ab44c67c2a6c5a246685eca67e01a26cacd0501d05ac9d5584537619a304111821
 MISC metadata.xml 332 BLAKE2B c53268eb86cf9b8af3cfe6fb66e2e014c8d99f7ec99808883d2f4e655ced6ae74df3f4fa2f6cfd71ae8ef7ca23e84bd677704aa580def76757371d2770ede52f SHA512 894d24fa0ae741f15c7ad4c73acae59f9b573ec470777aa9754756142a1c05af9d640afe4f542a860c1f0763bc624813d9f409f1c55f3c5ba4fd10a4bc97c864
diff --git a/app-admin/gopass-hibp/gopass-hibp-1.12.0.ebuild b/app-admin/gopass-hibp/gopass-hibp-1.12.0.ebuild
index 64c7c936910d..96b912147296 100644
--- a/app-admin/gopass-hibp/gopass-hibp-1.12.0.ebuild
+++ b/app-admin/gopass-hibp/gopass-hibp-1.12.0.ebuild
@@ -228,7 +228,7 @@ RDEPEND="
 	dev-vcs/git
 	>=app-crypt/gnupg-2
 "
-src_install(){
+src_install() {
 	# Makefile is broken
 	# https://github.com/gopasspw/gopass-hibp/issues/2
 	dobin gopass-hibp
diff --git a/app-admin/lastpass-cli/Manifest b/app-admin/lastpass-cli/Manifest
index 020db886e7e1..dad9e93d50cd 100644
--- a/app-admin/lastpass-cli/Manifest
+++ b/app-admin/lastpass-cli/Manifest
@@ -1,5 +1,5 @@
 AUX lastpass-cli-1.3.3-gcc10-fix.patch 2855 BLAKE2B 9d20c68d2d1349d557fef3d147e799cca1db7181e767011fcba73d2cb2639f2fa0e6a1f321561f0cffa39dfa365080984c923f10eff8fb9a3eeab19ca11418a3 SHA512 53d8d6842d21fad888597750d4ebef4de351621751befe791a09921210ddae13a2fbeb21e17aca759e60c3c6172ae786fbea42d8e9dbb379386033fe2b3a5bfa
 DIST lastpass-cli-1.3.3.tar.gz 116434 BLAKE2B 341f99a7a5edd157c271a0989a004ace8300f2121230b4c0b7c23152643ebc0e3f60717a057b4e6acc802fe641ccd84c770bfcb3d89c505713aea23692d1542b SHA512 9b9274cae1fe4045b7df4402170c522ab5765929739e76141b35a75ce3c8af824acd881e194face45e8721d6ce778bde97ff1a1ac23515de0c6dba28d61a8c7e
 DIST lastpass-cli-man-1.3.1.tar.xz 5700 BLAKE2B 736ab71ad55cfcb657c727f3dc9dc15775dab1a0232d1ffc51b8794e49911531c96a841b4a5ac0b31f0516cd7aa54027ac7d0eb096816730cdfd192c04d99449 SHA512 e60807683ecd681b3937ef447d3e6a487d25418fe99f51ba99e54bf643c5254dd18427a03e7f035198ef34ff578bbb6116baf04eb554f54d85e7d059b6bfed7e
-EBUILD lastpass-cli-1.3.3.ebuild 1693 BLAKE2B 7094b306aee08cabf6a9dd09bcb253ab3250e26740ec7effc105b90e2014d8c7cf7ba3ec958093eb7951ee8b7b349faca09843f77b00949f3fc99a37b46deee4 SHA512 0fb266ed52aa52c7d8d5aee6102287af3dc869ec4907f4d884e435d16bd844b96e379dcafca39de788e13f41fef2cf9ff815b8590e23a5fa263fd9e8ba54c16f
+EBUILD lastpass-cli-1.3.3.ebuild 1633 BLAKE2B dd78356f8707c0ae659f6a4116c24c1f39512a0a37a50b82cb2033fe8c4cca5d8154db93a09c76ffd67172ff2c76b44e9a3434560c8e597cba5b9f179f0fd945 SHA512 87d774e4cc3004aa62c9bcc5b1a6c8a8b2a1c44244a6b36f16ed469fda79d6c0b84f1a43e7d4fe600ed695072a3559f18363f179ffffc47020e127a92484e1d5
 MISC metadata.xml 643 BLAKE2B a5a01a1dbcc257692bd14369470d69eef33a00a9910ed5006c62f1f5fec2a9a261dd6ece42bcaa68345a21f6e26958f965f90459501324b0e7a168f3fcc4f7f9 SHA512 6b1a7f6566687384d328260576dad306dd07add06001b3746b4f37f05ff91b6ee72e1e2ecfd35463a5b78b4ba8dd1a7757503bdf992372dbd474967e4bf0e9f3
diff --git a/app-admin/lastpass-cli/lastpass-cli-1.3.3.ebuild b/app-admin/lastpass-cli/lastpass-cli-1.3.3.ebuild
index b202c4fb1ad2..27b8506f0ea3 100644
--- a/app-admin/lastpass-cli/lastpass-cli-1.3.3.ebuild
+++ b/app-admin/lastpass-cli/lastpass-cli-1.3.3.ebuild
@@ -14,13 +14,12 @@ SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 SLOT="0"
 LICENSE="GPL-2+ GPL-2+-with-openssl-exception"
 KEYWORDS="amd64 x86"
-IUSE="libressl X +pinentry test"
+IUSE="X +pinentry test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	net-misc/curl
 	dev-libs/libxml2
 	pinentry? ( app-crypt/pinentry )
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 25fbef9a6431..0d5b30544140 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -1,11 +1,6 @@
-AUX logrotate-3.14.0-ignore-hidden.patch 548 BLAKE2B 29a8efd36b000cc670a8a2db46cac3ad12ca49c5900409c3e1b456da88acc869e66a479481fcb24731d44d7d1815fce54068542afaa4737093a65a35ea7cd79e SHA512 2f08e4b1b483d301e2c6f9a5440957f43d336d44b3393c4408a02b5491826f887d53c782a6c7472bdb1ede9baacf2d1608d7385a576da0a8441a4b5a48ee5113
 AUX logrotate-3.15.0-ignore-hidden.patch 566 BLAKE2B 1739e0d175311eb2a3692826830bb101dc65b3966eb6dcd96fcbdb6bb1376eac5c0d0c78a26ff2ee6cfad57396d05dd3cae9ff4621a94b80d9a8b5877a52195d SHA512 ed572f12617812b44f7b79e9f3c7fb7aada1fed8f80244ee9e5e7c7f536e493c69790c7c62e0dc1951f979bc5a2cff581f439a8e1fb1a47722e6c0f1dcb4e65d
 AUX logrotate.conf 740 BLAKE2B ade43681e1929aa8b7e167a2be0c8569f3842680687381c202ac04b5cf97cd85481f6ca7fbf6f0dffa64caa3b1d9cb0f1e2154af8882a3ce7008337f2a5ede6f SHA512 6411acd842fac1a8af72142cddfa76b567f6ba859bed91dab56f1d26b48f3dcaa3ffee6c8094860fe9c43f9b6bc398199c8f4047856b91d6d12333d0fc7aef96
 AUX logrotate.tmpfiles 16 BLAKE2B 1f7925d6d2d4bc120d5202f49887b23e2eb633f5c369fe8d0bd1703e5075671dd1e13a030ec06fa269214bff9552670d3e0932e3dbde2e3673d59b7a50a2458b SHA512 f51852b1d5708a8fc48c6fcfd2fc4f34f3cd88d9119c607c0cb47f0cc0dc7370bd3399a9ebf781943cdd16a25bb4db0d81337140fc179faa72e18a848f3d8c36
-DIST logrotate-3.14.0.tar.gz 215413 BLAKE2B 7914188922d81b1f8b6c4e493fae71d23bc9e65ebfcb190ebb4287c875af53204cbecb51c2731a3dc57530a30c685c3a626074265d9a2462714ff6ff077ea5ca SHA512 5f584d9be01737960eaffcf43746270a5395486d2161577a9ee3e757cb4dfe5a207c8b1d097181dd413560d76ecc0e3d526f87d1b123a52dc3e5e49d529a5fb5
-DIST logrotate-3.17.0.tar.gz 224559 BLAKE2B 6d019bafad6986a0b6264893d36a515db75d746dd590afd26825c01c68e9ccf3c260502a29912d75c069ece8715ae14d3c13d4030f6222187be0e1ca05d60e49 SHA512 ada4415ef68ad97c1415fa0c1ba7bf108621777cd91599bf4f999dea1c1025596543aa00fd579cae4d39315b71c4d8f96a9c9d1178f78be7c523470588ab1d31
 DIST logrotate-3.18.0.tar.gz 224873 BLAKE2B f73ffa2d58a5125393e6c96e158e39e0b4cadef01e6eebd172220227a7e1363e6731bc2ac511fa028078054b55d42b131cdc30232ac5762ce4c6cbff79c19681 SHA512 d1bca267fbec4acbb83ffba4d3ac4c864f4269d8513e5614e7dbe6f3b1f176685218bffdb5d62f559ee73f84cf9a8a257c9f63e30af058d12d0034240f247586
-EBUILD logrotate-3.14.0.ebuild 2504 BLAKE2B ac279df5befd104bf6495aab0e423e953f52870155b5e52b61031cea90cbd57cce9c3b15043d144edff244ee468f4436c1d30acffeb1c4c73953abbfa16e6559 SHA512 fce971e5c74cdf8dfe8ca6e46c84e9e8b10674a7069c10b0ebcf47f88de2d2aac6849f242a399239f65f9aa700eac67dc7e62635d2043bbeed7fad07f50fa564
-EBUILD logrotate-3.17.0.ebuild 2485 BLAKE2B def8bc9ca3114392f84c537ad44d06b44503fddce3600464e3e5645251f9f25753458eaa86ed59ad9470be7c3df25df089cd2749933cf8bebf8da6533803cc72 SHA512 7f74ae31c32d858036c998ab0f7eefe0c56dc34d19fb35fd0133a0e618e073b940c4e007b710f76a626890f084492de1de4cfbd988e61ce935a63162a8475766
 EBUILD logrotate-3.18.0.ebuild 2485 BLAKE2B def8bc9ca3114392f84c537ad44d06b44503fddce3600464e3e5645251f9f25753458eaa86ed59ad9470be7c3df25df089cd2749933cf8bebf8da6533803cc72 SHA512 7f74ae31c32d858036c998ab0f7eefe0c56dc34d19fb35fd0133a0e618e073b940c4e007b710f76a626890f084492de1de4cfbd988e61ce935a63162a8475766
 MISC metadata.xml 1206 BLAKE2B c52b227a223e5d7db50f2009b3766d6af0f2c0ca51bdf3f6098d56d16c6586c08826b795f50a6f3f2e50f29ed4f9def8c53268a533eac985e3ab22042c418f7a SHA512 9d184f5b4c025416b7a2f6019f982a12e65e39da3532d7d024759e1e73d2b55d0e949e38c4cd0926e552059b600c114daa5beb135433d71e8f85d0f732d0b791
diff --git a/app-admin/logrotate/files/logrotate-3.14.0-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.14.0-ignore-hidden.patch
deleted file mode 100644
index 6745126259be..000000000000
--- a/app-admin/logrotate/files/logrotate-3.14.0-ignore-hidden.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nuar a/config.c b/config.c
---- a/config.c	2018-03-09 17:47:08.000000000 +0100
-+++ b/config.c	2018-03-09 19:47:42.274696766 +0100
-@@ -440,7 +440,9 @@
- 	int i;
- 
- 	/* Check if fname is '.' or '..'; if so, return false */
--	if (fname[0] == '.' && (!fname[1] || (fname[1] == '.' && !fname[2])))
-+    /* Don't include 'hidden' files either; this breaks Gentoo
-+       portage config file management http://bugs.gentoo.org/87683 */
-+    if (fname[0] == '.')
- 		return 0;
- 
- 	/* Check if fname is ending in a taboo-extension; if so, return false */
diff --git a/app-admin/logrotate/logrotate-3.14.0.ebuild b/app-admin/logrotate/logrotate-3.14.0.ebuild
deleted file mode 100644
index bedd9e10b9bb..000000000000
--- a/app-admin/logrotate/logrotate-3.14.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd tmpfiles
-
-DESCRIPTION="Rotates, compresses, and mails system logs"
-HOMEPAGE="https://github.com/logrotate/logrotate"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="acl +cron selinux"
-
-COMMON_DEPEND="
-	>=dev-libs/popt-1.5
-	selinux? ( sys-libs/libselinux )
-	acl? ( virtual/acl )"
-
-DEPEND="${COMMON_DEPEND}
-	>=sys-apps/sed-4"
-
-RDEPEND="${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-logrotate )
-	cron? ( virtual/cron )"
-
-STATEFILE="/var/lib/misc/logrotate.status"
-OLDSTATEFILE="/var/lib/logrotate.status"
-
-move_old_state_file() {
-	elog "logrotate state file is now located at ${STATEFILE}"
-	elog "See bug #357275"
-	if [[ -e "${OLDSTATEFILE}" ]] ; then
-		elog "Moving your current state file to new location: ${STATEFILE}"
-		mv -n "${OLDSTATEFILE}" "${STATEFILE}" || die
-	fi
-}
-
-install_cron_file() {
-	exeinto /etc/cron.daily
-	newexe "${S}"/examples/logrotate.cron "${PN}"
-}
-
-PATCHES=(
-	"${FILESDIR}/${P}-ignore-hidden.patch"
-)
-
-src_prepare() {
-	sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.{cron,service} || die
-	default
-}
-
-src_configure() {
-	econf \
-	$(use_with acl) \
-	$(use_with selinux) \
-	--with-state-file-path="${STATEFILE}"
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	insinto /usr
-	dobin logrotate
-	doman logrotate.8
-	dodoc ChangeLog.md examples/logrotate-default
-
-	insinto /etc
-	doins "${FILESDIR}"/logrotate.conf
-
-	use cron && install_cron_file
-
-	systemd_dounit examples/logrotate.{service,timer}
-	newtmpfiles "${FILESDIR}/${PN}.tmpfiles" "${PN}".conf
-
-	keepdir /etc/logrotate.d
-}
-
-pkg_postinst() {
-	elog
-	elog "The ${PN} binary is now installed under /usr/bin. Please"
-	elog "update your links"
-	elog
-	move_old_state_file
-	elog "If you are running systemd you might need to run:"
-	elog "systemd-tmpfiles --create /usr/lib/tmpfiles.d/logrotate.conf"
-	elog "in order to create the new location of the logrotate state file"
-	elog
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "If you wish to have logrotate e-mail you updates, please"
-		elog "emerge virtual/mailx and configure logrotate in"
-		elog "/etc/logrotate.conf appropriately"
-		elog
-		elog "Additionally, /etc/logrotate.conf may need to be modified"
-		elog "for your particular needs. See man logrotate for details."
-	fi
-}
diff --git a/app-admin/logrotate/logrotate-3.17.0.ebuild b/app-admin/logrotate/logrotate-3.17.0.ebuild
deleted file mode 100644
index 9e712b69c695..000000000000
--- a/app-admin/logrotate/logrotate-3.17.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd tmpfiles
-
-DESCRIPTION="Rotates, compresses, and mails system logs"
-HOMEPAGE="https://github.com/logrotate/logrotate"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="acl +cron selinux"
-
-COMMON_DEPEND="
-	>=dev-libs/popt-1.5
-	selinux? ( sys-libs/libselinux )
-	acl? ( virtual/acl )"
-
-DEPEND="${COMMON_DEPEND}
-	>=sys-apps/sed-4"
-
-RDEPEND="${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-logrotate )
-	cron? ( virtual/cron )"
-
-STATEFILE="/var/lib/misc/logrotate.status"
-OLDSTATEFILE="/var/lib/logrotate.status"
-
-move_old_state_file() {
-	elog "logrotate state file is now located at ${STATEFILE}"
-	elog "See bug #357275"
-	if [[ -e "${OLDSTATEFILE}" ]] ; then
-		elog "Moving your current state file to new location: ${STATEFILE}"
-		mv -n "${OLDSTATEFILE}" "${STATEFILE}" || die
-	fi
-}
-
-install_cron_file() {
-	exeinto /etc/cron.daily
-	newexe "${S}"/examples/logrotate.cron "${PN}"
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.15.0-ignore-hidden.patch"
-)
-
-src_prepare() {
-	sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.{cron,service} || die
-	default
-}
-
-src_configure() {
-	econf \
-	$(use_with acl) \
-	$(use_with selinux) \
-	--with-state-file-path="${STATEFILE}"
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	insinto /usr
-	dobin logrotate
-	doman logrotate.8
-	dodoc ChangeLog.md
-
-	insinto /etc
-	doins "${FILESDIR}"/logrotate.conf
-
-	use cron && install_cron_file
-
-	systemd_dounit examples/logrotate.{service,timer}
-	newtmpfiles "${FILESDIR}/${PN}.tmpfiles" "${PN}".conf
-
-	keepdir /etc/logrotate.d
-}
-
-pkg_postinst() {
-	elog
-	elog "The ${PN} binary is now installed under /usr/bin. Please"
-	elog "update your links"
-	elog
-	move_old_state_file
-	elog "If you are running systemd you might need to run:"
-	elog "systemd-tmpfiles --create /usr/lib/tmpfiles.d/logrotate.conf"
-	elog "in order to create the new location of the logrotate state file"
-	elog
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "If you wish to have logrotate e-mail you updates, please"
-		elog "emerge virtual/mailx and configure logrotate in"
-		elog "/etc/logrotate.conf appropriately"
-		elog
-		elog "Additionally, /etc/logrotate.conf may need to be modified"
-		elog "for your particular needs. See man logrotate for details."
-	fi
-}
diff --git a/app-admin/monit/Manifest b/app-admin/monit/Manifest
index 609a99f434ea..174dee7a32a6 100644
--- a/app-admin/monit/Manifest
+++ b/app-admin/monit/Manifest
@@ -4,7 +4,7 @@ AUX monit.service 226 BLAKE2B 3b3041900987acd5bb6faa770c6631f6554b2e436052025236
 DIST monit-5.27.1.tar.gz 1459360 BLAKE2B ef8030112c401ab08653692c702f2ec6d34c11605c2f6fbb5310f8e08d7fb238cf1b2d0271358b7160e05ad8dae3931d458329c422ae826681c11fe46fac01b4 SHA512 1e71a529a920a37576242a99fe8067d9b88f64136b111c152527aca4aa5d3cac3c32c1f58a793a56361b8e286f025bfb1f063f4c38d25ebafc7927fbf9170673
 DIST monit-5.27.2.tar.gz 1463790 BLAKE2B f00733261fd941f47ec04e63ed9e3617991cd8a069a14e59941e85d3a342537892019864d4716f821428adb57979aa270fcba9d57f573d49e897dfcd77cc133a SHA512 a45cbbf0905b165767e21d66103b460ea48948824d043881aba3de752e34a67bfb3b97f75153e3672d87a34a702d66ceee28160110654aa52fb82c668aa135b9
 DIST monit-5.28.0.tar.gz 1480041 BLAKE2B 3ac9930efc89de8b4f65dd197c4f4289b3410afac38950c83b459436720d2c786e89d8bad22e4a7688af9c6111021500b9f3c6f0a8e8cee3a6b0e2f5058ec148 SHA512 3805a8cd5ad2ef9c94832a7fe3a09cf508eb857c92cda129d914db8656613e26eac5fefdaa4530b3403b4f6eb0c4cccdc620c12461dbebcda738ba9535ffa885
-EBUILD monit-5.27.1.ebuild 1189 BLAKE2B 6d26a251a2971408adb9801306041c873741e6d2f8b785a050764c40fc7d1076881aeffac520c102e1c3138a945f23abc1b62d83bb6c6b8cc4ddb615511de277 SHA512 9ad4ca52585b0e2b20407b7a901e6fbb8dc0aeac56e6f9fb4c47b2453f745c88d416f5cbbe8b80c75d67c7b06fd99b68616736eb9f28328db18261bbb965581d
-EBUILD monit-5.27.2.ebuild 1189 BLAKE2B 09faa65105e9285ded38473cb325be0ccf4e89d303a872324c4718676fe77f11848145e496bb8e80ba4c75d57f8ab8b3ccc5565f288a069723998bf77ac11d76 SHA512 b073ad8241ec62feeea71b1bfb12b2ee6a3b694b7a304bcd24a3eb20ec0cc34322fa804b7cb84e7f25291a4f73b539d5764d5d3cb2f3222ba261d10b1698c210
-EBUILD monit-5.28.0.ebuild 1192 BLAKE2B 0cc7cf060143ba463b47dc82f5f330ed20a57aa5162ffe93b2f50c963542caee22695d9d17349fa3ea879d7d2b7d6177261af27ddb6197e4154c86841efd6d06 SHA512 ae84feda9f895625280f109cad73b27d68552d316f9d888d3594889b5b50dcf6185297732a3167a39a44fa997f2a19c5115122cc659fe36dcdbbc6ebcd25bd2b
+EBUILD monit-5.27.1.ebuild 1127 BLAKE2B e6170df230081dc9171697d0f280aafc8ded9b1061790616ad21f78579ee6fdfebd704b089dccf42d85ac7e15bddb476831f65230d66e335c35968adcf1ce650 SHA512 75cc834126cb0ab37ffac91fce47133c9fda9030a0534f093fb72f9930ec0f8eec8f7b25ce46d8678fc84a1dec43440be6c5fdab51dd8b95e01dfe537c1a89a7
+EBUILD monit-5.27.2.ebuild 1125 BLAKE2B bae8affa1da5da4a386b108dba8d03150fb2d5a1e99bfeabc0f40179bf4bdcf02961d746cb9c917edd29adb35253b9fbc863efdb9e7ba369e034311d86eb099f SHA512 02b13e7fd7972123b9e76847aff6d5e7a6337b7ca4d3f82b40fdb102c1dc029cfe026d0dd9ada1450133a1593115b26069004ba30f1be2752e6d72603a9db9f4
+EBUILD monit-5.28.0.ebuild 1130 BLAKE2B 5df362f709e56b313206c490cec0cc07a1a0b1f6c7281167d0ff2e646cc783864659ea65aae0222db2b1ff3376a1775907ddd3a85f6686a4e2743295c87a5775 SHA512 ffdddfca4405c281400252c2bdbf7b1da825e54d77c5f7d64e06e074753b568537c18718478f9f495a72a6c4ea4bcd3a6d840b11a86578723a64a9b6571fdd53
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/app-admin/monit/monit-5.27.1.ebuild b/app-admin/monit/monit-5.27.1.ebuild
index b5d4e9fca1a3..4db356a484eb 100644
--- a/app-admin/monit/monit-5.27.1.ebuild
+++ b/app-admin/monit/monit-5.27.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,13 +11,11 @@ SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux"
-IUSE="ipv6 libressl pam ssl"
+IUSE="ipv6 pam ssl"
 
 RDEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
+	ssl? ( dev-libs/openssl:0= )
+	"
 DEPEND="${RDEPEND}
 	pam? ( sys-libs/pam )"
 BDEPEND="
diff --git a/app-admin/monit/monit-5.27.2.ebuild b/app-admin/monit/monit-5.27.2.ebuild
index 89edd3be0a49..b5d12c9c390c 100644
--- a/app-admin/monit/monit-5.27.2.ebuild
+++ b/app-admin/monit/monit-5.27.2.ebuild
@@ -11,13 +11,10 @@ SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux"
-IUSE="ipv6 libressl pam ssl"
+IUSE="ipv6 pam ssl"
 
 RDEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
+	ssl? ( dev-libs/openssl:0= )"
 DEPEND="${RDEPEND}
 	pam? ( sys-libs/pam )"
 BDEPEND="
diff --git a/app-admin/monit/monit-5.28.0.ebuild b/app-admin/monit/monit-5.28.0.ebuild
index 69c2daf01304..da54d075b60d 100644
--- a/app-admin/monit/monit-5.28.0.ebuild
+++ b/app-admin/monit/monit-5.28.0.ebuild
@@ -11,13 +11,11 @@ SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="ipv6 libressl pam ssl"
+IUSE="ipv6 pam ssl"
 
 RDEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
+	ssl? ( dev-libs/openssl:0= )
+	"
 DEPEND="${RDEPEND}
 	pam? ( sys-libs/pam )"
 BDEPEND="
diff --git a/app-admin/passwordsafe/Manifest b/app-admin/passwordsafe/Manifest
index 804f828f8e04..975861beb7b1 100644
--- a/app-admin/passwordsafe/Manifest
+++ b/app-admin/passwordsafe/Manifest
@@ -1,6 +1,6 @@
 AUX passwordsafe-1.06_beta-system-gtest.patch 2962 BLAKE2B 1ef77391d355364e55da568c2686c1988916da9eadc312c37d01016df3449535b88b503dfd3aeac2bf3c8e613141552bb1d97f5f5a733becc33f3c565a610940 SHA512 2fc6745b84ad810a550c2b221aca4cd10f87d4bc77282cb31b3d3070b61a3958c126ce0d3da4eaf550d80be470ca4c5aefaeb863caaf2f9fb285bf844f5705bb
 DIST passwordsafe-1.12.0.tar.gz 14937705 BLAKE2B 523e4496ffb99f8a53e62252117d43b771af867b3505f3a5b8c8f1119e8365f0661090e410a832abca89e2ce35816d2046d4bff0ba1e0f06c52c01eaac9051b2 SHA512 c20cb754a2174e3b3ab61edf99f2a31c333144550103fac50cc26cea89669fa3574db3bdd59996fcd87b83c7bf6dd1e9d2b087c17615183cd7111f151be5a94a
 DIST passwordsafe-1.13.0.tar.gz 15022877 BLAKE2B 353976c22365fc98c034eac339f067061ee659043ab8507bbec174483414619b8442ba4fd7671e888127b83e9865d21587529c7821bd706a55da951c300425d4 SHA512 eb8ae46e9f3e8287b2ad781ed6d6e13026096a35fadc1fd1da1116e5e6b65e16e76090d8e7d1c64be387229ccd1053dcc820acbe7ee97914e46c311ee8ff03b8
-EBUILD passwordsafe-1.12.0-r1.ebuild 1952 BLAKE2B ca0b8d7112408f3bb6ddbae81f910f22454246f8442b858e4f51108f9cb8b372c9d34d2375c60e102d5a811dd467b0b92faa8198401e961ca7a1c7775b8cec02 SHA512 3c830d1f384651b2f6153594bb589f954c0261a285f1df5c9ee7cff4e7c26904b7b246478761e7bd38ad395e0d542f66ef48974174406b486d75a8c28cf2ac85
+EBUILD passwordsafe-1.12.0-r1.ebuild 1892 BLAKE2B 2943644c3546e9d31c29bda97d0292d31db902074452c025df2eaaf0f0128524974e8b933d018b84a66c1b6b5f39f4dac8be29d966870d1f497d17d661867115 SHA512 f6b29dc2a68f06ef500b8fcb2a8b5e14bdd89e93d074703c695c93749d9af283a118879c250b65e88b90d3b272d30e6f35d5323951449af67302d6242da84e02
 EBUILD passwordsafe-1.13.0.ebuild 1888 BLAKE2B 8e10bb42fb03ef98e3d946d2498b1265d142852c75f36ea1d3bce634991a618159edf9fba455cb56e730f8c28369f175108d731986c3e4e3a6bd158ee39c0e75 SHA512 712f86d94751e859a14281a5b3741e175c7f9a1002938ad31a374687a16463006c482d56f2096241f164f2954d556a63cf2a67fc78d865f6e98be9938de9e349
 MISC metadata.xml 713 BLAKE2B 7f98705703812e2a7148f5943d8b0c8e7a2f51f2bced2d27badbad478f87411c5dc3d7b37a1dffc7d21cabafa4b61650ca745b8d0bcdfafc7f15c46d363540da SHA512 31cacdb2b25093ee853a43200c498177d207027302a6542dfa095377e1f6834d1c40c28088241939ebe3022f122c0125a94e248f135c084a4a234b2510741148
diff --git a/app-admin/passwordsafe/passwordsafe-1.12.0-r1.ebuild b/app-admin/passwordsafe/passwordsafe-1.12.0-r1.ebuild
index 343fe3239dfe..e01c60e1a8ea 100644
--- a/app-admin/passwordsafe/passwordsafe-1.12.0-r1.ebuild
+++ b/app-admin/passwordsafe/passwordsafe-1.12.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/pwsafe/pwsafe/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
 LICENSE="Artistic-2"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
-IUSE="libressl qr test +xml yubikey"
+IUSE="qr test +xml yubikey"
 RESTRICT="!test? ( test )"
 
 DEPEND="
@@ -25,8 +25,7 @@ DEPEND="
 	x11-libs/libXt
 	x11-libs/libXtst
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	qr? ( media-gfx/qrencode )
 	xml? ( dev-libs/xerces-c )
 	yubikey? ( sys-auth/ykpers )"
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index b492ccb4ba2b..42b0af2c66d5 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -15,10 +15,10 @@ DIST rsyslog-doc-8.2010.0.tar.gz 8428326 BLAKE2B ee8eb2bdbb1f6c7122559b63ddc1ae6
 DIST rsyslog-doc-8.2012.0.tar.gz 6417145 BLAKE2B d8377f40b0311e8e7dcca274c251c0de7706490e3048c8d69d479120e06ca1e0b3ec9fce0a04928984d440da3aef196965f8c1b45afe8931c893b4baa72f4e87 SHA512 5647f499230276066abced34c2ca352268ba24fbd00cb7b5e3d0a2494977dd6f781cf8d1e7c7a9210d23c451ff162acda81ee93afa3f8f08fd555123e9daeece
 DIST rsyslog-doc-8.2102.0.tar.gz 6419104 BLAKE2B 134c7ccde6f7435b35840fa37f5774223ac1ebd7dc10db961900a7b1600483156518433c7f70d0981e96ea750e1916ab53e346abacf58066bf141e85c719ae00 SHA512 a5dc4fb9bd8892fac693c5692b926c8d7d9fa36667d6b4c6eccba750713af88d4317f6232efc2a16de38c2e58c4a8bc4d04c9ebb2e7ebc3b0878d53eef20dd2e
 DIST rsyslog-doc-8.2104.0.tar.gz 6451275 BLAKE2B cb8a38b28caec17babd190e463070b862071a75c4c63a7208e56f039f84ae7a5c6045112697c61635d328e56d9427f692e67a9d6fefc94b59ad28481210f1481 SHA512 6c898fa606190c5cf214822503f060b1692cd907731858736a395511b66d7b0d1cf6dfcc90c4cecbe21b099197ae2187db53d719f44f85f26a1bd34971539d36
-EBUILD rsyslog-8.2008.0.ebuild 12538 BLAKE2B 24a92fd62ec2254ee00e5b47afca9a1460254e860e0545c3b9db01cb6f951e06145f79ee158244a94184e8a8192099d5dafa5f9ef9ebabcbe09b806aa5b940af SHA512 2d6a9a7c7bcc4ef1b51f7233d24dc08b9ddb1e22e4dc94783c612a9ed864d0fd29a05c3642679807a0c48567b0a2d6f0babf4f4555dfb3ad37e79980ebf5b6f0
-EBUILD rsyslog-8.2010.0.ebuild 12889 BLAKE2B eb56b396c1613b38355971a2251b6b341160f4e806c2235469efa49d9b52d40cc9dee89d3ed0ba4c1c657431617fc2d510afffefee9a45610767f947fa796c37 SHA512 ff532d1e9e1b203be3aaf0fea0fbfca4e6ea5d2fb29f883f309d92f4605b19529abe957b1ad2d624c4f9b80fbd890bfee578f4ff7771a309906352b918c7a978
-EBUILD rsyslog-8.2012.0-r1.ebuild 12949 BLAKE2B 5043b13319455f26430a85c8bccf427bc59ffbc20739f39127de55afe72542903ebd108de75939bef1099203cad75aad836e96fc3e954a7b90867820be3bcb90 SHA512 1e772f0e010e9247993b1a22f0ea8360e269146cd6581ac6b73513431f23c292bedf09ab832e85ea9a00db1cc077a36499af8061a40dec172059453655173240
-EBUILD rsyslog-8.2012.0.ebuild 12889 BLAKE2B eb56b396c1613b38355971a2251b6b341160f4e806c2235469efa49d9b52d40cc9dee89d3ed0ba4c1c657431617fc2d510afffefee9a45610767f947fa796c37 SHA512 ff532d1e9e1b203be3aaf0fea0fbfca4e6ea5d2fb29f883f309d92f4605b19529abe957b1ad2d624c4f9b80fbd890bfee578f4ff7771a309906352b918c7a978
-EBUILD rsyslog-8.2102.0.ebuild 12947 BLAKE2B fbdf1798b6bfd8a252f3b13a1f1cecaef1db3ab1f0fc1e72771a26ca469efb989bb8faffa64b76a0b079333d897ab1d11bdd3c05ee4a20eb9d202820a94bd39d SHA512 a877b9bd66bd18782851ccf85925ec052d9d55c8e1d2623af411378f38e0615191f8944832e36df989a15f8d8833f0c1b5e20b7bb885f99bba89e441797f2c90
-EBUILD rsyslog-8.2104.0.ebuild 12981 BLAKE2B 8950958ca4f79c46c8c6adb5bbe76a6d53794e90156479d24ca7ba17a1f3912e71d54cd19e5cb566b8dc8e0d7a8b8de34eae0d6788259655fbc230f484eee519 SHA512 f18ad974f9be0617342f7b385e3f6919faab027dba8c3a0800a0fc676aa2c34f5ed8d944a962acd8d8e45ff013219d6ae3e88c87a16397840bc09a0e8f2a3fc4
-MISC metadata.xml 4070 BLAKE2B 3fde04df2bf0b93058d14787780f7f78b5014cdaa303101ef0fb637d1f0b165e453885ae307f137d98052719f992cd1a3f46da2f923bc97030ba629801190d5d SHA512 df868d04339eade02eb55b218f43c85c9efe2bf70cadf2ec1d59dc9f0d546ba9dbcd9ac5e3f9cbad05a8f4629ce5979668aba1fb8b027c51c7f8468b2e9b732a
+EBUILD rsyslog-8.2008.0.ebuild 12425 BLAKE2B 15ab2bafbf82cc912f135f96d634e0fe3f525d5171d84a302e8ef97258ac8b9ead00c27ff72120733fa7c5864ff434b1d179cb9404a98bd2aa2f8ec10dcdf938 SHA512 f6f5af2f835a89bfa0fc15a33360b54f668bf5e59aa9e75d5893da2eadf6422494cde151e286c245985d963ba8745e7316f36927776b9593fb8592095eaac900
+EBUILD rsyslog-8.2010.0.ebuild 12776 BLAKE2B 08ebe02ef4addd04ec2f36e5d5553deb0db1c89fb0c56e1b2e2ee01e8607c985c4b32e3afdb74cd03953dcd0749e61c691ec66e8abffd7c42b3c58f2dae9ef72 SHA512 701d0a91be68fc0ee6ce84eccfe58b6113c5f44e10c53e1aef86adb3bb892fee44c97d3be8a6a0c28efb68c9bf6eabed718ee7feb3065f1a3a4e320d94d333b8
+EBUILD rsyslog-8.2012.0-r1.ebuild 12836 BLAKE2B 54cd60b31f9d66a6be4ac468454eb84ba93ff17d0aa197a9f1b4e4236e09086162904a34db59b40369d16975d57211be23464dc7f07709ee31af85818561167c SHA512 4fbadeb0ab42de4a2896e5618f67c15db54309f73ede92d9f49830bc14c0947a439a8e833b9a6f9a4b0089b0c1e1f4076854b1d856ff50d4f45d47ee734d5443
+EBUILD rsyslog-8.2012.0.ebuild 12776 BLAKE2B 08ebe02ef4addd04ec2f36e5d5553deb0db1c89fb0c56e1b2e2ee01e8607c985c4b32e3afdb74cd03953dcd0749e61c691ec66e8abffd7c42b3c58f2dae9ef72 SHA512 701d0a91be68fc0ee6ce84eccfe58b6113c5f44e10c53e1aef86adb3bb892fee44c97d3be8a6a0c28efb68c9bf6eabed718ee7feb3065f1a3a4e320d94d333b8
+EBUILD rsyslog-8.2102.0.ebuild 12834 BLAKE2B 600f7e571aec90717770b4200607f430bea6e830ccb9b26495a64575cc0ac664dfaa1394c5895beae8e69a7152e6b97f4b038559a969a09a94a2a07320572ba2 SHA512 8e0ad535b2d8d0991e5165a9829af81b6870651346d2929a9aae8c6398e7e0684847c0a68c26ddff3817f06a3af827c98e5e749ff19bd71ef3c2146f8d870397
+EBUILD rsyslog-8.2104.0.ebuild 12868 BLAKE2B 5da76dd6fc4e5f74b8fba99aeed95fcff313c9ddf1893b459eca2ccff4396b58822dd3402b96ad56f705ba47a6072294e887eef9eb701a3e33070a0da7a08c74 SHA512 7e2e0a905548bec785bf86198ca6822528209e9f4faa51599ebaeb472d9ad78b847bf983ddbedc6ae03c1ee2fa85a88eeef8a75843d0a335cb0c30a9c2c0ed71
+MISC metadata.xml 3871 BLAKE2B 33e83d286bb5a62a851dc3ca10e8920071c9c16c9c7f54bde875a97d195e2b0c34615318adfc6d919df7cebd33e053b398267e4159753e597c97551b8ff0fbb7 SHA512 275939880de65c264e14b782169d760a61f0e5d9ae49e3f14861c9ddf5e66c0a78761cebc6c62e2f18426530ac4145bf8b8e71533eb103776be3164127c1b585
diff --git a/app-admin/rsyslog/metadata.xml b/app-admin/rsyslog/metadata.xml
index 8edddd33ee54..a5c7f6b9d28d 100644
--- a/app-admin/rsyslog/metadata.xml
+++ b/app-admin/rsyslog/metadata.xml
@@ -17,7 +17,6 @@
 		<flag name="kafka">Build the Apache Kafka input/output module (requires <pkg>dev-libs/librdkafka</pkg>)</flag>
 		<flag name="kerberos">Build the GSSAPI input and output module (requires <pkg>virtual/krb5</pkg>)</flag>
 		<flag name="kubernetes">Build the kubernetes modify plugin (requires <pkg>net-misc/curl</pkg>)</flag>
-		<flag name="libressl">Use <pkg>dev-libs/libressl</pkg> instead of <pkg>dev-libs/openssl</pkg> (you still need to enable functionality which requires OpenSSL)</flag>
 		<flag name="mdblookup">Build the MaxMind DB lookup message modify plugin using <pkg>dev-libs/libmaxminddb</pkg></flag>
 		<flag name="mongodb">Build the MongoDB output module (requires <pkg>dev-libs/mongo-c-driver</pkg>)</flag>
 		<flag name="mysql">Build the MySQL database output module (requires <pkg>virtual/mysql</pkg>)</flag>
@@ -31,7 +30,7 @@
 		<flag name="redis">Build the Redis output module using (requires <pkg>dev-libs/hiredis</pkg>)</flag>
 		<flag name="relp">Build the Reliable Event Logging Protocol (RELP) output module (requires <pkg>dev-libs/librelp</pkg>)</flag>
 		<flag name="rfc3195">Build the rfc3195 input module (requires <pkg>dev-libs/liblogging</pkg>)</flag>
-		<flag name="rfc5424hmac">Build the rfc5424hmac modify module (requires <pkg>dev-libs/openssl</pkg> or <pkg>dev-libs/libressl</pkg>)</flag>
+		<flag name="rfc5424hmac">Build the rfc5424hmac modify module (requires <pkg>dev-libs/openssl</pkg>)</flag>
 		<flag name="snmp">Build the snmp modify and output module (requires <pkg>net-analyzer/net-snmp</pkg>)</flag>
 		<flag name="ssl">Add support for encrypted client/server communication (requires <pkg>net-libs/gnutls</pkg>)</flag>
 		<flag name="systemd">Build the journal input and output module (requires <pkg>sys-apps/systemd</pkg>)</flag>
diff --git a/app-admin/rsyslog/rsyslog-8.2008.0.ebuild b/app-admin/rsyslog/rsyslog-8.2008.0.ebuild
index 102b62ab8755..b27254f48898 100644
--- a/app-admin/rsyslog/rsyslog-8.2008.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2008.0.ebuild
@@ -26,7 +26,7 @@ fi
 
 LICENSE="GPL-3 LGPL-3 Apache-2.0"
 SLOT="0"
-IUSE="curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE="curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes mdblookup"
 IUSE+=" mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres"
 IUSE+=" rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq"
 RESTRICT="!test? ( test )"
@@ -58,15 +58,13 @@ RDEPEND="
 	relp? ( >=dev-libs/librelp-1.2.17:= )
 	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
 	rfc5424hmac? (
-		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
-		libressl? ( dev-libs/libressl:= )
+		>=dev-libs/openssl-0.9.8y:0=
 	)
 	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
 	ssl? (
 		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
 		openssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
+			dev-libs/openssl:0=
 		)
 	)
 	systemd? ( >=sys-apps/systemd-234 )
diff --git a/app-admin/rsyslog/rsyslog-8.2010.0.ebuild b/app-admin/rsyslog/rsyslog-8.2010.0.ebuild
index 5302087c872d..82437e2752e3 100644
--- a/app-admin/rsyslog/rsyslog-8.2010.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2010.0.ebuild
@@ -28,7 +28,7 @@ LICENSE="GPL-3 LGPL-3 Apache-2.0"
 SLOT="0"
 
 IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
-IUSE+=" impcap jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
 IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
 IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
 IUSE+=" systemd test usertools +uuid xxhash zeromq"
@@ -78,15 +78,13 @@ RDEPEND="
 	relp? ( >=dev-libs/librelp-1.2.17:= )
 	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
 	rfc5424hmac? (
-		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
-		libressl? ( dev-libs/libressl:= )
+		>=dev-libs/openssl-0.9.8y:0=
 	)
 	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
 	ssl? (
 		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
 		openssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
+			dev-libs/openssl:0=
 		)
 	)
 	systemd? ( >=sys-apps/systemd-234 )
diff --git a/app-admin/rsyslog/rsyslog-8.2012.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.2012.0-r1.ebuild
index cd133449943a..e2470ad673f1 100644
--- a/app-admin/rsyslog/rsyslog-8.2012.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2012.0-r1.ebuild
@@ -28,7 +28,7 @@ LICENSE="GPL-3 LGPL-3 Apache-2.0"
 SLOT="0"
 
 IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
-IUSE+=" impcap jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
 IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
 IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
 IUSE+=" systemd test usertools +uuid xxhash zeromq"
@@ -78,15 +78,13 @@ RDEPEND="
 	relp? ( >=dev-libs/librelp-1.2.17:= )
 	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
 	rfc5424hmac? (
-		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
-		libressl? ( dev-libs/libressl:= )
+		>=dev-libs/openssl-0.9.8y:0=
 	)
 	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
 	ssl? (
 		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
 		openssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
+			dev-libs/openssl:0=
 		)
 	)
 	systemd? ( >=sys-apps/systemd-234 )
diff --git a/app-admin/rsyslog/rsyslog-8.2012.0.ebuild b/app-admin/rsyslog/rsyslog-8.2012.0.ebuild
index 5302087c872d..82437e2752e3 100644
--- a/app-admin/rsyslog/rsyslog-8.2012.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2012.0.ebuild
@@ -28,7 +28,7 @@ LICENSE="GPL-3 LGPL-3 Apache-2.0"
 SLOT="0"
 
 IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
-IUSE+=" impcap jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
 IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
 IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
 IUSE+=" systemd test usertools +uuid xxhash zeromq"
@@ -78,15 +78,13 @@ RDEPEND="
 	relp? ( >=dev-libs/librelp-1.2.17:= )
 	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
 	rfc5424hmac? (
-		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
-		libressl? ( dev-libs/libressl:= )
+		>=dev-libs/openssl-0.9.8y:0=
 	)
 	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
 	ssl? (
 		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
 		openssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
+			dev-libs/openssl:0=
 		)
 	)
 	systemd? ( >=sys-apps/systemd-234 )
diff --git a/app-admin/rsyslog/rsyslog-8.2102.0.ebuild b/app-admin/rsyslog/rsyslog-8.2102.0.ebuild
index 657d9410a1c8..02784fa99086 100644
--- a/app-admin/rsyslog/rsyslog-8.2102.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2102.0.ebuild
@@ -28,7 +28,7 @@ LICENSE="GPL-3 LGPL-3 Apache-2.0"
 SLOT="0"
 
 IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
-IUSE+=" impcap jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
 IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
 IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
 IUSE+=" systemd test usertools +uuid xxhash zeromq"
@@ -78,15 +78,13 @@ RDEPEND="
 	relp? ( >=dev-libs/librelp-1.2.17:= )
 	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
 	rfc5424hmac? (
-		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
-		libressl? ( dev-libs/libressl:= )
+		>=dev-libs/openssl-0.9.8y:0=
 	)
 	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
 	ssl? (
 		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
 		openssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
+			dev-libs/openssl:0=
 		)
 	)
 	systemd? ( >=sys-apps/systemd-234 )
diff --git a/app-admin/rsyslog/rsyslog-8.2104.0.ebuild b/app-admin/rsyslog/rsyslog-8.2104.0.ebuild
index 4fd8716916c3..731eb7f499cf 100644
--- a/app-admin/rsyslog/rsyslog-8.2104.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2104.0.ebuild
@@ -28,7 +28,7 @@ LICENSE="GPL-3 LGPL-3 Apache-2.0"
 SLOT="0"
 
 IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
-IUSE+=" impcap jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
 IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
 IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
 IUSE+=" systemd test usertools +uuid xxhash zeromq"
@@ -78,15 +78,13 @@ RDEPEND="
 	relp? ( >=dev-libs/librelp-1.2.17:= )
 	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
 	rfc5424hmac? (
-		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
-		libressl? ( dev-libs/libressl:= )
+		>=dev-libs/openssl-0.9.8y:0=
 	)
 	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
 	ssl? (
 		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
 		openssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
+			dev-libs/openssl:0=
 		)
 	)
 	systemd? ( >=sys-apps/systemd-234 )
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 4a4f82e79d55..a9f19510a281 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,7 +1,7 @@
 AUX sudo-1.9.5_p2-NO_ROOT_MAILER_fix.patch 1929 BLAKE2B 404bd5c03b81a9bfbc3796c706fa93a64b4649c651c7859175137e1abb7f9da34f43d7f6e1ca8bca10c567114a30383571771c6390de9975a6bf55d98b0caa7a SHA512 34dd6880a90740eefd3a1bb543b3121047ea6ab8837a127c55cff92ffb7bf9225d0c6adfd88adf299458fdafaaea5351a52f14a9487c04df41aa218c6eeb6e7a
 DIST sudo-1.9.5p2.tar.gz 4012277 BLAKE2B 41913887463e4f775564af8d614fb5ed762200aa777dc789ec333842d4f432323474fc952a531fe929b33607cdfbcd18d7fe7470a15d67139deaf855841ed11f SHA512 f0fe914963c31a6f8ab6c86847ff6cdd125bd5a839b27f46dcae03963f4fc413b3d4cca54c1979feb825c8479b44c7df0642c07345c941eecf6f9f1e03ea0e27
 DIST sudo-1.9.6p1.tar.gz 4119888 BLAKE2B 02bdb551c46cff11ac56e64937c64e6a29ccd8e0af34ea2f6b33c223bee8f7ad958d0fc3d7ef8ef12bf5bc82565769b923ff112a3f3d6bf6999fa4f6ea55e38e SHA512 632dfe72f04ce9a7a5a7236fcd5c09ce4535e695ced49d24dd848e3a7b1bea7380df44188b9e475af4271069539b5a5816948a98fbb0649ebebaba8b4c4b7745
-EBUILD sudo-1.9.5_p2-r1.ebuild 7028 BLAKE2B 6e1932b3d0350f0e51c662d6d55c6fa1d6ffb86408d6008bffa779c6d9904a82f7402101709b2844e22d1780cf00a0560404e376d66d926dfe116c683e272c4a SHA512 df6b9107da3f05987ccf2226e372a10d6a08cb997c4b82467c1dd8791104d3bbae41faaf14a29eaeff0ade1c410b54c869447c9e51f72ab87df2a2589c652c46
-EBUILD sudo-1.9.6_p1-r1.ebuild 6723 BLAKE2B 6a9cf024a9cf81832ccc974955c3cdb9a64f8427d131832fc7583b28646501f718c523dd866efa2af3bb602f55e460f382677f12d1a9d059897f0c628b903fcd SHA512 8289ea36497c7ebabb2dab6e132621311b251af098f4f9ef68aa1005eef310708f360c45c5117a49b1952430f3d13c7813e41943e7dd731353a16e90d8d7ad28
-EBUILD sudo-9999.ebuild 6723 BLAKE2B 6a9cf024a9cf81832ccc974955c3cdb9a64f8427d131832fc7583b28646501f718c523dd866efa2af3bb602f55e460f382677f12d1a9d059897f0c628b903fcd SHA512 8289ea36497c7ebabb2dab6e132621311b251af098f4f9ef68aa1005eef310708f360c45c5117a49b1952430f3d13c7813e41943e7dd731353a16e90d8d7ad28
-MISC metadata.xml 1161 BLAKE2B 0c501bf06edca82993ece857f9f7565f99da15df36c916bc9dc57e78bccf2b247c382e97dd6c97cc7f5375e1a0513c1a30ecbf097516e96319fd1797257fb117 SHA512 d6bc9cf11ea1bd28c19bfe167580556af517d92c958d63cd7872ab5076840eca39a7ab3d1f56e84fc0fcfb675d7a89c23ccdd3629f665c45232be1140eb950ac
+EBUILD sudo-1.9.5_p2-r1.ebuild 6964 BLAKE2B aadec2121ad557984b5b4e506b627dc334bc204d63525dee5dc3ee5f5e31ade83c88f55a00eccf3118faae8883e0a4b9d7d34a6822395a7cf92150c18c84909c SHA512 0173c240c2865d2298fe01a408c54587414932be1640da655abc7704f8094109a509b278d8c5d24250277872eb14d7684e2a8bab56b4b02fc8add23451722ec2
+EBUILD sudo-1.9.6_p1-r1.ebuild 6659 BLAKE2B 85c293bc01a785f063bd70fb42dded28d0cc07eac8c83f9d3a37e3291de0cc997f9d67a64bb43777e579431fbe17c3626bdd4a7fcad85e94062d2162543488d3 SHA512 9d2b56674ab5ef1d6735c7b12e83a18591661dfeef455d844a61abd2730b5713ff95956e24994bffcb2a5de5e9dc724b9072a3559c9bbab2b5c03800340118ff
+EBUILD sudo-9999.ebuild 6659 BLAKE2B 85c293bc01a785f063bd70fb42dded28d0cc07eac8c83f9d3a37e3291de0cc997f9d67a64bb43777e579431fbe17c3626bdd4a7fcad85e94062d2162543488d3 SHA512 9d2b56674ab5ef1d6735c7b12e83a18591661dfeef455d844a61abd2730b5713ff95956e24994bffcb2a5de5e9dc724b9072a3559c9bbab2b5c03800340118ff
+MISC metadata.xml 1049 BLAKE2B 7b4bbe6469dc6e683d73b81d055ca3b7b3ae610e2889edcde54b735cafa91d1a186268d70c96f5e90a4fcf90f4750ecee9eb4823fcbde5b47dfb9ebf27845b2e SHA512 7a9a9c9e0f457ba15355d5f14dbe0fd187485df6f9fad0c32a4e39850947e4bf1329370a52e4eb7396e0ee55c81fc31ea8569895e0d4608983b4b703d0dcc761
diff --git a/app-admin/sudo/metadata.xml b/app-admin/sudo/metadata.xml
index a99f4f7e613f..13a39991dab4 100644
--- a/app-admin/sudo/metadata.xml
+++ b/app-admin/sudo/metadata.xml
@@ -13,7 +13,6 @@
 	</longdescription>
 	<use>
 		<flag name="gcrypt">Use message digest functions from <pkg>dev-libs/libgcrypt</pkg> instead of sudo's</flag>
-		<flag name="libressl">Use message digest functions from <pkg>dev-libs/libressl</pkg> instead of sudo's</flag>
 		<flag name="offensive">Let sudo print insults when the user types the wrong password</flag>
 		<flag name="sendmail">Allow sudo to send emails with sendmail</flag>
 		<flag name="sssd">Add System Security Services Daemon support</flag>
diff --git a/app-admin/sudo/sudo-1.9.5_p2-r1.ebuild b/app-admin/sudo/sudo-1.9.5_p2-r1.ebuild
index 73aaae21c247..8a80098cbc64 100644
--- a/app-admin/sudo/sudo-1.9.5_p2-r1.ebuild
+++ b/app-admin/sudo/sudo-1.9.5_p2-r1.ebuild
@@ -30,7 +30,7 @@ fi
 # 3-clause BSD license
 LICENSE="ISC BSD"
 SLOT="0"
-IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
+IUSE="gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
 
 DEPEND="
 	sys-libs/zlib:=
@@ -45,10 +45,7 @@ DEPEND="
 	pam? ( sys-libs/pam )
 	sasl? ( dev-libs/cyrus-sasl )
 	skey? ( >=sys-auth/skey-1.1.5-r1 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
+	ssl? ( dev-libs/openssl:0= )
 	sssd? ( sys-auth/sssd[sudo] )
 "
 RDEPEND="
diff --git a/app-admin/sudo/sudo-1.9.6_p1-r1.ebuild b/app-admin/sudo/sudo-1.9.6_p1-r1.ebuild
index 32c7ad773094..4d5f317bd544 100644
--- a/app-admin/sudo/sudo-1.9.6_p1-r1.ebuild
+++ b/app-admin/sudo/sudo-1.9.6_p1-r1.ebuild
@@ -30,7 +30,7 @@ fi
 # 3-clause BSD license
 LICENSE="ISC BSD"
 SLOT="0"
-IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
+IUSE="gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
 
 DEPEND="
 	sys-libs/zlib:=
@@ -45,10 +45,7 @@ DEPEND="
 	pam? ( sys-libs/pam )
 	sasl? ( dev-libs/cyrus-sasl )
 	skey? ( >=sys-auth/skey-1.1.5-r1 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
+	ssl? ( dev-libs/openssl:0= )
 	sssd? ( sys-auth/sssd[sudo] )
 "
 RDEPEND="
diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild
index 32c7ad773094..4d5f317bd544 100644
--- a/app-admin/sudo/sudo-9999.ebuild
+++ b/app-admin/sudo/sudo-9999.ebuild
@@ -30,7 +30,7 @@ fi
 # 3-clause BSD license
 LICENSE="ISC BSD"
 SLOT="0"
-IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
+IUSE="gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
 
 DEPEND="
 	sys-libs/zlib:=
@@ -45,10 +45,7 @@ DEPEND="
 	pam? ( sys-libs/pam )
 	sasl? ( dev-libs/cyrus-sasl )
 	skey? ( >=sys-auth/skey-1.1.5-r1 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
+	ssl? ( dev-libs/openssl:0= )
 	sssd? ( sys-auth/sssd[sudo] )
 "
 RDEPEND="
diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
index f76dbbacf993..c86468f89de5 100644
--- a/app-admin/sysklogd/Manifest
+++ b/app-admin/sysklogd/Manifest
@@ -1,11 +1,7 @@
 AUX sysklogd.confd3 71 BLAKE2B 26e34fc5bd8fe936cb5cbe1ad7b3dc9ae47e153d731ecde62a354470448f91950a5ffe76104e80307543922bbb5777b9e3d096af8740d66a4dd637f4aa3adac5 SHA512 80a2159d24b343a5b14da054bd073015ffc8f81c6e5b47114429b6c069b81a3331392c88baafd9a5ac1e0d778119fa7ca10def17eeb9b88c7f5cca1c0d31c6b2
 AUX sysklogd.logrotate 402 BLAKE2B 2aba98bcef0516602268132507248ea44097541ac5659427f24a286661c500e6ff92b387f184bba84d0f10669ff9c917d7c8ee613c7fdb3a472434485b5f8c78 SHA512 655b25bc92c6d73807b11b0d64f97d619c067efb9fc16ee9c2aba5ba349b13991a22c83e7adaafb95e17578b17992992cab16d18b7bdb2be7d4fc876df5824f7
 AUX sysklogd.rc10 443 BLAKE2B 04d5d645a6e79582ce4532fdf5eb4453c61e66017596c641b6ebc087963f7667dc3dcef6d2d90c0602da753fb77fdd063a1bae5907798c47e7c0e92feb9a884c SHA512 274642e7555badc2395e4a08684b07e4b5be91cfe92f5f2e47903263dde1ccb67c9a5932864eb623d11d97a3ad429b28a8ab7a8d93177e949a2f8dec9a1aaea4
-DIST sysklogd-2.1.2.tar.gz 561286 BLAKE2B f70c2d116740930761677b9fdf715242844a583a59cd93c2e3408f985ce856d1a9eabc3ba736d18af44e8d154cdadec88035fc357db83eb504b4c6f800ea1f1d SHA512 dcd715939b4285e08ead0a1e797d09a8845156f456d3776cfcd0bcff7fbb9a306cb84a2b22731b430e2199d59ba42ab975fed6e675cf9d8a78833575c1490268
-DIST sysklogd-2.2.1.tar.gz 440182 BLAKE2B 7b926a45dc2aaa9cc57655c5a5cbbe3d1f91a29a136435a477d571f43b307d4f125672784319891b7498641c3ae265c3bda22d84beab99022ef7a870a4d3f1c8 SHA512 4b26e494bfdd82666718fc37c16577cfa45ad7235e4e7b9f605f1ae51dd595f0a01281ecfa04e31b9a79c2de9de3c64d02dab27924e33532da49844d8011b626
 DIST sysklogd-2.2.2.tar.gz 441106 BLAKE2B b99c63027468967083bb1338a6299bf2f58415c1d20a43f23ff613a5ce318c45c43640824bc82fe3ea423cd9432930a070354bb7a51281bd113b4d088bf17643 SHA512 5db5b0fc58530634627463a5b79ebc3b27c54284b371ce8c37cb6de4ed542640fb8a36e594bb73c0a541d22c6fa0ff985ad06cb2b76cd30cce988741ded86903
-EBUILD sysklogd-2.1.2.ebuild 2105 BLAKE2B d5b44d227c6d5b66ce0a19ca580f4cbc4d044c3c10ac991a0f50b9f9a5628cb274fcb9ae372e8007b85c9d8fe07ad99dae124b58e88bafda28b407cd0a5628cd SHA512 ea12b83058cfdbd1d7277b569cc2028588b7e95b6505511306e060b8da92d7e39cca6d9a298e0816c6e4d1b79f3245514c554e0bffdc2af1ba958261b7a12364
-EBUILD sysklogd-2.2.1.ebuild 2111 BLAKE2B 380deab4839155c659052403cd67e098c53717468ab8cb464d2bf274cfad0965f077cf8f82af8813090c748db3aeb5afb767c5924f871db4940bbf77d23569bf SHA512 541b2164b31189e74fc82de2717864e8ccfd7f4cd1b2b33524c2f239f64a24ff67ddc21f4dde18b88a87c31ec18ea397fcfcdcf19f0a1e4410c2d1b6a597be43
 EBUILD sysklogd-2.2.2.ebuild 2105 BLAKE2B d5b44d227c6d5b66ce0a19ca580f4cbc4d044c3c10ac991a0f50b9f9a5628cb274fcb9ae372e8007b85c9d8fe07ad99dae124b58e88bafda28b407cd0a5628cd SHA512 ea12b83058cfdbd1d7277b569cc2028588b7e95b6505511306e060b8da92d7e39cca6d9a298e0816c6e4d1b79f3245514c554e0bffdc2af1ba958261b7a12364
 EBUILD sysklogd-9999.ebuild 2111 BLAKE2B 380deab4839155c659052403cd67e098c53717468ab8cb464d2bf274cfad0965f077cf8f82af8813090c748db3aeb5afb767c5924f871db4940bbf77d23569bf SHA512 541b2164b31189e74fc82de2717864e8ccfd7f4cd1b2b33524c2f239f64a24ff67ddc21f4dde18b88a87c31ec18ea397fcfcdcf19f0a1e4410c2d1b6a597be43
 MISC metadata.xml 432 BLAKE2B 6333f9e73c96d80b69a0ae252660f93ae1466fc44fa379a461e7b611dae4841d0511887ce9a1ec3aa1f49bdb33a98fedce734be92b53580578f0e6a5ca67f192 SHA512 37d1ffbcdd86f5e94f5e38902bcb710fce1eb1c2702c06e05b00d56b02f51c6babbc05b8d1aa43317d336ab58af1df88e173dd152e4b62ca4fce411fe4a8ac23
diff --git a/app-admin/sysklogd/sysklogd-2.1.2.ebuild b/app-admin/sysklogd/sysklogd-2.1.2.ebuild
deleted file mode 100644
index 28b6cb446dec..000000000000
--- a/app-admin/sysklogd/sysklogd-2.1.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="Standard log daemons"
-HOMEPAGE="https://troglobit.com/sysklogd.html https://github.com/troglobit/sysklogd"
-
-if [[ "${PV}" == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/troglobit/sysklogd.git"
-else
-	SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="logger logrotate systemd"
-RESTRICT="test"
-
-DEPEND="
-	logger? (
-		!<sys-apps/util-linux-2.34-r3
-		!>=sys-apps/util-linux-2.34-r3[logger]
-	)
-"
-RDEPEND="${DEPEND}
-	logrotate? ( app-admin/logrotate )"
-
-DOCS=( ChangeLog.md README.md )
-
-pkg_setup() {
-	append-lfs-flags
-	tc-export CC
-}
-
-src_prepare() {
-	default
-	[[ "${PV}" == *9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		--runstatedir="${EPREFIX}"/run
-		$(use_with logger)
-		$(use_with systemd systemd $(systemd_get_systemunitdir))
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	doins syslog.conf
-	keepdir /etc/syslog.d
-
-	newinitd "${FILESDIR}"/sysklogd.rc10 sysklogd
-	newconfd "${FILESDIR}"/sysklogd.confd3 sysklogd
-
-	if use logrotate ; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/sysklogd.logrotate sysklogd
-		sed 's@ -r 10M:10@@' -i "${ED}"/etc/conf.d/sysklogd || die
-	fi
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}
-
-pkg_postinst() {
-	if ! use logrotate && [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.0 ; then
-		elog "Starting with version 2.0 syslogd has built in log rotation"
-		elog "functionality that does no longer require a running cron daemon."
-		elog "So we no longer install any log rotation cron files for sysklogd."
-	fi
-	if [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.1 ; then
-		elog "Starting with version 2.1 sysklogd no longer provides klogd."
-		elog "syslogd now also logs kernel messages."
-	fi
-}
diff --git a/app-admin/sysklogd/sysklogd-2.2.1.ebuild b/app-admin/sysklogd/sysklogd-2.2.1.ebuild
deleted file mode 100644
index fcf8b445d160..000000000000
--- a/app-admin/sysklogd/sysklogd-2.2.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="Standard log daemons"
-HOMEPAGE="https://troglobit.com/sysklogd.html https://github.com/troglobit/sysklogd"
-
-if [[ "${PV}" == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/troglobit/sysklogd.git"
-else
-	SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="logger logrotate systemd"
-RESTRICT="test"
-
-DEPEND="
-	logger? (
-		!<sys-apps/util-linux-2.34-r3
-		!>=sys-apps/util-linux-2.34-r3[logger]
-	)
-"
-RDEPEND="${DEPEND}
-	logrotate? ( app-admin/logrotate )"
-
-DOCS=( ChangeLog.md README.md )
-
-pkg_setup() {
-	append-lfs-flags
-	tc-export CC
-}
-
-src_prepare() {
-	default
-	[[ "${PV}" == *9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		--runstatedir="${EPREFIX}"/run
-		$(use_with logger)
-		$(use_with systemd systemd $(systemd_get_systemunitdir))
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	doins syslog.conf
-	keepdir /etc/syslog.d
-
-	newinitd "${FILESDIR}"/sysklogd.rc10 sysklogd
-	newconfd "${FILESDIR}"/sysklogd.confd3 sysklogd
-
-	if use logrotate ; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/sysklogd.logrotate sysklogd
-		sed 's@ -r 10M:10@@' -i "${ED}"/etc/conf.d/sysklogd || die
-	fi
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}
-
-pkg_postinst() {
-	if ! use logrotate && [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.0 ; then
-		elog "Starting with version 2.0 syslogd has built in log rotation"
-		elog "functionality that does no longer require a running cron daemon."
-		elog "So we no longer install any log rotation cron files for sysklogd."
-	fi
-	if [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.1 ; then
-		elog "Starting with version 2.1 sysklogd no longer provides klogd."
-		elog "syslogd now also logs kernel messages."
-	fi
-}
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 040fbbec91dd..aad4044f9137 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -13,9 +13,9 @@ DIST syslog-ng-3.26.1.tar.gz 5040993 BLAKE2B 235971547c8febe61191014d971b9e5d715
 DIST syslog-ng-3.28.1.tar.gz 5149671 BLAKE2B bfc33f2a595cb4fbcc5a69b60d283673922873434b21ca8ce9685a0f54b355f162b11242704419349a561f412573c84df30a49a4dc0cc95699e98720e3e65247 SHA512 d70b435a6c9d1d0d22ecebc051dc294b6e7f841159edabf229c772c40342a28014ea1599b2277f0514236f545bac63c9879988fd85d634e9ab4fe4f079c984cb
 DIST syslog-ng-3.29.1.tar.gz 5111614 BLAKE2B 1dba62290d6354d0cda7d43783327a19f69e05963c6d2e75f42c61c30984d49d28f1c6474e68ccdd806f38022bf6799e69e12f2444da391b2bccb736ca597c72 SHA512 c8ec6527cab9e46effe23aaa1306b5bde1e13c3e62a092a62af630a744cc41e81d861e6e2ebfbaad8a9199d3b75ba4ac5fb4b4215d03f80a41f57a2e7a074a49
 DIST syslog-ng-3.30.1.tar.gz 5707042 BLAKE2B 3e6ee58b3732ae4863de43c7d22799a74074e94dbbf735368c09c11382b641a5554a4a25ad836b4ac25c8a4f64781dbfb1d9ddd6961ba3aa70c4213cfec81bfd SHA512 ac7ed4978c6db9464add30aa7aeb71a646f841593b02884c8d4ad34c0508c8d3243bcbe6ee98e81c04698895305334eadd9e624ba71e510c14d79155723efb52
-EBUILD syslog-ng-3.26.1-r1.ebuild 4910 BLAKE2B 8b6ca27ed3d4f98d0ee40ad88b7143a50452103dab763067f996e76ef4631fce0e07153fa2251d5874231950cecfd46034f6875731c2fc39c5adf95a01a08787 SHA512 8c3187c2a7b1ed8d6fdf226b887d92674c3712ff19f60f6e0ed3466ec78043656de1df224d5ff2421fe34834cc33c5589b2188d7d817a2f153f41ab333f9993a
-EBUILD syslog-ng-3.28.1-r2.ebuild 4905 BLAKE2B a51992106f832abbfdcf876ba3472693e7d13594194b0fa165df8f593f32f6422d3fd8271808d41980350ffc5a50765eaaeaf1109aff4543e4fc9a426c6055f9 SHA512 3407603658ae6dd0869377921b383dfbff9a5e2b1d01cb5cd571254eb095c69f04acb01112ac3d40c137523fb0a2e4a45ae69e0aa4e29d828a2a107574a6bae3
-EBUILD syslog-ng-3.29.1.ebuild 4905 BLAKE2B a51992106f832abbfdcf876ba3472693e7d13594194b0fa165df8f593f32f6422d3fd8271808d41980350ffc5a50765eaaeaf1109aff4543e4fc9a426c6055f9 SHA512 3407603658ae6dd0869377921b383dfbff9a5e2b1d01cb5cd571254eb095c69f04acb01112ac3d40c137523fb0a2e4a45ae69e0aa4e29d828a2a107574a6bae3
-EBUILD syslog-ng-3.30.1-r1.ebuild 4975 BLAKE2B 8632cc3df06ca4de9adf177dc7361a1eb12e5ec2474d47e6b9e9fb2db73c80a45035a96821a161a00a5f8cbf1bae16607e6ce6f8fe602656b23c3386b7df1504 SHA512 8f56b1b0c79320a0c2eb935393bddb69e6ca47966ccbd86dee1a7785a450e42333e836f5bea65bbf444f8ecb405adf14e8c6f9e347cd24d96a0832924a6bc115
-EBUILD syslog-ng-3.30.1.ebuild 4897 BLAKE2B 21378d34ab6a7eb355c0ee8c132bf0af75fcb9a36035d55abd9d969c2fd8f270fe3956b8d3ce624f72f9852867260814af9b672c01c30b12150bdc37ef7c9b98 SHA512 7a2de2ef440ffe1c95fee72ad291e1968fa4c8ccf458b0c8394571bd0e98bf2f492c7cbe534c9243c424f6df7de5bd59b604811224ac12c6b2beb9969efad9fa
+EBUILD syslog-ng-3.26.1-r1.ebuild 4850 BLAKE2B 582ee36edfa4813345b5084652db3e2e61e0fbf8e58dd362714b23be6e284c0064be29c93ef50d7e8f62d472831c71b3a90ee2f361e986685c9b1dbfdb3d3b68 SHA512 1d9acc712b93cabc46f5ae1a716b64749cee6b37b33d24c3299554e76faeecf5dbd442924bbc5cf93997770828d01ac6c697a2cad33bb70bb896b729ef1fd275
+EBUILD syslog-ng-3.28.1-r2.ebuild 4845 BLAKE2B 3a644b90bc4aa739233304147293b0443934011e368b10b558571977c619a1a2438f48299993bbba323bd2fa425ee990b9e6b1f693986d0f68df4ec50a6e72fe SHA512 8f990c10d4fe5503e264d3462ba40047c0ec3fd8bcad26c38a83f26bbd89172338c603a573386c4c8f052d4bf98596d482c29044151116d60329ccd8a493721b
+EBUILD syslog-ng-3.29.1.ebuild 4845 BLAKE2B 3a644b90bc4aa739233304147293b0443934011e368b10b558571977c619a1a2438f48299993bbba323bd2fa425ee990b9e6b1f693986d0f68df4ec50a6e72fe SHA512 8f990c10d4fe5503e264d3462ba40047c0ec3fd8bcad26c38a83f26bbd89172338c603a573386c4c8f052d4bf98596d482c29044151116d60329ccd8a493721b
+EBUILD syslog-ng-3.30.1-r1.ebuild 4915 BLAKE2B 486d6ab3bfc3710a8e06e4301e0ec00771ba451613a205f3c914f5905079ed833d8a59f17df9698f72a8964ca2cc9fae25501b8a6f5339b030cf95c6b3f98bfd SHA512 164db058356bc4fc5c68783ed9f97ba85166ef306f63c186c53c7538100254f2e4cd47fdc5e037a91308e3e4880d8f2d6d4e50ed6193b0e7f37c52076af44eff
+EBUILD syslog-ng-3.30.1.ebuild 4837 BLAKE2B d58b8f79ac4f99867cc6b1bd4774a95f4dc1c9d91c68b87bec0719dc55d9741e2475f7deca471f908627c5bc914ad30c006c31d3e8ff87ecaf43bd1a66ce536a SHA512 eff8014d2f648e799ee0b090cd24d82ad610b022d1eb023de5d4f19b0f8138ee7b2993a2d067486ab7a532fed474288da1c413562ced38c32f3981886813cad2
 MISC metadata.xml 1282 BLAKE2B ddf01d9efaf2b8ad6aacbbb5a27299f14a5bd2656139960b61fb8855286c23a1a736ad4d543d16bfe50d277d20cce51249f572d3bbb428060a07c23ab78d90fd SHA512 7eeeb124214ae491905e42d726d2d167168425a66eb59802c9bb364f3a14337d0732afbb6cde7254a49e259573ca6eb5ced4dd737718d6a0bab450f7f3498964
diff --git a/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild b/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild
index 8b2aa9a1ce37..c720da246944 100644
--- a/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="amqp caps dbi geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
+IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
@@ -38,8 +38,7 @@ RDEPEND="
 	spoof-source? ( net-libs/libnet:1.1= )
 	systemd? ( sys-apps/systemd:= )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
+	dev-libs/openssl:0="
 DEPEND="${RDEPEND}
 	test? ( dev-libs/criterion )"
 BDEPEND="
diff --git a/app-admin/syslog-ng/syslog-ng-3.28.1-r2.ebuild b/app-admin/syslog-ng/syslog-ng-3.28.1-r2.ebuild
index a9abc617c791..80e2a64e5b52 100644
--- a/app-admin/syslog-ng/syslog-ng-3.28.1-r2.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.28.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="amqp caps dbi geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
+IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
@@ -38,8 +38,7 @@ RDEPEND="
 	spoof-source? ( net-libs/libnet:1.1= )
 	systemd? ( sys-apps/systemd:= )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
+	dev-libs/openssl:0="
 DEPEND="${RDEPEND}
 	test? ( dev-libs/criterion )"
 BDEPEND="
diff --git a/app-admin/syslog-ng/syslog-ng-3.29.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.29.1.ebuild
index a9abc617c791..80e2a64e5b52 100644
--- a/app-admin/syslog-ng/syslog-ng-3.29.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.29.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="amqp caps dbi geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
+IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
@@ -38,8 +38,7 @@ RDEPEND="
 	spoof-source? ( net-libs/libnet:1.1= )
 	systemd? ( sys-apps/systemd:= )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
+	dev-libs/openssl:0="
 DEPEND="${RDEPEND}
 	test? ( dev-libs/criterion )"
 BDEPEND="
diff --git a/app-admin/syslog-ng/syslog-ng-3.30.1-r1.ebuild b/app-admin/syslog-ng/syslog-ng-3.30.1-r1.ebuild
index 361c5df0c238..2c85e035f7e0 100644
--- a/app-admin/syslog-ng/syslog-ng-3.30.1-r1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.30.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="amqp caps dbi geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
+IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
@@ -38,8 +38,7 @@ RDEPEND="
 	spoof-source? ( net-libs/libnet:1.1= )
 	systemd? ( sys-apps/systemd:= )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
+	dev-libs/openssl:0="
 DEPEND="${RDEPEND}
 	test? ( dev-libs/criterion )"
 BDEPEND="
diff --git a/app-admin/syslog-ng/syslog-ng-3.30.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.30.1.ebuild
index 5e856a4f909b..32c3408b5c8e 100644
--- a/app-admin/syslog-ng/syslog-ng-3.30.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.30.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="amqp caps dbi geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
+IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
@@ -38,8 +38,7 @@ RDEPEND="
 	spoof-source? ( net-libs/libnet:1.1= )
 	systemd? ( sys-apps/systemd:= )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
+	dev-libs/openssl:0="
 DEPEND="${RDEPEND}
 	test? ( dev-libs/criterion )"
 BDEPEND="
diff --git a/app-admin/terraform/Manifest b/app-admin/terraform/Manifest
index 8e60fd4072d6..341a62ffc556 100644
--- a/app-admin/terraform/Manifest
+++ b/app-admin/terraform/Manifest
@@ -360,6 +360,8 @@ DIST github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.3.0.mod 502 BLAKE2B 8e1ba66012
 DIST github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.3.0.zip 117001 BLAKE2B 756f2a794f142e8a945bd9e2bb82290c2139df4d03357a7afae87c5494865848c3784204b24989d383bab5daf67b1ad9b94ccafb345d89063b8c5a102d2c9901 SHA512 2720f3712371327a88ec167dbb8095d5a69d3434b4d0c479357f637418f2e1754d088ef2d6f3fd77fe0038551dd5379202d253c1964976dce1791e11a560ec0d
 DIST github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.4.0.mod 475 BLAKE2B 9334c7016ebfc52aea6b30713d62098648c4c54cd1d06c108381c7b442af4e49833dbb75b19752ef6af2a3c83dbeeb8776d75e1832da9b854e56cd683bd19ac6 SHA512 f486f7253f45b358b44a94b9d769b62c9922b28dd4d1c8482f93ef0c91e98a8daa5e7505b98d933146b3d1191c2e5fc94d533574368dc19bd4a9e4c131b38d65
 DIST github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.4.0.zip 117916 BLAKE2B e5e0fd48352446542ef627548eaa150f5539a5793a129499a43aae79559317cbacbb0368a5788c3be93b865eccea1f4632d85cbb1a7fc902d2c96c5a91bb836c SHA512 67df1cfea24a169ed802cde13bba4495bd55a1e2c8c5b6d8223e98c003d7dec9aa60f381934e6884c211a1379171a7e83644a7cceb00c899023b08dbba163e17
+DIST github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.4.1.mod 475 BLAKE2B 9334c7016ebfc52aea6b30713d62098648c4c54cd1d06c108381c7b442af4e49833dbb75b19752ef6af2a3c83dbeeb8776d75e1832da9b854e56cd683bd19ac6 SHA512 f486f7253f45b358b44a94b9d769b62c9922b28dd4d1c8482f93ef0c91e98a8daa5e7505b98d933146b3d1191c2e5fc94d533574368dc19bd4a9e4c131b38d65
+DIST github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.4.1.zip 118035 BLAKE2B d0dd514a82e18d723d48c8b60975b4c4caaab375a5a67068bc5f8194061802b8c383b4900ea0758af547dd2acfda084225d23b1c78665ae570edddbb62b89742 SHA512 d29592de89cc2acaa6115f9f091082a1d69f2237d905406ad3518e68c882c1aed2b65cdeca5dcaf97a85e53bdfc3be4bf62dfaddba9765fd59aa668d17d381e8
 DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.2.mod 95 BLAKE2B 66af3c20daaa7307f453ab70f7f8db429de6202fef7ad27c4c54f6a37d5c06c253df6ea24ed2315fa8208107187615b7e5d7a5aeae2cd1fcfd3be407e8f67fe7 SHA512 472addc2b61db4d72d356e2033b0963352d5baed7e2c28a567ec4f4f8a4cdf199d50de2022d136f9ef85ee5e0329c2e4b9a6797e4ef07e348fe7976aec56088b
 DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.2.zip 17464 BLAKE2B 73165072089e8102868ccbdb428c73409c21f793b1ddd1d8b19335b6da1d938e308dfafff8053257c3a81f7d3de3f5c41e3e642dda7996f76b81877c5945d2a0 SHA512 965ff35de08e6050c4e7efa7aabb110a309663f3933e7c236cfc958579783f99314b3c91cc2434bc3381f4909a1577d644f9a064140ea7509dd891a0adca67e4
 DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod 89 BLAKE2B 9e53a988f41eb9425cc2fe3051c0bbe67c65208e6988ae1b455450183c225739b540edb0e59cdd8d010c34e89c4e4acb70687c2bcb861d379443a5c36e261458 SHA512 3446ae69871561766d2b70963eccaf443edafd9328f0f58a97630fde61fa746e59d26ee5d833548a92711555656aa9c1f44bb9e241aa87e21f4424a1f10fbe1a
@@ -652,6 +654,8 @@ DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.8.0.mod 207 BLAKE2B c6fa7bea22c9783
 DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.8.0.zip 259753 BLAKE2B 84d49096f09de3d1d4e83608027e50d81d6014eb9d449f68c78e72f22830c4645f7445af9afbd4dadbeb3767db069a669d879d20482240f27f2b7855c0528377 SHA512 556e118b2e75e16d05123d1058447ea702284d71765ea01bf1ae0734a3a31292e2955cc3553daef26ad485c30090c5f82764417e2ef47f9887ea5782046e821b
 DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.8.1.mod 207 BLAKE2B c6fa7bea22c978311fb4a7bc92da56725efee8c4055a63df58f09cca207fd82551b2108754a0ebb9e300bd4d05aab29ddc51f63c63df296690a3f213e9acf5df SHA512 fa73ed9738f477f22319d9ce7be0f655caeac3164097632425c8480facd0e50a385823093d490d795be61367c92afb8181b7c192ff94d07398874df8677eec7e
 DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.8.1.zip 263752 BLAKE2B 1a480ed516da3173535ffe33747496111e790fcd49657721a6b3fa2dd5c907ab60836fbc1179ed9298eded305b142ff8d7b83b15944108cbe00b66975c7d735d SHA512 e9f5763670f708bfcc6d45f4da86f0c560dd36baae2cc1d8b8376d18fcae61ccb5c1a4f28ed8fab09e4c07421fa1f493175f73c25e638da85955c68c8b7e5ca9
+DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.8.2.mod 207 BLAKE2B c6fa7bea22c978311fb4a7bc92da56725efee8c4055a63df58f09cca207fd82551b2108754a0ebb9e300bd4d05aab29ddc51f63c63df296690a3f213e9acf5df SHA512 fa73ed9738f477f22319d9ce7be0f655caeac3164097632425c8480facd0e50a385823093d490d795be61367c92afb8181b7c192ff94d07398874df8677eec7e
+DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.8.2.zip 268836 BLAKE2B 8838c6632a05d08652a940f0d00367ff6b4d1445e55f0cb0e201b4ae49fa4b7ebe1d82b71a6ae8fe57575f40e2207bb46b5bedbbd7a72154f0dfaae5d08b5ccc SHA512 681321e684bf8f8f61ff047a76346d7ebcad2c6cc91b598dc10aca68566fd1d802f56a16d0e4dceec5210b51e16dc30fc839d824038db6d05caf88fedb991ba7
 DIST github.com%2Fzclconf%2Fgo-cty-debug%2F@v%2Fv0.0.0-20191215020915-b22d67c1ba0b.mod 128 BLAKE2B 8aaf551c3afef3baeb7382d33ae0c2467b31bb567b5131d5b0302175b94d2d70a1390eb3f51c4cb7ee4357eb84142bb85c4306e210a9150b828971e3f93d5ac8 SHA512 1695d6effa440673a8c8a6f64b8931c8d6ff3401c4a8020bcb8f899dd6498951cd8fef233fe353e3d32cd59f5db7e3085839f67a5d142e0d3fc0e7772d64c799
 DIST github.com%2Fzclconf%2Fgo-cty-debug%2F@v%2Fv0.0.0-20191215020915-b22d67c1ba0b.zip 11821 BLAKE2B 49f42fbdf99c028d1d8be23c5649652509ea302aa05708552e891557c11d9716b864804cc1234ec785c383c03e435b077b80b105172c766f7df4dea56a507ebd SHA512 8cc0a553b7bb7a8d3d08f23ac1531e4f6458c96d84aa2816722304410c6e977f5150603f58f0d4865664fa10d0159f434a160cc674896b1329fc765ef5bf24da
 DIST github.com%2Fzclconf%2Fgo-cty-yaml%2F@v%2Fv1.0.2.mod 80 BLAKE2B 792b829d635e212603aa59faf482b301b95e5465e5544f28fd3810393bd270001fee6679a08567963e366d01e0f1fc9e8da9db5727669b6fe262f9d0f2db1431 SHA512 52f4cda625bf8ceda19e65dee204e30b1ceaa68b0a0815e925b22d41a02fce6b44e9e73b6d1e957c7826257dfecfe3d17b5c46da5668384957eb6b723e8024fc
@@ -1054,6 +1058,7 @@ DIST terraform-0.14.7.tar.gz 2799398 BLAKE2B 3ac38808a1e9452756514ff7020d9a8f225
 DIST terraform-0.14.8.tar.gz 2800767 BLAKE2B 105abf564c24bd2eafdcbef3efef1558886333e37f162a1d85cae700a844706177b0e13b5682aeafe5c1bf265efc63c68116fad476a2705290cac3bba9aeaf58 SHA512 e83675371f3181fa0c868c3536241edb3c930eaf6c5de32f456d16c15881bd5d2c6b727c0ce655a311f5609f935431026dd8e332ed448eb4b3566bcc60846645
 DIST terraform-0.14.9.tar.gz 2800597 BLAKE2B fa3679c68164ce0e14938460ee60c58cd85c27120619b5945459851b053aeb60f4c0dcf4c0d00f3b1d4a7805a84bc9b31ba16e30a10b193f7e37cde5b066ae46 SHA512 224cec89180322902a3ff95bb1de5af7ecf351889fdc99ddc5c574bf9f61e7f3b9ba3eead870239fa4f977c6c337a322bbc2260af301295bad7b2d2fb28a0da1
 DIST terraform-0.15.0.tar.gz 2805779 BLAKE2B 5edd00b5cc2daa1fdbf31d14056b356bceaca107f628ba272b86026dea54b98dc061e6497c855e620a160d8a07a3a3cefeeb29c1933d85446b8a531aea39cb79 SHA512 13b858959d2ceee785eb046eadd65063c7dd4e96e1c70fc58e8446c40f321c38118fa1cdb153d938b432633a035f3876f169bfc01f566283b422b51a5df5d36c
+DIST terraform-0.15.1.tar.gz 2817442 BLAKE2B 04cf7864bd4e55a5277dc973cd2c90f5b8674046b6e02691e17c3db2639b3429a8c36f7d8ff7a6d0b1d33173a1dc004e7854668d7eb56ef2fa8ffc9428bae07b SHA512 be077a68df57ea1413acab3b7fdbdb39e0890856c4c4c54f38cc09e51e46f3738e8db46f5e5ff6a60ba515a42a0db9e9992df83567ec111a5870485cda562957
 EBUILD terraform-0.14.10.ebuild 52143 BLAKE2B 5d552e6b9ff5a33dd9fcfd71edd48195cc29bec05be0311e86981a4f31e386873a05497d2f8b0ac62d926afa0455ad49a8c68e1209c4863faf58e0bd4c674baa SHA512 96c6297b95e278694db0f4b5def737e7a1547149bac3dbfc5c3a91081e2b78070b833689bd402fade29bb80067e64857c905982eb5b29e27b8b43d48d71685ba
 EBUILD terraform-0.14.5.ebuild 53050 BLAKE2B c60224261df05577b6b4a91bd4c002fe2fe8a00453fa7dd31c40f5192b49a3dbf44d63c22d77ca2d4d7caf3363227c08eb50faecb82e6edd47565d7093788e2d SHA512 4d3fd5634be431d347a2866a1fde0c4a58c8472dd1caba985240d83d74415ad43ee1266f4a46cabf55de5175f4c5769af08429ffeb9bfae3970522a4ead77c57
 EBUILD terraform-0.14.6.ebuild 52031 BLAKE2B 58857d47be3a8633e4154a0bc4956efbacb1ddf8d2473181dc77363ea4f369f54e9126f4ece8a53b2c0bc2837df0d8c222c2d777225f04254ab15803f06040d5 SHA512 6a01b423ed0adbb61fff24bde0602d85a5d3f92751b61e9d6d4da2081804a022aec7e12931083c67f1c6c98654a80f7941cf941aecfd897466e36290a7c46099
@@ -1061,4 +1066,5 @@ EBUILD terraform-0.14.7.ebuild 52031 BLAKE2B 58857d47be3a8633e4154a0bc4956efbacb
 EBUILD terraform-0.14.8.ebuild 52143 BLAKE2B 5d552e6b9ff5a33dd9fcfd71edd48195cc29bec05be0311e86981a4f31e386873a05497d2f8b0ac62d926afa0455ad49a8c68e1209c4863faf58e0bd4c674baa SHA512 96c6297b95e278694db0f4b5def737e7a1547149bac3dbfc5c3a91081e2b78070b833689bd402fade29bb80067e64857c905982eb5b29e27b8b43d48d71685ba
 EBUILD terraform-0.14.9.ebuild 52143 BLAKE2B 5d552e6b9ff5a33dd9fcfd71edd48195cc29bec05be0311e86981a4f31e386873a05497d2f8b0ac62d926afa0455ad49a8c68e1209c4863faf58e0bd4c674baa SHA512 96c6297b95e278694db0f4b5def737e7a1547149bac3dbfc5c3a91081e2b78070b833689bd402fade29bb80067e64857c905982eb5b29e27b8b43d48d71685ba
 EBUILD terraform-0.15.0.ebuild 54827 BLAKE2B 3c4a8cdac3b24d71155c806a6aa7932185ab047249f002d1d823f36e23bbc7f1181b7e6783c07d14b273bdd725be537da7dfe9e69d0f2cfc3b6e30aa20da91ae SHA512 a218f1947b348dcd657868156d7464f22c764b54e94c98527c64680870234bd5342da668a6f32f59c6dce2e10b81e3e9ba0c23816ecfae5b96f028d26aab920e
+EBUILD terraform-0.15.1.ebuild 54906 BLAKE2B 690f0f92854a0ce71ca5bb6a81e0c9a888252379ae7eb2d85603dfc46432346d3e2c0f3cc2dd3646fed3f648a0b47386aff2715e3601e3e4e318f818eac95df5 SHA512 4bde8818fa8d88dce5b13daa033758c71c432d2ecfda42e75fc77bca53e6b09cca45d6283093d20f776c97f49b0531344d780d14cf81610e6a50b732473f77a3
 MISC metadata.xml 1074 BLAKE2B f14c6ede900b616f5a5514adc9735d25fa834dc879712ab79b68fe15a927cb3e8e77a7b30ee8af3b44551be9ec2368476757c4ec5e5b44fcd266367b485fc8bc SHA512 2e28b3de2b512246ddfb76b547151683c4202620992f9453747b4869db1a16d92996cbf810bf82f09e6895ddc7b23ecc2e0ecaf43d9c3ba9e8a2fb53baa995dc
diff --git a/app-admin/terraform/terraform-0.15.1.ebuild b/app-admin/terraform/terraform-0.15.1.ebuild
new file mode 100644
index 000000000000..e12f68f48589
--- /dev/null
+++ b/app-admin/terraform/terraform-0.15.1.ebuild
@@ -0,0 +1,1013 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+EGO_SUM=(
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.38.0/go.mod"
+	"cloud.google.com/go v0.44.1/go.mod"
+	"cloud.google.com/go v0.44.2/go.mod"
+	"cloud.google.com/go v0.45.1/go.mod"
+	"cloud.google.com/go v0.46.3/go.mod"
+	"cloud.google.com/go v0.50.0/go.mod"
+	"cloud.google.com/go v0.52.0/go.mod"
+	"cloud.google.com/go v0.53.0/go.mod"
+	"cloud.google.com/go v0.54.0/go.mod"
+	"cloud.google.com/go v0.56.0/go.mod"
+	"cloud.google.com/go v0.57.0/go.mod"
+	"cloud.google.com/go v0.62.0/go.mod"
+	"cloud.google.com/go v0.65.0"
+	"cloud.google.com/go v0.65.0/go.mod"
+	"cloud.google.com/go/bigquery v1.0.1/go.mod"
+	"cloud.google.com/go/bigquery v1.3.0/go.mod"
+	"cloud.google.com/go/bigquery v1.4.0/go.mod"
+	"cloud.google.com/go/bigquery v1.5.0/go.mod"
+	"cloud.google.com/go/bigquery v1.7.0/go.mod"
+	"cloud.google.com/go/bigquery v1.8.0/go.mod"
+	"cloud.google.com/go/datastore v1.0.0/go.mod"
+	"cloud.google.com/go/datastore v1.1.0/go.mod"
+	"cloud.google.com/go/pubsub v1.0.1/go.mod"
+	"cloud.google.com/go/pubsub v1.1.0/go.mod"
+	"cloud.google.com/go/pubsub v1.2.0/go.mod"
+	"cloud.google.com/go/pubsub v1.3.1/go.mod"
+	"cloud.google.com/go/storage v1.0.0/go.mod"
+	"cloud.google.com/go/storage v1.5.0/go.mod"
+	"cloud.google.com/go/storage v1.6.0/go.mod"
+	"cloud.google.com/go/storage v1.8.0/go.mod"
+	"cloud.google.com/go/storage v1.10.0"
+	"cloud.google.com/go/storage v1.10.0/go.mod"
+	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+	"github.com/Azure/azure-sdk-for-go v45.0.0+incompatible/go.mod"
+	"github.com/Azure/azure-sdk-for-go v47.1.0+incompatible/go.mod"
+	"github.com/Azure/azure-sdk-for-go v51.2.0+incompatible/go.mod"
+	"github.com/Azure/azure-sdk-for-go v52.5.0+incompatible"
+	"github.com/Azure/azure-sdk-for-go v52.5.0+incompatible/go.mod"
+	"github.com/Azure/go-autorest v11.1.2+incompatible/go.mod"
+	"github.com/Azure/go-autorest v14.2.0+incompatible"
+	"github.com/Azure/go-autorest v14.2.0+incompatible/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.11.3/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.11.10/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.11.18"
+	"github.com/Azure/go-autorest/autorest v0.11.18/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.13"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.4.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.4.2"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.4.2/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.3.0"
+	"github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.4.1"
+	"github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod"
+	"github.com/Azure/go-autorest/autorest/to v0.4.0"
+	"github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/validation v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/validation v0.3.1"
+	"github.com/Azure/go-autorest/autorest/validation v0.3.1/go.mod"
+	"github.com/Azure/go-autorest/logger v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/logger v0.2.1"
+	"github.com/Azure/go-autorest/logger v0.2.1/go.mod"
+	"github.com/Azure/go-autorest/tracing v0.6.0"
+	"github.com/Azure/go-autorest/tracing v0.6.0/go.mod"
+	"github.com/Azure/go-ntlmssp v0.0.0-20180810175552-4a21cbd618b4/go.mod"
+	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c"
+	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+	"github.com/ChrisTrenkamp/goxpath v0.0.0-20170922090931-c385f95c6022/go.mod"
+	"github.com/ChrisTrenkamp/goxpath v0.0.0-20190607011252-c5096ec8773d"
+	"github.com/ChrisTrenkamp/goxpath v0.0.0-20190607011252-c5096ec8773d/go.mod"
+	"github.com/Masterminds/goutils v1.1.0"
+	"github.com/Masterminds/goutils v1.1.0/go.mod"
+	"github.com/Masterminds/semver v1.5.0"
+	"github.com/Masterminds/semver v1.5.0/go.mod"
+	"github.com/Masterminds/sprig v2.22.0+incompatible"
+	"github.com/Masterminds/sprig v2.22.0+incompatible/go.mod"
+	"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+	"github.com/PuerkitoBio/purell v1.0.0/go.mod"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
+	"github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod"
+	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
+	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
+	"github.com/agext/levenshtein v1.2.1/go.mod"
+	"github.com/agext/levenshtein v1.2.2"
+	"github.com/agext/levenshtein v1.2.2/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190329064014-6e358769c32a"
+	"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190329064014-6e358769c32a/go.mod"
+	"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190103054945-8205d1f41e70"
+	"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190103054945-8205d1f41e70/go.mod"
+	"github.com/aliyun/aliyun-tablestore-go-sdk v4.1.2+incompatible"
+	"github.com/aliyun/aliyun-tablestore-go-sdk v4.1.2+incompatible/go.mod"
+	"github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e"
+	"github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e/go.mod"
+	"github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0"
+	"github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0/go.mod"
+	"github.com/apparentlymart/go-cidr v1.1.0"
+	"github.com/apparentlymart/go-cidr v1.1.0/go.mod"
+	"github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod"
+	"github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0"
+	"github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0/go.mod"
+	"github.com/apparentlymart/go-shquot v0.0.1"
+	"github.com/apparentlymart/go-shquot v0.0.1/go.mod"
+	"github.com/apparentlymart/go-textseg v1.0.0"
+	"github.com/apparentlymart/go-textseg v1.0.0/go.mod"
+	"github.com/apparentlymart/go-textseg/v13 v13.0.0"
+	"github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod"
+	"github.com/apparentlymart/go-userdirs v0.0.0-20200915174352-b0c018a67c13"
+	"github.com/apparentlymart/go-userdirs v0.0.0-20200915174352-b0c018a67c13/go.mod"
+	"github.com/apparentlymart/go-versions v1.0.1"
+	"github.com/apparentlymart/go-versions v1.0.1/go.mod"
+	"github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2"
+	"github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2/go.mod"
+	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da"
+	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+	"github.com/armon/go-radix v1.0.0"
+	"github.com/armon/go-radix v1.0.0/go.mod"
+	"github.com/aws/aws-sdk-go v1.15.78/go.mod"
+	"github.com/aws/aws-sdk-go v1.31.9/go.mod"
+	"github.com/aws/aws-sdk-go v1.37.0"
+	"github.com/aws/aws-sdk-go v1.37.0/go.mod"
+	"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f"
+	"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d"
+	"github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod"
+	"github.com/bgentry/speakeasy v0.1.0"
+	"github.com/bgentry/speakeasy v0.1.0/go.mod"
+	"github.com/bmatcuk/doublestar v1.1.5"
+	"github.com/bmatcuk/doublestar v1.1.5/go.mod"
+	"github.com/boltdb/bolt v1.3.1"
+	"github.com/boltdb/bolt v1.3.1/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/cheggaaa/pb v1.0.27/go.mod"
+	"github.com/chzyer/logex v1.1.10"
+	"github.com/chzyer/logex v1.1.10/go.mod"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
+	"github.com/coreos/bbolt v1.3.0"
+	"github.com/coreos/bbolt v1.3.0/go.mod"
+	"github.com/coreos/etcd v3.3.10+incompatible"
+	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.2.0"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d"
+	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+	"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dimchansky/utfbom v1.1.0/go.mod"
+	"github.com/dimchansky/utfbom v1.1.1"
+	"github.com/dimchansky/utfbom v1.1.1/go.mod"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+	"github.com/dylanmei/iso8601 v0.1.0"
+	"github.com/dylanmei/iso8601 v0.1.0/go.mod"
+	"github.com/dylanmei/winrmtest v0.0.0-20190225150635-99b7fe2fddf1"
+	"github.com/dylanmei/winrmtest v0.0.0-20190225150635-99b7fe2fddf1/go.mod"
+	"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
+	"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+	"github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550/go.mod"
+	"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
+	"github.com/fatih/color v1.7.0"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/form3tech-oss/jwt-go v3.2.2+incompatible"
+	"github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
+	"github.com/ghodss/yaml v1.0.0"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod"
+	"github.com/go-kit/kit v0.8.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+	"github.com/go-logr/logr v0.1.0/go.mod"
+	"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
+	"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
+	"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
+	"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
+	"github.com/go-sql-driver/mysql v1.5.0/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/go-test/deep v1.0.1/go.mod"
+	"github.com/go-test/deep v1.0.3"
+	"github.com/go-test/deep v1.0.3/go.mod"
+	"github.com/gofrs/uuid v3.2.0+incompatible/go.mod"
+	"github.com/gofrs/uuid v3.3.0+incompatible"
+	"github.com/gofrs/uuid v3.3.0+incompatible/go.mod"
+	"github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d"
+	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+	"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
+	"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e"
+	"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/mock v1.3.1/go.mod"
+	"github.com/golang/mock v1.4.0/go.mod"
+	"github.com/golang/mock v1.4.1/go.mod"
+	"github.com/golang/mock v1.4.3/go.mod"
+	"github.com/golang/mock v1.4.4"
+	"github.com/golang/mock v1.4.4/go.mod"
+	"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
+	"github.com/golang/protobuf v1.1.0/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golang/protobuf v1.3.3/go.mod"
+	"github.com/golang/protobuf v1.3.4/go.mod"
+	"github.com/golang/protobuf v1.3.5/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+	"github.com/golang/protobuf v1.4.0/go.mod"
+	"github.com/golang/protobuf v1.4.1/go.mod"
+	"github.com/golang/protobuf v1.4.2/go.mod"
+	"github.com/golang/protobuf v1.4.3"
+	"github.com/golang/protobuf v1.4.3/go.mod"
+	"github.com/google/btree v0.0.0-20160524151835-7d79101e329e/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0"
+	"github.com/google/btree v1.0.0/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/go-cmp v0.4.1/go.mod"
+	"github.com/google/go-cmp v0.5.0/go.mod"
+	"github.com/google/go-cmp v0.5.1/go.mod"
+	"github.com/google/go-cmp v0.5.2"
+	"github.com/google/go-cmp v0.5.2/go.mod"
+	"github.com/google/go-querystring v1.0.0"
+	"github.com/google/go-querystring v1.0.0/go.mod"
+	"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
+	"github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod"
+	"github.com/google/gofuzz v1.0.0"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/martian/v3 v3.0.0"
+	"github.com/google/martian/v3 v3.0.0/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+	"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
+	"github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod"
+	"github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod"
+	"github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod"
+	"github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod"
+	"github.com/google/renameio v0.1.0/go.mod"
+	"github.com/google/uuid v1.0.0/go.mod"
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/google/uuid v1.1.2/go.mod"
+	"github.com/google/uuid v1.2.0"
+	"github.com/google/uuid v1.2.0/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.5"
+	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d"
+	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
+	"github.com/gophercloud/gophercloud v0.0.0-20190126172459-c818fa66e4c8/go.mod"
+	"github.com/gophercloud/gophercloud v0.6.1-0.20191122030953-d8ac278c1c9d/go.mod"
+	"github.com/gophercloud/gophercloud v0.10.1-0.20200424014253-c3bfe50899e5"
+	"github.com/gophercloud/gophercloud v0.10.1-0.20200424014253-c3bfe50899e5/go.mod"
+	"github.com/gophercloud/utils v0.0.0-20200423144003-7c72efc7435d"
+	"github.com/gophercloud/utils v0.0.0-20200423144003-7c72efc7435d/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gorilla/websocket v1.4.0"
+	"github.com/gorilla/websocket v1.4.0/go.mod"
+	"github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.8.5"
+	"github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod"
+	"github.com/hashicorp/aws-sdk-go-base v0.6.0"
+	"github.com/hashicorp/aws-sdk-go-base v0.6.0/go.mod"
+	"github.com/hashicorp/consul v0.0.0-20171026175957-610f3c86a089"
+	"github.com/hashicorp/consul v0.0.0-20171026175957-610f3c86a089/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/errwrap v1.1.0"
+	"github.com/hashicorp/errwrap v1.1.0/go.mod"
+	"github.com/hashicorp/go-azure-helpers v0.12.0/go.mod"
+	"github.com/hashicorp/go-azure-helpers v0.14.0"
+	"github.com/hashicorp/go-azure-helpers v0.14.0/go.mod"
+	"github.com/hashicorp/go-checkpoint v0.5.0"
+	"github.com/hashicorp/go-checkpoint v0.5.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.1"
+	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+	"github.com/hashicorp/go-getter v1.5.1"
+	"github.com/hashicorp/go-getter v1.5.1/go.mod"
+	"github.com/hashicorp/go-hclog v0.14.1/go.mod"
+	"github.com/hashicorp/go-hclog v0.15.0"
+	"github.com/hashicorp/go-hclog v0.15.0/go.mod"
+	"github.com/hashicorp/go-immutable-radix v0.0.0-20180129170900-7f3cd4390caa"
+	"github.com/hashicorp/go-immutable-radix v0.0.0-20180129170900-7f3cd4390caa/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.4"
+	"github.com/hashicorp/go-msgpack v0.5.4/go.mod"
+	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+	"github.com/hashicorp/go-multierror v1.1.1"
+	"github.com/hashicorp/go-multierror v1.1.1/go.mod"
+	"github.com/hashicorp/go-plugin v1.4.1"
+	"github.com/hashicorp/go-plugin v1.4.1/go.mod"
+	"github.com/hashicorp/go-retryablehttp v0.5.2"
+	"github.com/hashicorp/go-retryablehttp v0.5.2/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.0"
+	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+	"github.com/hashicorp/go-safetemp v1.0.0"
+	"github.com/hashicorp/go-safetemp v1.0.0/go.mod"
+	"github.com/hashicorp/go-slug v0.4.1"
+	"github.com/hashicorp/go-slug v0.4.1/go.mod"
+	"github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86"
+	"github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86/go.mod"
+	"github.com/hashicorp/go-tfe v0.8.1"
+	"github.com/hashicorp/go-tfe v0.8.1/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.1"
+	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+	"github.com/hashicorp/go-version v1.0.0/go.mod"
+	"github.com/hashicorp/go-version v1.1.0/go.mod"
+	"github.com/hashicorp/go-version v1.2.0/go.mod"
+	"github.com/hashicorp/go-version v1.2.1"
+	"github.com/hashicorp/go-version v1.2.1/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f"
+	"github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod"
+	"github.com/hashicorp/hcl/v2 v2.0.0/go.mod"
+	"github.com/hashicorp/hcl/v2 v2.9.1"
+	"github.com/hashicorp/hcl/v2 v2.9.1/go.mod"
+	"github.com/hashicorp/memberlist v0.1.0"
+	"github.com/hashicorp/memberlist v0.1.0/go.mod"
+	"github.com/hashicorp/serf v0.0.0-20160124182025-e4ec8cc423bb"
+	"github.com/hashicorp/serf v0.0.0-20160124182025-e4ec8cc423bb/go.mod"
+	"github.com/hashicorp/terraform-config-inspect v0.0.0-20210209133302-4fd17a0faac2"
+	"github.com/hashicorp/terraform-config-inspect v0.0.0-20210209133302-4fd17a0faac2/go.mod"
+	"github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734"
+	"github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734/go.mod"
+	"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
+	"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d"
+	"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/huandu/xstrings v1.3.2"
+	"github.com/huandu/xstrings v1.3.2/go.mod"
+	"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
+	"github.com/imdario/mergo v0.3.5/go.mod"
+	"github.com/imdario/mergo v0.3.11"
+	"github.com/imdario/mergo v0.3.11/go.mod"
+	"github.com/jhump/protoreflect v1.6.0"
+	"github.com/jhump/protoreflect v1.6.0/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod"
+	"github.com/jmespath/go-jmespath v0.3.0/go.mod"
+	"github.com/jmespath/go-jmespath v0.4.0"
+	"github.com/jmespath/go-jmespath v0.4.0/go.mod"
+	"github.com/jmespath/go-jmespath/internal/testify v1.5.1"
+	"github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/joyent/triton-go v0.0.0-20180313100802-d8f9c0314926"
+	"github.com/joyent/triton-go v0.0.0-20180313100802-d8f9c0314926/go.mod"
+	"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
+	"github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod"
+	"github.com/json-iterator/go v1.1.7"
+	"github.com/json-iterator/go v1.1.7/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/jstemmer/go-junit-report v0.9.1"
+	"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+	"github.com/jtolds/gls v4.2.1+incompatible"
+	"github.com/jtolds/gls v4.2.1+incompatible/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0"
+	"github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod"
+	"github.com/kisielk/errcheck v1.2.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.1.0"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod"
+	"github.com/kylelemons/godebug v1.1.0"
+	"github.com/kylelemons/godebug v1.1.0/go.mod"
+	"github.com/lib/pq v1.8.0"
+	"github.com/lib/pq v1.8.0/go.mod"
+	"github.com/likexian/gokit v0.0.0-20190309162924-0a377eecf7aa/go.mod"
+	"github.com/likexian/gokit v0.0.0-20190418170008-ace88ad0983b/go.mod"
+	"github.com/likexian/gokit v0.0.0-20190501133040-e77ea8b19cdc/go.mod"
+	"github.com/likexian/gokit v0.20.15"
+	"github.com/likexian/gokit v0.20.15/go.mod"
+	"github.com/likexian/simplejson-go v0.0.0-20190409170913-40473a74d76d/go.mod"
+	"github.com/likexian/simplejson-go v0.0.0-20190419151922-c1f9f0b4f084/go.mod"
+	"github.com/likexian/simplejson-go v0.0.0-20190502021454-d8787b4bfa0b/go.mod"
+	"github.com/lusis/go-artifactory v0.0.0-20160115162124-7e4ce345df82"
+	"github.com/lusis/go-artifactory v0.0.0-20160115162124-7e4ce345df82/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
+	"github.com/masterzen/simplexml v0.0.0-20160608183007-4572e39b1ab9/go.mod"
+	"github.com/masterzen/simplexml v0.0.0-20190410153822-31eea3082786"
+	"github.com/masterzen/simplexml v0.0.0-20190410153822-31eea3082786/go.mod"
+	"github.com/masterzen/winrm v0.0.0-20200615185753-c42b5136ff88"
+	"github.com/masterzen/winrm v0.0.0-20200615185753-c42b5136ff88/go.mod"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-colorable v0.1.4"
+	"github.com/mattn/go-colorable v0.1.4/go.mod"
+	"github.com/mattn/go-isatty v0.0.3/go.mod"
+	"github.com/mattn/go-isatty v0.0.4/go.mod"
+	"github.com/mattn/go-isatty v0.0.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.10/go.mod"
+	"github.com/mattn/go-isatty v0.0.12"
+	"github.com/mattn/go-isatty v0.0.12/go.mod"
+	"github.com/mattn/go-runewidth v0.0.4/go.mod"
+	"github.com/mattn/go-shellwords v1.0.4"
+	"github.com/mattn/go-shellwords v1.0.4/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/miekg/dns v1.0.8"
+	"github.com/miekg/dns v1.0.8/go.mod"
+	"github.com/mitchellh/cli v1.1.2"
+	"github.com/mitchellh/cli v1.1.2/go.mod"
+	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db"
+	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod"
+	"github.com/mitchellh/copystructure v1.0.0"
+	"github.com/mitchellh/copystructure v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-linereader v0.0.0-20190213213312-1b945b3263eb"
+	"github.com/mitchellh/go-linereader v0.0.0-20190213213312-1b945b3263eb/go.mod"
+	"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.0.0"
+	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+	"github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod"
+	"github.com/mitchellh/go-wordwrap v1.0.0"
+	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+	"github.com/mitchellh/gox v1.0.1"
+	"github.com/mitchellh/gox v1.0.1/go.mod"
+	"github.com/mitchellh/iochan v1.0.0"
+	"github.com/mitchellh/iochan v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/mitchellh/panicwrap v1.0.0"
+	"github.com/mitchellh/panicwrap v1.0.0/go.mod"
+	"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
+	"github.com/mitchellh/reflectwalk v1.0.1"
+	"github.com/mitchellh/reflectwalk v1.0.1/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/mozillazg/go-httpheader v0.2.1"
+	"github.com/mozillazg/go-httpheader v0.2.1/go.mod"
+	"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+	"github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d"
+	"github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod"
+	"github.com/oklog/run v1.0.0"
+	"github.com/oklog/run v1.0.0/go.mod"
+	"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+	"github.com/onsi/ginkgo v1.6.0/go.mod"
+	"github.com/onsi/ginkgo v1.8.0/go.mod"
+	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+	"github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3/go.mod"
+	"github.com/onsi/gomega v1.5.0/go.mod"
+	"github.com/packer-community/winrmcp v0.0.0-20180921211025-c76d91c1e7db"
+	"github.com/packer-community/winrmcp v0.0.0-20180921211025-c76d91c1e7db/go.mod"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+	"github.com/pkg/browser v0.0.0-20201207095918-0426ae3fba23"
+	"github.com/pkg/browser v0.0.0-20201207095918-0426ae3fba23/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.9.1"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/posener/complete v1.1.1/go.mod"
+	"github.com/posener/complete v1.2.1"
+	"github.com/posener/complete v1.2.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829"
+	"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/prometheus/common v0.2.0"
+	"github.com/prometheus/common v0.2.0/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1"
+	"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+	"github.com/satori/go.uuid v1.2.0"
+	"github.com/satori/go.uuid v1.2.0/go.mod"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+	"github.com/sergi/go-diff v1.0.0"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/sirupsen/logrus v1.2.0"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a"
+	"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod"
+	"github.com/soheilhy/cmux v0.1.4"
+	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/spf13/afero v1.2.2"
+	"github.com/spf13/afero v1.2.2/go.mod"
+	"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+	"github.com/spf13/pflag v1.0.1/go.mod"
+	"github.com/spf13/pflag v1.0.2/go.mod"
+	"github.com/spf13/pflag v1.0.3"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/stretchr/testify v1.6.1"
+	"github.com/stretchr/testify v1.6.1/go.mod"
+	"github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d"
+	"github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d/go.mod"
+	"github.com/tencentcloud/tencentcloud-sdk-go v3.0.82+incompatible"
+	"github.com/tencentcloud/tencentcloud-sdk-go v3.0.82+incompatible/go.mod"
+	"github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20190808065407-f07404cefc8c"
+	"github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20190808065407-f07404cefc8c/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6/go.mod"
+	"github.com/tombuildsstuff/giovanni v0.15.1"
+	"github.com/tombuildsstuff/giovanni v0.15.1/go.mod"
+	"github.com/ugorji/go v0.0.0-20180813092308-00b869d2f4a5"
+	"github.com/ugorji/go v0.0.0-20180813092308-00b869d2f4a5/go.mod"
+	"github.com/ulikunitz/xz v0.5.8"
+	"github.com/ulikunitz/xz v0.5.8/go.mod"
+	"github.com/vmihailenco/msgpack v3.3.3+incompatible"
+	"github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod"
+	"github.com/vmihailenco/msgpack/v4 v4.3.12"
+	"github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod"
+	"github.com/vmihailenco/tagparser v0.1.1"
+	"github.com/vmihailenco/tagparser v0.1.1/go.mod"
+	"github.com/xanzy/ssh-agent v0.2.1"
+	"github.com/xanzy/ssh-agent v0.2.1/go.mod"
+	"github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18"
+	"github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod"
+	"github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557"
+	"github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557/go.mod"
+	"github.com/yuin/goldmark v1.1.25/go.mod"
+	"github.com/yuin/goldmark v1.1.27/go.mod"
+	"github.com/yuin/goldmark v1.1.32/go.mod"
+	"github.com/yuin/goldmark v1.2.1/go.mod"
+	"github.com/zclconf/go-cty v1.0.0/go.mod"
+	"github.com/zclconf/go-cty v1.1.0/go.mod"
+	"github.com/zclconf/go-cty v1.2.0/go.mod"
+	"github.com/zclconf/go-cty v1.8.0/go.mod"
+	"github.com/zclconf/go-cty v1.8.1"
+	"github.com/zclconf/go-cty v1.8.1/go.mod"
+	"github.com/zclconf/go-cty v1.8.2"
+	"github.com/zclconf/go-cty v1.8.2/go.mod"
+	"github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b"
+	"github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod"
+	"github.com/zclconf/go-cty-yaml v1.0.2"
+	"github.com/zclconf/go-cty-yaml v1.0.2/go.mod"
+	"go.opencensus.io v0.21.0/go.mod"
+	"go.opencensus.io v0.22.0/go.mod"
+	"go.opencensus.io v0.22.2/go.mod"
+	"go.opencensus.io v0.22.3/go.mod"
+	"go.opencensus.io v0.22.4"
+	"go.opencensus.io v0.22.4/go.mod"
+	"go.uber.org/atomic v1.3.2"
+	"go.uber.org/atomic v1.3.2/go.mod"
+	"go.uber.org/multierr v1.1.0"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/zap v1.9.1"
+	"go.uber.org/zap v1.9.1/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-20181025213731-e84da0312774/go.mod"
+	"golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190222235706-ffb98f73852f/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod"
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+	"golang.org/x/crypto v0.0.0-20191202143827-86a70503ff7e/go.mod"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+	"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod"
+	"golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod"
+	"golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod"
+	"golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod"
+	"golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2"
+	"golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
+	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+	"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
+	"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
+	"golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod"
+	"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
+	"golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod"
+	"golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod"
+	"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod"
+	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+	"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
+	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+	"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+	"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
+	"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
+	"golang.org/x/lint v0.0.0-20200302205851-738671d3881b"
+	"golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod"
+	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+	"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
+	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+	"golang.org/x/mod v0.1.0/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod"
+	"golang.org/x/mod v0.2.0/go.mod"
+	"golang.org/x/mod v0.3.0"
+	"golang.org/x/mod v0.3.0/go.mod"
+	"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
+	"golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod"
+	"golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod"
+	"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
+	"golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod"
+	"golang.org/x/net v0.0.0-20191009170851-d66e71096ffb/go.mod"
+	"golang.org/x/net v0.0.0-20191126235420-ef20fe5d7933/go.mod"
+	"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
+	"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+	"golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod"
+	"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+	"golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod"
+	"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
+	"golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod"
+	"golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod"
+	"golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod"
+	"golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod"
+	"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+	"golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod"
+	"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
+	"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod"
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110"
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43"
+	"golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
+	"golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod"
+	"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
+	"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod"
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82/go.mod"
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+	"golang.org/x/sys v0.0.0-20190509141414-a5b02f93d862/go.mod"
+	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+	"golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod"
+	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+	"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
+	"golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod"
+	"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/go.mod"
+	"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+	"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
+	"golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+	"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+	"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod"
+	"golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod"
+	"golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod"
+	"golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod"
+	"golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod"
+	"golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod"
+	"golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod"
+	"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
+	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68"
+	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+	"golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf"
+	"golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod"
+	"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
+	"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/text v0.3.5"
+	"golang.org/x/text v0.3.5/go.mod"
+	"golang.org/x/time v0.0.0-20161028155119-f51c12702a4d/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
+	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+	"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
+	"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
+	"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
+	"golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod"
+	"golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod"
+	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+	"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
+	"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
+	"golang.org/x/tools v0.0.0-20191203134012-c197fd4bf371/go.mod"
+	"golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod"
+	"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
+	"golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod"
+	"golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod"
+	"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod"
+	"golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod"
+	"golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod"
+	"golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod"
+	"golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod"
+	"golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod"
+	"golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod"
+	"golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod"
+	"golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod"
+	"golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod"
+	"golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod"
+	"golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod"
+	"golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod"
+	"golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod"
+	"golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod"
+	"golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod"
+	"golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod"
+	"golang.org/x/tools v0.0.0-20201028111035-eafbe7b904eb"
+	"golang.org/x/tools v0.0.0-20201028111035-eafbe7b904eb/go.mod"
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/api v0.7.0/go.mod"
+	"google.golang.org/api v0.8.0/go.mod"
+	"google.golang.org/api v0.9.0/go.mod"
+	"google.golang.org/api v0.13.0/go.mod"
+	"google.golang.org/api v0.14.0/go.mod"
+	"google.golang.org/api v0.15.0/go.mod"
+	"google.golang.org/api v0.17.0/go.mod"
+	"google.golang.org/api v0.18.0/go.mod"
+	"google.golang.org/api v0.19.0/go.mod"
+	"google.golang.org/api v0.20.0/go.mod"
+	"google.golang.org/api v0.22.0/go.mod"
+	"google.golang.org/api v0.24.0/go.mod"
+	"google.golang.org/api v0.28.0/go.mod"
+	"google.golang.org/api v0.29.0/go.mod"
+	"google.golang.org/api v0.30.0/go.mod"
+	"google.golang.org/api v0.34.0"
+	"google.golang.org/api v0.34.0/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/appengine v1.5.0/go.mod"
+	"google.golang.org/appengine v1.6.1/go.mod"
+	"google.golang.org/appengine v1.6.5/go.mod"
+	"google.golang.org/appengine v1.6.6"
+	"google.golang.org/appengine v1.6.6/go.mod"
+	"google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
+	"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
+	"google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod"
+	"google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod"
+	"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
+	"google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod"
+	"google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod"
+	"google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod"
+	"google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod"
+	"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
+	"google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod"
+	"google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod"
+	"google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod"
+	"google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod"
+	"google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod"
+	"google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod"
+	"google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod"
+	"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
+	"google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod"
+	"google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod"
+	"google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod"
+	"google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod"
+	"google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d"
+	"google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod"
+	"google.golang.org/grpc v1.8.0/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.1/go.mod"
+	"google.golang.org/grpc v1.21.1/go.mod"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.25.1/go.mod"
+	"google.golang.org/grpc v1.26.0/go.mod"
+	"google.golang.org/grpc v1.27.0/go.mod"
+	"google.golang.org/grpc v1.27.1"
+	"google.golang.org/grpc v1.27.1/go.mod"
+	"google.golang.org/grpc v1.28.0/go.mod"
+	"google.golang.org/grpc v1.29.1/go.mod"
+	"google.golang.org/grpc v1.30.0/go.mod"
+	"google.golang.org/grpc v1.31.0/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+	"google.golang.org/protobuf v1.21.0/go.mod"
+	"google.golang.org/protobuf v1.22.0/go.mod"
+	"google.golang.org/protobuf v1.23.0/go.mod"
+	"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
+	"google.golang.org/protobuf v1.24.0/go.mod"
+	"google.golang.org/protobuf v1.25.0"
+	"google.golang.org/protobuf v1.25.0/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod"
+	"gopkg.in/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/inf.v0 v0.9.0"
+	"gopkg.in/inf.v0 v0.9.0/go.mod"
+	"gopkg.in/ini.v1 v1.42.0"
+	"gopkg.in/ini.v1 v1.42.0/go.mod"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"gopkg.in/yaml.v2 v2.2.7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	"gopkg.in/yaml.v2 v2.3.0"
+	"gopkg.in/yaml.v2 v2.3.0/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+	"honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
+	"honnef.co/go/tools v0.0.1-2020.1.4/go.mod"
+	"k8s.io/api v0.0.0-20190620084959-7cf5895f2711"
+	"k8s.io/api v0.0.0-20190620084959-7cf5895f2711/go.mod"
+	"k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719/go.mod"
+	"k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655"
+	"k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655/go.mod"
+	"k8s.io/client-go v0.0.0-20190620085101-78d2af792bab"
+	"k8s.io/client-go v0.0.0-20190620085101-78d2af792bab/go.mod"
+	"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
+	"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
+	"k8s.io/klog v0.3.1/go.mod"
+	"k8s.io/klog v0.4.0"
+	"k8s.io/klog v0.4.0/go.mod"
+	"k8s.io/klog/v2 v2.0.0/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod"
+	"k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod"
+	"k8s.io/utils v0.0.0-20200411171748-3d5a2fe318e4"
+	"k8s.io/utils v0.0.0-20200411171748-3d5a2fe318e4/go.mod"
+	"rsc.io/binaryregexp v0.2.0/go.mod"
+	"rsc.io/quote/v3 v3.1.0/go.mod"
+	"rsc.io/sampler v1.3.0/go.mod"
+	"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
+	"sigs.k8s.io/yaml v1.1.0"
+	"sigs.k8s.io/yaml v1.1.0/go.mod"
+)
+
+go-module_set_globals
+
+DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
+HOMEPAGE="https://www.terraform.io/"
+
+EGO_PN="github.com/hashicorp/${PN}"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+="${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 imagemagick ISC JSON MIT MIT-with-advertising MPL-2.0 unicode"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test"
+
+DOCS=( {README,CHANGELOG}.md )
+
+src_compile() {
+	GOCACHE="${T}/go-cache" go build -mod=readonly \
+		-work -o "bin/${PN}" ./ || die
+}
+
+src_install() {
+	dobin bin/terraform
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "If you would like to install shell completions please run:"
+	elog "    terraform -install-autocomplete"
+}
diff --git a/app-admin/tripwire/Manifest b/app-admin/tripwire/Manifest
index 47c50978de58..513e3e683671 100644
--- a/app-admin/tripwire/Manifest
+++ b/app-admin/tripwire/Manifest
@@ -2,5 +2,5 @@ AUX tripwire 466 BLAKE2B 1fca6945b6b8ce959b7c617eef9454690662676020ce7451396f8cd
 AUX tripwire.txt 11492 BLAKE2B f157c47e1461095a51e9868127d25df6769c3ea6441fe34925c29ef3e93541e66516ba59b1c04120979a4edc1f31bf166ac72998f2adba571d64ffa7c7008fd3 SHA512 ec53b2f71fb33f227628e1160a72fecf4a1aca7ee58b750945e7c0d0ce756a37666a02fe9e8ec235055fe6d28e1d20e77a449ae229f5d5d2349eaffe07827d47
 AUX twcfg.txt 604 BLAKE2B 78c0e1457e5ea37031c8f9cf5a340ee600775973ea2475daadb07f3cb59f117667506438628ced1b4b1fa738855748df7d4b2e6695d65de9ed832f335943797a SHA512 c8a568638d5a18bb9508ee6f70aea815b8bfdb9efbf7823cdad59890a617bbe941454f6f4622e38e4ac4622e1d611c9fc085d73aec5a23b5c13ae7f1d783b388
 DIST tripwire-2.4.3.7.tar.gz 1002257 BLAKE2B fb0c847087e8b27d2a111b4a4122b3c4d5b187efe6f80995c6d06c7592a22fec2c537bbebba9c21a7761a8047535de4a96a6b94246da586faad4e9fc92137196 SHA512 541138f4a4c3a4227f31de6607503d305f0d893bdd5d24928d619d3a25bb8fe7061a45c041992ace957b976b834b5f4212b5c727eee1cbc76ddb2e2c52aeafbd
-EBUILD tripwire-2.4.3.7.ebuild 2336 BLAKE2B b614c095a9e9528ecdccc0e40e661adc0702a2ebf20442c9f8d456560c142ba61ec0f1522d49635de28eb4b8c1ae51a230766f44de04c80f7c0841eaa751a434 SHA512 978e3bb6983740a5a857623fd4e57b7aeef1e892c3fa94a30d188b9999019964f4040204291285fa2be5d4b647fdf6180dd45733c0b7e7fca49bc17e1b9b0c4f
+EBUILD tripwire-2.4.3.7.ebuild 2272 BLAKE2B 4edff16ae68b7206f7fcba62bf1c86413cfaff84c1192c78b5d04e19c1b3757b809035127823cf91eeda613e9c0a3273f42db9c1fc588c22248bcc7595fccf5c SHA512 ae9c1b1b9604fad49f5b82fbac61db5dfd566c5d3d15f867c2bbfcaef3d7a9054e44990025872a22048050fb545cbaf1dcb12a21095a75cb9be3eb3949617621
 MISC metadata.xml 1538 BLAKE2B 24c822b7e513325d6daba8c4647afe2849032120492733ca117df4cf109358657c8ff8bd482a9a033834893fb0768aba47ae7df907f342ee61e72f7b374110d3 SHA512 ac08238f1e05e7fa7fe888ace88bbfd71498fed7508bd59e53088b767b1b9c8b566bd62dddd2aef87d28987974fbbdd5be94d1fe9ed01dddd15df59081d7cd20
diff --git a/app-admin/tripwire/tripwire-2.4.3.7.ebuild b/app-admin/tripwire/tripwire-2.4.3.7.ebuild
index db6b19a2144a..423a09ff9917 100644
--- a/app-admin/tripwire/tripwire-2.4.3.7.ebuild
+++ b/app-admin/tripwire/tripwire-2.4.3.7.ebuild
@@ -12,13 +12,10 @@ SRC_URI="https://github.com/Tripwire/tripwire-open-source/archive/${PV}.tar.gz -
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="libressl selinux ssl static +tools"
+IUSE="selinux ssl static +tools"
 
 DEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
+	ssl? ( dev-libs/openssl:0= )
 "
 RDEPEND="${DEPEND}
 	virtual/cron
diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
index 7024ef7222b1..1857424683ef 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -3,6 +3,5 @@ AUX ulogd.init 949 BLAKE2B bebbf58aab0957017980d46762743f366d9f2daeca35bbed53c1a
 AUX ulogd.logrotate 193 BLAKE2B 65e6d518260ad322539f05ea5a3177092db8cfa67bd8cd035cd714f8c3e6f90860ce47e27dccdf66feed68258f9bbbe2ef16fa103000f0166927a8cf9fc6969c SHA512 be62a8c63d567d90ab07d9a9e86fb85d868683c385de598b81fa369fd13581a144a0be1aedd2b899d653d94475679eee1fd4939ae72a35777d75208584b2f17a
 AUX ulogd.service 390 BLAKE2B e1395888ffe09cafd98a4384ab7b06e18c0e1b92fa80fb07a05415a3927bcd68a5d3d900ada141c684359bd37910801d40e069cba8cefc8a7c323584b9d8b993 SHA512 73923e6a851bf4f34f532c8b3fa17eb227f2fb2b4c485b89a488789f2d4af3605bd09538095a6acbee6d74300e98755bb03bacabe450104319938cfff62e4c89
 DIST ulogd-2.0.7.tar.bz2 394573 BLAKE2B bec028a3b35038a8cc0f3f8b81b3e19addb66fce09e4ea0f3b2cd29b20cdb28025a576badd0765d9bb15f9d097799b6f55ff45058f8a838daa836c3fe878eef0 SHA512 1ad12bcf91bebe8bf8580de38693318cdabd17146f1f65acf714334885cf13adf5f783abdf2dd67474ef12f82d2cfb84dd4859439bc7af10a0df58e4c7e48b09
-EBUILD ulogd-2.0.7-r1.ebuild 3198 BLAKE2B 8c6bafa8d1d514ef8fa8b73d456c2e254a32a138172fa43471083544234c55cbb0167be9cd74604cf49f3bb27f325589e727d83be92a84c4f35ecb4fa3fc356b SHA512 0510dbd4d7c53368d2c95d5d7270cdf87ad698fdfc9263a842041d1a13b9ec91a1b1d81716a203aac6ea394a87fe9f6d542da06a183e6592821e16cbca50a58e
 EBUILD ulogd-2.0.7-r2.ebuild 3178 BLAKE2B 6e0e62cd8ec982001c973a78da705f229d7bca57878c3a96cba2f2ac86ccd53da3fafece16d0993c1bb931e670c50b7106c74778e7d22b669be17804eeb420d2 SHA512 2dfa6f9b8992537f343770c447574beb1eccd23bec5e294711f25f324507f154224ae1ec98494470d1d04c7b231d3460dd199b046855f068277707d46b411c74
 MISC metadata.xml 1135 BLAKE2B 55b1207d68b757368a794f88678a36cac409b00c71e441db520f57435663dd41e75b381310350ed7023d50413a504ebdf81f8af157fbfa318003023f32be4d4e SHA512 00172540261e4f7e06b8afe70a5a4b21bc0833f12a83ecff675fae82f35dcc36f86d84fc744e3ec5d7055a4e97c512ef5fd6a39ca97ab5450c768612df0dee81
diff --git a/app-admin/ulogd/ulogd-2.0.7-r1.ebuild b/app-admin/ulogd/ulogd-2.0.7-r1.ebuild
deleted file mode 100644
index 073eac95b564..000000000000
--- a/app-admin/ulogd/ulogd-2.0.7-r1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic linux-info readme.gentoo-r1 systemd user
-
-DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
-HOMEPAGE="https://netfilter.org/projects/ulogd/index.html"
-SRC_URI="https://www.netfilter.org/projects/ulogd/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86"
-IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres selinux sqlite ulog"
-
-COMMON_DEPEND="
-	|| ( net-firewall/iptables net-firewall/nftables )
-	>=net-libs/libnfnetlink-1.0.1
-	dbi? ( dev-db/libdbi )
-	json? ( dev-libs/jansson )
-	nfacct? (
-		>=net-libs/libmnl-1.0.3
-		>=net-libs/libnetfilter_acct-1.0.1
-	)
-	nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 )
-	nflog? ( >=net-libs/libnetfilter_log-1.0.0 )
-	mysql? ( dev-db/mysql-connector-c:= )
-	pcap? ( net-libs/libpcap )
-	postgres? ( dev-db/postgresql:= )
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${COMMON_DEPEND}
-	doc? (
-		app-text/linuxdoc-tools
-		app-text/texlive-core
-		dev-texlive/texlive-fontsrecommended
-		virtual/latex-base
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-ulogd )
-"
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="
-You must have at least one logging stack enabled to make ulogd work.
-Please edit the example configuration located at '${EPREFIX}/etc/ulogd.conf'.
-"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if use nfacct && kernel_is lt 3 3 0; then
-		ewarn "NFACCT input plugin requires a kernel >= 3.3."
-	fi
-
-	if use ulog && kernel_is ge 3 17 0; then
-		ewarn "ULOG target has been removed in the 3.17 kernel release."
-		ewarn "Consider enabling NFACCT, NFCT, or NFLOG support instead."
-	fi
-
-	enewgroup ulogd
-	enewuser ulogd -1 -1 /var/log/ulogd ulogd
-}
-
-src_prepare() {
-	default_src_prepare
-
-	# Change default settings to:
-	# - keep log files in /var/log/ulogd instead of /var/log;
-	# - create sockets in /run instead of /tmp.
-	sed -i \
-		-e "s|var/log|var/log/${PN}|g" \
-		-e 's|tmp|run|g' \
-		ulogd.conf.in || die
-}
-
-src_configure() {
-	append-lfs-flags
-	local myeconfargs=(
-		$(use_with dbi)
-		$(use_with json jansson)
-		$(use_enable nfacct)
-		$(use_enable nfct)
-		$(use_enable nflog)
-		$(use_with mysql)
-		$(use_with pcap)
-		$(use_with postgres pgsql)
-		$(use_with sqlite)
-		$(use_enable ulog)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default_src_compile
-
-	if use doc; then
-		# Prevent access violations from bitmap font files generation.
-		export VARTEXFONTS="${T}/fonts"
-		emake -C doc
-	fi
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doc/${PN}.html )
-
-	default_src_install
-	find "${D}" -name '*.la' -delete || die
-
-	readme.gentoo_create_doc
-	doman ${PN}.8
-
-	use doc && dodoc doc/${PN}.{dvi,ps,txt}
-	use mysql && dodoc doc/mysql-*.sql
-	use postgres && dodoc doc/pgsql-*.sql
-	use sqlite && dodoc doc/sqlite3.table
-
-	insinto /etc
-	doins ${PN}.conf
-	fowners root:ulogd /etc/${PN}.conf
-	fperms 640 /etc/${PN}.conf
-
-	newinitd "${FILESDIR}/${PN}.init" ${PN}
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	diropts -o ulogd -g ulogd
-	keepdir /var/log/ulogd
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}