[patch] Diff between portage's sys-cluster/slurm-2.4.3 and sys-cluster/slurm-2.5.0_rc2

portage_sys-cluster_slurm-2.4.3_to_2.5.0_rc2.patch (text/plain), 3.31 KB, created by Nicolas Bigaouette on 2012-11-30 20:14:17 UTC

--- /usr/portage/sys-cluster/slurm/slurm-2.4.3.ebuild	2012-10-14 14:31:29.000000000 -0400
+++ slurm-2.5.0_rc2.ebuild	2012-11-30 15:09:07.397240124 -0500
@@ -1,26 +1,36 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/slurm/slurm-2.4.3.ebuild,v 1.2 2012/10/14 18:27:42 alexxy Exp $
+# $Header: $
 
 EAPI=4
-RESTRICT="primaryuri"
 
-inherit eutils versionator pam perl-module user
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="git://github.com/SchedMD/slurm.git"
+	INHERIT_GIT="git-2"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	inherit versionator
+	if [[ ${PV} == *pre* || ${PV} == *rc* ]]; then
+		MY_PV=$(replace_version_separator 3 '-0.') # pre-releases or release-candidate
+	else
+		MY_PV=$(replace_version_separator 3 '-') # stable releases
+	fi
+	MY_P="${PN}-${MY_PV}"
+	INHERIT_GIT=""
+	SRC_URI="http://www.schedmd.com/download/total/${MY_P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
 
-MY_PV=$(replace_version_separator 3 '-') # stable releases
-#MY_PV=$(replace_version_separator 3 '-0.') # pre-releases
-MY_P="${PN}-${MY_PV}"
-MY_branch="latest"
-#MY_branch="development"
+inherit eutils pam perl-module ${INHERIT_GIT}
 
 DESCRIPTION="SLURM: A Highly Scalable Resource Manager"
-HOMEPAGE="https://computing.llnl.gov/linux/slurm/"
-SRC_URI="http://www.schedmd.com/download/${MY_branch}/${MY_P}.tar.bz2"
+HOMEPAGE="http://www.schedmd.com"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="maui +munge mysql pam perl postgres ssl static-libs torque ypbind"
+IUSE="lua maui multiple-slurmd +munge mysql pam perl postgres ssl static-libs torque ypbind"
 
 DEPEND="
 	!sys-cluster/torque
@@ -32,6 +42,8 @@
 	pam? ( virtual/pam )
 	postgres? ( dev-db/postgresql-base )
 	ssl? ( dev-libs/openssl )
+    lua? ( dev-lang/lua )
+    !lua? ( !dev-lang/lua )
 	>=sys-apps/hwloc-1.1.1-r1"
 RDEPEND="${DEPEND}
 	dev-libs/libcgroup
@@ -39,11 +51,24 @@
 
 REQUIRED_USE="torque? ( perl )"
 
-S="${WORKDIR}/${MY_P}"
-
 LIBSLURM_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurm/perl"
 LIBSLURMDB_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurmdb/perl"
 
+RESTRICT="primaryuri"
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]]; then
+		git-2_src_unpack
+	else
+		[[ "${A}" != "" ]] && unpack ${A}
+	fi
+
+	cd ${S}
+	for patch_file in ${FILESDIR}/${P}*.patch; do
+		[[ -e ${patch_file} ]] && epatch ${patch_file}
+	done
+}
+
 pkg_setup() {
 	enewgroup slurm 500
 	enewuser slurm 500 -1 /var/spool/slurm slurm
@@ -73,8 +98,6 @@
 	sed -e 's:/tmp:/var/tmp:g' \
 		-i "${S}/etc/slurm.conf.example" \
 			|| die "Can't sed for StateSaveLocation=*./tmp"
-
-	epatch "${FILESDIR}"/${PN}-2.3.4-glibc2.16.patch
 }
 
 src_configure() {
@@ -91,7 +114,8 @@
 		$(use_enable pam) \
 		$(use_with ssl) \
 		$(use_with munge) \
-		$(use_enable static-libs static)
+		$(use_enable static-libs static) \
+		$(use_enable multiple-slurmd)
 
 	# --htmldir does not seems to propagate... Documentations are installed
 	# in /usr/share/doc/slurm-2.3.0/html
@@ -145,8 +169,9 @@
 	# install sample configs
 	keepdir /etc/slurm
 	insinto /etc/slurm
+	doins etc/bluegene.conf.example
 	doins etc/cgroup.conf.example
-	doins etc/federation.conf.example
+	doins etc/cgroup_allowed_devices_file.conf.example
 	doins etc/slurm.conf.example
 	doins etc/slurmdbd.conf.example
 	exeinto /etc/slurm