gentoo resync : 04.05.2021

14 files changed, 49 insertions, 47 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index af98db5689ae..fb1f5238309c 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/abseil-cpp/Manifest b/dev-cpp/abseil-cpp/Manifest
index bde44a83fc3f..caba6e71a69c 100644
--- a/dev-cpp/abseil-cpp/Manifest
+++ b/dev-cpp/abseil-cpp/Manifest
@@ -1,9 +1,9 @@
-AUX abseil-cpp-20200923-arm_no_crypto.patch 782 BLAKE2B 88d68fee79064727b32f8468d9f985ed7546ce632b36526ecf6e1b34acfe01910e92fd3dd9901dceabc65614057bc76b14104afba75d21171e62f83d58fb1b51 SHA512 2ca48562f8296f81af0b61eb700e60f5b0c9a59290a472f98a7316034300a0424c5a6e7119d16710eabcfd424ad80b585318571f17fe316d88aa9ee2ba34f04a
+AUX abseil-cpp-20200923-arm_no_crypto.patch 1038 BLAKE2B 2443144b968f22e29503fb4a58ac45b623c104d298445b68b5ab34a5a08a5398a9b16cf6563e3127dfc4ba7ed211d53c2e1fb8f72fb120749065dce77fb67158 SHA512 5e2c192379d7190d97065973861d76e3680728a2e723c7cfb8b9ead4e02c94c3b12061c75f2f619cf1c9c217c3f29eaa36b59ff73e23417bf56f600a97128ff3
 DIST abseil-cpp-20200225.2.tar.gz 1679650 BLAKE2B bbadb2b86fd390f51322e687526c72a3b13caff6391974462a1146cc563616ce479330336a489a71e27b143e7cbea6695fc12c91fb721185a5116b3a6c5506b1 SHA512 75a607dee825e83c10dcd5e509515461f1b12c4aca861e4739ac4d41357b8e893dbfbe33873aa5c05463dde0891dedd7535af2ec59f173de29488e1b1321b335
-DIST abseil-cpp-20200923.2.tar.gz 1783972 BLAKE2B 7ba01cab353de9bf34230e0efa567b1dc16680144579841a0fd127b95fb36cc8b63fc3c7da6a0a7c350c32b91955c6b6bb23a3ca52e50174a4dce5d3c1b9e936 SHA512 fdbb0f84265bc1d4f24aac0af6d0eb8cb603f801fc14d63ac1e9d3bab47703a8a2ff5f44a0a4d325819dbea50fc533d967e1bfd65004ec11ef35fadc44a2b855
+DIST abseil-cpp-20200923.3.tar.gz 1783980 BLAKE2B 66d46fd6aafe0bf0d3fccd8a4e0a72fb0545a405d9c92d36ffcb1cf791b6d0eb85fd55218f740ba34c05c7bc952ad1aeaa367963b1f540f03a4f510fd02cd6d5 SHA512 7d9e2bc001a397b983afe1e5ca4d779bd27d0d30fad7f44e564a675e228f2fc29c203ef89dd1b0ff4a1832c6d99ae7627c9103a0daa6cccb426472528109ef85
 DIST abseil-cpp-20210324.1.tar.gz 1774134 BLAKE2B 8dd42b3d60a38995eeeeb72ba8aaa367c3caff118d88069dba9df24b155318ffd6c4e289c263346899bf7fc0bf6e8332380407a8a93c77f8cade0e8e74743b84 SHA512 fe593ed98eeea5461abca95ebb9dd3f7e8eedaa15e009f776945fdbb6ed489c61966611c1c72558d2ccdd541b952a345e51885d522ff29542cbcc837cf565866
 DIST gtest-1.10.0_p20200702.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d SHA512 715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b
-EBUILD abseil-cpp-20200225.2-r1.ebuild 968 BLAKE2B c873e52fcc15eabf024db55ae332e6997e60c65188bece3cace092de1e0b356072dd6b718ee129974110facc9eb76ca221e66423a643d3e78a2a5625f00b267c SHA512 0e7c2697c8955ab03566b3405131e352e234644ec7310d587edd5c3b07aa11ab0360ca229f5c77cc4b234b70130f77f8ec637c19e1d9ebcac2cf428b89a35ee4
-EBUILD abseil-cpp-20200923.2-r1.ebuild 1923 BLAKE2B b1d33772e9c63060d7f5b4745d71e2ebebe090a36bfec4c934d14c04766fec1fc2997a48c9dc5948a417fa3821b6bf84c4ccddcfdb15e6abd3bc8cff339f67e1 SHA512 63ac983d95e592858131e6771efc61deb0c3e8b010bf4ebd139a9b3158512b0a6e116ca40e56874f5e6e49a5734916ae3bffeb569e68600d2dcf7afe4c19d635
-EBUILD abseil-cpp-20210324.1.ebuild 1926 BLAKE2B f197fe665b05a29a62f1f21874e15e27cd0c4b40326e69a9ecce320d32984dcf3ca0bb85a917e198aea818cf0cb63713b5151669f5352f1e570fa6a7f1274295 SHA512 4c73a8f2c02df6df96d65e2ad51a59eeacafdf06c76192e8af396ed9fa818d7bd76f65d045e7b8bdf1c381d29f7ed1be5ff0140858969f217f972e375b20ba33
+EBUILD abseil-cpp-20200225.2-r1.ebuild 1328 BLAKE2B f22f3a772e78085319e04793d4c6720d5bff17fb5af221db3f76d847eb0a360bc0b23025cc3a6d2a6251b8462750826b20e1c804ead6d7923e813a76e5a23de7 SHA512 129c56641a5ff1e6d1f3047786b06b0b9a8daa18b38af360835b22589039961815165fa0a07aab94413a93e250fbe56b8c2b277961712e451a860d5a2d47922d
+EBUILD abseil-cpp-20200923.3.ebuild 1979 BLAKE2B 99049668df386c2f2f754c513921a4106c13e5a57a90aa62a8c84eeb14ca5fe664505aae9f871d3d02df8848c9051f82f63b5b85a42c2d8543831022b68f8f43 SHA512 0d9958d85dd3ba91d6bcfcda4f59676b4a3c281c80842612c8e835ab4f91f6fcc35fedcb5611080a8fc093a46d49ef47bcca7a791872452adb7d16c3cc5be3e8
+EBUILD abseil-cpp-20210324.1.ebuild 1887 BLAKE2B cb5445c3be46ab7eed9451e40a9e04a6514955b9517727f060686c5e022a96d648df8794605d38ad3e3b8d46b531de523d2b75a3facea7137848f3d4753046da SHA512 ec9dab5feabf0c6354227361ee78a8ec7befa239aecd2d6d76e815fc3dd765a90cc021541a099fc84564edf73f0f4e462abdca2186a81aa3751917cf78130005
 MISC metadata.xml 356 BLAKE2B 192cd53686f89cf886b3dccd4d3c64dd44912c3572c3ec16c786c81c62b5ad1090be7c6e43bf2900d731ca72804f57f17d2eef619b88932d14423e72363e61b2 SHA512 39f66dcee864111412707467b6757811eeb9ddb24cb23bd3ff01b9426dff922fbd69312fda9142e03df146c22cd2b5fc1b06249cd1b6c334b076b798721fdca2
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20200225.2-r1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20200225.2-r1.ebuild
index 344942f1ecaa..cd83b6c48f55 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20200225.2-r1.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20200225.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit cmake python-any-r1
+inherit cmake flag-o-matic python-any-r1
 
 DESCRIPTION="Abseil Common Libraries (C++), LTS Branch"
 HOMEPAGE="https://abseil.io"
@@ -23,6 +23,10 @@ BDEPEND="${PYTHON_DEPS}"
 # requires source of gtest and other libs
 RESTRICT=test
 
+PATCHES=(
+	"${FILESDIR}/${PN}-20200923-arm_no_crypto.patch"
+)
+
 src_prepare() {
 	cmake_src_prepare
 
@@ -40,8 +44,16 @@ src_prepare() {
 }
 
 src_configure() {
+	if use arm || use arm64; then
+		# bug #778926
+		if [[ $($(tc-getCXX) ${CXXFLAGS} -E -P - <<<$'#if defined(__ARM_FEATURE_CRYPTO)\nHAVE_ARM_FEATURE_CRYPTO\n#endif') != *HAVE_ARM_FEATURE_CRYPTO* ]]; then
+			append-cxxflags -DABSL_ARCH_ARM_NO_CRYPTO
+		fi
+	fi
+
 	local mycmakeargs=(
 		-DABSL_ENABLE_INSTALL=TRUE
+		-DBUILD_SHARED_LIBS=TRUE
 	)
 	cmake_src_configure
 }
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20200923.2-r1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20200923.3.ebuild
index a5ffd719aa27..a215a3844394 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20200923.2-r1.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20200923.3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit cmake python-any-r1 toolchain-funcs
+inherit cmake flag-o-matic python-any-r1 toolchain-funcs
 
 # yes, it needs SOURCE, not just installed one
 GTEST_COMMIT="aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e"
@@ -59,6 +59,7 @@ src_prepare() {
 
 src_configure() {
 	if use arm || use arm64; then
+		# bug #778926
 		if [[ $($(tc-getCXX) ${CXXFLAGS} -E -P - <<<$'#if defined(__ARM_FEATURE_CRYPTO)\nHAVE_ARM_FEATURE_CRYPTO\n#endif') != *HAVE_ARM_FEATURE_CRYPTO* ]]; then
 			append-cxxflags -DABSL_ARCH_ARM_NO_CRYPTO
 		fi
@@ -68,6 +69,7 @@ src_configure() {
 		-DABSL_ENABLE_INSTALL=TRUE
 		-DABSL_LOCAL_GOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT}"
 		-DABSL_RUN_TESTS=$(usex test)
+		-DBUILD_SHARED_LIBS=TRUE
 		$(usex cxx17 -DCMAKE_CXX_STANDARD=17 '') # it has to be a useflag for some consumers
 		$(usex test -DBUILD_TESTING=ON '') #intentional usex
 	)
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild
index 136d41f23b4d..f251363fd3dd 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit cmake python-any-r1 toolchain-funcs
+inherit cmake flag-o-matic python-any-r1 toolchain-funcs
 
 # yes, it needs SOURCE, not just installed one
 GTEST_COMMIT="aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e"
@@ -22,7 +22,7 @@ LICENSE="
 "
 SLOT="0/${PV%%.*}"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+cxx17 test"
+IUSE="test"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
@@ -61,6 +61,7 @@ src_prepare() {
 
 src_configure() {
 	if use arm || use arm64; then
+		# bug #778926
 		if [[ $($(tc-getCXX) ${CXXFLAGS} -E -P - <<<$'#if defined(__ARM_FEATURE_CRYPTO)\nHAVE_ARM_FEATURE_CRYPTO\n#endif') != *HAVE_ARM_FEATURE_CRYPTO* ]]; then
 			append-cxxflags -DABSL_ARCH_ARM_NO_CRYPTO
 		fi
@@ -69,7 +70,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DABSL_ENABLE_INSTALL=TRUE
 		-DABSL_LOCAL_GOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT}"
-		$(usex cxx17 -DCMAKE_CXX_STANDARD=17 '') # it has to be a useflag for some consumers
+		-DCMAKE_CXX_STANDARD=17
 		$(usex test -DBUILD_TESTING=ON '') #intentional usex
 	)
 	cmake_src_configure
diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20200923-arm_no_crypto.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20200923-arm_no_crypto.patch
index b74a6c70e904..762476a10184 100644
--- a/dev-cpp/abseil-cpp/files/abseil-cpp-20200923-arm_no_crypto.patch
+++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20200923-arm_no_crypto.patch
@@ -1,3 +1,10 @@
+Don't assume all ARM CPUs have crypto extensions.
+
+Requires an accompanying change in the ebuild to disable crypto
+extensions (by passing -DABSL_ARCH_ARM_NO_CRYPTO). This could
+be done by the build system instead in future.
+
+https://bugs.gentoo.org/778926
 --- /absl/random/internal/randen_hwaes.cc
 +++ /absl/random/internal/randen_hwaes.cc
 @@ -50,8 +50,11 @@
diff --git a/dev-cpp/asio/Manifest b/dev-cpp/asio/Manifest
index 3009999bb623..11fef08c53d7 100644
--- a/dev-cpp/asio/Manifest
+++ b/dev-cpp/asio/Manifest
@@ -2,6 +2,6 @@ DIST asio-1.10.8.tar.bz2 1270332 BLAKE2B 97e4a6a7c8b4562f10af1d122e9b08c12d567fd
 DIST asio-1.17.0.tar.bz2 1694631 BLAKE2B 0463355eef1714604290be43247139ea0220c5614c3c280ccf6049b64a2bb920c9eb885cf5f00c7e007caf3b049fe5cd6589dad0cb23cda4994fd31c7ecd8102 SHA512 5978cbf452aff07d6d19a2e641824628f409ab74e2e1a964776dae4c586386149acea56e4c8aa1075b247d2ce566daad640c3bbd15e211df1f73fc7b02964353
 DIST asio-1.18.1.tar.bz2 1729219 BLAKE2B 3f020407403175ffb6777b855a38e708241499e0fc8f1389b367bac4faf1e14b94cdf45f3b5ba64e12303237c8a3f817f7b7c320e7a58d72be6b19e04022c681 SHA512 06b41869858b69bc523564d5b219f8ebc995ca862e989f65233778c7596143075662880b6c5dd2eb24c21ba6e68a450888ab07a6bc8585bb6ede9a738e1e27c0
 EBUILD asio-1.10.8.ebuild 921 BLAKE2B b71d193effac85b1774bf187f61b92d40d23fca104a210d18471dfb1b5c7e0d9d9615ba740627013493428ed355156bc927e4502eaf21d2c83c3340ff8ce865f SHA512 022d5a995aa8b5aedcc864fe903c8c4611dc7d5bd0f6e5e3492444d4d5ca374093cf74c08b5a2119f851894bfbe9bfb760f2c3ed2e2945a09ae0df3cb7626849
-EBUILD asio-1.17.0.ebuild 1182 BLAKE2B ac2cfb623111f9f7d4e64ddeaa395f3f4126aeccd666f82f0145ad62bb4a166cdaad9735bd7400071873e9e6b3718e20986150969ca2acb12dd81cbbfa9218f5 SHA512 4c518c0cc5988a5b821735df8fff7953c5511cb69efbcb8f44584867d1a195cd0f7e896fbf7187b9091324960c379ce5b2e46200e0fdd2440935911e44bd8c90
-EBUILD asio-1.18.1.ebuild 1189 BLAKE2B c295b2e1390300049aa5398a223ad6f3d587b9757177edb977a3688171123d5ffc7445cfb4a61c9bddcf653196ceb198cb76e7e653389df2e1100aedeb74e450 SHA512 c3aedc8a54cbe87e01242c56549ad389a17fae7d785e71166a169f51e5060ca392641e0f0737c002e3717d44980bda12575241aa9ec8d81ddd6527a028f859c2
+EBUILD asio-1.17.0.ebuild 1121 BLAKE2B b39f6f2a7060601d146fa3146fc0d487c894cf7ac2a4afb2d6b8370692944853f976b16e70a6e30aa3292f6e5b811a0718b503c6c061b49d63dbe87daac6ed46 SHA512 dd346b7cf8b7ff07ae8ddd387065350d1aefc938bb9dc20ab2c0af7946bb455cb5d1694aa064ca4e601ad477099d4ff96b729de524769510a292577ae27fb40e
+EBUILD asio-1.18.1.ebuild 1128 BLAKE2B 51a905624608b573a9bf246531d1c7d53f0fd685c2b02440b5c9493b2969e7ca418b323c8cf70c9f8caa526412f5f7a2c186520554dfc1d9b562d09f3814e20e SHA512 f08b8c89cd36ca32f6c9f58aa72c68abf9962495a6953f36c7df80f6c149099d0540c1dd26b91188a8e1051ac2380e0a054ced86332e3a659599e74c5b0a6bfa
 MISC metadata.xml 486 BLAKE2B 90de27749adaf253e5d03d290225f1d8b7f7ce36cf2ada6289d68b07513973fa21a47363aeb965da9914867e954e69b9e4868eb9a4ffe8e6e3a685bbe8ccf1d2 SHA512 11558b26c58abda9bae1b0314be4761f0637652b3ccc978d49f1a4dbfc57e12a126c9a152fabd6a8c81c628e8a47cae58b1456444671331c7d15369d6e07b0ff
diff --git a/dev-cpp/asio/asio-1.17.0.ebuild b/dev-cpp/asio/asio-1.17.0.ebuild
index e81139edfc90..434556c8ecbb 100644
--- a/dev-cpp/asio/asio-1.17.0.ebuild
+++ b/dev-cpp/asio/asio-1.17.0.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
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.tar.bz2"
 LICENSE="Boost-1.0"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="doc examples libressl ssl test"
+IUSE="doc examples ssl test"
 RESTRICT="!test? ( test )"
 # test searches for libssl during ./configure, and REQUIRED_USE is easier than
 # patching configure to not search for it with USE=-ssl
@@ -18,8 +18,7 @@ REQUIRED_USE="test? ( ssl )"
 
 RDEPEND="dev-libs/boost
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=
 	)"
 DEPEND="${RDEPEND}"
 
diff --git a/dev-cpp/asio/asio-1.18.1.ebuild b/dev-cpp/asio/asio-1.18.1.ebuild
index 55fc4cb2fe52..82d648ca221a 100644
--- a/dev-cpp/asio/asio-1.18.1.ebuild
+++ b/dev-cpp/asio/asio-1.18.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.tar.bz2"
 LICENSE="Boost-1.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc examples libressl ssl test"
+IUSE="doc examples ssl test"
 RESTRICT="!test? ( test )"
 # test searches for libssl during ./configure, and REQUIRED_USE is easier than
 # patching configure to not search for it with USE=-ssl
@@ -18,8 +18,7 @@ REQUIRED_USE="test? ( ssl )"
 
 RDEPEND="dev-libs/boost:=
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=
 	)"
 DEPEND="${RDEPEND}"
 
diff --git a/dev-cpp/commoncpp2/Manifest b/dev-cpp/commoncpp2/Manifest
index 1c37a50dd8a0..628cf8fe6e8f 100644
--- a/dev-cpp/commoncpp2/Manifest
+++ b/dev-cpp/commoncpp2/Manifest
@@ -6,8 +6,7 @@ AUX 1.8.1-fix-c++14.patch 1220 BLAKE2B 10df79cc01b26b5df35ede979743cc2d18598fb47
 AUX 1.8.1-fix-gcc9.patch 1222 BLAKE2B d5f93bb1f34ef563d6cf88007f859891e49a8e5bb561a9f702346407c1b3e6bd3fa535b6d0c3ceaefb6b50ef094aa2e91895565b893b453e774de8cc62fa5843 SHA512 b8c2b4a530418bedfa73b89fe8b4e659e38141ca9f4998d4f5217cfc05355263408e7ec2f726e5f8e8283165725c38c454ce92dd8d3cdf920858d70e63070199
 AUX 1.8.1-gnutls-3.4.patch 1229 BLAKE2B a4936cce4fff5a7935c2bd077add555fa8d9b229afaaec545e78c1f6a7d34f35f7168c2381183ceaf4fd56bd1318a9505305ae59e77c87d9813f485e1aa6936d SHA512 92db4deba0ae612fda5873224641d35d5637a48d553d0afee7749c5477ca19a62640656d4781d101db5b545ddd962ce7c11a6edf33d128b031cafebf3cf6db77
 AUX 1.8.1-libgcrypt.patch 1054 BLAKE2B fc96efbbc132972035ca9622cd21427e8d662a3ee3aa3972690305ca14da04d7665b17d33f4b9d16e5128575ee4d378e031b57cc579d777845fc65c3cbab4abe SHA512 76f444739b370681d1b619b78cc77867da197f149c19d036d9d8b430a7a59d697c7ab30529582c308f77bc584a003dc0701d8c06003329589ade652babe5edd2
-AUX 1.8.1-libressl.patch 427 BLAKE2B 2943df26ccd7401b845200ab263a531dbeacab4bfd6a280b0597191b391d45e218946fc5cf1e5230bd066b30270b6fd5f9d2e78e26472598ddedb4eb81827417 SHA512 9ef9a53cc4eb60e72a0049e7b3012df487ca3383c2a1908998df04dd37743125057614a235f9995c3840ade4bd96c19f13e1fa2c726b44c9a0f4fdbcb707a874
 AUX 1.8.1-parallel-build.patch 261 BLAKE2B 71e639f976d1c1893f7e3285cecda841f4c90b1c2a153edda527c47804df8821a14a3c340544a9e0860fb4047af2772f036c0e10380b4025b4538e40082046b2 SHA512 e06ca32ffd811897859ef7bf06f3b7998eaa56c7fcbb01f971ec32b6e75c4242e3a2ed5a1bdaa28c02bae08bfbb386d65ebed3e50e2de759d056f085f1f49c1f
 DIST commoncpp2-1.8.1.tar.gz 908678 BLAKE2B 93868286230b4b0507127627f0a1c24b4f340e4af50d7592774b57bfc7a8f1e31bacc0cee5d17b4237aac85be0265cf3aabd65708e988159daaac85b4145c398 SHA512 949823461d20429c2b0acfa22554a5a9dacc977e3ee097f34416f65d322df84fbdb27c644435c6c6caaed800347dfbe789cee7f19b39b306165c97b4f4012bfe
-EBUILD commoncpp2-1.8.1-r4.ebuild 1650 BLAKE2B 632f5f153cceed58a850675a0a6c74959435cc657204966052fdd9f1424bc90fb90b42474ea75d17f5f1b4c1d6858741c58f8a4e8ea598e05ee7027971be2dec SHA512 4c871d508b722beef2df44c2f29f42988ae487f360b1a7206f58f32313d37dac1e6101b4141ae9c0e2cba925af5d219899816820cb025d73cffbe58a02e0fecd
+EBUILD commoncpp2-1.8.1-r4.ebuild 1539 BLAKE2B 8aabbad57624f37806a75f3db758d1903d28b8746feedf30a500cd77e9f2dc9e7a8bf866e8437d3075bf6e2c72844b522cd1a9da66af07a876a48952ba99ec5f SHA512 0ceccc0a461b7874e01f340a39e4c061df3b006e8f173f79b23547e950208625c9f921556ad64d48fc0a65484c10faec88bc35bcc6bb3c7b18d983586157ca12
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-cpp/commoncpp2/commoncpp2-1.8.1-r4.ebuild b/dev-cpp/commoncpp2/commoncpp2-1.8.1-r4.ebuild
index d8c63727a4e3..aaa9e49a4ed9 100644
--- a/dev-cpp/commoncpp2/commoncpp2-1.8.1-r4.ebuild
+++ b/dev-cpp/commoncpp2/commoncpp2-1.8.1-r4.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="debug doc examples gnutls ipv6 libressl ssl static-libs"
+IUSE="debug doc examples gnutls ipv6 ssl static-libs"
 
 RDEPEND="
 	sys-libs/zlib:=
@@ -22,8 +22,7 @@ RDEPEND="
 			net-libs/gnutls:=
 		)
 		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
+			dev-libs/openssl:0=
 		)
 	)"
 DEPEND="${RDEPEND}
@@ -38,7 +37,6 @@ PATCHES=(
 	"${FILESDIR}/1.8.1-libgcrypt.patch"
 	"${FILESDIR}/1.8.1-fix-c++14.patch"
 	"${FILESDIR}/1.8.1-gnutls-3.4.patch"
-	"${FILESDIR}/1.8.1-libressl.patch" # bug 674416
 	"${FILESDIR}/1.8.1-fix-gcc9.patch" # bug 686012
 )
 
diff --git a/dev-cpp/commoncpp2/files/1.8.1-libressl.patch b/dev-cpp/commoncpp2/files/1.8.1-libressl.patch
deleted file mode 100644
index 9779a53d8fa0..000000000000
--- a/dev-cpp/commoncpp2/files/1.8.1-libressl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Submitted [bug-commoncpp@gnu.org]
-
-diff --git a/src/ssl.cpp b/src/ssl.cpp
-index 5bf526d..3cd7040 100644
---- a/src/ssl.cpp
-+++ b/src/ssl.cpp
-@@ -386,7 +386,7 @@ bool SSLStream::getSession(void)
-     if(so == INVALID_SOCKET)
-         return false;
- 
--    ctx = SSL_CTX_new(SSLv3_client_method());
-+    ctx = SSL_CTX_new(SSLv23_client_method());
-     if(!ctx) {
-         SSL_CTX_free(ctx);
-         return false;
diff --git a/dev-cpp/notcurses/Manifest b/dev-cpp/notcurses/Manifest
index 261c1d52fa5f..18dafc2e38f9 100644
--- a/dev-cpp/notcurses/Manifest
+++ b/dev-cpp/notcurses/Manifest
@@ -1,4 +1,4 @@
-DIST notcurses-2.2.3.tar.gz 10861361 BLAKE2B e7b487e84b5defbb1208f355c85f7178b05f412c2a746a8bcecb2da7db8df32da563aeb1f1f218014a2ff9803f0984889e4341d59f585add49c944d4707e5cd4 SHA512 9c718a39352cc10e4f4cb24cd7940ccc7ac7ad1f5890f1a87166267b3c24011629464a4720f08c2b8bbf0fab2c5cb9b31fba7a43bc62ae65dff894019adece7d
-DIST notcurses-doc-2.2.3.tar.gz 89550 BLAKE2B a42c74f95166e48ecff99a05d66925869a44a44c4faa867cca663d94ee340748417d6560d022fdb90c7761c19285b0c4838b75843a3d26d25182977f68a0d6ce SHA512 b61f829d1ad5f69147a7b4fe139db406d5a26683b55d72251f3e313c17f591ad4e9e868577fbecf86c4ac9959c942e244927fb29a2e44996fadde7946493ccc8
-EBUILD notcurses-2.2.3.ebuild 1143 BLAKE2B d087cfdb4f7e3c67bcac784d5d2c1255ad00debb6d924eb41872368275b55dc365cccdbbf4b498216e6f02ede0b284ac7c67ad77e35397f95e3e9c50dd31efe5 SHA512 d9c3d14b91b017fa4c196a034e17c53bd661f5c75688a03b3c076492e91bea6949f073a03e735af2e84b9a93ddf0691d3f467c3c45f54fa978f4da2313edf285
+DIST notcurses-2.2.8.tar.gz 11255362 BLAKE2B d56f48ecfcfc107d696bb1da029afba8c8a29ea6f0d6317ccdd42d895d890c0cc1d46120566c2f60bd554c2a57aa60409276632216608b29469421a1c22cecf2 SHA512 7455ad1dfbeda68a0b2c35ba3bb28eab3bc0be1ca4db12ce0e3662cf12f1e541dec506c9896624f77ef8032ae6b644ee85ac5abf2272f54fb1c9038b33214892
+DIST notcurses-doc-2.2.8.tar.gz 115654 BLAKE2B c770f81a3ad4071f75e84caaa4370f26e68ced2489586ae857a8e3c2cf998e0d7b5d84b8fd09150ace51898731150e499f648ad2e6d5be442df11c648ba58ccd SHA512 1a2c8931bd4f68dfdd2fa921d06b639d5fa382d826d5c9e0186b4d0160f220f3f32b1eb19f17136c4d452c8afd9f6fff1b4f463a11d847ef9216ddb94b5c8ab8
+EBUILD notcurses-2.2.8.ebuild 1146 BLAKE2B f127e77839e49fb8b5bef79db19fe222e1fd9fe74bd183b65b4ca44b4a155a2f3e7d6481aafec8cc21f3c793cb33119b2471c4c213a57c91ebe27357a136afcb SHA512 50a76ff1d6b274f4f0ed24c5ddf4e5b022174a523d0b66e9f556c644c898a51e27ab334882df8d1313c74c367293bb9e3f7c32eee624e1fe795532722e3113ab
 MISC metadata.xml 869 BLAKE2B c5414b2e27b44526c56e9c476d8c5540a3d7b462b70ed6e3e323c0dbee15c704055cc7d17bf270fbb7a6125bfa10a2934c9d56d5c727d73df0c8125ec30671d6 SHA512 f893bc5d9b44d26e178250432be8762524543f0c124c932d535e4f9742924d27a26b065a5d1275dc451f23b0ff72a55a2f5107749021081e7e399617de132f17
diff --git a/dev-cpp/notcurses/notcurses-2.2.3.ebuild b/dev-cpp/notcurses/notcurses-2.2.8.ebuild
index 9715255eb4f2..db8a559116e6 100644
--- a/dev-cpp/notcurses/notcurses-2.2.3.ebuild
+++ b/dev-cpp/notcurses/notcurses-2.2.8.ebuild
@@ -14,9 +14,9 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="dev-libs/libunistring:=
+DEPEND="dev-libs/libunistring
 	media-video/ffmpeg
-	>=sys-libs/readline-8.0:="
+	>=sys-libs/readline-8.0"
 RDEPEND="${DEPEND}"
 
 src_configure() {
@@ -45,6 +45,6 @@ src_install() {
 	# x.y.1 or x.y.3, to install the source dir as a man page.
 	# exploit the fact that there's a bijection from html<>man.
 	for i in ../*.html ; do
-		doman ../$(basename ${i} .html)
+		doman ../$(basename ${i} .html || die)
 	done
 }