gentoo resync : 04.05.2021

4 files changed, 5 insertions, 93 deletions

diff --git a/net-news/newsboat/Manifest b/net-news/newsboat/Manifest
index a40ee8cd74cb..3574a35beb84 100644
--- a/net-news/newsboat/Manifest
+++ b/net-news/newsboat/Manifest
@@ -1,6 +1,5 @@
 AUX newsboat-2.11-flags.patch 380 BLAKE2B 2479cfb65282b0cbdbf4d0c6d82257b00254970a6429d388a01b462e4294be2130f9ffebc9380b95d87b4de067768b1b263e28888de88ab48e7497e78d2424f8 SHA512 d031df9800fcbdeddd96b9aaa8fe936f66c35523adee0f1c8e1d08664f6a3ff9e04c606633f2df29fac5ee660b2f11b23c41e63499ad84a528426b9f9b1752b6
 AUX newsboat-2.19-json-c-0.14.0.patch 970 BLAKE2B e6685bca764b01c62d0e76b743aa95c90541d10283cfb74f4a58c2f730cb311d35dd27a54496aa183f40bdc54afd4d9cc50e812cfe612ed1a69405f25c11e39c SHA512 482086d59d6fa0c67897c829ced6480e674b8e42b3d658e65842ac0a75719ca1981175165014567c53d74d4d902d266b2903865acebec02b7df4ee63f483c138
-AUX newsboat-2.20.1-libressl.patch 5444 BLAKE2B c074ec60978b475d41adfbb3e4fe2d1c27f98deb033b85375a7ebfd80a9c2cb2443f9fab1595444ae203f26dade195555bfae106b07ae68b375acf99ad0f862d SHA512 62d3c49a902e720ba727a8c48fdad0668b071b1f187fe434f2a913e931ac05dfa747968b402d38b982904ce70a33019099e11262d46c4d65164ddddde2ded004
 DIST addr2line-0.12.2.crate 119767 BLAKE2B 5d012c7c0a0d8afd48f2148b5fb4ceb54f525ef1ae6e4f9c0ad228cff059b2e0662aabb82eead22db6ea284b5c430c8b8cc2aa0100a46d8d14009bd88b5fe24a SHA512 2c797f587498418c3c14d8ffc7eb79092532dfbb290b5371594e8dbd82a0979929ecb0b6f2cb615d0481a555cb1508b4220acb2db8076ea64fee0d47f290de6d
 DIST adler32-1.1.0.crate 5442 BLAKE2B 1a4d932402a584fa6edda414c0dedff4994afcee7bfc71f85f6e8b4568de835bb7a3eebad1b5ac0be7f59cdb0e5ce5dfa4444d2c59d5ecf819d2a6abbbd7ea37 SHA512 57e3b3812e2747470c63edf64e13827c96ef8dd2311833b7f616ec63cf57ce8967636ec4d57464b607f570df06f6f648214d12ddc567e761b2de2ab16c8a7271
 DIST aho-corasick-0.6.9.crate 25979 BLAKE2B a1bbec11c322d20d435d8683151b144e31f04b07ca47fc1c8128464533256f4004c8d346fe59a1e1c41be5609fdf768fad5f1afa5df94d1a02ced5c4f02c4bac SHA512 8dfc817b435d8a44fb4ca79bb20e283659c2fe9a75a4892389958f5880acc436bbe32552098429f15585ee025d064fdb5806b814f0e9d67a4261ffd23852172b
@@ -161,6 +160,6 @@ DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST xdg-2.2.0.crate 13387 BLAKE2B f1a5909b6a4544eaf28d1d051e05a6b9b09043060e14e394410778ed175e9f27246afadf3851dec21020c5e2ca81ef4db44a34e58d9229972b2475ff5f40d6c9 SHA512 16342b8396b4a329801a0ce3b9db82c4c767d09339f895d9f000c64b7160df11019b320cda632f99d8d5b9f65c97894b09091ee4e2ccafac0cd671481fa5c61e
-EBUILD newsboat-2.20.1.ebuild 3150 BLAKE2B 7b8cf2e13e5506b6ce6e6705c18eb1d2762fb3737184099d723ed1a851331f1538d72f3923831626c5dfa5ef1af3b14889c4b86081c79bc911dff3dc5c304a20 SHA512 9ba409d3019bc581cf4f841468a56a2a42346e691939725773d6ae52fa62e2404851e0d08ef9b461059a683772376145afa670e9d20b42ea4b6e2a22a026c66a
-EBUILD newsboat-2.21.ebuild 2771 BLAKE2B 1a806c6808aa8656c6682e67aedb6ab0b433e90b0ecdbfc2cdf7af146b6ebd97696f05e32026f0ef9c7476b78745680dc1cc973d99a93e8f795cfdc41034e70b SHA512 d039f33e9c915a08a3224dd38856499cd034ee25f428d7d16a6a30a6f9fb230a53730b15b1a5599af410c8f5f6804ae4bcddd6e820b15331d6be0d129f6ec2e8
+EBUILD newsboat-2.20.1.ebuild 3035 BLAKE2B 48f37f94d52b2bb9aa276fd81c569401e38b3f517edee638e1c6410358f5fdd667691dc6d585ee16ed633076f6574de2b7b6ea78ad29733c2d5c69dba4c4f66c SHA512 4ad2df95672d462359cffb52d2e4b0bdda8fcffd03f2ec96b0b4002235e1445803c092006c91d43d5846d385fb8e05379e5cae15c2d5409ee2b5a887b338b01b
+EBUILD newsboat-2.21.ebuild 2707 BLAKE2B 8d5d542f62527de3ccc1b11c92ccbd201f259d2868e82b35535174df035f6f0e617a5cb4b9dda02f6d2dc0da27095c5112a2e7bc23976faf2bed024b486fe6ec SHA512 77faf83c1295d2c5db20577e78b1e13baac89bb4ad42d42de12b84f23eeed7edbf36983db9a33c7433fe06cddb6e6aacad042a2d216f99e4d3dbe04fb9e5492a
 MISC metadata.xml 215 BLAKE2B 936d37ef66986b32cf36792a6e24253e879e02aacddfc3c3fbba0ff7951e761a2db63a0c344c512315b3845f6e9a9116effa985de44cfcaf22f7bf432533a5fb SHA512 13b907fe919da35e8fe030dcfcfcb4feb35b802e9c4a8721aa36454648f8f8c15e80ffaecd795c9ca8b4a6bd4a0650b6c548fed935b601569c1ac243eb0724f1
diff --git a/net-news/newsboat/files/newsboat-2.20.1-libressl.patch b/net-news/newsboat/files/newsboat-2.20.1-libressl.patch
deleted file mode 100644
index 2a2bf35039c4..000000000000
--- a/net-news/newsboat/files/newsboat-2.20.1-libressl.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index b25f598d..ad928616 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -151,12 +151,12 @@ dependencies = [
- 
- [[package]]
- name = "curl-sys"
--version = "0.4.5"
-+version = "0.4.12"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-  "cc 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
-  "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
-- "libz-sys 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libz-sys 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
-  "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)",
-  "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
-  "vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -273,12 +273,12 @@ dependencies = [
-  "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
-  "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
-  "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "curl-sys 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "curl-sys 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
-  "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-  "gettext-rs 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
-  "gettext-sys 0.19.8 (registry+https://github.com/rust-lang/crates.io-index)",
-  "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
-- "libz-sys 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libz-sys 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
-  "natord 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
-  "nom 5.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-  "once_cell 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -305,7 +305,7 @@ dependencies = [
- 
- [[package]]
- name = "libz-sys"
--version = "1.0.17"
-+version = "1.0.18"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-  "cc 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -822,7 +822,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
- "checksum constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
- "checksum crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
--"checksum curl-sys 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "71c63a540a9ee4e15e56c3ed9b11a2f121239b9f6d7b7fe30f616e048148df9a"
-+"checksum curl-sys 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "78800a6de442f65dab6ce26c6f369c14fc585686432bf4b77119d2d384216c31"
- "checksum dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3"
- "checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b"
- "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
-@@ -836,7 +836,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- "checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1"
- "checksum lexical-core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d7043aa5c05dd34fb73b47acb8c3708eac428de4545ea3682ed2f11293ebd890"
- "checksum libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)" = "99e85c08494b21a9054e7fe1374a732aeadaff3980b6990b94bfd3a70f690005"
--"checksum libz-sys 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "44ebbc760fd2d2f4d93de09a0e13d97e057612052e871da9985cedcb451e6bd5"
-+"checksum libz-sys 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)" = "87f737ad6cc6fd6eefe3d9dc5412f1573865bded441300904d2f42269e140f16"
- "checksum locale_config 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "14fbee0e39bc2dd6a2427c4fdea66e9826cc1fd09b0a0b7550359f5f6efe1dab"
- "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
- "checksum memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e1dd4eaac298c32ce07eb6ed9242eda7d82955b9170b7d6db59b2e02cc63fcb8"
-diff --git a/rust/libnewsboat/Cargo.toml b/rust/libnewsboat/Cargo.toml
-index 6f661009..744ba057 100644
---- a/rust/libnewsboat/Cargo.toml
-+++ b/rust/libnewsboat/Cargo.toml
-@@ -18,14 +18,14 @@ xdg = "2.2.0"
- backtrace = "= 0.3"
- unicode-width = "0.1.5"
- nom = "5"
--curl-sys = "0.4.5"
-+curl-sys = "0.4.12"
- libc = "0.2"
- gettext-rs = "0.4.1"
- natord = "1.0.9"
- 
- # We don't use the following crates, but we pin their versions to make sure
- # that Newsboat builds with Rust 1.25 and later.
--libz-sys = "= 1.0.17"
-+libz-sys = "= 1.0.18"
- 
- # The following constraints close security holes
- # https://rustsec.org/advisories/RUSTSEC-2019-0009
diff --git a/net-news/newsboat/newsboat-2.20.1.ebuild b/net-news/newsboat/newsboat-2.20.1.ebuild
index be1f7d8221b5..15bb080ac8fd 100644
--- a/net-news/newsboat/newsboat-2.20.1.ebuild
+++ b/net-news/newsboat/newsboat-2.20.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2020 Gentoo Authors
+# Copyright 2017-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Auto-Generated by cargo-ebuild 0.3.1
@@ -117,7 +117,6 @@ SRC_URI="
 LICENSE="Apache-2.0 BSD-2 Boost-1.0 CC0-1.0 ISC MIT Unlicense"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~ppc64 x86"
-IUSE="libressl"
 
 RDEPEND="
 	>=dev-db/sqlite-3.5:3
@@ -132,13 +131,11 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	sys-devel/gettext
 	sys-libs/zlib
-	!libressl? ( <dev-libs/openssl-1.1.2:0= )
-	libressl? ( <dev-libs/libressl-3.1:0= )
+	<dev-libs/openssl-1.1.2:0=
 "
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.11-flags.patch"
-	"${FILESDIR}/${PN}-2.20.1-libressl.patch"
 	"${FILESDIR}/${PN}-2.19-json-c-0.14.0.patch"
 )
 
diff --git a/net-news/newsboat/newsboat-2.21.ebuild b/net-news/newsboat/newsboat-2.21.ebuild
index fa1a16f4b4f1..2688836e1167 100644
--- a/net-news/newsboat/newsboat-2.21.ebuild
+++ b/net-news/newsboat/newsboat-2.21.ebuild
@@ -97,7 +97,6 @@ SRC_URI="
 LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 MIT Unlicense ZLIB"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~ppc64 x86"
-IUSE="libressl"
 
 RDEPEND="
 	>=dev-db/sqlite-3.5:3
@@ -107,8 +106,7 @@ RDEPEND="
 	dev-libs/libxml2
 	sys-libs/ncurses:0=[unicode]
 	sys-libs/zlib
-	!libressl? ( dev-libs/openssl )
-	libressl? ( dev-libs/libressl )
+	dev-libs/openssl
 "
 DEPEND="${RDEPEND}
 	sys-devel/gettext