gentoo resync : 04.05.2021

4 files changed, 9 insertions, 11 deletions

diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index db1002366297..251ce5e26f17 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -19,7 +19,7 @@ DIST torque-4.1.7.tar.gz 6218108 BLAKE2B 6c1ad0f1bb3f364603ad7f498999bd910491910
 DIST torque-4.2.10-gh-20150517.tar.gz 5836286 BLAKE2B 7108f1adcb6f674526b7db97df4ebcee04ae5c818d4f35ed1230a4e72e52ec0bc3b44e17334a143b21bcd3acccefc3927eca4f98d54d37745c8bb46a75e07045 SHA512 600bb5389b6a4161732b7aa82627f1ebeae238d7091aa2e223d9a14c44bf4668662f664b976f62ba3f1d8a366f90fb6058a8c904e20c26432dccd6abcd9c57fa
 DIST torque-6.0.4-gcc7.patch 50412 BLAKE2B 43748e9bfd3811abdfeb56f93dd517fcb07a6902194120e2c9e16bbe5bbe0f04afd3f898616d46e0310902a6376671be0c8f3865e8f7dd5381fca46e7ad62fc8 SHA512 430ae6a80ebbfb2066831326f8ce25a34cb6fc17c1fbe4a202c495baceb2b7011c9f6782da31b78c34287f26765c76c587611d689791523b8bd53d634e3681b6
 DIST torque-6.0.4-gh-20170829.tar.gz 6182495 BLAKE2B f9156ae4ffe388a7f3fa0df142e5f2d48c16fd7b8c148a3a80cd1c977eb0c1ef4a455da275f993100867be043422526ed05c53734e707851083d6d23ee1a2cc4 SHA512 8f1101adb89e06617de501f7956e126633b78b495baeb7980d3c534d34537cc604a3cf0a7c23c48eb2554b26cc13672b0e00c75d0f722d63ac4d42d57388ed94
-EBUILD torque-4.1.7-r1.ebuild 7443 BLAKE2B bdef3cb89b640f9287ea6f1c4b6adde228ff36a5f4e1e66058d4b5d04180457c33dec87cdbb09b4079af0c58e747f7f7a11ba40c1d7c04209272cb8342048721 SHA512 92ffb6ba2eff721f866469517832e58ccdc5c07e212ff0926d1abcdabd89944bc9d66cfe57982723ff7ce9a16d36e4feee7cfcf86133d63a20239b5751f4be75
-EBUILD torque-4.2.10-r1.ebuild 6081 BLAKE2B fb0ecc2bc7a3c4989e2785deaabdbd8c9885e9ef44f8b766a93a28a2e026cd7e37bce01e355ce983ad75171cf6f3549a8d4b6a2441781afa0d59dcbf7c45bdd8 SHA512 bfd98258caf95fcf9cf37295acbf43302f31095ec6d72cae4aa25c0722887644b961d3dc70b66e6a2505c656edea5e99d6f52451dd72db61c0709ad5329faa73
-EBUILD torque-6.0.4-r1.ebuild 5518 BLAKE2B 563b14e5a08bb429c5c5f40939bf7363e6260323de70b674d78f6aef7b3a20aa30b40a18f5c191e3b7540af82ac9f6a710131d2438509b5aed045c1491984c65 SHA512 cc45836fbd08c5da09cf85aa087fe337c6db863d3aa75e429857478c9970c88ea18fa36e9e5e65559ea78d0bad5daf0a499b6b3ba92b872300b804a4c77f8849
+EBUILD torque-4.1.7-r1.ebuild 7383 BLAKE2B 23dbbafc5d21a7a6631fb2278a81e7a6178241d7bce3c3aae9099b2fa1eb7504e20a9b6cddb4ac2de844b7460a9b46acb7139546320527f704bc8917fe0e0565 SHA512 0143debec0f6ef3b588d60c69c1d1257949361a3764d414bd92f1fa35769a31be9bc8d855a55a9f351e8ab77de32ac4a9d8fa2020c0588190f1d454a19fd3b47
+EBUILD torque-4.2.10-r1.ebuild 6021 BLAKE2B 535a550db66dfd73b4afa7e9c777a9aaa6bcfcd787aea54a72d146739dabf1be08e7676df4f47da0f59fa2b6b74341c3b0e8645853f136dae0cbbc65ab4ff650 SHA512 d224d2d7988fec1afddd9adb6210998846b4c3e0384d6aece745c897b4f962c3cc2091c00cab49e5ef8d32c56151171199e3f1776f37c396bb59cc3a28b51b86
+EBUILD torque-6.0.4-r1.ebuild 5509 BLAKE2B 503502630acabaf6e21dfee960b7e429d21e8f2539ca8ca87235132e3ad44175ce99e27d06cb75ad5400cc701ec4ec1a677545f4ee2c78c3711e45946a642036 SHA512 403fe8163731f94ff7069d31ae450086c73f7c5d5b0303e70dca4571e30677430a015c9755a2ddcd5b23269958efb1af67a1b7589e9da0a47c51d2cfa88a6a88
 MISC metadata.xml 875 BLAKE2B 5dc87d879d76aeabc191e39ed3732f7c4a114cd153a24a6d01fb8cfcb9b492a89a0241105f6e2f58b28f66a77632032d283499edeaed144abe6efd214eb038d8 SHA512 c317f81cd3df8549d58cc9216d9c2cff35b046efc1dac56b0dc22c5defc14f3fedbbc5ba3a4cdbb1c9561072222d90fe776c6e1a3e4bf11a135bb7e3bc408f95
diff --git a/sys-cluster/torque/torque-4.1.7-r1.ebuild b/sys-cluster/torque/torque-4.1.7-r1.ebuild
index ea5c56333ff2..4246e10b66c6 100644
--- a/sys-cluster/torque/torque-4.1.7-r1.ebuild
+++ b/sys-cluster/torque/torque-4.1.7-r1.ebuild
@@ -14,13 +14,12 @@ SRC_URI="http://www.adaptivecomputing.com/index.php?wpfb_dl=1690 -> ${P}.tar.gz"
 LICENSE="torque-2.5"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="cpusets +crypt doc drmaa kernel_linux libressl munge nvidia server +syslog tk"
+IUSE="cpusets +crypt doc drmaa kernel_linux munge nvidia server +syslog tk"
 
 DEPEND_COMMON="
 	sys-libs/zlib
 	sys-libs/readline:0=
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
+	dev-libs/openssl:0=
 	cpusets? ( sys-apps/hwloc )
 	munge? ( sys-auth/munge )
 	nvidia? ( >=x11-drivers/nvidia-drivers-275 )
diff --git a/sys-cluster/torque/torque-4.2.10-r1.ebuild b/sys-cluster/torque/torque-4.2.10-r1.ebuild
index 46e0fd38f968..682843cf7e65 100644
--- a/sys-cluster/torque/torque-4.2.10-r1.ebuild
+++ b/sys-cluster/torque/torque-4.2.10-r1.ebuild
@@ -15,14 +15,13 @@ SRC_URI="https://github.com/adaptivecomputing/torque/archive/ddf5c4f40091b615716
 LICENSE="torque-2.5"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cpusets +crypt doc drmaa kernel_linux libressl munge nvidia server +syslog tk"
+IUSE="cpusets +crypt doc drmaa kernel_linux munge nvidia server +syslog tk"
 
 DEPEND_COMMON="
 	sys-libs/zlib
 	sys-libs/readline:0=
 	dev-libs/libxml2
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	cpusets? ( sys-apps/hwloc )
 	munge? ( sys-auth/munge )
 	nvidia? ( >=x11-drivers/nvidia-drivers-275 )
diff --git a/sys-cluster/torque/torque-6.0.4-r1.ebuild b/sys-cluster/torque/torque-6.0.4-r1.ebuild
index b551a3e06694..3def8e696c1c 100644
--- a/sys-cluster/torque/torque-6.0.4-r1.ebuild
+++ b/sys-cluster/torque/torque-6.0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/adaptivecomputing/torque/archive/6a0b37f85c7d644e921
 LICENSE="torque-2.5"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="autorun cgroups cpusets +crypt doc kernel_linux libressl munge nvidia quickcommit server +syslog tk"
+IUSE="autorun cgroups cpusets +crypt doc kernel_linux munge nvidia quickcommit server +syslog tk"
 
 DEPEND_COMMON="
 	sys-libs/zlib