Gentoo Archives: gentoo-commits

From: Ian Stakenvicius <axs@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
Date: Thu, 05 Mar 2020 19:16:40
Message-Id: 1583435788.e9eca8ffeb8fb002255605616789264880d3a2d2.axs@gentoo
1 commit: e9eca8ffeb8fb002255605616789264880d3a2d2
2 Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
3 AuthorDate: Thu Mar 5 19:15:56 2020 +0000
4 Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 5 19:16:28 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9eca8ff
7
8 sys-cluster/torque: drop broken USE=drmaa, fix doc and econf warn
9
10 -Fixed the documentation link in pkg_postinst
11 -Dropped USE=drmaa as its broken and upstream hasn't done anything with
12 the code since torque-2
13 -Removed the --disable-geometry-request config option
14
15 Closes: https://bugs.gentoo.org/697124
16 Package-Manager: Portage-2.3.79, Repoman-2.3.16
17 Signed-off-by: Ian Stakenvicius <axs <AT> gentoo.org>
18
19 sys-cluster/torque/torque-6.0.4-r1.ebuild | 8 ++++----
20 1 file changed, 4 insertions(+), 4 deletions(-)
21
22 diff --git a/sys-cluster/torque/torque-6.0.4-r1.ebuild b/sys-cluster/torque/torque-6.0.4-r1.ebuild
23 index 456675c959f..6f18c025266 100644
24 --- a/sys-cluster/torque/torque-6.0.4-r1.ebuild
25 +++ b/sys-cluster/torque/torque-6.0.4-r1.ebuild
26 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/adaptivecomputing/torque/archive/6a0b37f85c7d644e921
27 LICENSE="torque-2.5"
28 SLOT="0"
29 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
30 -IUSE="autorun cgroups cpusets +crypt doc drmaa kernel_linux libressl munge nvidia quickcommit server +syslog tk"
31 +IUSE="autorun cgroups cpusets +crypt doc kernel_linux libressl munge nvidia quickcommit server +syslog tk"
32
33 DEPEND_COMMON="
34 sys-libs/zlib
35 @@ -100,12 +100,11 @@ src_configure() {
36 $(use_enable tk tcl-qstat) \
37 $(use_enable syslog) \
38 $(use_enable server) \
39 - $(use_enable drmaa) \
40 + --disable-drmaa \
41 $(use_enable munge munge-auth) \
42 $(use_enable nvidia nvidia-gpus) \
43 $(usex crypt "--with-rcp=scp" "--with-rcp=mom_rcp") \
44 $(usex kernel_linux $(use_enable cpusets cpuset) --disable-cpuset) \
45 - $(usex kernel_linux $(use_enable cpusets geometry-request) --disable-geometry-request) \
46 $(usex kernel_linux $(use_enable cgroups) --disable-cgroups) \
47 $(use_enable autorun) \
48 $(use_enable quickcommit) \
49 @@ -113,6 +112,7 @@ src_configure() {
50 --with-environ=/etc/pbs_environment \
51 --with-default-server=${PBS_SERVER_NAME} \
52 --disable-gcc-warnings \
53 + --disable-silent-rules \
54 --with-tcp-retry-limit=2 \
55 --without-loadlibfile
56 }
57 @@ -174,6 +174,6 @@ pkg_postinst() {
58 if [[ -z "${REPLACING_VERSIONS}" ]] ; then
59 elog "If this is the first time torque has been installed, then you are not"
60 elog "ready to start the server. Please refer to the documentation located at:"
61 - elog "http://docs.adaptivecomputing.com/torque/${PN//./-}/adminGuide/help.htm#topics/torque/1-installConfig/initializeConfigOnServer.htm"
62 + elog "http://docs.adaptivecomputing.com/torque/${PV//./-}/adminGuide/torquehelp.htm#topics/torque/1-installConfig/initializeConfigOnServer.htm"
63 fi
64 }