gentoo resync : 04.05.2021

5 files changed, 11 insertions, 15 deletions

diff --git a/dev-libs/libmowgli/Manifest b/dev-libs/libmowgli/Manifest
index 4e39a7f8c565..0f1fb42bc1c3 100644
--- a/dev-libs/libmowgli/Manifest
+++ b/dev-libs/libmowgli/Manifest
@@ -2,8 +2,8 @@ AUX libmowgli-2.1.3-cacheline-Ensure-sysconf-var-is-defined-before-use.patch 831
 AUX libmowgli-2.1.3-use-host-tools-for-ar-and-ranlib.patch 531 BLAKE2B 13627cf2420f8a9f1c90010e9b40fd4234a6c6603857f463de7d469a1e2e148bdf1ac5dc620ddfc622b2fe6da64f52f9756b2e980e529a78d519bcdd9ef36cf6 SHA512 b4e35ea2cb241a48ce698f7fe094a9a55b0c901f3a9f613a308898714496c4b3b531380d81ab34651b6f24dd877341eeb1c694120d420096854daad03240bd01
 DIST libmowgli-1.0.0.tar.bz2 105929 BLAKE2B f22af94e1d5693e92544e9c177f56caf7fcbbf3f46a254e1e6982ba0e6f41443bcf70d1b944cd68e7eea7a0247dd478777afcebb5db80742312149f52dd86bc4 SHA512 f3f7f9a527cb3f6f24c23d0585b55509d8721023c670df9e59a7f5667d4e12caf17ed71773cd1283a3ebfada465824653f654aa29d857c076875d36b2a824313
 DIST libmowgli-2.1.3.tar.gz 227742 BLAKE2B 9ef5c30880644247df3c98dabbd87694d0a7c92e7de0c44a73842d4c5bbc7f19a32db24acc52b27fe5f204b1f74a5c730c64edd1e8edd23bc320e4c0dc4a554c SHA512 bf976cf8b8bf0efaf7565230f42147adcdbe993339f58f907f5005eddf178d936cffb6cdbba59e38813854f30414856a1b9f8bdc972ea2f59cb08987ee336533
-EBUILD libmowgli-1.0.0-r1.ebuild 472 BLAKE2B 9d9c086a3f8f07ca535287baeda38018d0928c14f0601835d47f62274cb377960f67979ab6bbcad90301b212ef4e399f82f169a41aecf87c34790e3a3b6254ce SHA512 9f4b5f170de65914e4f404130b91f940139b608d67c243a180a588264e50173a1e76fe834e29bdcaaa52c6d98c8f35a2ca1ce892ca9263d77eb4478d9fe20653
-EBUILD libmowgli-2.1.3-r2.ebuild 1097 BLAKE2B 6398d0f93ca750d0b313fbc20eb8964443a01b473796a54d30080539e1a339de9c951b31d86d7d9cdafc755c7521ce77753e22c54019cc1a7a32440329cc3f6b SHA512 5e81a6c4303b4bb59c577c7c8e94d42ec317fcac4f6a0adf4b0b0c50d1c150d126fadc81b7953348ace8250921010dc434c06fa24be0286fc57f86c24bd14178
-EBUILD libmowgli-2.1.3.ebuild 758 BLAKE2B 48cead860bb0f3e97ee089a2780878fd1ea8e5b8b06ed9c8ff69f5bc8d63dce275b35b51ad1b6442eaebeca6d166779640d910dda5e91866f3308f80d9dff826 SHA512 7e4d4af5c0cfc8d25b602ce8fe6fa8b29747cfd451f7b39df13b2c458a22743dd7311141da14f0729077786731be7816324480094a34a0d87a1d1728b95a7ef1
-EBUILD libmowgli-9999.ebuild 608 BLAKE2B c6dedd277c9406c534b97383d19a58a4ed461c49e96877deca89b02354ad43473a00b51e460e25c52f97323dd36d0a70100ffae2e68b4e07d4d09841f49dd390 SHA512 e4f523ef69e89ffa039494816d20cc552264d0f3fbbc054a198a5697f88aed24b3b8a812febd5eae00b5fd94ddebdcf82c7962d88b44a6ccfbfe80d6cb69f821
+EBUILD libmowgli-1.0.0-r1.ebuild 464 BLAKE2B 3af1ab647f5ac276b5e696f6136c17e5344afbac60cfe40d8618d0e71fe0802655453a2ec33911dadc5cde5346a6ff6aeca7a291d7f2241162e22eeba667e42a SHA512 17ea5dcf4eed008028309dbb7bf22e6c0e8f4d4ffc5e0e6d705347cd505864466930f3ee73fad8972c637f75906c15e58f134363375ae0101082e127d12a5320
+EBUILD libmowgli-2.1.3-r2.ebuild 1036 BLAKE2B 87b25ec5f80417e482fa14e7c3c26881eef72cdfeccfe01dcc182ee5bc2aff727ab6a8314cbb7194a88fe3ea84463d3ffd6f4575f7131623180e13bb060a644d SHA512 d4e660c81986de1b8a53b93a17276012db7e1db85ccf53438dfb0c6414c4036abf246392038158bef1b1df8b45a66f264a5b005de4af186a37d9723117f4bf0a
+EBUILD libmowgli-2.1.3.ebuild 698 BLAKE2B 00c9b02c91eebe7bfa1d688dd60e55b529efc6f3d0b0dbb6f0e1793ec94d48c3dfd40ed7b736e56edc12275bbf0e321c031c1bf7763f5c0f0f69fcfaea839975 SHA512 9993961b99e43d87af42d5dc2679935d2272d22f254047262ccce7314d1d36cfae5d297e42bfe3c2f8edb5e6d29f7d5f12bd509d658f6f18cf1bac225333dd81
+EBUILD libmowgli-9999.ebuild 544 BLAKE2B 2879462d9fd8852a509694b9e109d0f9b6aff350057a53c0e6842d4698aa3930ba307905b2a0f9b217959aec45f5a9b4e7b862dac725b02f78ff945b58c89c8b SHA512 4e0499381d9648023b989d981e9a89ef45eb2f521f6ca0dae3e5da410210ebcae879e6c3448aa5dc3b105bc57ae48daa6b6737866bfceef6f62d75a3857e7ff9
 MISC metadata.xml 394 BLAKE2B e4b580e9a34040eb194ded9a3bdb46c08be541e2ed3f6d0f6399a9f7c6f05f6e6b315ef0233f1f2c4b3013115714aadb8c2074ec1aef3d6205558be3c79bb069 SHA512 926f5b878e7e6065111e669945eb71a5cd645b7e52cd548fcdf078c3b1eb95a855e4ad23690b00426fad059304c6356b16d01c647c91972c55ab6e90715b0aca
diff --git a/dev-libs/libmowgli/libmowgli-1.0.0-r1.ebuild b/dev-libs/libmowgli/libmowgli-1.0.0-r1.ebuild
index cb0973240225..af108d290d58 100644
--- a/dev-libs/libmowgli/libmowgli-1.0.0-r1.ebuild
+++ b/dev-libs/libmowgli/libmowgli-1.0.0-r1.ebuild
@@ -10,6 +10,5 @@ SRC_URI="http://distfiles.atheme.org/${P}.tar.bz2"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
 DOCS=( AUTHORS README doc/BOOST )
diff --git a/dev-libs/libmowgli/libmowgli-2.1.3-r2.ebuild b/dev-libs/libmowgli/libmowgli-2.1.3-r2.ebuild
index ff19e41257c5..e7b02c8ea2b2 100644
--- a/dev-libs/libmowgli/libmowgli-2.1.3-r2.ebuild
+++ b/dev-libs/libmowgli/libmowgli-2.1.3-r2.ebuild
@@ -12,11 +12,10 @@ SRC_URI="https://github.com/atheme/libmowgli-2/archive/v${PV}.tar.gz -> ${P}.tar
 LICENSE="BSD-2"
 SLOT="2"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="libressl ssl"
+IUSE="ssl"
 
 RDEPEND="ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=
 	)
 	!~dev-libs/libmowgli-2.1.0" # Bug 629644
 DEPEND="${RDEPEND}"
diff --git a/dev-libs/libmowgli/libmowgli-2.1.3.ebuild b/dev-libs/libmowgli/libmowgli-2.1.3.ebuild
index fda525fcb4a5..e47671e57767 100644
--- a/dev-libs/libmowgli/libmowgli-2.1.3.ebuild
+++ b/dev-libs/libmowgli/libmowgli-2.1.3.ebuild
@@ -10,11 +10,10 @@ SRC_URI="https://github.com/atheme/libmowgli-2/archive/v${PV}.tar.gz -> ${P}.tar
 LICENSE="BSD-2"
 SLOT="2"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-linux ~ppc-macos"
-IUSE="libressl ssl"
+IUSE="ssl"
 
 RDEPEND="ssl? (
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	)
 	!~dev-libs/libmowgli-2.1.0" # Bug 629644
 DEPEND="${RDEPEND}"
diff --git a/dev-libs/libmowgli/libmowgli-9999.ebuild b/dev-libs/libmowgli/libmowgli-9999.ebuild
index bae567fb341c..bbf56b6c4b73 100644
--- a/dev-libs/libmowgli/libmowgli-9999.ebuild
+++ b/dev-libs/libmowgli/libmowgli-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,12 +12,11 @@ EGIT_REPO_URI="https://github.com/atheme/libmowgli-2.git"
 LICENSE="BSD-2"
 SLOT="2"
 KEYWORDS=""
-IUSE="libressl ssl"
+IUSE="ssl"
 
 RDEPEND="
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=
 	)"
 DEPEND="${RDEPEND}"