gentoo resync : 04.05.2021

4 files changed, 10 insertions, 13 deletions

diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest
index a0c408945c94..ba5f8ea26c8f 100644
--- a/net-analyzer/hydra/Manifest
+++ b/net-analyzer/hydra/Manifest
@@ -1,7 +1,7 @@
 AUX hydra-9.2-respect-cflags-more.patch 1072 BLAKE2B 4361f339a0cd9ea3a32a9671bb1a31f2775dceb6b2b305885a2a3e72a2329c5337221c895ab49129e920c36941d5b34101877ebf0d35f10f46d601de58981c21 SHA512 b00112c17f025b657111c93decdecc5ee4a10f388e259929ed2f55ca08888d24fb2fac1892df017d00602943ba93a72dcbbb4cf00fa808c2bc05ed1b95cb428a
 DIST hydra-9.1.tar.gz 611846 BLAKE2B 9a5b6dc52b5f4069bf326e86728ebaf8c1fe018536f3943b83493de934703bff6770ae3f7a9a223ee00b5f52f7bd10ee4ddc272e1bbad00c399aa19cc0c083ba SHA512 863176375fe1aae4c0a2b74c11aba297682d66e522c98c926c539348309b0af4e407e460b4cb803d2c83c008787c73f7f1e56ac6aca9791351e1b596c2e4fbb2
 DIST hydra-9.2.tar.gz 614176 BLAKE2B 102c744fbdd3702c624b1c8339178883b689db093d9f1c66d8e04816327eb8095f3e3133f889b2a6ee6dcabb9e5af0c71ec8470731b4b174021fbd79741d05e7 SHA512 ee8ecd854b61ac9d708098c8a0d9a128d8b80b38db1a2ba8eb06de6fbbc6865135d994620ade8e3742fb993899274ed9d8fd0e95bed7a9fbeb1ca9e182540322
-EBUILD hydra-9.1.ebuild 3625 BLAKE2B 2b45007774a181be5459a133c630c60c74f33845825b925e5dd316cc8f0f8f258990c10298179653427723bb4bb9b7f281cf484eecb58c5ff5d609b2c1f264f6 SHA512 7a93fbe38732a4336af0cbd57b75ded2ab850f92f589ca5ded2ed0615738d31a58bd3cc624b8f7fd6b59918ff9d8a4af79e2dc287001f5ba5146efbf65c214d6
-EBUILD hydra-9.2.ebuild 3662 BLAKE2B e49f162de992b218bd65ae480f52887188caa337ec0202b6ff19f52dc967e7ad93a7112203754541b2e065ce00fe245550b519bb7f47fa8c42fdc3d957379cea SHA512 f4db9ae074d853275a1a4fddbcaf7b81af05fdb91c3594327aa6dd39b51ad5f5513d0d7f6c65b4862ca184903be75851db361e317f7c8efd3cb58af25a87ade7
-EBUILD hydra-9999999.ebuild 3586 BLAKE2B d510ae7b3a31e0064563f7858c87b5830849ffb68fd4277e0716bf927fb2a879786844aa840c54c7da4beddd56b7518a9ade811ad26b3b63f55e44eae717fdf2 SHA512 73bd694d30bc004c10ff5ab4a61ff610e5830db180205991a4ba5e066904b663afba91554fe728496bf5f67d2bcc6383d1bc668931965cb996185369c3e3ad78
+EBUILD hydra-9.1.ebuild 3565 BLAKE2B 0194fe7972904f7cb3941db204847863739c933ff6fe1340664e3d467b77ab47df699e3197856182792dc49b0ef888b4283486151395e83cb2490776da20047d SHA512 9415468c35018864d296d2ff73d74f682c22145cb6bc4862a4f75c5d53484361a9023e2d91e0ddc9a08a34e01bbb8bd5a4f0e6dea82d328ca760a37d0c3e18b2
+EBUILD hydra-9.2.ebuild 3601 BLAKE2B 1f9db899a324ea8ae2b1acea1b9cc2f3c47fbafc554a4b8f58735acd76f5c2ae1d92d7a0e339e8eebf9a144a97622cc880d180de7e49a77b93658cef77bc3bf8 SHA512 79daf2557cc872cf7e401c389cde1e059c46c2cb52eea81d40d9679450894b10c359f0bd6808ad2e703262aa07b481782ebdf808cf6998c8d359740a6ccea001
+EBUILD hydra-9999999.ebuild 3526 BLAKE2B 62437e07d91e5424234b7adb9c86c6d9cb00b89e9133d37cdbcc861fa2d793737073e4c5243e612480d3333b2a514d7da690659d022a878a6ba0016e3e385d75 SHA512 9179b9f969452208c3be9720cb5529c01ebe44f1e5d58870365bf2b0b13138ba8d7fdf1a5b540ce2a8044aaf2448fc1614ff0e036a3c9b5aeaa53ae45ca47311
 MISC metadata.xml 583 BLAKE2B 4471d2ece7889ace03be32f2d7227bfe9a0b7795a0d6292b97cb46fb9944cdac8b248deafcef087bbbc885c885cc60d2d58c4ccac391dc6f90bcdd975bdff3df SHA512 ab05494b6f96f007c06d7f86b696d148a8b2bf12ab23e193751785023733d9472623a873167f3b580d9167021d794466304732958ffbc0e67027a06076fd2ec5
diff --git a/net-analyzer/hydra/hydra-9.1.ebuild b/net-analyzer/hydra/hydra-9.1.ebuild
index 1d9dfaec2fc5..09104ab74d27 100644
--- a/net-analyzer/hydra/hydra-9.1.ebuild
+++ b/net-analyzer/hydra/hydra-9.1.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="
-	debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncurses
+	debug firebird gcrypt gtk idn memcached mongodb mysql ncurses
 	oracle pcre postgres rdp libssh subversion zlib
 "
 
@@ -26,8 +26,7 @@ RDEPEND="
 	firebird? ( dev-db/firebird )
 	gcrypt? ( dev-libs/libgcrypt )
 	idn? ( net-dns/libidn:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	memcached? ( dev-libs/libmemcached[sasl] )
 	mongodb? ( dev-libs/mongo-c-driver )
 	mysql? ( dev-db/mysql-connector-c:0= )
diff --git a/net-analyzer/hydra/hydra-9.2.ebuild b/net-analyzer/hydra/hydra-9.2.ebuild
index ff6615335797..c93420ba6a1d 100644
--- a/net-analyzer/hydra/hydra-9.2.ebuild
+++ b/net-analyzer/hydra/hydra-9.2.ebuild
@@ -12,9 +12,9 @@ S="${WORKDIR}/thc-${P}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="
-	debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncurses
+	debug firebird gcrypt gtk idn memcached mongodb mysql ncurses
 	oracle pcre postgres rdp libssh subversion zlib
 "
 
@@ -28,8 +28,7 @@ RDEPEND="
 	firebird? ( dev-db/firebird )
 	gcrypt? ( dev-libs/libgcrypt )
 	idn? ( net-dns/libidn:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	memcached? ( dev-libs/libmemcached[sasl] )
 	mongodb? ( dev-libs/mongo-c-driver )
 	mysql? ( dev-db/mysql-connector-c:0= )
diff --git a/net-analyzer/hydra/hydra-9999999.ebuild b/net-analyzer/hydra/hydra-9999999.ebuild
index fd067f1b4ca5..170b7b810865 100644
--- a/net-analyzer/hydra/hydra-9999999.ebuild
+++ b/net-analyzer/hydra/hydra-9999999.ebuild
@@ -12,7 +12,7 @@ EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-hydra"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="
-	debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncurses
+	debug firebird gcrypt gtk idn memcached mongodb mysql ncurses
 	oracle pcre postgres rdp libssh subversion zlib
 "
 
@@ -26,8 +26,7 @@ RDEPEND="
 	firebird? ( dev-db/firebird )
 	gcrypt? ( dev-libs/libgcrypt )
 	idn? ( net-dns/libidn:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	memcached? ( dev-libs/libmemcached[sasl] )
 	mongodb? ( dev-libs/mongo-c-driver )
 	mysql? ( dev-db/mysql-connector-c:0= )