Merge updates from master

21 files changed, 292 insertions, 86 deletions

diff --git a/dev-lang/parrot/parrot-8.1.0-r3.ebuild b/dev-lang/parrot/parrot-8.1.0-r4.ebuild
index ad319217e9f1..1612f5348710 100644
--- a/dev-lang/parrot/parrot-8.1.0-r3.ebuild
+++ b/dev-lang/parrot/parrot-8.1.0-r4.ebuild
@@ -3,11 +3,6 @@
 
 EAPI=7
 
-inherit multilib
-
-# weird failures
-RESTRICT="test"
-
 DESCRIPTION="Virtual machine designed to compile and execute bytecode for dynamic languages"
 HOMEPAGE="http://www.parrot.org/"
 SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/all/${PV}/${P}.tar.gz"
@@ -17,13 +12,17 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="opengl nls doc examples gdbm +gmp ssl +unicode pcre"
 
+# weird failures
+RESTRICT="test"
+
 CDEPEND="sys-libs/readline:0=
 	dev-libs/libffi:=
 	net-libs/libnsl:0=
+	virtual/libcrypt:=
 	opengl? ( media-libs/freeglut )
 	nls? ( sys-devel/gettext )
 	unicode? ( >=dev-libs/icu-2.6:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3-r1 )
+	gdbm? ( >=sys-libs/gdbm-1.8.3-r1:= )
 	gmp? ( >=dev-libs/gmp-4.1.4:0= )
 	ssl? ( dev-libs/openssl:0= )
 	pcre? ( dev-libs/libpcre )
diff --git a/dev-lang/regina-rexx/regina-rexx-3.9.1-r1.ebuild b/dev-lang/regina-rexx/regina-rexx-3.9.1-r2.ebuild
index bc100fa59cf2..b09080ce292b 100644
--- a/dev-lang/regina-rexx/regina-rexx-3.9.1-r1.ebuild
+++ b/dev-lang/regina-rexx/regina-rexx-3.9.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
@@ -8,12 +8,14 @@ inherit autotools
 DESCRIPTION="Portable Rexx interpreter"
 HOMEPAGE="https://regina-rexx.sourceforge.io/"
 SRC_URI="mirror://sourceforge/${PN}/Regina-REXX-${PV}.tar.gz"
+S="${WORKDIR}/Regina-REXX-${PV}"
 
 LICENSE="LGPL-2.1 MPL-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-S="${WORKDIR}/Regina-REXX-${PV}"
+RDEPEND="virtual/libcrypt:="
+DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/${PN}-3.9.1-makefile.patch )
 
diff --git a/dev-lang/swi-prolog/swi-prolog-8.2.3-r1.ebuild b/dev-lang/swi-prolog/swi-prolog-8.2.3-r2.ebuild
index 39819e8af952..a681b43d480d 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.2.3-r1.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.2.3-r2.ebuild
@@ -20,13 +20,14 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="sys-libs/ncurses:=
 	sys-libs/zlib
-	archive? ( app-arch/libarchive )
+	virtual/libcrypt:=
+	archive? ( app-arch/libarchive:= )
 	berkdb? ( >=sys-libs/db-4:= )
 	odbc? ( dev-db/unixODBC )
 	pcre? ( dev-libs/libpcre )
 	readline? ( sys-libs/readline:= )
 	libedit? ( dev-libs/libedit )
-	gmp? ( dev-libs/gmp:0 )
+	gmp? ( dev-libs/gmp:0= )
 	ssl? ( dev-libs/openssl:0= )
 	java? ( >=virtual/jdk-1.8:* )
 	uuid? ( dev-libs/ossp-uuid )
diff --git a/dev-lang/swi-prolog/swi-prolog-8.2.4-r1.ebuild b/dev-lang/swi-prolog/swi-prolog-8.2.4-r2.ebuild
index 40ca2887121c..3b46e7558599 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.2.4-r1.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.2.4-r2.ebuild
@@ -19,13 +19,14 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="sys-libs/ncurses:=
 	sys-libs/zlib
-	archive? ( app-arch/libarchive )
+	virtual/libcrypt:=
+	archive? ( app-arch/libarchive:= )
 	berkdb? ( >=sys-libs/db-4:= )
 	odbc? ( dev-db/unixODBC )
 	pcre? ( dev-libs/libpcre )
 	readline? ( sys-libs/readline:= )
 	libedit? ( dev-libs/libedit )
-	gmp? ( dev-libs/gmp:0 )
+	gmp? ( dev-libs/gmp:0= )
 	ssl? ( dev-libs/openssl:0= )
 	java? ( >=virtual/jdk-1.8:* )
 	uuid? ( dev-libs/ossp-uuid )
diff --git a/dev-lang/swi-prolog/swi-prolog-8.3.26.ebuild b/dev-lang/swi-prolog/swi-prolog-8.3.25-r2.ebuild
index cf72f0070592..3b4293326d30 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.3.26.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.3.25-r2.ebuild
@@ -19,13 +19,14 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="sys-libs/ncurses:=
 	sys-libs/zlib
-	archive? ( app-arch/libarchive )
+	virtual/libcrypt:=
+	archive? ( app-arch/libarchive:= )
 	berkdb? ( >=sys-libs/db-4:= )
 	odbc? ( dev-db/unixODBC )
 	pcre? ( dev-libs/libpcre )
 	readline? ( sys-libs/readline:= )
 	libedit? ( dev-libs/libedit )
-	gmp? ( dev-libs/gmp:0 )
+	gmp? ( dev-libs/gmp:0= )
 	ssl? ( dev-libs/openssl:0= )
 	java? ( >=virtual/jdk-1.8:* )
 	uuid? ( dev-libs/ossp-uuid )
diff --git a/dev-lang/swi-prolog/swi-prolog-8.3.25-r1.ebuild b/dev-lang/swi-prolog/swi-prolog-8.3.26-r1.ebuild
index cf72f0070592..3b4293326d30 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.3.25-r1.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.3.26-r1.ebuild
@@ -19,13 +19,14 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="sys-libs/ncurses:=
 	sys-libs/zlib
-	archive? ( app-arch/libarchive )
+	virtual/libcrypt:=
+	archive? ( app-arch/libarchive:= )
 	berkdb? ( >=sys-libs/db-4:= )
 	odbc? ( dev-db/unixODBC )
 	pcre? ( dev-libs/libpcre )
 	readline? ( sys-libs/readline:= )
 	libedit? ( dev-libs/libedit )
-	gmp? ( dev-libs/gmp:0 )
+	gmp? ( dev-libs/gmp:0= )
 	ssl? ( dev-libs/openssl:0= )
 	java? ( >=virtual/jdk-1.8:* )
 	uuid? ( dev-libs/ossp-uuid )
diff --git a/dev-libs/Ice/Ice-3.6.5-r1.ebuild b/dev-libs/Ice/Ice-3.6.5-r2.ebuild
index 56dd843d69fd..7a584459e1ec 100644
--- a/dev-libs/Ice/Ice-3.6.5-r1.ebuild
+++ b/dev-libs/Ice/Ice-3.6.5-r2.ebuild
@@ -35,6 +35,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RDEPEND=">=dev-libs/expat-2.0.1
 	>=app-arch/bzip2-1.0.5
 	dev-libs/openssl:0=
+	virtual/libcrypt:=
 	|| (
 		$(for slot in ${BERKDB_SLOTS[@]} ; do printf '%s\n' "sys-libs/db:${slot}[cxx]" ; done)
 	)
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index 03859e6c7da7..d96cc0b0fede 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -1,3 +1,2 @@
-DIST leatherman-1.12.2.tar.gz 816010 BLAKE2B 4b7b00b88ef0ba5cb01405aa24fd5ff72918a122cc8a1c0a029e374152964f77afa29a1f503ed5863a39bd13aa808dba2a0b351f65756e97c8e2e8408358cbfc SHA512 9be8333b616bd9772f234474ae874c7214fa0c1bc4658ff042233d6e1683cc61b63d666d750297c79a8058490e42c8b2ff8999cb7f04aa329644f52540e43bde
-DIST leatherman-1.12.4.tar.gz 818043 BLAKE2B 7a8718d598bf48b70d555d2a21e2e930eba6b3407ad5414b43d30411acf4c9bf4193ad20058b63d3c8911b7c5b0d021f84d6eca6dd3d00165c7d145186f8177f SHA512 b2645a5049856f93c30bb89e87e3a47cf8137aeac73708248b2b228874818063fb31440ca2bd760783e8c95e880fe7ae34a387fcc448efee01dd0cda48089b55
 DIST leatherman-1.12.5.tar.gz 818066 BLAKE2B 9d30fb224d3f4389f398294712dc85af782eeff877dd0a214fc60ee67d4a70467c1d32255cf8814f0cfc5428c660a315c24a9becdb1aa05f4d5c43ede8552af7 SHA512 dad1ee67f98a4cd12d9c6f022ae2b8c748e4c081918744030191d7c33f84983691f6bcfba3ddf5c0e5b4c36109ebd757325d6e42d88c74caaff942e6603d333e
+DIST leatherman-1.12.6.tar.gz 818106 BLAKE2B 056ea52c355cf178e16be03f2a4fb54bf0e6aece4045545e7e45c50664e711db2bb756f56c9cd33a6dfe1de24c4ecb98766d4bd158ffb7757958274ba38f76db SHA512 4e2a1ee2e7226224f115648a78bc3e4798ef0528ef32e01d1e7ebcbeb1250fd6ed88001c9db21456feeef3bd6ff201b0fd68fd5feb2671a66d13519dd3454386
diff --git a/dev-libs/leatherman/leatherman-1.12.4.ebuild b/dev-libs/leatherman/leatherman-1.12.4.ebuild
deleted file mode 100644
index e41dffc8583c..000000000000
--- a/dev-libs/leatherman/leatherman-1.12.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="A C++ toolkit"
-HOMEPAGE="https://github.com/puppetlabs/leatherman"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-IUSE="debug static-libs test"
-#RESTRICT="!test? ( test )"
-RESTRICT="test"  # restricted til we don't need the shared_nowide patch
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 sparc x86"
-SLOT="0/${PV}"
-
-RDEPEND="net-misc/curl"
-DEPEND=">=dev-libs/boost-1.73:=[nls]
-	net-misc/curl
-	>=sys-devel/gcc-4.8:*"
-
-PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch )
-PATCHES+=( "${FILESDIR}"/1.12.2-shared_nowide.patch )
-
-src_prepare() {
-	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
-	# vendored boost lib conflicts with boost 1.73 and above
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-	)
-	if ! use static-libs; then
-		mycmakeargs+=(
-			-DLEATHERMAN_SHARED=ON
-		)
-	else
-		mycmakeargs+=(
-			-DLEATHERMAN_SHARED=OFF
-		)
-	fi
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_test() {
-	"${WORKDIR}/${P}"_build/bin/leatherman_test
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-libs/leatherman/leatherman-1.12.5.ebuild b/dev-libs/leatherman/leatherman-1.12.5.ebuild
index c105fc67cf23..93aeee4fe225 100644
--- a/dev-libs/leatherman/leatherman-1.12.5.ebuild
+++ b/dev-libs/leatherman/leatherman-1.12.5.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 IUSE="debug static-libs test"
 #RESTRICT="!test? ( test )"
 RESTRICT="test"  # restricted til we don't need the shared_nowide patch
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 sparc x86"
 SLOT="0/${PV}"
 
 RDEPEND="net-misc/curl"
diff --git a/dev-libs/leatherman/leatherman-1.12.2.ebuild b/dev-libs/leatherman/leatherman-1.12.6.ebuild
index e41dffc8583c..c105fc67cf23 100644
--- a/dev-libs/leatherman/leatherman-1.12.2.ebuild
+++ b/dev-libs/leatherman/leatherman-1.12.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="A C++ toolkit"
 HOMEPAGE="https://github.com/puppetlabs/leatherman"
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 IUSE="debug static-libs test"
 #RESTRICT="!test? ( test )"
 RESTRICT="test"  # restricted til we don't need the shared_nowide patch
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 sparc x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0/${PV}"
 
 RDEPEND="net-misc/curl"
@@ -27,7 +27,7 @@ PATCHES+=( "${FILESDIR}"/1.12.2-shared_nowide.patch )
 src_prepare() {
 	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
 	# vendored boost lib conflicts with boost 1.73 and above
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -49,7 +49,7 @@ src_configure() {
 		  -DCMAKE_BUILD_TYPE=Debug
 		)
 	fi
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
@@ -57,5 +57,5 @@ src_test() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 }
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 948becfca010..6c637dab87ec 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -1,2 +1,3 @@
 DIST facter-3.14.17.tar.gz 409415 BLAKE2B 5884d1244ee869b1e8880bb243996be5a0377adcbcc7e02ccd94a98f3a98d700ad129a457dcddcc3aeae6027fb818032331ce5690019fe7186e8deb9b022430d SHA512 109a7748d883748c516ff7262c7eb589f3c7321edc3882aad242f6fece566d1e6e81f340f3dbb3a7fed16c528ba0da8769984c394178efdd447f10de1841ff53
 DIST facter-3.14.18.tar.gz 409243 BLAKE2B 6d11498ecd82910ab82ec9674fbe7cf8d87f76f47dc6bf1a25c6138d498ad0c1d47ae5b2cb67fb092892e29279ff3263e2d025ff1317e4fb428105c943ee11e3 SHA512 537696324fd1ea653019fe3febdd168f40155d120bb0f9b899711c04f8252166731ab3530e2f03c01606e3549db3726e146b00781ac6ab5383f5ba2ce1e74d3f
+DIST facter-3.14.19.tar.gz 409345 BLAKE2B f977bb36ec8042ac950babd19ed398b8bd4fece854304a8a7a5f6b7608c3ad6ba4999b9038e401d599883da5bad63304b502fef164d1988d68a8477f1ff302a1 SHA512 65efc0237edc8198165e8229ca5d64e165a36e58718a863e14df9de9b64d4c9fb911d084e23daa982473f0703077b2cb0a5de8c544161591a894d537312c30f0
diff --git a/dev-ruby/facter/facter-3.14.18.ebuild b/dev-ruby/facter/facter-3.14.18.ebuild
index 249ddd7569a6..b69eea0e499e 100644
--- a/dev-ruby/facter/facter-3.14.18.ebuild
+++ b/dev-ruby/facter/facter-3.14.18.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_BRANCH="master"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/dev-ruby/facter/facter-3.14.19.ebuild b/dev-ruby/facter/facter-3.14.19.ebuild
new file mode 100644
index 000000000000..249ddd7569a6
--- /dev/null
+++ b/dev-ruby/facter/facter-3.14.19.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+# git-r3 goes after ruby-ng so that it overrides src_unpack properly
+inherit cmake eutils ruby-ng
+
+DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
+HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
+	EGIT_BRANCH="master"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+RESTRICT="!test? ( test )"
+
+ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
+
+RDEPEND="
+	>=dev-cpp/cpp-hocon-0.2.1:=
+	>=dev-libs/leatherman-1.0.0:=
+	dev-libs/openssl:0=
+	sys-apps/util-linux
+	app-emulation/virt-what
+	net-misc/curl
+	dev-libs/boost:=[nls]
+	>=dev-cpp/yaml-cpp-0.5.1
+	!<app-admin/puppet-4.0.0"
+DEPEND="${RDEPEND}"
+
+# restore ${S} and override all phases exported by ruby-ng.eclass
+S="${WORKDIR}/${P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.14.6-fix-static-libcpp-hocon.patch
+	# be explicit about the version of rspec we test with
+	"${FILESDIR}"/${PN}-3.14.8-explicit-rspec-2.patch
+)
+
+pkg_setup() {
+	ruby-ng_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+each_ruby_configure() {
+	# hack for correct calculation of relative path from facter.rb to
+	# libfacter.so
+	my_ruby_sitelibdir=$(ruby_rbconfig_value 'sitelibdir')
+}
+
+src_configure() {
+	ruby-ng_src_configure
+
+	local mycmakeargs=(
+		-DRUBY_LIB_INSTALL=${my_ruby_sitelibdir}
+		-DBLKID_LIBRARYDIR="${EPREFIX}/$(get_libdir)"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	addpredict /proc/self/oom_score_adj
+	cmake_src_compile
+}
+
+src_test() {
+	cmake_src_test
+}
+
+each_ruby_install() {
+	doruby "${BUILD_DIR}"/lib/facter.rb
+}
+
+src_install() {
+	cmake_src_install
+	ruby-ng_src_install
+}
diff --git a/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild b/net-analyzer/net-snmp/net-snmp-5.9-r4.ebuild
index 5ee941602786..85e04734976d 100644
--- a/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9-r4.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 DISTUTILS_OPTIONAL=yesplz
 DISTUTILS_SINGLE_IMPL=yesplz
 GENTOO_DEPEND_ON_PERL=no
@@ -31,6 +32,7 @@ REQUIRED_USE="
 "
 
 COMMON_DEPEND="
+	virtual/libcrypt:=
 	bzip2? ( app-arch/bzip2 )
 	elf? ( dev-libs/elfutils )
 	lm-sensors? ( sys-apps/lm-sensors )
diff --git a/net-analyzer/net-snmp/net-snmp-5.9-r3.ebuild b/net-analyzer/net-snmp/net-snmp-5.9-r5.ebuild
index 3a88621c46cb..30fa5fda53e0 100644
--- a/net-analyzer/net-snmp/net-snmp-5.9-r3.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9-r5.ebuild
@@ -33,6 +33,7 @@ REQUIRED_USE="
 RESTRICT="test"
 
 COMMON_DEPEND="
+	virtual/libcrypt:=
 	bzip2? ( app-arch/bzip2 )
 	elf? ( dev-libs/elfutils )
 	lm-sensors? ( sys-apps/lm-sensors )
diff --git a/net-analyzer/net-snmp/net-snmp-5.9.1.ebuild b/net-analyzer/net-snmp/net-snmp-5.9.1-r1.ebuild
index a33f94b2f9ae..ac38c56a767e 100644
--- a/net-analyzer/net-snmp/net-snmp-5.9.1.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9.1-r1.ebuild
@@ -33,6 +33,7 @@ REQUIRED_USE="
 RESTRICT="test"
 
 COMMON_DEPEND="
+	virtual/libcrypt:=
 	bzip2? ( app-arch/bzip2 )
 	elf? ( dev-libs/elfutils )
 	lm-sensors? ( sys-apps/lm-sensors )
diff --git a/net-analyzer/net-snmp/net-snmp-99999999.ebuild b/net-analyzer/net-snmp/net-snmp-99999999.ebuild
index 652062a60647..5517dfe32065 100644
--- a/net-analyzer/net-snmp/net-snmp-99999999.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-99999999.ebuild
@@ -32,6 +32,7 @@ REQUIRED_USE="
 RESTRICT="test"
 
 COMMON_DEPEND="
+	virtual/libcrypt:=
 	bzip2? ( app-arch/bzip2 )
 	elf? ( dev-libs/elfutils )
 	lm-sensors? ( sys-apps/lm-sensors )
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 69e960c2ff60..b68f250d6c8f 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1 +1,3 @@
 DIST icingaweb2-2.8.2.tar.gz 8514166 BLAKE2B 7e6a44574999967a6a728c5818999ac6f15234f1cfd1415132e1a8219e897affddd4d4ec488bb90ced82a0ce5403220463ccfa0424014a4c090176d85fd968a9 SHA512 252ecb36751add239897b6344dd622542f892b1850398fe724d0ab91e8d691cefe0b33c727c28aa630c93b76b381aabe69721db034c4de0518f346bbd5b698de
+DIST icingaweb2-2.8.3.tar.gz 8514052 BLAKE2B 507753833ed8a0de816651f3fdb06f3fdf04b3fa9c43fad5046c28924c93f3c3e491d9a4e1532f08ac0d6abe97c1343b85cdb23de9ece9f16858b91886283e9c SHA512 236385dc54dbd11d8e100059bb7e29b3a4efc23888f187e13e563510dfb1f3d20e5c4107e2dadfa6842e6689aaa21d4e9465abd0a234c52229354f43ec44cfb4
+DIST icingaweb2-2.9.0.tar.gz 10895850 BLAKE2B cf0f1375e3eb29ddbbf6691afd1c240ae1431b7dd82bd591dd3fe135602d1eabc418c6279fe7bd8f8e519f264b69a9da8bb1d09d286f37aa2f7e5ed21ddacd5a SHA512 d8f2817c025160cd8f59f33d678ca6eea9b893b80ca5c45c719d8778269da46322e720a1c73d7bcd7be73a07f08dbe279ffb78220f2a6c00f7e07e9f0f88d4d4
diff --git a/www-apps/icingaweb2/icingaweb2-2.8.3.ebuild b/www-apps/icingaweb2/icingaweb2-2.8.3.ebuild
new file mode 100644
index 000000000000..c5f119e375d9
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.8.3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit depend.apache multilib
+
+DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
+HOMEPAGE="http://www.icinga.org/"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apache2 apache2-server fpm ldap mysql nginx pdf postgres"
+REQUIRED_USE="( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )"
+
+DEPEND=">=net-analyzer/icinga2-2.1.1
+		dev-php/pecl-imagick
+		pdf? ( media-gfx/imagemagick[png] )
+		apache2-server? ( >=www-servers/apache-2.4.0 )
+		nginx? ( >=www-servers/nginx-1.7.0:* )
+		|| (
+			dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+			dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+		)
+		acct-group/icingacmd
+		acct-group/icingaweb2"
+RDEPEND="${DEPEND}"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+
+	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
+	use apache2 && usermod -a -G icingacmd,icingaweb2 apache
+}
+
+pkg_config() {
+	if [[ -d /etc/icingaweb2 ]] ; then
+		einfo "Updating existing installation ..."
+	else
+		einfo "Running first time setup ..."
+		einfo "Creating configuration directory ..."
+		/usr/share/${PN}/bin/icingacli setup config directory
+		einfo "Creating authentication token for web setup ..."
+		/usr/share/${PN}/bin/icingacli setup token create
+		if use apache2 ; then
+			einfo "The following might be useful for your Apache2 configuration:"
+			/usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
+		fi
+		if use nginx ; then
+			einfo "The following might be useful for your NGinx configuration:"
+			/usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
+		fi
+	fi
+	einfo "All done."
+}
+
+src_install() {
+	insinto "/usr/share/${PN}"
+	doins -r "${S}"/*
+	fperms -R a+rX "/usr/share/${PN}/public/"
+	fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
+}
+
+pkg_postinst() {
+	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
+}
diff --git a/www-apps/icingaweb2/icingaweb2-2.9.0.ebuild b/www-apps/icingaweb2/icingaweb2-2.9.0.ebuild
new file mode 100644
index 000000000000..2a18a8e21d99
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.9.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit depend.apache multilib
+
+DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
+HOMEPAGE="http://www.icinga.org/"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apache2 apache2-server fpm ldap mysql nginx pdf postgres"
+REQUIRED_USE="( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )"
+
+DEPEND=">=net-analyzer/icinga2-2.1.1
+		dev-php/pecl-imagick
+		pdf? ( media-gfx/imagemagick[png] )
+		apache2-server? ( >=www-servers/apache-2.4.0 )
+		nginx? ( >=www-servers/nginx-1.7.0:* )
+		|| (
+			dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+			dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+			dev-lang/php:8.0[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+		)
+		acct-group/icingacmd
+		acct-group/icingaweb2"
+RDEPEND="${DEPEND}"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+
+	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
+	use apache2 && usermod -a -G icingacmd,icingaweb2 apache
+}
+
+pkg_config() {
+	if [[ -d /etc/icingaweb2 ]] ; then
+		einfo "Updating existing installation ..."
+	else
+		einfo "Running first time setup ..."
+		einfo "Creating configuration directory ..."
+		/usr/share/${PN}/bin/icingacli setup config directory
+		einfo "Creating authentication token for web setup ..."
+		/usr/share/${PN}/bin/icingacli setup token create
+		if use apache2 ; then
+			einfo "The following might be useful for your Apache2 configuration:"
+			/usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
+		fi
+		if use nginx ; then
+			einfo "The following might be useful for your NGinx configuration:"
+			/usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
+		fi
+	fi
+	einfo "All done."
+}
+
+src_install() {
+	insinto "/usr/share/${PN}"
+	doins -r "${S}"/*
+	fperms -R a+rX "/usr/share/${PN}/public/"
+	fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
+}
+
+pkg_postinst() {
+	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
+}