gentoo Easter resync : 12.04.2020

3 files changed, 7 insertions, 7 deletions

diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index 62769f88bcff..240ab54ce4d9 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -19,7 +19,7 @@ AUX trqauthd-init.d 477 BLAKE2B fe62bfae07d1d9fe08352ba4d99ab5d46185a74b10497f32
 DIST torque-4.1.7.tar.gz 6218108 BLAKE2B 6c1ad0f1bb3f364603ad7f498999bd910491910fa5632b9f6b82e08b3afb8c54e8775c38bc8e5c959aa99d0647c54c7c348cd07bcbe11add8bfab5f3f06a4c80 SHA512 5a085c0a7b205fed075bff4599db90ca5c4bb5f22d87d76fd56539d5cc1935bb8eeffcd4d18ba84401bd4ca128718070b69c8b91ab6814a4638622ba351654e6
 DIST torque-4.2.10-gh-20150517.tar.gz 5836286 BLAKE2B 7108f1adcb6f674526b7db97df4ebcee04ae5c818d4f35ed1230a4e72e52ec0bc3b44e17334a143b21bcd3acccefc3927eca4f98d54d37745c8bb46a75e07045 SHA512 600bb5389b6a4161732b7aa82627f1ebeae238d7091aa2e223d9a14c44bf4668662f664b976f62ba3f1d8a366f90fb6058a8c904e20c26432dccd6abcd9c57fa
 DIST torque-6.0.4-gh-20170829.tar.gz 6182495 BLAKE2B f9156ae4ffe388a7f3fa0df142e5f2d48c16fd7b8c148a3a80cd1c977eb0c1ef4a455da275f993100867be043422526ed05c53734e707851083d6d23ee1a2cc4 SHA512 8f1101adb89e06617de501f7956e126633b78b495baeb7980d3c534d34537cc604a3cf0a7c23c48eb2554b26cc13672b0e00c75d0f722d63ac4d42d57388ed94
-EBUILD torque-4.1.7-r1.ebuild 7489 BLAKE2B d501d043c61825faf2101d7d47d20f373f05f9e4135ad86c2c61ac75002dd462c29c3ad23f856020c0bc008563d2c97b638f5eb2422544af8e576e8816422d3e SHA512 005bf4107b0bdf7fc7adc441196dab1cc900332c0988dd332bb0621eabf67406675cccf6da0fd1315064611343d7debc44726f62ff8838ae317b0186fdd7ab41
+EBUILD torque-4.1.7-r1.ebuild 7490 BLAKE2B fe42f00dd776d8d8b1b505cda4773d7fdc51abc17ba01fc2be538f36c9287ab18e490a580090489897d2a47fce88edbb644353cb3638e5e3bec240e0cef89d23 SHA512 2779644eb339119b62a18b159e89ff818e3501b526ecb12c2eb3a560957dd2f8b2f5ae95c19a32db4179142a1e631942b4bc4945776ed4dc5cc391f6aac92f96
 EBUILD torque-4.2.10-r1.ebuild 6086 BLAKE2B c685ce4e6b5b7f58c040f0b16779bb59540aa0c80fe9a55b76d603e336e63a5186d543d664caa0f6184c3145c9608b31fed379b2e827bdcd62e6e53f8334b5cc SHA512 2c64f7dfaa26e1648e32283c1dcc31df0dba8bf3c4177fdafbe713d408d931ca83c2386d3548b47e1d6d90552e4c5ceeadf96c50089f2d17eb56d79312dc70f8
-EBUILD torque-6.0.4-r1.ebuild 5516 BLAKE2B 4d5df405f257a71a5fe828e2c30ae752c5f90f90de1d4f08d76aed91a4b4a00cc0d2d9ea6ba55958f655214c9c5ce11913dfe7db54a1ad27f899638874db9903 SHA512 c990b36581da9eff9614149dc0a4d51e3306cb4fddca685de5a7d4d6d17702d33aec6416a676348726a8d3202e92e3ba3a6e817d9103d22c5b0fab19e253b857
+EBUILD torque-6.0.4-r1.ebuild 5448 BLAKE2B e71a78dc2e1b51c81d4513134bcbabb29c01b3caa0eb48fffc8ba2a17154b41b30535d3c9550d7d992a61a66b920ea8fa5bcda3cf83ac81d7c633387ffa0b7d9 SHA512 e08a5b7decad36d11561e4d4f8aae597e865106eba3d8e148c8db10c4bc6be1c6d36ba6f0dbb0f344b6137330578f5847cad40a4b099ed6b4c20cca39eba7754
 MISC metadata.xml 988 BLAKE2B 257e838c8bde7ceea876a84631c248fce2e3a347794459bbfd4ae23210c779f69e606e120438351783ebf1cdeab7bd5e5df196ee9af31306bebd6130a08bb46f SHA512 46f2eb41303c17e84aacf5b8548b645772ab923bf9a4847892260cc5c6aaf354acc0bb0128186acf312ed77a24d9429c97f18914d759c7c5c97c19ad62489a43
diff --git a/sys-cluster/torque/torque-4.1.7-r1.ebuild b/sys-cluster/torque/torque-4.1.7-r1.ebuild
index fd9b4732144a..6e27735c3372 100644
--- a/sys-cluster/torque/torque-4.1.7-r1.ebuild
+++ b/sys-cluster/torque/torque-4.1.7-r1.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="cpusets +crypt doc drmaa kernel_linux libressl munge nvidia server +syslog tk"
 
 DEPEND_COMMON="
diff --git a/sys-cluster/torque/torque-6.0.4-r1.ebuild b/sys-cluster/torque/torque-6.0.4-r1.ebuild
index 456675c959f4..6f18c0252662 100644
--- a/sys-cluster/torque/torque-6.0.4-r1.ebuild
+++ b/sys-cluster/torque/torque-6.0.4-r1.ebuild
@@ -12,7 +12,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 drmaa kernel_linux libressl munge nvidia quickcommit server +syslog tk"
+IUSE="autorun cgroups cpusets +crypt doc kernel_linux libressl munge nvidia quickcommit server +syslog tk"
 
 DEPEND_COMMON="
 	sys-libs/zlib
@@ -100,12 +100,11 @@ src_configure() {
 		$(use_enable tk tcl-qstat) \
 		$(use_enable syslog) \
 		$(use_enable server) \
-		$(use_enable drmaa) \
+		--disable-drmaa \
 		$(use_enable munge munge-auth) \
 		$(use_enable nvidia nvidia-gpus) \
 		$(usex crypt "--with-rcp=scp" "--with-rcp=mom_rcp") \
 		$(usex kernel_linux $(use_enable cpusets cpuset) --disable-cpuset) \
-		$(usex kernel_linux $(use_enable cpusets geometry-request) --disable-geometry-request) \
 		$(usex kernel_linux $(use_enable cgroups) --disable-cgroups) \
 		$(use_enable autorun) \
 		$(use_enable quickcommit) \
@@ -113,6 +112,7 @@ src_configure() {
 		--with-environ=/etc/pbs_environment \
 		--with-default-server=${PBS_SERVER_NAME} \
 		--disable-gcc-warnings \
+		--disable-silent-rules \
 		--with-tcp-retry-limit=2 \
 		--without-loadlibfile
 }
@@ -174,6 +174,6 @@ pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
 		elog "If this is the first time torque has been installed, then you are not"
 		elog "ready to start the server.  Please refer to the documentation located at:"
-		elog "http://docs.adaptivecomputing.com/torque/${PN//./-}/adminGuide/help.htm#topics/torque/1-installConfig/initializeConfigOnServer.htm"
+		elog "http://docs.adaptivecomputing.com/torque/${PV//./-}/adminGuide/torquehelp.htm#topics/torque/1-installConfig/initializeConfigOnServer.htm"
 	fi
 }