commit: 10d045b613c46cc566bfee34d537ffa06b49c646
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 19 10:28:28 2016 +0000
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 10:28:28 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10d045b6
sys-cluster/slurm: Version bump!
Gentoo-bug: 531710
Gentoo-bug: 570728
Package-Manager: portage-2.3.0
sys-cluster/slurm/Manifest | 2 +-
.../slurm/files/slurm-16.05.2-disable-sview.patch | 90 ++++++++++++++++++++++
sys-cluster/slurm/files/slurm-2.5.4-nogtk.patch | 43 -----------
sys-cluster/slurm/metadata.xml | 2 -
.../{slurm-2.6.3.ebuild => slurm-16.05.2.ebuild} | 51 ++++--------
5 files changed, 107 insertions(+), 81 deletions(-)
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index 1bdaad0..d98544e 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -1 +1 @@
-DIST slurm-2.6.3.tar.bz2 5945106 SHA256
3523f6866531d48061e6b4d769a17e005b7d440bb5cee6c6ab6a12518c884d23 SHA512
98e212db02d14d9808c3e89bf0a44f7925dbb8bae360e5084e28c71c0dea0e670a28a0baa1a1511666c42e19693ecd807f24241baa082475f385bf7285dba0cd
WHIRLPOOL
5e8955df7419d15f4be78eb1584a5797f6c3b29c01b4352b3f0bf8a7c5e9b96b97aa4ef74ba6bda0f278e80723b72a860eb2c65686bd2adb383ea444d4a62e29
+DIST slurm-16.05.2.tar.bz2 5982329 SHA256
de57ab107c98499f7184c54de8d5ac115a55657aa03d29d69cd0b7e737a42852 SHA512
8b4296481c5ad83da2bde1530937b3da9b6e32b6606ba0b0a3899e0f2f0b4fc42ca8a802d4bf346d0de28852d75839e9359e28c4ce77588cd22a08ddbd34dd21
WHIRLPOOL
925902c9432b24a2c85488d1ba6a867abed0adaaecaa94b648402e48d250d924000741b2be486b34d3b7f6890aeabb9aea6c47e2e8fd9896dda3a3ae416a4a89
diff --git a/sys-cluster/slurm/files/slurm-16.05.2-disable-sview.patch
b/sys-cluster/slurm/files/slurm-16.05.2-disable-sview.patch
new file mode 100644
index 0000000..5b861c3
--- /dev/null
+++ b/sys-cluster/slurm/files/slurm-16.05.2-disable-sview.patch
@@ -0,0 +1,90 @@
+diff -urN slurm-16.05.2.orig/configure.ac slurm-16.05.2/configure.ac
+--- slurm-16.05.2.orig/configure.ac 2016-07-07 02:51:37.000000000 +0300
++++ slurm-16.05.2/configure.ac 2016-07-15 20:02:41.373270765 +0300
+@@ -261,44 +261,6 @@
+ PKG_CHECK_MODULES([CHECK], [check >= 0.9.8], [ac_have_check="yes"],
[ac_have_check="no"])
+ AM_CONDITIONAL(HAVE_CHECK, test "x$ac_have_check" = "xyes")
+
+-#
+-# Tests for GTK+
+-#
+-
+-# use the correct libs if running on 64bit
+-if test -d "/usr/lib64/pkgconfig"; then
+- PKG_CONFIG_PATH="/usr/lib64/pkgconfig/:$PKG_CONFIG_PATH"
+-fi
+-
+-if test -d "/opt/gnome/lib64/pkgconfig"; then
+- PKG_CONFIG_PATH="/opt/gnome/lib64/pkgconfig/:$PKG_CONFIG_PATH"
+-fi
+-
+-AM_PATH_GLIB_2_0([2.7.1], [ac_glib_test="yes"], [ac_glib_test="no"],
[gthread])
+-
+-if test ${glib_config_minor_version=0} -ge 32 ; then
+- AC_DEFINE([GLIB_NEW_THREADS], 1, [Define to 1 if using glib-2.32.0 or
higher])
+-fi
+-
+-AM_PATH_GTK_2_0([2.7.1], [ac_gtk_test="yes"], [ac_gtk_test="no"], [gthread])
+-if test ${gtk_config_minor_version=0} -ge 10 ; then
+- AC_DEFINE([GTK2_USE_RADIO_SET], 1, [Define to 1 if using gtk+-2.10.0
or higher])
+-fi
+-
+-if test ${gtk_config_minor_version=0} -ge 12 ; then
+- AC_DEFINE([GTK2_USE_TOOLTIP], 1, [Define to 1 if using gtk+-2.12.0 or
higher])
+-fi
+-
+-if test ${gtk_config_minor_version=0} -ge 14 ; then
+- AC_DEFINE([GTK2_USE_GET_FOCUS], 1, [Define to 1 if using gtk+-2.14.0
or higher])
+-fi
+-
+-if test "x$ac_glib_test" != "xyes" -o "x$ac_gtk_test" != "xyes"; then
+- AC_MSG_WARN([cannot build sview without gtk library]);
+-fi
+-
+-AM_CONDITIONAL(BUILD_SVIEW, [test "x$ac_glib_test" = "xyes"] && [test
"x$ac_gtk_test" = "xyes"])
+-
+ X_AC_DATABASES
+
+ dnl Cray ALPS/Basil support depends on mySQL
+@@ -503,7 +465,6 @@
+ src/sshare/Makefile
+ src/sstat/Makefile
+ src/strigger/Makefile
+- src/sview/Makefile
+ src/plugins/Makefile
+ src/plugins/accounting_storage/Makefile
+ src/plugins/accounting_storage/common/Makefile
+diff -urN slurm-16.05.2.orig/src/Makefile.am slurm-16.05.2/src/Makefile.am
+--- slurm-16.05.2.orig/src/Makefile.am 2016-07-07 02:51:37.000000000 +0300
++++ slurm-16.05.2/src/Makefile.am 2016-07-15 20:02:41.373270765 +0300
+@@ -27,8 +27,7 @@
+ srun_cr \
+ sshare \
+ sstat \
+- strigger \
+- sview
++ strigger
+
+ if !REAL_BG_L_P_LOADED
+ SUBDIRS += srun
+diff -urN slurm-16.05.2.orig/src/Makefile.in slurm-16.05.2/src/Makefile.in
+--- slurm-16.05.2.orig/src/Makefile.in 2016-07-07 02:51:37.000000000 +0300
++++ slurm-16.05.2/src/Makefile.in 2016-07-15 20:02:41.373270765 +0300
+@@ -199,7 +199,7 @@
+ DIST_SUBDIRS = api bcast common database db_api layouts plugins sacct \
+ sacctmgr salloc sattach sbatch sbcast scancel scontrol sdiag \
+ sinfo slurmctld slurmd slurmdbd smap smd sprio squeue sreport \
+- srun_cr sshare sstat strigger sview srun
++ srun_cr sshare sstat strigger srun
+ am__DIST_COMMON = $(srcdir)/Makefile.in
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ am__relativize = \
+@@ -487,7 +487,7 @@
+ SUBDIRS = api bcast common database db_api layouts plugins sacct \
+ sacctmgr salloc sattach sbatch sbcast scancel scontrol sdiag \
+ sinfo slurmctld slurmd slurmdbd smap smd sprio squeue sreport \
+- srun_cr sshare sstat strigger sview $(am__append_1)
++ srun_cr sshare sstat strigger $(am__append_1)
+ all: all-recursive
+
+ .SUFFIXES:
diff --git a/sys-cluster/slurm/files/slurm-2.5.4-nogtk.patch
b/sys-cluster/slurm/files/slurm-2.5.4-nogtk.patch
deleted file mode 100644
index 12741f53..0000000
--- a/sys-cluster/slurm/files/slurm-2.5.4-nogtk.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- slurm-2.5.4/configure.ac.orig 2013-04-11 12:58:24.971724348 +0400
-+++ slurm-2.5.4/configure.ac 2013-04-11 12:59:00.921724309 +0400
-@@ -229,40 +229,6 @@
- AM_CONDITIONAL(HAVE_SOME_CURSES, test "x$ac_have_some_curses" = "xyes")
- AC_SUBST(HAVE_SOME_CURSES)
-
--#
--# Tests for GTK+
--#
--
--# use the correct libs if running on 64bit
--if test -d "/usr/lib64/pkgconfig"; then
-- PKG_CONFIG_PATH="/usr/lib64/pkgconfig/:$PKG_CONFIG_PATH"
--fi
--
--if test -d "/opt/gnome/lib64/pkgconfig"; then
-- PKG_CONFIG_PATH="/opt/gnome/lib64/pkgconfig/:$PKG_CONFIG_PATH"
--fi
--
--AM_PATH_GLIB_2_0([2.7.1], [ac_glib_test="yes"], [ac_glib_test="no"],
[gthread])
--
--if test ${glib_config_minor_version=0} -ge 32 ; then
-- AC_DEFINE([GLIB_NEW_THREADS], 1, [Define to 1 if using glib-2.32.0 or
higher])
--fi
--
--AM_PATH_GTK_2_0([2.7.1], [ac_gtk_test="yes"], [ac_gtk_test="no"], [gthread])
--if test ${gtk_config_minor_version=0} -ge 10 ; then
-- AC_DEFINE([GTK2_USE_RADIO_SET], 1, [Define to 1 if using gtk+-2.10.0
or higher])
--fi
--
--if test ${gtk_config_minor_version=0} -ge 12 ; then
-- AC_DEFINE([GTK2_USE_TOOLTIP], 1, [Define to 1 if using gtk+-2.12.0 or
higher])
--fi
--
--if test ${gtk_config_minor_version=0} -ge 14 ; then
-- AC_DEFINE([GTK2_USE_GET_FOCUS], 1, [Define to 1 if using gtk+-2.14.0
or higher])
--fi
--
--AM_CONDITIONAL(BUILD_SVIEW, [test "x$ac_glib_test" = "xyes"] && [test
"x$ac_gtk_test" = "xyes"])
--
- X_AC_DATABASES
-
- dnl Cray ALPS/Basil support depends on mySQL
diff --git a/sys-cluster/slurm/metadata.xml b/sys-cluster/slurm/metadata.xml
index e9c1d83..3ea8121 100644
--- a/sys-cluster/slurm/metadata.xml
+++ b/sys-cluster/slurm/metadata.xml
@@ -9,10 +9,8 @@
<name>Gentoo Cluster Project</name>
</maintainer>
<use>
- <flag name="maui">Enable maui scheduler support</flag>
<flag name="munge">Enable authentication via munge</flag>
<flag name="multiple-slurmd">Allow multiple slurmd to run</flag>
- <flag name="ypbind">Enable ypbind based auth</flag>
<flag name="torque">Enable perl scripts that emulates pbs
(qstat, qsub etc.)</flag>
</use>
</pkgmetadata>
diff --git a/sys-cluster/slurm/slurm-2.6.3.ebuild
b/sys-cluster/slurm/slurm-16.05.2.ebuild
similarity index 84%
rename from sys-cluster/slurm/slurm-2.6.3.ebuild
rename to sys-cluster/slurm/slurm-16.05.2.ebuild
index 2227a52..a804679 100644
--- a/sys-cluster/slurm/slurm-2.6.3.ebuild
+++ b/sys-cluster/slurm/slurm-16.05.2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="git://github.com/SchedMD/slurm.git"
- INHERIT_GIT="git-2"
+ INHERIT_GIT="git-r3"
SRC_URI=""
KEYWORDS=""
else
@@ -18,19 +18,19 @@ else
fi
MY_P="${PN}-${MY_PV}"
INHERIT_GIT=""
- SRC_URI="http://www.schedmd.com/download/total/${MY_P}.tar.bz2";
+ SRC_URI="http://www.schedmd.com/download/latest/${MY_P}.tar.bz2";
KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${MY_P}"
fi
-inherit autotools base eutils pam perl-module user ${INHERIT_GIT}
+inherit autotools eutils pam perl-module user ${INHERIT_GIT}
DESCRIPTION="SLURM: A Highly Scalable Resource Manager"
HOMEPAGE="http://www.schedmd.com";
LICENSE="GPL-2"
SLOT="0"
-IUSE="lua maui multiple-slurmd +munge mysql pam perl postgres ssl static-libs
torque ypbind"
+IUSE="lua multiple-slurmd +munge mysql pam perl ssl static-libs torque"
DEPEND="
!sys-cluster/torque
@@ -38,16 +38,13 @@ DEPEND="
!net-analyzer/sinfo
mysql? ( virtual/mysql )
munge? ( sys-auth/munge )
- ypbind? ( net-nds/ypbind )
pam? ( virtual/pam )
- postgres? ( dev-db/postgresql )
- ssl? ( dev-libs/openssl )
- lua? ( dev-lang/lua )
+ ssl? ( dev-libs/openssl:0= )
+ lua? ( dev-lang/lua:0= )
!lua? ( !dev-lang/lua )
>=sys-apps/hwloc-1.1.1-r1"
RDEPEND="${DEPEND}
- dev-libs/libcgroup
- maui? ( sys-cluster/maui[slurm] )"
+ dev-libs/libcgroup"
REQUIRED_USE="torque? ( perl )"
@@ -57,7 +54,7 @@
LIBSLURMDB_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurmdb/perl"
RESTRICT="primaryuri"
PATCHES=(
- "${FILESDIR}/${PN}-2.5.4-nogtk.patch"
+ "${FILESDIR}/${P}-disable-sview.patch"
)
src_unpack() {
@@ -74,16 +71,11 @@ pkg_setup() {
}
src_prepare() {
- # Gentoo uses /sys/fs/cgroup instead of /cgroup
- # FIXME: Can the "^/cgroup" and "\([ =\"]\)/cgroup" patterns be merged?
- sed \
- -e 's|\([ =\"]\)/cgroup|\1/sys/fs/cgroup|g' \
- -e "s|^/cgroup|/sys/fs/cgroup|g" \
- -i "${S}/doc/man/man5/cgroup.conf.5" \
- -i "${S}/etc/cgroup.release_common.example" \
- -i "${S}/src/common/xcgroup_read_config.c" \
- || die "Can't sed /cgroup for /sys/fs/cgroup"
- # and pids should go to /var/run/slurm
+ if [ ${#PATCHES[0]} -ne 0 ]; then
+ epatch ${PATCHES[@]}
+ fi
+ eapply_user
+ # pids should go to /var/run/slurm
sed -e 's:/var/run/slurmctld.pid:/var/run/slurm/slurmctld.pid:g' \
-e 's:/var/run/slurmd.pid:/var/run/slurm/slurmd.pid:g' \
-i "${S}/etc/slurm.conf.example" \
@@ -97,14 +89,7 @@ src_prepare() {
sed -e 's:/tmp:/var/tmp:g' \
-i "${S}/etc/slurm.conf.example" \
|| die "Can't sed for StateSaveLocation=*./tmp"
- # disable sview since it need gtk+
- sed -e '/sview/d' \
- -i configure.ac
- sed -e 's:sview::g' \
- -i src/Makefile.am
- # apply patches
- epatch "${PATCHES[@]}"
- elibtoolize
+
eautoreconf
}
@@ -117,7 +102,6 @@ src_configure() {
)
use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) )
use mysql || myconf+=( --without-mysql_config )
- use postgres || myconf+=( --without-pg_config )
econf "${myconf[@]}" \
$(use_enable pam) \
$(use_with ssl) \
@@ -207,9 +191,6 @@ pkg_preinst() {
if use munge; then
sed -i 's,\(SLURM_USE_MUNGE=\).*,\11,' "${D}"etc/conf.d/slurm
|| die
fi
- if use ypbind; then
- sed -i 's,\(SLURM_USE_YPBIND=\).*,\11,' "${D}"etc/conf.d/slurm
|| die
- fi
}
create_folders_and_fix_permissions() {
