[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/files/, sys-cluster/slurm/

[Alexey Shvetsov]

commit:     017cd425528e318e78e4aac574169be21f1bd523
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  4 13:36:43 2018 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Tue Sep  4 13:36:43 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=017cd425

sys-cluster/slurm: Version bump

Closes: https://bugs.gentoo.org/656960
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 sys-cluster/slurm/Manifest                         |  1 +
 .../slurm/files/slurm-18.08.0-disable-sview.patch  | 99 ++++++++++++++++++++++
 sys-cluster/slurm/slurm-17.11.9.ebuild             |  2 +-
 .../{slurm-17.11.9.ebuild => slurm-18.08.0.ebuild} |  2 +-
 4 files changed, 102 insertions(+), 2 deletions(-)

diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index ab80e3b9bdc..0800d99dd77 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -1 +1,2 @@
 DIST slurm-17.11.9.tar.bz2 6258698 BLAKE2B 53f724dfdcaec4117eedcb187b0bfced41471fff667ea3f3452b35d80ed039c14c31a75672c304816af538861fccd0dcf37c0decd32521299db2162a30b8bba0 SHA512 281bda70695011bbc30f56738049b2b11866d6c266c6aa5590ffcbaaa748a02fc76cd2d03834cd90f0e1f4160ee0fb3c35a7c2e53819f5e21445748d4d437e6b
+DIST slurm-18.08.0.tar.bz2 6100548 BLAKE2B 108a64c05cf704288b2ed3627b92edb6402c41aec9866b06d7fdf18b9e0e5f5e815a7e7ded5f8d5c4ab7e9ad46368b5bc54ac52902413fc8a9395c665f11e2ed SHA512 e0da38e2b8b96433c244bcad41e7dd0da56e9bf3de8a64eafd5a8d89ffb8400a3aebb2a54ec28f6c2e9804d40945bb8b53b2a9e3ac688a1d8a2a81ee71b4b11d

diff --git a/sys-cluster/slurm/files/slurm-18.08.0-disable-sview.patch b/sys-cluster/slurm/files/slurm-18.08.0-disable-sview.patch
new file mode 100644
index 00000000000..f7e2c5b2673
--- /dev/null
+++ b/sys-cluster/slurm/files/slurm-18.08.0-disable-sview.patch
@@ -0,0 +1,99 @@
+ configure.ac             | 39 ---------------------------------------
+ doc/man/man1/Makefile.am |  8 --------
+ src/Makefile.am          |  3 +--
+ 3 files changed, 1 insertion(+), 49 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2f177ec..ff4d69b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -238,44 +238,6 @@ AC_SUBST(HAVE_SOME_CURSES)
+ 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"])
+-
+ dnl Cray ALPS/Basil support depends on mySQL
+ X_AC_CRAY
+ 
+@@ -477,7 +439,6 @@ AC_CONFIG_FILES([Makefile
+ 		 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 --git a/doc/man/man1/Makefile.am b/doc/man/man1/Makefile.am
+index 246f16d..ba39af2 100644
+--- a/doc/man/man1/Makefile.am
++++ b/doc/man/man1/Makefile.am
+@@ -29,10 +29,6 @@ if WITH_BLCR
+ man1_MANS += srun_cr.1
+ endif
+ 
+-if BUILD_SVIEW
+-man1_MANS += sview.1
+-endif
+-
+ EXTRA_DIST = $(man1_MANS)
+ 
+ if HAVE_MAN2HTML
+@@ -65,10 +61,6 @@ if WITH_BLCR
+ html_DATA += srun_cr.html
+ endif
+ 
+-if BUILD_SVIEW
+-html_DATA += sview.html
+-endif
+-
+ MOSTLYCLEANFILES = ${html_DATA}
+ 
+ EXTRA_DIST += $(html_DATA)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index bcd5aa7..a8cbf17 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -28,5 +28,4 @@ SUBDIRS =		\
+ 	srun_cr		\
+ 	sshare		\
+ 	sstat		\
+-	strigger	\
+-	sview
++	strigger

diff --git a/sys-cluster/slurm/slurm-17.11.9.ebuild b/sys-cluster/slurm/slurm-17.11.9.ebuild
index 3a1c55f311c..837a4d32c76 100644
--- a/sys-cluster/slurm/slurm-17.11.9.ebuild
+++ b/sys-cluster/slurm/slurm-17.11.9.ebuild
@@ -36,7 +36,7 @@ CDEPEND="
 	!sys-cluster/torque
 	!net-analyzer/slurm
 	!net-analyzer/sinfo
-	sys-cluster/pmix[-pmi]
+	|| ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 )
 	mysql? ( virtual/mysql )
 	munge? ( sys-auth/munge )
 	pam? ( virtual/pam )

diff --git a/sys-cluster/slurm/slurm-17.11.9.ebuild b/sys-cluster/slurm/slurm-18.08.0.ebuild
similarity index 99%
copy from sys-cluster/slurm/slurm-17.11.9.ebuild
copy to sys-cluster/slurm/slurm-18.08.0.ebuild
index 3a1c55f311c..837a4d32c76 100644
--- a/sys-cluster/slurm/slurm-17.11.9.ebuild
+++ b/sys-cluster/slurm/slurm-18.08.0.ebuild
@@ -36,7 +36,7 @@ CDEPEND="
 	!sys-cluster/torque
 	!net-analyzer/slurm
 	!net-analyzer/sinfo
-	sys-cluster/pmix[-pmi]
+	|| ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 )
 	mysql? ( virtual/mysql )
 	munge? ( sys-auth/munge )
 	pam? ( virtual/pam )