gentoo resync : 27.03.2021

5 files changed, 12 insertions, 12 deletions

diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 415bcd249492..038116281221 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -5,8 +5,8 @@ AUX socat-2.0.0_beta9-libressl.patch 9738 BLAKE2B c790d2e6486ace62f410680d936791
 DIST socat-1.7.3.4.tar.bz2 490552 BLAKE2B 68db1674a3156b28c10340e515f346de83d4e953570f3a3cdee9402db9f276285a8f46db14978b4651df6d0fa90fb496696f151afb3e826172daa444ee35e666 SHA512 f338d28e5fd9d7ebb9e30b0fa700bcd5ff50ff9e668403474963a3310ba2b5f68b5236b928872c18e4b1ee95328374987e7e263ac7655a0d9b3fc9da77281123
 DIST socat-1.7.4.1.tar.bz2 510101 BLAKE2B 9b7ca0a0add173c39d736d470079bf8e1330a8b11497128cc2b5edb019277682697f1f71f6d3d4a526a74a7297e4aace25493acea98ea95a885c52e5a9c34568 SHA512 7fa069bff294a01baebfd790faed027391ab1f47f09f0990e6dcb1c7cce5f3cdc20638fecb10e82c10b6342d903de9481f6d85a0debcc0368c882417dafbc756
 DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31 SHA512 f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834
-EBUILD socat-1.7.3.4.ebuild 1586 BLAKE2B 7dfdd2075cee949d3252488fb60a5d3370bf540463857521a06b5e3fc32ae75195a4383e8dc18673322ef3db9ab2f25209ac638e67e7ad65bc113a3d4285b50b SHA512 716db6a19271e18a9f08386ef2906f55d7c483186e3622fca19075b2fbcbb57c3f22fc7adf62398528b576afff040aa6bef3dbf6d6ccd9f0fc919dc1f9faaa07
-EBUILD socat-1.7.4.1.ebuild 1527 BLAKE2B 86e3e04f423fe199cae6ee0017d66aa0765f4bca095f1f02eec979760a0cd61205f36907e5ce9b83d2e9558bdf391afe5e305e2c937c9e7e65059658139f2668 SHA512 578929ddc138d0e0df22275f2351454bdbd1152d6e3deeb82e74e438a3b0abfdf8ef8960412054a20df92e80638310bf4bd4844b791899e1f1583a7fec66b76c
-EBUILD socat-2.0.0_beta9.ebuild 1684 BLAKE2B 8b12d6c8f85d1f3d161238100f994c1f85862b1abc0d5759eca22d5e743821d1cccd2e1f505b19faf8ad4d65803fe26fd1a388b8a21802f000ec94d9f145a360 SHA512 5c3c58e869b297dfffded35ff69b6f34574901472196863bd8f29d52e4957129923c2f0738dc0a0b64c6cebbcb421be20ff008561ab53bfc91f543a0f96726d1
-EBUILD socat-9999.ebuild 1406 BLAKE2B c68fd7bf03d58f1bd16266304afab4cc73e2e129be5facb7416ed0a765fd198b02a76e5459b4dda831e2c4765c6cd9d4e0669dd024795161f38909c62d882116 SHA512 6ab7b9aa353e917b8aa46f2179bbcff95fa03e1e59ff4a8f68c512cbc8a582d5e288bd79a2a251c47837b60318640a1005392e0ebc72844a08327e41effdcc18
+EBUILD socat-1.7.3.4.ebuild 1587 BLAKE2B ddd3c6d94cdca7f462f018214a95fc4f8d22c8b5020acd43808814a9ae62fbac4341d9146ae0acaf0d055753a3547d6941baa044bb288e61eb8b6503eee228df SHA512 c09705ad3cb215318117ce75af1540c0468ee901a27de374622c01abc47f011fd90243874519f8ecc8bf37bb9395e9e3ceb26a6c35a5c8f3e73625979cff5932
+EBUILD socat-1.7.4.1.ebuild 1528 BLAKE2B 5fed5c3401ce50e1f2c2d2bb7edfc687d896a0c7d9ee01d3bb4af4f0eae3625f98cda5e7b169ca25e32318d889b62482ae0a56f22e126956d67272767c6983f8 SHA512 8022000b46d1ac3ce3b33f9dbe1f4f4825ba2d29b2c5ea64d0bb44dcb241cca3d50802e6e9df33b4bf1c05c8c6cf6089a6b789a25aee89def8f17ae3840ef2b2
+EBUILD socat-2.0.0_beta9.ebuild 1685 BLAKE2B 783283ae2c853992e7fde6e7057a99de9aa8d9fc19b00a65b730425c66a95f6b96a465393508ae8a3cf85b62735fff56273112bde46d5c4fd2a761df94e5232d SHA512 8a4e0dddf6e33f95eea3e39373ad08ad29e2c534dcca1d1309c9ac537ee0c32730b5742300658a34ffc4cbf77191b326d9b843ee4066e4fcb80470a353988d8a
+EBUILD socat-9999.ebuild 1407 BLAKE2B 6a4ba58aca53b4e7da902ea6fc075fb2f48f1482008de6702b42025927a8bb6e414b32ac5d632a5ccabb14ed9191352b1cb7eb851d5bf47655ac5610946c1f02 SHA512 67ea7dca8d4502220aa7160238fa0c4bc5c6d63af5058474ecb3ec8690556c071f5f38a4c89eb8284c1f579e499f3920f51aef3c97343813c2305eaf849f58f8
 MISC metadata.xml 467 BLAKE2B c95bf4d69aaf5077911ffc97657ec511286dd4f524fa4b9a1d537cba55d6fbc6ed2bdebf5379daa7c340a2f56538a2546971b39e7915baed943b177e7813b781 SHA512 2eb27fc5699059cecf00fa097c2e09440d5efd5a3b851631818d965bbda6767bfcc60a663d24569ab8b89a2e60bac9a5aead5fb3ca52d15e1d250140e7b70514
diff --git a/net-misc/socat/socat-1.7.3.4.ebuild b/net-misc/socat/socat-1.7.3.4.ebuild
index 3eba54db2ef8..6a1961503781 100644
--- a/net-misc/socat/socat-1.7.3.4.ebuild
+++ b/net-misc/socat/socat-1.7.3.4.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="bindist libressl ssl readline ipv6 tcpd"
+IUSE="bindist libressl ipv6 readline ssl tcpd"
 
 DEPEND="
 	ssl? (
@@ -41,7 +41,7 @@ PATCHES=(
 
 pkg_setup() {
 	# bug #587740
-	if use readline && use ssl; then
+	if use readline && use ssl ; then
 		elog "You are enabling both readline and openssl USE flags, the licenses"
 		elog "for these packages conflict. You may not be able to legally"
 		elog "redistribute the resulting binary."
diff --git a/net-misc/socat/socat-1.7.4.1.ebuild b/net-misc/socat/socat-1.7.4.1.ebuild
index d064243f99d2..d7ded0482c7a 100644
--- a/net-misc/socat/socat-1.7.4.1.ebuild
+++ b/net-misc/socat/socat-1.7.4.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="bindist libressl ssl readline ipv6 tcpd"
+IUSE="bindist libressl ipv6 readline ssl tcpd"
 
 DEPEND="
 	ssl? (
@@ -37,7 +37,7 @@ DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY
 
 pkg_setup() {
 	# bug #587740
-	if use readline && use ssl; then
+	if use readline && use ssl ; then
 		elog "You are enabling both readline and openssl USE flags, the licenses"
 		elog "for these packages conflict. You may not be able to legally"
 		elog "redistribute the resulting binary."
diff --git a/net-misc/socat/socat-2.0.0_beta9.ebuild b/net-misc/socat/socat-2.0.0_beta9.ebuild
index 0f00e1445827..9532a8284217 100644
--- a/net-misc/socat/socat-2.0.0_beta9.ebuild
+++ b/net-misc/socat/socat-2.0.0_beta9.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="libressl ssl readline ipv6 tcpd"
+IUSE="libressl ipv6 readline ssl tcpd"
 
 DEPEND="
 	ssl? (
@@ -44,7 +44,7 @@ PATCHES=(
 
 pkg_setup() {
 	# bug #587740
-	if use readline && use ssl; then
+	if use readline && use ssl ; then
 		elog "You are enabling both readline and openssl USE flags, the licenses"
 		elog "for these packages conflict. You may not be able to legally"
 		elog "redistribute the resulting binary."
diff --git a/net-misc/socat/socat-9999.ebuild b/net-misc/socat/socat-9999.ebuild
index dada7a8478e0..b0f72ca9e8e3 100644
--- a/net-misc/socat/socat-9999.ebuild
+++ b/net-misc/socat/socat-9999.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://repo.or.cz/${PN}.git"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="bindist libressl ssl readline ipv6 tcpd"
+IUSE="bindist libressl ipv6 readline ssl tcpd"
 
 BDEPEND="app-text/yodl"
 DEPEND="
@@ -35,7 +35,7 @@ DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY
 
 pkg_setup() {
 	# bug #587740
-	if use readline && use ssl; then
+	if use readline && use ssl ; then
 		elog "You are enabling both readline and openssl USE flags, the licenses"
 		elog "for these packages conflict. You may not be able to legally"
 		elog "redistribute the resulting binary."