Only preserve nodes if server is enabled, #489336. Thanks to Olaf Leidinger for the patch.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4D7043C9

5 files changed, 19 insertions, 14 deletions

diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog
index 551a12c7371e..c7fc2cb127b6 100644
--- a/sys-cluster/torque/ChangeLog
+++ b/sys-cluster/torque/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/torque
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.172 2014/10/17 03:23:11 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.173 2014/10/17 03:59:14 jsbronder Exp $
+
+  17 Oct 2014; Justin Bronder <jsbronder@gentoo.org> torque-4.1.5.1-r1.ebuild,
+  torque-4.1.7.ebuild, torque-4.2.9-r1.ebuild:
+  Only preserve nodes if server is enabled, #489336. Thanks to Olaf Leidinger
+  for the patch.
 
 *torque-4.2.9-r1 (17 Oct 2014)
 
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index ea6acead7e51..d239a306e9e8 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -26,15 +26,15 @@ DIST torque-4.1.7.tar.gz 6218108 SHA256 3c86b2d84589f54ac222e81dd1953d153e1d8361
 DIST torque-4.2.9.tar.gz 6294022 SHA256 46f1f319683af6d3820e18cda69ce59113c9a5c192e1f07826007be69385889b SHA512 898703fa1d02310c22e2a02b86d67ca52ebed46684597931944edebb39f8293746739c8dca9cd10e07c2e7274c3dd7f65a5664d1980817e3feec58952c4cf4d1 WHIRLPOOL e65be66b056a519ebd1c30c2c1ae2ddf43bc4e617a52d3caced1e6dfd2b0d8b2a83c26a0f2e6e41cfae791aca68b6f91424745b2baffa2085fccc8f6ae9b8e04
 EBUILD torque-2.5.12-r1.ebuild 7637 SHA256 06709db3e6a4de2c545467584813f05385b76e64350f77e9c70b3559aae068fb SHA512 ec992ccb9430bf74e85025b3d23154f2a91c2281e9b424818002d75873152940424543c7b06e70b3c2d3d58a15b4e241022b42128a189fe587833918eed0eac7 WHIRLPOOL ee89d2da1fdbd11bcc8e3012b0c4acdc895271e483e9d70ca2e7d7db65e3532f2d251b70884757861842c0708cdfdf8ceef2cd15d61f786a361ca1dc7084e8d9
 EBUILD torque-2.5.13.ebuild 7749 SHA256 d6341222bcd51c48f59f0d1703cefae99e81665251da24ee2bc29391f82a05fa SHA512 9fc230bd7b698faa26eca29efbfe1f05843d4385e034de5194a638c22ddc3d8e35f36406685ade448094f8b1f9b89bac2f961aafa1739f5cce850f0693fd2185 WHIRLPOOL 14e1bd68466c463be5063f3db371a14588ad84db0fe6629f7fecf244ae2669d63c683da6f665e7e54ce369b152cd53ba80d1f1f26f5f96a5bc73261e2526e39f
-EBUILD torque-4.1.5.1-r1.ebuild 7434 SHA256 d2d00a3f3267e0e8f1a68cf3c9476fff224e62d56ae5b2bf01540fbe76a145c5 SHA512 08eadd4f8b72a475d16f20d27cd2eb5c2c6056ec93196d81b405c253c2c6a82a98f6339aab2e240e81c019b2528ccf213c0c7f01dac881c4d906ae032e1570ee WHIRLPOOL a105d1954c42ae9442b7dc7bfd732cbb48a73eb7b6cdfd2f3e48b99b98d9361b23de47ac81765f29cb8554914b40e3cbe3ef84823e0d67ec64ca764ea7be3d6b
-EBUILD torque-4.1.7.ebuild 7388 SHA256 75f68a7f50ba7bf07de8b76b2b6763b447c4c724c28449fc7ea673bd283caac2 SHA512 5a634e1c9beaabcc4d7f7c62b0212380cc77cb254b500d9e42bf4e99ac041ea0f39ea8746995c0b54accae3c63699aa6d6a9dfcdd895eab7aa8dda47eae3f95a WHIRLPOOL 9522ddfa18e8ec571423c898b9169fdac22800c9b33f95918ae0a4febd73e1a42b9a5740bc9da44f73384724610e4240240c3bf0b4f0670ae8fb3b1654eedaa9
-EBUILD torque-4.2.9-r1.ebuild 7417 SHA256 40cfb1229731d55d86e23805985cbb3e222ec0828582c16910aa0bf2e86bc171 SHA512 777edfbd1cbd755c9c0e412780140038792782a005f960b99ea0112cc772431cbedeb679b1e086977f0e5e28b8a037d9551558cdb840b8761b0b138a9f52caf4 WHIRLPOOL 3909751d56c12f356996a472a629c27c761b2c2c132bc4f658d7ed2bfc8ffe9b426c3f7d93de9af88ac4bd35c5d985ead62a9973ded5f3fa67b95e8069e0e99b
-MISC ChangeLog 29601 SHA256 c739927d593e803aebbed5af0d1b018e47c133c967e7de3b4cfc56453c61d57b SHA512 530e794f37a6851523c407e13d3f41065aa508a2beed004e5802f867b7e70b7ed13c0929e2db282e6fa922834bd44d26eeead49f8705a4feec0f14a14c9f5a7a WHIRLPOOL 426b0b9ac0a77da7b602a22721058f459ad0b10c53857c116fec145285b5091d2ec66e3335553de8d9c317d7450a4c42aedd4287748968717566ef3a8f7bb95d
+EBUILD torque-4.1.5.1-r1.ebuild 7448 SHA256 1dacfc38dc7b7e9c04495e31e36afe20d84e5015b1b94ed6e2626cd5ceb3df70 SHA512 1787102e304fc4bf94a42ee2593a8e0f0cbf85d22c3879e15170ba00d2b2144db1c721a3d49d564eaaf9e5e1079bf3bc494df4c76dcc12a65453bd0d16acf886 WHIRLPOOL 4fb6f7d2392ae4cc5acdaeee30b6bc5f5d27df572f6494ccc9e21f3ac9a2c9f7ae6680fc28d2a0a4c5528473e43cd66d61ad7288c2d120718937e3f070d83c29
+EBUILD torque-4.1.7.ebuild 7402 SHA256 7a42f36b04d865140537d612e78f88ecf05b54e817a96cc5343925e920170267 SHA512 c73843192b3db6a6f94442b4d2b458b30d06891a7fd33da3200ee0bec9addc610407ae2bf2ebc18ab80e7d3ef572bd18e57d481712a3895d83c1ebd5d713eee5 WHIRLPOOL 31deca3421698bb206971a363a7d73fba5541d9d6fbdf9862dd1d6ad92f65feb1f8c8069dcafc8fe669589d4b79b53c1a1df093c3d93f9b3d10ea278bdb6512f
+EBUILD torque-4.2.9-r1.ebuild 7431 SHA256 e9c352589976c67e6af0069e8fd6bf5534939b85aa41f636339f95ba3798ca4b SHA512 3ae692dc754bf1e6c6dcfda6e777a4c5a44eb674b72f729156624a2df2b4fa8966ee9888d731cfad0f329f59f041cd14b24cf93e2b944e6c6f8d5d61926c4977 WHIRLPOOL 0f4befdbda82ce06a9c14a9407698685efb952ddb90e25a2a8b5796c6c74894bab68bcfa5dcb954847b41b34a92670b8ab93fb00d1221b19387baf92d7c35829
+MISC ChangeLog 29823 SHA256 3f0f340537d3691d07a83a649d91f36ff2e2e91c36a31ca67f41115e217b2277 SHA512 d9465e6177fcf157fdc191400040dbbd467d946e5c8b6420828b0e2625ffba0880f15810becd3cf4b4c836d9893670b531efa0ac1427c90ede63eb0f4bc5e6ae WHIRLPOOL 7697341846b1ff49da0b35a45d8ba8a86627ef98890de4afaed1f740af3b48d842e70af297430fd3ae9a0ab3708fd6619ae1d75ad452074b87dcb6d0a6f5f1ea
 MISC metadata.xml 628 SHA256 10fab1886476e44fabbcda6e7dbbc8452d07cb0de0cefcf6e594312dfe89f7af SHA512 d1c78c4247f209eda60a61c9c611c4a4b87d52f85b112a78b96a4dee6f3cd660aef49547323074d69ffce8c1b916c3914f00282781e2f68f76658e6f9ac7ff9b WHIRLPOOL 243373e602f92a256118e6bee6c3071d5894caf3d53a663abee6929a310cf306b15a6a7bd2a0e76882cfe36cd4e8b6c06bb9e12f49f678d085883d61d4a84cf9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlRAi6AACgkQ4MrvBE1wQ8md6QCgsFnRJSRZSSPD8Dsni72cotS6
-79cAoLRRNO9oPDGZpiXxSREFU4L7Kf8v
-=gEUS
+iEYEAREIAAYFAlRAlBQACgkQ4MrvBE1wQ8n7lQCfdhocoZ29czoBUkQHY7k1uck/
+WOAAoKhTg1CvrJKW/96dKbxzP/ctZ/2Y
+=lv4u
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/torque/torque-4.1.5.1-r1.ebuild b/sys-cluster/torque/torque-4.1.5.1-r1.ebuild
index d931c037cf91..b76e696f5da7 100644
--- a/sys-cluster/torque/torque-4.1.5.1-r1.ebuild
+++ b/sys-cluster/torque/torque-4.1.5.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-4.1.5.1-r1.ebuild,v 1.10 2014/10/17 02:54:02 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-4.1.5.1-r1.ebuild,v 1.11 2014/10/17 03:59:14 jsbronder Exp $
 
 EAPI=4
 inherit flag-o-matic eutils linux-info
@@ -142,7 +142,7 @@ pkg_preinst() {
 		cp "${ROOT}etc/pbs_environment" "${D}"/etc/pbs_environment || die
 	fi
 
-	if [[ -f "${ROOT}${PBS_SERVER_HOME}/server_priv/nodes" ]]; then
+	if use server && [[ -f "${ROOT}${PBS_SERVER_HOME}/server_priv/nodes" ]]; then
 		cp "${ROOT}${PBS_SERVER_HOME}/server_priv/nodes" \
 			"${D}"/${PBS_SERVER_HOME}/server_priv/nodes || die
 	fi
diff --git a/sys-cluster/torque/torque-4.1.7.ebuild b/sys-cluster/torque/torque-4.1.7.ebuild
index c37fde44eafc..e3bc3421dd74 100644
--- a/sys-cluster/torque/torque-4.1.7.ebuild
+++ b/sys-cluster/torque/torque-4.1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-4.1.7.ebuild,v 1.3 2014/10/17 02:54:02 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-4.1.7.ebuild,v 1.4 2014/10/17 03:59:14 jsbronder Exp $
 
 EAPI=5
 
@@ -145,7 +145,7 @@ pkg_preinst() {
 		cp "${ROOT}etc/pbs_environment" "${ED}"/etc/pbs_environment || die
 	fi
 
-	if [[ -f "${ROOT}${PBS_SERVER_HOME}/server_priv/nodes" ]]; then
+	if use server && [[ -f "${ROOT}${PBS_SERVER_HOME}/server_priv/nodes" ]]; then
 		cp \
 			"${EROOT}${PBS_SERVER_HOME}/server_priv/nodes" \
 			"${ED}/${PBS_SERVER_HOME}/server_priv/nodes" || die
diff --git a/sys-cluster/torque/torque-4.2.9-r1.ebuild b/sys-cluster/torque/torque-4.2.9-r1.ebuild
index 15a08dfa2891..3f8ed13495b1 100644
--- a/sys-cluster/torque/torque-4.2.9-r1.ebuild
+++ b/sys-cluster/torque/torque-4.2.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-4.2.9-r1.ebuild,v 1.1 2014/10/17 03:23:11 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-4.2.9-r1.ebuild,v 1.2 2014/10/17 03:59:14 jsbronder Exp $
 
 EAPI=5
 
@@ -145,7 +145,7 @@ pkg_preinst() {
 		cp "${ROOT}etc/pbs_environment" "${ED}"/etc/pbs_environment || die
 	fi
 
-	if [[ -f "${ROOT}${PBS_SERVER_HOME}/server_priv/nodes" ]]; then
+	if use server && [[ -f "${ROOT}${PBS_SERVER_HOME}/server_priv/nodes" ]]; then
 		cp \
 			"${EROOT}${PBS_SERVER_HOME}/server_priv/nodes" \
 			"${ED}/${PBS_SERVER_HOME}/server_priv/nodes" || die