Version bump and misc fixes (#397525).

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

3 files changed, 46 insertions, 48 deletions

diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog
index 500088bf01f7..9cb526873fff 100644
--- a/sys-cluster/torque/ChangeLog
+++ b/sys-cluster/torque/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/torque
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.127 2012/01/03 15:56:44 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.128 2012/01/06 01:54:36 jsbronder Exp $
+
+*torque-3.0.3 (06 Jan 2012)
+
+  06 Jan 2012; Justin Bronder <jsbronder@gentoo.org> -torque-3.0.2.ebuild,
+  +torque-3.0.3.ebuild:
+  Version bump and misc fixes (#397525).
 
 *torque-2.5.9 (03 Jan 2012)
 
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index a0ebb6cbc4f5..53b8acd5b9fd 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX 0001-fix-parallel-doc-install.patch 1510 RMD160 d1e59f8888bd5e15f563f2e40fba83739aa8d5bb SHA1 750746a9503e92451e2e2ff6c63305cef6959743 SHA256 ad576c6449e078841f8f3dad1515d74264b66d43dfe5232007aca4c467120b22
 AUX 0002-fix-implicit-declaration-warnings.patch 1325 RMD160 b20b48f93d470de63772d884c6a4f63ddb86e825 SHA1 b24e9a5c5291edc8b061241446d8e975872b9477 SHA256 e3ca220f3a30ad68eaabc2152bf5e9e60fc09347d9f61edccb755d7837ef2764
@@ -18,28 +18,18 @@ DIST torque-2.3.13.tar.gz 5466720 RMD160 9323be14efb5746f2290ee36ccad9381ba536d9
 DIST torque-2.4.14.tar.gz 5705022 RMD160 7bfa41fb6648060316c58dbd01c6741a46f1fa85 SHA1 88ac7d00c7a09ff5a91c82a08dd19ceb1f55faaa SHA256 4ce2cdac450ab1f05f89169700364180067778535e7d5fa6d4ca576c0ca1c5f8
 DIST torque-2.4.16.tar.gz 5705768 RMD160 cd08cc44e9f5c9ce7202d50ee11cb2801ac3a8ab SHA1 11cec0cd980ab0652876e37ece607ff120b383e8 SHA256 48b1344e13baf974053dbd2faea3e2d24bb6ea8d785805d78623ae06747c0a0d
 DIST torque-2.5.9.tar.gz 5853931 RMD160 87ebf548d9a5cf6e56b7bdd9ec8d6c9082e1de99 SHA1 d0375b739854a545782f358d59029046066a59a2 SHA256 c68beb4b4e24042e4a8f4d84226e5d91aeb09a3d700d00f2c476559313597fe9
-DIST torque-3.0.2.tar.gz 5864771 RMD160 eae9991eb808a80739e8e64c9a543b14229a38ab SHA1 73e31ca0de2455620a471b2015da0b4c05876908 SHA256 a82c6a269a78ace25a7b60bfe1204db34855ddc56c1af29ca73f165999cb24a1
+DIST torque-3.0.3.tar.gz 5882061 RMD160 ee89a38039f9387deb0e8ecd815a886ecdb5c883 SHA1 031d118f213112d7dcf66c7c083ce5aa10608285 SHA256 76c9d672704fd6cf7742a32187e86a64034178411cbe011060e2fe3855604a2a
 EBUILD torque-2.3.13.ebuild 7721 RMD160 394d879172bc72b485b37a928887045068e90977 SHA1 4a7549f0356ded5cc48d56850875628980a2f178 SHA256 05021de624a6e1c52eb2f731232588e75b2fcc04b7bbed6fe640fecd9f779b84
 EBUILD torque-2.4.14.ebuild 7653 RMD160 686f24f144fdbaec8028d4b00d51e5c02f5bfc28 SHA1 6a00b845b38b44a73cfd5f1c255212a54e263fe1 SHA256 49276b6375cee31cb083f8744ec2aace43bb19b14e4f01d6c59db489b0814991
 EBUILD torque-2.4.16.ebuild 7660 RMD160 20c0d683c9d3ca2afeed19e6baf574bfdae5c5f5 SHA1 6896a8203e7a3781640654fa5ca8b84565772a55 SHA256 f6b007274dd0fb5d44066850d3a866045d1298c33361dc954bbe82f7b64bfa20
 EBUILD torque-2.5.9.ebuild 7230 RMD160 b557589d82cecbe8db1fdc2f80837e0a78a69e47 SHA1 4b20a3c5ec34fe8847ec076a75331d6dbf831bfd SHA256 7c8b615fa5005480a15fa43eefb8a2fab8ff5aeb6c188f7dce726557d5576b0d
-EBUILD torque-3.0.2.ebuild 7870 RMD160 de2cdb179556ac6496aa74b044023dccf947c9e3 SHA1 f12441ea19d1babba75f02c9a1e59a55644fb88d SHA256 d4e4c97e47689a0e7868e03b8d0ab3d203a344882e7db730aeda59037c5b70fe
-MISC ChangeLog 21224 RMD160 b66a1bedc696165d1ec2f4a1fb6a3959a5b3f72f SHA1 f648d254db0a9d7e85d3bac0a06de6668b6c40c7 SHA256 23dfca0bd52025b2fb7d26d332abecb2af782bc5e7a61700b0796e0cc1aeb1d9
+EBUILD torque-3.0.3.ebuild 8004 RMD160 bfe2460a4b5b0eb544c121f45cd3df0142a0cb3c SHA1 4967edbf83ff2554384d461ead79fa81a5519786 SHA256 0f0f7f99c33b763afd681576913ac3b79c957a2f8f019b134c91254efb479ece
+MISC ChangeLog 21393 RMD160 697fcc94380940973f661b329a39118f52b90363 SHA1 14460f9046f79f1f337d2af7fd3564835d767a59 SHA256 5a582916416385f90b7f4f1dfe17ae3c7a64b50532f1040b832ad15592c83496
 MISC metadata.xml 549 RMD160 9fb7dd9648470fa355b59cb855da7a1abbbc92d4 SHA1 3ce3726e415cf3e0a7aabb9bd71adee605d5cb5d SHA256 64bc2bf6a305af729513a2223a96b4255ce8e15391e4d22fda15d7b346baba4a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPAyVCAAoJEF0huFKJUZL591kP/A6pt4sbEbvxdS/4Ql+TIOlp
-CUbuw4MRhIr5EB1i3dDIv3sZuI/xY6GS3jYGGGtrgUniVDrsNHdNYlyWgvteA4Cn
-hVlP0bxYewLunYy2egwLgtdgr0GSyQqA5hlmFFGi3CJ820b5YkjfjSVs9xHuGw9Z
-Nh9alOZMB5ffuHCba5aj575IvQFilj+X9Ku1cP/2MMZlyRrIM5BErzqEjT0+G40s
-CXaK5/o6LQc/oey5tHhvCSdbrHgLEWmQddQmacelx+cHVwjL7QSlJK48O4X10aZN
-PoA8sKtAEpZPF3pUWKdfZBd65WA6G1HPNemv2ps3sxDmQ3jE31XQmXoinw5WFUqV
-KgGuOE3cO9+1mt10ZP1KrqInyZT9PWdSP0jYzOrSVnPoLOh7uCEsZoAfIgFA8ffT
-zJbI3f6WImTYBR38xgEBkYJL3bP0CWs1Lbyuy2oK2n1qwSPTlHSVUsw3jAGX7wKu
-RGxIMmtSU2i7nE+HNANDSAdRpILjn0W+OLWGREo0gg1En6U5lfUyErh0PbfkaUr5
-i2ABc8xYRpEfeC1h9QS6Q+3nA5dtvpwRM31rkoktLW5EesWi/o3hnLz6NxStczIn
-nDBJehh9RxUma2HRVzpRPvalbyjH8KKVxAJSGVVTlH9vcGhCoE2XfpQXzOF/0fUW
-nE0evc9O6CQKf6s6Yahg
-=qTZV
+iEYEARECAAYFAk8GVGgACgkQ4MrvBE1wQ8n70gCfSIVssP3cHuu0iHtNfVU2NkO4
+31EAni4aHZv06q1g+bhUoSAn+kyfV+d9
+=2h/m
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/torque/torque-3.0.2.ebuild b/sys-cluster/torque/torque-3.0.3.ebuild
index 459a6e67bf13..a2886e44a331 100644
--- a/sys-cluster/torque/torque-3.0.2.ebuild
+++ b/sys-cluster/torque/torque-3.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-3.0.2.ebuild,v 1.1 2011/09/30 23:11:54 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-3.0.3.ebuild,v 1.1 2012/01/06 01:54:36 jsbronder Exp $
 
 EAPI=2
 inherit flag-o-matic eutils linux-info autotools
@@ -44,7 +44,7 @@ pkg_setup() {
 		fi
 	fi
 
-	USE_CPUSETS="--disable-cpusets"
+	USE_CPUSETS="--disable-cpuset"
 	if use cpusets; then
 		if ! use kernel_linux; then
 			einfo
@@ -63,7 +63,7 @@ pkg_setup() {
 				elog "your kernel with CONFIG_CPUSETS enabled."
 				einfo
 			fi
-			USE_CPUSETS="--enable-cpusets"
+			USE_CPUSETS="--enable-cpuset"
 		fi
 	fi
 }
@@ -95,8 +95,7 @@ src_configure() {
 		--disable-gcc-warnings \
 		--with-tcp-retry-limit=2 \
 		${USE_CPUSETS} \
-		${myconf} \
-		|| die "econf failed"
+		${myconf}
 }
 
 # WARNING
@@ -128,13 +127,13 @@ pbs_createspool() {
 		d="${a/*:}"
 		m="${a/:*}"
 		if [[ ! -d "${root}${d}" ]]; then
-			install -d -m${m} "${root}${d}"
+			install -d -m${m} "${root}${d}" || die
 		else
-			chmod ${m} "${root}${d}"
+			chmod ${m} "${root}${d}" || die
 		fi
 		# (#149226) If we're running in src_*, then keepdir
 		if [[ "${root}" = "${D}" ]]; then
-			keepdir ${d}
+			keepdir ${d} || die
 		fi
 	done
 }
@@ -143,7 +142,7 @@ src_install() {
 	# Make directories first
 	pbs_createspool "${D}"
 
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "make install failed"
 
 	dodoc CHANGELOG README.* Release_Notes || die "dodoc failed"
 	if use doc; then
@@ -154,27 +153,29 @@ src_install() {
 	# So we have to fix some hard-coded paths in tclIndex for xpbs* to work
 	for file in `find "${D}" -iname tclIndex`; do
 		sed -e "s/${D//\// }/ /" "${file}" > "${file}.new"
-		mv "${file}.new" "${file}"
+		mv "${file}.new" "${file}" || die
 	done
 
 	if use server; then
-		newinitd "${FILESDIR}"/pbs_server-init.d-munge pbs_server
-		newinitd "${FILESDIR}"/pbs_sched-init.d pbs_sched
+		newinitd "${FILESDIR}"/pbs_server-init.d-munge pbs_server || die
+		newinitd "${FILESDIR}"/pbs_sched-init.d pbs_sched || die
 	fi
-	newinitd "${FILESDIR}"/pbs_mom-init.d-munge pbs_mom
-	newconfd "${FILESDIR}"/torque-conf.d-munge torque
-	newenvd "${FILESDIR}"/torque-env.d 25torque
+	newinitd "${FILESDIR}"/pbs_mom-init.d-munge pbs_mom || die
+	newconfd "${FILESDIR}"/torque-conf.d-munge torque || die
+	newenvd "${FILESDIR}"/torque-env.d 25torque || die
 }
 
 pkg_preinst() {
 	if [[ -f "${ROOT}etc/pbs_environment" ]]; then
-		cp "${ROOT}etc/pbs_environment" "${D}"/etc/pbs_environment
+		cp "${ROOT}etc/pbs_environment" "${D}"/etc/pbs_environment || die
 	fi
 
-	echo "${PBS_SERVER_NAME}" > "${D}${PBS_SERVER_HOME}/server_name"
+	echo "${PBS_SERVER_NAME}" > "${D}${PBS_SERVER_HOME}/server_name" || die
 
 	# Fix up the env.d file to use our set server home.
-	sed -i "s:/var/spool/torque:${PBS_SERVER_HOME}:g" "${D}"/etc/env.d/25torque
+	sed -i \
+		"s:/var/spool/torque:${PBS_SERVER_HOME}:g" "${D}"/etc/env.d/25torque \
+		|| die
 
 	if use munge; then
 		sed -i 's,\(PBS_USE_MUNGE=\).*,\11,' "${D}"etc/conf.d/torque || die
@@ -217,8 +218,8 @@ pkg_config() {
 	fi
 
 	# pbs_mom configuration.
-	echo "\$pbsserver ${PBS_SERVER_NAME}" > "${h}/mom_priv/config"
-	echo "\$logevent 255" >> "${h}/mom_priv/config"
+	echo "\$pbsserver ${PBS_SERVER_NAME}" > "${h}/mom_priv/config" || die
+	echo "\$logevent 255" >> "${h}/mom_priv/config" || die
 
 	if use server; then
 		local qmgr="${ROOT}/usr/bin/qmgr -c"
@@ -227,14 +228,15 @@ pkg_config() {
 			eerror "Failed to start pbs_server"
 			rc=1
 		else
-			${qmgr} "set server operators = root@$(hostname -f)" ${PBS_SERVER_NAME}
-			${qmgr} "create queue batch" ${PBS_SERVER_NAME}
-			${qmgr} "set queue batch queue_type = Execution" ${PBS_SERVER_NAME}
-			${qmgr} "set queue batch started = True" ${PBS_SERVER_NAME}
-			${qmgr} "set queue batch enabled = True" ${PBS_SERVER_NAME}
-			${qmgr} "set server default_queue = batch" ${PBS_SERVER_NAME}
-			${qmgr} "set server resources_default.nodes = 1" ${PBS_SERVER_NAME}
-			${qmgr} "set server scheduling = True" ${PBS_SERVER_NAME}
+			${qmgr} "set server operators = root@$(hostname -f)" ${PBS_SERVER_NAME} \
+				&& ${qmgr} "create queue batch" ${PBS_SERVER_NAME} \
+				&& ${qmgr} "set queue batch queue_type = Execution" ${PBS_SERVER_NAME} \
+				&& ${qmgr} "set queue batch started = True" ${PBS_SERVER_NAME} \
+				&& ${qmgr} "set queue batch enabled = True" ${PBS_SERVER_NAME} \
+				&& ${qmgr} "set server default_queue = batch" ${PBS_SERVER_NAME} \
+				&& ${qmgr} "set server resources_default.nodes = 1" ${PBS_SERVER_NAME} \
+				&& ${qmgr} "set server scheduling = True" ${PBS_SERVER_NAME} \
+				|| die
 
 			"${ROOT}"/usr/bin/qterm -t quick ${PBS_SERVER_NAME} || rc=1