gentoo resync : 04.05.2021

23 files changed, 205 insertions, 44 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 64f5c45ac3ad..f730daea8845 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/bijiben/Manifest b/app-misc/bijiben/Manifest
index 18c22d3e704c..54602d323945 100644
--- a/app-misc/bijiben/Manifest
+++ b/app-misc/bijiben/Manifest
@@ -1,5 +1,7 @@
 DIST bijiben-3.36.3.tar.xz 528772 BLAKE2B 2445f0b3b40aa9c556635d25e85b31f620a83a4be4ed4c6d3091d3f3c5f19d5b8fc13769ed56bea6a731184b9dfdd2f604a3f29ad8dbde9c019a1f58f4c41447 SHA512 dba2d9da6ae62dd10a75662b9b04475e0ba64f50065d1dab8da8601b6a4dc44cb4f2b6129dec1f4a415844bee80ff534704e703118838a993a4ffe3ebbe2d254
 DIST bijiben-40.0.tar.xz 642760 BLAKE2B 9c0f9f1d103e9775ce1369b16844828c11c2c43ba9808a5978d7090fe131d9dd54a25cd4fd06cb565b2d7936c6298a87f4a774cc5c30aa0cd6a86ae012b45043 SHA512 3fef381014109fe716d05b4b150f80778196c29af588e3a476b663aac5b113659f8ddfed82417811292bf9039a3d0982591503f72550130179ed1a7fef39edcd
+DIST bijiben-40.1.tar.xz 687344 BLAKE2B 187e6d0af40649ef35453af4ce51f286196bfd0570370136611cd2191e6c0c6b578e95eb4b6edf448bac6ae7b93b729afef161d3cd4d2cbd9c40f873ed5004c3 SHA512 5d2e0694f9eddca9a152eac5c208b51a15d2a5651ab77c79c1bb94425c0f1541c916887c3aab5fb8b105ca50d0f14c432ac18cd8ac64d03e2a0ee46c91901f10
 EBUILD bijiben-3.36.3.ebuild 1055 BLAKE2B 71f215d69edb0bc91637bd0361ac38d4c80900d9a04015a3df6354573cde3e368afd74e4b6b26cd704773267be6321b2068f4cb870deeb92c5512d1df396d83c SHA512 71f6b947acb39badc539d3f20b21a87ed20c7502b1a937de5a714836c9bd3782239d082d7f51dc3acad5bd128d8d828958fb2559222cf956f08181e15dd9205b
 EBUILD bijiben-40.0.ebuild 1106 BLAKE2B f2138107d53d7501984492309c87da72ccc7e318d3e7ce3b145316a4bfffa11ef4ab6ea057c9d5ba23117415f047ce647d352d96c2fbf63a781044ccf4adf4f7 SHA512 f525c1cdf291885dd5234a517811846f2108cc557aca493e72899559a0d0c1e96e155a1c6bf2fba2bf0963cd618fbd934f81bbc6b0b5d3a6467073bf17267429
+EBUILD bijiben-40.1.ebuild 1106 BLAKE2B f2138107d53d7501984492309c87da72ccc7e318d3e7ce3b145316a4bfffa11ef4ab6ea057c9d5ba23117415f047ce647d352d96c2fbf63a781044ccf4adf4f7 SHA512 f525c1cdf291885dd5234a517811846f2108cc557aca493e72899559a0d0c1e96e155a1c6bf2fba2bf0963cd618fbd934f81bbc6b0b5d3a6467073bf17267429
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-misc/bijiben/bijiben-40.1.ebuild b/app-misc/bijiben/bijiben-40.1.ebuild
new file mode 100644
index 000000000000..6748c33e46a8
--- /dev/null
+++ b/app-misc/bijiben/bijiben-40.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+inherit gnome.org gnome2-utils meson python-any-r1 xdg
+
+DESCRIPTION="Note editor designed to remain simple to use"
+HOMEPAGE="https://wiki.gnome.org/Apps/Notes"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	app-misc/tracker:3=
+	>=dev-libs/glib-2.53.4:2
+	net-libs/gnome-online-accounts:=
+	>=x11-libs/gtk+-3.19.3:3
+	dev-libs/json-glib
+	>=gnome-extra/evolution-data-server-3.33.2:=
+	>=gui-libs/libhandy-1.0.0:1=
+	dev-libs/libxml2:2
+	sys-apps/util-linux
+	>=net-libs/webkit-gtk-2.26:4
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/appstream-glib
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dupdate_mimedb=false
+		-Dprivate_store=false # private store is mainly meant for flatpak builds
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-misc/figlet/Manifest b/app-misc/figlet/Manifest
index 5a8339ab84d1..af1a7e777f90 100644
--- a/app-misc/figlet/Manifest
+++ b/app-misc/figlet/Manifest
@@ -1,6 +1,7 @@
+AUX figlet-2.2.5-musl.patch 894 BLAKE2B c616940cf436a9434062acff8ef26e8f5327eee808be883d25be516b0d9d74ee72b088a7e47de511f729e8eeab63c3d9d1b848b42de883d0e9473d6e96ca265b SHA512 fa88f09e6eb375a6052a60d9671fa48986ff5d9c5075cdbb987db9611d6cc8e3d680038f87f6318120d0fe2f151916d5004912ae78f2f9f6fd63257572420366
 AUX figlet.bashcomp 1376 BLAKE2B a0e07ba26e97890bb0a6df473c609d40e68bd31a1ede5369eb2e4f04bfafdfdb680d6fc62670f1299db6978add0298c833afd6471ff26992db96fbd0a78f6874 SHA512 1a9d06139bbb105c9d909d1e7bfb64b04d6ccba6e0ebfa0968f75264da5582c2f449ad5759f36ec90bf068e69005c2eac2d0565765b02a13044531601b7b9d18
 AUX figlet.bashcomp-r1 1214 BLAKE2B b2f521559b9f3f957d1fe060e72dffa3b2342f389e5c1791dadd94181ef215344de2d909cf4abd5de1beef7f03a637576401db68ec1d537b569a89e0a9bb3a6f SHA512 7140cfbacbd99f0f4e9463bb024ead73ea1a3f6ddf9cb5806134ab711e772f32c57e69596f63f125cf13941cff51f84ccdb9f0288ca8614c99b9f1890d3d3e69
 DIST figlet-2.2.5.tar.gz 233201 BLAKE2B 9d7a8b518ee91bd937d7fb81d782c894bc2a1738b696b03d948c1319e68aadde9ff1ea291ee77f9e79bdd950c68fe98c9e4539e7e76ef5f9e758c16b968966e1 SHA512 bb9610fd89a51dd3e65c485653fe1292f47dbca7cb9a05af4ce317f5d776bb346ae455aec07fc37c290f6658639920fd7c431c1135a0f4d456a21c0bd25f99fb
-EBUILD figlet-2.2.5-r1.ebuild 921 BLAKE2B 2a033908b8494ceb3f8dc2f4ec6174852773b4a9e00769bf20b8dc6e08acbaf6dbb82375146c69b05384209bae7b26ebca5f33189d03b99a6cc27b75b44880e5 SHA512 4e063d1db69c4933fea8fce98ff435fdc6a39c0baa6d598dbf7c7ff2ac04f9f0d4b8620de6833080b6385ece88a01ad8e3771febde76437f36008d3dfc9433eb
+EBUILD figlet-2.2.5-r1.ebuild 964 BLAKE2B ffd1722e39932ffe494a5e10eb3873df3721be6e397abc621852bfbf66b26fac056406cc2234e645a35f6ed92a38c4f8eca41b499d6b356318455b4473194d07 SHA512 2fec15c81d80861fd1c5a11de8e6f0a7c595e6fe7ff1c90b5870dfbfa9f5eb75fe0aaa4ab2ed73e553d7d08852a4012539e8d6ccc1c8437bc61a4bc904c60934
 EBUILD figlet-9999.ebuild 805 BLAKE2B 9562e2503c2395d88e78e832c5ae1fb5fc2a49c83871cd868cda802138db038f685dcbe60ffe77d9cfcea7b75281fb5596bee641d8ad9da28167452b4a127302 SHA512 1486ee9197ebab6a17e781366037f5e8cd24ead017dd2c87de373321f18bf3e908e952f983b2e9be6bda7914e51938324e8fe257487ccb015cf180495b1c7304
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/figlet/figlet-2.2.5-r1.ebuild b/app-misc/figlet/figlet-2.2.5-r1.ebuild
index 7514e810fb65..2d98e79b36b3 100644
--- a/app-misc/figlet/figlet-2.2.5-r1.ebuild
+++ b/app-misc/figlet/figlet-2.2.5-r1.ebuild
@@ -13,6 +13,8 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
+PATCHES=( "${FILESDIR}"/${P}-musl.patch )
+
 src_compile() {
 	emake clean
 	emake \
diff --git a/app-misc/figlet/files/figlet-2.2.5-musl.patch b/app-misc/figlet/files/figlet-2.2.5-musl.patch
new file mode 100644
index 000000000000..6294d9d889dd
--- /dev/null
+++ b/app-misc/figlet/files/figlet-2.2.5-musl.patch
@@ -0,0 +1,36 @@
+From 88428a728e1f99dcdc63d7c5ff0cd8b6cda37576 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Tue, 3 Jun 2014 10:59:40 +0000
+Subject: [PATCH] Fix build with musl libc
+
+Avoid using the glibc internal macros __BEGIN/__END_DECLS.
+
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
+---
+ utf8.h | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/utf8.h b/utf8.h
+index 0631b8a..a3e09bd 100644
+--- a/utf8.h
++++ b/utf8.h
+@@ -27,13 +27,17 @@
+ #define UTF8_IGNORE_ERROR		0x01
+ #define UTF8_SKIP_BOM			0x02
+ 
+-__BEGIN_DECLS
++#ifdef   __cplusplus
++extern "C" {
++#endif
+ 
+ size_t		utf8_to_wchar(const char *in, size_t insize, wchar_t *out,
+ 		    size_t outsize, int flags);
+ size_t		wchar_to_utf8(const wchar_t *in, size_t insize, char *out,
+ 		    size_t outsize, int flags);
+ 
+-__END_DECLS
++#ifdef   __cplusplus
++}
++#endif
+ 
+ #endif /* !_UTF8_H_ */
diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
index 0cf3fae4c54d..9254153c1ef1 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -1,6 +1,8 @@
 AUX gnote-3.38.1-cstddef.patch 988 BLAKE2B 8281bd3b515d642b57e49e365b76b134a3ccc9021b4b95b46934d4713f39cb107a644db948cac73175fa6dcdbdf566639894521b1415957af2dc8b661aca08e1 SHA512 3f4cdb300299fc224f3c5fd2cc8a4f8d47a7eb41af47eb233555f714879cdf1d0e294c5045a4fb89b4b721b6029f5c38dac7fee5d6c1c11461efe0523a3edefe
 DIST gnote-3.38.1.tar.xz 3530348 BLAKE2B d3312162ffdf505dea31f8e8848bd755d6fc54a5f95250ce6b90a28e04801fb86a8c4e239471442a4501068a841e38e4764da8f16528849fdec57a88bd271891 SHA512 ccfe35ff3dc8e90fa96307565875401540c9e03a18ffd5b2c25fdb053927c4bb2b6b5515456f5260c053948b1a63bf6959a73e1ab09feefce61ed2adc257734f
 DIST gnote-40.0.tar.xz 3418516 BLAKE2B 93834a3d9cdae89604be01b96c5293741263a1812ed23cc51a151c250f42c33c560456ac78a5a97f713dffc095b6f53ffe465da89867df89497239443939f3c4 SHA512 098273ee2de15152e7da739b857a8f7c43561e51013d1f42a631b0a9f52edebcd089817a9009556697e4c4b43506834919cd0f8cae7b3d899517f4b6d42eeb31
+DIST gnote-40.1.tar.xz 3420216 BLAKE2B a84604b25301fb0332da161a7f1f258542f1dfa16a02f34e700280e87393a3eb6d9005a5ed18204b91d0fccea2f6e44738789ab57dae543707650bfce55165c8 SHA512 6f4286fef18b060bb46c1c9f43772df7d9d913d6d1e3e3801e38e277fa660aa213e46f4a825788795f153821f705bbea22df7d1ff90ee949752497274455ad37
 EBUILD gnote-3.38.1.ebuild 1604 BLAKE2B 3de1688743a57faa5d11f39adeb2fcbd337a58ed4e7e9b2784cf79916fe54248d19cba834890336ea22c7cc71bc6b481a44634e34485da1890f0368bce43d3b5 SHA512 ee634cbf38dbc32bc1c5804fe5bfb58a4f405ad1c3032a204041192c2ac54321027c3b0ebe41f0c1df984912a366de178adf671345cde65bbea5d4be41fc4a5d
 EBUILD gnote-40.0.ebuild 1563 BLAKE2B e9112a82cb20c0bfa6cb0d19c2cbc811fbc42251e76f84026cb5e849d728f7042315e4d7d3cafca19dd948b043d5054da938ff87312ed3ae20e09965a991d139 SHA512 070dee31791766de946e674387c3a65e57c5385d58571b07a45d86caa4b251d892064a38d20e94aaa1ebb03c828fe363b66f562af4deb7b7dd31eba5a237ed04
+EBUILD gnote-40.1.ebuild 1563 BLAKE2B e9112a82cb20c0bfa6cb0d19c2cbc811fbc42251e76f84026cb5e849d728f7042315e4d7d3cafca19dd948b043d5054da938ff87312ed3ae20e09965a991d139 SHA512 070dee31791766de946e674387c3a65e57c5385d58571b07a45d86caa4b251d892064a38d20e94aaa1ebb03c828fe363b66f562af4deb7b7dd31eba5a237ed04
 MISC metadata.xml 342 BLAKE2B 51d98560833845aa6d1f2b9f4c85021fd317434efcd81ba31d106c7b4945acd23cfefc2de2a601ffef3d330adcf93ec0377f69107fa37771d80f7dff056d32ff SHA512 c68c058e279222cc9293a5b97fbf450f95a940a70a32b1adcac3e6276783d2bcc545f39895e92e7bd62c9ac5dc98139dc9800513c2a828895ba1fcf023227d21
diff --git a/app-misc/gnote/gnote-40.1.ebuild b/app-misc/gnote/gnote-40.1.ebuild
new file mode 100644
index 000000000000..d59f76c84cde
--- /dev/null
+++ b/app-misc/gnote/gnote-40.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2 readme.gentoo-r1
+
+DESCRIPTION="Desktop note-taking application"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
+
+LICENSE="GPL-3+ FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+# Automagic:
+# glib-2.32 dep
+# >=dev-libs/unittest++-1.5.1 (but not detected due to missing .pc)
+DEPEND="
+	>=app-crypt/libsecret-0.8
+	>=app-text/gspell-1.6.0:=
+	>=dev-cpp/glibmm-2.62.0:2
+	>=dev-cpp/gtkmm-3.22.20:3.0
+	>=dev-libs/glib-2.32:2[dbus]
+	>=dev-libs/libxml2-2:2
+	dev-libs/libxslt
+	>=sys-apps/util-linux-2.16:=
+	>=x11-libs/gtk+-3.22.20:3
+"
+RDEPEND="${DEPEND}
+	gnome-base/gsettings-desktop-schemas
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-util/intltool-0.35.0
+	dev-util/itstool
+	virtual/pkgconfig
+"
+
+PATCHES=("${FILESDIR}"/${PN}-3.38.1-cstddef.patch)
+
+src_prepare() {
+	# Do not alter CFLAGS
+	sed 's/-DDEBUG -g/-DDEBUG/' -i configure.ac configure || die
+
+	gnome2_src_prepare
+
+	if has_version net-fs/wdfs; then
+		DOC_CONTENTS="You have net-fs/wdfs installed. app-misc/gnote will use it to
+		synchronize notes."
+	else
+		DOC_CONTENTS="Gnote can use net-fs/wdfs to synchronize notes.
+		If you want to use that functionality just emerge net-fs/wdfs.
+		Gnote will automatically detect that you did and let you use it."
+	fi
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable debug)
+}
+
+src_install() {
+	gnome2_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index 5a5917d9dd0f..23e5978a76f0 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,3 +1,3 @@
 DIST gramps-5.1.3.tar.gz 17352457 BLAKE2B 8356e29d4e9e2ee78f0f09e54db8f77b2db991652f2c6b2fdc742b8f2e160a2c9c2b7df1a43c34e5d05b12b540e88cd8572fe89cfbb3a1ecb6df650a39ac0651 SHA512 045d5dd6aac4745ce527624657bbee25b9130e63b1b66bdd6a8409cdc876f1f3a4a6c0435d433a62bfffb723f6ac66d93829b79fc12c8768694c266b7a3b82cc
-EBUILD gramps-5.1.3.ebuild 2742 BLAKE2B e0debd52ea99d5b731ed060409b14ea6fbafdbf1078047276b7e6445ba218f3b86702bc6d4f3ad783dd43cb926e9057a19b9803deb7e0750d38f2b9f538db6dc SHA512 89a303b4796311a6177a62da4c57c24211db600edda6f472ebd4008c3a381a8714dd9f28f3289f673b4a0447e679b10304ebe13b917e800ecb6c1023e8b94fcb
+EBUILD gramps-5.1.3.ebuild 2744 BLAKE2B 83a2fa0bdd02c61f839c52e7706b236867998d395672c12a6ee66492c53f72f75cf8ee383d76f7efae3856f8325d35505b27d686ca3088ef18b8c0e0bdee9db2 SHA512 25796d3defb7c8c6a82ee283521acb8dc20a75cf5c161ba8748fb8b87ee24f9d97e30cc8665d63725ef5f3e8a593ba90c770ba01c69d1e42374317ac9d78cf53
 MISC metadata.xml 5598 BLAKE2B 4516bb11bb4fa57403d9b86409a073021dc9372b4d6d53af2c90cb31d5988b960ce4ab9f190b7e82948c1118f1fb0581bef1f8e1e4bbc9da8c294541eabbeda5 SHA512 74b37ffecc01f6c140f349d822ceedf20eb36af2c7a09faca53abaacede12d916cae4b514d066026600bd46d04943c4948dda7fe8c85e7e01714ebd24e428359
diff --git a/app-misc/gramps/gramps-5.1.3.ebuild b/app-misc/gramps/gramps-5.1.3.ebuild
index b82ca6ba3681..9908893b3c33 100644
--- a/app-misc/gramps/gramps-5.1.3.ebuild
+++ b/app-misc/gramps/gramps-5.1.3.ebuild
@@ -46,7 +46,7 @@ BDEPEND="test? ( ${RDEPEND}
 
 python_prepare_all() {
 	# Install documentation to the proper location. This can't be done
-	# easily with a patch because we substitute in the $PF variable,
+	# easily with a patch because we substitute in the ${PF} variable,
 	# and that changes with every revision.
 	sed -i "s:share/doc/gramps:share/doc/${PF}:g" setup.py || die
 	distutils-r1_python_prepare_all
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 9f17ca09b1b6..4e2a3339e66c 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -2,6 +2,6 @@ AUX mc-4.8.26-file-seccomp.patch 4794 BLAKE2B f6b2ba15b2f7f57aa620fc5745816be434
 AUX mc-4.8.26-shadow-crash.patch 936 BLAKE2B 65bf04b92a193de03457f95b94c7eff7677cedc0886fff4d934bd4e3bf94babf3650d5e56ad54eb73e41791e67089c9a65b6628615b87609035e6b823fd317e6 SHA512 8874e98bc5a9b032ff094d3042c71bf279f42c71840920ac3221011ae991fb199050e60d47ee8a65ef82bc5b64e4c14233fd3909c49de807fabf771a953a6c6a
 DIST mc-4.8.26.tar.xz 2492612 BLAKE2B e13ab99fb7d5a9e2cf1149ad96d763681b0186fbf5c03fc9e349a57a4a6f48b598c9eeed85e4cb94a18c5c5b89d4ee0e21f6d34c8cfd5e21da53551085aa3469 SHA512 f2f06915b775ecc94016fe5d5db9301e953cc89ee0708e79ee96e14a9f53142a467b27061ca57f65b40310fa86d4d13e2f2a29a601f8fefa6216fb10f73007be
 EBUILD mc-4.8.26-r1.ebuild 2841 BLAKE2B ba0cf54b91292f2184b0e05203d0a407efe28eb13ff378ecd0b881bf46506d43d4a52e1d8d2218f2e864fcfad7167dbdbc0ad19030c3988fac6fd2075eaf238f SHA512 40e67c95d0a0bcf350d25a36edcc00bb850152328794b5a0a03a4243b43a31c82f910e11a10e15ef0eb40bf3f0845454802af223fb20b75fcac24aaad4ebdf17
-EBUILD mc-4.8.26-r2.ebuild 2973 BLAKE2B e87bfc76b10345892c521a9295e522ac46df4ef04e2e34cf9da19619cb236d2b919ac26f20a8c623f5e3fd5c39ba510f04bb8c13a2545c5e0d28a8e290c524fb SHA512 00a6084639337c55f44b313e529f56c6e03d398dec349cdb856c4335ca3df48351058a54d7dc3c5824c1bfa3b7a5e94ac8d3649884a30734a0189f3cf42a5bd9
+EBUILD mc-4.8.26-r2.ebuild 2965 BLAKE2B 1825a073d8256f1c161a6dc734a638fd4310f7cca6cff28caefc4f875d6d0f01c112fa90d217f99134caaef8353ae933b625a48a5b682d2d8693cf9909c4e889 SHA512 11c2ef50e23400f675cf91a8e68000f6cb2baf781d74dbf74ae6fb63a581ad582e96a17734b5a8121487f5ccd4c6a5ed65c943cc6164182b3bc1dd94f9ce88d6
 EBUILD mc-9999.ebuild 3039 BLAKE2B 080662107814c15a4889a73c9f3b9338a305fb10b5ae2369acfb6f2f818d63215e8e176af0d8fed2fda6a47f83d8de45bbd37d6c0c4be108e3a8dec8bcb9203c SHA512 e107269656f99702c1c544e161dc0a36663798d4bb3798213a5d05d6cca1a0c072f487d833a5cfe2f2b48abb983ed5ace4041258661bd61dcff0f8d3ed0d9cd4
 MISC metadata.xml 773 BLAKE2B c7f3bb9bfb49c380a0493eabadcedec215df8696c5d52433aaccdffa0bf5ba3b89c77c291e19ed88c5ac29718e34eece1d3dabbc3ba6c1ec7862970f3900e204 SHA512 c5c0ca5a41a78cf746e14264b291f81ccffaa9c34a4149d27a9293cca8d304cb4844c07979b31218b250c3baeaccef2cba529c2ab43e81dc5552dca34ddbd4da
diff --git a/app-misc/mc/mc-4.8.26-r2.ebuild b/app-misc/mc/mc-4.8.26-r2.ebuild
index 9bd2fbe7d5ed..5c6783cbf2cc 100644
--- a/app-misc/mc/mc-4.8.26-r2.ebuild
+++ b/app-misc/mc/mc-4.8.26-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg"
 
 REQUIRED_USE="spell? ( edit )"
diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 582764f9dcad..58c4515194e3 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -5,9 +5,9 @@ DIST mosquitto-1.6.12.tar.gz 618718 BLAKE2B 4e7744d212f0fda980e485d102702547e76b
 DIST mosquitto-1.6.8.tar.gz 589873 BLAKE2B aa2e13397f7d4b6305af3180cd042cd143054e154cf8e6d93b05bc5a10d48419174711a1893fe60c1303a2f83cfbc5341cf03ec595e3640f503a2407e869491b SHA512 c15897df4e0979ee29a1e67cc671f56db600a078e9eb0bea376248b3f53b13ceed36616ad3678e2c9e07d6834a6d75e4efca2c40086069c1546e0223be04c071
 DIST mosquitto-1.6.9.tar.gz 610934 BLAKE2B 59d126a2b26be895f078be0c0dcf3513e56fc135dc956d9361ee191bd7ad6972b4692cd1824ad7a4e86a982df70c1e198e937f9ab23bf778069690098f87c815 SHA512 f78228a1e8305e4d89b34250981ed2c5fe5317636003636dc90f6fa2b1e3ca3c8fadb705ee7301f5252456cb093a6547bd46a255ca3d9fb5cdced697738d6eb7
 DIST mosquitto-2.0.10.tar.gz 759106 BLAKE2B 9cf94d29ee52a9086d8be176f5bba12b8b958a758fc03765c95298a5e7752c63510f6e12915a67d92a4e49b3ecfaa897b615b825375540728681bc9d628a992c SHA512 c356bfe5dc9317e1943cf14c20ae52af544aefc0138349abd3be5001032ce63579aa059dd62901a0802f08d059a9dc29b6fbcba852e3c4cd702189433ceac174
-EBUILD mosquitto-1.6.10.ebuild 2889 BLAKE2B 592c7c7439864cdc787843d07862f45aee57532f6a4d15840daeb85ccb8c4b635281832a9b1dc6e1e3b405d71f6e028eda56add7e4e71f4aafa645ee3bda2b54 SHA512 8ddc2378385f2f1da78628edcd41e43f541d5fa03574b82ae6bd766b46f0cee87f1f6edcb893c861536bba306a5aa9454841298cbdc0982fdc952f1c555c40b7
-EBUILD mosquitto-1.6.12.ebuild 2887 BLAKE2B eee9bb7f59b73e59671478cf8099523a565c6539781f4092527b05563a6e7377abb66fa09bd8d675adebbe34e1126cc7ce3afbfc6538277d48797456190b5b26 SHA512 1b7f43fb0a47aff7de08cf12a86e5225d4f6830f480e4ad4c7f8d28aa8582dd74a4575798844ed857aabd575d13b4f2355597ff7df435fe0e387e3388f6e320a
-EBUILD mosquitto-1.6.8.ebuild 2842 BLAKE2B 9c3edb2fd1801aaf523029260906bf36d45a30f8e9170f2530e3e142cfa17e0ab0f1067d40540237e0d4995a5fd98c08272aef92a9d9262226296a4656d1abcd SHA512 b4654f1e54c557188967957e62b4def70a3766948a38a7a7d34f70fbd3aa00944feddb9070ccbcbbdcf93cc39cd6bd2bc2b71700b5476e885e7ae79ffa866775
-EBUILD mosquitto-1.6.9.ebuild 2882 BLAKE2B 3fc6ffca0938013e28973b90dd24be274d31a0699e888ba034a77906ed2c97044d9219a91487cd9ec4d19d07c92b2db533cc1d447f5aeb1e010b1e85911203f0 SHA512 557e802c11ffa1ecdc53da365d3a2773997a4571ecb529f1c8a1ec5e07c63ae0f3790e66a7b1e9ab8fffbf197c2f3490558ffcfc5e8c327c05830e10c812f25e
-EBUILD mosquitto-2.0.10.ebuild 2649 BLAKE2B 63156d495dd1ef8da4b6f9539ed7246c2a1149811e0fa7cfe4cb60a4f25852130391a639212f9d907f9c0685a72571439b67eef729746f8846e273c218c6bbed SHA512 5003ea615b389f83b4773e2eb8b0d3d36c3412f095fa64be8f927f700efc2742b747b5c8146b80051d80325a2943fa6dc80ca91cbb2df13e1fa25c805d6bf8f8
+EBUILD mosquitto-1.6.10.ebuild 2828 BLAKE2B 6f7ebe1099d6a6a606bfebf85afec716951aaaff24a3a2e01d7edcdb2f7a4da15496f47aee5282aab37d6b6a663c980217f79aecffd056d4131a1878911c2f3e SHA512 d4bf9db26020f8bd1eb10c8be04fc7201a8afdbfb9e4c52c40d532aaae8e6b3fa3c3636e67631942d9aa02d75adb82314955aa544b5d33fb92b40d4646a87877
+EBUILD mosquitto-1.6.12.ebuild 2826 BLAKE2B 7e4ed5867bfe471e70977a4d7e42fbeea0b8e9acc8ec82b0814682d13852cfc13973fc6d6e2cc79a3956bfa2fe422c949ecaef500954e405db98f20f3a83ee74 SHA512 34982359687d167b118db33162130938db3b04caabacf3311a219f2a6ac7bcb7b0888e06f18a7698d9f3dd47e21e0aef5f647425e559bd85c0d0b8df8a2a8272
+EBUILD mosquitto-1.6.8.ebuild 2781 BLAKE2B 83eab150d52ad54fc49731a725a7a2cbe63b6363f1b9316018b57564a54033a070a9b8d1215bacf3980ecdfc5244f82def9f24f61e343b261389501631edc6a6 SHA512 0cda010e5dd81fcd6b166eb5210e048074052ca488d91ed0ec25ba982dc70b507d0d3c0b0b7435c66a008e6e700c0d7e9641d0b3996a90b9d658e7ecf9914d5f
+EBUILD mosquitto-1.6.9.ebuild 2821 BLAKE2B d19eb74ba76ba9414085db255124a0133550a09772b445b40a2384fe50ee767c60aede6d5e255716cf46bf6bc5bc9e72d818669ff3365e9939a36781700a4b04 SHA512 bd025b3c148f7eb7483652f052750687de0bf45f06dec56c4ca8e763488d901bacc729f004eb0ef971ae9f3754be44e7696a441c9c0e901472e0622c2595f01d
+EBUILD mosquitto-2.0.10.ebuild 2588 BLAKE2B 0b278fa3c07532ff7a5d063f506946fe16e59276e6e75c796bde26fa6e0ebbda4cf96e3e1dba8fcf15df81ad7300408cb5319835aa1ed5bf0c8450a2930f3dfc SHA512 ab2bf471840ffca29ebcb472f4e09d23ea9dfd27d0c05ed5f65334f14c4ac9a1a0c2d91ac42f121a586a29c4686806a6b0d75f2a2884b486601cd50885c5d073
 MISC metadata.xml 611 BLAKE2B d40adc8754f0c20b5c0634b75f12df935d246c67d3a9edccb8db262888b5dd6154fbfc21c270b854e61bb0389c625e3608623dcec519e05badc96f1bbdadf38f SHA512 93161a58861a9ea1ab372495fb66bb695d3be5e59dea96418aaf1f5fad936827d7d65a154711ef8c6c9fc752a69fef20c90741ac2627dfdefb8d38d63a3121fb
diff --git a/app-misc/mosquitto/mosquitto-1.6.10.ebuild b/app-misc/mosquitto/mosquitto-1.6.10.ebuild
index 3711e89f61db..e6439ec04b86 100644
--- a/app-misc/mosquitto/mosquitto-1.6.10.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.6.10.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
@@ -13,7 +13,7 @@ SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz"
 LICENSE="EPL-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="bridge examples libressl +persistence +srv ssl tcpd test websockets"
+IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="test? ( bridge )"
@@ -23,8 +23,7 @@ RDEPEND="
 	acct-group/mosquitto
 	srv? ( net-dns/c-ares:= )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=
 	)
 	tcpd? ( sys-apps/tcp-wrappers )"
 
diff --git a/app-misc/mosquitto/mosquitto-1.6.12.ebuild b/app-misc/mosquitto/mosquitto-1.6.12.ebuild
index a60ecf8a3ca2..3e4e46ebc04b 100644
--- a/app-misc/mosquitto/mosquitto-1.6.12.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.6.12.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
@@ -13,7 +13,7 @@ SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz"
 LICENSE="EPL-1.0"
 SLOT="0"
 KEYWORDS="amd64 arm ~arm64 ~x86"
-IUSE="bridge examples libressl +persistence +srv ssl tcpd test websockets"
+IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="test? ( bridge )"
@@ -23,8 +23,7 @@ RDEPEND="
 	acct-group/mosquitto
 	srv? ( net-dns/c-ares:= )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=
 	)
 	tcpd? ( sys-apps/tcp-wrappers )"
 
diff --git a/app-misc/mosquitto/mosquitto-1.6.8.ebuild b/app-misc/mosquitto/mosquitto-1.6.8.ebuild
index a3a8a935d8ca..f5044e2f0b3e 100644
--- a/app-misc/mosquitto/mosquitto-1.6.8.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.6.8.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
@@ -13,7 +13,7 @@ SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz"
 LICENSE="EPL-1.0"
 SLOT="0"
 KEYWORDS="amd64 arm x86"
-IUSE="bridge examples libressl +persistence +srv ssl tcpd test websockets"
+IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="test? ( bridge )"
@@ -23,8 +23,7 @@ RDEPEND="
 	acct-group/mosquitto
 	srv? ( net-dns/c-ares:= )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=
 	)
 	tcpd? ( sys-apps/tcp-wrappers )"
 
diff --git a/app-misc/mosquitto/mosquitto-1.6.9.ebuild b/app-misc/mosquitto/mosquitto-1.6.9.ebuild
index 44b883762e6a..951f69319f66 100644
--- a/app-misc/mosquitto/mosquitto-1.6.9.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.6.9.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
@@ -13,7 +13,7 @@ SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz"
 LICENSE="EPL-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bridge examples libressl +persistence +srv ssl tcpd test websockets"
+IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="test? ( bridge )"
@@ -23,8 +23,7 @@ RDEPEND="
 	acct-group/mosquitto
 	srv? ( net-dns/c-ares:= )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=
 	)
 	tcpd? ( sys-apps/tcp-wrappers )"
 
diff --git a/app-misc/mosquitto/mosquitto-2.0.10.ebuild b/app-misc/mosquitto/mosquitto-2.0.10.ebuild
index 40fa1801f2cc..7ed6b145a411 100644
--- a/app-misc/mosquitto/mosquitto-2.0.10.ebuild
+++ b/app-misc/mosquitto/mosquitto-2.0.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz"
 LICENSE="EPL-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64"
-IUSE="bridge examples libressl +persistence +srv ssl tcpd test websockets"
+IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="test? ( bridge )"
@@ -24,8 +24,7 @@ RDEPEND="
 	dev-libs/cJSON:=
 	srv? ( net-dns/c-ares:= )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=
 	)
 	tcpd? ( sys-apps/tcp-wrappers )"
 
diff --git a/app-misc/pwsafe/Manifest b/app-misc/pwsafe/Manifest
index c58bbd91f66f..303aa76d6a47 100644
--- a/app-misc/pwsafe/Manifest
+++ b/app-misc/pwsafe/Manifest
@@ -4,5 +4,5 @@ AUX pwsafe-0.2.0-fake-readline.patch 2667 BLAKE2B 297032d651ae485796fd4a21318241
 AUX pwsafe-0.2.0-man-page-option-syntax.patch 848 BLAKE2B d05bca68e0d8d224c059b4b949bf5fd590eede9840dafb03e6df37cd961d867db9bd5cb3be15fb804961fd51d2ba6196d035ab18622a4d19e0f6882b9d980856 SHA512 17697927e64e5bcdbc68343775732e1559dd7fe5c000b15fda9af7229f3c2c36bbd4ee3af3c652da9e8d0550acd1b5bb39a75891f5f40c37640ea089a5b6306e
 AUX pwsafe-0.2.0-printf.patch 1868 BLAKE2B 85ca5b70068dc50f6f650d766cf381dd2013640b45db0628df7137c5694a18783932e0effcb86f60b27a84aaedb77c25c86c281f4d05b357cea72961340a64be SHA512 7567e666f7dfb9c798aa2e6368ea1abf72f749c953da42bff7ef1b61aea6bf2faca96ef702ef9f7a9ceeece90999c066763006e549c5f2ec365cbf9358547449
 DIST pwsafe-0.2.0.tar.gz 127433 BLAKE2B abfcf36e3fc685100302b4dc7862cc8d8335e5dade40943cb0b7ef17b83dd2b75c36e3069d6bf759ba907e46adf20f3712af5223a8d8a586ae57e98ff6c0a3db SHA512 e8d3684f523f83def6317ef5561a02d1493685cfbda18707644bf335b7f45b1a548aae17a735838d9f6df345ddb17934607162a6e99348df625b34a9ad5f4cf3
-EBUILD pwsafe-0.2.0-r5.ebuild 1101 BLAKE2B 3d1dc24fd42c9ab1f9089c51ce0f8b7bbc40281fc268b579f0ca4cb61aab31d55a8e25938120862ee9a1d29a04976390c2744fed0141bf7bb746c29929d65e2f SHA512 28762ccc44bcfa5bb076e3de0bee12c47dbb20c923969e0f9b6e7fe8f817aefd7d78cc52ea2b160467d3b3d7cfb22dd97a0b3427d06c6aca1fbebe0522427822
+EBUILD pwsafe-0.2.0-r5.ebuild 1041 BLAKE2B 91af96d3d1ca02ccc96afefc70c26509b8a780891ab2c7446a83ff9df278be06b6ed5bf26d252364cb1018877773a768aaeea70c245dac97b55f3715a62c4c43 SHA512 1d347dd65c1ee276748138e34b4c7eb2d05ec6edec2090d644f4e2fe02fd26d7c39e7c3f499e415ad02e233bddaef46a14c8453e48f48c8d61953ec1bfc1697f
 MISC metadata.xml 897 BLAKE2B a575108a92c6e9199f694315da31ef9ed4682e1063ebb802c41e2e5f089555c9ebfa8e437f675241fe7a233523116f6ad849f188b1badcc1f6b291a60734e7ef SHA512 636f9740c48a1cf9831e98ac92058db730b084825e445cf7ff00d04c393a6de0110ca2e4568482ef194fddbb5fa4486478b73041226bdda72d3756e98f8f008b
diff --git a/app-misc/pwsafe/pwsafe-0.2.0-r5.ebuild b/app-misc/pwsafe/pwsafe-0.2.0-r5.ebuild
index eac49c89f1d2..ae32ba74d73e 100644
--- a/app-misc/pwsafe/pwsafe-0.2.0-r5.ebuild
+++ b/app-misc/pwsafe/pwsafe-0.2.0-r5.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,11 +11,10 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-IUSE="X libressl readline"
+IUSE="X readline"
 
 DEPEND="sys-libs/ncurses:0=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	readline? ( sys-libs/readline:0= )
 	X? (
 		x11-libs/libSM
diff --git a/app-misc/tmate/Manifest b/app-misc/tmate/Manifest
index c90ec08eeebb..8bdc6e8c82e0 100644
--- a/app-misc/tmate/Manifest
+++ b/app-misc/tmate/Manifest
@@ -1,5 +1,5 @@
 DIST tmate-2.3.1.tar.gz 611136 BLAKE2B bbcfb137cb9e712bbe3c36b2d57e6f1ea5a68c884e6e6ccd252315bca689b1bbec7a53cd131f0f36a6bab5b1defd3acb26bb458684894c81d676d2585db4790b SHA512 98531e3a3c1cc4da11894e8298df560fd58f1ede6a81ac8cb5f8cbea86f5c21672a016977dab801ec06e14f6c718a64599a9e32740934fcd4c0a155f92710520
 DIST tmate-2.4.0.tar.gz 614179 BLAKE2B 9864f71255ceafb10cfd622346ef7d2db2a124d13599a7c8ae81e83950ba56216193e02633a9becd90fd430c6ddff66df763fe2733d58f45b02c74c8fb8f7fc4 SHA512 92d2ca354b295678bfc2747ca83a45ebafeaec40ebac94bd94c4926af4f820b3f3a087f365147f41c80d1c8ad032f52c697a2421839c39315d84f98f7eccada6
-EBUILD tmate-2.3.1.ebuild 827 BLAKE2B c1ccaca2b5ef4569d59838755b1826a8677454d89291dc768b39ee77a86040a8b54940b67a7bfbe291409a1d8ce9ca3572cb84dafaa409e51ef4defe4edadc19 SHA512 6a7548e1f248b2c22b5478a10734294ab6bd48f237e2d8c56308b733f5d7748883598ccec390a8432034726561a15d1e876f1783c0fa3122b7dce56d55960dbb
-EBUILD tmate-2.4.0.ebuild 827 BLAKE2B c1ccaca2b5ef4569d59838755b1826a8677454d89291dc768b39ee77a86040a8b54940b67a7bfbe291409a1d8ce9ca3572cb84dafaa409e51ef4defe4edadc19 SHA512 6a7548e1f248b2c22b5478a10734294ab6bd48f237e2d8c56308b733f5d7748883598ccec390a8432034726561a15d1e876f1783c0fa3122b7dce56d55960dbb
+EBUILD tmate-2.3.1.ebuild 753 BLAKE2B 2f9f55ec33f42c37142a5134d0ac24a9424cc9f40050d5f0ccedfc4a9b6095643f66b2be250fb7828e0ee22410432584e30a3f6ecb0e7618791f36d34acd9545 SHA512 6376ae3927e0d83d94c5b9a6b45d9b9b4e500d1f1e712ecf26c91515a4ecc2eed1c0f947a3fc4b1f4965da6baad1f797dbed8e63167ecf0e31a324504140d00e
+EBUILD tmate-2.4.0.ebuild 753 BLAKE2B 2f9f55ec33f42c37142a5134d0ac24a9424cc9f40050d5f0ccedfc4a9b6095643f66b2be250fb7828e0ee22410432584e30a3f6ecb0e7618791f36d34acd9545 SHA512 6376ae3927e0d83d94c5b9a6b45d9b9b4e500d1f1e712ecf26c91515a4ecc2eed1c0f947a3fc4b1f4965da6baad1f797dbed8e63167ecf0e31a324504140d00e
 MISC metadata.xml 329 BLAKE2B f5ed7ad5dc2827db367a67a14dfda02644260fd16336e5d342b5e9d9ab7e0d62bc8493b834443fee00337123474ab7a1a9a6614ff9ca98ab3a1b4bc022fc03e7 SHA512 d5595ede15c355e3a54363cce03bdf3ead85d95035687432a2f53e30c61570d33f6f2c7893c8fe21b0bac47bf4a87cee8b1672084410a47f13c46aace2729d60
diff --git a/app-misc/tmate/tmate-2.3.1.ebuild b/app-misc/tmate/tmate-2.3.1.ebuild
index bdddbdf93b17..7386182a40c9 100644
--- a/app-misc/tmate/tmate-2.3.1.ebuild
+++ b/app-misc/tmate/tmate-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://tmate.io/"
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug libressl static-libs"
+IUSE="debug static-libs"
 
 SRC_URI="https://github.com/tmate-io/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
@@ -21,8 +21,7 @@ RDEPEND="
 	dev-libs/libevent[static-libs?]
 	dev-libs/msgpack[static-libs?]
 	>=net-libs/libssh-0.6.0[static-libs?]
-	!libressl? ( dev-libs/openssl:0=[static-libs?] )
-	libressl? ( dev-libs/libressl:0=[static-libs?] )
+	dev-libs/openssl:0=[static-libs?]
 "
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
diff --git a/app-misc/tmate/tmate-2.4.0.ebuild b/app-misc/tmate/tmate-2.4.0.ebuild
index bdddbdf93b17..7386182a40c9 100644
--- a/app-misc/tmate/tmate-2.4.0.ebuild
+++ b/app-misc/tmate/tmate-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://tmate.io/"
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug libressl static-libs"
+IUSE="debug static-libs"
 
 SRC_URI="https://github.com/tmate-io/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
@@ -21,8 +21,7 @@ RDEPEND="
 	dev-libs/libevent[static-libs?]
 	dev-libs/msgpack[static-libs?]
 	>=net-libs/libssh-0.6.0[static-libs?]
-	!libressl? ( dev-libs/openssl:0=[static-libs?] )
-	libressl? ( dev-libs/libressl:0=[static-libs?] )
+	dev-libs/openssl:0=[static-libs?]
 "
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"