Bug #283320 cleanup: linux_config_exists before linux_chkconfig*.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

5 files changed, 21 insertions, 25 deletions

diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog
index 7da02f1b0e6d..233725dde698 100644
--- a/sys-cluster/torque/ChangeLog
+++ b/sys-cluster/torque/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/torque
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.87 2009/12/03 22:50:46 jsbronder Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.88 2010/01/10 01:22:39 robbat2 Exp $
+
+  10 Jan 2010; Robin H. Johnson <robbat2@gentoo.org> torque-2.3.6.ebuild,
+  torque-2.3.7.ebuild, torque-2.3.7-r1.ebuild:
+  Bug #283320 cleanup: linux_config_exists before linux_chkconfig*.
 
 *torque-2.3.7-r1 (03 Dec 2009)
 
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index b21032532efd..11dd12e5eb21 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX pbs_mom-init.d-2.2.1-r1 1093 RMD160 ade6389bcda7974fd17c56c5f6f7a1c5b19c7fda SHA1 051455da4526b908ddb2346c912b68ba22245209 SHA256 ce5dfb1db62de8611974dcf15698dce75ef289f2a13d6a95039aec724748e64d
 AUX pbs_sched-init.d-2.2.1-r1 1174 RMD160 d39789a7675487065094083c1ebb6da6e8246818 SHA1 c550cd7606da18a74e736c7f0d26d04deea3d34b SHA256 b1edba8149cc3962e147d8e16148113ad629c5c7ab54ea629d5c106aea337afe
 AUX pbs_server-init.d-2.2.1-r1 1666 RMD160 e757d58142dd2abc10cee6e016744336788bca5c SHA1 f1f0a3181265e7a0c0e59cfb51c53dfaf4f93dd8 SHA256 a7e05fa7b544b46d8e8a6fc2ed4fc843dd63496597fcd32a70f45c4ddcec18d3
@@ -8,15 +5,10 @@ AUX torque-conf.d-2.2.1-r1 649 RMD160 d8a8cec80a86fdea54545d64df9276db0386d688 S
 AUX torque-env.d-2.2.1-r1 260 RMD160 d16f5490599c9f2a2db493cdeedaf777e19bc6a4 SHA1 85ad40b92ec2573aae1536aa35995ca3d7deb222 SHA256 3f1c12897f3a5993a634da35a069360b0069ad189309175a0276d32b06b2d67a
 DIST torque-2.3.6.tar.gz 5447812 RMD160 c56c50eb6c060485ccd843a2595aa6952e465681 SHA1 43420cca1a6dcb22fb246b8b44501eed7ac5649b SHA256 95cdc2d4c61fef867caffcb20e41e614b9f8b0f4bc9d0a618546a885dd259dd3
 DIST torque-2.3.7.tar.gz 5456607 RMD160 2dc59650397e23f3439ed057024114f9f54536a2 SHA1 4280343ed794c2b6a549c6b04ec691dab4149551 SHA256 802e2f3b5489e32c44d27a76861df94eb791f42f4e13283cf90431194a48d4d0
-EBUILD torque-2.3.6.ebuild 7093 RMD160 68c3441a690676f17f1772a4a84dc00b8d895522 SHA1 9aa7bf2bf70ad5c651f438164ca10a72991e4ca2 SHA256 9ecb827bd6ab17fd8cea13af28abf60387b5218502b7c086974988c4a1834b1e
-EBUILD torque-2.3.7-r1.ebuild 6964 RMD160 bf830cf757875514903b44289c86a33bd70e84ba SHA1 2befb535fea7d0661190cfcc752f1e3274a0c2d1 SHA256 b4dceef1fd4b00954db200bf1a7e91a4b51c1fb8739e85ac65b193db6ca480bc
-EBUILD torque-2.3.7.ebuild 7072 RMD160 ec6785c151e95db57799825d38a74d7d43ba7f76 SHA1 d16c71671d35761d00bba901a8a843d13943ec7d SHA256 be85732b8b5c5ad24d96be10a9b61bf7c1f4e9108cb3aa331bc2c8608b0b6ebf
-MISC ChangeLog 15135 RMD160 1d5cfcbf89e1ea6d5f42849e9e990aead1100005 SHA1 7c09280357109504676f891504ac0bc0d8889b54 SHA256 0d4f4dca450d076a0031094fd1056826213148def0a23fb30a32d1cdcb0e6651
+EBUILD torque-2.3.6.ebuild 7118 RMD160 b7ee60a7e9e46c21158485287508ea03543f5cce SHA1 d6d107a851600d9ba67d5a3ca96c0ad75e1eca76 SHA256 568aa7e924a72e51362e7531be136463392c947e6038143a3147661174b57c2d
+EBUILD torque-2.3.7-r1.ebuild 6987 RMD160 0121e9a50a8f1a56428ea7422208b691b0e8c943 SHA1 ca2c5c4621471831c5f1629a6fe50c96cd138f14 SHA256 48d4ce4793375d80f9fba48c5a2a7a826a9662516c28ee16afa41613c338e2f6
+EBUILD torque-2.3.7.ebuild 7095 RMD160 3ec52c16ef114231cdedee518dc366a2b7c68c33 SHA1 ad46fe4a07897f44089acd8e72fb65e6fd820d81 SHA256 36563ebad0a0ffec38a2d6891f0879dd2788180b84d6eec35d388c37ae6e3c85
+MISC ChangeLog 15323 RMD160 818adcaf072b023f1e73ad3952b052fd0f329914 SHA1 9f4d3624eb04fd94989577eec53c87d45c33ab6f SHA256 4c068e594b1b012df87661596984d9152bfa55f4b2e5de49fe3e4b68857668c1
 MISC metadata.xml 495 RMD160 ed5f4dcf6030235e74f01c992a4b94340d1abcf8 SHA1 b8aace94549c40750ac998296695d80e52bf8634 SHA256 145bd4f19406de8d0168d48652203c30f19607b79c6a58a9b0709618f44e37db
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAksYQMwACgkQ4MrvBE1wQ8lztACfeE+GbJCIkYTC/ha7dh5cYHaE
-qPEAoIk0dFxnjYzPWH3HKfboFBypiP+m
-=1V9p
------END PGP SIGNATURE-----
+MISC torque-2.3.6.ebuild.orig 7093 RMD160 68c3441a690676f17f1772a4a84dc00b8d895522 SHA1 9aa7bf2bf70ad5c651f438164ca10a72991e4ca2 SHA256 9ecb827bd6ab17fd8cea13af28abf60387b5218502b7c086974988c4a1834b1e
+MISC torque-2.3.7.ebuild.orig 7072 RMD160 ec6785c151e95db57799825d38a74d7d43ba7f76 SHA1 d16c71671d35761d00bba901a8a843d13943ec7d SHA256 be85732b8b5c5ad24d96be10a9b61bf7c1f4e9108cb3aa331bc2c8608b0b6ebf
diff --git a/sys-cluster/torque/torque-2.3.6.ebuild b/sys-cluster/torque/torque-2.3.6.ebuild
index 5fdaa6b5a801..4d75cd7fd708 100644
--- a/sys-cluster/torque/torque-2.3.6.ebuild
+++ b/sys-cluster/torque/torque-2.3.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.3.6.ebuild,v 1.8 2009/09/23 20:44:15 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.3.6.ebuild,v 1.9 2010/01/10 01:22:39 robbat2 Exp $
 
 inherit flag-o-matic eutils linux-info
 
@@ -47,7 +47,7 @@ pkg_setup() {
 			elog "    Torque support for cpusets is still in development, you may"
 			elog "wish to disable it for production use."
 			einfo
-			if ! linux_chkconfig_present CPUSETS; then
+			if ! linux_config_exists || ! linux_chkconfig_present CPUSETS; then
 				einfo
 				elog "    Torque support for cpusets will require that you recompile"
 				elog "your kernel with CONFIG_CPUSETS enabled."
diff --git a/sys-cluster/torque/torque-2.3.7-r1.ebuild b/sys-cluster/torque/torque-2.3.7-r1.ebuild
index 27fc3d274d74..943b513d17df 100644
--- a/sys-cluster/torque/torque-2.3.7-r1.ebuild
+++ b/sys-cluster/torque/torque-2.3.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.3.7-r1.ebuild,v 1.1 2009/12/03 22:50:46 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.3.7-r1.ebuild,v 1.2 2010/01/10 01:22:39 robbat2 Exp $
 
 EAPI=2
 inherit flag-o-matic eutils linux-info
@@ -56,7 +56,7 @@ pkg_setup() {
 			elog "    Torque support for cpusets is still in development, you may"
 			elog "wish to disable it for production use."
 			einfo
-			if ! linux_chkconfig_present CPUSETS; then
+			if ! linux_config_exists || ! linux_chkconfig_present CPUSETS; then
 				einfo
 				elog "    Torque support for cpusets will require that you recompile"
 				elog "your kernel with CONFIG_CPUSETS enabled."
diff --git a/sys-cluster/torque/torque-2.3.7.ebuild b/sys-cluster/torque/torque-2.3.7.ebuild
index e0a6a9d0b9ca..8835e0270721 100644
--- a/sys-cluster/torque/torque-2.3.7.ebuild
+++ b/sys-cluster/torque/torque-2.3.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.3.7.ebuild,v 1.3 2009/11/02 15:40:02 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.3.7.ebuild,v 1.4 2010/01/10 01:22:39 robbat2 Exp $
 
 EAPI=2
 inherit flag-o-matic eutils linux-info
@@ -46,7 +46,7 @@ pkg_setup() {
 			elog "    Torque support for cpusets is still in development, you may"
 			elog "wish to disable it for production use."
 			einfo
-			if ! linux_chkconfig_present CPUSETS; then
+			if ! linux_config_exists || ! linux_chkconfig_present CPUSETS; then
 				einfo
 				elog "    Torque support for cpusets will require that you recompile"
 				elog "your kernel with CONFIG_CPUSETS enabled."