1 |
commit: f5fa3d050a6ae98a14266167c00241f7208c8452 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Oct 16 04:01:09 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 16 04:01:09 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=f5fa3d05 |
7 |
|
8 |
sys-cluster/htcondor: Remove optional dep on net-libs/qmf |
9 |
|
10 |
Package-Manager: Portage-2.3.11, Repoman-2.3.3 |
11 |
|
12 |
sys-cluster/htcondor/htcondor-8.0.0.ebuild | 24 ++++++++++-------------- |
13 |
sys-cluster/htcondor/htcondor-8.3.2.ebuild | 25 +++++++++++-------------- |
14 |
sys-cluster/htcondor/metadata.xml | 1 - |
15 |
3 files changed, 21 insertions(+), 29 deletions(-) |
16 |
|
17 |
diff --git a/sys-cluster/htcondor/htcondor-8.0.0.ebuild b/sys-cluster/htcondor/htcondor-8.0.0.ebuild |
18 |
index 9219714f5..5e25f0325 100644 |
19 |
--- a/sys-cluster/htcondor/htcondor-8.0.0.ebuild |
20 |
+++ b/sys-cluster/htcondor/htcondor-8.0.0.ebuild |
21 |
@@ -1,4 +1,4 @@ |
22 |
-# Copyright 1999-2016 Gentoo Foundation |
23 |
+# Copyright 1999-2017 Gentoo Foundation |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
|
26 |
EAPI=5 |
27 |
@@ -16,7 +16,7 @@ SRC_URI="condor_src-${PV}-all-all.tar.gz" |
28 |
LICENSE="Apache-2.0" |
29 |
SLOT="0" |
30 |
KEYWORDS="~amd64 ~x86" |
31 |
-IUSE="boinc cgroup contrib curl doc kerberos libvirt management minimal postgres python soap ssl test X xml" |
32 |
+IUSE="boinc cgroup contrib curl doc kerberos libvirt minimal postgres python soap ssl test X xml" |
33 |
|
34 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
35 |
|
36 |
@@ -31,7 +31,6 @@ CDEPEND=" |
37 |
libvirt? ( >=app-emulation/libvirt-0.6.2 ) |
38 |
kerberos? ( virtual/krb5 ) |
39 |
X? ( x11-libs/libX11 ) |
40 |
- management? ( net-libs/qmf ) |
41 |
postgres? ( >=dev-db/postgresql-8.2.4:= ) |
42 |
python? ( ${PYTHON_DEPS} ) |
43 |
soap? ( >=net-libs/gsoap-2.7.11[ssl?] ) |
44 |
@@ -47,22 +46,19 @@ RDEPEND="${CDEPEND} |
45 |
RESTRICT=fetch |
46 |
|
47 |
S="${WORKDIR}/condor-${PV}" |
48 |
+PATCHES=( |
49 |
+ "${FILESDIR}"/condor_shadow_dlopen-${PV}.patch |
50 |
+ "${FILESDIR}"/condor_config.generic.patch |
51 |
+ "${FILESDIR}"/0001-Apply-the-user-s-condor_config-last-rather-than-firs.patch |
52 |
+ "${FILESDIR}"/packaging_directories-${PV}.patch |
53 |
+ "${FILESDIR}"/fix_sandbox_violations-${PV}.patch |
54 |
+) |
55 |
|
56 |
pkg_setup() { |
57 |
enewgroup condor |
58 |
enewuser condor -1 "${ROOT}"bin/bash "${ROOT}var/lib/condor" condor |
59 |
} |
60 |
|
61 |
-src_prepare() { |
62 |
- epatch \ |
63 |
- "${FILESDIR}"/condor_shadow_dlopen-${PV}.patch \ |
64 |
- "${FILESDIR}"/condor_config.generic.patch \ |
65 |
- "${FILESDIR}"/0001-Apply-the-user-s-condor_config-last-rather-than-firs.patch \ |
66 |
- "${FILESDIR}"/packaging_directories-${PV}.patch \ |
67 |
- "${FILESDIR}"/fix_sandbox_violations-${PV}.patch |
68 |
- cmake-utils_src_prepare |
69 |
-} |
70 |
- |
71 |
src_configure() { |
72 |
# All the hard coded -DWITH_X=OFF flags are for packages that aren't in portage |
73 |
# I also haven't included support for HAVE_VMWARE because I don't know what it requires |
74 |
@@ -81,6 +77,7 @@ src_configure() { |
75 |
-DWITH_UNICOREGAHP=OFF |
76 |
-DWITH_VOMS=OFF |
77 |
-DWITH_WSO2=OFF |
78 |
+ -DWITH_MANAGEMENT=OFF |
79 |
$(cmake-utils_use_has boinc BACKFILL) |
80 |
$(cmake-utils_use_has boinc) |
81 |
$(cmake-utils_use_with cgroup LIBCGROUP) |
82 |
@@ -92,7 +89,6 @@ src_configure() { |
83 |
$(cmake-utils_use_with kerberos KRB5) |
84 |
$(cmake-utils_use_with postgres POSTGRESQL) |
85 |
$(cmake-utils_use_with python PYTHON_BINDINGS) |
86 |
- $(cmake-utils_use_with management) |
87 |
$(cmake-utils_use minimal CLIPPED) |
88 |
$(cmake-utils_use_with soap AVIARY) |
89 |
$(cmake-utils_use_with soap GSOAP) |
90 |
|
91 |
diff --git a/sys-cluster/htcondor/htcondor-8.3.2.ebuild b/sys-cluster/htcondor/htcondor-8.3.2.ebuild |
92 |
index 56b08cc76..c4464b88f 100644 |
93 |
--- a/sys-cluster/htcondor/htcondor-8.3.2.ebuild |
94 |
+++ b/sys-cluster/htcondor/htcondor-8.3.2.ebuild |
95 |
@@ -1,4 +1,4 @@ |
96 |
-# Copyright 1999-2015 Gentoo Foundation |
97 |
+# Copyright 1999-2017 Gentoo Foundation |
98 |
# Distributed under the terms of the GNU General Public License v2 |
99 |
|
100 |
EAPI=5 |
101 |
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/V${PV//./_}.tar.gz -> ${P}.tar.g |
102 |
LICENSE="Apache-2.0" |
103 |
SLOT="0" |
104 |
#KEYWORDS="~amd64 ~x86" |
105 |
-IUSE="boinc cgroup contrib curl dmtcp doc kerberos libvirt management minimal postgres python soap ssl test X xml" |
106 |
+IUSE="boinc cgroup contrib curl dmtcp doc kerberos libvirt minimal postgres python soap ssl test X xml" |
107 |
|
108 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
109 |
|
110 |
@@ -31,7 +31,6 @@ CDEPEND="sys-libs/zlib |
111 |
libvirt? ( >=app-emulation/libvirt-0.6.2 ) |
112 |
kerberos? ( virtual/krb5 ) |
113 |
X? ( x11-libs/libX11 ) |
114 |
- management? ( net-libs/qmf ) |
115 |
postgres? ( >=dev-db/postgresql-8.2.4:= ) |
116 |
python? ( ${PYTHON_DEPS} ) |
117 |
soap? ( >=net-libs/gsoap-2.7.11[ssl?] ) |
118 |
@@ -44,21 +43,19 @@ DEPEND="${CDEPEND} |
119 |
RDEPEND="${CDEPEND} |
120 |
virtual/mailx" |
121 |
|
122 |
+PATCHES=( |
123 |
+ "${FILESDIR}"/${P}-shadow_dlopen.patch |
124 |
+ "${FILESDIR}"/${P}-condor_config.generic.patch |
125 |
+ "${FILESDIR}"/${P}-Apply-the-users-condor_config-last-rather-than-first.patch |
126 |
+ "${FILESDIR}"/${P}-packaging_directories.patch |
127 |
+ "${FILESDIR}"/fix_sandbox_violations-8.0.0.patch |
128 |
+) |
129 |
+ |
130 |
pkg_setup() { |
131 |
enewgroup condor |
132 |
enewuser condor -1 "${ROOT}"bin/bash "${ROOT}var/lib/condor" condor |
133 |
} |
134 |
|
135 |
-src_prepare() { |
136 |
- epatch \ |
137 |
- "${FILESDIR}"/${P}-shadow_dlopen.patch \ |
138 |
- "${FILESDIR}"/${P}-condor_config.generic.patch \ |
139 |
- "${FILESDIR}"/${P}-Apply-the-users-condor_config-last-rather-than-first.patch \ |
140 |
- "${FILESDIR}"/${P}-packaging_directories.patch \ |
141 |
- "${FILESDIR}"/fix_sandbox_violations-8.0.0.patch |
142 |
- cmake-utils_src_prepare |
143 |
-} |
144 |
- |
145 |
src_configure() { |
146 |
# All the hard coded -DWITH_X=OFF flags are for packages that aren't in portage |
147 |
# I also haven't included support for HAVE_VMWARE because I don't know what it requires |
148 |
@@ -77,6 +74,7 @@ src_configure() { |
149 |
-DWITH_UNICOREGAHP=OFF |
150 |
-DWITH_VOMS=OFF |
151 |
-DWITH_WSO2=OFF |
152 |
+ -DWITH_MANAGEMENT=OFF |
153 |
$(cmake-utils_use_has boinc BACKFILL) |
154 |
$(cmake-utils_use_has boinc) |
155 |
$(cmake-utils_use_with cgroup LIBCGROUP) |
156 |
@@ -88,7 +86,6 @@ src_configure() { |
157 |
$(cmake-utils_use_with kerberos KRB5) |
158 |
$(cmake-utils_use_with postgres POSTGRESQL) |
159 |
$(cmake-utils_use_with python PYTHON_BINDINGS) |
160 |
- $(cmake-utils_use_with management) |
161 |
$(cmake-utils_use minimal CLIPPED) |
162 |
$(cmake-utils_use_with soap AVIARY) |
163 |
$(cmake-utils_use_with soap GSOAP) |
164 |
|
165 |
diff --git a/sys-cluster/htcondor/metadata.xml b/sys-cluster/htcondor/metadata.xml |
166 |
index 6b59f13ef..32ec6ea2e 100644 |
167 |
--- a/sys-cluster/htcondor/metadata.xml |
168 |
+++ b/sys-cluster/htcondor/metadata.xml |
169 |
@@ -25,7 +25,6 @@ |
170 |
<flag name="contrib">Build contrib modules</flag> |
171 |
<flag name="dmtcp">Use <pkg>sys-apps/dmtcp</pkg> for checkpointing</flag> |
172 |
<flag name="libvirt">Use <pkg>app-emulation/libvirt</pkg> for virtualisation</flag> |
173 |
- <flag name="management">Use <pkg>net-libs/qmf</pkg> for management</flag> |
174 |
<flag name="minimal">Don't support standard universe jobs</flag> |
175 |
<flag name="X">Enable the HTCondor Keyboard Daemon to monitor logged in X users for activity</flag> |
176 |
</use> |