1 |
commit: 134584b2d81b9928835d5ea44bbb6a2e146b2ef5 |
2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jun 2 16:22:53 2016 +0000 |
4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 2 16:56:18 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=134584b2 |
7 |
|
8 |
sys-cluster/torque: dependency cleanup |
9 |
|
10 |
Dependency atoms listed in the ebuild were rather significantly mis-matching what |
11 |
is actually linked to. Cleaned them up, added slot and slot-operators as needed. |
12 |
|
13 |
Added libressl to IUSE but didn't test if libressl is a drop-in replacement for |
14 |
openssl -- the situation should be better either way since it was a magic dep |
15 |
until now. |
16 |
|
17 |
Also bumped EAPI for torque-2.x so it is no longer deprecated, and adjusted how |
18 |
the cpusets flag is added to configure. |
19 |
|
20 |
Package-Manager: portage-2.2.28 |
21 |
|
22 |
...orque-2.5.13.ebuild => torque-2.5.13-r1.ebuild} | 26 ++++++++++---------- |
23 |
...{torque-4.1.7.ebuild => torque-4.1.7-r1.ebuild} | 27 ++++++++++++--------- |
24 |
...rque-4.2.9-r4.ebuild => torque-4.2.9-r5.ebuild} | 28 +++++++++++++--------- |
25 |
3 files changed, 47 insertions(+), 34 deletions(-) |
26 |
|
27 |
diff --git a/sys-cluster/torque/torque-2.5.13.ebuild b/sys-cluster/torque/torque-2.5.13-r1.ebuild |
28 |
similarity index 94% |
29 |
rename from sys-cluster/torque/torque-2.5.13.ebuild |
30 |
rename to sys-cluster/torque/torque-2.5.13-r1.ebuild |
31 |
index 252ac35..82934c0 100644 |
32 |
--- a/sys-cluster/torque/torque-2.5.13.ebuild |
33 |
+++ b/sys-cluster/torque/torque-2.5.13-r1.ebuild |
34 |
@@ -1,8 +1,8 @@ |
35 |
-# Copyright 1999-2014 Gentoo Foundation |
36 |
+# Copyright 1999-2016 Gentoo Foundation |
37 |
# Distributed under the terms of the GNU General Public License v2 |
38 |
# $Id$ |
39 |
|
40 |
-EAPI=4 |
41 |
+EAPI=5 |
42 |
|
43 |
inherit autotools-utils eutils flag-o-matic linux-info |
44 |
|
45 |
@@ -17,16 +17,21 @@ KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86" |
46 |
IUSE="cpusets +crypt doc drmaa kernel_linux munge server static-libs +syslog threads tk xml" |
47 |
|
48 |
# ed is used by makedepend-sh |
49 |
-DEPEND_COMMON="sys-libs/ncurses |
50 |
- sys-libs/readline |
51 |
+DEPEND_COMMON=" |
52 |
+ sys-libs/readline:0= |
53 |
munge? ( sys-auth/munge ) |
54 |
- tk? ( dev-lang/tk ) |
55 |
+ tk? ( |
56 |
+ dev-lang/tk:0= |
57 |
+ dev-lang/tcl:0= |
58 |
+ ) |
59 |
syslog? ( virtual/logger ) |
60 |
- !games-util/qstat" |
61 |
+ !!games-util/qstat" |
62 |
|
63 |
+# libncurses.so is just needed so that configure will pass for the readline check |
64 |
DEPEND="${DEPEND_COMMON} |
65 |
+ sys-libs/ncurses:* |
66 |
sys-apps/ed |
67 |
- !sys-cluster/slurm" |
68 |
+ !!sys-cluster/slurm" |
69 |
|
70 |
RDEPEND="${DEPEND_COMMON} |
71 |
crypt? ( net-misc/openssh ) |
72 |
@@ -49,12 +54,11 @@ pkg_setup() { |
73 |
fi |
74 |
fi |
75 |
|
76 |
- USE_CPUSETS="--disable-cpuset" |
77 |
if use cpusets; then |
78 |
if ! use kernel_linux; then |
79 |
einfo |
80 |
elog " Torque currently only has support for cpusets in linux." |
81 |
- elog "Assuming you didn't really want this USE flag." |
82 |
+ elog "Assuming you didn't really want this USE flag and ignoring." |
83 |
einfo |
84 |
else |
85 |
linux-info_pkg_setup |
86 |
@@ -68,7 +72,6 @@ pkg_setup() { |
87 |
elog "your kernel with CONFIG_CPUSETS enabled." |
88 |
einfo |
89 |
fi |
90 |
- USE_CPUSETS="--enable-cpuset" |
91 |
fi |
92 |
fi |
93 |
} |
94 |
@@ -92,7 +95,6 @@ src_configure() { |
95 |
local myeconfargs=( --with-rcp=mom_rcp ) |
96 |
|
97 |
use crypt && myeconfargs=( --with-rcp=scp ) |
98 |
- |
99 |
myeconfargs+=( |
100 |
$(use_enable tk gui) |
101 |
$(use_enable tk tcl-qstat) |
102 |
@@ -102,12 +104,12 @@ src_configure() { |
103 |
$(use_enable threads high-availability) |
104 |
$(use_enable xml server-xml) |
105 |
$(use_enable munge munge-library) |
106 |
+ $(usex kernel_linux $(use_enable cpusets cpuset) --disable-cpuset) |
107 |
--with-server-home=${PBS_SERVER_HOME} |
108 |
--with-environ=/etc/pbs_environment |
109 |
--with-default-server=${PBS_SERVER_NAME} |
110 |
--disable-gcc-warnings |
111 |
--with-tcp-retry-limit=2 |
112 |
- ${USE_CPUSETS} |
113 |
) |
114 |
autotools-utils_src_configure |
115 |
} |
116 |
|
117 |
diff --git a/sys-cluster/torque/torque-4.1.7.ebuild b/sys-cluster/torque/torque-4.1.7-r1.ebuild |
118 |
similarity index 92% |
119 |
rename from sys-cluster/torque/torque-4.1.7.ebuild |
120 |
rename to sys-cluster/torque/torque-4.1.7-r1.ebuild |
121 |
index ea148c3..86dfeb5 100644 |
122 |
--- a/sys-cluster/torque/torque-4.1.7.ebuild |
123 |
+++ b/sys-cluster/torque/torque-4.1.7-r1.ebuild |
124 |
@@ -1,4 +1,4 @@ |
125 |
-# Copyright 1999-2014 Gentoo Foundation |
126 |
+# Copyright 1999-2016 Gentoo Foundation |
127 |
# Distributed under the terms of the GNU General Public License v2 |
128 |
# $Id$ |
129 |
|
130 |
@@ -15,20 +15,27 @@ SRC_URI="http://www.adaptivecomputing.com/index.php?wpfb_dl=1690 -> ${P}.tar.gz" |
131 |
LICENSE="torque-2.5" |
132 |
SLOT="0" |
133 |
KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86" |
134 |
-IUSE="cpusets +crypt doc drmaa kernel_linux munge nvidia server +syslog tk" |
135 |
+IUSE="cpusets +crypt doc drmaa kernel_linux libressl munge nvidia server +syslog tk" |
136 |
|
137 |
DEPEND_COMMON=" |
138 |
- sys-libs/ncurses |
139 |
- sys-libs/readline |
140 |
+ sys-libs/zlib |
141 |
+ sys-libs/readline:0= |
142 |
+ libressl? ( dev-libs/libressl:0= ) |
143 |
+ !libressl? ( dev-libs/openssl:0= ) |
144 |
cpusets? ( sys-apps/hwloc ) |
145 |
munge? ( sys-auth/munge ) |
146 |
nvidia? ( >=x11-drivers/nvidia-drivers-275 ) |
147 |
- tk? ( dev-lang/tk ) |
148 |
+ tk? ( |
149 |
+ dev-lang/tk:0= |
150 |
+ dev-lang/tcl:0= |
151 |
+ ) |
152 |
syslog? ( virtual/logger ) |
153 |
- !games-util/qstat" |
154 |
+ !!games-util/qstat" |
155 |
|
156 |
+# libncurses.so is only needed for the configure check on readline to pass |
157 |
DEPEND="${DEPEND_COMMON} |
158 |
- !sys-cluster/slurm" |
159 |
+ sys-libs/ncurses:* |
160 |
+ !!sys-cluster/slurm" |
161 |
|
162 |
RDEPEND="${DEPEND_COMMON} |
163 |
crypt? ( net-misc/openssh ) |
164 |
@@ -53,12 +60,11 @@ pkg_setup() { |
165 |
fi |
166 |
fi |
167 |
|
168 |
- USE_CPUSETS="--disable-cpuset" |
169 |
if use cpusets; then |
170 |
if ! use kernel_linux; then |
171 |
einfo |
172 |
elog " Torque currently only has support for cpusets in linux." |
173 |
- elog "Assuming you didn't really want this USE flag." |
174 |
+ elog "Assuming you didn't really want this USE flag, and ignoring its state." |
175 |
einfo |
176 |
else |
177 |
linux-info_pkg_setup |
178 |
@@ -68,7 +74,6 @@ pkg_setup() { |
179 |
elog "your kernel with CONFIG_CPUSETS enabled." |
180 |
einfo |
181 |
fi |
182 |
- USE_CPUSETS="--enable-cpuset" |
183 |
fi |
184 |
fi |
185 |
} |
186 |
@@ -100,13 +105,13 @@ src_configure() { |
187 |
$(use_enable drmaa) \ |
188 |
$(use_enable munge munge-auth) \ |
189 |
$(use_enable nvidia nvidia-gpus) \ |
190 |
+ $(usex kernel_linux $(use_enable cpusets cpuset) --disable-cpuset) \ |
191 |
--with-server-home=${PBS_SERVER_HOME} \ |
192 |
--with-environ=/etc/pbs_environment \ |
193 |
--with-default-server=${PBS_SERVER_NAME} \ |
194 |
--disable-gcc-warnings \ |
195 |
--with-tcp-retry-limit=2 \ |
196 |
--without-loadlibfile \ |
197 |
- ${USE_CPUSETS} \ |
198 |
${myconf} |
199 |
} |
200 |
|
201 |
|
202 |
diff --git a/sys-cluster/torque/torque-4.2.9-r4.ebuild b/sys-cluster/torque/torque-4.2.9-r5.ebuild |
203 |
similarity index 89% |
204 |
rename from sys-cluster/torque/torque-4.2.9-r4.ebuild |
205 |
rename to sys-cluster/torque/torque-4.2.9-r5.ebuild |
206 |
index 372a4a1..601227f 100644 |
207 |
--- a/sys-cluster/torque/torque-4.2.9-r4.ebuild |
208 |
+++ b/sys-cluster/torque/torque-4.2.9-r5.ebuild |
209 |
@@ -1,4 +1,4 @@ |
210 |
-# Copyright 1999-2015 Gentoo Foundation |
211 |
+# Copyright 1999-2016 Gentoo Foundation |
212 |
# Distributed under the terms of the GNU General Public License v2 |
213 |
# $Id$ |
214 |
|
215 |
@@ -15,20 +15,28 @@ SRC_URI="http://www.adaptivecomputing.com/index.php?wpfb_dl=2849 -> ${P}.tar.gz" |
216 |
LICENSE="torque-2.5" |
217 |
SLOT="0" |
218 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" |
219 |
-IUSE="cpusets +crypt doc drmaa kernel_linux munge nvidia server +syslog tk" |
220 |
+IUSE="cpusets +crypt doc drmaa kernel_linux libressl munge nvidia server +syslog tk" |
221 |
|
222 |
DEPEND_COMMON=" |
223 |
- sys-libs/ncurses |
224 |
- sys-libs/readline:* |
225 |
+ sys-libs/zlib |
226 |
+ sys-libs/readline:0= |
227 |
+ dev-libs/libxml2 |
228 |
+ !libressl? ( dev-libs/openssl:0= ) |
229 |
+ libressl? ( dev-libs/libressl:0= ) |
230 |
cpusets? ( sys-apps/hwloc ) |
231 |
munge? ( sys-auth/munge ) |
232 |
nvidia? ( >=x11-drivers/nvidia-drivers-275 ) |
233 |
- tk? ( dev-lang/tk:0 ) |
234 |
+ tk? ( |
235 |
+ dev-lang/tk:0= |
236 |
+ dev-lang/tcl:0= |
237 |
+ ) |
238 |
syslog? ( virtual/logger ) |
239 |
- !games-util/qstat" |
240 |
+ !!games-util/qstat" |
241 |
|
242 |
+# libncurses.so is only needed for configure check on readline |
243 |
DEPEND="${DEPEND_COMMON} |
244 |
- !sys-cluster/slurm" |
245 |
+ sys-libs/ncurses:* |
246 |
+ !!sys-cluster/slurm" |
247 |
|
248 |
RDEPEND="${DEPEND_COMMON} |
249 |
crypt? ( net-misc/openssh ) |
250 |
@@ -53,12 +61,11 @@ pkg_setup() { |
251 |
fi |
252 |
fi |
253 |
|
254 |
- USE_CPUSETS="--disable-cpuset" |
255 |
if use cpusets; then |
256 |
if ! use kernel_linux; then |
257 |
einfo |
258 |
elog " Torque currently only has support for cpusets in linux." |
259 |
- elog "Assuming you didn't really want this USE flag." |
260 |
+ elog "Assuming you didn't really want this USE flag and ignoring its state." |
261 |
einfo |
262 |
else |
263 |
linux-info_pkg_setup |
264 |
@@ -68,7 +75,6 @@ pkg_setup() { |
265 |
elog "your kernel with CONFIG_CPUSETS enabled." |
266 |
einfo |
267 |
fi |
268 |
- USE_CPUSETS="--enable-cpuset" |
269 |
fi |
270 |
fi |
271 |
} |
272 |
@@ -100,13 +106,13 @@ src_configure() { |
273 |
$(use_enable drmaa) \ |
274 |
$(use_enable munge munge-auth) \ |
275 |
$(use_enable nvidia nvidia-gpus) \ |
276 |
+ $(usex kernel_linux $(use_enable cpusets cpuset) --disable-cpuset) \ |
277 |
--with-server-home=${PBS_SERVER_HOME} \ |
278 |
--with-environ=/etc/pbs_environment \ |
279 |
--with-default-server=${PBS_SERVER_NAME} \ |
280 |
--disable-gcc-warnings \ |
281 |
--with-tcp-retry-limit=2 \ |
282 |
--without-loadlibfile \ |
283 |
- ${USE_CPUSETS} \ |
284 |
${myconf} |
285 |
} |