aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Kerr <cjk34@cam.ac.uk>2013-07-02 21:14:57 +0100
committerChris Kerr <cjk34@cam.ac.uk>2013-07-02 21:14:57 +0100
commite4419430104d85e94f224356084dc9d9ad3bea4d (patch)
tree6e2c3b1545daab2af5749787dcff7d670c65e865 /sys-cluster
parentFixed repoman complaint about trailing whitespace (diff)
downloadsci-e4419430104d85e94f224356084dc9d9ad3bea4d.tar.gz
sci-e4419430104d85e94f224356084dc9d9ad3bea4d.tar.bz2
sci-e4419430104d85e94f224356084dc9d9ad3bea4d.zip
Suggestions from Sébastien Fabbro
Fixed some inconsistencies and included better conformance to the Gentoo directory hierarchy.
Diffstat (limited to 'sys-cluster')
-rw-r--r--sys-cluster/htcondor/files/packaging_directories-8.0.0.patch14
-rw-r--r--sys-cluster/htcondor/htcondor-8.0.0.ebuild1
-rw-r--r--sys-cluster/htcondor/metadata.xml12
3 files changed, 13 insertions, 14 deletions
diff --git a/sys-cluster/htcondor/files/packaging_directories-8.0.0.patch b/sys-cluster/htcondor/files/packaging_directories-8.0.0.patch
index db63bf67e..ef3161b45 100644
--- a/sys-cluster/htcondor/files/packaging_directories-8.0.0.patch
+++ b/sys-cluster/htcondor/files/packaging_directories-8.0.0.patch
@@ -8,9 +8,9 @@
+
+ #Directory overrides
+ set( C_BIN usr/bin )
-+ set( C_LIB usr/lib/condor )
-+ set( C_LIB_PUBLIC usr/lib )
-+ set( C_LIB32 usr/lib/condor )
++ set( C_LIB usr/lib\${LIB_SUFFIX}/condor )
++ set( C_LIB_PUBLIC usr/lib\${LIB_SUFFIX} )
++ set( C_LIB32 usr/lib\${LIB_SUFFIX}/condor )
+ set( C_SBIN usr/sbin )
+ set( C_INCLUDE usr/include/condor )
+ set( C_INCLUDE_PUBLIC usr/include )
@@ -21,10 +21,10 @@
+ set( C_ETC etc/condor )
+ set( C_CONFIGD etc/condor/config.d )
+
-+ set( C_ETC_EXAMPLES usr/share/doc/condor/etc/examples )
-+ set( C_SHARE_EXAMPLES usr/share/doc/condor)
-+ set( C_DOC usr/share/doc/condor )
-+ set( C_LIBEXEC usr/lib/condor/libexec )
++ set( C_ETC_EXAMPLES usr/share/doc/\${PF}/etc/examples )
++ set( C_SHARE_EXAMPLES usr/share/doc/\${PF} )
++ set( C_DOC usr/share/doc/\${PF} )
++ set( C_LIBEXEC usr/lib\${LIB_SUFFIX}/condor/libexec )
+ set( C_SYSCONFIG etc/default )
+
endif()
diff --git a/sys-cluster/htcondor/htcondor-8.0.0.ebuild b/sys-cluster/htcondor/htcondor-8.0.0.ebuild
index 5d9cdc751..9b1f4abfd 100644
--- a/sys-cluster/htcondor/htcondor-8.0.0.ebuild
+++ b/sys-cluster/htcondor/htcondor-8.0.0.ebuild
@@ -65,7 +65,6 @@ src_configure() {
local mycmakeargs="
-DCONDOR_PACKAGE_BUILD=ON
-DCMAKE_INSTALL_PREFIX=/
- -DWITH_AVIARY=OFF
-DWITH_BLAHP=OFF
-DWITH_CAMPUSFACTORY=OFF
-DWITH_CLUSTER_RA=OFF
diff --git a/sys-cluster/htcondor/metadata.xml b/sys-cluster/htcondor/metadata.xml
index 7257cf730..6485807ae 100644
--- a/sys-cluster/htcondor/metadata.xml
+++ b/sys-cluster/htcondor/metadata.xml
@@ -3,16 +3,16 @@
<pkgmetadata>
<herd>cluster</herd>
<maintainer>
- <email>bicatali@gentoo.org</email>
+ <email>cjk34@cam.ac.uk</email>
</maintainer>
<longdescription lang="en">
- Condor is a open-source, specialized workload management system for
- compute-intensive jobs. Like other full-featured batch systems, Condor
+ HTCondor is a open-source, specialized workload management system for
+ compute-intensive jobs. Like other full-featured batch systems, HTCondor
provides a job queueing mechanism, scheduling policy, priority scheme,
resource monitoring, and resource management. Users submit their serial
- or parallel jobs to Condor, Condor places them into a queue, chooses
+ or parallel jobs to HTCondor, HTCondor places them into a queue, chooses
when and where to run the jobs based upon a policy, carefully monitors
- their progress, and ultimately informs the user upon completion. Condor
+ their progress, and ultimately informs the user upon completion. HTCondor
also contains mechanisms to submit jobs to grid-sites and supports many
different grid toolkits.
</longdescription>
@@ -24,6 +24,6 @@
<flag name="libvirt">Use <pkg>app-emulation/libvirt</pkg> for virtualisation</flag>
<flag name="management">Use <pkg>net-libs/qmf</pkg> for management</flag>
<flag name="minimal">Don't support standard universe jobs</flag>
- <flag name="X">Enable the Condor Keyboard Daemon to monitor logged in X users for activity</flag>
+ <flag name="X">Enable the HTCondor Keyboard Daemon to monitor logged in X users for activity</flag>
</use>
</pkgmetadata>