gentoo resync : 04.05.2021

6 files changed, 15 insertions, 20 deletions

diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 47ebf5e8bc28..fb1f855b4dc3 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -10,9 +10,9 @@ DIST glusterfs-8.3.tar.gz 7829522 BLAKE2B 1ba60f7209db4f1ce21237c3adea94df1b9eae
 DIST glusterfs-8.4.tar.gz 7833014 BLAKE2B c67f510c655465e9fbecaa7f391531543e37a2a84917592e699d88564b24fe55689b95770f385ac5b645069f287d4af974db76a77c0f44ea5d2e88f995b427f7 SHA512 a81394b3584c2e6c27060367b443c0879512054ed9287740bc24308603b9e3c11376179ed6589d5d38441982cd6415e3612f98ae4c97ddf7d5c747b42171d796
 DIST glusterfs-9.0.tar.gz 8171193 BLAKE2B f9f9905515607b4877432bde264075f73c4c076ae435a67ab803affc468f5f88d02235419fea6e25db19adecff9b797a41eb5ac63772fe81251c064389f7aca6 SHA512 daa5a7342c067c75668910e8fed17145636e7a576830b4cd68e81d9fceedaab918228b8780ebd5014e2397e0606858af650cd2c52bec0883ccd2126955ad07e7
 DIST glusterfs-9.1.tar.gz 8206207 BLAKE2B dea099eb1d366704010247964c24de404fb09c00a375dde4af30a2af836d3b35689fab91a75268aa01dba45860eb50a6e0572913c059e53fb5799d2302c2f005 SHA512 2c26813f12fed7a0640cc470badc2b83f156b660ef475487a689dca6c3fa407192f4959aeaf7a981969a079cf5d2c7aace85ff818ea6133d5a085d90d226e1da
-EBUILD glusterfs-7.9.ebuild 5938 BLAKE2B 7b31e021d5702e99ef8041f3cb7345ec13f88b721adbe8aaae10432592186bbadb8327fce4f2ba6416e40c4b1c75a05f0a1de53c3f4aeb55143ebe66b2bf42a1 SHA512 d1b260eea7412f9db4d0054fa8d9b4ee265232d31b68bbb7171ba28927c8fe1348032a80386da19c851735a0c3264dfb1b32e2bf0dfb520f172e755458178e65
-EBUILD glusterfs-8.3.ebuild 5452 BLAKE2B 1746dbcbe52adca356cb848d864daae65fbac286e9a5ead200db2efe1e007f0ab8029baa8e5d3de898cdbe5c2be62f00d8f7d33e7c2d5eca78cb09f69d9db18d SHA512 b35a4949640fc579acb4254536e5242592ddcfb78ae79280b115c8b6565160f7b5bb9aafa41f97cb4d66d800e7048bd50a266bca8b0e4ab9412f7865cce396d3
-EBUILD glusterfs-8.4.ebuild 5456 BLAKE2B eeb9144d6e458da1dac3feb025b2aca0d58e3a2fae7f722999f9b784a99931bc74bd8c53e4aff27969cb9a96b321467f1ccb051686481cdc3c42cf9613bf2f9a SHA512 1d87562916c3bf7ed30e8d150b747a2832f6178b5c9a6d74e62351926c3b7f9183c94c7759e7c9a0d4f06297eb90108a613200494481354cfdae762a1cb93955
-EBUILD glusterfs-9.0.ebuild 5456 BLAKE2B eeb9144d6e458da1dac3feb025b2aca0d58e3a2fae7f722999f9b784a99931bc74bd8c53e4aff27969cb9a96b321467f1ccb051686481cdc3c42cf9613bf2f9a SHA512 1d87562916c3bf7ed30e8d150b747a2832f6178b5c9a6d74e62351926c3b7f9183c94c7759e7c9a0d4f06297eb90108a613200494481354cfdae762a1cb93955
-EBUILD glusterfs-9.1.ebuild 5477 BLAKE2B 74598848709198e1dee9b33b3aa8dd20c6233c57497722cedaf264247603af47d16d0eef4bdfe46a053bc612a6393235f8c21ed6b10d4cf585dec9fb2b08df3b SHA512 9ed5c4ca69708f805d758f510aff50c55282358457446137750a87b500c89fa78a19787486865f2936f1085c33894faa9a4f666f20cbb5bcd9ffdbc0ae864089
+EBUILD glusterfs-7.9.ebuild 5879 BLAKE2B 3ce9d8f2b643ebae7c6d611985a67b2d1a033bce3a4a8dee15266fefc862cf4f99914420616b27770e2cb650b1a031e9592d6f526f0f158b804b66076390ea17 SHA512 09a332a7215f08148a512dfbc4dae9d17a812ceb75ac02dc84d3c59b8b6b157ee0a3a96c6a858d9dd3963e5c17c216d9c33d1e67ab67f9bc93e12378635fdbbf
+EBUILD glusterfs-8.3.ebuild 5393 BLAKE2B 355898682abe9959bab05d84f82965ce6becb4552291fb6ae82b67c6b7116f7514d75f963da529cf98b0f4a19f92cd8eaee4b1772fdf09cf60d1f87ba17b9fde SHA512 fd7b898ffa4fb6d340599a34a005a64a237aa7184ba76fce052d4e94904c582ae00f031f8ead2b143d4e96e0bee991db70405795cd54ffdbcaef7f8469c6a188
+EBUILD glusterfs-8.4.ebuild 5397 BLAKE2B ca7003592d3dcde38025a0670605e0400593284aa225edea7bd38047abd5254fc9becb5ee770f4aa4b0862a08a05cbaae464401811a1f2a96374bd46b673f2d3 SHA512 6fb2836bd047ca08d5467926eadcf697257509561633c3e6e9f3548426880b8f3dacf7899726b5c4d0bb8ff7f1519bd7967e4b6d430d44b3ca42bf7c40981654
+EBUILD glusterfs-9.0.ebuild 5397 BLAKE2B ca7003592d3dcde38025a0670605e0400593284aa225edea7bd38047abd5254fc9becb5ee770f4aa4b0862a08a05cbaae464401811a1f2a96374bd46b673f2d3 SHA512 6fb2836bd047ca08d5467926eadcf697257509561633c3e6e9f3548426880b8f3dacf7899726b5c4d0bb8ff7f1519bd7967e4b6d430d44b3ca42bf7c40981654
+EBUILD glusterfs-9.1.ebuild 5418 BLAKE2B a5c1bf500d67d35cbf68df34cf96f441f385e16c7a2c04a3834050cfdaf6f9039ec6b98eb5c645af45888d8c27f12266a9976f79cf47d1025326c6c9cf0f8af5 SHA512 d020ae1f6981b5e1bfff52be7c63d9b1a57947e05695710ff125d229d2961148bb9d58a55928b45591302f3fe6c1ed9d61ecb7b52b4b1d2906eaab467f957275
 MISC metadata.xml 1516 BLAKE2B dc32b16a9cc12174d5cf6a82f8d45920392d43545a4ed9be1c6a0ec3bc50b7c51a647b049c1b74971e95a4de949c9205ad168bfc8f074ca4c535d2999b917d3a SHA512 04542d21102f1722d8f82e498f38e91316932d96f0a05eec74180e4ad133b83fd26d58d3591d2906995072c184822d7ed16357d741b7de99a0c7ff7571da6a08
diff --git a/sys-cluster/glusterfs/glusterfs-7.9.ebuild b/sys-cluster/glusterfs/glusterfs-7.9.ebuild
index 84f522b78c81..606d9b72d06e 100644
--- a/sys-cluster/glusterfs/glusterfs-7.9.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-7.9.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gluster.org/ https://github.com/gluster/glusterfs/"
 
 LICENSE="|| ( GPL-2 LGPL-3+ )"
 SLOT="0/${PV%%.*}"
-IUSE="debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test +xml"
+IUSE="debug emacs +fuse +georeplication infiniband ipv6 +libtirpc rsyslog static-libs +syslog test +xml"
 
 REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
 	ipv6? ( libtirpc )"
@@ -40,8 +40,7 @@ RDEPEND="
 	!elibc_glibc? ( sys-libs/argp-standalone )
 	libtirpc? ( net-libs/libtirpc:= )
 	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-	!libressl? ( dev-libs/openssl:=[-bindist] )
-	libressl? ( dev-libs/libressl:= )
+	dev-libs/openssl:=[-bindist]
 "
 DEPEND="
 	${RDEPEND}
diff --git a/sys-cluster/glusterfs/glusterfs-8.3.ebuild b/sys-cluster/glusterfs/glusterfs-8.3.ebuild
index 7781fd95707c..eb0826d32139 100644
--- a/sys-cluster/glusterfs/glusterfs-8.3.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-8.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gluster.org/ https://github.com/gluster/glusterfs/"
 
 LICENSE="|| ( GPL-2 LGPL-3+ )"
 SLOT="0/${PV%%.*}"
-IUSE="debug emacs +fuse +georeplication ipv6 libressl +libtirpc rsyslog static-libs +syslog test +xml"
+IUSE="debug emacs +fuse +georeplication ipv6 +libtirpc rsyslog static-libs +syslog test +xml"
 
 REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} xml )
 	ipv6? ( libtirpc )"
@@ -39,8 +39,7 @@ RDEPEND="
 	!elibc_glibc? ( sys-libs/argp-standalone )
 	libtirpc? ( net-libs/libtirpc:= )
 	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-	!libressl? ( dev-libs/openssl:=[-bindist] )
-	libressl? ( dev-libs/libressl:= )
+	dev-libs/openssl:=[-bindist]
 "
 DEPEND="
 	${RDEPEND}
diff --git a/sys-cluster/glusterfs/glusterfs-8.4.ebuild b/sys-cluster/glusterfs/glusterfs-8.4.ebuild
index 447c689852df..a95eb88996f4 100644
--- a/sys-cluster/glusterfs/glusterfs-8.4.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-8.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gluster.org/ https://github.com/gluster/glusterfs/"
 
 LICENSE="|| ( GPL-2 LGPL-3+ )"
 SLOT="0/${PV%%.*}"
-IUSE="debug emacs +fuse +georeplication ipv6 libressl +libtirpc rsyslog static-libs +syslog test +xml"
+IUSE="debug emacs +fuse +georeplication ipv6 +libtirpc rsyslog static-libs +syslog test +xml"
 
 REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} xml )
 	ipv6? ( libtirpc )"
@@ -39,8 +39,7 @@ RDEPEND="
 	!elibc_glibc? ( sys-libs/argp-standalone )
 	libtirpc? ( net-libs/libtirpc:= )
 	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-	!libressl? ( dev-libs/openssl:=[-bindist] )
-	libressl? ( dev-libs/libressl:= )
+	dev-libs/openssl:=[-bindist]
 "
 DEPEND="
 	${RDEPEND}
diff --git a/sys-cluster/glusterfs/glusterfs-9.0.ebuild b/sys-cluster/glusterfs/glusterfs-9.0.ebuild
index 447c689852df..a95eb88996f4 100644
--- a/sys-cluster/glusterfs/glusterfs-9.0.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-9.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gluster.org/ https://github.com/gluster/glusterfs/"
 
 LICENSE="|| ( GPL-2 LGPL-3+ )"
 SLOT="0/${PV%%.*}"
-IUSE="debug emacs +fuse +georeplication ipv6 libressl +libtirpc rsyslog static-libs +syslog test +xml"
+IUSE="debug emacs +fuse +georeplication ipv6 +libtirpc rsyslog static-libs +syslog test +xml"
 
 REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} xml )
 	ipv6? ( libtirpc )"
@@ -39,8 +39,7 @@ RDEPEND="
 	!elibc_glibc? ( sys-libs/argp-standalone )
 	libtirpc? ( net-libs/libtirpc:= )
 	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-	!libressl? ( dev-libs/openssl:=[-bindist] )
-	libressl? ( dev-libs/libressl:= )
+	dev-libs/openssl:=[-bindist]
 "
 DEPEND="
 	${RDEPEND}
diff --git a/sys-cluster/glusterfs/glusterfs-9.1.ebuild b/sys-cluster/glusterfs/glusterfs-9.1.ebuild
index 074763734a0d..1cd066e8303d 100644
--- a/sys-cluster/glusterfs/glusterfs-9.1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-9.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gluster.org/ https://github.com/gluster/glusterfs/"
 
 LICENSE="|| ( GPL-2 LGPL-3+ )"
 SLOT="0/${PV%%.*}"
-IUSE="debug emacs +fuse +georeplication ipv6 libressl +libtirpc rsyslog static-libs +syslog test +xml"
+IUSE="debug emacs +fuse +georeplication ipv6 +libtirpc rsyslog static-libs +syslog test +xml"
 
 REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} xml )
 	ipv6? ( libtirpc )"
@@ -40,8 +40,7 @@ RDEPEND="
 	!elibc_glibc? ( sys-libs/argp-standalone )
 	libtirpc? ( net-libs/libtirpc:= )
 	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-	!libressl? ( dev-libs/openssl:=[-bindist] )
-	libressl? ( dev-libs/libressl:= )
+	dev-libs/openssl:=[-bindist]
 "
 DEPEND="
 	${RDEPEND}