gentoo resync : 04.05.2021

23 files changed, 132 insertions, 78 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 534cf2ae17a8..2527cfae84a3 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/conf-update/Manifest b/app-portage/conf-update/Manifest
index 1ad498ebf9cb..7b91673bc873 100644
--- a/app-portage/conf-update/Manifest
+++ b/app-portage/conf-update/Manifest
@@ -1,4 +1,4 @@
 AUX conf-update-1.0.3-fno-common.patch 1945 BLAKE2B 9619507d58509bde87d0f436860d69738c5c5e96192926ba64ca9a6f5ccb35f225b3f44808c92e61599728cb602e49001f20a0b947fb6759578855881e4a4826 SHA512 692fce54d499c9d561ee5bb959a292117d25b60ab9a315e1c36d6a2472eccdd5b83dec4779283509f80913d53c4f71395a0f0bf0225d516fb01b277812d2e6a4
 DIST conf-update-1.0.3.tar.bz2 18296 BLAKE2B 7551b8de644bacf00764c8ad989cbf0c96be3ca4733a26b5f3083b3a9d26c3b8e1fe3525ccfc648aa9543bbc73ff6e3a949c5a3e7d59f71a008f73a720042f4d SHA512 7f20a4974f804d73729105d9abc0f3205a7574c6e2c6dbf020404f3161500b5ecc60d141e0833e9ae0f43a814591a74cd885a5033f50864bbcfb36ba452175b7
-EBUILD conf-update-1.0.3-r1.ebuild 905 BLAKE2B 927274f70f52809a0098b25c86cb38c673b317c6e89e53487f6dca60b055972f258939f811ccd56ebd66bcd54f297419d15d97a91c3c7e22f5ac1edee18ddc42 SHA512 0b1221fd49ddd29b7986624e86f910bea7ed6c99ccdb894c4996321221890d38e8960987e3e3f042aa211af96cba1849c3690c8a1f0f401de9d5e6ddd3411351
-MISC metadata.xml 389 BLAKE2B 201f0324021e977b97d3599ad5402d6294f1f798a05bf61bc82b3ed706a4112eaba2b7a41949b04da598909970625522e4ceb9d78e9dd140644f2f390c2873e8 SHA512 83867504b2d791a0eda45a700af3e9df0d878c8dca9622e3bc7809bc7fdc2f80fe5c4812caed1820e90d3521dfeb3aee8baf83cbfac3daa6d3ede3b25904d9c2
+EBUILD conf-update-1.0.3-r1.ebuild 847 BLAKE2B e1f1be8a6aa735bdfd93267305a8dea149cde9686c35925eb2bc491f7f7f506cef48b492c5308e72433f3fc6c3e4c6734c2a261f674897754e6b36771fc4aa7c SHA512 c75fb6bf1b450baeb732ff6276a0edcdb9c189d8982c39e343cb007e0fa518c2276a852725a2d86a088db37f4c4b681891017dd5eab976864477745f2370f622
+MISC metadata.xml 279 BLAKE2B dd96a15222669bfc7f36a5eb916f80ae7169bc17cec30676a6db25e0f241237d0c495c9ec003d47bee3190928da8cb1ea7d18fe7aa94776cf981d648c9fe8e69 SHA512 0546e405bf373849012842d4f3b48b0daa70b772166b8769eddd1884ab5f79d69f3b825c5a1191e312b6702b32295af1023d6bea157fcad90cf942dc95b5287c
diff --git a/app-portage/conf-update/conf-update-1.0.3-r1.ebuild b/app-portage/conf-update/conf-update-1.0.3-r1.ebuild
index e45068f6d28a..53603d63c761 100644
--- a/app-portage/conf-update/conf-update-1.0.3-r1.ebuild
+++ b/app-portage/conf-update/conf-update-1.0.3-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
@@ -12,14 +12,14 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="colordiff libressl"
+IUSE="colordiff"
 
 RDEPEND="
 	dev-libs/glib
 	sys-libs/ncurses:0
 	colordiff? ( app-misc/colordiff )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
+	dev-libs/openssl:0=
+	"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
diff --git a/app-portage/conf-update/metadata.xml b/app-portage/conf-update/metadata.xml
index 1e5a51a1844c..90a0e1a4289b 100644
--- a/app-portage/conf-update/metadata.xml
+++ b/app-portage/conf-update/metadata.xml
@@ -4,6 +4,5 @@
 	<!-- maintainer-needed -->
 	<use>
 		<flag name="colordiff">Use colors when displaying diffs (<pkg>app-misc/colordiff</pkg>)</flag>
-		<flag name="libressl">Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/app-portage/deltup/Manifest b/app-portage/deltup/Manifest
index badc6a2e425f..39caa655516f 100644
--- a/app-portage/deltup/Manifest
+++ b/app-portage/deltup/Manifest
@@ -1,5 +1,5 @@
 AUX deltup-0.4.6-cxx.patch 659 BLAKE2B 1005ff5439b96eda1f8106dc3620a00e343fd4df6f1736b9ca1b5fe6f06f8bafcc332852f7e51565179fccf8994515ce8dff19c6eb89b8263253e71132cdfdd5 SHA512 fae1d6c90a7458b0c4a7795a16ac794a506e2bd002be0be9e0772ef7a9f5174aeef35422d6ee1cca69e4dccc49b36dc732a3408d92d0c960e229935318d0033c
 AUX deltup-0.4.6-ldflags.patch 241 BLAKE2B 43091ce7b06d5b554183248b3e26732a00c0a7eccaaeaa7aa5dcdd4b2d11ca4f6cde707941545b9ecc13367152efd85e086f5ee94d8816ac967a79e5d29e01ad SHA512 e8b705bd581928b15523e6692648fb89f2bb0c15c565a7dee4d45292fae8aad88e9c6e83b29672825943c2bc15d8b151e57f603dd1c6577a62203249f1e96316
 DIST deltup-0.4.6.tar.gz 14869 BLAKE2B d0332eca70da268f0f85718bf08f8b19da7e7e8a1868d6bb4b2edd386d498f61342538234defebbc0430cc176da13b57efc11ecd62f300eef960b62e738d3147 SHA512 196be319f31860d89654c23241edde503d4194064617970d87cb0d0a66544959bc666dd34a3bf1a42e69ddb5927420728a1e208b7bb848e935e99f3a090ffa7a
-EBUILD deltup-0.4.6-r1.ebuild 903 BLAKE2B 37bff4627f8f8207acb2592c4d091192767f5bcbfe4eacc96f5980fd2c7fd3ce2e7800aada4647ed65621e6b5036047f59be0ce797190ca55309464a54c81dae SHA512 d0fae3ba5452559165c5b93d37e9138a2a57d82578badd94fa963623bc00c28ffaf7b39525b825aaf49eb241e2f6e8f68ac3b5699a8479c42f5ba5dd73e318d0
+EBUILD deltup-0.4.6-r1.ebuild 837 BLAKE2B a44c8ae42bd704a52820864262f9ace04492143dc4d063a517b370689c81b96563eda7dc8b2a14a8758d535c7dcdac7218267991379baf4db35e144a20e120c0 SHA512 0da562677bd95e7ea5ce6a8f1ff12a7a6e3d31bda1e08c2ac2653ed9dad72b2a77603915b2d791195eed4e6bcac7354edd6129a2a00897f0c7cf8d32feef50cc
 MISC metadata.xml 559 BLAKE2B f519d2d6a797e16aba8fd7aabe17554c5b4a2ba03ebe6c7c5bba44f5eaaf0c5bb4b5bb72de383147a3ced0f6f0a7034a357488e37506797a920fcb3455a97026 SHA512 e3f2234ad04c520aa8aa260b50177c3027acea5ef9e71861dcc9328e0d95e2d3d6df9d29705ce810b4ed6236412a1178512f7bb3bebbedad706c62eba98e98d0
diff --git a/app-portage/deltup/deltup-0.4.6-r1.ebuild b/app-portage/deltup/deltup-0.4.6-r1.ebuild
index c000491c69d0..81b8f8efe465 100644
--- a/app-portage/deltup/deltup-0.4.6-r1.ebuild
+++ b/app-portage/deltup/deltup-0.4.6-r1.ebuild
@@ -15,13 +15,11 @@ S="${WORKDIR}/${MY_PN}-${PV}/src"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="libressl"
 
 DEPEND="
 	sys-libs/zlib
 	app-arch/bzip2
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
+	dev-libs/openssl:0=
 "
 RDEPEND="${DEPEND}
 	|| ( dev-util/bdelta =dev-util/xdelta-1* )"
diff --git a/app-portage/g-sorcery/Manifest b/app-portage/g-sorcery/Manifest
index a7d2db1c4d71..0cec5a2ee797 100644
--- a/app-portage/g-sorcery/Manifest
+++ b/app-portage/g-sorcery/Manifest
@@ -1,4 +1,6 @@
 AUX g-sorcery-0.2.1-py3.7.tests-fix.patch 4455 BLAKE2B 631c028024312fd25f5191191a953cb9db9eda0de2f97ee84c1e5266fea99ddedb2faa36f24740561f181b76d311c0997cf5c1c04fe3bf69df0828b0d3ed96cd SHA512 68674b89fe101770adf7de711f828207856d97ecb0f66d4a369c90136fc8168095b2d5548e5d722eebabb5a7ed2eb91832c2dbd2618c97fb5961ffd2dc4186df
 DIST g-sorcery-0.2.1.tar.gz 55546 BLAKE2B 56fb8a766c17c220a8279d2288f5de5c6976dc8fb380ac695bcf891616aa8a284f6b07c9be79c3c819c69faf7fcf9a7a826ee8b8b955db007c00e23d6417f2f8 SHA512 42c34ed8addaf721583029d5056751810b0a77546f798081c7c605223342fa2a99bd2e30f20f004a8606ccf847108f0e2ef2c479f3cbb55f2fe6648d4ffc075e
+DIST g-sorcery-0.2.2.tar.gz 55707 BLAKE2B 59466e116caff697618154f3c9d8a2c11809ac0c1d367a35a7773fdcad381e283c2426310ccd4f843e10e6fc5143061f2ee575bdd190a1a51d7691be0d452d73 SHA512 a63b6a49225fbf5105666a6d8094f04534674c4773eb8008e2cb8e2eb75291011d53ff3f1bf6dd456496469d537a97151feca73b9b26553cf1fda9d3128534cb
 EBUILD g-sorcery-0.2.1-r1.ebuild 1080 BLAKE2B d649e5985064d02bdc2f97aa078088126da6317866221104933a8abac80cd86a08246a03fe95cab2b79ef511377a12750033349c08f2178f611956def0e025c2 SHA512 49982f740bd26e71b16347a5a3ebc9e6e2fd10ea67deb5f31d68684b686caa26ae98c1f1690eb8997e8ef20f71c2a00845f56ae7796ea2f6e4bd1f26deef08fe
-MISC metadata.xml 416 BLAKE2B d1009974d29bf69e2938899e03cc44942f86476c92ba3dde3f3a56e7253f77307bcb30771ba2a860e2c84e5daa1a16039a69aade1227c0739668ceb766ef9134 SHA512 63d03d46ad0f346591ea9208c55d186da8419fbd8cb1ba9ec68dcd8484cfd6dec0200e46004829cc8a1c411e13e4cdfeeef8e8c9ac05679f8d595cf306d49f54
+EBUILD g-sorcery-0.2.2.ebuild 1070 BLAKE2B 4fc7d608be55214f1e44bb41bb38261eca37e4dca23aca16ff34819bf0a3a386ea0825ee1110481ecc8aab9c4999f4e796778404fa9f167ffd6b30f56e429f34 SHA512 0f9bc9dc2f5df362c6dcc2fefff45d900b3aacfb6f3949572414188f2c45d07ae436cf57a63f31f4497330bbbae9e822f6e7ce27a0422b447a03f4f16d881a53
+MISC metadata.xml 334 BLAKE2B 6064d759a710731b62d8bbd56c2c07ba4cbcbac211d63024cdba8a2dd16fb268ce1198200990ce205164e573f00e88a3dfcef373a18215292cb693f2d165cfbe SHA512 0280e3f6d3d5c908e87c1996ffa41f98977053976b65439953fa9364e2714bb2eb344eee3f3d753b46c2176029749494f500d4b94ccb3327eb2441a3cbe04df2
diff --git a/app-portage/g-sorcery/g-sorcery-0.2.2.ebuild b/app-portage/g-sorcery/g-sorcery-0.2.2.ebuild
new file mode 100644
index 000000000000..e05a407dfc0e
--- /dev/null
+++ b/app-portage/g-sorcery/g-sorcery-0.2.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 prefix
+
+DESCRIPTION="framework for ebuild generators"
+HOMEPAGE="https://gitweb.gentoo.org/proj/g-sorcery.git
+	https://github.com/jauhien/g-sorcery"
+SRC_URI="https://gitweb.gentoo.org/proj/g-sorcery.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="bson git test"
+RESTRICT="!test? ( test )"
+
+DEPEND="bson? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	git? ( dev-vcs/git )
+	sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+PDEPEND=">=app-portage/layman-2.2.0[g-sorcery(-),${PYTHON_USEDEP}]"
+
+src_prepare() {
+	hprefixify setup.py
+	default
+}
+
+python_test() {
+	PYTHONPATH="." "${PYTHON}" scripts/run_tests.py
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman docs/*.8
+
+	docinto html
+	dodoc docs/developer_instructions.html
+
+	diropts -m0777
+	keepdir /var/lib/g-sorcery
+}
diff --git a/app-portage/g-sorcery/metadata.xml b/app-portage/g-sorcery/metadata.xml
index a7455e94355b..32f32e7f0643 100644
--- a/app-portage/g-sorcery/metadata.xml
+++ b/app-portage/g-sorcery/metadata.xml
@@ -8,7 +8,4 @@
 		<email>layman@gentoo.org</email>
 		<name>Gentoo Layman team</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">jauhien/g-sorcery</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/app-portage/gpyutils/Manifest b/app-portage/gpyutils/Manifest
index 48956ef99e13..9fa2ef9810b5 100644
--- a/app-portage/gpyutils/Manifest
+++ b/app-portage/gpyutils/Manifest
@@ -1,4 +1,4 @@
-AUX implementations.txt 819 BLAKE2B d0cd25c313152b3252eb7f30f5409481248c2a2bc693c898e97cc35d966530ee6a80ab345bf3a400a89b3c930be7e5331287383f66e3bd5bdfeb81aaa751d806 SHA512 e9851d4f956cd1c272f214d51f945f3957a1b1a5d1f44cd128d039f948069f106a4cabb1107a5317e616bb2657374f8a4266b60ea378aed256c5d65b698a511b
+AUX implementations.txt 849 BLAKE2B a1f00e70488afc1bb98b86316af963d80953ad57cf8851aa624148c8c622613aa3b2b2824776ab0bfa0ddff985d472f47dfda2a203f2b88945fab4f4d38e308e SHA512 72e73b2397dc2cc0124986bd8ec7b4f87fb6af56a87bf32939c53615d3043ed2f58aaf41f2da5b63105bb5a5286e4a6d5e860a9cf1b5ac40a53db11521e5b866
 DIST gpyutils-0.4.5.tar.gz 20037 BLAKE2B f628c11e0ae2c9bb02a024e1b7dcab7092e7b01c14078683c47a8ca00d71021b988c51d80ab8b322891f9ecd4bb11c7bfe7d300f3bcbe489a977b18244ead085 SHA512 f68c87b5a35aece182bf2f9f93fe89f061dd49b4b75fabb7637038aee1e5301797af1d889a75829048eeb05dda0233461a2f2600e185214600a282cea50d1d3c
 EBUILD gpyutils-0.4.5.ebuild 532 BLAKE2B 008b08ed4d228f7845270cf644ff68199d02bbc85d85eeaaaf0fe0de68afed8e041fd605f749dd230d849b4863b124d031ac0d196f1c831c0c2bf5cc02f89d0b SHA512 3dcb448ffb5567b411293d9c28562a599ea7e174464966b05a328b586d757d399355697f1775b1e00e735d60159b7a461d028d096a0c443d7751f91f0b2222d4
 EBUILD gpyutils-9999.ebuild 510 BLAKE2B f1368e0bf4df4d14e0f5309cf9fdfa76264eff5d627cfcffe62935b0d11fb2fa3b398798ef5677aef44ff30cb1fad36ffb84aa526b3358dfe1955d52f941a2c4 SHA512 4252aa88d5c50bcc697a46daf883494afa20998996e8fd7955d16d131c7481be77df80bd0f6c8e26f82d455e400c41b3374e9a67889434a6417232838631b7c4
diff --git a/app-portage/gpyutils/files/implementations.txt b/app-portage/gpyutils/files/implementations.txt
index 0236041583bf..e4f2de735fbc 100644
--- a/app-portage/gpyutils/files/implementations.txt
+++ b/app-portage/gpyutils/files/implementations.txt
@@ -19,6 +19,7 @@ python3_6		dead	3.6
 python3_7		old	3.7
 python3_8		current	3.8
 python3_9		supported	3.9
+python3_10		experimental	3.10
 
 pypy1_8	2.7-pypy-1.8	dead	p1.8
 pypy1_9	2.7-pypy-1.9	dead	p1.9
diff --git a/app-portage/gs-elpa/Manifest b/app-portage/gs-elpa/Manifest
index 16d1618471b3..c40ae5821de8 100644
--- a/app-portage/gs-elpa/Manifest
+++ b/app-portage/gs-elpa/Manifest
@@ -1,3 +1,5 @@
 DIST gs-elpa-0.1.3.tar.gz 15486 BLAKE2B 6e34aa27aae9d7e27d41e122ed18890b5b63a18e5803f83aaa2fe5c82cf95fb010f7d428e576ce1c8493b27fbb587e37f74f8c9ed3ed9320722ec61eff1f535e SHA512 616c6cc33e89094e727c9ebe577d211cf9200a95b7ad6fd4b350b16d6982e3d509278b63a145880cdbc8f83481ba409b650e43260d463bf90a22e2a705997020
+DIST gs-elpa-0.2.tar.gz 15717 BLAKE2B 17be05e19134a99109c4be6f3604a26b5183312adcd0ef195f6f460eac4a28e9cb9370d7d980dbe822af7372eccc0c59ae9f4bc49351a4ce398fc787011bd4ac SHA512 e491a5a8d19b9e077cb41b0934aca6b3e9c091f844f8be1905a79da160fb6f725433b6be4d198533080de5951b1af87c22835e759afb864c8533139349f94a72
 EBUILD gs-elpa-0.1.3-r1.ebuild 642 BLAKE2B 7bbea1856876e9fbd605f34cb565fe54f1cdf3c4f33c18cd77832a17ce187b7006fb08e3e6a801108e3f92e842d8223b2b7b77b98a098799ce6277469647a16d SHA512 12dcded1712ace296e6d3737d7b972185037bc6e9fc08d9cc1ebcc150ebdbff1c3b96ff1421699156452192e4a623aca62b7906dd6c4254285cd3787312506ed
-MISC metadata.xml 332 BLAKE2B fba6bf848c564260ffecdccc4a972f929bc0bec8b8df1a5842da68943d1877a27eebe514d3b6d963d398050f3411b8c6626be4cf743382559646099cd681d570 SHA512 cd0d491e5d3362c673b23769d802067f467d48038f0590d94a3a93fdcd6ebd3edc2162829854d0123576dc92a7b1bf49dd3fbad2a0e2a85c311701027d8d4fb9
+EBUILD gs-elpa-0.2.ebuild 679 BLAKE2B 2ccc8c17302ed204584b9dd9446c82e240a23cd9e9debf7d8cc5566ba07c7c5de5aa7c82fca90e3e92388beb9ac339a935d952843f4b84dfbbda8f2b4775d916 SHA512 7ca34267be0644b61a4ecd566af33a2620222f6e2b1735ffc214813e6e19e7deed0847344094494c363827dedb160f2ec07bd55873fa72bffd7ba9f2211657bb
+MISC metadata.xml 374 BLAKE2B ca92264ce6ed20aabad6c30f6d7f87ec140b984e04aed7746934543f6de80faa4c954069cb66d17bd0ecb5f4e774ffbac97c4c5cb5980e9346e44c0f6d70b9ed SHA512 283d51c14188adcc55e916cd48831aadf66a0b78d7d8c7775feada3ef6ea941dc58dd94ea7b45025a4be88c8faa34ff684950eb7ed3e870bb3d23e1ebf43e65d
diff --git a/app-portage/gs-elpa/gs-elpa-0.2.ebuild b/app-portage/gs-elpa/gs-elpa-0.2.ebuild
new file mode 100644
index 000000000000..2fb307534535
--- /dev/null
+++ b/app-portage/gs-elpa/gs-elpa-0.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="g-sorcery backend for elisp packages"
+HOMEPAGE="https://gitweb.gentoo.org/proj/gs-elpa.git
+	https://github.com/jauhien/gs-elpa"
+SRC_URI="https://gitweb.gentoo.org/proj/gs-elpa.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="app-portage/g-sorcery[$(python_gen_usedep 'python*')]
+	dev-python/sexpdata[$(python_gen_usedep 'python*')]"
+RDEPEND="${DEPEND}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman docs/*.8
+}
diff --git a/app-portage/gs-elpa/metadata.xml b/app-portage/gs-elpa/metadata.xml
index 02eaa858168c..a70f9d31bfdb 100644
--- a/app-portage/gs-elpa/metadata.xml
+++ b/app-portage/gs-elpa/metadata.xml
@@ -5,7 +5,8 @@
 		<email>layman@gentoo.org</email>
 		<name>Gentoo Layman team</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">jauhien/gs-elpa</remote-id>
-	</upstream>
+	<maintainer type="project">
+		<email>gnu-emacs@gentoo.org</email>
+		<name>Gentoo GNU Emacs project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-portage/java-ebuilder/Manifest b/app-portage/java-ebuilder/Manifest
index 0e13db888392..3a00537a5866 100644
--- a/app-portage/java-ebuilder/Manifest
+++ b/app-portage/java-ebuilder/Manifest
@@ -1,4 +1,4 @@
 DIST java-ebuilder-0.5.1.tar.gz 51590 BLAKE2B d37638247650610637d71e91c7209c1bace4489a5bdd2a3c3be3961e8f1238c96c6d0978f59b32f3a44f51d4f1b26c5016cc5c82c7b619ae35601eeeed866a35 SHA512 e091b1c80eaced03b1950fcb769f2bd5922aa37ebdb480b48870f9c601017c621486b049e7cd694a57f832baf4f04c6fc8a31848f9c63f4d26dd4092b1193c55
-EBUILD java-ebuilder-0.5.1.ebuild 1267 BLAKE2B a299679eea724515f5da20569faf606ab2f4173305e3bf38e6d287b2dec7a8b2ed00f9a9841436afe845f16895b734943cfc6992dbd64b81bcba22b703f4fe8c SHA512 67d4332febeb284a982ef64d7643421a28e80275871e2cbf2c222fe05d179ee5b1fab4578daaa1f9c85ca495cc0d094cac65ed99127e0052b0b82e287180f51b
-EBUILD java-ebuilder-9999.ebuild 1267 BLAKE2B a299679eea724515f5da20569faf606ab2f4173305e3bf38e6d287b2dec7a8b2ed00f9a9841436afe845f16895b734943cfc6992dbd64b81bcba22b703f4fe8c SHA512 67d4332febeb284a982ef64d7643421a28e80275871e2cbf2c222fe05d179ee5b1fab4578daaa1f9c85ca495cc0d094cac65ed99127e0052b0b82e287180f51b
+EBUILD java-ebuilder-0.5.1-r1.ebuild 1271 BLAKE2B 4f182da84e66accd13e4498b5ea2ee26a4395b736d880f41f6705953a3341d5154870bfd43e2d9a9a181a6dd8bf7c153112183f1a3ab9f26721b4e2abf21e33b SHA512 736157ea5f6d5230900aa80ee9e05d358dbf3cf77874bf62f1334a948e2bc47bc7322fb0fc6b55cf758716ea0ce6bef99b170529fa148d1c18b1d20a8f73423a
+EBUILD java-ebuilder-9999.ebuild 1271 BLAKE2B 4f182da84e66accd13e4498b5ea2ee26a4395b736d880f41f6705953a3341d5154870bfd43e2d9a9a181a6dd8bf7c153112183f1a3ab9f26721b4e2abf21e33b SHA512 736157ea5f6d5230900aa80ee9e05d358dbf3cf77874bf62f1334a948e2bc47bc7322fb0fc6b55cf758716ea0ce6bef99b170529fa148d1c18b1d20a8f73423a
 MISC metadata.xml 339 BLAKE2B e6068070bc51e0f0a213a76593f11fee385ebe1546b08f23088706ba46469e7352f4f73647980595b9c3aef4fecfd96d9d2d907cfe7e147897e9259c02dfb30f SHA512 b200cb9a9934082d9460c2dcaded12756bbafde1c0df15638979a31974736233f02fe15bffd5698532ebfffdad7f9b3b6df9129c2e7f1383314cf1ac5898595b
diff --git a/app-portage/java-ebuilder/java-ebuilder-0.5.1.ebuild b/app-portage/java-ebuilder/java-ebuilder-0.5.1-r1.ebuild
index 32f44a7de32c..664ccaef394d 100644
--- a/app-portage/java-ebuilder/java-ebuilder-0.5.1.ebuild
+++ b/app-portage/java-ebuilder/java-ebuilder-0.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2020 Gentoo Authors
+# Copyright 2016-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,8 +19,8 @@ HOMEPAGE="https://github.com/gentoo/java-ebuilder"
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND=">=virtual/jdk-1.8"
-RDEPEND=">=virtual/jre-1.8
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*
 	sys-process/parallel
 	>=dev-java/maven-bin-3"
 
diff --git a/app-portage/java-ebuilder/java-ebuilder-9999.ebuild b/app-portage/java-ebuilder/java-ebuilder-9999.ebuild
index 32f44a7de32c..664ccaef394d 100644
--- a/app-portage/java-ebuilder/java-ebuilder-9999.ebuild
+++ b/app-portage/java-ebuilder/java-ebuilder-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2020 Gentoo Authors
+# Copyright 2016-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,8 +19,8 @@ HOMEPAGE="https://github.com/gentoo/java-ebuilder"
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND=">=virtual/jdk-1.8"
-RDEPEND=">=virtual/jre-1.8
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*
 	sys-process/parallel
 	>=dev-java/maven-bin-3"
 
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 27fc713b8cd5..b25ecfaa5da1 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -2,9 +2,9 @@ DIST portage-utils-0.87.tar.xz 1772956 BLAKE2B b1487d89303b524ffa9e6030feba181fc
 DIST portage-utils-0.90.1.tar.xz 1779252 BLAKE2B 27c94694cab84970c0c92e835b9039d9420fbfa20f9f2e03f4f53d118df4dc243cddce33994095a3e41bd1027a42c9c29cda65cb7cf4f45279a028b21555f4f8 SHA512 67290a69ad6ac40da3ce0f41d2630096690e69bb97a1428af921ccc582dcfbf903bbf98259f68afdbe9e96aef81672ea3352a9266a649e75f99acec7fa00cd8a
 DIST portage-utils-0.90.tar.xz 1776636 BLAKE2B bbacc05aa97c77705ae4fbdb5efde5f1d49a99ac8ed259e026c9a997f43a86551b3a10a397e0c5f1da161d2c0d88afe88e22870705ca39d911c4a98ad13f4928 SHA512 2077061dd7dfd444d4ad38faf5a87aa44392d7747f71d7283b5e2775ce3d714773cd642ea085aea3dd34a715f2c446d42fd64ba42fa99e716e8d843aae3d9682
 DIST portage-utils-0.91.tar.xz 1783048 BLAKE2B cb93f29b8f7402b745ca0d191c8c02c75ab6a4a9fbe54b8d1ea60d1a2917a8ba2f6ff88e2c211b957ace1916307c38308ff355c7cd9a8db8876aed8f235a841f SHA512 f10c1653af44e9907bea5245b65127f047f8cd48c30a5d0252f514c759b6fdb83fbf036ba7297c926b6ddd3ca34c231717e78378dfd709fab699012ab5a67450
-EBUILD portage-utils-0.87.ebuild 2140 BLAKE2B 184c2904596b63e799e6dd0a456b5b266935623f0589e78628dfc9d1db79c43ece44e5d7a439d4a24c15c657b68cfc58d4f494fe4487da72c8f5ad7325f67cef SHA512 f8d317f0952b593dbdc701c2a37c5da441220e79af57246d04636ee31cccc0bf1eebd2cbd06ab0b188824ac893a64ab79222de8d43af83ff4819c7d51b26e149
-EBUILD portage-utils-0.90.1.ebuild 1770 BLAKE2B a8507a54b09b2e65d11ea19ae59eb6123d4a97ad2da77d2392ebb5c87b038d4c308b86f5bb00bfe392c8e4d1ed2de7db7c825620a34cb0477cbbe354f7e62d0f SHA512 f6dbacd94a564053506f2607575abb0f7268713588504705f41cd9eb1bb00f9eb09803e653a503c6f24c9af7f9ac0391cef2b03cf6fa7280ddc97d6b8a3ec7e6
-EBUILD portage-utils-0.90.ebuild 1771 BLAKE2B 7f41bcd459e5e681cc53e79bbb5a8643e8fefab6d4923a8b6a937dc5cf13bfdb870f108eab5b6739a4f48e87d2d7c030c6678cecc015ebd50441d6307b7da9a9 SHA512 b9211a98241073dd7c7eacd4ea0c1733085262b51b5579644a9f84ce6d5d9ca083b38b4c6b2eada9737df6710d882dd19d59e4bfb7c4b225c42b5273f87c47e6
-EBUILD portage-utils-0.91.ebuild 1775 BLAKE2B 4c4e52807d5e0ebfd07b236d260e5e14abb563864f660e93fd02247e280bd106333019e89b278a8968522a310062dbb95a3fa747f580e30590baa45687364314 SHA512 055d3f1a06722adb7800f3fbe8c995ac79e3b25380e3a7b4c4a247ef3c0407dad4fe22eff72c90dad7e51f5a4b007de25416fa2616f729b263c4f164f63ae54e
-EBUILD portage-utils-9999.ebuild 1775 BLAKE2B 4c4e52807d5e0ebfd07b236d260e5e14abb563864f660e93fd02247e280bd106333019e89b278a8968522a310062dbb95a3fa747f580e30590baa45687364314 SHA512 055d3f1a06722adb7800f3fbe8c995ac79e3b25380e3a7b4c4a247ef3c0407dad4fe22eff72c90dad7e51f5a4b007de25416fa2616f729b263c4f164f63ae54e
+EBUILD portage-utils-0.87.ebuild 1893 BLAKE2B 2331da140c01b921b86e2d7fcfb187a9f1d488a836dbead2c6f5d6124fb04677d210cfd6fc9f71c5939e274eb6db073dcda3e32d36a0655d788064644e6c58d3 SHA512 783def934c7d9c72f856f9e6b74a1e56b4cc88f7beb4eae63e578044fe1e920a16cc1f44021d22a4a493183f95d66546ed0ec358aaa80b2e3e390c2dcc289295
+EBUILD portage-utils-0.90.1.ebuild 1523 BLAKE2B 9170019bd5cb1d42718f8f65af0db2449e3cc0386bb811e8501c6e8a1f8a80faa8b0d00db22fab3f8d6d0a7140df8b924ca1a94e81efc1c2feaa29d15d1fea67 SHA512 0288694c4aead56774216dc530f256277b6a576373710632028c55cb99a587f842bf2edab270bd5a33d5f1572e9dd63b7afe044c512981d41b51887c959b6d37
+EBUILD portage-utils-0.90.ebuild 1524 BLAKE2B 75878900c8ba8a8a6c8382a0be0a48bf5bb75ef28b12583e437a577cbf3138f6e562675344bb79b3516c7510baed5bf5d69339d0e6924570e21fc45c2f248c0e SHA512 9bd404d97610fedb1e036e5548be12932570fe7916ab486e02835baa1bfa8d8fa59a7c31689b17728d72ee9d8d1a4733823dc611a6c9b2eecc1d58f78b1165ac
+EBUILD portage-utils-0.91.ebuild 1528 BLAKE2B 6ffd2e8918b698d5bd889466372feb394b8aed16a16a388f4e2a17d33a94cac296359255efc8a2b339422a6b10ba957e68021895ce90c36c30997e2fb1d97416 SHA512 8aa781c65ec4e0cb67f9b34c1fc184f50b6c81d3c4b3518d51adbe6710d3f6f76ba53e8c6362a70750e2c72aec84b4be87794a8d8135e037bbef4ddcc5ad81e3
+EBUILD portage-utils-9999.ebuild 1528 BLAKE2B 6ffd2e8918b698d5bd889466372feb394b8aed16a16a388f4e2a17d33a94cac296359255efc8a2b339422a6b10ba957e68021895ce90c36c30997e2fb1d97416 SHA512 8aa781c65ec4e0cb67f9b34c1fc184f50b6c81d3c4b3518d51adbe6710d3f6f76ba53e8c6362a70750e2c72aec84b4be87794a8d8135e037bbef4ddcc5ad81e3
 MISC metadata.xml 573 BLAKE2B 7c24e5d74a38a20b0c79c228ca131ee5073cbf0fdccfc2b42221521ae684566b4bf7474743c0a9cd1273b59eb94e2eef63b1db70f0ffed7d688073bb3679e007 SHA512 85f32bcd860ab711ade03cdb4a241722efbba47396b736e302fa2282e363bc8e445daf9316996b1cedb420d2cb102fd416962f05e15a57c51b514d776ac7cd84
diff --git a/app-portage/portage-utils/portage-utils-0.87.ebuild b/app-portage/portage-utils/portage-utils-0.87.ebuild
index 622862edf99b..fb828aa80ce9 100644
--- a/app-portage/portage-utils/portage-utils-0.87.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.87.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="nls static openmp +qmanifest +qtegrity libressl"
+IUSE="nls static openmp +qmanifest +qtegrity"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3 autotools
@@ -28,15 +28,13 @@ RDEPEND="
 		)
 		static? (
 			app-crypt/libb2:=[static-libs]
-			!libressl? ( dev-libs/openssl:0=[static-libs] )
-			libressl? ( dev-libs/libressl:0=[static-libs] )
+			dev-libs/openssl:0=[static-libs]
 			sys-libs/zlib:=[static-libs]
 			app-crypt/gpgme:=[static-libs]
 		)
 		!static? (
 			app-crypt/libb2:=
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
+			dev-libs/openssl:0=
 			sys-libs/zlib:=
 			app-crypt/gpgme:=
 		)
@@ -49,12 +47,10 @@ RDEPEND="
 			)
 		)
 		static? (
-			!libressl? ( dev-libs/openssl:0=[static-libs] )
-			libressl? ( dev-libs/libressl:0=[static-libs] )
+			dev-libs/openssl:0=[static-libs]
 		)
 		!static? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
+			dev-libs/openssl:0=
 		)
 	)
 "
diff --git a/app-portage/portage-utils/portage-utils-0.90.1.ebuild b/app-portage/portage-utils/portage-utils-0.90.1.ebuild
index fe266d230a59..2c9445c3d585 100644
--- a/app-portage/portage-utils/portage-utils-0.90.1.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.90.1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="nls static openmp +qmanifest +qtegrity libressl"
+IUSE="nls static openmp +qmanifest +qtegrity"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3 autotools
@@ -28,15 +28,13 @@ RDEPEND="
 		)
 		static? (
 			app-crypt/libb2:=[static-libs]
-			!libressl? ( dev-libs/openssl:0=[static-libs] )
-			libressl? ( dev-libs/libressl:0=[static-libs] )
+			dev-libs/openssl:0=[static-libs]
 			sys-libs/zlib:=[static-libs]
 			app-crypt/gpgme:=[static-libs]
 		)
 		!static? (
 			app-crypt/libb2:=
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
+			dev-libs/openssl:0=
 			sys-libs/zlib:=
 			app-crypt/gpgme:=
 		)
@@ -49,12 +47,10 @@ RDEPEND="
 			)
 		)
 		static? (
-			!libressl? ( dev-libs/openssl:0=[static-libs] )
-			libressl? ( dev-libs/libressl:0=[static-libs] )
+			dev-libs/openssl:0=[static-libs]
 		)
 		!static? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
+			dev-libs/openssl:0=
 		)
 	)
 "
diff --git a/app-portage/portage-utils/portage-utils-0.90.ebuild b/app-portage/portage-utils/portage-utils-0.90.ebuild
index d3f68790d8d6..b6b9c568ac3a 100644
--- a/app-portage/portage-utils/portage-utils-0.90.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.90.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="nls static openmp +qmanifest +qtegrity libressl"
+IUSE="nls static openmp +qmanifest +qtegrity"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3 autotools
@@ -28,15 +28,13 @@ RDEPEND="
 		)
 		static? (
 			app-crypt/libb2:=[static-libs]
-			!libressl? ( dev-libs/openssl:0=[static-libs] )
-			libressl? ( dev-libs/libressl:0=[static-libs] )
+			dev-libs/openssl:0=[static-libs]
 			sys-libs/zlib:=[static-libs]
 			app-crypt/gpgme:=[static-libs]
 		)
 		!static? (
 			app-crypt/libb2:=
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
+			dev-libs/openssl:0=
 			sys-libs/zlib:=
 			app-crypt/gpgme:=
 		)
@@ -49,12 +47,10 @@ RDEPEND="
 			)
 		)
 		static? (
-			!libressl? ( dev-libs/openssl:0=[static-libs] )
-			libressl? ( dev-libs/libressl:0=[static-libs] )
+			dev-libs/openssl:0=[static-libs]
 		)
 		!static? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
+			dev-libs/openssl:0=
 		)
 	)
 "
diff --git a/app-portage/portage-utils/portage-utils-0.91.ebuild b/app-portage/portage-utils/portage-utils-0.91.ebuild
index 50b348199614..85c3b587a26c 100644
--- a/app-portage/portage-utils/portage-utils-0.91.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.91.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="nls static openmp +qmanifest +qtegrity libressl"
+IUSE="nls static openmp +qmanifest +qtegrity"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3 autotools
@@ -28,15 +28,13 @@ RDEPEND="
 		)
 		static? (
 			app-crypt/libb2:=[static-libs]
-			!libressl? ( dev-libs/openssl:0=[static-libs] )
-			libressl? ( dev-libs/libressl:0=[static-libs] )
+			dev-libs/openssl:0=[static-libs]
 			sys-libs/zlib:=[static-libs]
 			app-crypt/gpgme:=[static-libs]
 		)
 		!static? (
 			app-crypt/libb2:=
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
+			dev-libs/openssl:0=
 			sys-libs/zlib:=
 			app-crypt/gpgme:=
 		)
@@ -49,12 +47,10 @@ RDEPEND="
 			)
 		)
 		static? (
-			!libressl? ( dev-libs/openssl:0=[static-libs] )
-			libressl? ( dev-libs/libressl:0=[static-libs] )
+			dev-libs/openssl:0=[static-libs]
 		)
 		!static? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
+			dev-libs/openssl:0=
 		)
 	)
 "
diff --git a/app-portage/portage-utils/portage-utils-9999.ebuild b/app-portage/portage-utils/portage-utils-9999.ebuild
index 50b348199614..85c3b587a26c 100644
--- a/app-portage/portage-utils/portage-utils-9999.ebuild
+++ b/app-portage/portage-utils/portage-utils-9999.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="nls static openmp +qmanifest +qtegrity libressl"
+IUSE="nls static openmp +qmanifest +qtegrity"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3 autotools
@@ -28,15 +28,13 @@ RDEPEND="
 		)
 		static? (
 			app-crypt/libb2:=[static-libs]
-			!libressl? ( dev-libs/openssl:0=[static-libs] )
-			libressl? ( dev-libs/libressl:0=[static-libs] )
+			dev-libs/openssl:0=[static-libs]
 			sys-libs/zlib:=[static-libs]
 			app-crypt/gpgme:=[static-libs]
 		)
 		!static? (
 			app-crypt/libb2:=
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
+			dev-libs/openssl:0=
 			sys-libs/zlib:=
 			app-crypt/gpgme:=
 		)
@@ -49,12 +47,10 @@ RDEPEND="
 			)
 		)
 		static? (
-			!libressl? ( dev-libs/openssl:0=[static-libs] )
-			libressl? ( dev-libs/libressl:0=[static-libs] )
+			dev-libs/openssl:0=[static-libs]
 		)
 		!static? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
+			dev-libs/openssl:0=
 		)
 	)
 "